iso package test

This reverts commit c6a21aee85.

.sops.yaml

@@ -3,29 +3,7 @@ keys:
   - &laptop age1yqgyp2uxz4lzrc9f9ka0mfjl5fr6ahf8nf24nlmran2wulg6fpvq9hyp9q
   - &android age12pnf36uqesjmy3e0lythfnpwam3zg5mv8m936fc4jphy4ces2fdqwn0s74
 creation_rules:
-  - path_regex: homebox/secrets.yaml$
-    key_groups:
-    - age:
-      - *homebox
-  - path_regex: laptop/secrets.yaml$
-    key_groups:
-    - age:
-      - *laptop
-  - path_regex: pi4/secrets.yaml$
-    key_groups:
-    - age:
-      - *laptop
-  - path_regex: live/secrets.yaml$
-    key_groups:
-    - age:
-      - *laptop
-  - path_regex: nathan/secrets.yaml$
-    key_groups:
-    - age:
-      - *laptop
-      - *homebox
-      - *android
-  - path_regex: system-config/secrets.yaml$
+  - path_regex: system/secrets.yaml$
     key_groups:
     - age:
       - *laptop

flake-parts.nix

@@ -0,0 +1,12 @@
+{ inputs, ... }: {
+
+    imports = [
+        inputs.home-manager.flakeModules.home-manager
+        inputs.disko.flakeModules.default
+    ];
+
+    systems = [
+        "x86_64-linux"
+        "aarch64-linux"
+    ];
+}

flake.nix

@@ -2,21 +2,15 @@
     description = "Nixos config flake";
      
     inputs = {
-        nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
+        nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
 
         nixpkgs-us.url = "github:nixos/nixpkgs/nixos-unstable";
 
         home-manager = {
-            url = "github:nix-community/home-manager/release-25.05";
+            url = "github:nix-community/home-manager/release-25.11";
             inputs.nixpkgs.follows = "nixpkgs";
         };
 
-        nix-on-droid = {
-            url = "github:nix-community/nix-on-droid";
-            inputs.nixpkgs.follows = "nixpkgs";
-            inputs.home-manager.follows = "home-manager";
-        };
-
         disko = {
             url = "github:nix-community/disko";
             inputs.nixpkgs.follows = "nixpkgs";
@@ -27,168 +21,31 @@
             inputs.nixpkgs.follows = "nixpkgs";
         };
 
+        flake-parts.url = "github:hercules-ci/flake-parts";
+
+        import-tree.url = "github:vic/import-tree";
 
         firefox-addons = {
             url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
             inputs.nixpkgs.follows = "nixpkgs";
         };
 
-        nix-minecraft.url = "github:Infinidoge/nix-minecraft";
-
-        #simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05";
-
         hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
 
-        #nixvim.url = "git+https://gitea.blunkall.us/Blunkall-Technologies/Moirai";
-        nixvim.url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/Moirai";
+        nixvim.url = "git+https://gitea.esotericbytes.com/Blunkall-Technologies/Moirai";
+        #nixvim.url = "git+file:///home/nathan/Projects/Moirai";
 
+        aurora.url = "git+https://gitea.esotericbytes.com/Blunkall-Technologies/Aurora";
+        #aurora.url = "git+file:///home/nathan/Projects/Aurora";
     };
 
-    outputs = { self, nixpkgs, home-manager, ... } @ inputs: {
-
-
-        nixosConfigurations = {
-        
-            homebox = nixpkgs.lib.nixosSystem {
-                specialArgs = { 
-                    inputs = inputs // { 
-                        nathan = import ./home-manager/users/nathan;
-                        home-manager-config = import ./home-manager;
-                        inherit self;
-                    }; 
-                };
-                modules = [
-                    ./system-config/configuration/homebox
-                    ./system-config
-                ];
-            };
-
-            laptop = nixpkgs.lib.nixosSystem {
-                specialArgs = { 
-                    inputs = inputs // { 
-                        nathan = import ./home-manager/users/nathan;
-                        home-manager-config = import ./home-manager;
-                        inherit self;
-                    }; 
-                };
-                modules = [
-                    ./system-config/configuration/laptop
-                    ./system-config
-                ];
-            };
-
-            jesstop = nixpkgs.lib.nixosSystem {
-                specialArgs = { 
-                    inputs = inputs // { 
-                    }; 
-                };
-                modules = [
-                    ./system-config/configuration/jesstop
-                    ./system-config
-                ];
-            };
-
-            pi4 = {
-                system = "aarch64-linux";
-                specialArgs = { 
-                    inputs = inputs // { 
-                        nathan = import ./home-manager/users/nathan;
-                        home-manager-config = import ./home-manager;
-                        inherit self;
-                    }; 
-                };
-                modules = [
-                    ./system-config/configuration/pi4
-                    ./system-config
-                ];
-            };
-
-            live = nixpkgs.lib.nixosSystem {
-                specialArgs = { 
-                    inputs = inputs // { 
-                        nathan = import ./home-manager/users/nathan;
-                        home-manager-config = import ./home-manager;
-                        inherit self;
-                    }; 
-                };
-                modules = [
-                    ./system-config/configuration/live
-                    ./system-config
-                ];
-            };
-
-            container = nixpkgs.lib.nixosSystem {
-                specialArgs = { 
-                    inputs = inputs // { 
-                        nathan = import ./home-manager/users/nathan;
-                        home-manager-config = import ./home-manager;
-                        inherit self;
-                    }; 
-                };
-                modules = [
-                    ./system-config/configuration/containers/nathan
-                    ./system-config
-                ];
-            };
-
-            iso = nixpkgs.lib.nixosSystem {
-                system = "x86_64-linux";
-                specialArgs = { 
-                    inputs = inputs // { 
-                        nathan = import ./home-manager/users/nathan;
-                        home-manager-config = import ./home-manager;
-                        inherit self;
-                    }; 
-                };
-                modules = [
-                    ./system-config/configuration/iso
-                    ./system-config
-                ];
-            };
-        };
-
-        nixOnDroidConfigurations.default = inputs.nix-on-droid.lib.nixOnDroidConfiguration {
-            pkgs = import nixpkgs { 
-                system = "aarch64-linux"; 
-                overlays = [ inputs.nix-on-droid.overlays.default ];
-            };
-
-            modules = [
-                ./system-config/configuration/android 
-            ];
-
-            extraSpecialArgs = {
-                inputs = inputs // {
-                    nathan = import ./home-manager/users/nathan;
-                    home-manager-config = import ./home-manager;
-                };
-            };
-        };
-
-
-        homeConfigurations = {
-            nathan = home-manager.lib.homeManagerConfiguration {
-                pkgs = import nixpkgs {
-                    system = builtins.currentSystem;
-                };
-
-                modules = [
-                    ./home-manager
-                    {
-                        homeconfig = {
-                            username = "nathan";
-                            graphical = false;
-                            minimal = false;
-                        };
-                    }
-                ];
-
-                extraSpecialArgs = {
-                    inherit inputs;
-                };
-            };
-        };
-        
-        iso = self.nixosConfigurations.iso.config.system.build.isoImage;
-    };
+    outputs = { ... } @ inputs: 
+    inputs.flake-parts.lib.mkFlake { inherit inputs; }
+    (inputs.import-tree [ 
+        ./profiles 
+        ./homes 
+        ./system 
+        ./templates/default.nix
+        ./flake-parts.nix
+    ]);
 }

home-manager/default.nix

@@ -1,38 +0,0 @@
-{ config, lib, ... }: {
-
-    imports = [
-        ./programs
-        ./services
-    ];
-
-    options.homeconfig = with lib; {
-        host = mkOption {
-            type = with types; nullOr str;
-            default = null;
-        };
-        
-        name = mkOption {
-            type = with types; nullOr str;
-            default = null;
-        };
-        
-        graphical = mkOption {
-            type = with types; bool;
-            default = true;
-        };
-
-        standalone.enable = mkOption {
-            type = with types; bool;
-            default = false;
-        };
-    };
-
-    config = {
-
-        home.username = lib.mkDefault config.homeconfig.name;
-
-        home.homeDirectory = lib.mkDefault "/home/${config.home.username}";
-        
-        programs.home-manager.enable = config.homeconfig.standalone.enable;
-    };
-}

home-manager/programs/calcurse/default.nix

@@ -1,14 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-    options.homeconfig.calcurse.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.homeconfig.calcurse.enable {
-        home.packages = with pkgs; [
-            calcurse
-            libnotify
-        ];
-    };
-}

home-manager/programs/default.nix

@@ -1,24 +0,0 @@
-{ config, lib, pkgs, inputs, ... }: {
-
-    imports = [
-        ./git
-        ./nh
-        ./hyprland
-        ./hyprpanel
-	    ./terminal
-        ./rofi
-        ./pywal
-        ./hyprlock
-        ./calcurse
-        ./firefox
-    ];
-
-    config = lib.mkIf (config.homeconfig.host != "android") {
-
-        home.packages = lib.mkIf (!config.homeconfig.wal.enable) [
-            inputs.nixvim.packages.${pkgs.system}.default
-        ];
-
-        home.sessionVariables.EDITOR = "nvim";
-    };
-}

home-manager/programs/firefox/default.nix

@@ -1,60 +0,0 @@
-{ config, lib, pkgs, inputs, ... }: {
-
-    options.homeconfig.firefox.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.homeconfig.firefox.enable {
-
-        home.sessionVariables.BROWSER = "${config.programs.firefox.package}/bin/firefox";
-
-        home.packages = lib.mkIf config.homeconfig.wal.enable [ 
-            pkgs.pywalfox-native
-        ];
-
-        home.file.".mozilla/native-messaging-hosts/pywalfox.json".text = let
-            pywalfox-wrapper = pkgs.writeShellScriptBin "pywalfox-wrapper" ''
-                ${pkgs.pywalfox-native}/bin/pywalfox start
-            '';
-        in lib.replaceStrings [ "<path>" ] [
-            "${pywalfox-wrapper}/bin/pywalfox-wrapper"
-        ] (lib.readFile "${pkgs.pywalfox-native}/lib/python3.12/site-packages/pywalfox/assets/manifest.json");
-
-
-        programs.firefox = {
-
-            enable = true;
-            package = pkgs.firefox;
-
-            profiles.nathan = {
-                search = {
-                    default = "ddg";
-                    privateDefault = "ddg";
-                    force = true;
-                };
-                bookmarks = {
-                    force = true;
-                    settings = [
-                        {
-                            name = "toolbar";
-                            toolbar = true;
-                            bookmarks = [
-                                {
-                                    name = "NixOS Search - Packages";
-                                    url = "https://search.nixos.org/packages";
-                                }
-                            ];
-                        }
-                    ];
-                };
-
-                extensions.packages = with inputs.firefox-addons.packages.${pkgs.system}; [
-                    ublock-origin
-                    keepassxc-browser
-                    pywalfox
-                ];
-            };
-        };
-    };
-}

home-manager/programs/git/default.nix

@@ -1,44 +0,0 @@
-{ config, lib, ... }: {
-
-    options.homeconfig.git.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.homeconfig.git.enable {
-
-        sops = {
-            secrets = {
-                "git/username" = {};
-                "git/email" = {};
-            };
-
-            templates.gitconfig.content = ''
-                [user]
-                    name = "${config.sops.placeholder."git/username"}"
-                    email = "${config.sops.placeholder."git/email"}"
-            '';
-        };
-        
-        programs.git = {
-            enable = true;
-
-            includes = [
-                { path = "${config.sops.templates.gitconfig.path}"; }
-            ];
-            
-            extraConfig = {
-                init = {
-                    defaultBranch = "master";
-                };
-                url = {
-                    "ssh://gitea@gitea.blunkall.us/" = {
-                        insteadOf = [
-                            "blunkall:"
-                        ];
-                    };
-                };
-            };
-        };
-    };
-}

home-manager/programs/hyprland/default.nix

@@ -1,66 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-    options.homeconfig.hyprland.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.homeconfig.hyprland.enable {
-
-        home.sessionVariables.NIX_OZONE_WL = "1";
-
-        programs.kitty.enable = lib.mkDefault true;
-
-        home.packages = with pkgs; [
-            pyprland
-        ];
-
-        home.activation.extraHyprFile = lib.hm.dag.entryAfter ["writeBoundary"] ''
-            if [[ ! -f ${config.home.homeDirectory}/.config/hypr/otf.conf ]]; then
-                touch ${config.home.homeDirectory}/.config/hypr/otf.conf
-            fi
-
-            if [[ ! -f ${config.home.homeDirectory}/.config/background ]]; then
-                cp ${config.home.homeDirectory}/Pictures/Wallpaper/bluescape.jpg ${config.home.homeDirectory}/.config/background
-                chmod 600 ${config.home.homeDirectory}/.config/background
-            fi
-        '';
-
-
-        wayland.windowManager.hyprland = {
-
-            enable = true;
-
-            systemd = {
-                enable = true;
-                variables = [ "--all" ];
-            };
-
-            extraConfig = (if config.homeconfig.host == "laptop" then ''
-                    bind = CTRL SHIFT, XF86Launch2, exec, bash -c 'if [[ $(hyprctl monitors | grep 0x0 | sed -n -e "s/\t*1920x1080@//" -e "s/.[1234567890]* at 0x0//p") == 300 ]]; then pkexec --user root /nix/var/nix/profiles/system/bin/switch-to-configuration switch; else pkexec --user root /nix/var/nix/profiles/system/specialisation/docked/bin/switch-to-configuration switch; fi'
-                    bind = ALT, Escape, exec, if [[ $(hyprctl monitors | grep 0x0 | sed -n -e "s/\t*1920x1080@//" -e "s/.[1234567890]* at 0x0//p") == 300 ]]; then hyprctl keyword monitor eDP-1,1920x1080@60,0x0,1; else hyprctl keyword monitor eDP-1,1920x1080@300,0x0,1; fi
-                '' else if config.homeconfig.host == "homebox" then ''
-                    monitor=HDMI-A-2,1920x1080@60,0x0,1
-                    monitor=HEADLESS-2,1920x1080@60,0x0,1
-                    exec-once=hyprctl output create headless HEADLESS-2
-                    exec-once=hyprctl keyword monitor HDMI-A-2,disable
-                    exec-once=${pkgs.wayvnc}/bin/wayvnc 0.0.0.0 -o HEADLESS-2
-                '' else if config.homeconfig.host == "container" then ''
-                    monitor=HEADLESS-2,1920x1080@60,0x0,1
-                    exec-once=hyprctl output create headless HEADLESS-2
-                    exec-once=${pkgs.wayvnc}/bin/wayvnc 0.0.0.0 -o HEADLESS-2
-                '' else ''
-                    monitor= , prefered, auto, 1
-                '') + (if config.homeconfig.hyprpanel.enable then ''
-                    bind = , Print, exec, bash -c ${pkgs.hyprpanel}/share/scripts/screenshot.sh"
-                '' else ''
-                    bind = , Print, exec, grim -g "$(slurp)"
-                '') + ''
-                source = ${config.home.homeDirectory}/.config/hypr/main.conf
-
-                exec-shutdown = if [[ -f ${config.home.homeDirectory}/.local/share/calcurse/.calcurse.pid ]]; then rm ${config.home.homeDirectory}/.local/share/calcurse/.calcurse.pid; fi
-            '';
-
-        };
-    };
-}

home-manager/programs/hyprlock/default.nix

@@ -1,52 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-    options.homeconfig.hyprlock.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.homeconfig.hyprlock.enable {
-
-        programs.hyprlock = {
-            enable = true;
-        };
-
-        services.hypridle = {
-            enable = true;
-
-            settings = {
-
-                general = {
-                    lock_cmd = "pidof hyprlock || hyprlock";       # avoid starting multiple hyprlock instances.
-                    before_sleep_cmd = "loginctl lock-session";    # lock before suspend.
-                    after_sleep_cmd = "hyprctl --instance 0 dispatch dpms on";  # to avoid having to press a key twice to turn on the display.
-                };
-
-                listener = [
-
-                {
-                    timeout = 150;                                # 2.5min.
-                    on-timeout = "brightnessctl -s set 10";        # set monitor backlight to minimum, avoid 0 on OLED monitor.
-                    on-resume = "brightnessctl -r";                 # monitor backlight restore.
-                }
-
-                {
-                    timeout = 300;                                 # 5min
-                    on-timeout = "loginctl lock-session";            # lock screen when timeout has passed
-                }
-
-                {
-                    timeout = 330;                                                     # 5.5min
-                    on-timeout = "hyprctl --instance 0 dispatch dpms off";                            # screen off when timeout has passed
-                    on-resume = "hyprctl --instance 0 dispatch dpms on && brightnessctl -r";          # screen on when activity is detected after timeout has fired.
-                }
-
-                {
-                    timeout = 1800;                                # 30min
-                    on-timeout = "systemctl suspend";                # suspend pc
-                }
-                ];
-            };
-        };
-    };
-}

home-manager/programs/hyprpanel/default.nix

@@ -1,14 +0,0 @@
-{ config, lib, ... }: {
-
-    options.homeconfig.hyprpanel.enable = with lib; mkOption {
-        type = with types; bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.homeconfig.hyprpanel.enable {
-        
-        programs.hyprpanel = {
-            enable = true;
-        };
-    };
-}

home-manager/programs/nh/default.nix

@@ -1,21 +0,0 @@
-{ config, lib, ... }: {
-
-    options.homeconfig.nh.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.homeconfig.nh.enable {
-        
-        programs.nh = {
-            enable = true;
-            flake = "${config.home.homeDirectory}/Projects/Olympus";
-
-            clean = {
-                enable = true;
-                dates = "weekly";
-                extraArgs = "--keep 5 --keep-since 5d";
-            };
-        };
-    };
-}

home-manager/programs/pywal/default.nix

@@ -1,19 +0,0 @@
-{ config, lib, pkgs, inputs, ... }: {
-
-    options.homeconfig.wal.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.homeconfig.wal.enable {
-
-        home.packages = with pkgs; [
-            inputs.nixvim.packages.${pkgs.system}.pywal
-
-            pywal16
-		    imagemagick
-        ];
-
-        
-    };
-}

home-manager/programs/rofi/default.nix

@@ -1,20 +0,0 @@
-{ config, lib, pkgs, ... }: {
-    
-    options.homeconfig.rofi.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.homeconfig.rofi.enable {
-        programs.rofi = {
-
-            enable = true;
-            package = pkgs.rofi-wayland;
-
-            cycle = true;
-
-            theme = "/home/nathan/.cache/wal/colors-rofi-dark.rasi";
-        };
-    };
-}
-

home-manager/programs/terminal/bash/default.nix

@@ -1,31 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-    home.packages = with pkgs; [ oh-my-posh ];
-
-    programs.bash = {
-        enable = true;
-        enableCompletion = true;
-
-        shellAliases = {
-            ls = "eza";
-            ll = "ls -l";
-
-            ksh = "kitten ssh";
-
-            vi = "nvim";
-            vim = "nvim";
-
-        };
-
-        bashrcExtra = ''
-            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)"
-        '');
-    };
-}

home-manager/programs/terminal/bat/default.nix

@@ -1,18 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-  programs.bat = {
-
-    enable = true;
-
-    extraPackages = with pkgs.bat-extras; [
-      batman
-      batpipe
-      batgrep
-      batdiff
-      batwatch
-      prettybat
-    ];
-
-
-  };
-}

home-manager/programs/terminal/default.nix

@@ -1,16 +0,0 @@
-{ ... }: {
-
-  imports = [
-    ./bat
-    ./bash
-    ./eza
-    ./fzf
-    ./lf
-    ./tmux
-    ./kitty
-    ./zoxide
-    ./zsh
-    ./ssh
-    ./ohmyposh
-  ];
-}

home-manager/programs/terminal/eza/default.nix

@@ -1,17 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-  programs.eza = {
-
-    enable = true;
-
-    enableZshIntegration = true;
-
-    extraOptions = [
-      "--color=auto"
-    ];
-
-    git = true;
-
-    icons = "auto";
-  };
-}

home-manager/programs/terminal/fzf/default.nix

@@ -1,15 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-  programs.fzf = {
-  
-    enable = true;
-
-    enableZshIntegration = true;
-
-    tmux = {
-      #enableShellIntegration = true;
-
-      #shellIntegrationOptions = [];
-    };
-  };
-}

home-manager/programs/terminal/kitty/default.nix

@@ -1,33 +0,0 @@
-{ config, lib, pkgs, ... }: {
-      
-  programs.kitty = {
-    
-    enable = true;
-
-    font = {
-      name = "FiraCode Nerd Font";
-      size = 12;
-    };
-
-    extraConfig = ''
-
-confirm_os_window_close 0
-
-include ${config.home.homeDirectory}/.cache/wal/colors-kitty.conf
-
-disable_ligatures never
-
-dynamic_background_opacity yes
-
-tab_bar_edge top
-
-map ctrl+shift+t new_tab
-map ctrl+shift+w close_tab
-
-map ctrl+tab next_tab
-map ctrl+shift+tab previous_tab
-
-    '';
-  };
-}
-

home-manager/programs/terminal/lf/default.nix

@@ -1,7 +0,0 @@
-{ ... }: {
-    config = {
-        programs.lf = {
-            enable = true;
-        };
-    };
-}

home-manager/programs/terminal/ohmyposh/default.nix

@@ -1,132 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-  home.packages = with pkgs; [
-    oh-my-posh
-  ];
-  
-  programs.zsh = {
-    
-    initContent = if config.homeconfig.wal.enable then (lib.mkBefore ''
-      cat ${config.home.homeDirectory}/.cache/wal/sequences
-      eval "$(oh-my-posh init zsh --config ${config.home.homeDirectory}/.cache/wal/ohmyposh.toml)"
-    '') else (lib.mkBefore ''
-      eval "$(oh-my-posh init zsh --config ${config.home.homeDirectory}/.config/ohmyposh/ohmyposh.toml)"
-    '');
-
-  };
-
-  home.file.".config/wal/templates/ohmyposh.toml".text = ''
-#:schema https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json
-
-version = 2
-final_space = true
-console_title_template = '{{{{ .Shell }}}} in {{{{ .Folder }}}}'
-
-[[blocks]]
-  type = 'prompt'
-  alignment = 'left'
-  newline = true
-
-  [[blocks.segments]]
-    type = 'os'
-    style = 'diamond'
-    trailing_diamond = ''
-    background = 'p:c1'
-    foreground = 'p:c12'
-    template = ' {{{{ .Icon }}}} '
-
-  [[blocks.segments]]
-    type = 'session'
-    style = 'diamond'
-    trailing_diamond = ''
-    background = 'p:c2'
-    foreground = 'p:c14'
-    template = '{{{{ .UserName }}}}@{{{{ .HostName }}}}'
-
-  [[blocks.segments]]
-    type = 'path'
-    style = 'diamond'
-    trailing_diamond = ''
-    background = 'p:c4'
-    foreground = 'p:c13'
-    template = '{{{{ .Path }}}}'
-
-    [blocks.segments.properties]
-      style = 'full'
-
-[[blocks]]
-  type = 'prompt'
-  overflow = 'hidden'
-  alignment = 'right'
-
-  [[blocks.segments]]
-    type = 'executiontime'
-    style = 'diamond'
-    leading_diamond = ''
-    background = 'p:c4'
-    foreground = 'p:c13'
-    template = '{{{{ .FormattedMs }}}}'
-
-  [[blocks.segments]]
-    type = 'time'
-    style = 'diamond'
-    leading_diamond = ''
-    background = 'p:c2'
-    foreground = 'p:c14'
-
-  [[blocks.segments]]
-    type = 'shell'
-    style = 'diamond'
-    leading_diamond = ''
-    background = 'p:c1'
-    foreground = 'p:c12'
-
-[[blocks]]
-  type = 'prompt'
-  alignment = 'left'
-  newline = true
-
-  [[blocks.segments]]
-    type = 'text'
-    style = 'plain'
-    background = 'transparent'
-    foreground_templates = [
-      "{{{{ if gt .Code 0 }}}}p:c13{{{{end}}}}",
-      "{{{{ if eq .Code 0 }}}}p:c14{{{{end}}}}",
-    ]
-    template = "{{{{ if gt .Code 0 }}}}!❭ {{{{else}}}}❭ {{{{end}}}}"
-
-[transient_prompt] 
-  foreground_templates = [
-    "{{{{ if gt .Code 0 }}}}p:c13{{{{end}}}}",
-    "{{{{ if eq .Code 0 }}}}p:c14{{{{end}}}}",
-  ]
-  background = 'transparent'
-  template = "{{{{ if gt .Code 0 }}}}!❭ {{{{else}}}}❭ {{{{end}}}}"
-
-[secondary_prompt]
-  background = 'transparent'
-  forground = 'p:c14'
-  template = "❭❭ "
-
-
-[palette]
-
-c0 = "{color0}"
-c1 = "{color1}"
-c2 = "{color2}"
-c3 = "{color3}"
-c4 = "{color4}"
-c5 = "{color5}"
-c6 = "{color6}"
-c7 = "{color7}"
-c8 = "{color8}"
-c9 = "{color9}"
-c10 = "{color10}"
-c11 = "{color11}"
-c12 = "{color12}"
-c13 = "{color13}"
-c14 = "{color14}"
-c15 = "{color15}"
-  '';
-}

home-manager/programs/terminal/ssh/default.nix

@@ -1,8 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-  programs.ssh = {
-
-    enable = true;
-
-  };
-}

home-manager/programs/terminal/tmux/default.nix

@@ -1,23 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-  programs.tmux = {
-    
-    enable = true;
-    
-    clock24 = true;
-    
-    mouse = true;
-    
-    baseIndex = 1;
-    
-    keyMode = "vi";
-    
-    prefix = "C-b";
-    
-    shell = "${pkgs.zsh}/bin/zsh";
-  
-  };
-
-}
-
-

home-manager/programs/terminal/zoxide/default.nix

@@ -1,13 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-  programs.zoxide = {
-
-    enable = true;
-
-    enableZshIntegration = true;
-
-    options = [
-      "--cmd cd"
-    ];
-  };
-}

home-manager/programs/terminal/zsh/default.nix

@@ -1,33 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-  programs.zsh = {
-    
-    enable = true;
-    
-    enableCompletion = true;
-    
-    autosuggestion.enable = true;
-    
-    syntaxHighlighting.enable = true;
-    
-    shellAliases = {
-      ls = "eza";
-      ll = "ls -l";
-
-      ksh = "kitten ssh";
-
-      vi = "nvim";
-      vim = "nvim";
-
-      python = "python3.13";
-      python3 = "python3.13";
-    };
-
-    history = {
-      size = 5000;
-      ignoreAllDups = true;
-      ignoreSpace = true;
-      share = true;
-    };
-  };
-}

home-manager/services/custom/default.nix

@@ -1 +0,0 @@
-{}: {}

home-manager/services/default.nix

@@ -1,5 +0,0 @@
-{ ... }: {
-    imports = [
-        ./mpd
-    ];
-}

home-manager/services/mpd/default.nix

@@ -1,41 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-    options = {
-        homeconfig.mpd.enable = lib.options.mkOption {
-            type = lib.types.bool;
-            default = false;
-        };
-    };
-
-    config = lib.mkIf config.homeconfig.mpd.enable {
-        services.mpd = {
-            enable = true;
-            network.startWhenNeeded = true;
-            network.port = 6600;
-            network.listenAddress = "127.0.0.1";
-            musicDirectory = "/home/nathan/Music";
-            extraConfig = ''
-                audio_output {
-                    type "pipewire"
-                    name "Audio1"
-                }
-                audio_output {
-                    type "fifo"
-                    name "visualizer"
-                    path "/tmp/mpd.fifo"
-                    format "44100:16:1"
-                }
-            '';
-        };
-
-        services.mpdris2 = { 
-            enable = true;
-            mpd.host = "127.0.0.1";
-            mpd.port = 6600;
-            package = pkgs.mpdris2;
-            mpd.musicDirectory = "/home/nathan/Music";
-            notifications = true;
-        };
-    };
-
-}

home-manager/users/nathan/default.nix

@@ -1,74 +0,0 @@
-{ config, lib, pkgs, inputs, ... }: {
-
-    imports = [
-#        ./programs
-#        ./services
-        ./packages
-        ./dotfiles
-	];
-
-    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.pointerCursor = lib.mkIf config.homeconfig.graphical {
-            gtk.enable = true;
-            package = pkgs.bibata-cursors;
-            name = "Bibata-Modern-Classic";
-            size = 16;
-        };
-
-        gtk = lib.mkIf config.homeconfig.graphical {
-            enable = true;
-            theme.name = "Tokyonight-Dark";
-            theme.package = pkgs.tokyonight-gtk-theme;
-            iconTheme.package = pkgs.rose-pine-icon-theme;
-            iconTheme.name = "rose-pine-moon";
-        };
-
-        sops = {
-            age.keyFile = "${config.home.homeDirectory}/.config/sops/age/keys.txt";
-            defaultSopsFile = ./secrets.yaml;
-            defaultSopsFormat = "yaml";
-        };
-
-        nix = lib.mkIf config.homeconfig.standalone.enable {
-            nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
-            settings = {
-                experimental-features = [ "nix-command" "flakes" ];
-                builders = "ssh://builder x86_64-linux,aarch64-linux /run/secrets/remoteBuildKey 1 1 nixos-test,benchmark,big-parallel,kvm - -";
-                builders-use-substituters = true;
-            };
-        };
-
-        services.mpris-proxy.enable = true;
-
-        programs.ssh = {
-            enable = true;
-
-            matchBlocks = {
-                "builder" = {
-                    hostname = "blunkall.us";
-                    user = "remote-builder";
-                    identityFile = "${config.home.homeDirectory}/.ssh/id_ed25519";
-                    port = 2222;
-                };
-                
-                "remote" = {
-                    hostname = "blunkall.us";
-                    user = "nathan";
-                    identityFile = "${config.home.homeDirectory}/.ssh/id_ed25519";
-                    port = 2222;
-                };
-            };
-        };
-
-    };
-}

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

@@ -1,11 +0,0 @@
-{ config, lib, ... }: {
-
-	home.file = {
-		".config/hypr" = lib.mkIf config.homeconfig.hyprland.enable { source = ./hypr; recursive = true; };
-		".config/hyprpanel" = lib.mkIf config.homeconfig.hyprpanel.enable { source = ./hyprpanel; recursive = true; };
-		".config/wal/templates" = lib.mkIf config.homeconfig.wal.enable { source = ./wal/templates; recursive = true; };
-		".config/ohmyposh" = { source = ./ohmyposh; recursive = true; };
-		"Pictures/Wallpaper" = lib.mkIf config.homeconfig.graphical { source = ./Wallpaper; recursive = true; };
-	};
-
-}

home-manager/users/nathan/dotfiles/hypr/hyprlock.conf

@@ -1,106 +0,0 @@
-# sample hyprlock.conf
-# for more configuration options, refer https://wiki.hyprland.org/Hypr-Ecosystem/hyprlock
-#
-# rendered text in all widgets supports pango markup (e.g. <b> or <i> tags)
-# ref. https://wiki.hyprland.org/Hypr-Ecosystem/hyprlock/#general-remarks
-#
-# shortcuts to clear password buffer: ESC, Ctrl+U, Ctrl+Backspace
-#
-# you can get started by copying this config to ~/.config/hypr/hyprlock.conf
-#
-
-$font = Monospace
-
-general {
-    hide_cursor = false
-}
-
-# uncomment to enable fingerprint authentication
-# auth {
-#     fingerprint {
-#         enabled = true
-#         ready_message = Scan fingerprint to unlock
-#         present_message = Scanning...
-#         retry_delay = 250 # in milliseconds
-#     }
-# }
-
-animations {
-    enabled = true
-    bezier = linear, 1, 1, 0, 0
-    animation = fadeIn, 1, 5, linear
-    animation = fadeOut, 1, 5, linear
-    animation = inputFieldDots, 1, 2, linear
-}
-
-background {
-    monitor =
-    path = screenshot
-    blur_passes = 3
-}
-
-input-field {
-    monitor =
-    size = 20%, 5%
-    outline_thickness = 3
-    inner_color = rgba(0, 0, 0, 0.0) # no fill
-
-    outer_color = rgba(33ccffee) rgba(00ff99ee) 45deg
-    check_color = rgba(00ff99ee) rgba(ff6633ee) 120deg
-    fail_color = rgba(ff6633ee) rgba(ff0066ee) 40deg
-
-    font_color = rgb(143, 143, 143)
-    fade_on_empty = false
-    rounding = 15
-
-    font_family = $font
-    placeholder_text = Input password...
-    fail_text = $PAMFAIL
-
-    # uncomment to use a letter instead of a dot to indicate the typed password
-    # dots_text_format = *
-    # dots_size = 0.4
-    dots_spacing = 0.3
-
-    # uncomment to use an input indicator that does not show the password length (similar to swaylock's input indicator)
-    # hide_input = true
-
-    position = 0, -20
-    halign = center
-    valign = center
-}
-
-# TIME
-label {
-    monitor =
-    text = $TIME # ref. https://wiki.hyprland.org/Hypr-Ecosystem/hyprlock/#variable-substitution
-    font_size = 90
-    font_family = $font
-
-    position = -30, 0
-    halign = right
-    valign = top
-}
-
-# DATE
-label {
-    monitor =
-    text = cmd[update:60000] date +"%A, %d %B %Y" # update every 60 seconds
-    font_size = 25
-    font_family = $font
-
-    position = -30, -150
-    halign = right
-    valign = top
-}
-
-label {
-    monitor =
-    text = $LAYOUT[en,ru]
-    font_size = 24
-    onclick = hyprctl switchxkblayout all next
-
-    position = 250, -20
-    halign = center
-    valign = center
-}

home-manager/users/nathan/dotfiles/hyprpanel/config.json

@@ -1,65 +0,0 @@
-{
-  "theme.font.name": "FiraCode Nerd Font Mono",
-  "theme.font.label": "FiraCode Nerd Font Mono Medium",
-  "theme.bar.floating": true,
-  "bar.layouts": {
-    "*": {
-      "left": [
-        "dashboard",
-        "workspaces",
-        "windowtitle",
-        "submap",
-        "kbinput"
-      ],
-      "middle": [
-        "volume",
-        "battery",
-        "hyprsunset",
-        "clock",
-        "hypridle",
-        "network",
-        "bluetooth"
-      ],
-      "right": [
-        "ram",
-        "storage",
-        "systray",
-        "cava",
-        "notifications",
-        "power"
-      ]
-    }
-  },
-  "theme.bar.opacity": 50,
-  "wallpaper.image": "/tmp/nathan/bg",
-  "wallpaper.enable": false,
-  "theme.matugen_settings.scheme_type": "content",
-  "theme.matugen_settings.variation": "standard_2",
-  "theme.matugen": true,
-  "bar.launcher.autoDetectIcon": true,
-  "bar.network.truncation_size": 10,
-  "bar.bluetooth.label": false,
-  "bar.clock.showIcon": false,
-  "bar.clock.format": "%A %H:%M:%S %m/%d/%C%y",
-  "bar.notifications.show_total": true,
-  "bar.notifications.hideCountWhenZero": true,
-  "menus.dashboard.shortcuts.left.shortcut2.command": "spotify",
-  "menus.dashboard.shortcuts.left.shortcut1.command": "$BROWSER",
-  "menus.dashboard.shortcuts.left.shortcut1.tooltip": "Browser",
-  "menus.dashboard.shortcuts.left.shortcut1.icon": "󰈹",
-  "menus.dashboard.directories.enabled": false,
-  "menus.dashboard.stats.enable_gpu": true,
-  "menus.power.lowBatteryNotification": true,
-  "bar.customModules.cava.leftClick": "menu:media",
-  "bar.customModules.cava.showIcon": false,
-  "bar.customModules.hypridle.label": false,
-  "bar.customModules.hyprsunset.label": false,
-  "bar.customModules.hyprsunset.temperature": "4000k",
-  "bar.customModules.netstat.dynamicIcon": true,
-  "bar.customModules.netstat.label": true,
-  "bar.workspaces.show_numbered": true,
-  "bar.workspaces.numbered_active_indicator": "highlight",
-  "bar.workspaces.ignored": "-\\d+",
-  "menus.clock.time.military": true,
-  "menus.clock.weather.enabled": false
-}

home-manager/users/nathan/dotfiles/hyprpanel/modules.json

@@ -1 +0,0 @@
-{}

home-manager/users/nathan/dotfiles/wal/templates/colors-hypr.conf

@@ -1,18 +0,0 @@
-$foregroundCol = 0xff{foreground.strip}
-$backgroundCol = 0xff{background.strip}
-$color0 = 0xff{color0.strip}
-$color1 = 0xff{color1.strip}
-$color2 = 0xff{color2.strip}
-$color3 = 0xff{color3.strip}
-$color4 = 0xff{color4.strip}
-$color5 = 0xff{color5.strip}
-$color6 = 0xff{color6.strip}
-$color7 = 0xff{color7.strip}
-$color8 = 0xff{color8.strip}
-$color9 = 0xff{color9.strip}
-$color10 = 0xff{color10.strip}
-$color11 = 0xff{color11.strip}
-$color12 = 0xff{color12.strip}
-$color13 = 0xff{color13.strip}
-$color14 = 0xff{color14.strip}
-$color15 = 0xff{color15.strip}

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

@@ -1,104 +0,0 @@
-{ config, lib, pkgs, inputs, ... }: let 
-    system = "x86_64-linux";
-
-    pkgs-us = import inputs.nixpkgs-us {
-      inherit system;
-      config.allowUnfree = true;
-    };
-
-    in {
-
-    imports = [ 
-	  ./scripts
-	];
-
-    options.homeconfig.minimal = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = {
-
-        nixpkgs.config = lib.mkIf (!config.homeconfig.minimal) {
-            allowUnfree = true;
-        };
-
-        home.packages = with pkgs; ([
-
-            inputs.disko.packages.${pkgs.system}.disko-install 
-
-            kjv
-            openssh
-            sops
-            killall
-            btop
-            zip    
-            unzip
-            rsync
-            curl
-            wget
-            (python313.withPackages (ps: with ps; [
-                gpustat
-                numpy
-                matplotlib
-                scipy
-                pandas
-                pyaudio
-                pyusb
-                debugpy
-                requests
-            ]))
-        ] ++ (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
-            gcc
-            zulu
-            fastfetch
-            ncmpcpp
-            playerctl
-            mpc-cli
-            ffmpeg
-
-        ] else []) ++ (if !config.homeconfig.minimal && config.homeconfig.graphical then [
-            handbrake
-            quickemu
-            bottles
-            
-            brightnessctl
-            libdbusmenu-gtk3
-            lmms
-
-#unfree {
-            geogebra
-            spotify
-            pkgs-us.discord
-#}
-            pkgs-us.rustdesk-flutter
-            pkgs-us.mpv
-            vlc
-            pavucontrol
-            rpi-imager
-            tigervnc
-            keepassxc
-
-#3D modeling/printing
-            blender
-            freecad-wayland
-            cura-appimage
-
-#productivity
-            libreoffice
-
-#games
-            prismlauncher
-        ] else []));
-    };
-}

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

@@ -1,118 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-    options = {
-        homeconfig.scripts.enable = lib.options.mkOption {
-            type = lib.types.bool;
-            default = true;
-        };
-    };
-
-    config = lib.mkIf config.homeconfig.scripts.enable {
-        home.packages = [
-
-            #scripts
-	        (pkgs.writeShellScriptBin "_systemRebuild" ''
-	            ${pkgs.nh}/bin/nh os switch --ask
-	            echo //////Enter to close//////
-	            read
-	        '')
-	        
-
-	        (pkgs.writeShellScriptBin "randWallpaper" ''
-                file=''$(ls ${config.home.homeDirectory}/Pictures/Wallpaper/ | shuf -n 1)
-                setWallpaper ${config.home.homeDirectory}/Pictures/Wallpaper/''$file
-	        '')
-
-	        (pkgs.writeShellScriptBin "setWallpaper" ''
-
-	            if [[ ! -d /tmp/nathan ]]; then
-                    mkdir /tmp/nathan
-                fi
-
-	            img=''$(realpath "''${1:-$(find ~/Pictures/Wallpaper | rofi -dmenu)}")
-                n=''$(basename "''$img")
-	            ext="''${n''\#''\#*.}"
-
-                if [[ ''$ext == "gif" || ''$ext == "mp4" ]]; then
-                    yes | ${pkgs.ffmpeg}/bin/ffmpeg -i "''$img" -vframes 1 /tmp/nathan/tmp.jpg
-                    pidof mpvpaper && pkill mpvpaper
-                    ${pkgs.swww}/bin/swww img /tmp/nathan/tmp.jpg -t wipe
-                    sleep 0.3
-                    hyprctl dispatch exec "${pkgs.mpvpaper}/bin/mpvpaper ALL ''$img -o loop"
-                    hyprctl dispatch exec "${pkgs.swww}/bin/swww img ''$img -t wipe"
-                    ${pkgs.hyprpanel}/bin/hyprpanel sw ~/Pictures/Wallpaper/bluescape.jpg
-                    ${pkgs.hyprpanel}/bin/hyprpanel sw /tmp/nathan/tmp.jpg
-                else
-                    pidof mpvpaper && pkill mpvpaper
-                    hyprctl dispatch exec "${pkgs.swww}/bin/swww img ''$img -t wipe"
-                    ${pkgs.hyprpanel}/bin/hyprpanel sw "''$img"
-                fi
-
-                changeColors "''$img" "''$2"
-	        '')
-
-	        (pkgs.writeShellScriptBin "changeColors" ''
-
-                img=''$(realpath "''$1")
-                alpha=''${2:-70}
-
-                if [[ ''$alpha -lt 0 ]]; then
-                alpha=0
-                elif [[ ''$alpha -gt 100 ]]; then
-                alpha=100
-                fi
-
-                if [[ -f ~/.config/wal/colorschemes/dark/''$(basename "''$img")-''$alpha.json ]]; then
-                    ${pkgs.pywal16}/bin/wal -n -f "''$(basename "''$img")-''$alpha"
-                else
-	                ${pkgs.pywal16}/bin/wal -n -i "''$img" -a "''$alpha" --cols16 -p "''$(basename "''$img")-''$alpha"
-                fi
-
-	            colorPrefix 
-	        '')
-
-            (pkgs.writeShellScriptBin "colorPrefix" ''
-                exec -a "$0" "$@" &
-	            sleep 0.4
-	            ${pkgs.pywalfox-native}/bin/pywalfox update &
-	            pkill -USR1 kitty
-	            pidof cava && pkill -USR1 cava
-                for i in ''$(ls /run/user/1000 | grep nvim); do 
-                    ${pkgs.neovim-remote}/bin/nvr -s --servername /run/user/1000/''$i --remote-send '<cmd>colorscheme pywal<CR>'; 
-                done
-	        '')
-            
-	        (pkgs.writeShellScriptBin "onSystemStart" ''
-
-                if [[ ! -d /tmp/nathan ]]; then
-                    mkdir /tmp/nathan
-                fi
-
-                if [[ -f ${config.home.homeDirectory}/.local/share/calcurse/.calcurse.pid ]]; then
-                    rm ${config.home.homeDirectory}/.local/share/calcurse/.calcurse.pid
-                fi
-
-                hyprctl --batch "\
-                dispatch exec ${pkgs.swww}/bin/swww-daemon ;\
-                dispatch exec setWallpaper ${config.home.homeDirectory}/Pictures/Wallpaper/bluescape.jpg ;\
-	            dispatch exec ${pkgs.pyprland}/bin/pypr ;\
-                dispatch exec ${pkgs.netbird-ui}/bin/netbird-ui ;\
-	            dispatch exec ${pkgs.hyprpolkitagent}/libexec/hyprpolkitagent ;\
-                setcursor Bibata-Modern-Classic 16"
-                sleep 3
-		        hyprctl reload
-                hyprctl dispatch exec ${pkgs.pyprland}/bin/pypr toggle calendar
-                #tmux new-session -s hyprland 
-	        '')
-
-        ] ++ (if config.homeconfig.standalone.enable then [
-
-            (pkgs.writeShellScriptBin "_homeRebuild" ''
-	            ${pkgs.nh}/bin/nh home switch --ask
-	            echo //////Enter to close//////
-	            read
-	        '')
-        ] else []);
-    };
-}
-

home-manager/users/nathan/programs/calcurse/default.nix

@@ -1,14 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-    options.homeconfig.calcurse.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.homeconfig.calcurse.enable {
-        home.packages = with pkgs; [
-            calcurse
-            libnotify
-        ];
-    };
-}

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

@@ -1,24 +0,0 @@
-{ config, lib, pkgs, inputs, ... }: {
-
-    imports = [
-        ./git
-        ./nh
-        ./hyprland
-        ./hyprpanel
-	    ./terminal
-        ./rofi
-        ./pywal
-        ./hyprlock
-        ./calcurse
-        ./firefox
-    ];
-
-    config = lib.mkIf (config.homeconfig.host != "android") {
-
-        home.packages = lib.mkIf (!config.homeconfig.wal.enable) [
-            inputs.nixvim.packages.${pkgs.system}.default
-        ];
-
-        home.sessionVariables.EDITOR = "nvim";
-    };
-}

home-manager/users/nathan/programs/firefox/default.nix

@@ -1,60 +0,0 @@
-{ config, lib, pkgs, inputs, ... }: {
-
-    options.homeconfig.firefox.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.homeconfig.firefox.enable {
-
-        home.sessionVariables.BROWSER = "${config.programs.firefox.package}/bin/firefox";
-
-        home.packages = lib.mkIf config.homeconfig.wal.enable [ 
-            pkgs.pywalfox-native
-        ];
-
-        home.file.".mozilla/native-messaging-hosts/pywalfox.json".text = let
-            pywalfox-wrapper = pkgs.writeShellScriptBin "pywalfox-wrapper" ''
-                ${pkgs.pywalfox-native}/bin/pywalfox start
-            '';
-        in lib.replaceStrings [ "<path>" ] [
-            "${pywalfox-wrapper}/bin/pywalfox-wrapper"
-        ] (lib.readFile "${pkgs.pywalfox-native}/lib/python3.12/site-packages/pywalfox/assets/manifest.json");
-
-
-        programs.firefox = {
-
-            enable = true;
-            package = pkgs.firefox;
-
-            profiles.nathan = {
-                search = {
-                    default = "ddg";
-                    privateDefault = "ddg";
-                    force = true;
-                };
-                bookmarks = {
-                    force = true;
-                    settings = [
-                        {
-                            name = "toolbar";
-                            toolbar = true;
-                            bookmarks = [
-                                {
-                                    name = "NixOS Search - Packages";
-                                    url = "https://search.nixos.org/packages";
-                                }
-                            ];
-                        }
-                    ];
-                };
-
-                extensions.packages = with inputs.firefox-addons.packages.${pkgs.system}; [
-                    ublock-origin
-                    keepassxc-browser
-                    pywalfox
-                ];
-            };
-        };
-    };
-}

home-manager/users/nathan/programs/git/default.nix

@@ -1,44 +0,0 @@
-{ config, lib, ... }: {
-
-    options.homeconfig.git.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.homeconfig.git.enable {
-
-        sops = {
-            secrets = {
-                "git/username" = {};
-                "git/email" = {};
-            };
-
-            templates.gitconfig.content = ''
-                [user]
-                    name = "${config.sops.placeholder."git/username"}"
-                    email = "${config.sops.placeholder."git/email"}"
-            '';
-        };
-        
-        programs.git = {
-            enable = true;
-
-            includes = [
-                { path = "${config.sops.templates.gitconfig.path}"; }
-            ];
-            
-            extraConfig = {
-                init = {
-                    defaultBranch = "master";
-                };
-                url = {
-                    "ssh://gitea@gitea.blunkall.us/" = {
-                        insteadOf = [
-                            "blunkall:"
-                        ];
-                    };
-                };
-            };
-        };
-    };
-}

home-manager/users/nathan/programs/hyprland/default.nix

@@ -1,66 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-    options.homeconfig.hyprland.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.homeconfig.hyprland.enable {
-
-        home.sessionVariables.NIX_OZONE_WL = "1";
-
-        programs.kitty.enable = lib.mkDefault true;
-
-        home.packages = with pkgs; [
-            pyprland
-        ];
-
-        home.activation.extraHyprFile = lib.hm.dag.entryAfter ["writeBoundary"] ''
-            if [[ ! -f ${config.home.homeDirectory}/.config/hypr/otf.conf ]]; then
-                touch ${config.home.homeDirectory}/.config/hypr/otf.conf
-            fi
-
-            if [[ ! -f ${config.home.homeDirectory}/.config/background ]]; then
-                cp ${config.home.homeDirectory}/Pictures/Wallpaper/bluescape.jpg ${config.home.homeDirectory}/.config/background
-                chmod 600 ${config.home.homeDirectory}/.config/background
-            fi
-        '';
-
-
-        wayland.windowManager.hyprland = {
-
-            enable = true;
-
-            systemd = {
-                enable = true;
-                variables = [ "--all" ];
-            };
-
-            extraConfig = (if config.homeconfig.host == "laptop" then ''
-                    monitor=eDP-1,1920x1080@300,0x0,1
-                    bind = CTRL SHIFT, XF86Launch2, exec, if [[ $(hyprctl monitors | grep 0x0 | sed -n -e "s/\t*1920x1080@//" -e "s/.[1234567890]* at 0x0//p") == 300 ]]; then hyprctl keyword monitor eDP-1,1920x1080@60,0x0,1; else hyprctl keyword monitor eDP-1,1920x1080@300,0x0,1; fi
-                '' else if config.homeconfig.host == "homebox" then ''
-                    monitor=HDMI-A-2,1920x1080@60,0x0,1
-                    monitor=HEADLESS-2,1920x1080@60,0x0,1
-                    exec-once=hyprctl output create headless HEADLESS-2
-                    exec-once=hyprctl keyword monitor HDMI-A-2,disable
-                    exec-once=${pkgs.wayvnc}/bin/wayvnc 0.0.0.0 -o HEADLESS-2
-                '' else if config.homeconfig.host == "container" then ''
-                    monitor=HEADLESS-2,1920x1080@60,0x0,1
-                    exec-once=hyprctl output create headless HEADLESS-2
-                    exec-once=${pkgs.wayvnc}/bin/wayvnc 0.0.0.0 -o HEADLESS-2
-                '' else ''
-                    monitor= , prefered, auto, 1
-                '') + (if config.homeconfig.hyprpanel.enable then ''
-                    bind = , Print, exec, bash -c ${pkgs.hyprpanel}/share/scripts/screenshot.sh"
-                '' else ''
-                    bind = , Print, exec, grim -g "$(slurp)"
-                '') + ''
-                source = ${config.home.homeDirectory}/.config/hypr/main.conf
-
-                exec-shutdown = if [[ -f ${config.home.homeDirectory}/.local/share/calcurse/.calcurse.pid ]]; then rm ${config.home.homeDirectory}/.local/share/calcurse/.calcurse.pid; fi
-            '';
-
-        };
-    };
-}

home-manager/users/nathan/programs/hyprlock/default.nix

@@ -1,18 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-    options.homeconfig.hyprlock.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.homeconfig.hyprlock.enable {
-
-        programs.hyprlock = {
-            enable = true;
-        };
-
-        services.hypridle = {
-            enable = true;
-        };
-    };
-}

home-manager/users/nathan/programs/hyprpanel/default.nix

@@ -1,15 +0,0 @@
-{ config, lib, ... }: {
-
-    options.homeconfig.hyprpanel.enable = with lib; mkOption {
-        type = with types; bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.homeconfig.hyprpanel.enable {
-        
-        programs.hyprpanel = {
-            enable = true;
-            systemd.enable = false;
-        };
-    };
-}

home-manager/users/nathan/programs/nh/default.nix

@@ -1,21 +0,0 @@
-{ config, lib, ... }: {
-
-    options.homeconfig.nh.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.homeconfig.nh.enable {
-        
-        programs.nh = {
-            enable = true;
-            flake = "${config.home.homeDirectory}/Projects/Olympus";
-
-            clean = {
-                enable = true;
-                dates = "weekly";
-                extraArgs = "--keep 5 --keep-since 5d";
-            };
-        };
-    };
-}

home-manager/users/nathan/programs/pywal/default.nix

@@ -1,19 +0,0 @@
-{ config, lib, pkgs, inputs, ... }: {
-
-    options.homeconfig.wal.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.homeconfig.wal.enable {
-
-        home.packages = with pkgs; [
-            inputs.nixvim.packages.${pkgs.system}.pywal
-
-            pywal16
-		    imagemagick
-        ];
-
-        
-    };
-}

home-manager/users/nathan/programs/rofi/default.nix

@@ -1,20 +0,0 @@
-{ config, lib, pkgs, ... }: {
-    
-    options.homeconfig.rofi.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.homeconfig.rofi.enable {
-        programs.rofi = {
-
-            enable = true;
-            package = pkgs.rofi-wayland;
-
-            cycle = true;
-
-            theme = "/home/nathan/.cache/wal/colors-rofi-dark.rasi";
-        };
-    };
-}
-

home-manager/users/nathan/programs/terminal/bash/default.nix

@@ -1,31 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-    home.packages = with pkgs; [ oh-my-posh ];
-
-    programs.bash = {
-        enable = true;
-        enableCompletion = true;
-
-        shellAliases = {
-            ls = "eza";
-            ll = "ls -l";
-
-            ksh = "kitten ssh";
-
-            vi = "nvim";
-            vim = "nvim";
-
-        };
-
-        bashrcExtra = ''
-            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)"
-        '');
-    };
-}

home-manager/users/nathan/programs/terminal/bat/default.nix

@@ -1,18 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-  programs.bat = {
-
-    enable = true;
-
-    extraPackages = with pkgs.bat-extras; [
-      batman
-      batpipe
-      batgrep
-      batdiff
-      batwatch
-      prettybat
-    ];
-
-
-  };
-}

home-manager/users/nathan/programs/terminal/default.nix

@@ -1,15 +0,0 @@
-{ ... }: {
-
-  imports = [
-    ./bat
-    ./bash
-    ./eza
-    ./fzf
-    ./tmux
-    ./kitty
-    ./zoxide
-    ./zsh
-    ./ssh
-    ./ohmyposh
-  ];
-}

home-manager/users/nathan/programs/terminal/eza/default.nix

@@ -1,17 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-  programs.eza = {
-
-    enable = true;
-
-    enableZshIntegration = true;
-
-    extraOptions = [
-      "--color=auto"
-    ];
-
-    git = true;
-
-    icons = "auto";
-  };
-}

home-manager/users/nathan/programs/terminal/fzf/default.nix

@@ -1,15 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-  programs.fzf = {
-  
-    enable = true;
-
-    enableZshIntegration = true;
-
-    tmux = {
-      #enableShellIntegration = true;
-
-      #shellIntegrationOptions = [];
-    };
-  };
-}

home-manager/users/nathan/programs/terminal/kitty/default.nix

@@ -1,33 +0,0 @@
-{ config, lib, pkgs, ... }: {
-      
-  programs.kitty = {
-    
-    enable = true;
-
-    font = {
-      name = "FiraCode Nerd Font";
-      size = 12;
-    };
-
-    extraConfig = ''
-
-confirm_os_window_close 0
-
-include ${config.home.homeDirectory}/.cache/wal/colors-kitty.conf
-
-disable_ligatures never
-
-dynamic_background_opacity yes
-
-tab_bar_edge top
-
-map ctrl+shift+t new_tab
-map ctrl+shift+w close_tab
-
-map ctrl+tab next_tab
-map ctrl+shift+tab previous_tab
-
-    '';
-  };
-}
-

home-manager/users/nathan/programs/terminal/ssh/default.nix

@@ -1,8 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-  programs.ssh = {
-
-    enable = true;
-
-  };
-}

home-manager/users/nathan/programs/terminal/tmux/default.nix

@@ -1,23 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-  programs.tmux = {
-    
-    enable = true;
-    
-    clock24 = true;
-    
-    mouse = true;
-    
-    baseIndex = 1;
-    
-    keyMode = "vi";
-    
-    prefix = "C-b";
-    
-    shell = "${pkgs.zsh}/bin/zsh";
-  
-  };
-
-}
-
-

home-manager/users/nathan/programs/terminal/zoxide/default.nix

@@ -1,13 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-  programs.zoxide = {
-
-    enable = true;
-
-    enableZshIntegration = true;
-
-    options = [
-      "--cmd cd"
-    ];
-  };
-}

home-manager/users/nathan/programs/terminal/zsh/default.nix

@@ -1,33 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-  programs.zsh = {
-    
-    enable = true;
-    
-    enableCompletion = true;
-    
-    autosuggestion.enable = true;
-    
-    syntaxHighlighting.enable = true;
-    
-    shellAliases = {
-      ls = "eza";
-      ll = "ls -l";
-
-      ksh = "kitten ssh";
-
-      vi = "nvim";
-      vim = "nvim";
-
-      python = "python3.13";
-      python3 = "python3.13";
-    };
-
-    history = {
-      size = 5000;
-      ignoreAllDups = true;
-      ignoreSpace = true;
-      share = true;
-    };
-  };
-}

home-manager/users/nathan/services/custom/default.nix

@@ -1 +0,0 @@
-{}: {}

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

@@ -1,5 +0,0 @@
-{ ... }: {
-    imports = [
-        ./mpd
-    ];
-}

home-manager/users/nathan/services/mpd/default.nix

@@ -1,41 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-    options = {
-        homeconfig.mpd.enable = lib.options.mkOption {
-            type = lib.types.bool;
-            default = false;
-        };
-    };
-
-    config = lib.mkIf config.homeconfig.mpd.enable {
-        services.mpd = {
-            enable = true;
-            network.startWhenNeeded = true;
-            network.port = 6600;
-            network.listenAddress = "127.0.0.1";
-            musicDirectory = "/home/nathan/Music";
-            extraConfig = ''
-                audio_output {
-                    type "pipewire"
-                    name "Audio1"
-                }
-                audio_output {
-                    type "fifo"
-                    name "visualizer"
-                    path "/tmp/mpd.fifo"
-                    format "44100:16:1"
-                }
-            '';
-        };
-
-        services.mpdris2 = { 
-            enable = true;
-            mpd.host = "127.0.0.1";
-            mpd.port = 6600;
-            package = pkgs.mpdris2;
-            mpd.musicDirectory = "/home/nathan/Music";
-            notifications = true;
-        };
-    };
-
-}

homes/nathan/home-manager/.sops.yaml

@@ -0,0 +1,11 @@
+keys:
+  - &homebox age1640eg0pnmkruc89m5xguz0m8fek44fl4tzez6qwuzlz6kmapqewsp8esxd
+  - &laptop age1yqgyp2uxz4lzrc9f9ka0mfjl5fr6ahf8nf24nlmran2wulg6fpvq9hyp9q
+  - &android age12pnf36uqesjmy3e0lythfnpwam3zg5mv8m936fc4jphy4ces2fdqwn0s74
+creation_rules:
+  - path_regex: ^secrets.yaml$
+    key_groups:
+    - age:
+      - *laptop
+      - *homebox
+      - *android

homes/nathan/home-manager/default.nix

@@ -0,0 +1,113 @@
+{ inputs, ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {
+
+        imports = [
+            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.homeDirectory = lib.mkDefault "/home/${config.home.username}";
+
+            home.stateVersion = "23.11";
+
+            home.pointerCursor = lib.mkIf config.homeconfig.graphical {
+                gtk.enable = true;
+                package = pkgs.bibata-cursors;
+                name = "Bibata-Modern-Classic";
+                size = 16;
+            };
+
+            dconf.settings = lib.mkIf config.homeconfig.virtual-machines {
+                "org/virt-manager/virt-manager/connections" = {
+                    autoconnect = ["qemu:///system"];
+                    uris = ["qemu:///system"];
+                };
+            };
+
+            gtk = lib.mkIf (config.homeconfig.graphical && config.homeconfig.hyprland.enable) {
+                enable = true;
+                theme.name = "Tokyonight-Dark";
+                theme.package = pkgs.tokyonight-gtk-theme;
+                iconTheme.package = pkgs.rose-pine-icon-theme;
+                iconTheme.name = "rose-pine-moon";
+            };
+
+            sops = {
+                age.keyFile = "${config.home.homeDirectory}/.config/sops/age/keys.txt";
+                defaultSopsFile = ./secrets.yaml;
+                defaultSopsFormat = "yaml";
+
+#secrets."remoteBuildKey" = {};
+            };
+
+            services.mpris-proxy.enable = true;
+
+            programs.ssh = {
+                enable = true;
+
+                matchBlocks = {
+                    "builder" = {
+                        hostname = "esotericbytes.com";
+                        user = "remote-builder";
+                        identityFile = "${config.home.homeDirectory}/.ssh/id_ed25519";
+                        port = 22;
+                    };
+
+                    "remote" = {
+                        hostname = "esotericbytes.com";
+                        user = "nathan";
+                        identityFile = "${config.home.homeDirectory}/.ssh/id_ed25519";
+                        port = 22;
+                    };
+                };
+            };
+
+        };
+    };
+}

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

@@ -0,0 +1,13 @@
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, ... }: {
+
+        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/ohmyposh" = { source = ./ohmyposh; recursive = true; };
+            "Pictures/Wallpaper" = lib.mkIf config.homeconfig.graphical { source = ./Wallpaper; recursive = true; };
+        };
+
+    };
+}

homes/nathan/home-manager/dotfiles/hypr/dwindle.conf

@@ -0,0 +1,35 @@
+dwindle {
+	# See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
+        pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
+        preserve_split = yes # you probably want this
+}
+
+bind = $mainMod, F1, submap, dwindle
+
+submap = master
+
+bind = $mainMod, F2, submap, master
+bind = $mainMod, F3, submap, scrolling
+bind = $mainMod, End, submap, reset
+
+bind = $mainMod, down, workspace, r+1
+bind = $mainMod, up, workspace, r-1
+bind = $mainMod, left, layoutmsg, move -col
+bind = $mainMod, right, layoutmsg, move +col
+
+bind = $mainMod SHIFT, down, movetoworkspace, r+1
+bind = $mainMod SHIFT, up, movetoworkspace, r-1
+bind = $mainMod SHIFT, left, layoutmsg, swapcol l
+bind = $mainMod SHIFT, right, layoutmsg, swapcol r
+
+bind = $mainMod, H, layoutmsg, focus l
+bind = $mainMod, J, workspace, e+1
+bind = $mainMod, K, workspace, e-1
+bind = $mainMod, L, layoutmsg, focus r
+
+bind = $mainMod SHIFT, H, layoutmsg, swapcol l
+bind = $mainMod SHIFT, J, movetoworkspace, e+1
+bind = $mainMod SHIFT, K, movetoworkspace, e-1
+bind = $mainMod SHIFT, L, layoutmsg, swapcol r
+
+submap = reset

homes/nathan/home-manager/dotfiles/hypr/main.conf

@@ -10,17 +10,19 @@
 #                                                #
 #------------------------------------------------#
 
-exec-once=onSystemStart
+exec-once = onSystemStart
 
 # Some default env vars.
 env = XCURSOR_SIZE,16
 
+$mainMod = ALT
+
 source = ~/.config/hypr/otf.conf
-source = ~/.cache/wal/colors-hypr.conf
+source = ~/.cache/wal/colors-hyprland.conf
 
 # For all categories, see https://wiki.hyprland.org/Configuring/Variables/
 input {
-	kb_layout = us,jp
+	kb_layout = us
 	kb_variant =
 	kb_model =
 	kb_options =
@@ -48,7 +50,7 @@ general {
         col.active_border = $color1 $color5 100deg
         col.inactive_border = $color0
 
-        layout = master
+        layout = scrolling
 }
 decoration { # See https://wiki.hyprland.org/Configuring/Variables/ for more 
 
@@ -77,26 +79,16 @@ animations {
         animation = border, 1, 10, default
         animation = borderangle, 1, 8, default
         animation = fade, 1, 7, default
-        animation = workspaces, 1, 6, default
+        animation = workspaces, 1, 6, default, slidevert
 }
 
 
+source = ~/.config/hypr/dwindle.conf
 
-dwindle {
-	# See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
-        pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
-        preserve_split = yes # you probably want this
-}
+source = ~/.config/hypr/master.conf
 
-master {
-        # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
-        new_status = "master"
-}
+source = ~/.config/hypr/scroll.conf
 
-gestures {
-        # See https://wiki.hyprland.org/Configuring/Variables/ for more
-        workspace_swipe = off
-}
 
 misc {
         disable_hyprland_logo = false
@@ -110,9 +102,6 @@ ecosystem {
 }
 
 # Binds
-$mainMod = ALT
-
-bind = $mainMod SHIFT, H, exec, colorPrefix kitty -e "hyprctl binds | less"
 
 bind = $mainMod SHIFT, E, exec, colorPrefix kitty
 
@@ -122,14 +111,14 @@ bind = $mainMod SHIFT, B, exec, firefox --private-window
 
 bind = $mainMod, Q, killactive,
 
-bind = $mainMod, R, exec, colorPrefix kitty -e _systemRebuild
+#bind = $mainMod, R, exec, colorPrefix kitty -e _systemRebuild
 
-bind = $mainMod SHIFT, R, exec, colorPrefix kitty -e _homeRebuild
+#bind = $mainMod SHIFT, R, exec, colorPrefix kitty -e _homeRebuild
 
 bind = $mainMod, F, exec, thunar
 bind = $mainMod SHIFT, F, fullscreen
 
-bind = $mainMod SHIFT, semicolon, exec, colorPrefix kitty -e lf
+bind = $mainMod SHIFT, semicolon, exec, colorPrefix kitty -e yazi
 
 bind = $mainMod, Insert, exec, libreoffice
 
@@ -137,9 +126,9 @@ bind = $mainMod, V, togglefloating,
 
 bind = $mainMod SHIFT, V, exec, vlc
 
-bind = , Menu, exec, rofi -show drun
+bind = , Menu, exec, rofi -show drun -show-icons -run-command '{cmd}'
 
-bind = $mainMod, Menu, exec, hyprpanel -q; hyprpanel
+bind = $mainMod, Menu, exec, systemctl restart --user quickshell
 
 #bind = $mainMod, P, pseudo, # dwindle
 #bind = $mainMod, Z, togglesplit, # dwindle
@@ -174,6 +163,8 @@ bind = $mainMod, Return, exec, discord --enable-features=UseOzonePlatform --ozon
 
 bind = $mainMod CTRL, Return, exec, firefox https://discord.com/app
 
+bind = , Home, exec, setWallpaper
+
 # Move focus with mainMod + arrow keys
 bind = $mainMod, W, movefocus, u
 bind = $mainMod, A, movefocus, l
@@ -208,26 +199,25 @@ bind = $mainMod SHIFT, 0, movetoworkspace, 10
 bind = $mainMod SHIFT, Home, movetoworkspace, 11
 
 # Scroll through existing workspaces with mainMod + scroll
-bind = $mainMod, right, workspace, e+1
-bind = $mainMod, left, workspace, e-1
+bind = $mainMod, down, workspace, r+1
+bind = $mainMod, up, workspace, r-1
+bind = $mainMod, left, layoutmsg, move -col
+bind = $mainMod, right, layoutmsg, move +col
 
-bind = $mainMod, H, exec, hyprctl keyword animation workspaces,1,6,default
-bind = $mainMod, H, workspace, e-1
-bind = $mainMod, J, exec, hyprctl keyword animation workspaces,1,6,default,slidevert
+bind = $mainMod SHIFT, down, movetoworkspace, r+1
+bind = $mainMod SHIFT, up, movetoworkspace, r-1
+bind = $mainMod SHIFT, left, layoutmsg, swapcol l
+bind = $mainMod SHIFT, right, layoutmsg, swapcol r
+
+bind = $mainMod, H, layoutmsg, focus l
 bind = $mainMod, J, workspace, e+1
-bind = $mainMod, K, exec, hyprctl keyword animation workspaces,1,6,default,slidevert
 bind = $mainMod, K, workspace, e-1
-bind = $mainMod, L, exec, hyprctl keyword animation workspaces,1,6,default
-bind = $mainMod, L, workspace, e+1
+bind = $mainMod, L, layoutmsg, focus r
 
-bind = $mainMod SHIFT, H, exec, hyprctl keyword animation workspaces,1,6,default
-bind = $mainMod SHIFT, H, movetoworkspace, e-1
-bind = $mainMod SHIFT, J, exec, hyprctl keyword animation workspaces,1,6,default,slidevert
+bind = $mainMod SHIFT, H, layoutmsg, swapcol l
 bind = $mainMod SHIFT, J, movetoworkspace, e+1
-bind = $mainMod SHIFT, K, exec, hyprctl keyword animation workspaces,1,6,default,slidevert
 bind = $mainMod SHIFT, K, movetoworkspace, e-1
-bind = $mainMod SHIFT, L, exec, hyprctl keyword animation workspaces,1,6,default
-bind = $mainMod SHIFT, L, movetoworkspace, e+1
+bind = $mainMod SHIFT, L, layoutmsg, swapcol r
 
 #switch network connections
 bind = CTRL SHIFT, Escape, exec, nmcli device down wlo1
@@ -237,17 +227,21 @@ bind = CTRL SHIFT, 2, exec, nmcli connection up CXNK00813829
 bind = CTRL SHIFT, 3, exec, nmcli connection up ATT9MhT2ql
 
 #brightness keys
-bind = , XF86MonBrightnessUp, exec, brightnessctl set +10%
-bind = , XF86MonBrightnessDown, exec, brightnessctl set 10%-
+binde = SHIFT, XF86MonBrightnessUp, exec, brightnessctl set +2%
+binde = SHIFT, XF86MonBrightnessDown, exec, brightnessctl set 2%-
+binde = , XF86MonBrightnessUp, exec, brightnessctl set +10%
+binde = , XF86MonBrightnessDown, exec, brightnessctl set 10%-
 
 #volume keys
+binde = SHIFT, XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_SINK@ 2%+
+binde = SHIFT, XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_SINK@ 2%-
 binde = , XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_SINK@ 10%+
 binde = , XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_SINK@ 10%-
 bind = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_SINK@ toggle
 bind = $mainMod, F9, exec, pavucontrol
 
 #screen lock key
-bind = $mainMod, F12, exec, swaylock
+#bind = $mainMod, F12, exec, swaylock
 
 #logout shortcut
 bind = CTRL ALT, Delete, exec, loginctl kill-session self
@@ -262,29 +256,9 @@ bind = $mainMod SHIFT, D, movewindow, r
 bindm = $mainMod, mouse:272, movewindow
 bindm = $mainMod SHIFT, mouse:272, resizewindow
 
-$scratchpadsize = size 60% 80%
+source = ~/.config/hypr/pypr.conf
 
-$kitty = class:^(scratchpad-kitty)$
-windowrulev2 = float, $kitty
-windowrulev2 = $scratchpadsize, $kitty
-windowrulev2 = workspace special silent, $kitty
-
-$lf = class:^(scratchpad-lf)$
-windowrulev2 = float, $lf
-windowrulev2 = $scratchpadsize, $lf
-windowrulev2 = workspace special silent, $lf
-
-$cal = class:^(scratchpad-cal)$
-windowrulev2 = float, $cal
-windowrulev2 = $scratchpadsize, $cal
-windowrulev2 = workspace special silent, $cal
-
-bind = $mainMod, semicolon, exec, colorPrefix pypr toggle lf
-bind = $mainMod, E, exec, colorPrefix pypr toggle kitty
-bind = $mainMod, C, exec, colorPrefix pypr toggle calendar
-
-
-bind = CTRL SHIFT, Home, exec, ssh nathan@blunkall.us -fL 5900:localhost:5900 sleep 10; vncviewer localhost:5900 -fullscreen
+bind = CTRL SHIFT, Home, exec, ssh nathan@esotericbytes.com -fL 5900:localhost:5900 sleep 10; vncviewer localhost:5900 -fullscreen
 bind = CTRL SHIFT, Home, submap, clean