From 1f4a53d646b7bbcc38df1b36ae699a7ec4c315fe Mon Sep 17 00:00:00 2001 From: roxwize Date: Sat, 15 Mar 2025 15:29:27 -0400 Subject: [PATCH] ~ --- nixos/home/base.nix | 311 +++++++++++++++++------------- nixos/home/vscode.nix | 113 +++++------ nixos/hosts/ioides/packages.nix | 1 + nixos/pkgs/vasm-psi-x/default.nix | 4 +- secrets/libera_chat.gpg | Bin 0 -> 170 bytes 5 files changed, 234 insertions(+), 195 deletions(-) create mode 100644 secrets/libera_chat.gpg diff --git a/nixos/home/base.nix b/nixos/home/base.nix index e56e842..5072bf4 100644 --- a/nixos/home/base.nix +++ b/nixos/home/base.nix @@ -1,147 +1,182 @@ { pkgs, inputs, ... }: { - nixpkgs.overlays = import ../overlays.nix inputs; + nixpkgs.overlays = import ../overlays.nix inputs; - home = { - stateVersion = "24.11"; - username = "rae"; - homeDirectory = "/home/rae"; - sessionVariables = { - BROWSER = "firefox"; - TERM = "kitty"; - }; - file = { - ".twmrc".source = ../../configs/twm; - ".local/share/themes".source = ../../configs/openbox/themes; - #! dumb (see todo) - ".local/share/PrismLauncher" = { - source = ../../assets/minecraft; - recursive = true; - }; - }; - }; - xdg.configFile = { - "openbox".source = ../../configs/openbox; - "rmpc".source = ../../configs/rmpc; - }; + home = { + stateVersion = "24.11"; + username = "rae"; + homeDirectory = "/home/rae"; + sessionVariables = { + BROWSER = "firefox"; + TERM = "kitty"; + }; + file = { + ".twmrc".source = ../../configs/twm; + ".local/share/themes".source = ../../configs/openbox/themes; + #! dumb (see todo) + ".local/share/PrismLauncher" = { + source = ../../assets/minecraft; + recursive = true; + }; + }; + }; + xdg.configFile = { + "openbox".source = ../../configs/openbox; + "rmpc".source = ../../configs/rmpc; + }; - accounts.email = { - maildirBasePath = "mail"; - accounts.rae = rec { - primary = true; - address = "rae@roxwize.xyz"; - realName = "Rae 5e"; - userName = address; - passwordCommand = "pass show mail/rae"; - signature = { - showSignature = "append"; - text = "rae "; - delimiter = "~~~~"; - }; - gpg = { - key = "6F92AED338D339DE14E7491C5B1A0FAB9BAB81EE"; - signByDefault = true; - }; + accounts.email = { + maildirBasePath = "mail"; + accounts.rae = rec { + primary = true; + address = "rae@roxwize.xyz"; + realName = "Rae 5e"; + userName = address; + passwordCommand = "pass show mail/rae"; + signature = { + showSignature = "append"; + text = "rae "; + delimiter = "~~~~"; + }; + gpg = { + key = "6F92AED338D339DE14E7491C5B1A0FAB9BAB81EE"; + signByDefault = true; + }; - imap = { - host = "mail.privateemail.com"; - port = 993; - }; - smtp = { - host = imap.host; - port = 465; - }; + imap = { + host = "mail.privateemail.com"; + port = 993; + }; + smtp = { + host = imap.host; + port = 465; + }; - thunderbird.enable = true; - }; - }; + thunderbird.enable = true; + }; + }; - programs = { - fish = { - enable = true; - shellInit = '' - set -g fish_greeting - ''; - plugins = [ - { - name = "fishline"; - src = pkgs.fetchFromGitHub { - owner = "0rax"; - repo = "fishline"; - rev = "v3.3.0"; - sha256 = "0j14nvhbz80pfkyzmwmj8x5b4pbngg9z4w04c6qrx3fip8fv70im"; - }; - } - ]; - }; - git = { - enable = true; - userName = "roxwize"; - userEmail = "rae@roxwize.xyz"; - extraConfig = { - core = { - editor = "nvim"; - }; - }; - }; - kitty = { - enable = true; - font = { - name = "GohuFont"; - size = 10.5; - }; - themeFile = "mayukai"; - }; - password-store = { - enable = true; - settings = { - PASSWORD_STORE_DIR = "/home/rae/.dotfiles/secrets"; - PASSWORD_STORE_KEY = "6F92AED338D339DE14E7491C5B1A0FAB9BAB81EE"; - }; - }; - rofi = { - enable = true; - font = "Fira Code Light 11"; - terminal = "kitty"; - pass = { - enable = true; - stores = [ "/home/rae/.dotfiles/secrets" ]; - }; - }; - }; + programs = { + fish = { + enable = true; + shellInit = '' + set -g fish_greeting + ''; + plugins = [ + { + name = "fishline"; + src = pkgs.fetchFromGitHub { + owner = "0rax"; + repo = "fishline"; + rev = "v3.3.0"; + sha256 = "0j14nvhbz80pfkyzmwmj8x5b4pbngg9z4w04c6qrx3fip8fv70im"; + }; + } + ]; + }; + git = { + enable = true; + userName = "roxwize"; + userEmail = "rae@roxwize.xyz"; + extraConfig = { + core = { + editor = "nvim"; + }; + }; + }; + kitty = { + enable = true; + font = { + name = "GohuFont"; + size = 10.5; + }; + themeFile = "mayukai"; + }; + password-store = { + enable = true; + settings = { + PASSWORD_STORE_DIR = "/home/rae/.dotfiles/secrets"; + PASSWORD_STORE_KEY = "6F92AED338D339DE14E7491C5B1A0FAB9BAB81EE"; + }; + }; + rofi = { + enable = true; + font = "Fira Code Light 11"; + terminal = "kitty"; + pass = { + enable = true; + stores = [ "/home/rae/.dotfiles/secrets" ]; + }; + }; + tiny = { + enable = true; + settings = { + defaults = { + nicks = [ "roxwize" ]; + notify = "mentions"; + realname = "rae 5e"; + }; + key_map = { + ctrl_alt_left = "tab_prev"; + ctrl_alt_right = "tab_next"; + }; + layout = "aligned"; + log_dir = "/tmp/tinylog"; + servers = [ + { + addr = "irc.libera.chat"; + join = [ + "#wikipedia-en" + "#wikipedia-abstract" + "#libera" + ]; + nicks = [ "roxwize" ]; + port = 6697; + realname = "rae 5e"; + sasl = { + username = "roxwize"; + password.command = "pass show libera_chat"; + }; + tls = true; + } + ]; + scrollback = 65535; + }; + }; + }; - services = { - flameshot = { - enable = true; - settings = { - General = { - disabledTrayIcon = true; - showStartupLaunchMessage = false; - }; - }; - }; - mpd = { - enable = true; - musicDirectory = "/mnt/world/music"; - extraConfig = '' - audio_output { - type "pipewire" - name "main" - } - log_file "/tmp/mpd.log" - ''; - }; - mpdris2 = { - enable = true; - mpd.musicDirectory = "/mnt/world/music"; - multimediaKeys = true; - notifications = true; - }; - mpris-proxy.enable = true; - }; + services = { + flameshot = { + enable = true; + settings = { + General = { + disabledTrayIcon = true; + showStartupLaunchMessage = false; + }; + }; + }; + mpd = { + enable = true; + musicDirectory = "/mnt/world/music"; + extraConfig = '' + audio_output { + type "pipewire" + name "main" + } + log_file "/tmp/mpd.log" + ''; + }; + mpdris2 = { + enable = true; + mpd.musicDirectory = "/mnt/world/music"; + multimediaKeys = true; + notifications = true; + }; + mpris-proxy.enable = true; + }; - gtk = { - enable = true; - cursorTheme.name = "Posy's Cursor"; - theme.name = "io.elementary.stylesheet.blueberry"; - }; + gtk = { + enable = true; + cursorTheme.name = "Posy's Cursor"; + theme.name = "io.elementary.stylesheet.blueberry"; + }; } diff --git a/nixos/home/vscode.nix b/nixos/home/vscode.nix index 3ddb61a..2ae4b53 100644 --- a/nixos/home/vscode.nix +++ b/nixos/home/vscode.nix @@ -1,58 +1,59 @@ { pkgs, ... }: { - programs.vscode = { - enable = true; - package = pkgs.vscodium; - enableUpdateCheck = false; - enableExtensionUpdateCheck = false; - extensions = with pkgs.vscode-extensions; [ - catppuccin.catppuccin-vsc - catppuccin.catppuccin-vsc-icons - editorconfig.editorconfig - esbenp.prettier-vscode - jnoortheen.nix-ide - llvm-vs-code-extensions.vscode-clangd - mesonbuild.mesonbuild - ms-vscode.live-server - rust-lang.rust-analyzer - skellock.just - vadimcn.vscode-lldb - wakatime.vscode-wakatime - ]; - userSettings = - let - df = lang: formatter: { - name = "[" + lang + "]"; - value = { - "editor.defaultFormatter" = formatter; - }; - }; - in { - "editor.detectIndentation" = false; - "editor.fontFamily" = "'Fira Code Light', monospace"; - # "editor.fontLigatures" = true; - "editor.formatOnSave" = false; - "editor.indentSize" = 4; - "editor.insertSpaces" = false; - "editor.tabSize" = 4; - "explorer.confirmDelete" = false; - "explorer.confirmDragAndDrop" = false; - "mesonbuild.buildFolder" = "build"; - "prettier.tabWidth" = 4; - "prettier.trailingComma" = "none"; - "prettier.singleAttributePerLine" = false; - "prettier.useEditorConfig" = true; - "prettier.useTabs" = true; - "svelte.enable-ts-plugin" = true; - "telemetry.telemetryLevel" = "off"; - "workbench.activityBar.iconClickBehavior" = "toggle"; - "workbench.activityBar.location" = "bottom"; - "workbench.colorTheme" = "Catppuccin Frappé"; - "workbench.iconTheme" = "catppuccin-frappe"; - } // builtins.listToAttrs [ - (df "css" "esbenp.prettier-vscode") - (df "html" "esbenp.prettier-vscode") - (df "typescript" "esbenp.prettier-vscode") - (df "javascript" "esbenp.prettier-vscode") - ]; - }; + programs.vscode = { + enable = true; + package = pkgs.vscodium; + enableUpdateCheck = false; + enableExtensionUpdateCheck = false; + extensions = with pkgs.vscode-extensions; [ + catppuccin.catppuccin-vsc + catppuccin.catppuccin-vsc-icons + editorconfig.editorconfig + esbenp.prettier-vscode + jnoortheen.nix-ide + llvm-vs-code-extensions.vscode-clangd + mesonbuild.mesonbuild + ms-vscode.live-server + rust-lang.rust-analyzer + skellock.just + vadimcn.vscode-lldb + wakatime.vscode-wakatime + ]; + userSettings = + let + df = lang: formatter: { + name = "[" + lang + "]"; + value = { + "editor.defaultFormatter" = formatter; + }; + }; + in { + "editor.detectIndentation" = false; + "editor.fontFamily" = "'Fira Code Light', monospace"; + # "editor.fontLigatures" = true; + "editor.formatOnSave" = false; + "editor.indentSize" = 4; + "editor.insertSpaces" = false; + "editor.tabSize" = 4; + "explorer.confirmDelete" = false; + "explorer.confirmDragAndDrop" = false; + "mesonbuild.buildFolder" = "build"; + "prettier.tabWidth" = 4; + "prettier.trailingComma" = "none"; + "prettier.singleAttributePerLine" = false; + "prettier.useEditorConfig" = true; + "prettier.useTabs" = true; + "svelte.enable-ts-plugin" = true; + "telemetry.telemetryLevel" = "off"; + "workbench.activityBar.iconClickBehavior" = "toggle"; + "workbench.activityBar.location" = "bottom"; + "workbench.colorTheme" = "Catppuccin Frappé"; + "workbench.iconTheme" = "catppuccin-frappe"; + "workbench.startupEditor" = "none"; + } // builtins.listToAttrs [ + (df "css" "esbenp.prettier-vscode") + (df "html" "esbenp.prettier-vscode") + (df "typescript" "esbenp.prettier-vscode") + (df "javascript" "esbenp.prettier-vscode") + ]; + }; } diff --git a/nixos/hosts/ioides/packages.nix b/nixos/hosts/ioides/packages.nix index 1b09fff..4a0e565 100644 --- a/nixos/hosts/ioides/packages.nix +++ b/nixos/hosts/ioides/packages.nix @@ -67,6 +67,7 @@ playit-agent # The playit program qbittorrent # Featureful free software BitTorrent client slack # Desktop client for Slack + tiny # Console IRC client vesktop # Alternate client for Discord with Vencord built-in yt-dlp # Command-line tool to download videos from YouTube.com and other sites (youtube-dl fork) # system tools diff --git a/nixos/pkgs/vasm-psi-x/default.nix b/nixos/pkgs/vasm-psi-x/default.nix index b840634..62f0304 100644 --- a/nixos/pkgs/vasm-psi-x/default.nix +++ b/nixos/pkgs/vasm-psi-x/default.nix @@ -13,10 +13,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + # output vasm6502, vasmm68k, and vasmz80 + cmakeFlags = [ "-DVASM_CPU=m68k" "-DVASM_SYNTAX=psi-x" ]; meta = with lib; { - description = "Portable and retargetable assembler (Motorola 68000)"; + description = "Portable and retargetable assembler"; homepage = "https://github.com/NaotoNTP/vasm-psi-x"; license = licenses.free; }; diff --git a/secrets/libera_chat.gpg b/secrets/libera_chat.gpg new file mode 100644 index 0000000000000000000000000000000000000000..3df41e9131fc43430d97aa222008d39d3d985593 GIT binary patch literal 170 zcmV;b09F5lUIRX