reworking

home-manager/users/default.nix

@@ -0,0 +1,26 @@
+{ config, lib, osConfig, ... }: {
+
+    imports = [
+        ./nathan
+    ];
+
+    options.homeconfig = {
+        host = lib.options.mkOption {
+            type = lib.types.nullOr lib.types.str;
+            default = osConfig.sysconfig.host;
+        };
+
+        username = lib.options.mkOption {
+            type = lib.types.nullOr lib.types.str;
+            default = null;
+        };
+        
+        home-manager.enable = lib.options.mkOption {
+            type = lib.types.bool;
+            default = false;
+            description = "Whether this is a standalone home-manager setup";
+        };
+    };
+
+    config = {};
+}

home-manager/users/nathan/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }: {
+{ config, lib, pkgs, inputs, ... }: {
 
     imports = [
         ./programs
@@ -7,34 +7,25 @@
         ./dotfiles
 	];
 
-    options.homeconfig = {
-        host = lib.options.mkOption {
-            type = lib.types.str;
-            default = null;
-        };
-        
-        home-manager.enable = lib.options.mkOption {
-            type = lib.types.bool;
-            default = false;
-        };
-    };
+    config = lib.mkIf (config.homeconfig.username == "nathan") {
 
-    config = {
+        homeconfig = {
+            mpd.enable = lib.mkDefault true;
+            calcurse.enable = lib.mkDefault true;
+            git.enable = lib.mkDefault true;
+            nh.enable = lib.mkDefault true;
+        };
 
         home.stateVersion = "23.11";
 
-        home.username = "nathan";
-
-        home.homeDirectory = "/home/nathan";
-
-        home.pointerCursor = {
+        home.pointerCursor = lib.mkIf config.homeconfig.graphical {
             gtk.enable = true;
             package = pkgs.bibata-cursors;
             name = "Bibata-Modern-Classic";
             size = 16;
         };
 
-        gtk = {
+        gtk = lib.mkIf config.homeconfig.graphical {
             enable = true;
             theme.name = "Tokyonight-Dark";
             theme.package = pkgs.tokyonight-gtk-theme;
@@ -43,16 +34,26 @@
         };
 
         sops = {
-            age.keyFile = "/home/nathan/.config/sops/age/keys.txt";
+            age.keyFile = "${config.home.homeDirectory}/.config/sops/age/keys.txt";
             defaultSopsFile = ./secrets.yaml;
             defaultSopsFormat = "yaml";
         };
 
+        nix = {
+            nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
+            settings = {
+                experimental-features = [ "nix-command" "flakes" ];
+            };
+
+            distributedBuilds = config.sysconfig.remoteBuildClient;
+            buildMachines = lib.mkIf config.sysconfig.remoteBuildClient {};
+
+            trusted-users = lib.mkIf config.sysconfig.remoteBuildHost [ config.users.users."remote-builder".name ];
+        };
+
         services.mpris-proxy.enable = true;
 
         programs.ssh.enable = true;
 
-        programs.home-manager.enable = config.homeconfig.home-manager.enable;
-
     };
 }

home-manager/users/nathan/dotfiles/default.nix

@@ -5,7 +5,7 @@
 		".config/hypr" = { source = ./hypr; recursive = true; };
 		".config/swaylock" = { source = ./swaylock; recursive = true; };
 		".config/wal/templates" = { source = ./wal/templates; recursive = true; };
-		".config/zsh" = { source = ./zsh; recursive = true; };
+		".config/ohmyposh" = { source = ./ohmyposh; recursive = true; };
 		"Pictures/Wallpaper" = { source = ./Wallpaper; recursive = true; };
 	};
 

home-manager/users/nathan/packages/default.nix

@@ -17,96 +17,82 @@
         default = false;
     };
 
-    config = lib.mkMerge [
+    config = {
 
-        {
-            home.packages = with pkgs; [
-                killall
-                btop
-                zip    
-                unzip
-                gcc
-                zulu
-                rsync
-                lxqt.lxqt-policykit
-                blueberry
-                wl-clipboard
-                xfce.thunar
-                grim
-                slurp
-                curl
-                wget
-            ];
-        }
-        
-        (lib.mkIf (!config.homeconfig.minimal) {
+        nixpkgs.config = lib.mkIf (!config.homeconfig.minimal) {
+            allowUnfree = true;
+        };
 
-            nixpkgs.config = {
-                allowUnfree = true;
-            };
+        home.packages = with pkgs; [
+            killall
+            btop
+            zip    
+            unzip
+            gcc
+            zulu
+            rsync
+            curl
+            wget
+        ] ++ (if config.homeconfig.graphical then [
+            grim
+            slurp
+            xfce.thunar
+            wl-clipboard
+            blueberry
+            lxqt.lxqt-policykit
+        ] else []) ++ (if !config.homeconfig.minimal then [
+            cava 
+            android-tools
+            neovim-remote
 
-            home.packages = with pkgs; let
-                pypkgs = ps: with ps; [
-                    numpy
-                    matplotlib
-                    scipy
+            (python312.withPackages (ps: with ps; [
+                numpy
+                matplotlib
+                scipy
+                pandas
+                pyaudio
+                pyusb
+                debugpy
+                requests
+            ]))
 
-                    pandas
-                    pyaudio
-                    pyusb
-                    debugpy
-                    requests
-                ];
+            fastfetch
+            ncmpcpp
+            playerctl
+            mpc-cli
+            ffmpeg
 
-            in [
+        ] else []) ++ (if !config.homeconfig.minimal && config.homeconfig.graphical then [
+            handbrake
+            quickemu
+            bottles
+            
+            brightnessctl
+            libdbusmenu-gtk3
+            lmms
 
-                cava 
-                android-tools
-                neovim-remote
-                handbrake
-                quickemu
-                bottles
+#unfree {
+            geogebra
+            spotify
+            pkgs-us.rustdesk-flutter
+#}
+            pkgs-us.mpv
+            vlc
+            pavucontrol
+            rpi-imager
+            tigervnc
+            keepassxc
 
-                (pkgs.python312.withPackages pypkgs)
+#3D modeling/printing
+            blender
+            freecad-wayland
+            cura-appimage
 
-                brightnessctl
-                libdbusmenu-gtk3
-                lmms
-                #unfree {
-                geogebra
-                spotify
-                pkgs-us.rustdesk-flutter
-                #}
-
-                neofetch
-                pkgs-us.mpv
-                ncmpcpp
-                playerctl
-                mpc-cli
-                vlc
-                pavucontrol
-                yewtube
-                ytmdl
-                ffmpeg
-                rpi-imager
-                tigervnc
-                keepassxc
-                httplz
-
-                #3D modeling/printing
-                blender
-                freecad-wayland
-                cura-appimage
-
-                #productivity
-                libreoffice
-                super-productivity
-
-                #games
-                prismlauncher
-            ];
-
-        })
-    ];
+#productivity
+            libreoffice
 
+#games
+            prismlauncher
+        ] else []);
+    };
 }