flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1739051380,
+        "lastModified": 1738188574,
-        "narHash": "sha256-p1QSLO8DJnANY+ppK7fjD8GqfCrEIDjso1CSRHsXL7Y=",
+        "narHash": "sha256-I1gh2Ho565SDmbonmzj7sWbEgTXYyERmMT5KwuuaSDo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "5af1b9a0f193ab6138b89a8e0af8763c21bbf491",
+        "rev": "6aa38ffdf77fb4250f5d832fd5a09eb99226fba7",
         "type": "github"
       },
       "original": {
@@ -28,11 +28,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1739034224,
+        "lastModified": 1738033138,
-        "narHash": "sha256-Mj/8jDzh1KNmUhWqEeVlW3hO9MZkxqioJGnmR7rivaE=",
+        "narHash": "sha256-qlIM8A3bdL9c6PexhpS+QyZLO9y/8a3V75HVyJgDE5Q=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "0b6f96a6b9efcfa8d3cc8023008bcbcd1b9bc1a4",
+        "rev": "349a74c66c596ef97ee97b4d80a3ca61227b6120",
         "type": "github"
       },
       "original": {
@@ -43,11 +43,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1739020877,
+        "lastModified": 1738021509,
-        "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=",
+        "narHash": "sha256-JNUiceGsr7cVBUQxLBF1ILCe99E0qLxsVuet6GsZUuw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547",
+        "rev": "9db269672dbdbb519e0bd3ea24f01506c135e46f",
         "type": "github"
       },
       "original": {

flake.nix

@@ -67,9 +67,6 @@
       extraSpecialArgs.user = "random";
       modules = [
         ./home/headful-nixos.nix
-        ./home/modules/development.nix
-        ./home/modules/gui-apps.nix
-        ./home/modules/hacking.nix
       ];
     };
 
@@ -86,7 +83,6 @@
       extraSpecialArgs.user = "sampledb";
       modules = [
         ./home/headless-nixos.nix
-        ./home/modules/development.nix
       ];
     };
 

home/darwin.nix

@@ -10,8 +10,6 @@
 
   imports = [
     ./shared.nix
-    ./modules/utils.nix
-    ./modules/development.nix
     ./modules/sketchybar.nix
     ./modules/aerospace.nix
     ./modules/neovim.nix

home/headful-nixos.nix

@@ -7,21 +7,56 @@
 
   imports = [
     ./shared.nix
-    ./modules/utils.nix
+    ./modules/hacking.nix
-    ./modules/linux-only-utils.nix
-    ./modules/networking.nix
     ./modules/neovim.nix
     ./modules/emacs.nix
-    ./modules/tmux.nix
+    ./modules/apps.nix
     ./modules/zsh.nix
   ];
 
+  home.packages = with pkgs; [
+    feh
+    ncdu
+    dconf
+    docker
+    barrier
+    firefox
+    flameshot
+    traceroute
+    pavucontrol
+    virt-viewer
+    bitwarden-cli
+    wireguard-tools
+    nextcloud-client
+    protonmail-desktop
+    nvtopPackages.full
+  ];
+
   services.emacs.enable = true;
 
-  home.packages = with pkgs; [
+  dconf = {
-    bitwarden-cli
+    enable = true;
-    wireguard-tools
+    settings = {
+      "org/gnome/desktop/interface" = {
+        color-scheme = "prefer-dark";
+      };
+    };
+  };
+
+  gtk = {
+    enable = true;
+    theme = {
+      name = "Materia-dark";
+      package = pkgs.materia-theme;
+    };
+  };
+
+  programs.obs-studio = {
+    enable = true;
+    plugins = with pkgs.obs-studio-plugins; [
+      obs-backgroundremoval
     ];
+  };
 
   home.file = {
     ".Xresources".source = ../dotfiles/.Xresources;

home/headless-nixos.nix

@@ -7,11 +7,13 @@
 
   imports = [
     ./shared.nix
-    ./modules/utils.nix
-    ./modules/linux-only-utils.nix
-    ./modules/networking.nix
     ./modules/neovim.nix
-    ./modules/tmux.conf
     ./modules/zsh.nix
   ];
+
+  home.packages = with pkgs; [
+    ncdu
+    traceroute
+    nvtopPackages.full
+  ];
 }

home/modules/apps.nix

@@ -0,0 +1,10 @@
+{pkgs, ... }: {
+    home.packages = with pkgs; [
+      vlc
+      typora
+      zoom-us
+      discord
+      libreoffice
+      bitwarden-desktop
+    ];
+}

home/modules/development.nix

@@ -1,10 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [
-    clang
-    clang-tools
-    cargo
-    python3
-    gnumake
-    ansible
-  ];
-}

home/modules/gui-apps.nix

@@ -1,41 +0,0 @@
-{pkgs, ... }: {
-  home.packages = with pkgs; [
-    feh
-    vlc
-    firefox
-    zoom-us
-    discord
-    flameshot
-    libreoffice
-    pavucontrol
-    virt-viewer
-    nextcloud-client
-    protonmail-desktop
-    bitwarden-desktop
-  ];
-
-  programs.obs-studio = {
-    enable = true;
-    plugins = with pkgs.obs-studio-plugins; [
-      obs-backgroundremoval
-    ];
-  };
-
-  dconf = {
-    enable = true;
-    settings = {
-      "org/gnome/desktop/interface" = {
-        color-scheme = "prefer-dark";
-      };
-    };
-  };
-
-  gtk = {
-    enable = true;
-    theme = {
-      name = "Materia-dark";
-      package = pkgs.materia-theme;
-    };
-  };
-
-}

home/modules/linux-only-utils.nix

@@ -1,6 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs [
-    ncdu
-    nvtopPackages.full
-  ];
-}

home/modules/networking.nix

@@ -1,13 +0,0 @@
-
-{ pkgs, ... }: {
-  home.packages = with pkgs; [
-    # Network tools
-    dig
-    iftop
-    iperf
-    tcpdump
-    ethtool
-    traceroute
-  ];
-}
-

home/modules/tmux.nix

@@ -1,9 +0,0 @@
-{ pkgs, lib, config, ... }: let 
-  mypkgs = import ../../packages/all-packages.nix { inherit pkgs lib config };
-in {
-  home.packages = with pkgs [ tmux ]; 
-  home.file = {
-    "tmux/plugins/tpm".source = "${mypkgs.tpm}";
-    ".tmux.conf".source = ../../dotfiles/.tmux.conf;
-  };
-}

home/modules/utils.nix

@@ -1,21 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [
-    # Nix specific utilities
-    manix
-    nix-tree
-
-    # Utilities
-    jq
-    bc
-    file
-    wget
-    curl
-    btop
-    p7zip
-    sshpass
-    ripgrep
-    openvpn
-    pciutils
-    fastfetch
-  ];
-}

home/modules/zsh.nix

@@ -4,11 +4,7 @@
     meslo-lgs-nf
   ];
 
-  programs = {
+  programs.zsh = {
-    zoxide.enable = true;
-    eza.enable = true;
-    fzf.enable = true;
-    zsh = {
     enable = true;
     enableCompletion = true;
     autosuggestion.enable = true;
@@ -82,10 +78,6 @@
         { name = "romkatv/powerlevel10k"; tags = [ as:theme depth:1 ]; }
       ];
     };
-    };
-  };
 
-  home.file = {
-      ".functions.zsh".source = ../../dotfiles/.functions.zsh;
   };
 }

home/shared.nix

@@ -1,10 +1,55 @@
-{ lib, config, pkgs, ... }: {
+{ lib, config, pkgs, ... }:
+let
+  mypkgs = import ../packages/all-packages.nix {
+    inherit pkgs lib config;
+  };
+in {
 
   nixpkgs.config.allowUnfree = true;
   fonts.fontconfig.enable = true;
 
+  home.packages = with pkgs; [
+    # Nix specific utilities
+    manix
+    nix-tree
+
+    # Utilities
+    jq
+    bc
+    file
+    wget
+    curl
+    tmux
+    btop
+    iftop
+    p7zip
+    sshpass
+    ripgrep
+    openvpn
+    pciutils
+    fastfetch
+
+    # Network tools
+    dig
+    iperf
+    tcpdump
+    ethtool
+
+    # Dev tools
+    clang
+    clang-tools
+    cargo
+    python3
+    gnumake
+    ansible
+  ];
+
   programs = {
     home-manager.enable = true;
+    zoxide.enable = true;
+    eza.enable = true;
+    fzf.enable = true;
+
     git = {
       enable = true;
       userName = "Random936";
@@ -12,5 +57,11 @@
     };
   };
 
+  home.file = {
+    ".functions.zsh".source = ../dotfiles/.functions.zsh;
+    ".tmux/plugins/tpm".source = "${mypkgs.tpm}";
+    ".tmux.conf".source = ../dotfiles/.tmux.conf;
+  };
+
   home.stateVersion = "24.05";
 }