Split config up into pieces

clipboard-utils.nix

@@ -0,0 +1,8 @@
+{ config, pkgs, ...}:
+{
+  home.packages = with pkgs; [
+    xsel
+    xclip
+    wl-clipboard
+  ];
+}

communications-gui.nix

@@ -0,0 +1,7 @@
+{ config, pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    discord
+    quasselClient
+  ];
+}

console.nix

@@ -0,0 +1,29 @@
+{ config, pkgs, ... }:
+{
+  # many of these packages come from "mort.io/blog/nu-posix"
+  home.packages = with pkgs; [
+    bat     # better cat
+    htop    # better top, but old
+    bottom  # btm ~ better top, htop, etc
+    broot   # interactive directory navigation
+    chafa   # terminal graphics viewer
+    ctpv    # terminal file previewer
+    cyme    # better `lsusb`
+    delta   # better syntax highlighting diff
+    dfc     # better df
+    dua     # disk usage, interactively
+    eza     # improved `ls`
+    fd      # `find` replacement
+    fend    # better CLI calculator
+    hexyl   # hex pretty printer
+    htop    # graphical top
+    iotop   # io top
+    jujutsu # better git
+    just    # updated gnumake replacement
+    procs   # better ps
+    ripgrep # rg ~ `grep` replacement
+    timg    # display images in the terminal
+    viddy   # better watch
+    uutils-coreutils-noprefix # replaces GNU `coreutils`
+  ];
+}

development.nix

@@ -0,0 +1,7 @@
+{ config, pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    exercism
+    act
+  ];
+}

go.nix

@@ -0,0 +1,6 @@
+{ config, pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    go
+  ];
+}

home.nix

@@ -1,23 +1,45 @@
 { config, pkgs, lib, ... }:
-let inherit (lib) hm;
+let
+  inherit (lib) hm;
+  nixGL = import ./nixGL.nix { inherit pkgs config; };
 in
   {
     imports = [
-      ./vim.nix
-      ./git.nix
-      ./zsh.nix
       ./atuin.nix
-      ./starship.nix
+      ./console.nix
-      ./ssh.nix
+      ./development.nix
-      ./eza.nix
-      ./jq.nix
-      ./tmux.nix
       ./direnv.nix
-      ./syncthing.nix
+      ./eza.nix
       ./fzf.nix
+      ./git.nix
+      ./go.nix
+      ./hare.nix
+      ./javascript.nix
       ./jj.nix
+      ./jq.nix
+      ./nix-utils.nix
+      ./pandoc.nix
+      ./python.nix
+      ./ssh.nix
+      ./starship.nix
+      ./syncthing.nix
+      ./tmux.nix
+      ./vanity.nix
+      ./vim.nix
+      ./web.nix
       ./zellij.nix
-      ./packages.nix
+      ./zsh.nix
+
+      ./privacy-gui.nix
+      ./communications-gui.nix
+    ];
+
+    home.packages = with pkgs; [
+      (nixGL firefox)
+      (nixGL anki)
+      (nixGL digikam)
+      (nixGL zotero)
+      (nixGL decker)
     ];
 
   # Home Manager is pretty good at managing dotfiles. The primary way to manage

javascript.nix

@@ -0,0 +1,7 @@
+{ config, pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    deno
+    nodejs
+  ];
+}

nix-utils.nix

@@ -0,0 +1,7 @@
+{ config, pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    nix-output-monitor
+    npins
+  ];
+}

packages-min.nix

@@ -1,52 +0,0 @@
-{ config, pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    tor-browser
-    htop
-    wget
-    monolith
-    freshfetch
-    neofetch
-    dfc
-    yt-dlp
-    (pkgs.callPackage ./custom/fortune-kind-custom.nix {})
-    timg
-    graphviz
-    nix-output-monitor
-    npins
-    uv
-    exercism
-    pandoc
-    act
-    go
-    xsel
-    xclip
-    wl-clipboard
-    neocities
-    deno
-    decker
-
-    # from "mort.io/blog/nu-posix"
-    bat # better cat
-    bottom # btm ~ better top, htop, etc
-    broot # interactive directory navigation
-    chafa # terminal graphics viewer
-    ctpv # terminal file previewer
-    cyme # better `lsusb`
-    delta # better syntax highlighting diff
-    dua # disk usage, interactively
-    eza # improved `ls`
-    fd # `find` replacement
-    fend # better CLI calculator
-    hexyl # hex pretty printer
-    htop # graphical top
-    iotop # io top
-    jujutsu # better git
-    just # updated gnumake replacement
-    procs # better ps
-    ripgrep # rg ~ `grep` replacement
-    uutils-coreutils-noprefix # replaces GNU `coreutils`
-    viddy # better watch
-
-  ];
-}

packages.nix

@@ -1,49 +0,0 @@
-{ config, pkgs, ... }:
-let 
-  nixGL = import ./nixGL.nix { inherit pkgs config; };
-  nixos_23_11 = builtins.fetchTarball {
-    name = "nixos-23.11-2024-03-29";
-    url = "https://github.com/nixos/nixpkgs/archive/219951b495fc2eac67b1456824cc1ec1fd2ee659.tar.gz";
-    sha256 = "065jy7qivlbdqmbvd7r9h97b23f21axmc4r7sqmq2h0j82rmymxv";
-  };
-  stable = (import nixos_23_11) {
-    config.allowUnfree = true;
-    config.permittedInsecurePackages = [
-      "electron-25.9.0"
-    ];
-  };
-in
-{
-  home.packages = with pkgs; [
-    mullvad-vpn
-    tor-browser
-    opensnitch-ui
-    htop
-    ollama
-    wget
-    (nixGL firefox)
-    ripgrep
-    bat
-    monolith
-    fd
-    quasselClient
-    discord
-    freshfetch
-    neofetch
-    dfc
-    (nixGL anki)
-    (nixGL digikam)
-    deno
-    stable.nodejs_21
-    yt-dlp
-    (pkgs.callPackage ./custom/fortune-kind-custom.nix {})
-    fend
-    timg
-    graphviz
-    (nixGL zotero)
-    nix-output-monitor
-    npins
-    odin
-    decker
-  ];
-}

pandoc.nix

@@ -0,0 +1,6 @@
+{ config, pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    pandoc
+  ];
+}

privacy-gui.nix

@@ -0,0 +1,7 @@
+{ config, pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    mullvad-vpn
+    tor-browser
+  ];
+}

python.nix

@@ -0,0 +1,6 @@
+{ config, pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    uv
+  ];
+}

timberhearth.nix

@@ -3,22 +3,31 @@ let inherit (lib) hm;
 in
   {
     imports = [
-      ./vim.nix
-      ./git.nix
-      ./zsh.nix
       ./atuin.nix
-      ./starship.nix
+      ./console.nix
-      ./ssh.nix
+      ./development.nix
-      ./eza.nix
-      ./jq.nix
       ./direnv.nix
-      ./syncthing.nix
+      ./eza.nix
       ./fzf.nix
-      ./zellij.nix
+      ./git.nix
-      ./jj.nix
+      ./go.nix
       ./hare.nix
+      ./javascript.nix
+      ./jj.nix
+      ./jq.nix
+      ./nix-utils.nix
       ./ollama.nix
-      ./packages-min.nix
+      ./pandoc.nix
+      ./python.nix
+      ./ssh.nix
+      ./starship.nix
+      ./syncthing.nix
+      ./tmux.nix
+      ./vanity.nix
+      ./vim.nix
+      ./web.nix
+      ./zellij.nix
+      ./zsh.nix
     ];
 
   # Home Manager is pretty good at managing dotfiles. The primary way to manage

vanity.nix

@@ -0,0 +1,7 @@
+{ config, pkgs, ...}:
+{
+  home.packages = with pkgs; [
+    freshfetch
+    neofetch
+  ];
+}

web.nix

@@ -0,0 +1,10 @@
+{ config, pkgs, ...}:
+{
+  home.packages = with pkgs; [
+    curl
+    wget
+    monolith
+    yt-dlp
+    neocities
+  ];
+}

zellij.nix

@@ -1,5 +1,9 @@
 { config, pkgs, ... }:
 {
+  imports = [
+    ./clipboard-utils.nix
+  ];
+
   home.sessionVariables = {
     ZELLIJ_AUTO_EXIT = "false";
   };

zsh.nix

@@ -12,4 +12,8 @@
     enableVteIntegration = true;
     initContent = (builtins.readFile ./rcfiles/zshrc);
   };
+
+  home.packages = [
+    (pkgs.callPackage ./custom/fortune-kind-custom.nix {})
+  ];
 }