restructure

2026-04-22 13:27:21 -05:00
parent 06385f94f6
commit e950b4c162
34 changed files with 112 additions and 253 deletions
--- a/modules/users/nathan/home-manager/default.nix
+++ b/modules/users/nathan/home-manager/default.nix
@@ -6,71 +6,29 @@
            inputs.sops-nix.homeManagerModules.sops
        ];

-        options.homeconfig = with lib; {
-
-            name = mkOption {
-                type = with types; nullOr str;
-                default = null;
-            };
-
-            graphical = mkOption {
-                type = with types; bool;
-                default = true;
-            };
-
-            standalone = mkOption {
-                type = with types; bool;
-                default = false;
-            };
-
-            virtual-machines = mkOption {
-                type = with types; bool;
-                default = false;
-            };
-        };
-
-
        config = {

-            homeconfig = {
-                name = "nathan";
-
-                mpd.enable = lib.mkDefault true;
-                calcurse.enable = lib.mkDefault true;
-                git.enable = lib.mkDefault true;
-                nh.enable = lib.mkDefault true;
-
-                minimal = lib.mkDefault false;
-                hyprland.enable = lib.mkDefault config.homeconfig.graphical;
-                hypridle.enable = lib.mkDefault config.homeconfig.hyprland.enable;
-                wal.enable = lib.mkDefault config.homeconfig.graphical;
-                rofi.enable = lib.mkDefault config.homeconfig.hyprland.enable;
-                firefox.enable = lib.mkDefault config.homeconfig.graphical;
-
-                aurora.enable = lib.mkDefault config.homeconfig.hyprland.enable;
-            };
-
-            home.username = lib.mkDefault config.homeconfig.name;
+            home.username = "nathan";

            home.homeDirectory = lib.mkDefault "/home/${config.home.username}";

            home.stateVersion = "23.11";

-            home.pointerCursor = lib.mkIf config.homeconfig.graphical {
+            home.pointerCursor = {
                gtk.enable = true;
                package = pkgs.bibata-cursors;
                name = "Bibata-Modern-Classic";
                size = 16;
            };

-            dconf.settings = lib.mkIf config.homeconfig.virtual-machines {
+            dconf.settings = {
                "org/virt-manager/virt-manager/connections" = {
                    autoconnect = ["qemu:///system"];
                    uris = ["qemu:///system"];
                };
            };

-            gtk = lib.mkIf (config.homeconfig.graphical && config.homeconfig.hyprland.enable) {
+            gtk = {
                enable = true;
                theme.name = "Tokyonight-Dark";
                theme.package = pkgs.tokyonight-gtk-theme;
@@ -108,7 +66,7 @@
                };
            };

-            home.packages = lib.mkIf (!config.homeconfig.wal.enable) [
+            home.packages = lib.mkIf (!(builtins.any (x: x == pkgs.pywal16) config.home.packages)) [
                inputs.nixvim.packages.${pkgs.stdenv.hostPlatform.system}.default
            ];

--- a/modules/users/nathan/home-manager/dotfiles/default.nix
+++ b/modules/users/nathan/home-manager/dotfiles/default.nix
@@ -1,12 +1,12 @@
 { ... }: {

-    flake.homeModules.nathan = { config, lib, ... }: {
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {

        home.file = {
-            ".config/hypr" = lib.mkIf config.homeconfig.hyprland.enable { source = ./hypr; recursive = true; };
-            ".config/wal/templates" = lib.mkIf config.homeconfig.wal.enable { source = ./wal/templates; recursive = true; };
+            ".config/hypr" = lib.mkIf config.wayland.windowManager.hyprland.enable { source = ./hypr; recursive = true; };
+            ".config/wal/templates" = lib.mkIf (builtins.any (x: x == pkgs.pywal16) config.home.packages) { source = ./wal/templates; recursive = true; };
            ".config/ohmyposh" = { source = ./ohmyposh; recursive = true; };
-            "Pictures/Wallpaper" = lib.mkIf config.homeconfig.graphical { source = ./Wallpaper; recursive = true; };
+            "Pictures/Wallpaper" = lib.mkIf config.wayland.windowManager.hyprland.enable { source = ./Wallpaper; recursive = true; };
        };

    };
--- a/modules/users/nathan/home-manager/features/aurora.nix
+++ b/modules/users/nathan/home-manager/features/aurora.nix
@@ -1,17 +1,12 @@
 { inputs, ... }: {

-    flake.homeModules.nathan = { config, lib, ... }: {
+    flake.homeModules.nathan-aurora = { config, lib, ... }: {

        imports = [
            inputs.aurora.homeModules.default
        ];

-        options.homeconfig.aurora.enable = with lib; mkOption {
-            type = with types; bool;
-            default = false;
-        };
-
-        config = lib.mkIf config.homeconfig.aurora.enable {
+        config = {

            programs.aurora = {
                enable = true;
--- a/modules/users/nathan/home-manager/features/bash.nix
+++ b/modules/users/nathan/home-manager/features/bash.nix
@@ -1,6 +1,6 @@
 { ... }: {

-    flake.homeModules.nathan = { config, lib, pkgs, ... }: {
+    flake.homeModules.nathan-bash = { config, lib, pkgs, ... }: {

        home.packages = with pkgs; [ oh-my-posh ];

@@ -24,12 +24,16 @@
                source ${pkgs.blesh}/share/blesh/ble.sh
            '';

-            initExtra = if config.homeconfig.wal.enable then (lib.mkBefore ''
-                cat ${config.home.homeDirectory}/.cache/wal/sequences
-                eval "$(oh-my-posh init bash --config ${config.home.homeDirectory}/.cache/wal/ohmyposh.toml)"
-            '') else (lib.mkBefore ''
-                eval "$(oh-my-posh init bash --config ${config.home.homeDirectory}/.config/ohmyposh/ohmyposh.toml)"
-            '');
+            initExtra = lib.mkMerge [
+                (lib.mkIf (builtins.any (x: x == pkgs.pywal16) config.home.packages) (lib.mkBefore ''
+                    cat ${config.home.homeDirectory}/.cache/wal/sequences
+                    eval "$(oh-my-posh init bash --config ${config.home.homeDirectory}/.cache/wal/ohmyposh.toml)"
+                ''))
+
+                (lib.mkIf (!(builtins.any (x: x == pkgs.pywal16) config.home.packages)) (lib.mkBefore ''
+                    eval "$(oh-my-posh init bash --config ${config.home.homeDirectory}/.config/ohmyposh/ohmyposh.toml)"
+                ''))
+            ]; 
        };
    };
 }
--- a/modules/users/nathan/home-manager/features/bat.nix
+++ b/modules/users/nathan/home-manager/features/bat.nix
@@ -1,6 +1,6 @@
 { ... }: {

-    flake.homeModules.nathan = { config, lib, pkgs, ... }: {
+    flake.homeModules.nathan-bat = { config, lib, pkgs, ... }: {

        programs.bat = {

--- a/modules/users/nathan/home-manager/features/calcurse.nix
+++ b/modules/users/nathan/home-manager/features/calcurse.nix
@@ -1,13 +1,8 @@
 { ... }: {

-    flake.homeModules.nathan = { config, lib, pkgs, ... }: {
+    flake.homeModules.nathan-calcurse = { config, lib, pkgs, ... }: {

-        options.homeconfig.calcurse.enable = lib.options.mkOption {
-            type = lib.types.bool;
-            default = false;
-        };
-
-        config = lib.mkIf config.homeconfig.calcurse.enable {
+        config = {
            home.packages = with pkgs; [
                calcurse
                    libnotify
--- a/modules/users/nathan/home-manager/features/eza.nix
+++ b/modules/users/nathan/home-manager/features/eza.nix
@@ -1,6 +1,6 @@
 { ... }: {

-    flake.homeModules.nathan = { config, lib, pkgs, ... }: {
+    flake.homeModules.nathan-eza = { config, lib, pkgs, ... }: {

        programs.eza = {

--- a/modules/users/nathan/home-manager/features/firefox.nix
+++ b/modules/users/nathan/home-manager/features/firefox.nix
@@ -1,17 +1,12 @@
 { inputs, ... }: {

-    flake.homeModules.nathan = { config, lib, pkgs, ... }: {
+    flake.homeModules.nathan-firefox = { config, lib, pkgs, ... }: {

-        options.homeconfig.firefox.enable = lib.options.mkOption {
-            type = lib.types.bool;
-            default = false;
-        };
-
-        config = lib.mkIf config.homeconfig.firefox.enable {
+        config = {

            home.sessionVariables.BROWSER = "${config.programs.firefox.package}/bin/firefox";

-            home.packages = lib.mkIf config.homeconfig.wal.enable [ 
+            home.packages = lib.mkIf (builtins.any (x: x == pkgs.pywal16) config.home.packages) [ 
                pkgs.pywalfox-native
            ];

--- a/modules/users/nathan/home-manager/features/fzf.nix
+++ b/modules/users/nathan/home-manager/features/fzf.nix
@@ -1,6 +1,6 @@
 { ... }: {

-    flake.homeModules.nathan = { config, lib, pkgs, ... }: {
+    flake.homeModules.nathan-fzf = { config, lib, pkgs, ... }: {

        programs.fzf = {

--- a/modules/users/nathan/home-manager/features/git.nix
+++ b/modules/users/nathan/home-manager/features/git.nix
@@ -1,13 +1,8 @@
 { ... }: {

-    flake.homeModules.nathan = { config, lib, ... }: {
+    flake.homeModules.nathan-git = { config, lib, ... }: {

-        options.homeconfig.git.enable = lib.options.mkOption {
-            type = lib.types.bool;
-            default = false;
-        };
-
-        config = lib.mkIf config.homeconfig.git.enable {
+        config = {

            sops = {
                secrets = {
--- a/modules/users/nathan/home-manager/features/hypridle.nix
+++ b/modules/users/nathan/home-manager/features/hypridle.nix
@@ -1,13 +1,8 @@
 { ... }: {

-    flake.homeModules.nathan = { config, lib, pkgs, ... }: {
+    flake.homeModules.nathan-hypridle = { config, lib, pkgs, ... }: {

-        options.homeconfig.hypridle.enable = lib.options.mkOption {
-            type = lib.types.bool;
-            default = false;
-        };
-
-        config = lib.mkIf config.homeconfig.hypridle.enable {
+        config = {

            services.hypridle = {
                enable = true;
--- a/modules/users/nathan/home-manager/features/hyprland.nix
+++ b/modules/users/nathan/home-manager/features/hyprland.nix
@@ -1,13 +1,8 @@
 { ... }: {

-    flake.homeModules.nathan = { config, lib, pkgs, ... }: {
+    flake.homeModules.nathan-hyprland = { config, lib, pkgs, ... }: {

-        options.homeconfig.hyprland.enable = lib.options.mkOption {
-            type = lib.types.bool;
-            default = false;
-        };
-
-        config = lib.mkIf config.homeconfig.hyprland.enable {
+        config = {

            home.sessionVariables.NIX_OZONE_WL = "1";

--- a/modules/users/nathan/home-manager/features/kitty.nix
+++ b/modules/users/nathan/home-manager/features/kitty.nix
@@ -1,6 +1,6 @@
 { ... }: {

-    flake.homeModules.nathan = { config, ... }: {
+    flake.homeModules.nathan-kitty = { config, ... }: {

        programs.kitty = {

--- a/modules/users/nathan/home-manager/features/mpd.nix
+++ b/modules/users/nathan/home-manager/features/mpd.nix
@@ -1,15 +1,8 @@
 { ... }: {

-    flake.homeModules.nathan = { config, lib, pkgs, ... }: {
+    flake.homeModules.nathan-mpd = { config, lib, pkgs, ... }: {

-        options = {
-            homeconfig.mpd.enable = lib.options.mkOption {
-                type = lib.types.bool;
-                default = false;
-            };
-        };
-
-        config = lib.mkIf config.homeconfig.mpd.enable {
+        config = {
            services.mpd = {
                enable = true;
                network.startWhenNeeded = true;
--- a/modules/users/nathan/home-manager/features/nh.nix
+++ b/modules/users/nathan/home-manager/features/nh.nix
@@ -1,13 +1,8 @@
 { inputs, ... }: {

-    flake.homeModules.nathan = { config, lib, ... }: {
+    flake.homeModules.nathan-nh = { config, lib, ... }: {

-        options.homeconfig.nh.enable = lib.options.mkOption {
-            type = lib.types.bool;
-            default = false;
-        };
-
-        config = lib.mkIf config.homeconfig.nh.enable {
+        config = {

            programs.nh = {
                enable = true;
--- a/modules/users/nathan/home-manager/features/ohmyposh.nix
+++ b/modules/users/nathan/home-manager/features/ohmyposh.nix
@@ -1,6 +1,6 @@
 { ... }: {

-    flake.homeModules.nathan = { config, lib, pkgs, ... }: {
+    flake.homeModules.nathan-ohmyposh = { config, lib, pkgs, ... }: {

        home.packages = with pkgs; [
            oh-my-posh
@@ -9,7 +9,7 @@
        programs.zsh = {

            initContent = with lib; mkMerge [
-                (mkIf config.homeconfig.wal.enable (mkBefore ''
+                (mkIf (builtins.any (x: x == pkgs.pywal16) config.home.packages) (mkBefore ''
                    cat ${config.home.homeDirectory}/.cache/wal/sequences
                    eval "$(oh-my-posh init zsh --config ${config.home.homeDirectory}/.cache/wal/ohmyposh.toml)"
                    
@@ -21,7 +21,7 @@
                    bindkey '\r' _colorRefresh
                ''))

-                (mkIf (!config.homeconfig.wal.enable) (mkBefore ''
+                (mkIf (!(builtins.any (x: x == pkgs.pywal16) config.home.packages)) (mkBefore ''
                    eval "$(oh-my-posh init zsh --config ${config.home.homeDirectory}/.config/ohmyposh/ohmyposh.toml)"
                ''))
            ];
--- a/modules/users/nathan/home-manager/features/opencode.nix
+++ b/modules/users/nathan/home-manager/features/opencode.nix
@@ -1,13 +1,8 @@
 { ... }: {

-    flake.homeModules.nathan = { config, lib, ... }: {
+    flake.homeModules.nathan-opencode = { config, lib, ... }: {

-        options.homeconfig.opencode.enable = with lib; mkOption {
-            type = with types; bool;
-            default = true;
-        };
-
-        config = lib.mkIf config.homeconfig.opencode.enable {
+        config = {

            programs.opencode = {
                enable = true;
--- a/modules/users/nathan/home-manager/features/packages.nix
+++ b/modules/users/nathan/home-manager/features/packages.nix
@@ -1,19 +1,6 @@
-{ inputs, ... }: {
+{ ... }: {

-    flake.homeModules.nathan = { config, lib, pkgs, ... }: let 
-        system = pkgs.stdenv.hostPlatform;
-
-    pkgs-us = import inputs.nixpkgs-us {
-        inherit system;
-        config.allowUnfree = true;
-    };
-
-    in {
-
-        options.homeconfig.minimal = with lib; options.mkOption {
-            type = with types; bool;
-            default = false;
-        };
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {

        config = with lib; mkMerge [
        {
@@ -41,11 +28,27 @@
                    pyusb
                    requests
                ]))
+                
+                cava 
+                android-tools
+                neovim-remote
+                zulu
+                fastfetch
+                ncmpcpp
+                playerctl
+                mpc
+                ffmpeg
            ];

        }

-        (mkIf config.homeconfig.graphical {
+        (mkIf config.wayland.windowManager.hyprland.enable {
+
+            nixpkgs.config = {
+                allowUnfree = true;
+            };
+
+
         home.packages = with pkgs; [

         grim
@@ -53,30 +56,6 @@
         wl-clipboard
         xfce.thunar
         blueberry
-         ];
-         })
-
-        (mkIf (!config.homeconfig.minimal) {
-         home.packages = with pkgs; [
-         cava 
-         android-tools
-         neovim-remote
-         zulu
-         fastfetch
-         ncmpcpp
-         playerctl
-         mpc
-         ffmpeg
-         ];
-         })
-
-        (mkIf (!config.homeconfig.minimal && config.homeconfig.graphical) {
-
-         nixpkgs.config = {
-         allowUnfree = true;
-         };
-
-         home.packages = with pkgs; [

         handbrake
         quickemu
@@ -111,7 +90,7 @@
 #games
         prismlauncher
         ];
-        })
+         })
        ];
    };
 }
--- a/modules/users/nathan/home-manager/features/pywal.nix
+++ b/modules/users/nathan/home-manager/features/pywal.nix
@@ -1,19 +1,13 @@
 { inputs, ... }: {

-    flake.homeModules.nathan = { config, lib, pkgs, ... }: {
+    flake.homeModules.nathan-pywal = { config, lib, pkgs, ... }: {

-        options.homeconfig.wal.enable = lib.options.mkOption {
-            type = lib.types.bool;
-            default = false;
-        };
-
-        config = lib.mkIf config.homeconfig.wal.enable {
+        config = {

            home.packages = with pkgs; [
                inputs.nixvim.packages.${pkgs.stdenv.hostPlatform.system}.pywal
-
-                    pywal16
-                    imagemagick
+                pywal16
+                imagemagick
            ];


--- a/modules/users/nathan/home-manager/features/ripgrep.nix
+++ b/modules/users/nathan/home-manager/features/ripgrep.nix
@@ -1,6 +1,6 @@
 { ... }: {

-    flake.homeModules.nathan = { ... }: {
+    flake.homeModules.nathan-ripgrep = { ... }: {

        programs.ripgrep = {
            enable = true;
--- a/modules/users/nathan/home-manager/features/rofi.nix
+++ b/modules/users/nathan/home-manager/features/rofi.nix
@@ -1,13 +1,8 @@
 { ... }: {

-    flake.homeModules.nathan = { config, lib, pkgs, ... }: {
+    flake.homeModules.nathan-rofi = { config, lib, pkgs, ... }: {

-        options.homeconfig.rofi.enable = lib.options.mkOption {
-            type = lib.types.bool;
-            default = false;
-        };
-
-        config = lib.mkIf config.homeconfig.rofi.enable {
+        config = {
            programs.rofi = {

                enable = true;
--- a/modules/users/nathan/home-manager/features/scripts.nix
+++ b/modules/users/nathan/home-manager/features/scripts.nix
@@ -1,17 +1,8 @@
 { ... }: {

-    flake.homeModules.nathan = { config, lib, pkgs, ... }: {
+    flake.homeModules.nathan-scripts = { config, lib, pkgs, ... }: {

-        options = {
-            homeconfig.scripts.enable = lib.options.mkOption {
-                type = lib.types.bool;
-                default = true;
-            };
-        };
-
-        config = lib.mkMerge [
-
-        (lib.mkIf config.homeconfig.scripts.enable {
+        config = {
         home.packages = [

 #scripts
@@ -64,8 +55,7 @@
                   '')

                   ];
-        })
-        ];
+        };
    };
 }

--- a/modules/users/nathan/home-manager/features/ssh.nix
+++ b/modules/users/nathan/home-manager/features/ssh.nix
@@ -1,6 +1,6 @@
 { ... }: {

-    flake.homeModules.nathan = { ... }: {
+    flake.homeModules.nathan-ssh = { ... }: {

        programs.ssh = {

--- a/modules/users/nathan/home-manager/features/tmux.nix
+++ b/modules/users/nathan/home-manager/features/tmux.nix
@@ -1,6 +1,6 @@
 { ... }: {

-    flake.homeModules.nathan = { config, lib, pkgs, ... }: {
+    flake.homeModules.nathan-tmux = { config, lib, pkgs, ... }: {

        programs.tmux = {

--- a/modules/users/nathan/home-manager/features/yazi.nix
+++ b/modules/users/nathan/home-manager/features/yazi.nix
@@ -1,6 +1,6 @@
 { ... }: {

-    flake.homeModules.nathan = { ... }: {
+    flake.homeModules.nathan-yazi = { ... }: {
        config = {
            programs.yazi = {
                enable = true;
--- a/modules/users/nathan/home-manager/features/zoxide.nix
+++ b/modules/users/nathan/home-manager/features/zoxide.nix
@@ -1,6 +1,6 @@
 { ... }: {

-    flake.homeModules.nathan = { ... }: {
+    flake.homeModules.nathan-zoxide = { ... }: {

        programs.zoxide = {

--- a/modules/users/nathan/home-manager/features/zsh.nix
+++ b/modules/users/nathan/home-manager/features/zsh.nix
@@ -1,6 +1,6 @@
 { ... }: {

-    flake.homeModules.nathan = { lib, ... }: {
+    flake.homeModules.nathan-zsh = { lib, ... }: {

        programs.zsh = {