update

flake.lock

@@ -46,11 +46,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1754964749,
+        "lastModified": 1755104723,
-        "narHash": "sha256-zrF376CPh/rkB1xPXFN5WbbEqsd7ClOXxGx3sLMqgng=",
+        "narHash": "sha256-YRGZYZPOQ6N7NEyFgVZt3oqGnFDdAJmLFuo8iDtiCps=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "8916044b55506a9b05b7c681ac864b302d867b34",
+        "rev": "f6151862155f7bb5e21b7682bc89905a8f188da2",
         "type": "github"
       },
       "original": {
@@ -180,11 +180,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1754901323,
+        "lastModified": 1755104498,
-        "narHash": "sha256-G4/LiwFvBAKy6E0GqcegyCjmaJNjdl+9rFRxrOOjH30=",
+        "narHash": "sha256-kMosXLeEB43OtUKvhvzikKfFLpv7H7JzObCQO0j4X34=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "ed0fcb158e2ecf597a95dcc51facaf68557011a0",
+        "rev": "22a24ab05a9f4b3a94fba0aa0d8d850e6269241a",
         "type": "github"
       },
       "original": {
@@ -213,11 +213,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1754894368,
+        "lastModified": 1755074352,
-        "narHash": "sha256-I7uSAOosX79BLVTWRHWHvT9z3Lv8rDYY3RogV/0Gne0=",
+        "narHash": "sha256-I+kpboTzfMwRVK76OoTmHStrGuzJPcmvZKxmlmL9q+A=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "0044578681cee50fd7ad49fcb8d1e2ea53d85fe4",
+        "rev": "af9ce533100b49e8bc879b557ab830f5d3a18805",
         "type": "github"
       },
       "original": {
@@ -244,11 +244,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1754767907,
+        "lastModified": 1754937576,
-        "narHash": "sha256-8OnUzRQZkqtUol9vuUuQC30hzpMreKptNyET2T9lB6g=",
+        "narHash": "sha256-3sWA5WJybUE16kIMZ3+uxcxKZY/JRR4DFBqLdSLBo7w=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c5f08b62ed75415439d48152c2a784e36909b1bc",
+        "rev": "ddae11e58c0c345bf66efbddbf2192ed0e58f896",
         "type": "github"
       },
       "original": {
@@ -304,11 +304,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1754966322,
+        "lastModified": 1755052812,
-        "narHash": "sha256-7f/LH60DnjjQVKbXAsHIniGaU7ixVM7eWU3hyjT24YI=",
+        "narHash": "sha256-Tjw2YP7Hz8+ibE8wJ+Ps65vh1lzAe5ozmoo9sdQ7rGg=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "7c13cec2e3828d964b9980d0ffd680bd8d4dce90",
+        "rev": "433023cba5f4fa66b8b0fdbb8f91d420c9cc2527",
         "type": "github"
       },
       "original": {
@@ -360,11 +360,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1754972926,
+        "lastModified": 1755055213,
-        "narHash": "sha256-2CEQSI3o7XWMc/DOdeNf6gTKjgGf8hHS0TB0HYPmSmA=",
+        "narHash": "sha256-smOMNJ6ZM4mKvYB2z1Dbfkttr9fnjqeLT9bqRwn/L1U=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "508a7c0c5c993d237773be89f5ca91ff8c997b44",
+        "rev": "6391f8217d75b9f72b8c77572246937323ed90bc",
         "type": "github"
       },
       "original": {

home-manager/gui.nix

@@ -21,117 +21,116 @@
 
   home.packages =
     with pkgs;
-    [
+    lib.concatLists [
-      #calculator
+      # libreoffice
-      gnome-calculator
+      [
+        libreoffice
+        hunspell # spellcheck
+        hunspellDicts.en_US # spellcheck dictionary
+      ]
 
-      #productivity stuff
+      # browsers
-      libreoffice
+      [
-      hunspell # spellcheck
+        tor-browser
-      hunspellDicts.en_US # spellcheck dictionary
+        inputs.zen-browser.packages."${system}".twilight
+      ]
 
-      #video and audio downloading
+      # music library management
-      parabolic
+      [
+        picard
+        puddletag
+        lrcget
+      ]
 
-      #soulseek client
+      # image editing
-      nicotine-plus
+      [
+        darktable
+        rawtherapee
+        hugin
 
-      #dark web browsing deep web browsing
+        gimp3
-      tor-browser
+        pinta
+      ]
 
-      #audio editing
+      [
-      audacity
+        #calculator
+        gnome-calculator
 
-      #fonts
+        # audio editing
-      noto-fonts
+        audacity
-      noto-fonts-emoji
-      liberation_ttf
 
-      #for ebook reading
+        #fonts
-      foliate
+        noto-fonts
+        noto-fonts-emoji
+        liberation_ttf
 
-      #audio mixer (pavucontrol but for pipewire)
+        #for ebook reading
-      pwvucontrol
+        foliate
 
-      #minecraft launcher
+        #audio mixer (pavucontrol but for pipewire)
-      prismlauncher
+        pwvucontrol
 
-      mpv
+        # minecraft launcher
-      mumble
+        prismlauncher
-      system76-keyboard-configurator
 
-      #jellyfin
+        mpv
-      finamp # music player
+        mumble
-      delfin # jellyfin client
+        system76-keyboard-configurator
 
-      signal-desktop
+        #jellyfin
+        finamp # music player
+        delfin # jellyfin client
 
-      #accounting
+        signal-desktop
-      # gnucash
 
-      # image tools
+        # accounting
-      inkscape
+        # gnucash
-      nomacs
 
-      # partitioning utilities
+        # image tools
-      gparted
+        inkscape
-      gnome-disk-utility
+        nomacs
 
-      # small nicities
+        # partitioning utilities
-      wl-clipboard # wl-copy & wl-paste
+        gparted
-      libnotify # notifications library
+        gnome-disk-utility
-      xdg-utils # xdg utils
 
-      # music tagging utility
+        # small nicities
-      picard
+        wl-clipboard # wl-copy & wl-paste
+        libnotify # notifications library
+        xdg-utils # xdg utils
 
-      # music lyric fetcher
+        wireshark
-      lrcget
 
-      inputs.zen-browser.packages."${system}".twilight
+        nautilus
+        nufraw-thumbnailer
+        gdk-pixbuf
 
-      puddletag
+        enblend-enfuse
 
-      wireshark
+        # simple screen recording on wayland
+        wl-screenrec
 
-      darktable
+        # wayland-compatible color picker
-      rawtherapee
+        hyprpicker
-      hugin
 
-      # nufraw
+        blender
-      nufraw-thumbnailer
-      gdk-pixbuf
-      nautilus
 
-      enblend-enfuse
+        ghidra-bin
 
-      savvycan
+        # for mod organizer 2
+        zenity
+        p7zip
 
-      # simple screen recording on wayland
+        # password manager
-      wl-screenrec
+        keepassxc
 
-      gimp3
+        freecad-wayland
-      pinta
 
-      # wayland-compatible color picker
+        localsend
-      hyprpicker
+      ]
-
+      # all the fonts
-      blender
+      (builtins.filter lib.isDerivation (builtins.attrValues nerd-fonts))
-
+    ];
-      ghidra-bin
-
-      # for mod organizer 2
-      zenity
-      p7zip
-
-      # password manager
-      keepassxc
-
-      freecad-wayland
-
-      localsend
-    ]
-    ++ (builtins.filter lib.isDerivation (builtins.attrValues nerd-fonts));
 
   # programs.zed-editor = {
   #   enable = true;

home-manager/no-gui.nix

@@ -123,89 +123,91 @@ in
 
   home.packages =
     with pkgs;
-    [
+    lib.concatLists [
-      # python formatter
+      [
-      ruff
+        # python formatter
+        ruff
 
-      # for website generation
+        # for website generation
-      hugo
+        hugo
-      go
+        go
 
-      # for benchmaking stuff
+        # for benchmaking stuff
-      hyperfine
+        hyperfine
 
-      pfetch-rs
+        pfetch-rs
-      waypipe
+        waypipe
 
-      sshfs
+        sshfs
 
-      # nix formatter
+        # nix formatter
-      nixfmt-rfc-style
+        nixfmt-rfc-style
 
-      # serial viewer
+        # serial viewer
-      minicom
+        minicom
 
-      # "~~matt's~~ my trace route"
+        # "~~matt's~~ my trace route"
-      mtr
+        mtr
 
-      ffmpeg-full
+        ffmpeg-full
 
-      # microcontroller tooling
+        # microcontroller tooling
-      probe-rs
+        probe-rs
 
-      (python312.withPackages (
+        (python312.withPackages (
-        ps: with ps; [
+          ps: with ps; [
-          mypy # type checking
+            mypy # type checking
 
-          python-lsp-server # lsp
+            python-lsp-server # lsp
-          python-lsp-ruff # ruff integration
+            python-lsp-ruff # ruff integration
-          pyserial
+            pyserial
 
-          numpy
+            numpy
-          matplotlib
+            matplotlib
-          notebook
+            notebook
 
-          pandas
+            pandas
-        ]
+          ]
-      ))
+        ))
 
-      binwalk
+        binwalk
 
-      # clang-format and clang-tidy
+        # clang-format and clang-tidy
-      clang-tools
+        clang-tools
-      clang
+        clang
-      gdb
+        gdb
 
-      git-crypt
+        git-crypt
 
-      imagemagick
+        imagemagick
 
-      nixpkgs-review
+        nixpkgs-review
 
-      nmap
+        nmap
 
-      # terminal image viewer
+        # terminal image viewer
-      timg
+        timg
 
-      tcpdump
+        tcpdump
 
-      borgbackup
+        borgbackup
 
-      # used to deploy nix system to server
+        # used to deploy nix system to server
-      # (and in the future, desktop)
+        # (and in the future, desktop)
-      deploy-rs
+        deploy-rs
 
-      # power stuff
+        # power stuff
-      powerstat
+        powerstat
 
-      nodePackages_latest.nodejs
+        nodePackages_latest.nodejs
 
-      yt-dlp
+        yt-dlp
-    ]
+      ]
-    ++ rust_pkgs
+      rust_pkgs
-    ++ lsps
+      lsps
-    ++ java_tools
+      java_tools
-    ++ common_tools;
+      common_tools
+    ];
 
   # https://github.com/flamegraph-rs/flamegraph
   home.file.".cargo/config.toml".text = ''