Update to 25.11

A devshell for my pdf->ledger conversion script.

Eventually I should package up my script as a derivation, but let's
leave this for now.

.gitattributes

@@ -0,0 +1 @@
+*.ttf filter=lfs diff=lfs merge=lfs -text

.gitmodules

@@ -7,3 +7,6 @@
 [submodule "submodules/wezterm-config"]
 	path = submodules/wezterm-config
 	url = git@github.com:pestctrl/wezterm-config
+[submodule "submodules/work-bash-config"]
+	path = submodules/work-bash-config
+	url = git@github.com:pestctrl/work-bash-config

common/base-packages.nix

@@ -17,20 +17,13 @@
   nfs-utils
   sshfs
 
-  # unstable.emacs
-  #
-  # Probably this is being overwritten by home-manager.
-  #
-  # TODO: Resolve the disparity.
-  ((emacsPackagesFor emacs-unstable).emacsWithPackages
-    (epkgs: with epkgs; [
-      treesit-grammars.with-all-grammars
-      mu4e
-    ]))
+  myEmacs
+
   notmuch mu isync
   keychain ledger gnupg
   ledger2beancount beancount fava
   hledger
+  ledger-autosync
   mailutils
   pandoc texlive.combined.scheme-full
   texlivePackages.noto
@@ -80,6 +73,17 @@
     # chromaprint
 
     lxml
+
+    # RedditArchiver dependencies
+    pyyaml
+    anytree
+    colored
+    markdown2
+    praw
+    colored
+    prawcore
+
+    ofxclient
   ]))
 
   chromaprint

common/configuration.nix

@@ -71,6 +71,18 @@ in
     LC_TIME = "en_US.UTF-8";
   };
 
+  system.autoUpgrade = {
+    enable = true;
+    flake = "/home/benson/nixos-config";
+    flags = [
+      "--update-input"
+      "unstable"
+      "-L" # print build logs
+    ];
+    dates = "12:00";
+    randomizedDelaySec = "45min";
+  };
+
   environment.systemPackages = import ./base-packages.nix { inherit pkgs; };
 
   services.tailscale.enable = true;
@@ -89,13 +101,4 @@ in
   # networking.firewall.allowedUDPPorts = [ ... ];
   # Or disable the firewall altogether.
   # networking.firewall.enable = false;
-
-  # This value determines the NixOS release from which the default
-  # settings for stateful data, like file locations and database versions
-  # on your system were taken. It‘s perfectly fine and recommended to leave
-  # this value at the release version of the first install of this system.
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "24.05"; # Did you read the comment?
-
 }

common/development-machine.nix

@@ -12,6 +12,8 @@
     zstd.dev
     zstd.out
 
+    devenv
+
     racket
 
     ninja
@@ -19,8 +21,8 @@
     lldb
     mold
     lld
-    clang-tools_16 # clangd, clang-format
-    llvmPackages_16.libllvm
+    clang-tools # clangd, clang-format
+    llvmPackages.libllvm
     bear
     rr
     valgrind
@@ -34,10 +36,11 @@
     cutter
 
     nodejs_22
+    wireshark
 
     minikube
     kubectl
-    talosctl
+    unstable.talosctl
     k9s
     (wrapHelm kubernetes-helm {
       plugins = with pkgs.kubernetes-helmPlugins; [
@@ -51,6 +54,8 @@
     postgresql_16
     basez
 
+    zeal
+
     # mps.overrideAttrs (old: {
     #   pname = "mps";
     #   version = "1.118.0";
@@ -64,5 +69,8 @@
     # })
   ];
 
-  boot.kernel.sysctl."kernel.perf_event_paranoid" = 1;
+  boot.kernel.sysctl = {
+    # "kernel.yama.ptrace_scope" = 0;
+    "kernel.perf_event_paranoid" = 1;
+  };
 }

common/exwm.nix

@@ -1,12 +1,4 @@
 { config, pkgs, ... }:
-let
-  emacs =
-    ((pkgs.emacsPackagesFor pkgs.emacs-unstable).emacsWithPackages
-      (epkgs: with epkgs; [
-        treesit-grammars.with-all-grammars
-        mu4e
-      ]));
-in
 {
   environment.systemPackages = with pkgs; [
     picom
@@ -19,7 +11,7 @@ in
     windowManager.session = [{
       name = "my-exwm";
       start = ''
-        ${emacs}/bin/emacs -l /home/benson/.emacs.d/init.el
+        ${pkgs.myEmacs}/bin/emacs -l /home/benson/.emacs.d/init.el
       '';
     }];
 

common/laptop-things.nix

@@ -15,10 +15,17 @@
 
     # Configure keymap in X11
     xserver = {
+      layout = lib.mkForce "neo_dvorak,us";
+      xkbOptions = "grp:ctrls_toggle";
+
       xkb = {
-        layout = lib.mkForce "us,us";
-        variant = lib.mkForce "dvorak,";
-        options = "grp:win_space_toggle";
+        extraLayouts = {
+          neo_dvorak = {
+            description = "Dvorak with Neo2 Extensions";
+            symbolsFile = ../res/xkb/symbols/neo_dvorak;
+            languages = [ "eng" ];
+          };
+        };
       };
     };
   };

common/overlays.nix

@@ -10,4 +10,14 @@ inputs:
       dontStrip = true;
     });
   })
+
+  (final: prev: {
+    # final.emacs-git, final.emacs-unstable, or final.emacs-igc
+    myEmacs =
+      ((prev.emacsPackagesFor final.emacs-unstable)
+        .emacsWithPackages (epkgs: with epkgs; [
+          treesit-grammars.with-all-grammars
+          mu4e
+        ]));
+    })
 ]

common/user-facing.nix

@@ -5,11 +5,10 @@
     ./exwm.nix
   ];
 
-  # Enable sound with pipewire.
-  hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
-  services = {
 
+  services = {
+    # Enable sound with pipewire.
     pipewire = {
       enable = true;
       alsa.enable = true;
@@ -21,35 +20,37 @@
       # no need to redefine it in your config for now)
       # media-session.enable = true;
     };
-  };
 
-  services.xserver = {
-    # Enable the X11 windowing system.
-    enable = true;
+    pulseaudio.enable = false;
 
     # Enable the KDE Plasma Desktop Environment.
-    desktopManager.plasma5.enable = true;
+    desktopManager.plasma6.enable = true;
+
+    xserver = {
+      # Enable the X11 windowing system.
+      enable = true;
+
+      # Enable sddm and startx
+      displayManager = {
+        startx.enable = true;
+      };
+
+      # Configure keymap in X11
+      xkb = {
+        layout = "us";
+        variant = "";
+      };
+    };
 
-    # Enable sddm and startx
     displayManager = {
-      startx.enable = true;
+      sddm.enable = true;
     };
 
-    # Configure keymap in X11
-    xkb = {
-      layout = "us";
-      variant = "";
-    };
-  };
-
-  services.displayManager = {
-    sddm.enable = true;
-  };
-
-  services.libinput = {
-    enable = true;
-    touchpad = {
-      naturalScrolling = true;
+    libinput = {
+      enable = true;
+      touchpad = {
+        naturalScrolling = true;
+      };
     };
   };
 
@@ -57,16 +58,16 @@
     packages = with pkgs; [
       roboto-mono
       noto-fonts
-      noto-fonts-extra
       noto-fonts-cjk-sans
       noto-fonts-cjk-serif
+      commit-mono
     ];
   };
 
   environment.systemPackages = with pkgs; [
     update.firefox
     update.google-chrome
-    bitwarden
+    bitwarden-desktop
     vlc
     mpv
     obs-studio
@@ -79,10 +80,10 @@
     inkscape
 
     qdirstat
-    update.signal-desktop
+    unstable.signal-desktop
     parsec-bin
-    update.discord
-    update.telegram-desktop
+    unstable.discord
+    unstable.telegram-desktop
     dunst
     shutter
     # update.rustdesk
@@ -90,10 +91,13 @@
     docker
 
     pcmanfm
-    libsForQt5.dolphin
-    libsForQt5.dolphin-plugins
-    libsForQt5.ffmpegthumbs
-    libsForQt5.kdegraphics-thumbnailers
+    kdePackages.dolphin
+    kdePackages.dolphin-plugins
+    kdePackages.ffmpegthumbs
+    kdePackages.kdegraphics-thumbnailers
+
+    p7zip
+    unzip
 
     qemu
 
@@ -130,5 +134,7 @@
     xorg.xkbcomp
 
     insomnia
+
+    mujmap
   ];
 }

flake.lock

@@ -2,20 +2,17 @@
   "nodes": {
     "emacs-overlay": {
       "inputs": {
-        "flake-utils": [
-          "flake-utils"
-        ],
         "nixpkgs": [
           "nixpkgs"
         ],
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1722791415,
-        "narHash": "sha256-7n9UqBkTAF/RikFzCyHKz50kzBDF5GYgVb3J5wCh4EY=",
+        "lastModified": 1765729484,
+        "narHash": "sha256-exsMvinnpTWm+lZiq8RucYejmS605EP8uny/32KzlE8=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "c4f6796e5c499cf6370a45fff08a03e848b9abad",
+        "rev": "60f44dfc7fedf818666436d3b341858a400e31e0",
         "type": "github"
       },
       "original": {
@@ -25,6 +22,22 @@
         "type": "github"
       }
     },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1747046372,
+        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "inputs": {
         "systems": "systems"
@@ -50,16 +63,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1736373539,
-        "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
+        "lastModified": 1765605144,
+        "narHash": "sha256-RM2xs+1HdHxesjOelxoA3eSvXShC8pmBvtyTke4Ango=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
+        "rev": "90b62096f099b73043a747348c11dbfcfbdea949",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-24.11",
+        "ref": "release-25.11",
         "repo": "home-manager",
         "type": "github"
       }
@@ -80,34 +93,56 @@
         "type": "github"
       }
     },
+    "nixos-wsl": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1752199438,
+        "narHash": "sha256-xSBMmGtq8K4Qv80TMqREmESCAsRLJRHAbFH2T/2Bf1Y=",
+        "owner": "nix-community",
+        "repo": "NixOS-WSL",
+        "rev": "d34d9412556d3a896e294534ccd25f53b6822e80",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "main",
+        "repo": "NixOS-WSL",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1737165118,
-        "narHash": "sha256-s40Kk/OulP3J/1JvC3VT16U4r/Xw6Qdi7SRw3LYkPWs=",
+        "lastModified": 1765608474,
+        "narHash": "sha256-9Wx53UK0z8Di5iesJID0tS1dRKwGxI4i7tsSanOHhF0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "6a3ae7a5a12fb8cac2d59d7df7cbd95f9b2f0566",
+        "rev": "28bb483c11a1214a73f9fd2d9928a6e2ea86ec71",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1722651103,
-        "narHash": "sha256-IRiJA0NVAoyaZeKZluwfb2DoTpBAj+FLI0KfybBeDU0=",
+        "lastModified": 1765363881,
+        "narHash": "sha256-3C3xWn8/2Zzr7sxVBmpc1H1QfxjNfta5IMFe3O9ZEPw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a633d89c6dc9a2a8aae11813a62d7c58b2c0cc51",
+        "rev": "d2b1213bf5ec5e62d96b003ab4b5cbc42abfc0d0",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-24.05",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -118,6 +153,7 @@
         "flake-utils": "flake-utils",
         "home-manager": "home-manager",
         "nixos-hardware": "nixos-hardware",
+        "nixos-wsl": "nixos-wsl",
         "nixpkgs": "nixpkgs",
         "unstable": "unstable",
         "update": "update"
@@ -140,11 +176,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1725432240,
-        "narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=",
+        "lastModified": 1765472234,
+        "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ad416d066ca1222956472ab7d0555a6946746a80",
+        "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b",
         "type": "github"
       },
       "original": {
@@ -156,16 +192,16 @@
     },
     "update": {
       "locked": {
-        "lastModified": 1737165118,
-        "narHash": "sha256-s40Kk/OulP3J/1JvC3VT16U4r/Xw6Qdi7SRw3LYkPWs=",
+        "lastModified": 1765608474,
+        "narHash": "sha256-9Wx53UK0z8Di5iesJID0tS1dRKwGxI4i7tsSanOHhF0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "6a3ae7a5a12fb8cac2d59d7df7cbd95f9b2f0566",
+        "rev": "28bb483c11a1214a73f9fd2d9928a6e2ea86ec71",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.11",
         "repo": "nixpkgs",
         "type": "github"
       }

flake.nix

@@ -1,20 +1,23 @@
 {
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
-    update.url = "github:nixos/nixpkgs/nixos-24.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
+    update.url = "github:nixos/nixpkgs/nixos-25.11";
     unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     flake-utils.url = "github:numtide/flake-utils";
 
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-24.11";
+      url = "github:nix-community/home-manager/release-25.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     emacs-overlay = {
       url = "github:nix-community/emacs-overlay/master";
       inputs.nixpkgs.follows = "nixpkgs";
-      inputs.flake-utils.follows = "flake-utils";
+    };
+    nixos-wsl = {
+      url = "github:nix-community/NixOS-WSL/main";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
   };
 
@@ -38,7 +41,7 @@
               home-manager.extraSpecialArgs = { inherit inputs; };
               home-manager.useGlobalPkgs = true;
               home-manager.useUserPackages = true;
-              home-manager.users.benson.imports = [ ./home/users/benson.nix ];
+              home-manager.users.benson = ./home/users/benson.nix;
             }
           ];
         };
@@ -50,55 +53,85 @@
           (map mkSystem ["NixDawn" "NixFrame"]))
 
         // {
-        NixGate = pkgs.lib.nixosSystem {
-          inherit system;
-          specialArgs = { inherit inputs; };
-          modules = [
-            ./common/configuration.nix
-            ./hosts/NixGate/configuration.nix
-          ];
-        };
+	        NixWSL = nixpkgs.lib.nixosSystem {
+            inherit system;
+            specialArgs = { inherit inputs; };
+            modules = [
+              ./common/configuration.nix
+              ./hosts/NixWSL/configuration.nix
+            ];
+          };
 
-        NixSentinel = pkgs.lib.nixosSystem {
-          inherit system;
-          specialArgs = { inherit inputs; };
-          modules = [
-            ./common/configuration.nix
-            ./hosts/NixSentinel/configuration.nix
-          ];
-        };
+          NixGate = pkgs.lib.nixosSystem {
+            inherit system;
+            specialArgs = { inherit inputs; };
+            modules = [
+              ./common/configuration.nix
+              ./hosts/NixGate/configuration.nix
+            ];
+          };
 
-        # LenoNix = nixpkgs.lib.nixosSystem {
-        #   system = "x86_64-linux";
-        #   modules = [ ./hosts/NixFrame/configuration.nix ];
-        # };
-      };
+          NixSentinel = pkgs.lib.nixosSystem {
+            inherit system;
+            specialArgs = { inherit inputs; };
+            modules = [
+              ./common/configuration.nix
+              ./hosts/NixSentinel/configuration.nix
+            ];
+          };
+
+          # LenoNix = nixpkgs.lib.nixosSystem {
+          #   system = "x86_64-linux";
+          #   modules = [ ./hosts/NixFrame/configuration.nix ];
+          # };
+        };
 
       packages."${system}" = {
         mps-debug = pkgs.mps-debug;
       };
 
       devShells."${system}" = {
-        default = pkgs.mkShell {
+        emacs-min = pkgs.mkShell {
+          packages = with pkgs; [
+            emacs
+            git
+            libtool
+            cmake gcc gnumake
+            roboto-mono ripgrep
+          ];
+        };
+
+        emacs-devel = pkgs.mkShell {
           # packages = with pkgs; [mps-debug];
           # nativeBuildInputs = with pkgs; [ mps-debug ] ++ pkgs.emacs.nativeBuildInputs;
           # buildInputs = pkgs.emacs.buildInputs;
-          packages = with pkgs; [ mps-debug ];
-          # inputsFrom = with pkgs; [ emacs ];
+          # packages = with pkgs; [ mps-debug ];
+          inputsFrom = with pkgs; [ emacs ];
+          packages = with pkgs; [ mps ];
+          buildInputs = with pkgs; [ xorg.libXrandr ];
 
           shellHook = ''
+            echo "MPS debug environment!"
+            set -x
             export MPS_LIB="${pkgs.mps-debug}/lib"
             export MPS_INC="${pkgs.mps-debug}/include"
-            echo "MPS debug environment!"
-            echo "MPS_LIB = $MPS_LIB"
-            echo "MPS_INC = $MPS_INC"
+            unset EMACSLOADPATH
+            set +x
             echo "Configure Command: "
             echo -n '  LDFLAGS="-L$MPS_LIB" CFLAGS="-O0 -g3 -isystem $MPS_INC" '
             echo './configure --with-mps=debug --with-native-compilation=no --enable-checking="yes,glyphs"'
-            echo "If you are using Emacs from emacs-overlay, remember to unset environment variable EMACSLOADPATH"
-            echo "Need to investigate further as to why"
           '';
         };
+
+        pymupdf = pkgs.mkShell {
+          venvDir = "./venv";
+          buildInputs = with pkgs.python312Packages; [
+            venvShellHook
+            python
+            pymupdf
+            icecream
+          ];
+        };
       };
 
       homeConfigurations = {
@@ -110,7 +143,7 @@
           ];
         };
 
-        "work" = home-manager.lib.homeManagerConfiguration {
+        "a0487752" = home-manager.lib.homeManagerConfiguration {
           inherit pkgs;
           extraSpecialArgs = { inherit inputs; };
           modules = [

home/modules/bash-config/default.nix

@@ -27,12 +27,21 @@ in
     xdg.configFile."bash-config/emacs.sh".source = "${bash-drv}/emacs.sh";
 
     # home.file.".bashrc".source = "${bash-drv}/bashrc.sh";
-    programs.bash.bashrcExtra = ''
-      source ${bash-drv}/bashrc.sh
+    programs.bash = {
+      shellAliases = {
+        enable_gdb = "sudo sysctl kernel.yama.ptrace_scope=0";
+        disable_gdb = "sudo sysctl kernel.yama.ptrace_scope=3";
+      };
 
-      # Need to figure out how to conditionally generate this
-      alias k=kubectl
-      source <(kubectl completion bash | sed s/kubectl/k/g)
-    '';
+      bashrcExtra = ''
+        source ${bash-drv}/bashrc.sh
+
+        # Need to figure out how to conditionally generate this
+        if [[ -n $(which kubectl) ]]; then
+          alias k=kubectl
+          source <(kubectl completion bash | sed s/kubectl/k/g)
+        fi
+      '';
+    };
   };
 }

home/users/benson.nix

@@ -1,24 +1,20 @@
 { inputs, config, pkgs, lib, ... }@args:
-let
-  my-emacs = ((pkgs.emacsPackagesFor pkgs.emacs-unstable)
-    .emacsWithPackages (epkgs: with epkgs; [
-      treesit-grammars.with-all-grammars
-      mu4e
-    ]));
-in {
+{
   imports = [
     ../modules
     ../../submodules
   ];
 
-  nixpkgs.overlays = [
+  nixpkgs.overlays = (lib.mkIf (!config.submoduleSupport.enable) [
     inputs.emacs-overlay.overlays.default
-  ];
+  ]);
 
   my.beets-config.enable = true;
   my.tmux-config.enable = true;
 
-  my.flakeLocation = lib.mkIf (builtins.hasAttr "osConfig" args) args.osConfig.my.flakeLocation;
+  my.flakeLocation = if (builtins.hasAttr "osConfig" args)
+                     then args.osConfig.my.flakeLocation
+                     else "/home/benson/nixos-config";
 
   # Home Manager needs a bit of information about you and the paths it should
   # manage.
@@ -42,7 +38,7 @@ in {
   # You should not change this value, even if you update Home Manager. If you do
   # want to update the value, then make sure to first check the Home Manager
   # release notes.
-  home.stateVersion = "24.05"; # Please read the comment before changing.
+  home.stateVersion = "23.11"; # Please read the comment before changing.
 
   # The home.packages option allows you to install Nix packages into your
   # environment.
@@ -100,7 +96,7 @@ in {
       primary = true;
       realName = "Benson Chu";
       address = "bensonchu@fastmail.com";
-      aliases = ["me@mail.pestctrl.io" "bensonchu457@fastmail.com"];
+      aliases = ["dev@mail.pestctrl.io" "me@mail.pestctrl.io" "bensonchu457@fastmail.com"];
       flavor = "fastmail.com";
 
 
@@ -108,9 +104,11 @@ in {
       smtp.host = "smtp.fastmail.com";
 
       userName = "bensonchu@fastmail.com";
-      passwordCommand = ''${my-emacs}/bin/emacsclient -e '(get-authinfo "imap.fastmail.com" "993" "bensonchu457@fastmail.com")' | ${pkgs.coreutils}/bin/tr -d '"' '';
+      passwordCommand = ''${pkgs.myEmacs}/bin/emacsclient -e '(get-authinfo "imap.fastmail.com" "993" "bensonchu457@fastmail.com")' | ${pkgs.coreutils}/bin/tr -d '"' '';
 
       mu.enable = true;
+
+      mujmap.enable = true;
     };
   };
 
@@ -120,7 +118,7 @@ in {
     git = {
       enable = true;
       userName = "Benson Chu";
-      userEmail = "bensonchu457@gmail.com";
+      userEmail = "dev@mail.pestctrl.io";
       extraConfig = {
         core = {
           editor = "emacsclient";
@@ -129,7 +127,7 @@ in {
     };
 
     emacs = {
-      package = my-emacs;
+      package = pkgs.myEmacs;
       enable = true;
     };
 

home/users/work.nix

@@ -1,20 +1,24 @@
-{ inputs, config, pkgs, ... }:
+{ inputs, config, pkgs, lib, ... }:
 
 {
   imports = [
     ../modules
-  ];
-
-  nixpkgs.overlays = [
-    inputs.emacs-overlay.overlays.default
+    ../../submodules
   ];
 
   # Home Manager needs a bit of information about you and the paths it should
   # manage.
-  home.username = "cvs";
-  home.homeDirectory = "/home/cvs";
+  # home.username = "cvs";
+  # home.homeDirectory = "/home/cvs";
+  home.username = "a0487752";
+  home.homeDirectory = "/home/a0487752";
 
   # my.bash-config.enable = true;
+  my = {
+    flakeLocation = "/scratch/benson/_repos-personal/nixos-config";
+    tmux-config.enable = true;
+    # work-bash-config.enable = true;
+  };
 
   nix = (lib.mkIf (!config.submoduleSupport.enable) {
     package = pkgs.nix;
@@ -42,11 +46,27 @@
     # '')
     roboto-mono
 
+    fastfetch
+
     rizin radare2 cutter
     ripgrep
     git
 
-    cmake gnumake libtool gcc
+    cmatrix
+    gnumake libtool roswell sbcl
+    dtc
+
+    clang-tools
+
+    jira-cli-go
+
+    direnv
+
+    firefox
+
+    tmux
+
+    mold
   ];
 
   # Home Manager is pretty good at managing dotfiles. The primary way to manage
@@ -99,12 +119,7 @@
 
     emacs = {
       enable = true;
-      package = (
-        (pkgs.emacsPackagesFor pkgs.emacs-unstable)
-          .emacsWithPackages (epkgs: with epkgs; [
-            treesit-grammars.with-all-grammars
-            mu4e
-          ]));
+      package = pkgs.myEmacs;
     };
 
     # bash.enable = true; # see note on other shells below

hosts/NixDawn/configuration.nix

@@ -8,7 +8,8 @@
     ../../common/configuration.nix
     ../../common/user-facing.nix
     ../../common/development-machine.nix
-    ../../common/lxd-setup.nix
+    # Unmaintained
+    # ../../common/lxd-setup.nix
     ../../common/moms-house
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
@@ -22,7 +23,6 @@
 
   networking.hostName = "NixDawn"; # Define your hostname.
   networking.hostId = "5640b87e";
-  networking.wireless.enable = true;
 
   fileSystems."/home/benson/workspace" = {
     device = "/dev/disk/by-uuid/aa640eb6-0655-446a-8a12-5867eeef6638";
@@ -37,13 +37,17 @@
     description = "Benson Chu";
     extraGroups = [ "networkmanager" "wheel" ];
     packages = with pkgs; [
-      kate
+      kdePackages.kate
+      kdePackages.dolphin
+      kdePackages.breeze-icons
       steam
       moonlight-qt
-      dolphin
-      breeze-icons
       xautolock
       unstable.mqtt-explorer
+      musescore
+      unstable.spotify
+      pulseaudio
+      immich-cli
     ];
   };
 
@@ -56,6 +60,7 @@
       remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
       dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
     };
+    coolercontrol.enable = true;
   };
 
   services = {
@@ -64,6 +69,7 @@
     # appearance.
     #
     # picom.enable = true;
+    pipewire.pulse.enable = true;
     pcscd.enable = true;
     tailscale.enable = true;
     gvfs.enable = true;
@@ -73,10 +79,12 @@
     fwupd.enable = true;
 
     logind = {
-      extraConfig = ''
-        IdleAction=hybrid-sleep
-        IdleActionSec=30min
-      '';
+      settings = {
+        Login = {
+          IdleAction = "hybrid-sleep";
+          IdleActionSec = "30min";
+        };
+      };
     };
 
     apcupsd = {
@@ -115,6 +123,14 @@
     };
   };
 
+  xdg.portal = {
+    enable = true;
+    extraPortals = with pkgs; [
+      xdg-desktop-portal-gtk
+    ];
+    xdgOpenUsePortal = true;
+  };
+
   virtualisation = {
     virtualbox.host.enable = true;
 
@@ -126,17 +142,14 @@
 
   environment.systemPackages = with pkgs; [
     pavucontrol
-    unstable.rustdesk
-    gkraken
+    # unstable.rustdesk
     tarsnap
     # (pkgs.callPackage /home/benson/workspace/peter-nixos/mfcl2690dw/default.nix { } )
-    clasp
+    clasp-common-lisp
     leiningen
     supercollider-with-sc3-plugins
   ];
 
-  hardware.gkraken.enable = true;
-
   networking.firewall = {
     enable = true;
     allowedTCPPortRanges = [
@@ -147,7 +160,11 @@
     ];
 
     # Syncthing
-    allowedTCPPorts = [ 22000 ];
+    allowedTCPPorts = [
+      # vlc audio streaming
+      8888
+      22000
+    ];
     allowedUDPPorts = [ 22000 21027 ];
   };
 
@@ -189,6 +206,5 @@
   # this value at the release version of the first install of this system.
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "24.05"; # Did you read the comment?
-
+  system.stateVersion = "23.11";
 }

hosts/NixFrame/configuration.nix

@@ -47,7 +47,7 @@
     description = "Benson Chu";
     extraGroups = [ "networkmanager" "wheel" ];
     packages = with pkgs; [
-      kate
+      kdePackages.kate
       steam
     ];
   };
@@ -65,6 +65,6 @@
   # this value at the release version of the first install of this system.
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "24.05"; # Did you read the comment?
+  system.stateVersion = "23.11"; # Did you read the comment?
 
 }

hosts/NixFrame/hardware-configuration.nix

@@ -19,7 +19,7 @@
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/7CFD-742B";
+    { device = "/dev/disk/by-uuid/D289-46FB";
       fsType = "vfat";
     };
 

hosts/NixGate/configuration.nix

@@ -40,9 +40,9 @@
   };
 
   # Configure keymap in X11
-  services.xserver = {
+  services.xserver.xkb = {
     layout = "us";
-    xkbVariant = "";
+    variant = "";
   };
 
   # Virtualizer Agent

hosts/NixWSL/configuration.nix

@@ -0,0 +1,30 @@
+# Edit this configuration file to define what should be installed on
+# your system. Help is available in the configuration.nix(5) man page, on
+# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
+
+# NixOS-WSL specific options are documented on the NixOS-WSL repository:
+# https://github.com/nix-community/NixOS-WSL
+
+{ config, lib, pkgs, inputs, ... }:
+
+{
+  imports = [
+    ../../common/configuration.nix
+    ../../common/user-facing.nix
+    ../../common/development-machine.nix
+    inputs.nixos-wsl.nixosModules.default
+  ];
+
+  networking.hostName = "NixWSL";
+
+  wsl.enable = true;
+  wsl.defaultUser = "benson";
+
+  # This value determines the NixOS release from which the default
+  # settings for stateful data, like file locations and database versions
+  # on your system were taken. It's perfectly fine and recommended to leave
+  # this value at the release version of the first install of this system.
+  # Before changing this value read the documentation for this option
+  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
+  system.stateVersion = "24.05"; # Did you read the comment?
+}

modules/secrets/default.nix

@@ -1,3 +1,20 @@
 { inputs, config, pkgs, lib, ... }:
 {
+  fileSystems."/mnt/media" = {
+    device = "//atlantis.local/media2";
+    fsType = "cifs";
+    options = [ "username=bchu" "password=Mathexpert457" "uid=1000" "x-systemd.automount" "noauto"];
+  };
+
+  fileSystems."/mnt/dump" = {
+    device = "//atlantis.local/dump";
+    fsType = "cifs";
+    options = [ "username=bchu" "password=Mathexpert457" "uid=1000" "x-systemd.automount" "noauto"];
+  };
+
+  fileSystems."/mnt/puppet_recordings" = {
+    device = "//atlantis.local/Puppet Recordings";
+    fsType = "cifs";
+    options = [ "username=bchu" "password=Mathexpert457" "uid=1000" "x-systemd.automount" "noauto"];
+  };
 }

res/xkb/set.sh

@@ -0,0 +1 @@
+setxkbmap -I. neo_dvorak -option grp:ctrls_toggle -print | xkbcomp -I. - $DISPLAY

res/xkb/symbols/neo_dvorak

@@ -0,0 +1,67 @@
+partial alphanumeric_keys
+xkb_symbols "neo_dvorak_base" {
+    include "de(neo_base)"
+
+    key.type[Group1] = "EIGHT_LEVEL_WITH_LEVEL5_LOCK";
+    key <AD01> { [ apostrophe,   quotedbl,            NoSymbol,    Greek_eta,   NoSymbol,         NoSymbol,  U2135,         NoSymbol ] };
+    key <AD02> { [ comma,        less,                NoSymbol,    U03F1,       NoSymbol,         NoSymbol,  U21D2,         NoSymbol ] };
+    key <AD03> { [ period,       greater,             NoSymbol,    U03D1,       NoSymbol,         NoSymbol,  U21A6,         NoSymbol ] };
+    key <AD11> { [ slash,        question,            NoSymbol,    NoSymbol,    NoSymbol,         NoSymbol,  union,         NoSymbol ] };
+    key <AD12> { [ equal,        plus,                dead_stroke, dead_psili,  dead_doubleacute, NoSymbol,  dead_breve,    NoSymbol] };
+    key <AC11> { [ minus,        underscore,          NoSymbol,    U2011,       NoSymbol,         NoSymbol,  hyphen,        NoSymbol ] };
+    key <AB01> { [ semicolon,    colon,               NoSymbol,    U03F5,       NoSymbol,         NoSymbol,  intersection,  NoSymbol ] };
+
+    key.type[Group1] = "EIGHT_LEVEL_ALPHABETIC_WITH_LEVEL5_LOCK";
+    key <AE11> { [ sharp,        U1E9E,               NoSymbol, Greek_finalsmallsigma,  NoSymbol,   NoSymbol, jot,               NoSymbol ] };
+    key <AD04> { [ p,            P,                   NoSymbol, Greek_pi,               NoSymbol,   NoSymbol, Greek_PI,          NoSymbol ] };
+    key <AD05> { [ y,            Y,                   NoSymbol, Greek_upsilon,          NoSymbol,   NoSymbol, nabla,             NoSymbol ] };
+    key <AD06> { [ f,            F,                   NoSymbol, Greek_phi,              NoSymbol,   NoSymbol, Greek_PHI,         NoSymbol ] };
+    key <AD07> { [ g,            G,                   NoSymbol, Greek_gamma,            NoSymbol,   NoSymbol, Greek_GAMMA,       NoSymbol ] };
+    key <AD08> { [ c,            C,                   NoSymbol, Greek_chi,              NoSymbol,   NoSymbol, U2102,             NoSymbol ] };
+    key <AD09> { [ r,            R,                   NoSymbol, Greek_rho,              NoSymbol,   NoSymbol, U211D,             NoSymbol ] };
+    key <AD10> { [ l,            L,                   NoSymbol, Greek_lambda,           NoSymbol,   NoSymbol, Greek_LAMBDA,      NoSymbol ] };
+    key <AC01> { [ a,            A,                   NoSymbol, Greek_alpha,            NoSymbol,   NoSymbol, U2200,             NoSymbol ] };
+    key <AC02> { [ o,            O,                   NoSymbol, Greek_omicron,          NoSymbol,   NoSymbol, elementof,         NoSymbol ] };
+    key <AC03> { [ e,            E,                   NoSymbol, Greek_epsilon,          NoSymbol,   NoSymbol, U2203,             NoSymbol ] };
+    key <AC04> { [ u,            U,                   NoSymbol, NoSymbol,               NoSymbol,   NoSymbol, includedin,        NoSymbol ] };
+    key <AC05> { [ i,            I,                   NoSymbol, Greek_iota,             NoSymbol,   NoSymbol, integral,          NoSymbol ] };
+    key <AC06> { [ d,            D,                   NoSymbol, Greek_delta,            NoSymbol,   NoSymbol, Greek_DELTA,       NoSymbol ] };
+    key <AC07> { [ h,            H,                   NoSymbol, Greek_psi,              NoSymbol,   NoSymbol, Greek_PSI,         NoSymbol ] };
+    key <AC08> { [ t,            T,                   NoSymbol, Greek_tau,              NoSymbol,   NoSymbol, partialderivative, NoSymbol ] };
+    key <AC09> { [ n,            N,                   NoSymbol, Greek_nu,               NoSymbol,   NoSymbol, U2115,             NoSymbol ] };
+    key <AC10> { [ s,            S,                   NoSymbol, Greek_sigma,            NoSymbol,   NoSymbol, Greek_SIGMA,       NoSymbol ] };
+    key <AB02> { [ q,            Q,                   NoSymbol, U03D5,                  NoSymbol,   NoSymbol, U211A,             NoSymbol ] };
+    key <AB03> { [ j,            J,                   NoSymbol, Greek_theta,            NoSymbol,   NoSymbol, Greek_THETA,       NoSymbol ] };
+    key <AB04> { [ k,            K,                   NoSymbol, Greek_kappa,            NoSymbol,   NoSymbol, multiply,          NoSymbol ] };
+    key <AB05> { [ x,            X,                   NoSymbol, Greek_xi,               NoSymbol,   NoSymbol, Greek_XI,          NoSymbol ] };
+    key <AB06> { [ b,            B,                   NoSymbol, Greek_beta,             NoSymbol,   NoSymbol, U21D0,             NoSymbol ] };
+    key <AB07> { [ m,            M,                   NoSymbol, Greek_mu,               NoSymbol,   NoSymbol, ifonlyif,          NoSymbol ] };
+    key <AB08> { [ w,            W,                   NoSymbol, Greek_omega,            NoSymbol,   NoSymbol, Greek_OMEGA,       NoSymbol ] };
+    key <AB09> { [ v,            V,                   NoSymbol, NoSymbol,               NoSymbol,   NoSymbol, radical,           NoSymbol ] };
+    key <AB10> { [ z,            Z,                   NoSymbol, Greek_zeta,             NoSymbol,   NoSymbol, U2124,             NoSymbol ] };
+
+    key <AE01> { [ 1,           exclam,       onesuperior,           onesubscript,           ordfeminine,     NoSymbol,      notsign,            NoSymbol ] };
+    key <AE02> { [ 2,           at,           twosuperior,           twosubscript,           masculine,       NoSymbol,      logicalor,          NoSymbol ] };
+    key <AE03> { [ 3,           numbersign,   threesuperior,         threesubscript,         numerosign,      NoSymbol,      logicaland,         NoSymbol ] };
+    key <AE04> { [ 4,           dollar,       U203A,                 femalesymbol,           NoSymbol,        NoSymbol,      U22A5,              NoSymbol ] };
+    key <AE05> { [ 5,           percent,      U2039,                 malesymbol,             periodcentered,  NoSymbol,      U2221,              NoSymbol ] };
+    key <AE06> { [ 6,           asciicircum,  cent,                  U26A5,                  sterling,        NoSymbol,      U2225,              NoSymbol ] };
+    key <AE07> { [ 7,           ampersand,    yen,                   U03F0,                  currency,        NoSymbol,      rightarrow,         NoSymbol ] };
+    key <AE08> { [ 8,           asterisk,     singlelowquotemark,    U27E8,                  Tab,             ISO_Left_Tab,  U221E,              NoSymbol ] };
+    key <AE09> { [ 9,           parenleft,    leftsinglequotemark,   U27E9,                  KP_Divide,       KP_Divide,     variation,          NoSymbol ] };
+    key <AE10> { [ 0,           parenright,   rightsinglequotemark,  zerosubscript,          KP_Multiply,     KP_Multiply,   emptyset,           NoSymbol ] };
+};
+
+default partial alphanumeric_keys modifier_keys keypad_keys
+xkb_symbols "neo_dvorak" {
+
+    include "neo_dvorak(neo_dvorak_base)"
+
+    name[Group1]= "English (Neo, DVORAK)";
+
+    include "shift(both_capslock)"
+    include "level3(caps_switch)"
+    include "level3(bksl_switch)"
+    include "level5(lsgt_switch_lock)"
+    include "level5(ralt_switch_lock)"
+};

submodules/beets-config

@@ -1 +1 @@
-Subproject commit 69ed4fe876144b2d8cd3fc7edeaa7a4c98b0616d
+Subproject commit ae7e236072bcc0fc7d7bd3ca58bc0ad5cff0fdd2

submodules/default.nix

@@ -2,6 +2,7 @@
 let
   beets-cfg = config.my.beets-config;
   tmux-cfg = config.my.tmux-config;
+  work-bash-cfg = config.my.work-bash-config;
   mkIfFlakeLoc = condition: errorMsg: value:
     (lib.mkIf (condition &&
                !(config.my.flakeLocation == null &&
@@ -18,14 +19,28 @@ in
     };
     my.beets-config.enable = lib.mkEnableOption "Enable beets configuration file";
     my.tmux-config.enable = lib.mkEnableOption "Enable tmux configuration file";
+    my.work-bash-config.enable = lib.mkEnableOption "Enable work bash configurations";
   };
 
   config = {
-    # xdg.configFile."beets/config.yaml".source = ./beets-config/config.yaml;
+    home.file = (mkIfFlakeLoc work-bash-cfg.enable
+      "I won't symlink bashrc and bash_profile into place"
+      {
+        ".bashrc" = {
+          source = config.lib.file.mkOutOfStoreSymlink
+            "${flakeSubmodules}/work-bash-config/dot-bashrc.sh";
+        };
+        ".bash_profile" = {
+          source = config.lib.file.mkOutOfStoreSymlink
+            "${flakeSubmodules}/work-bash-config/dot-bash_profile.sh";
+        };
 
-    home = {
-      file = {
-        ".config/beets/config.yaml" = (mkIfFlakeLoc beets-cfg.enable
+      }
+    );
+
+    xdg = {
+      configFile = {
+        "beets/config.yaml" = (mkIfFlakeLoc beets-cfg.enable
           "I won't symlink beets' config.yaml into place"
           {
             source = config.lib.file.mkOutOfStoreSymlink
@@ -37,18 +52,41 @@ in
             # recursive = true;
           });
 
-        ".config/tmux/tmux.conf" = (mkIfFlakeLoc tmux-cfg.enable
+        "beets/plugins/" = (mkIfFlakeLoc beets-cfg.enable
+          "I won't symlink beets' plugins directory into place"
+          {
+            source = config.lib.file.mkOutOfStoreSymlink
+              "${flakeSubmodules}/beets-config/plugins/";
+          });
+
+        "tmux/tmux.conf" = (mkIfFlakeLoc tmux-cfg.enable
           "I won't symlink tmux's tmux.conf into place"
           {
             source = config.lib.file.mkOutOfStoreSymlink
               "${flakeSubmodules}/tmux-config/tmux.conf";
           });
 
-        ".config/wezterm/" = (mkIfFlakeLoc beets-cfg.enable
+        "wezterm/" = (mkIfFlakeLoc beets-cfg.enable
           "I won't symlink wezterm config folder into place"
           {
             source = config.lib.file.mkOutOfStoreSymlink
-              "${config.my.flakeLocation}/submodules/wezterm-config/";
+              "${flakeSubmodules}/wezterm-config/";
+          });
+
+        "bash/" = (mkIfFlakeLoc work-bash-cfg.enable
+          "I won't symlink bash config folder into place"
+          {
+            source = config.lib.file.mkOutOfStoreSymlink
+              "${flakeSubmodules}/work-bash-config/dot-config-bash/";
+          });
+      };
+
+      dataFile = {
+        "fonts/王漢宗中明體注音.ttf" = (mkIfFlakeLoc true
+          "I won't symlink chinese fonts into place"
+          {
+            source = config.lib.file.mkOutOfStoreSymlink
+              "${flakeSubmodules}/fonts/王漢宗中明體注音.ttf";
           });
       };
     };

submodules/tmux-config

@@ -1 +1 @@
-Subproject commit e5aa35f4f8ed5aad24844d56d2782ba924a38c8a
+Subproject commit d28c28e27b24a5848e41df1419f17fce289d73a0

submodules/wezterm-config

@@ -1 +1 @@
-Subproject commit 54dcdc0c412b08c10d9cd6599e4589b068154db7
+Subproject commit dfaad48b33fdd89eef3f88da00bcfd13dcd11074

submodules/work-bash-config

@@ -0,0 +1 @@
+Subproject commit 369bbcbd4734110389dfebc719b5add555447795