Upgraded to 25.11

.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

@@ -23,6 +23,7 @@
   keychain ledger gnupg
   ledger2beancount beancount fava
   hledger
+  ledger-autosync
   mailutils
   pandoc texlive.combined.scheme-full
   texlivePackages.noto
@@ -72,6 +73,17 @@
     # chromaprint
 
     lxml
+
+    # RedditArchiver dependencies
+    pyyaml
+    anytree
+    colored
+    markdown2
+    praw
+    colored
+    prawcore
+
+    ofxclient
   ]))
 
   chromaprint

common/configuration.nix

@@ -89,13 +89,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/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,6 +20,7 @@
       # no need to redefine it in your config for now)
       # media-session.enable = true;
     };
+    pulseaudio.enable = false;
   };
 
   services.xserver = {
@@ -28,7 +28,7 @@
     enable = true;
 
     # Enable the KDE Plasma Desktop Environment.
-    desktopManager.plasma5.enable = true;
+    desktopManager.plasma6.enable = true;
 
     # Enable sddm and startx
     displayManager = {
@@ -91,10 +91,10 @@
     docker
 
     pcmanfm
-    libsForQt5.dolphin
-    libsForQt5.dolphin-plugins
-    libsForQt5.ffmpegthumbs
-    libsForQt5.kdegraphics-thumbnailers
+    kdePackages.dolphin
+    kdePackages.dolphin-plugins
+    kdePackages.ffmpegthumbs
+    kdePackages.kdegraphics-thumbnailers
 
     p7zip
     unzip

flake.lock

@@ -63,16 +63,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1736373539,
-        "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
+        "lastModified": 1753592768,
+        "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
+        "rev": "fc3add429f21450359369af74c2375cb34a2d204",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-24.11",
+        "ref": "release-25.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -117,16 +117,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1750330365,
-        "narHash": "sha256-hJ7XMNVsTnnbV2NPmStCC07gvv5l2x7+Skb7hyUzazg=",
+        "lastModified": 1754767907,
+        "narHash": "sha256-8OnUzRQZkqtUol9vuUuQC30hzpMreKptNyET2T9lB6g=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d883b6213afa179b58ba8bace834f1419707d0ad",
+        "rev": "c5f08b62ed75415439d48152c2a784e36909b1bc",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -192,16 +192,16 @@
     },
     "update": {
       "locked": {
-        "lastModified": 1746957726,
-        "narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=",
+        "lastModified": 1754767907,
+        "narHash": "sha256-8OnUzRQZkqtUol9vuUuQC30hzpMreKptNyET2T9lB6g=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a39ed32a651fdee6842ec930761e31d1f242cb94",
+        "rev": "c5f08b62ed75415439d48152c2a784e36909b1bc",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }

flake.nix

@@ -1,14 +1,14 @@
 {
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
-    update.url = "github:nixos/nixpkgs/nixos-24.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
+    update.url = "github:nixos/nixpkgs/nixos-25.05";
     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.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     emacs-overlay = {
@@ -62,7 +62,7 @@
             ];
           };
 
-          NixGate = nixpkgs.lib.nixosSystem {
+          NixGate = pkgs.lib.nixosSystem {
             inherit system;
             specialArgs = { inherit inputs; };
             modules = [
@@ -71,7 +71,7 @@
             ];
           };
 
-          NixSentinel = nixpkgs.lib.nixosSystem {
+          NixSentinel = pkgs.lib.nixosSystem {
             inherit system;
             specialArgs = { inherit inputs; };
             modules = [
@@ -84,7 +84,7 @@
           #   system = "x86_64-linux";
           #   modules = [ ./hosts/NixFrame/configuration.nix ];
           # };
-      };
+        };
 
       packages."${system}" = {
         mps-debug = pkgs.mps-debug;

home/users/benson.nix

@@ -5,14 +5,16 @@
     ../../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.
@@ -36,7 +38,7 @@
   # 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.

home/users/work.nix

@@ -3,6 +3,7 @@
 {
   imports = [
     ../modules
+    ../../submodules
   ];
 
   # Home Manager needs a bit of information about you and the paths it should
@@ -13,6 +14,11 @@
   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;
@@ -49,6 +55,8 @@
     cmatrix
     cmake gnumake libtool roswell sbcl
     dtc
+
+    mold
   ];
 
   # Home Manager is pretty good at managing dotfiles. The primary way to manage

hosts/NixDawn/configuration.nix

@@ -36,11 +36,11 @@
     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
@@ -147,8 +147,6 @@
     supercollider-with-sc3-plugins
   ];
 
-  hardware.gkraken.enable = true;
-
   networking.firewall = {
     enable = true;
     allowedTCPPortRanges = [
@@ -205,6 +203,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?
 
 }

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"];
+  };
 }

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,9 +19,25 @@ 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 = {
+    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";
+        };
+
+      }
+    );
+
     xdg = {
       configFile = {
         "beets/config.yaml" = (mkIfFlakeLoc beets-cfg.enable
@@ -46,7 +63,14 @@ in
           "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/";
           });
       };
 

submodules/tmux-config

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

submodules/work-bash-config

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