openrgb

.sops.yaml

@@ -1,6 +1,7 @@
 keys:
   - &homebox age1640eg0pnmkruc89m5xguz0m8fek44fl4tzez6qwuzlz6kmapqewsp8esxd
   - &laptop age1yqgyp2uxz4lzrc9f9ka0mfjl5fr6ahf8nf24nlmran2wulg6fpvq9hyp9q
+  - &android age12pnf36uqesjmy3e0lythfnpwam3zg5mv8m936fc4jphy4ces2fdqwn0s74
 creation_rules:
   - path_regex: homebox/secrets.yaml$
     key_groups:
@@ -10,13 +11,23 @@ creation_rules:
     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$
     key_groups:
     - age:
       - *laptop
       - *homebox
+      - *android

flake.lock

@@ -20,11 +20,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1755632680,
-        "narHash": "sha256-EjaD8+d7AiAV2fGRN4NTMboWDwk8szDfwbzZ8DL1PhQ=",
+        "lastModified": 1755946532,
+        "narHash": "sha256-POePremlUY5GyA1zfbtic6XLxDaQcqHN6l+bIxdT5gc=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "50637ed23e962f0db294d6b0ef534f37b144644b",
+        "rev": "81584dae2df6ac79f6b6dae0ecb7705e95129ada",
         "type": "github"
       },
       "original": {
@@ -40,11 +40,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1756115622,
-        "narHash": "sha256-iv8xVtmLMNLWFcDM/HcAPLRGONyTRpzL9NS09RnryRM=",
+        "lastModified": 1757255839,
+        "narHash": "sha256-XH33B1X888Xc/xEXhF1RPq/kzKElM0D5C9N6YdvOvIc=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "bafad29f89e83b2d861b493aa23034ea16595560",
+        "rev": "c8a0e78d86b12ea67be6ed0f7cae7f9bfabae75a",
         "type": "github"
       },
       "original": {
@@ -61,11 +61,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1756094605,
-        "narHash": "sha256-EVEL1nB9n3G5ysABWR1MYB0JX92grZ0eGUU57qIytew=",
+        "lastModified": 1757304222,
+        "narHash": "sha256-s070stByAXxeCLgftTXxFxZ2ynJhghne4Y6cTuqGAaw=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "b4df8d436285dda8d83386d1df3f82be5c1a7180",
+        "rev": "fa312c0175ffb82bc67da095439b9cb683ac52bd",
         "type": "gitlab"
       },
       "original": {
@@ -212,11 +212,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1755928099,
-        "narHash": "sha256-OILVkfhRCm8u18IZ2DKR8gz8CVZM2ZcJmQBXmjFLIfk=",
+        "lastModified": 1756679287,
+        "narHash": "sha256-Xd1vOeY9ccDf5VtVK12yM0FS6qqvfUop8UQlxEB+gTQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "4a44fb9f7555da362af9d499817084f4288a957f",
+        "rev": "07fc025fe10487dd80f2ec694f1cd790e752d0e8",
         "type": "github"
       },
       "original": {
@@ -226,48 +226,6 @@
         "type": "github"
       }
     },
-    "home-manager-droid": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs-droid"
-        ]
-      },
-      "locked": {
-        "lastModified": 1726989464,
-        "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "release-24.05",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "home-manager-us": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs-us"
-        ]
-      },
-      "locked": {
-        "lastModified": 1756022458,
-        "narHash": "sha256-J1i35r4HfNDdPpwL0vOBaZopQudAUVtartEerc1Jryc=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "9e3a33c0bcbc25619e540b9dfea372282f8a9740",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "master",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
     "hyprcursor": {
       "inputs": {
         "hyprlang": [
@@ -313,11 +271,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1754305013,
-        "narHash": "sha256-u+M2f0Xf1lVHzIPQ7DsNCDkM1NYxykOSsRr4t3TbSM4=",
+        "lastModified": 1756891319,
+        "narHash": "sha256-/e6OXxzbAj/o97Z1dZgHre4bNaVjapDGscAujSCQSbI=",
         "owner": "hyprwm",
         "repo": "hyprgraphics",
-        "rev": "4c1d63a0f22135db123fc789f174b89544c6ec2d",
+        "rev": "621e2e00f1736aa18c68f7dfbf2b9cff94b8cc4d",
         "type": "github"
       },
       "original": {
@@ -342,11 +300,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1756069181,
-        "narHash": "sha256-FPur4yuDwzM9uHhPFJW6KD3Xys5fz0xmRmZqFfWQD3Y=",
+        "lastModified": 1757322502,
+        "narHash": "sha256-/91c40cXye2No6YQZcoXaMcIDqGkdE0hmRPC4SSTlRU=",
         "ref": "refs/heads/main",
-        "rev": "0ed880f3f7dc2c746bf3590eee266c010d737558",
-        "revCount": 6393,
+        "rev": "b619f39555b96c70330f4a933dedde7e897e0d81",
+        "revCount": 6413,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland"
@@ -466,11 +424,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1753622892,
-        "narHash": "sha256-0K+A+gmOI8IklSg5It1nyRNv0kCNL51duwnhUO/B8JA=",
+        "lastModified": 1756810301,
+        "narHash": "sha256-wgZ3VW4VVtjK5dr0EiK9zKdJ/SOqGIBXVG85C3LVxQA=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "23f0debd2003f17bd65f851cd3f930cff8a8c809",
+        "rev": "3d63fb4a42c819f198deabd18c0c2c1ded1de931",
         "type": "github"
       },
       "original": {
@@ -491,11 +449,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1755416120,
-        "narHash": "sha256-PosTxeL39YrLvCX5MqqPA6NNWQ4T5ea5K55nmN7ju9Q=",
+        "lastModified": 1756117388,
+        "narHash": "sha256-oRDel6pNl/T2tI+nc/USU9ZP9w08dxtl7hiZxa0C/Wc=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "e631ea36ddba721eceda69bfee6dd01068416489",
+        "rev": "b2ae3204845f5f2f79b4703b441252d8ad2ecfd0",
         "type": "github"
       },
       "original": {
@@ -565,7 +523,10 @@
           "nix-on-droid",
           "nixpkgs"
         ],
-        "nmd": "nmd",
+        "nmd": [
+          "nix-on-droid",
+          "nmd"
+        ],
         "nmt": "nmt"
       },
       "locked": {
@@ -589,11 +550,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1756001439,
-        "narHash": "sha256-IdIgQP6nfHgzn+pRSzm+mHiU0mwbQvOmusv+LrpSBrk=",
+        "lastModified": 1757296734,
+        "narHash": "sha256-NRkbte52DMPcDbWEM823CJSApImXLIzRmWCKMMhYVbA=",
         "owner": "Infinidoge",
         "repo": "nix-minecraft",
-        "rev": "3a015545c12704bdeca89f3e77cacc68acd3ddb1",
+        "rev": "e2915ee5edd4da1fa076ba155f1d539be78340fb",
         "type": "github"
       },
       "original": {
@@ -605,38 +566,37 @@
     "nix-on-droid": {
       "inputs": {
         "home-manager": [
-          "home-manager-droid"
+          "home-manager"
         ],
         "nix-formatter-pack": "nix-formatter-pack",
         "nixpkgs": [
-          "nixpkgs-droid"
+          "nixpkgs"
         ],
         "nixpkgs-docs": "nixpkgs-docs",
         "nixpkgs-for-bootstrap": "nixpkgs-for-bootstrap",
-        "nmd": "nmd_2"
+        "nmd": "nmd"
       },
       "locked": {
-        "lastModified": 1720396533,
-        "narHash": "sha256-UFzk/hZWO1VkciIO5UPaSpJN8s765wsngUSvtJM6d5Q=",
+        "lastModified": 1753100895,
+        "narHash": "sha256-nEuGlpIT7q4c/otPu00pGhb5Y12FtQm00pH3MXOJpfw=",
         "owner": "nix-community",
         "repo": "nix-on-droid",
-        "rev": "f3d3b8294039f2f9a8fb7ea82c320f29c6b0fe25",
+        "rev": "27696cac81d4444319bb9158037b0da45e213f5e",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-24.05",
         "repo": "nix-on-droid",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1755186698,
-        "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=",
+        "lastModified": 1757068644,
+        "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c",
+        "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9",
         "type": "github"
       },
       "original": {
@@ -662,22 +622,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-droid": {
-      "locked": {
-        "lastModified": 1735563628,
-        "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-24.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs-for-bootstrap": {
       "locked": {
         "lastModified": 1720244366,
@@ -711,11 +655,11 @@
     },
     "nixpkgs-us": {
       "locked": {
-        "lastModified": 1755615617,
-        "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=",
+        "lastModified": 1762363567,
+        "narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "20075955deac2583bb12f07151c2df830ef346b4",
+        "rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4",
         "type": "github"
       },
       "original": {
@@ -743,11 +687,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1755922037,
-        "narHash": "sha256-wY1+2JPH0ZZC4BQefoZw/k+3+DowFyfOxv17CN/idKs=",
+        "lastModified": 1757244434,
+        "narHash": "sha256-AeqTqY0Y95K1Fgs6wuT1LafBNcmKxcOkWnm4alD9pqM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b1b3291469652d5a2edb0becc4ef0246fff97a7c",
+        "rev": "092c565d333be1e17b4779ac22104338941d913f",
         "type": "github"
       },
       "original": {
@@ -796,17 +740,17 @@
         "nixvim": "nixvim_2"
       },
       "locked": {
-        "lastModified": 1755754251,
-        "narHash": "sha256-objBSkdkrn6BpQ1mH1tkvXmipfJ+mONHuydefPhdNSs=",
+        "lastModified": 1760575893,
+        "narHash": "sha256-u6eyhxtlxgG29uI2VCSt5Ir6/BW9hkhglCTfbJ14Hgg=",
         "ref": "refs/heads/master",
-        "rev": "3ba1175ea9cdff79caf368460919af740480fe26",
-        "revCount": 33,
+        "rev": "bcc5185ef433a77b18f5aa585ee79d97f9a8e69c",
+        "revCount": 36,
         "type": "git",
-        "url": "ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/Moirai"
+        "url": "ssh://gitea@gitea.esotericbytes.com/Blunkall-Technologies/Moirai"
       },
       "original": {
         "type": "git",
-        "url": "ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/Moirai"
+        "url": "ssh://gitea@gitea.esotericbytes.com/Blunkall-Technologies/Moirai"
       }
     },
     "nixvim_2": {
@@ -831,22 +775,6 @@
       }
     },
     "nmd": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1666190571,
-        "narHash": "sha256-Z1hc7M9X6L+H83o9vOprijpzhTfOBjd0KmUTnpHAVjA=",
-        "owner": "rycee",
-        "repo": "nmd",
-        "rev": "b75d312b4f33bd3294cd8ae5c2ca8c6da2afc169",
-        "type": "gitlab"
-      },
-      "original": {
-        "owner": "rycee",
-        "repo": "nmd",
-        "type": "gitlab"
-      }
-    },
-    "nmd_2": {
       "inputs": {
         "nixpkgs": [
           "nix-on-droid",
@@ -918,11 +846,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1755446520,
-        "narHash": "sha256-I0Ok1OGDwc1jPd8cs2VvAYZsHriUVFGIUqW+7uSsOUM=",
+        "lastModified": 1757239681,
+        "narHash": "sha256-E9spYi9lxm2f1zWQLQ7xQt8Xs2nWgr1T4QM7ZjLFphM=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "4b04db83821b819bbbe32ed0a025b31e7971f22e",
+        "rev": "ab82ab08d6bf74085bd328de2a8722c12d97bd9d",
         "type": "github"
       },
       "original": {
@@ -936,17 +864,13 @@
         "disko": "disko",
         "firefox-addons": "firefox-addons",
         "home-manager": "home-manager",
-        "home-manager-droid": "home-manager-droid",
-        "home-manager-us": "home-manager-us",
         "hyprland": "hyprland",
         "nix-minecraft": "nix-minecraft",
         "nix-on-droid": "nix-on-droid",
         "nixpkgs": "nixpkgs_3",
-        "nixpkgs-droid": "nixpkgs-droid",
         "nixpkgs-us": "nixpkgs-us",
         "nixvim": "nixvim",
-        "sops-nix": "sops-nix",
-        "themecord": "themecord"
+        "sops-nix": "sops-nix"
       }
     },
     "scss-reset": {
@@ -1045,26 +969,6 @@
         "type": "github"
       }
     },
-    "themecord": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1743970059,
-        "narHash": "sha256-vwrIULP9VmYqhNtHcNaPat6OjKqbDgwf3qSypOusG9c=",
-        "owner": "danihek",
-        "repo": "themecord",
-        "rev": "2117717f830c4847eafc450319de26ae09ac9277",
-        "type": "github"
-      },
-      "original": {
-        "owner": "danihek",
-        "repo": "themecord",
-        "type": "github"
-      }
-    },
     "xdph": {
       "inputs": {
         "hyprland-protocols": [

flake.nix

@@ -3,35 +3,18 @@
      
     inputs = {
         nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
-        #nixpkgs.url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/nixpkgs?ref=nixos-24.11";
 
         nixpkgs-us.url = "github:nixos/nixpkgs/nixos-unstable";
-        #nixpkgs-us.url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/nixpkgs?ref=nixos-unstable";
 
         home-manager = {
             url = "github:nix-community/home-manager/release-25.05";
-            #url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/home-manager?ref=release-24.11";
             inputs.nixpkgs.follows = "nixpkgs";
         };
 
-        home-manager-us = {
-            url = "github:nix-community/home-manager/master";
-            #url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/home-manager?ref=release-24.11";
-            inputs.nixpkgs.follows = "nixpkgs-us";
-        };
-
-        nixpkgs-droid.url = "github:nixos/nixpkgs/nixos-24.05";
-        
-        home-manager-droid = {
-            url = "github:nix-community/home-manager/release-24.05";
-            #url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/home-manager?ref=release-24.05";
-            inputs.nixpkgs.follows = "nixpkgs-droid";
-        };
-
         nix-on-droid = {
-            url = "github:nix-community/nix-on-droid/release-24.05";
-            inputs.nixpkgs.follows = "nixpkgs-droid";
-            inputs.home-manager.follows = "home-manager-droid";
+            url = "github:nix-community/nix-on-droid";
+            inputs.nixpkgs.follows = "nixpkgs";
+            inputs.home-manager.follows = "home-manager";
         };
 
         disko = {
@@ -55,20 +38,15 @@
         #simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05";
 
         hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
-        #hyprland.url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/hyprland?submodules=1";
 
-        nixvim.url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/Moirai";
-        #nixvim.url = "git+https://gitea.blunkall.us/Blunkall-Technologies/Moirai";
-
-        themecord = {
-            url = "github:danihek/themecord";
-            inputs.nixpkgs.follows = "nixpkgs";
-        };
+        #nixvim.url = "git+https://gitea.esotericbytes.com/Blunkall-Technologies/Moirai";
+        nixvim.url = "git+ssh://gitea@gitea.esotericbytes.com/Blunkall-Technologies/Moirai";
 
     };
 
     outputs = { self, nixpkgs, home-manager, ... } @ inputs: {
 
+
         nixosConfigurations = {
         
             homebox = nixpkgs.lib.nixosSystem {
@@ -114,7 +92,9 @@
                 system = "aarch64-linux";
                 specialArgs = { 
                     inputs = inputs // { 
-                        nathan-home-manager = import ./home-manager/nathan;
+                        nathan = import ./home-manager/users/nathan;
+                        home-manager-config = import ./home-manager;
+                        inherit self;
                     }; 
                 };
                 modules = [
@@ -126,7 +106,9 @@
             live = nixpkgs.lib.nixosSystem {
                 specialArgs = { 
                     inputs = inputs // { 
-                        nathan-home-manager = import ./home-manager/nathan;
+                        nathan = import ./home-manager/users/nathan;
+                        home-manager-config = import ./home-manager;
+                        inherit self;
                     }; 
                 };
                 modules = [
@@ -138,11 +120,28 @@
             container = nixpkgs.lib.nixosSystem {
                 specialArgs = { 
                     inputs = inputs // { 
-                        nathan-home-manager = import ./home-manager/nathan;
+                        nathan = import ./home-manager/users/nathan;
+                        home-manager-config = import ./home-manager;
+                        inherit self;
                     }; 
                 };
                 modules = [
-                    ./system-config/configuration/sandbox-nathan
+                    ./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
                 ];
             };
@@ -160,12 +159,10 @@
 
             extraSpecialArgs = {
                 inputs = inputs // {
-                    nathan = import ./home-manager/nathan;
+                    nathan = import ./home-manager/users/nathan;
+                    home-manager-config = import ./home-manager;
                 };
             };
-
-            home-manager-path = home-manager.outPath;
-
         };
 
 
@@ -191,5 +188,7 @@
                 };
             };
         };
+        
+        iso = self.nixosConfigurations.iso.config.system.build.isoImage;
     };
 }

home-manager/programs/default.nix

@@ -8,12 +8,12 @@
 	    ./terminal
         ./rofi
         ./pywal
-        ./swaylock
+        ./hyprlock
         ./calcurse
         ./firefox
     ];
 
-    config = {
+    config = lib.mkIf (config.homeconfig.host != "android") {
 
         home.packages = lib.mkIf (!config.homeconfig.wal.enable) [
             inputs.nixvim.packages.${pkgs.system}.default

home-manager/programs/firefox/default.nix

@@ -31,6 +31,7 @@
                 search = {
                     default = "ddg";
                     privateDefault = "ddg";
+                    force = true;
                 };
                 bookmarks = {
                     force = true;

home-manager/programs/hyprland/default.nix

@@ -15,6 +15,18 @@
             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;
@@ -24,9 +36,9 @@
                 variables = [ "--all" ];
             };
 
-            extraConfig = let 
-                monitor = if config.homeconfig.host == "laptop" then ''
-                    monitor=eDP-1,1920x1080@300,0x0,1
+            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
@@ -37,9 +49,16 @@
                     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 '''';
-            in monitor + ''
-                source = /home/nathan/.config/hypr/main.conf
+                '' 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

@@ -0,0 +1,52 @@
+{ 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

@@ -9,7 +9,6 @@
         
         programs.hyprpanel = {
             enable = true;
-
         };
     };
 }

home-manager/programs/swaylock/default.nix

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

home-manager/programs/terminal/default.nix

@@ -5,9 +5,12 @@
     ./bash
     ./eza
     ./fzf
+    ./lf
     ./tmux
     ./kitty
     ./zoxide
     ./zsh
+    ./ssh
+    ./ohmyposh
   ];
 }

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

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

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

@@ -6,36 +6,12 @@
   
   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";
-
-    };
-
-    history = {
-      size = 5000;
-      ignoreAllDups = true;
-      ignoreSpace = true;
-      share = true;
-    };
-
-    initExtraFirst = ''
+    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-manager/programs/terminal/ssh/default.nix

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

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

@@ -1,9 +1,5 @@
 { config, lib, pkgs, ... }: {
 
-  home.packages = with pkgs; [
-    oh-my-posh
-  ];
-  
   programs.zsh = {
     
     enable = true;
@@ -23,6 +19,8 @@
       vi = "nvim";
       vim = "nvim";
 
+      python = "python3.13";
+      python3 = "python3.13";
     };
 
     history = {
@@ -31,128 +29,5 @@
       ignoreSpace = true;
       share = true;
     };
-
-    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/zsh/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/services/default.nix

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

home-manager/services/wayvnc/default.nix

@@ -1,36 +0,0 @@
-{ config, lib, pkgs, inputs, ... }: {
-
-    options.homeconfig.wayvnc.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    disabledModules = [
-    ];
-
-    imports = [
-        (import "${inputs.home-manager-us}/modules/services/wayvnc.nix" { 
-            inherit config; 
-            inherit lib; 
-            pkgs = (import inputs.nixpkgs-us { system = "x86_64-linux"; });
-        })
-    ];
-
-    config = lib.mkIf config.homeconfig.wayvnc.enable {
-        home.packages = with pkgs; [
-            novnc
-        ];
-
-        services.wayvnc = {
-            enable = true;
-
-            autoStart = true;
-
-            settings = {
-                address = "0.0.0.0";
-
-                port = 5900;
-            };
-        };
-    };
-}

home-manager/users/nathan/default.nix

@@ -38,30 +38,37 @@
             defaultSopsFile = ./secrets.yaml;
             defaultSopsFormat = "yaml";
         };
-/*
-        nix = {
+
+        nix = lib.mkIf config.homeconfig.standalone.enable {
             nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
             settings = {
                 experimental-features = [ "nix-command" "flakes" ];
-                builders = ''
-                    ssh://remote-builder@blunkall.us
-                '';
+                builders = "ssh://builder x86_64-linux,aarch64-linux /run/secrets/remoteBuildKey 1 1 nixos-test,benchmark,big-parallel,kvm - -";
                 builders-use-substituters = true;
             };
         };
 
-        programs.ssh.matchBlocks = {
-            "builder" = {
-                hostname = "blunkall.us";
-                user = "remote-builder";
-                identityFile = config.sops.secrets."".path;
-                port = 2222;
-            };
-        };
-*/
         services.mpris-proxy.enable = true;
 
-        programs.ssh.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 +1,11 @@
 { config, lib, ... }: {
 
 	home.file = {
-		".config/hypr" = { source = ./hypr; recursive = true; };
-		".config/swaylock" = { source = ./swaylock; recursive = true; };
-		".config/wal/templates" = { source = ./wal/templates; recursive = true; };
+		".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" = { source = ./Wallpaper; recursive = true; };
+		"Pictures/Wallpaper" = lib.mkIf config.homeconfig.graphical { source = ./Wallpaper; recursive = true; };
 	};
 
 }

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

@@ -0,0 +1,106 @@
+# 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/hypr/main.conf

@@ -15,12 +15,12 @@ exec-once=onSystemStart
 # Some default env vars.
 env = XCURSOR_SIZE,16
 
-source = ~/Projects/Olympus/home-manager/users/nathan/dotfiles/hypr/otf.conf
+source = ~/.config/hypr/otf.conf
 source = ~/.cache/wal/colors-hypr.conf
 
 # For all categories, see https://wiki.hyprland.org/Configuring/Variables/
 input {
-	kb_layout = us
+	kb_layout = us,jp
 	kb_variant =
 	kb_model =
 	kb_options =
@@ -48,7 +48,7 @@ general {
         col.active_border = $color1 $color5 100deg
         col.inactive_border = $color0
 
-        layout = dwindle
+        layout = master
 }
 decoration { # See https://wiki.hyprland.org/Configuring/Variables/ for more 
 
@@ -101,12 +101,19 @@ gestures {
 misc {
         disable_hyprland_logo = false
         disable_splash_rendering = true
-        force_default_wallpaper = 2
+        force_default_wallpaper = 0
+}
+
+ecosystem {
+    no_update_news = true
+    no_donation_nag = true
 }
 
 # Binds
 $mainMod = ALT
 
+bind = CTRL SHIFT, H, exec, colorPrefix kitty -e 'bash -c "hyprctl binds | less"'
+
 bind = $mainMod SHIFT, E, exec, colorPrefix kitty
 
 bind = $mainMod, B, exec, firefox
@@ -119,28 +126,26 @@ bind = $mainMod, R, exec, colorPrefix kitty -e _systemRebuild
 
 bind = $mainMod SHIFT, R, exec, colorPrefix kitty -e _homeRebuild
 
-bind = $mainMod, C, exec, colorPrefix kitty -e bash -c "cd ~/Projects/Olympus; nvim ~/Projects/Olympus/"
-
 bind = $mainMod, F, exec, thunar
 bind = $mainMod SHIFT, F, fullscreen
 
-bind = $mainMod, semicolon, exec, colorPrefix kitty -e nvim ~
+bind = $mainMod SHIFT, semicolon, exec, colorPrefix kitty -e lf
 
-bind = $mainMod, Insert, exec, libreoffice &
-
-bind = $mainMod, H, exec, bluetoothctl connect 88:D0:39:F9:83:CE
+bind = $mainMod, Insert, exec, libreoffice
 
 bind = $mainMod, V, togglefloating,
 
-bind = $mainMod SHIFT, V, exec, vlc &
+bind = $mainMod SHIFT, V, exec, vlc
 
 bind = , Menu, exec, rofi -show drun
 
-bind = $mainMod, Menu, exec, killall .ags-wrapped; ags &
+bind = $mainMod, Menu, exec, hyprpanel -q; hyprpanel
 
-bind = $mainMod, P, pseudo, # dwindle
+#bind = $mainMod, P, pseudo, # dwindle
+#bind = $mainMod, Z, togglesplit, # dwindle
 
-bind = $mainMod, Z, togglesplit, # dwindle
+bind = $mainMod, N, layoutmsg, rollnext # master
+bind = $mainMod, P, layoutmsg, rollprev # master
 
 bind = $mainMod, M, exec, spotify
 
@@ -158,25 +163,24 @@ bind = , XF86AudioNext, exec, playerctl next
 
 bind = , XF86AudioPrev, exec, playerctl previous
 
-bind = , XF86Launch2, exec, steam &
+bind = , XF86Launch2, exec, steam
 bind = $mainMod, XF86Launch2, exec, prismlauncher
 
-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
-
 bind = , XF86Calculator, exec, geogebra
 
 bind = $mainMod SHIFT, Print, exec, firefox localhost:631
-bind = , Print, exec, grim -g "$(slurp)"
 
-bind = $mainMod, Return, exec, discord --enable-features=UseOzonePlatform --ozone-platform=wayland &
+bind = $mainMod, Return, exec, discord --enable-features=UseOzonePlatform --ozone-platform=wayland
 
 bind = $mainMod CTRL, Return, exec, firefox https://discord.com/app
 
+bind = , Home, exec, setWallpaper
+
 # Move focus with mainMod + arrow keys
-bind = $mainMod, H, movefocus, l
-bind = $mainMod, L, movefocus, r
-bind = $mainMod, J, movefocus, u
-bind = $mainMod, K, movefocus, d
+bind = $mainMod, W, movefocus, u
+bind = $mainMod, A, movefocus, l
+bind = $mainMod, S, movefocus, d
+bind = $mainMod, D, movefocus, r
 # Switch workspaces with mainMod + [0-9]
 bind = $mainMod, 1, workspace, 1
 bind = $mainMod, 2, workspace, 2
@@ -209,6 +213,24 @@ bind = $mainMod SHIFT, Home, movetoworkspace, 11
 bind = $mainMod, right, workspace, e+1
 bind = $mainMod, left, workspace, e-1
 
+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, 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 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, 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
+
 #switch network connections
 bind = CTRL SHIFT, Escape, exec, nmcli device down wlo1
 bind = CTRL SHIFT, 0, exec, nmcli connection up Hotspot
@@ -234,33 +256,34 @@ bind = CTRL ALT, Delete, exec, loginctl kill-session self
 
 
 # Move/resize windows with mainMod + LMB/RMB and dragging
-bind = $mainMod SHIFT, J, movewindow, u
-bind = $mainMod SHIFT, K, movewindow, d
-bind = $mainMod SHIFT, H, movewindow, l
-bind = $mainMod SHIFT, L, movewindow, r
+bind = $mainMod SHIFT, W, movewindow, u
+bind = $mainMod SHIFT, A, movewindow, l
+bind = $mainMod SHIFT, S, movewindow, d
+bind = $mainMod SHIFT, D, movewindow, r
+
 bindm = $mainMod, mouse:272, movewindow
 bindm = $mainMod SHIFT, mouse:272, resizewindow
 
 $scratchpadsize = size 60% 80%
-$scratchpad = class:^(scratchpad)$
-
-windowrulev2 = float, $scratchpad
-windowrulev2 = $scratchpadsize, $scratchpad
-windowrulev2 = workspace special silent, $scratchpad
 
 $kitty = class:^(scratchpad-kitty)$
-
 windowrulev2 = float, $kitty
 windowrulev2 = $scratchpadsize, $kitty
 windowrulev2 = workspace special silent, $kitty
-$nvim = class:^(scratchpad-nvim)$
 
-windowrulev2 = float, $nvim
-windowrulev2 = $scratchpadsize, $nvim
-windowrulev2 = workspace special silent, $nvim
+$lf = class:^(scratchpad-lf)$
+windowrulev2 = float, $lf
+windowrulev2 = $scratchpadsize, $lf
+windowrulev2 = workspace special silent, $lf
 
-bind = $mainMod, N, exec, colorPrefix pypr toggle nvim
-bind = $mainMod, E, exec, colorPrefix pypr toggle free
+$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

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

@@ -1 +0,0 @@
-

home-manager/users/nathan/dotfiles/hypr/pyprland.toml

@@ -1,21 +1,30 @@
     [pyprland]
 	plugins = [
-          "scratchpads"
+        "scratchpads"
 	]
 
-	[scratchpads.nvim]
+	[scratchpads.lf]
 	animation = "fromTop"
-	command = "kitty --class scratchpad-nvim -e nvim ~/Projects"
+	command = "kitty --class scratchpad-lf -e lf ~"
 	lazy = false
-	class = "scratchpad-nvim"
+	class = "scratchpad-lf"
 	margin = 100
 	multi = true
 	excludes = "*"
 
-	[scratchpads.free]
+	[scratchpads.kitty]
 	animation = "fromBottom"
-	command = "kitty --class scratchpad -e tmux"
-	class = "scratchpad"
+	command = "kitty --class scratchpad-kitty -e tmux"
+	class = "scratchpad-kitty"
+	lazy = false
+	margin = 100
+	multi = true
+	excludes = "*"
+	
+    [scratchpads.calendar]
+	animation = "fromTop"
+	command = "kitty --class scratchpad-cal -e calcurse"
+	class = "scratchpad-cal"
 	lazy = false
 	margin = 100
 	multi = true

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

@@ -0,0 +1,65 @@
+{
+  "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

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

home-manager/users/nathan/dotfiles/quickshell/modules/ActiveWindow.qml

@@ -0,0 +1,37 @@
+import QtQuick // for Text
+import QtQuick.Controls
+import QtQuick.Layouts
+import Quickshell.Widgets
+import Quickshell.Hyprland
+import Quickshell
+
+Item {
+    implicitWidth: t.contentWidth + 10 
+    implicitHeight: 30
+
+    ClippingWrapperRectangle {
+        radius: 5
+        anchors.fill: parent
+        Text {
+            id: t
+            verticalAlignment: Text.AlignVCenter
+            horizontalAlignment: Text.AlignHCenter
+            text: {
+                if(hws.toplevels.values.length > 0) {
+                    return Hyprland.activeToplevel.title
+                } else {
+                    return "  Desktop"
+                }
+            }
+
+            property HyprlandWorkspace hws: Hyprland.focusedWorkspace
+
+            onHwsChanged: {
+                Hyprland.refreshToplevels()
+                Hyprland.refreshWorkspaces()
+            }
+
+            font.pointSize: 11
+        }
+    }
+}

home-manager/users/nathan/dotfiles/quickshell/modules/Bar.qml

@@ -0,0 +1,170 @@
+import Quickshell // for PanelWindow
+import QtQuick // for Text
+import QtQuick.Controls
+import QtQuick.Layouts
+import Quickshell.Io
+import Quickshell.Widgets
+import Quickshell.Wayland
+
+PanelWindow {
+    anchors {
+        top: true
+        //left: true
+        //right: true
+        //bottom: true
+
+    }
+
+    id: bar
+
+    exclusionMode: ExclusionMode.Ignore
+    WlrLayershell.layer: WlrLayer.Background
+
+    color: "#a0706050"
+
+
+    implicitHeight: 40
+    implicitWidth: 1900
+
+    /*RowLayout {
+        width: bar.width
+    }*/
+    RowLayout {
+        //Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
+        id: left
+        x: 0
+        y: parent.y + (parent.height - height) / 2
+        //width: center.x
+        spacing: 0
+
+        Launcher { 
+            id: l 
+            Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
+            Layout.preferredWidth: width
+            Layout.margins: 5
+        }
+
+        Workspaces { 
+            id: ws 
+            Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
+            Layout.margins: 5
+        }
+
+        /*ActiveWindow {
+            id: aw
+            Layout.margins: 5
+
+            Layout.maximumWidth: Math.min(implicitWidth, center.x - (parent.x + x + Layout.margins))
+        }*/
+
+    }
+
+    RowLayout {
+        //Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
+        id: center
+        x: (parent.width - cl.width) / 2 + parent.x - centerLeft.width
+        //y: parent.y + (parent.height - height) / 2
+        y: parent.y + (parent.height - height) / 2
+        spacing: 0
+
+        RowLayout {
+            id: centerLeft
+            spacing: 0
+            
+            Volume { 
+                id: v 
+                window: bar
+                popupOffset: center.x
+                Layout.margins: 5
+            }
+
+            Battery { 
+                id: bat 
+                window: bar
+                popupOffset: center.x
+                Layout.margins: 5
+            }
+
+            Hyprsunset { 
+                id: hs 
+                Layout.margins: 5
+            }
+        }
+
+
+        Clock { 
+            id: cl 
+            Layout.margins: 5
+        }
+
+        IdleInhibitor { 
+            id: ii 
+            Layout.margins: 5
+        }
+
+        Wifi { 
+            id: wifi 
+            window: bar
+            Layout.margins: 5
+        }
+
+        Bluetooth { 
+            id: bt 
+            window: bar
+            popupOffset: center.x + center.width
+            Layout.margins: 5
+        }
+
+    }
+
+
+    RowLayout {
+        //Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
+        id: right
+        //implicitWidth: bar.width - (spacer.x + spacer.width)
+        x: bar.width - implicitWidth
+        y: parent.y + (parent.height - height) / 2
+        //Layout.maximumWidth: bar.width - (center.x + center.width)
+        //Layout.preferredWidth: 10
+        spacing: 0
+
+        Media { 
+            Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
+            id: media
+            
+            implicitWidth: Math.min(textWidth, bar.width - (righter.width) - (center.x + center.width) - 10)
+
+            Layout.margins: 5
+        }
+
+        RowLayout {
+            id: righter
+            spacing: 0
+            Tray { 
+                id: tray
+                window: bar 
+                Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
+                Layout.margins: 5
+                popupOffset: right.x + righter.x + x
+            }
+
+            Notifications { 
+                id: notif 
+                window: bar
+                Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
+                Layout.margins: 5
+            }
+
+            Power { 
+                id: power 
+                window: bar
+                popupOffset: bar.width
+                Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
+                Layout.margins: 5
+            }
+        }
+    }
+
+
+
+}

home-manager/users/nathan/dotfiles/quickshell/modules/Battery.qml

@@ -0,0 +1,71 @@
+import Quickshell // for PanelWindow
+import QtQuick // for Text
+import QtQuick.Controls
+import QtQuick.Layouts
+import Quickshell.Io
+import Quickshell.Widgets
+import Quickshell.Hyprland
+import Quickshell.Services.UPower
+
+ClippingWrapperRectangle {
+    radius: 5
+    width: 100; height: 30
+    color: "red"
+    Button {
+        id: button
+        text: "󰁹 " + Math.floor(UPower.displayDevice.percentage * 100) + "%"
+        font.pointSize: 12
+        implicitHeight: parent.height
+        //icon.color: "red"
+        //icon.source: "/nix/store/c4dcn4vl0v5njv4d587sazrad1xgyd9h-rose-pine-icon-theme-unstable-2022-09-01/share/icons/rose-pine/symbolic/devices/battery-symbolic.svg"
+        onClicked: {
+            menu.visible = true
+            grab.active = true
+        }
+    }
+
+    required property var window
+    required property real popupOffset
+    id: root
+
+    PopupWindow {
+        
+        id: menu
+
+        anchor.window: window
+        anchor.rect.x: popupOffset
+        anchor.rect.y: 50
+        implicitWidth: 250
+        implicitHeight: 150
+        visible: false
+
+        color: "transparent"
+        
+        ClippingWrapperRectangle {
+            radius: 5
+
+            implicitHeight: parent.height - 20
+            implicitWidth: parent.width
+            
+            ColumnLayout {
+
+                spacing: 0
+
+                Button {
+                    Layout.topMargin: 5
+                    x: (parent.width - width) / 2
+                    implicitWidth: parent.width - 10
+                    implicitHeight: parent.height / 5 - parent.spacing
+
+                    text: 'shutdown'
+                }
+            }
+        }
+
+        HyprlandFocusGrab {
+            id: grab
+            windows: [ menu ]
+            onCleared: menu.visible = false
+        }
+    }
+}

home-manager/users/nathan/dotfiles/quickshell/modules/Bluetooth.qml

@@ -0,0 +1,141 @@
+import Quickshell // for PanelWindow
+import QtQuick // for Text
+import QtQuick.Controls
+import QtQuick.Layouts
+import Quickshell.Io
+import Quickshell.Widgets
+import Quickshell.Hyprland
+import Quickshell.Bluetooth
+
+ClippingWrapperRectangle {
+    
+    
+    radius: 5
+    implicitWidth: 30; implicitHeight: 30
+    Button {
+        id: button
+        text: ""
+        font.pointSize: 16
+        
+        onClicked: {
+            menu.visible = true
+            grab.active = true
+        }
+        implicitHeight: parent.height
+    }
+
+    required property PanelWindow window
+    required property real popupOffset
+    id: root
+
+    PopupWindow {
+        
+        id: menu
+
+        anchor.window: window
+        anchor.rect.x: popupOffset - width
+        anchor.rect.y: 50
+        implicitWidth: 250
+        implicitHeight: 150
+        visible: false
+
+        color: "transparent"
+        
+        ClippingWrapperRectangle {
+            radius: 5
+
+            implicitHeight: parent.height - 20
+            implicitWidth: parent.width
+            
+            ColumnLayout {
+
+                spacing: 0
+
+                ClippingWrapperRectangle {
+                    radius: 5
+                    implicitWidth: parent.width - 2 * Layout.margins
+                    implicitHeight: 30
+                    Layout.alignment: Qt.AlignHCenter | Qt.AlignTop
+                    Layout.margins: 5
+                    color: "#ff3333aa"
+
+                    RowLayout {
+                        Text {
+                            text: 'Bluetooth'
+                            Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
+                            Layout.margins: 5
+                        }
+
+                        Switch {
+                            Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
+                            //Layout.margins: 5
+                            checked: Bluetooth.defaultAdapter.enabled
+                            onClicked: Bluetooth.defaultAdapter.enabled = checked
+                        }
+                    }
+
+                }
+
+                ScrollView {
+                    Layout.alignment: Qt.AlignHCenter | Qt.AlignTop
+                    Layout.margins: 5
+
+                    implicitWidth: parent.width - 4 * Layout.margins
+                    implicitHeight: menu.height / 2
+
+                    id: scroll
+
+                    ColumnLayout {
+                        spacing: 0
+
+                        Repeater {
+
+                            id: rep
+
+                            model: Bluetooth.devices.values
+
+                            ClippingWrapperRectangle {
+                                radius: 5
+                                color: "#ff3333aa"
+
+                                implicitWidth: menu.width - 3 * scroll.x
+                                implicitHeight: 40
+                                
+                                Layout.alignment: Qt.AlignHCenter | Qt.AlignTop
+                                Layout.margins: 5
+
+                                RowLayout {
+                                    Text {
+                                        Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
+                                        Layout.margins: 5
+                                        
+                                        text: rep.model[index].name
+                                    }
+
+                                    Button {
+                                        Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
+                                        Layout.rightMargin: 5
+                                        text: 'Connect'
+
+                                        onClicked: rep.model[index].connected = !rep.model[index].connected
+                                    }
+                                }
+
+
+                            }
+
+                        }
+                    }
+
+                }
+
+            }
+        }
+
+        HyprlandFocusGrab {
+            id: grab
+            windows: [ menu ]
+            onCleared: menu.visible = false
+        }
+    }
+}

home-manager/users/nathan/dotfiles/quickshell/modules/Clock.qml

@@ -0,0 +1,27 @@
+import QtQuick // for Text
+import QtQuick.Controls
+import QtQuick.Layouts
+import Quickshell.Widgets
+import Quickshell
+
+Item {
+    implicitWidth: t.contentWidth + 10 
+    implicitHeight: 30
+
+    ClippingWrapperRectangle {
+        radius: 5
+        anchors.fill: parent
+        Text {
+            id: t
+            verticalAlignment: Text.AlignVCenter
+            horizontalAlignment: Text.AlignHCenter
+            text: Qt.formatDateTime(clock.date, "dddd HH:mm:ss MM/dd/yyyy")
+            font.pointSize: 11
+
+            SystemClock {
+                id: clock
+                precision: SystemClock.Seconds
+            }
+        }
+    }
+}

home-manager/users/nathan/dotfiles/quickshell/modules/Hyprsunset.qml

@@ -0,0 +1,30 @@
+import Quickshell // for PanelWindow
+import QtQuick // for Text
+import QtQuick.Controls
+import Quickshell.Io
+import Quickshell.Widgets
+
+ClippingWrapperRectangle {
+    radius: 5
+    implicitWidth: 30; height: 30
+    Button {
+        id: button
+        text: "󰛨 "
+        font.pointSize: 16
+        Process {
+            id: idlent
+            running: false
+            command: ["hyprsunset", "-t", "4000"]
+
+            onExited: {
+                running = button.text == "󰛨 " ? false : true
+            }
+        }
+
+        onClicked: {
+            idlent.running = button.text == "󰛨 " ? true : false
+            button.text = button.text == "󰛨 " ? "󱩌 " : "󰛨 "
+        }
+        implicitHeight: parent.height
+    }
+}

home-manager/users/nathan/dotfiles/quickshell/modules/IdleInhibitor.qml

@@ -0,0 +1,34 @@
+import Quickshell // for PanelWindow
+import QtQuick // for Text
+import QtQuick.Controls
+import Quickshell.Io
+import Quickshell.Widgets
+
+ClippingWrapperRectangle {
+
+    property real interval: 100
+    id: root
+
+    radius: 5
+    implicitWidth: 30; height: 30
+    Button {
+        id: button
+        text: "󰒲 "
+        font.pointSize: 16
+        Process {
+            id: idlent
+            running: false
+            command: ["systemd-inhibit", "--what=idle", "sleep", root.interval.toString()]
+
+            onExited: {
+                running = button.text == "󰒲 " ? false : true
+            }
+        }
+
+        onClicked: {
+            idlent.running = button.text == "󰒲 " ? true : false
+            button.text = button.text == "󰒲 " ? "󰒳 " : "󰒲 "
+        }
+        implicitHeight: parent.height
+    }
+}

home-manager/users/nathan/dotfiles/quickshell/modules/Launcher.qml

@@ -0,0 +1,22 @@
+import Quickshell // for PanelWindow
+import QtQuick // for Text
+import QtQuick.Controls
+import Quickshell.Io
+import Quickshell.Widgets
+
+ClippingWrapperRectangle {
+    radius: 5
+    width: 30; height: 30
+    Button {
+        id: button
+        text: " "
+        font.pointSize: 16
+        Process {
+            id: launcher
+            running: false
+            command: ["rofi", "-show", "drun"]
+        }
+        onClicked: launcher.running = true
+        implicitHeight: parent.height
+    }
+}

home-manager/users/nathan/dotfiles/quickshell/modules/Media.qml

@@ -0,0 +1,48 @@
+import QtQuick // for Text
+import QtQuick.Controls
+import QtQuick.Layouts
+import Quickshell.Services.Mpris
+import Quickshell.Widgets
+
+Item {
+    id: media
+    height: 30
+
+    readonly property real textWidth: info.contentWidth + 10
+
+    ClippingWrapperRectangle {
+        radius: 5
+        anchors.fill: parent
+        Text {
+
+            verticalAlignment: Text.AlignVCenter
+            horizontalAlignment: Text.AlignHCenter
+
+            id: info
+
+            text: {
+                let s = ''
+                let players = []
+                
+                Mpris.players.values.forEach((p) => { 
+                    if(p.isPlaying) players.push(p)
+                })
+                
+                if(players[0]?.trackTitle) {
+                    s += players[0].trackTitle
+                }
+                if(players[0]?.trackAlbum) {
+                    s += ' - ' + players[0].trackAlbum
+                }
+                if(players[0]?.trackArtist) {
+                    s += ' - ' + players[0].trackArtist
+                }
+
+                media.visible = players.length > 0
+
+                return s
+            }
+            font.pointSize: 11
+        }
+    }
+}

home-manager/users/nathan/dotfiles/quickshell/modules/Notifications.qml

@@ -0,0 +1,183 @@
+import Quickshell
+import QtQuick // for Text
+import QtQuick.Controls
+import QtQuick.Layouts
+import Quickshell.Services.Notifications
+import Quickshell.Io
+import Quickshell.Widgets
+import Quickshell.Hyprland
+
+Item {
+    width: 50
+    height: 30
+
+    ClippingWrapperRectangle {
+        id: barbutton
+        radius: 5
+        anchors.fill: parent
+        Button {
+            id: button
+            text: "󰂚"
+            //text: server.trackedNotifications.values.length == 0 ? "󰂚" : '󱅫 ' + server.trackedNotifications.values.length
+            //icon.source: ''
+            font.pointSize: 16
+            
+            onClicked: {
+                
+
+                menu.visible = true
+                grab.active = true
+            }
+            implicitHeight: parent.height
+        }
+    }
+
+    NotificationServer {
+        id: server
+        persistenceSupported: true
+        imageSupported: true
+        actionsSupported: true
+        bodyImagesSupported: true
+        bodySupported: true
+        bodyHyperlinksSupported: true
+        inlineReplySupported: true
+        actionIconsSupported: true
+
+        onNotification: (n) => {
+            n.tracked = true
+            console.log(n?.body)
+            button.text = '󱅫 ' + (server.trackedNotifications.values.length + 1)
+        }
+
+    }
+
+    required property PanelWindow window
+    id: root
+
+    PopupWindow {
+        
+        id: menu
+
+        anchor.window: window
+        anchor.rect.x: window.width - width
+        anchor.rect.y: 50
+        implicitWidth: 400
+        implicitHeight: 1080 - anchor.rect.y
+        visible: false
+
+        color: "transparent"
+        
+        ClippingWrapperRectangle {
+            radius: 5
+            
+            color: "#ff706050"
+
+            implicitHeight: parent.height - 20
+            implicitWidth: parent.width
+            
+            ColumnLayout {
+                id: lay
+
+                spacing: 10
+
+                ClippingWrapperRectangle {
+                    radius: 5
+                    Layout.margins: 5
+                    Layout.alignment: Qt.AlignVCenter | Qt.AlignTop
+                    implicitWidth: menu.width - 2 * Layout.margins
+                    
+                    RowLayout {
+                        width: parent.width
+                        Text {
+                            Layout.margins: 5
+                            Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
+                            text: 'Notifications'
+                        }
+                        Button {
+                            Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
+                            Layout.margins: 5
+                            implicitWidth: 20
+                            implicitHeight: 20
+
+                            text: 'x'
+
+                            onClicked: {
+                                while(server.trackedNotifications.values.length > 0) {
+                                     server.trackedNotifications.values[0].dismiss()
+                                }
+                            }
+                        }
+                    }
+                }
+
+                
+                Repeater {
+                    id: rep
+
+                    model: server.trackedNotifications.values
+                    ClippingWrapperRectangle {
+                        Layout.alignment: Qt.AlignHCenter | Qt.AlignTop
+                        Layout.margins: 5
+                        radius: 10
+                        implicitWidth: parent.width - 2 * Layout.margins
+                        implicitHeight: 100
+                        MouseArea {
+                            anchors.fill: parent
+                            
+                            RowLayout {
+                                Image {
+                                    //anchors.fill: parent
+                                    source: {
+                                        let icon = rep.model[index].image
+                                        if (icon.includes("?path=")) {
+                                            const [name, path] = icon.split("?path=");
+                                            icon = Qt.resolvedUrl(`${path}/${name.slice(name.lastIndexOf("/") + 1)}`);
+                                        }
+                                        return icon
+                                    }
+
+                                    Layout.maximumWidth: 100
+                                    Layout.maximumHeight: 100
+                                }
+                                
+                                ColumnLayout {
+                                    Layout.topMargin: 10
+                                    Layout.alignment: Qt.AlignLeft | Qt.AlignTop
+                                    Text {
+                                        Layout.alignment: Qt.AlignLeft | Qt.AlignTop
+                                        text: rep.model[index].summary
+                                        Layout.leftMargin: 10
+                                        font.pointSize: 14
+                                    }
+                                    Text {
+                                        Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
+                                        text: rep.model[index].body
+                                        Layout.leftMargin: 10
+                                        font.pointSize: 12
+                                    }
+                                }
+                            }
+
+                            acceptedButtons: Qt.LeftButton | Qt.RightButton
+
+                            onClicked: mouse => {
+                                if(mouse.button == Qt.LeftButton) {
+                                    button.text = rep.count - 1 <= 0 ? "󰂚" : '󱅫 ' + (rep.count - 1)
+                                    rep.model[index].dismiss()
+                                    //button.text = server.trackedNotifications.values.length == 0 ? "󰂚" : '󱅫 ' + server.trackedNotifications.values.length
+                                } else if(mouse.button == Qt.RightButton) {
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        HyprlandFocusGrab {
+            id: grab
+            windows: [ menu ]
+            onCleared: menu.visible = false
+        }
+    }
+}

home-manager/users/nathan/dotfiles/quickshell/modules/Power.qml

@@ -0,0 +1,96 @@
+import Quickshell
+import QtQuick // for Text
+import QtQuick.Controls
+import QtQuick.Layouts
+import Quickshell.Hyprland
+import Quickshell.Io
+import Quickshell.Widgets
+
+Item {
+    width: 30
+    height: 30
+
+    id: root
+
+    required property PanelWindow window
+    required property real popupOffset
+
+    ClippingWrapperRectangle {
+        radius: 5
+        width: 30; height: 30
+        Button {
+            id: button
+            text: " "
+            font.pointSize: 16
+            
+            onClicked: {
+                menu.visible = true
+                grab.active = true
+            }
+            implicitHeight: parent.height
+        }
+    }
+
+    PopupWindow {
+        
+        id: menu
+
+        anchor.window: window
+        anchor.rect.x: popupOffset
+        anchor.rect.y: 50
+        implicitWidth: 150
+        implicitHeight: 250
+        visible: false
+
+        color: "transparent"
+        
+        ClippingWrapperRectangle {
+            radius: 5
+
+            implicitHeight: parent.height - 20
+            implicitWidth: parent.width
+            
+            ColumnLayout {
+
+                spacing: 0
+
+                Button {
+                    Layout.topMargin: 5
+                    x: (parent.width - width) / 2
+                    implicitWidth: parent.width - 10
+                    implicitHeight: parent.height / 5 - parent.spacing
+
+                    text: 'shutdown'
+                }
+                
+                Button {
+                    x: (parent.width - width) / 2
+                    implicitWidth: parent.width - 10
+                    implicitHeight: parent.height / 5 - parent.spacing
+                    text: 'reboot'
+                }
+                
+                Button {
+                    x: (parent.width - width) / 2
+                    implicitWidth: parent.width - 10
+                    implicitHeight: parent.height / 5 - parent.spacing
+                    text: 'logout'
+                }
+                
+                Button {
+                    Layout.bottomMargin: 10
+                    x: (parent.width - width) / 2
+                    implicitWidth: parent.width - 10
+                    implicitHeight: parent.height / 5 - parent.spacing
+                    text: 'sleep'
+                }
+            }
+        }
+
+        HyprlandFocusGrab {
+            id: grab
+            windows: [ menu ]
+            onCleared: menu.visible = false
+        }
+    }
+}

home-manager/users/nathan/dotfiles/quickshell/modules/Tray.qml

@@ -0,0 +1,62 @@
+import QtQuick // for Text
+import QtQuick.Controls
+import QtQuick.Layouts
+import Quickshell.Services.SystemTray
+import Quickshell.Widgets
+
+Item {
+    implicitWidth: 10 + rep.count * (2 * lay.spacing + 20)
+    height: 30
+    visible: SystemTray.items.values.length != 0
+
+    id: root
+    required property var window
+    required property real popupOffset
+
+    ClippingWrapperRectangle {
+        radius: 5
+        anchors.fill: parent
+        RowLayout {
+            id: lay
+            spacing: 4
+            Repeater {
+                id: rep
+
+                model: SystemTray.items
+                ClippingWrapperRectangle {
+                    Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
+                    radius: 10
+                    implicitWidth: 20
+                    implicitHeight: 20
+                    MouseArea {
+                        anchors.fill: parent
+                        
+                        Image {
+                            anchors.fill: parent
+                            source: {
+                                let icon = SystemTray.items.values[index].icon
+                                if (icon.includes("?path=")) {
+                                    const [name, path] = icon.split("?path=");
+                                    icon = Qt.resolvedUrl(`${path}/${name.slice(name.lastIndexOf("/") + 1)}`);
+                                }
+                                return icon
+                            }
+                        }
+
+                        acceptedButtons: Qt.LeftButton | Qt.RightButton
+
+                        onClicked: (mouse) => {
+                            if(mouse.button == Qt.LeftButton) {
+                                SystemTray.items.values[index].activate()
+                            } else if(mouse.button == Qt.RightButton) {
+                                SystemTray.items.values[index].display(root.window, popupOffset, 40)
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+
+    }
+}

home-manager/users/nathan/dotfiles/quickshell/modules/Volume.qml

@@ -0,0 +1,97 @@
+import Quickshell // for PanelWindow
+import QtQuick // for Text
+import QtQuick.Controls
+import QtQuick.Layouts
+import Quickshell.Io
+import Quickshell.Widgets
+import Quickshell.Hyprland
+import Quickshell.Services.Pipewire
+
+ClippingWrapperRectangle {
+    radius: 5
+    width: 100; height: 30
+    Button {
+        id: button
+        text: "   " + Math.floor(Pipewire.defaultAudioSink?.audio?.volume * 100) + "%"
+        font.pointSize: 12
+        implicitHeight: parent.height
+
+        PwObjectTracker {
+            objects: [ Pipewire.defaultAudioSink ]
+        }
+
+        onClicked: {
+            menu.visible = true
+            grab.active = true
+        }
+
+    }
+
+    required property var window
+    required property real popupOffset
+    id: root
+
+    PopupWindow {
+        
+        id: menu
+
+        anchor.window: window
+        anchor.rect.x: popupOffset
+        anchor.rect.y: 50
+        implicitWidth: 250
+        implicitHeight: 150
+        visible: false
+
+        color: "transparent"
+        
+        ClippingWrapperRectangle {
+            radius: 5
+
+            implicitHeight: parent.height - 20
+            implicitWidth: parent.width
+
+            ScrollView {
+                ColumnLayout {
+
+                    spacing: 0
+
+                    Text {
+                        text: 'Output Devices'
+                    }
+
+                    ColumnLayout {
+                        
+                    }
+
+                    Text {
+                        text: 'Input Devices'
+                    }
+
+                    ColumnLayout {
+                        /*Repeater {
+                            id: in
+
+                            model: {
+                                set = []
+                                Pipewire.nodes.values.forEach(n => { !n.isSink && !n.isStream ? set.push(n) : return })
+                                return set
+                            }
+
+                            Text {
+                                text: in.model[index].nickname
+                            }
+                        }*/
+                    }
+
+                }
+            }
+            
+        }
+
+        HyprlandFocusGrab {
+            id: grab
+            windows: [ menu ]
+            onCleared: menu.visible = false
+        }
+    }
+}

home-manager/users/nathan/dotfiles/quickshell/modules/Wifi.qml

@@ -0,0 +1,72 @@
+import Quickshell
+import QtQuick // for Text
+import QtQuick.Controls
+import QtQuick.Layouts
+import Quickshell.Hyprland
+import Quickshell.Io
+import Quickshell.Widgets
+
+Item {
+    implicitWidth: 30
+    implicitHeight: 30
+
+    ClippingWrapperRectangle {
+        radius: 5
+        anchors.fill: parent
+        Button {
+            id: button
+            text: "󰤨 "
+            font.pointSize: 16
+            
+            onClicked: {
+                menu.visible = true
+                grab.active = true
+            }
+            implicitHeight: parent.height
+        }
+    }
+
+    property var window: null
+    id: root
+
+    PopupWindow {
+        
+        id: menu
+
+        anchor.window: window
+        anchor.rect.x: root.parent.x + root.parent.width - width
+        anchor.rect.y: 50
+        implicitWidth: 250
+        implicitHeight: 150
+        visible: false
+
+        color: "transparent"
+        
+        ClippingWrapperRectangle {
+            radius: 5
+
+            implicitHeight: parent.height - 20
+            implicitWidth: parent.width
+            
+            ColumnLayout {
+
+                spacing: 0
+
+                Button {
+                    Layout.topMargin: 5
+                    x: (parent.width - width) / 2
+                    implicitWidth: parent.width - 10
+                    implicitHeight: parent.height / 5 - parent.spacing
+
+                    text: 'shutdown'
+                }
+            }
+        }
+
+        HyprlandFocusGrab {
+            id: grab
+            windows: [ menu ]
+            onCleared: menu.visible = false
+        }
+    }
+}

home-manager/users/nathan/dotfiles/quickshell/modules/Workspaces.qml

@@ -0,0 +1,46 @@
+import QtQuick // for Text
+import QtQuick.Controls
+import QtQuick.Layouts
+import Quickshell.Hyprland
+import Quickshell.Widgets
+
+Item {
+    implicitWidth: 10 + rep.count * (2 * lay.spacing + 25)
+    implicitHeight: 30
+
+    Component.onCompleted: Hyprland.refreshWorkspaces()
+
+    ClippingWrapperRectangle {
+        radius: 5
+        anchors.fill: parent
+        RowLayout {
+            id: lay
+            Repeater {
+                id: rep
+
+                property var ws: {
+                    let arr = [];
+                    Hyprland.workspaces.values.forEach((w) => { if(w.id > 0) arr.push(w) })
+                    return arr;
+                }
+
+                model: ws
+                ClippingWrapperRectangle {
+                    Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
+                    radius: 10
+                    implicitWidth: 25
+                    Button {
+                        background: Rectangle {
+                            color: Hyprland.focusedWorkspace.id == rep.model[index].id ? "#ffff00ff" : "#ff7744dd"
+                            anchors.fill: parent
+                        }
+                        text: rep.model[index].id
+                        onClicked: rep.model[index].activate()
+                    }
+                }
+            }
+        }
+
+
+    }
+}

home-manager/users/nathan/dotfiles/quickshell/shell.qml

@@ -0,0 +1,14 @@
+//@ pragma Env QS_NO_RELOAD_POPUP=1
+//@ pragma Env QSG_RENDER_LOOP=threaded
+//@ pragma Env QT_QUICK_FLICKABLE_WHEEL_DECELERATION=10000
+
+//@ pragma UseQApplication
+
+import Quickshell // for ShellRoot
+import qs.modules
+
+ShellRoot {
+    Bar { 
+        id: bar 
+    }
+}

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

@@ -3,6 +3,7 @@
 
     pkgs-us = import inputs.nixpkgs-us {
       inherit system;
+      config.allowUnfree = true;
     };
 
     in {
@@ -23,6 +24,12 @@
         };
 
         home.packages = with pkgs; ([
+
+            inputs.disko.packages.${pkgs.system}.disko-install 
+
+            kjv
+            openssh
+            sops
             killall
             btop
             zip    
@@ -30,21 +37,7 @@
             rsync
             curl
             wget
-        ] ++ (if config.homeconfig.graphical then [
-            grim
-            slurp
-            xfce.thunar
-            wl-clipboard
-            blueberry
-            lxqt.lxqt-policykit
-        ] else []) ++ (if !config.homeconfig.minimal then [
-            cava 
-            android-tools
-            neovim-remote
-            gcc
-            zulu
-
-            (python312.withPackages (ps: with ps; [
+            (python313.withPackages (ps: with ps; [
                 gpustat
                 numpy
                 matplotlib
@@ -55,7 +48,19 @@
                 debugpy
                 requests
             ]))
-
+        ] ++ (if config.homeconfig.graphical then [
+            grim
+            slurp
+            xfce.thunar
+            wl-clipboard
+            blueberry
+            pkgs-us.quickshell
+        ] else []) ++ (if !config.homeconfig.minimal then [
+            cava 
+            android-tools
+            neovim-remote
+            gcc
+            zulu
             fastfetch
             ncmpcpp
             playerctl
@@ -74,7 +79,7 @@
 #unfree {
             geogebra
             spotify
-            discord
+            pkgs-us.discord
 #}
             pkgs-us.rustdesk-flutter
             pkgs-us.mpv

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

@@ -1,88 +1,115 @@
 { config, lib, pkgs, ... }: {
 
     options = {
-        homeScripts.enable = lib.options.mkOption {
+        homeconfig.scripts.enable = lib.options.mkOption {
             type = lib.types.bool;
             default = true;
         };
     };
 
-    config = lib.mkIf config.homeScripts.enable {
+    config = lib.mkIf config.homeconfig.scripts.enable {
         home.packages = [
 
             #scripts
 	        (pkgs.writeShellScriptBin "_systemRebuild" ''
-	            ${pkgs.nh}/bin/nh os switch --ask /home/nathan/Projects/Olympus
+	            ${pkgs.nh}/bin/nh os switch --ask
 	            echo //////Enter to close//////
 	            read
 	        '')
 	        
 
 	        (pkgs.writeShellScriptBin "randWallpaper" ''
-                file=$(ls /home/nathan/Pictures/Wallpaper/ | shuf -n 1)
-                setWallpaper /home/nathan/Pictures/Wallpaper/$file
+                file=''$(ls ${config.home.homeDirectory}/Pictures/Wallpaper/ | shuf -n 1)
+                setWallpaper ${config.home.homeDirectory}/Pictures/Wallpaper/''$file
 	        '')
 
 	        (pkgs.writeShellScriptBin "setWallpaper" ''
-	            img=''$(realpath ''${1:-~/.config/background})
-                chmod 600 ~/.config/background
-                ${pkgs.hyprpanel}/bin/hyprpanel sw ''$img
-                changeColors ''$img ''$2
+
+	            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
+                    cp /tmp/nathan/tmp.jpg /tmp/nathan/tmp2.jpg
+                    pidof mpvpaper && pkill mpvpaper
+                    ${pkgs.swww}/bin/swww img /tmp/nathan/tmp.jpg -t wipe
+                    ${pkgs.hyprpanel}/bin/hyprpanel sw /tmp/nathan/tmp2.jpg
+                    sleep 0.3
+                    hyprctl dispatch exec "${pkgs.mpvpaper}/bin/mpvpaper ALL ''$img -o loop"
+                    ${pkgs.hyprpanel}/bin/hyprpanel sw /tmp/nathan/tmp.jpg
+                    rm /tmp/nathan/tmp2.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" ''
 
-	            if [[ $(ls ~/.config/ | grep bga) != bga ]]; then
-	            echo 100 > ~/.config/bga
-	            fi
+                img=''$(realpath "''$1")
+                alpha=''${2:-70}
 
-	            alpha=''${2:-`cat ~/.config/bga`}
+                if [[ ''$alpha -lt 0 ]]; then
+                alpha=0
+                elif [[ ''$alpha -gt 100 ]]; then
+                alpha=100
+                fi
 
-	            img=''$(realpath ''${1:-~/.config/background})
+                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
 
-	            if [[ $alpha -lt 0 ]]; then
-	            $alpha=0
-	            fi
-	    
-	            if [[ $alpha -gt 100 ]]; then
-	            $alpha=100
-	            fi
-            
-	            wal -i $img -a $alpha --cols16 -n
-	    
-	            echo $alpha > ~/.config/bga
+	            colorPrefix 
+	        '')
 
+            (pkgs.writeShellScriptBin "colorPrefix" ''
+                exec -a "$0" "$@" &
 	            sleep 0.4
-            
-	            pywalfox update &
-            
-	            [[ $(pidof cava) != "" ]] && pkill -USR1 cava &
-	    
-	            for i in $(ls /run/user/1000 | grep nvim); do nvr -s --servername /run/user/1000/$i --remote-send '<cmd>colorscheme pywal<CR>'; done
-	    
+	            ${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" ''
-                ${pkgs.hyprpanel}/bin/hyprpanel &
-		        randWallpaper &
-	            pypr &
-	            lxqt-policykit-agent &
-                hyprctl setcursor Bibata-Modern-Classic 16 &
-                sleep 3
-		        hyprctl reload &
-                #tmux new-session -s hyprland 
-	        '')
 
-	        (pkgs.writeShellScriptBin "colorPrefix" ''
-                exec -a "$0" "$@" &
-	            sleep 0.4 && changeColors &
+                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 /home/nathan/Projects/Olympus
+	            ${pkgs.nh}/bin/nh home switch --ask
 	            echo //////Enter to close//////
 	            read
 	        '')

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

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

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

@@ -31,6 +31,7 @@
                 search = {
                     default = "ddg";
                     privateDefault = "ddg";
+                    force = true;
                 };
                 bookmarks = {
                     force = true;

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

@@ -15,6 +15,18 @@
             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;
@@ -24,18 +36,29 @@
                 variables = [ "--all" ];
             };
 
-            extraConfig = let 
-                monitor = if config.homeconfig.host == "laptop" then ''
-                    monitor=eDP-1,1920x1080@60,0x0,1
+            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 '''';
-            in monitor + ''
-                source = /home/nathan/.config/hypr/main.conf
+                '' 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

@@ -0,0 +1,18 @@
+{ 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

@@ -0,0 +1,15 @@
+{ 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/pywal/default.nix

@@ -8,7 +8,6 @@
     config = lib.mkIf config.homeconfig.wal.enable {
 
         home.packages = with pkgs; [
-            
             inputs.nixvim.packages.${pkgs.system}.pywal
 
             pywal16

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

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

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

@@ -5,7 +5,6 @@
     programs.bash = {
         enable = true;
         enableCompletion = true;
-        blesh.enable = true;
 
         shellAliases = {
             ls = "eza";
@@ -18,7 +17,11 @@
 
         };
 
-        initContent = if config.homeconfig.wal.enable then (lib.mkBefore ''
+        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 ''

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

@@ -2,11 +2,14 @@
 
   imports = [
     ./bat
+    ./bash
     ./eza
     ./fzf
     ./tmux
     ./kitty
     ./zoxide
     ./zsh
+    ./ssh
+    ./ohmyposh
   ];
 }

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

@@ -0,0 +1,132 @@
+{ 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/users/nathan/programs/terminal/ssh/default.nix

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

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

@@ -1,9 +1,5 @@
 { config, lib, pkgs, ... }: {
 
-  home.packages = with pkgs; [
-    oh-my-posh
-  ];
-  
   programs.zsh = {
     
     enable = true;
@@ -23,6 +19,8 @@
       vi = "nvim";
       vim = "nvim";
 
+      python = "python3.13";
+      python3 = "python3.13";
     };
 
     history = {
@@ -31,128 +29,5 @@
       ignoreSpace = true;
       share = true;
     };
-
-    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/users/nathan/secrets.yaml

@@ -6,20 +6,29 @@ sops:
         - recipient: age1yqgyp2uxz4lzrc9f9ka0mfjl5fr6ahf8nf24nlmran2wulg6fpvq9hyp9q
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA3dER2bmZjYUhlNHpvVVNY
-            dlFYdU1KVzQ0WGhtUlRyRUtMdldqdC9nNm1JCjdJU3pqQ2x2NE52Qm15MUw4d2lv
-            MjM4V3lBQ1o5MWl2MDRrTlJLWFFHRjAKLS0tIHhpUld3NXh4RzdKajJWMzM2a3gy
-            VU4xSytSZHgzd3pocUdOZmFTTVg4OXMKPkk9mbu6POQNwy+6jAhgv3t/DAN1n+Jo
-            xK0s1Ni1FKPU4mvQUsIN2v6y3Nircfr15CfzThjpIBoLtBOyoRhXrw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBvMktJdFhxRjhaT0MyZ0N3
+            YVBMYlNkRnl1eU8zajZLWXRPajZzWDBGQWxVCkhMcEdsNlVKQ1VHR2hjZWdsR1gx
+            MkhCeVZGUDJwdkdDTiswRW40QjRRYWMKLS0tIENIN2pheisyR21YZkIzblVZZ1cw
+            bHpLWEdPdUc4d2ZSS1FjUDM0QWRQUWsKqvlH0oWHH/PhMDTYT5KhCTzaEffsf1jM
+            r0o60YUCe6pUFs0qPvOxEPM3bq+7MkUpH4eXVAw3tCov3nUkmwlVZg==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1640eg0pnmkruc89m5xguz0m8fek44fl4tzez6qwuzlz6kmapqewsp8esxd
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSByM3lvcDM4Z0VJMGVBK1lU
-            Y0g1bTE2U3ZiN0E3NUJ0QVlQSUdlSDh6NjNNCmRVZjQ4VWJSM3g4S2Q1TnRWbjZG
-            TVVKUkJTWS9nUGN0Uy9LQ1V0YlpLeWsKLS0tIHRCWkxFTUhNQ21wYVBUL0k4d25h
-            RWNTdys0VnV1V0ZHL3R1N0NvdGFOTjAKQtM4wMzD9Lr9G9o1sp0Ud7LsxnTXzyV9
-            yQ5fxn5lmef7SAPAYVvkU7IH1uhtVyfH9SwsM+EnHdcQWO/lNQp+hg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5K3ovcmpPck1reGVPQ0lm
+            YTYvNGtaSk4vLzlYSW0rSkpHcjZWUnBMS2dBCmt3RU1PMkJ1VU5wNUc1NC9lbGFk
+            cjl6cXp6M292enFHckkyamwwaDRia2MKLS0tIGRUTzFGdDZFaS9LdkRjMW56U25B
+            emRDTncvNnlycHF3V2VJN3NlZTNVSjgK8RUx9qImdqjHBHisnwY+qRZ9vuafl3MN
+            jnJsIsKSdF51dWYskEMVnPYwn9HdOKkAh6amwSITcw3ZCcK7ftfT+g==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age12pnf36uqesjmy3e0lythfnpwam3zg5mv8m936fc4jphy4ces2fdqwn0s74
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBRWXVTSVQvNEhsMkQ2QkRl
+            SlZLTWN2eUdMa3MwdTBHZE8vdENKTTRKYVF3Ck01N2VNQUJPeHBwVHZTNWYzbXR5
+            ZS9hUDQydy9nQnR0SVpiUHV6ejhPb0EKLS0tIEZKeXV5QnpZYzBCVDR3WjVSV2Vv
+            TmJkL3VUbTRLNGNISGhFaGpmaXJ1cDAKpiZ8Nfml0KFq46JRg+394BCyZmnpE4XC
+            zqxRrNlGH/EDp00q5/jN84vQA+bOhGHcScQpvRCDKMXehQn3H4jksw==
             -----END AGE ENCRYPTED FILE-----
     lastmodified: "2025-08-16T16:08:48Z"
     mac: ENC[AES256_GCM,data:3/ztJNXhOIPqgQ47QxjM5KTeAJwXPpUuVtvI5/xJsMOOZhXYRt+uhL584F98rJiMHhnbsuGIZi+jGlYRiE6c+GJ9X7TKLj9yRqKvCMSCdWHGzY721GH5kMPcjD2YDYZ4tt+olIMePNJBPjC1XJgfhfOvs43o2HyDTCS95cEQzB4=,iv:qofZBAwxbTrc/hPyuSi8nxibJ0bGhoytZpUTZwwzbuI=,tag:z1SJXutJmlJ+j6RnV4u29Q==,type:str]

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

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

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

@@ -1,36 +0,0 @@
-{ config, lib, pkgs, inputs, ... }: {
-
-    options.homeconfig.wayvnc.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    disabledModules = [
-    ];
-
-    imports = [
-        (import "${inputs.home-manager-us}/modules/services/wayvnc.nix" { 
-            inherit config; 
-            inherit lib; 
-            pkgs = (import inputs.nixpkgs-us { system = "x86_64-linux"; });
-        })
-    ];
-
-    config = lib.mkIf config.homeconfig.wayvnc.enable {
-        home.packages = with pkgs; [
-            novnc
-        ];
-
-        services.wayvnc = {
-            enable = true;
-
-            autoStart = true;
-
-            settings = {
-                address = "0.0.0.0";
-
-                port = 5900;
-            };
-        };
-    };
-}

home-manager/users/nix-on-droid/default.nix

@@ -1,47 +0,0 @@
-{ config, lib, pkgs, inputs, ... }: {
-
-    imports = [
-        ./programs
-        ./services
-        ./packages
-        ./dotfiles
-	];
-
-    options.homeconfig = {
-        host = lib.options.mkOption {
-            type = lib.types.str;
-            default = null;
-        };
-        
-        home-manager.enable = lib.options.mkOption {
-            type = lib.types.bool;
-            default = false;
-        };
-    };
-
-    config = {
-
-        home.stateVersion = "24.11";
-
-        home.username = "nix-on-droid";
-
-        home.homeDirectory = "/data/data/com.termux.nix/files/home";
-
-        nix = {
-            package = pkgs.nix;
-
-            nixPath = [
-                "nixpkgs=${inputs.nixpkgs}"
-            ];
-
-            settings = {
-                experimental-features = [ "nix-command" "flakes" ];
-            };
-        };
-
-        programs.ssh.enable = true;
-
-        programs.home-manager.enable = config.homeconfig.home-manager.enable;
-
-    };
-}

home-manager/users/nix-on-droid/dotfiles/default.nix

@@ -1,8 +0,0 @@
-{ config, lib, ... }: {
-
-	home.file = {
-		".config/wal/templates" = { source = ./wal/templates; recursive = true; };
-		"Pictures/Wallpaper" = { source = ./Wallpaper; recursive = true; };
-	};
-
-}

home-manager/users/nix-on-droid/dotfiles/wal/templates/cava_config

@@ -1,279 +0,0 @@
-## Configuration file for CAVA.
-# Remove the ; to change parameters.
-
-
-[general]
-
-# Smoothing mode. Can be 'normal', 'scientific' or 'waves'. DEPRECATED as of 0.6.0
-; mode = normal
-
-# Accepts only non-negative values.
-; framerate = 60
-
-# 'autosens' will attempt to decrease sensitivity if the bars peak. 1 = on, 0 = off
-# new as of 0.6.0 autosens of low values (dynamic range)
-# 'overshoot' allows bars to overshoot (in % of terminal height) without initiating autosens. DEPRECATED as of 0.6.0
-; autosens = 1
-; overshoot = 20
-
-# Manual sensitivity in %. If autosens is enabled, this will only be the initial value.
-# 200 means double height. Accepts only non-negative values.
-; sensitivity = 100
-
-# The number of bars (0-512). 0 sets it to auto (fill up console).
-# Bars' width and space between bars in number of characters.
-; bars = 0
-; bar_width = 2
-; bar_spacing = 1
-# bar_height is only used for output in "noritake" format
-; bar_height = 32
-
-# For SDL width and space between bars is in pixels, defaults are:
-; bar_width = 20
-; bar_spacing = 5
-
-# sdl_glsl have these default values, they are only used to calulate max number of bars.
-; bar_width = 1
-; bar_spacing = 0
-
-
-# Lower and higher cutoff frequencies for lowest and highest bars
-# the bandwidth of the visualizer.
-# Note: there is a minimum total bandwidth of 43Mhz x number of bars.
-# Cava will automatically increase the higher cutoff if a too low band is specified.
-; lower_cutoff_freq = 50
-; higher_cutoff_freq = 10000
-
-
-# Seconds with no input before cava goes to sleep mode. Cava will not perform FFT or drawing and
-# only check for input once per second. Cava will wake up once input is detected. 0 = disable.
-; sleep_timer = 0
-
-
-[input]
-
-# Audio capturing method. Possible methods are: 'fifo', 'portaudio', 'pipewire', 'alsa', 'pulse', 'sndio', 'oss', 'jack' or 'shmem'
-# Defaults to 'oss', 'pipewire', 'sndio', 'jack', 'pulse', 'alsa', 'portaudio' or 'fifo', in that order, dependent on what support cava was built with.
-# On Mac it defaults to 'portaudio' or 'fifo'
-# On windows this is automatic and no input settings are needed.
-#
-# All input methods uses the same config variable 'source'
-# to define where it should get the audio.
-#
-# For pulseaudio and pipewire 'source' will be the source. Default: 'auto', which uses the monitor source of the default sink
-# (all pulseaudio sinks(outputs) have 'monitor' sources(inputs) associated with them).
-#
-# For pipewire 'source' will be the object name or object.serial of the device to capture from.
-# Both input and output devices are supported.
-#
-# For alsa 'source' will be the capture device.
-# For fifo 'source' will be the path to fifo-file.
-# For shmem 'source' will be /squeezelite-AA:BB:CC:DD:EE:FF where 'AA:BB:CC:DD:EE:FF' will be squeezelite's MAC address
-#
-# For sndio 'source' will be a raw recording audio descriptor or a monitoring sub-device, e.g. 'rsnd/2' or 'snd/1'. Default: 'default'.
-# README.md contains further information on how to setup CAVA for sndio.
-#
-# For oss 'source' will be the path to a audio device, e.g. '/dev/dsp2'. Default: '/dev/dsp', i.e. the default audio device.
-# README.md contains further information on how to setup CAVA for OSS on FreeBSD.
-#
-# For jack 'source' will be the name of the JACK server to connect to, e.g. 'foobar'. Default: 'default'.
-# README.md contains further information on how to setup CAVA for JACK.
-#
-; method = pulse
-; source = auto
-
-; method = pipewire
-; source = auto
-
-; method = alsa
-; source = hw:Loopback,1
-
-; method = fifo
-; source = /tmp/mpd.fifo
-
-; method = shmem
-; source = /squeezelite-AA:BB:CC:DD:EE:FF
-
-; method = portaudio
-; source = auto
-
-; method = sndio
-; source = default
-
-; method = oss
-; source = /dev/dsp
-
-; method = jack
-; source = default
-
-# The options 'sample_rate', 'sample_bits', 'channels' and 'autoconnect' can be configured for some input methods:
-#   sample_rate: fifo, pipewire, sndio, oss
-#   sample_bits: fifo, pipewire, sndio, oss
-#   channels:    sndio, oss, jack
-#   autoconnect: jack
-# Other methods ignore these settings.
-#
-# For 'sndio' and 'oss' they are only preferred values, i.e. if the values are not supported
-# by the chosen audio device, the device will use other supported values instead.
-# Example: 48000, 32 and 2, but the device only supports 44100, 16 and 1, then it
-# will use 44100, 16 and 1.
-#
-; sample_rate = 44100
-; sample_bits = 16
-; channels = 2
-; autoconnect = 2
-
-
-[output]
-
-# Output method. Can be 'ncurses', 'noncurses', 'raw', 'noritake', 'sdl'
-# or 'sdl_glsl'.
-# 'noncurses' (default) uses a buffer and cursor movements to only print
-# changes from frame to frame in the terminal. Uses less resources and is less
-# prone to tearing (vsync issues) than 'ncurses'.
-#
-# 'raw' is an 8 or 16 bit (configurable via the 'bit_format' option) data
-# stream of the bar heights that can be used to send to other applications.
-# 'raw' defaults to 200 bars, which can be adjusted in the 'bars' option above.
-#
-# 'noritake' outputs a bitmap in the format expected by a Noritake VFD display
-#  in graphic mode. It only support the 3000 series graphical VFDs for now.
-#
-# 'sdl' uses the Simple DirectMedia Layer to render in a graphical context.
-# 'sdl_glsl' uses SDL to create an OpenGL context. Write your own shaders or
-# use one of the predefined ones.
-; method = noncurses
-
-# Orientation of the visualization. Can be 'bottom', 'top', 'left' or 'right'.
-# Default is 'bottom'. Other orientations are only supported on sdl and ncruses
-# output. Note: many fonts have weird glyphs for 'top' and 'right' characters,
-# which can make ncurses not look right.
-; orientation = bottom
-
-# Visual channels. Can be 'stereo' or 'mono'.
-# 'stereo' mirrors both channels with low frequencies in center.
-# 'mono' outputs left to right lowest to highest frequencies.
-# 'mono_option' set mono to either take input from 'left', 'right' or 'average'.
-# set 'reverse' to 1 to display frequencies the other way around.
-; channels = stereo
-; mono_option = average
-; reverse = 0
-
-# Raw output target. A fifo will be created if target does not exist.
-; raw_target = /dev/stdout
-
-# Raw data format. Can be 'binary' or 'ascii'.
-; data_format = binary
-
-# Binary bit format, can be '8bit' (0-255) or '16bit' (0-65530).
-; bit_format = 16bit
-
-# Ascii max value. In 'ascii' mode range will run from 0 to value specified here
-; ascii_max_range = 1000
-
-# Ascii delimiters. In ascii format each bar and frame is separated by a delimiters.
-# Use decimal value in ascii table (i.e. 59 = ';' and 10 = '\n' (line feed)).
-; bar_delimiter = 59
-; frame_delimiter = 10
-
-# sdl window size and position. -1,-1 is centered.
-; sdl_width = 1000
-; sdl_height = 500
-; sdl_x = -1
-; sdl_y= -1
-; sdl_full_screen = 0
-
-# set label on bars on the x-axis. Can be 'frequency' or 'none'. Default: 'none'
-# 'frequency' displays the lower cut off frequency of the bar above.
-# Only supported on ncurses and noncurses output.
-; xaxis = none
-
-# enable alacritty synchronized updates. 1 = on, 0 = off
-# removes flickering in alacritty terminal emulator.
-# defaults to off since the behaviour in other terminal emulators is unknown
-; alacritty_sync = 0
-
-# Shaders for sdl_glsl, located in $HOME/.config/cava/shaders
-; vertex_shader = pass_through.vert
-; fragment_shader = bar_spectrum.frag
-
-; for glsl output mode, keep rendering even if no audio
-; continuous_rendering = 0
-
-# disable console blank (screen saver) in tty
-# (Not supported on FreeBSD)
-; disable_blanking = 0
-
-# show a flat bar at the bottom of the screen when idle, 1 = on, 0 = off
-; show_idle_bar_heads = 1
-
-# show waveform instead of frequency spectrum, 1 = on, 0 = off
-; waveform = 0
-
-[color]
-
-# Colors can be one of seven predefined: black, blue, cyan, green, magenta, red, white, yellow.
-# Or defined by hex code '#xxxxxx' (hex code must be within ''). User defined colors requires
-# a terminal that can change color definitions such as Gnome-terminal or rxvt.
-# default is to keep current terminal color
-; background = default
-; foreground = default
-
-# SDL and sdl_glsl only support hex code colors, these are the default:
-; background = '#111111'
-; foreground = '#33ffff'
-
-
-# Gradient mode, only hex defined colors are supported,
-# background must also be defined in hex or remain commented out. 1 = on, 0 = off.
-# You can define as many as 8 different colors. They range from bottom to top of screen
- gradient = 1
- gradient_count = 8
- gradient_color_1 = '{color1}'
- gradient_color_2 = '{color2}'
- gradient_color_3 = '{color3}'
- gradient_color_4 = '{color4}'
- gradient_color_5 = '{color5}'
- gradient_color_6 = '{color6}'
- gradient_color_7 = '{color7}'
- gradient_color_8 = '{color8}'
-
-
-
-[smoothing]
-
-# Percentage value for integral smoothing. Takes values from 0 - 100.
-# Higher values means smoother, but less precise. 0 to disable.
-# DEPRECATED as of 0.8.0, use noise_reduction instead
-; integral = 77
-
-# Disables or enables the so-called "Monstercat smoothing" with or without "waves". Set to 0 to disable.
-; monstercat = 0
-; waves = 0
-
-# Set gravity percentage for "drop off". Higher values means bars will drop faster.
-# Accepts only non-negative values. 50 means half gravity, 200 means double. Set to 0 to disable "drop off".
-# DEPRECATED as of 0.8.0, use noise_reduction instead
-; gravity = 100
-
-
-# In bar height, bars that would have been lower that this will not be drawn.
-# DEPRECATED as of 0.8.0
-; ignore = 0
-
-# Noise reduction, int 0 - 100. default 77
-# the raw visualization is very noisy, this factor adjusts the integral and gravity filters to keep the signal smooth
-# 100 will be very slow and smooth, 0 will be fast but noisy.
-; noise_reduction = 77
-
-
-[eq]
-
-# This one is tricky. You can have as much keys as you want.
-# Remember to uncomment more than one key! More keys = more precision.
-# Look at readme.md on github for further explanations and examples.
-; 1 = 1 # bass
-; 2 = 1
-; 3 = 1 # midtone
-; 4 = 1
-; 5 = 1 # treble

home-manager/users/nix-on-droid/packages/default.nix

@@ -1,68 +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 = lib.mkMerge [
-
-        {
-            home.packages = with pkgs; [
-                killall
-                zip    
-                unzip
-                gcc
-                zulu
-                rsync
-                git
-                openssh
-            ];
-        }
-        
-        (lib.mkIf (!config.homeconfig.minimal) {
-
-            nixpkgs.config = {
-                allowUnfree = true;
-            };
-
-            home.packages = with pkgs; let
-                pypkgs = ps: with ps; [
-                    numpy
-                    pandas
-                    torch
-                    torchvision
-                    torchaudio
-                    transformers
-                    datasets
-                    pyaudio
-                    faster-whisper
-                    pyusb
-                ];
-
-            in [
-
-                cava 
-                neovim-remote
-
-                (pkgs.python311.withPackages pypkgs)
-
-                neofetch
-            ];
-
-        })
-    ];
-
-}

home-manager/users/nix-on-droid/packages/scripts/default.nix

@@ -1,97 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-    options = {
-        homeScripts.enable = lib.options.mkOption {
-            type = lib.types.bool;
-            default = true;
-        };
-    };
-
-    config = lib.mkIf config.homeScripts.enable {
-        home.packages = [
-
-            #scripts
-	        (pkgs.writeShellScriptBin "_systemRebuild" ''
-	            ${pkgs.nh}/bin/nh os switch --ask /home/nathan/Projects/System
-	            echo //////Enter to close//////
-	            read
-	        '')
-	        (pkgs.writeShellScriptBin "_homeRebuild" ''
-	            ${pkgs.nh}/bin/nh home switch --ask /home/nathan/Projects/System
-	            echo //////Enter to close//////
-	            read
-	        '')
-
-	        (pkgs.writeShellScriptBin "randWallpaper" ''
-                file=$(ls /home/nathan/Pictures/Wallpaper/ | shuf -n 1)
-                setWallpaper /home/nathan/Pictures/Wallpaper/$file
-	        '')
-
-	        (pkgs.writeShellScriptBin "setWallpaper" ''
-	            img=''$(realpath ''${1:-~/.cache/bg})
-                p=''$(ps -e | grep mpvpaper | sed -n -e "s/ *//" -e "s/ /\n/" -e "1 P")
-                ${pkgs.mpvpaper}/bin/mpvpaper -f -o "loop" '*' $img && \
-                changeColors $img $2 && \
-                sleep 0.4 && \
-                kill $p
-	        '')
-
-	        (pkgs.writeShellScriptBin "changeColors" ''
-
-	            if [[ $(ls ~/.cache/ | grep bga) != bga ]]; then
-	            echo 100 > ~/.cache/bga
-	            fi
-
-	            alpha=''${2:-`cat ~/.cache/bga`}
-
-	            img=''$(realpath ''${1:-~/.cache/bg})
-	    
-	            if [[ $alpha -lt 0 ]]; then
-	            $alpha=0
-	            fi
-	    
-	            if [[ $alpha -gt 100 ]]; then
-	            $alpha=100
-	            fi
-            
-	            wal -i $img -a $alpha --cols16 -n
-	    
-	            echo $alpha > ~/.cache/bga
-	    
-	            rm ~/.cache/bg
-	            ln -s $img ~/.cache/bg
-            
-	            sleep 0.4
-            
-	            pywalfox update &
-            
-	            themecord > ~/.cache/_.txt && rm ~/.cache/_.txt
-            
-	            [[ $(pidof cava) != "" ]] && pkill -USR1 cava &
-	    
-	            for i in $(ls /run/user/1000 | grep nvim); do nvr -s --servername /run/user/1000/$i --remote-send '<cmd>colorscheme pywal<CR>'; done
-	    
-	            pkill -USR1 kitty
-	        '')
-
-	        (pkgs.writeShellScriptBin "onSystemStart" ''
-		        randWallpaper &
-                ags &
-	            pypr &
-	            lxqt-policykit-agent &
-	           # nmcli device wifi connect EagleNet password '~?C#@ZiH' &
-                hyprctl setcursor Bibata-Modern-Classic 16 &
-                wayvnc &
-		        hyprctl reload &
-                novnc &
-	        '')
-
-	        (pkgs.writeShellScriptBin "colorPrefix" ''
-                exec -a "$0" "$@" &
-	            sleep 0.4 && changeColors &
-	        '')
-
-        ];
-    };
-}
-

home-manager/users/nix-on-droid/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/nix-on-droid/programs/default.nix

@@ -1,17 +0,0 @@
-{ config, lib, pkgs, inputs, ... }: {
-
-    imports = [
-	    ./terminal
-        ./pywal
-        ./calcurse
-    ];
-
-    config = {
-
-        home.packages = [
-            inputs.nixvim.packages.${pkgs.system}.default
-        ];
-
-        home.sessionVariables.EDITOR = "nvim";
-    };
-}

home-manager/users/nix-on-droid/programs/pywal/default.nix

@@ -1,15 +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; [
-            pywal16
-		    imagemagick
-        ];
-    };
-}

home-manager/users/nix-on-droid/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/nix-on-droid/programs/terminal/default.nix

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

home-manager/users/nix-on-droid/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/nix-on-droid/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/nix-on-droid/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/nix-on-droid/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/nix-on-droid/programs/terminal/zoxide/default.nix

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

home-manager/users/nix-on-droid/services/custom/default.nix

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

home-manager/users/nix-on-droid/services/default.nix

@@ -1,4 +0,0 @@
-{ ... }: {
-    imports = [
-    ];
-}

system-config/configuration/android/default.nix

@@ -1,15 +1,23 @@
 { config, lib, pkgs, inputs, ... }: {
 
+    options.sysconfig.remoteBuildClient = with lib; mkOption {
+        type = with types; bool;
+        default = false;
+    };
+
     config = {
+        sysconfig.remoteBuildClient = true;
+
         home-manager = {
             backupFileExtension = ".backup";
             useUserPackages = true;
             useGlobalPkgs = true;
+            extraSpecialArgs = { inherit inputs; };
             sharedModules = [ 
                 inputs.sops-nix.homeManagerModules.sops 
                 inputs.home-manager-config
             ];
-            config = {
+            config = { config, lib, pkgs, ... }: {
                 imports = [
                     inputs.nathan
                 ];
@@ -17,10 +25,13 @@
                     homeconfig = {
                         graphical = false;
                         minimal = true;
-                        homeScripts.enable = false;
+                        host = "android";
+                        scripts.enable = false;
                     };
 
-                    home.homeDirectory = config.user.home;
+                    home.username = "nathan";
+
+                    home.homeDirectory = "/data/data/com.termux.nix/files/home";
                 };
             };
         };
@@ -35,13 +46,35 @@
 
         time.timeZone = "America/Chicago";
 
-        android-integration = {};
+        android-integration = {
+            xdg-open.enable = true;
 
-        system.stateVersion = "24.11";
+            termux-open.enable = true;
+            termux-open-url.enable = true;
+
+            termux-setup-storage.enable = true;
+
+            termux-wake-lock.enable = true;
+            termux-wake-unlock.enable = true;
+
+            am.enable = true;
+        };
+
+        system.stateVersion = "24.05";
 
         environment = {
             etcBackupExtension = ".backup";
             motd = "";
         };
+
+        nix = {
+            nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
+            extraOptions = ''
+                experimental-features = nix-command flakes
+                builders-use-substitutes = true
+                builders = ssh://builder x86_64-linux,aarch64-linux /run/secrets/remoteBuildKey 1 1 nixos-test,benchmark,big-parallel,kvm - -
+            '';
+        };
+
     };
 }

system-config/configuration/containers/default.nix

@@ -0,0 +1 @@
+{ ... }: { config = {}; }

system-config/configuration/containers/nathan/default.nix

@@ -122,11 +122,10 @@
                     {
                         config.homeconfig = {
                             minimal = false;
-                            wayvnc.enable = true;
                             hyprland.enable = false;
                             wal.enable = false;
                             hyprpanel.enable = false;
-                            swaylock.enable = true;
+                            hyprlock.enable = false;
                             mpd.enable = true;
                             calcurse.enable = true;
                             rofi.enable = true;

system-config/configuration/homebox/default.nix

@@ -27,8 +27,6 @@
 
         hardware = {
 
-            graphics.enable = true;
-
             nvidia = {
                 modesetting.enable = true;
                 open = false;
@@ -42,11 +40,11 @@
 
         services = {
             xserver = {
-#enable = true;
+                enable = false;
                 videoDrivers = ["nvidia"];
             };
             displayManager = {
-                enable = true;
+                enable = false;
                 defaultSession = "hyprland";
                 autoLogin = {
                     enable = true;
@@ -54,6 +52,11 @@
                 };
             };
             pulseaudio.enable = false;
+
+            hardware.openrgb = {
+                enable = true;
+                motherboard = "amd";
+            };
         };
 
         systemd.extraConfig = "DefaultLimitNOFILE=2048";
@@ -85,14 +88,14 @@
             nat = {
                 enable = true;
                 internalInterfaces = [ "ve-+" ];
-                externalInterface = "enp6s0";
+                externalInterface = "wlp7s0";
             };
         };
 
         system.stateVersion = "23.05"; # Did you read the comment?
 
             sops = {
-                age.keyFile = "/home/nathan/.config/sops/age/keys.txt";
+                age.keyFile = "/var/lib/sops/age/keys.txt";
                 defaultSopsFile = ./secrets.yaml;
                 defaultSopsFormat = "yaml";
 
@@ -118,7 +121,7 @@
         sysconfig = {
             remoteBuildHost = true;
             host = "homebox";
-            graphical = true;
+            graphical = false;
             users = {
                 nathan = {
                     extraGroups = [ "wheel" "networkmanager" ];
@@ -133,21 +136,23 @@
                         {
                             homeconfig = {
                                 minimal = false;
-                                wayvnc.enable = false;
-                                hyprland.enable = true;
-                                swaylock.enable = true;
+                                hyprland.enable = false;
+                                hyprlock.enable = false;
                                 wal.enable = true;
                                 mpd.enable = true;
-                                hyprpanel.enable = true;
+                                hyprpanel.enable = false;
                                 calcurse.enable = true;
-                                rofi.enable = true;
-                                firefox.enable = true;
+                                rofi.enable = false;
+                                firefox.enable = false;
                                 git.enable = true;
                                 nh.enable = true;
                             };
 
-                            home.packages = [
-                                pkgs.wayvnc
+                            services.hypridle.enable = lib.mkForce false;
+
+                            home.packages = with pkgs; [
+                                wayvnc
+                                openrgb
                             ];
                         } 
                         ];
@@ -164,15 +169,15 @@
             };
 
             programs = {
-                hyprland.enable = true;
-                hyprpanel.enable = true;
+                hyprland.enable = false;
+                hyprpanel.enable = false;
                 steam.enable = false;
             };
 
             virtualization = {
                 traefik.enable = true;
                 jellyfin.enable = true;
-                "blunkall.us".enable = true;
+                "esotericbytes.com".enable = true;
                 nextcloud.enable = true;
                 ntfy.enable = false;
                 gitea.enable = true;
@@ -180,17 +185,18 @@
                 keycloak.enable = true;
                 netbird.enable = true;
                 ollama.enable = true;
+                openwebui.enable = true;
                 homeassistant.enable = true;
                 wyoming = {
                     enable = true;
-                    piper = true;
+                    piper = false;
                     openwakeword = true;
                     faster-whisper = true;
                 };
                 rustdesk.enable = false; #broken
-                    pihole.enable = false; #broken
+                    #pihole.enable = false; #broken
                     code-server.enable = false;
-                novnc.enable = true;
+                novnc.enable = false;
                 minecraft.enable = true;
 
                 sandbox.enable = false;

system-config/configuration/iso/default.nix

@@ -0,0 +1,106 @@
+{ lib, pkgs, inputs, modulesPath, ... }: {
+
+    imports = with inputs; [
+        
+        (modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix")
+        
+        home-manager.nixosModules.default
+
+    ];
+
+    config = {
+
+        fonts.fontconfig.enable = lib.mkForce true;
+        
+        fonts.packages = with pkgs; [ nerd-fonts.fira-code ];
+        environment.systemPackages = with pkgs; [ nerd-fonts.fira-code ];
+        
+        system.stateVersion = "25.05";
+
+        nixpkgs.hostPlatform = "x86_64-linux";
+
+        users.users."nathan" = {
+            hashedPassword = "$y$j9T$F0pn6l4C45lz4a0FTZLqE0$Fc48Ptbmz/3MJCk/Jsaqop4ff.bY3J3GcjhmJx5R7k6";
+            packages = with pkgs; [ 
+                git 
+                nerd-fonts.fira-code
+            ];
+        };
+
+        users.users.nixos.enable = lib.mkForce false;
+
+        services.getty.autologinUser = lib.mkForce null;
+
+        networking = {
+            nameservers = [ "1.1.1.1" "1.0.0.1" ];
+            networkmanager.enable = true;
+        };
+
+        programs.zsh.enable = true;
+
+        environment.shells = with pkgs; [ zsh bashInteractive ];
+
+        sysconfig = {
+            host = "iso";
+            graphical = true;
+            users = {
+                nathan = {
+                    extraGroups = [ "wheel" "networkmanager" ];
+                    shell = pkgs.zsh;
+                    sshKeys = [
+                        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAsU69CxfQk58CvItPN426h5Alnpb60SH37wet97Vb57 nathan@laptop"
+                    ];
+                    home-manager = {
+                        enable = true;
+                        standalone = false;
+                        extraModules = [
+                        {
+                            homeconfig = {
+                                minimal = false;
+                                hyprland.enable = true;
+                                hyprlock.enable = true;
+                                wal.enable = true;
+                                mpd.enable = true;
+                                hyprpanel.enable = true;
+                                rofi.enable = true;
+                                firefox.enable = true;
+                                git.enable = false;
+                                nh.enable = true;
+                            };
+                        } 
+                        ];
+                    };
+                };
+            };
+
+            services = {
+                sddm.enable = true;
+                openssh.enable = true;
+                pipewire.enable = true;
+                #kdePlasma6.enable = true;
+                netbird.enable = true;
+                #ollama.enable = true;
+            };
+
+            programs = {
+                #steam.enable = true;
+                hyprpanel.enable = true;
+                hyprland.enable = true;
+            };
+
+
+            virtualization = {
+
+                wyoming = {
+                    enable = false;
+                };
+
+                homeassistant = {
+                    enable = false;
+                };
+            };
+        };
+
+
+    };
+}

system-config/configuration/laptop/default.nix

@@ -22,19 +22,37 @@
             loader = {
                 systemd-boot.enable = true;
                 efi.canTouchEfiVariables = true;
+                timeout = null;
             };
             kernelParams = [ "snd-intel-dspcfg.dsp_driver=1" ];
         };
 
         systemd.extraConfig = "DefaultLimitNOFILE=2048";
 
+        specialisation = {
+            docked.configuration = {
+                home-manager.users.nathan.wayland.windowManager.hyprland.extraConfig = ''
+                    monitor=eDP-1,1920x1080@300,0x0,1
+                '';
+            };
+        };
+
+        home-manager.users.nathan.wayland.windowManager.hyprland.extraConfig = lib.mkIf (config.specialisation != {}) ''
+            monitor=eDP-1,1920x1080@60,0x0,1
+            monitor=eDP-1, addreserved, 40,0,0,0
+        '';
+
         hardware = {
             graphics.enable = true;
 
+            firmware = with pkgs; [
+                sof-firmware
+            ];
+
             nvidia = {
                 modesetting.enable = true;
                 powerManagement.enable = true;
-                powerManagement.finegrained = false;
+                powerManagement.finegrained = true;
                 open = false;
                 nvidiaSettings = true;
                 package = config.boot.kernelPackages.nvidiaPackages.stable;
@@ -79,9 +97,8 @@
                         {
                             homeconfig = {
                                 minimal = false;
-                                wayvnc.enable = false;
                                 hyprland.enable = true;
-                                swaylock.enable = true;
+                                hyprlock.enable = true;
                                 wal.enable = true;
                                 mpd.enable = true;
                                 hyprpanel.enable = true;
@@ -101,7 +118,6 @@
                 sddm.enable = true;
                 openssh.enable = false;
                 pipewire.enable = true;
-                kdePlasma6.enable = true;
                 netbird.enable = true;
                 ollama.enable = true;
             };
@@ -163,7 +179,7 @@
             };
 
         sops = {
-            age.keyFile = "/home/nathan/.config/sops/age/keys.txt";
+            age.keyFile = "/var/lib/sops/age/keys.txt";
             defaultSopsFile = ./secrets.yaml;
             defaultSopsFormat = "yaml";
             secrets."nathan/pass".neededForUsers = true;

system-config/configuration/live/default.nix

@@ -1,82 +1,121 @@
-{ config, lib, pkgs, inputs, modulesPath, ... }: {
+{ pkgs, inputs, ... }: {
 
     imports = with inputs; [
         
         disko.nixosModules.default
 
-        (import ./disko.nix { device = "/dev/sda"; })
+        (import ./disko.nix { device = "/dev/mmcblk0"; })
 
-        (modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix")
+        sops-nix.nixosModules.sops
 
-        #sops-nix.nixosModules.sops
-
-        #home-manager.nixosModules.default
+        home-manager.nixosModules.default
 
     ];
 
     config = {
 
+        hardware.enableRedistributableFirmware = true;
+        hardware.enableAllHardware = true;
+        
+        programs.zsh.enable = true;
+
+        environment.shells = with pkgs; [ zsh bashInteractive ];
+
+        networking = {
+            nameservers = [ "1.1.1.1" "1.0.0.1" ];
+            networkmanager.enable = true;
+        };
+
         nixpkgs.hostPlatform = "x86_64-linux";
         
         boot = {
-            #kernelPackages = pkgs.linuxKernel.packages.linux_6_6;
             loader = {
                 systemd-boot.enable = true;
                 efi.canTouchEfiVariables = true;
             };
         };
 
-
-        /*sysconfig.opts = {
-            sddm.enable = true;
-            openssh.enable = false;
-            pipewire.enable = true;
-            hyprpanel.enable = true;
-            hyprland.enable = true;
-            git.enable = true;
-            nh.enable = true;
-        };*/
-
         users.users."nathan" = {
-            isNormalUser = true;
-            initialPassword = "7567";
-            extraGroups = [ "wheel" ];
+            hashedPassword = "$y$j9T$F0pn6l4C45lz4a0FTZLqE0$Fc48Ptbmz/3MJCk/Jsaqop4ff.bY3J3GcjhmJx5R7k6";
+            packages = with pkgs; [ 
+                git 
+                nerd-fonts.fira-code
+            ];
         };
 
-        /*home-manager = {
-            backupFileExtension = "backup";
-            extraSpecialArgs = { inherit inputs; };
+        sops = {
+            age.keyFile = "/var/lib/sops/age/keys.txt";
+            defaultSopsFile = ./secrets.yaml;
+            defaultSopsFormat = "yaml";
+            #secrets."nathan/pass".neededForUsers = true;
+        };
+
+        sysconfig = {
+            #remoteBuildClient = true;
+            host = "live";
+            graphical = true;
             users = {
-                "nathan" = lib.mkMerge [
-                    inputs.nathan-home-manager
-                    {
-                        config.homeconfig = {
-                            hyprland.enable = true;
-                            swaylock.enable = true;
-                            wal.enable = true;
-                            wayvnc.enable = false;
-                            mpd.enable = true;
-                            hyprpanel.enable = true;
-                            calcurse.enable = true;
-                            rofi.enable = true;
-                            firefox.enable = true;
-                        };
-                    }
-                ];
+                nathan = {
+                    extraGroups = [ "wheel" "networkmanager" ];
+                    #hashedPasswordFile = config.sops.secrets."nathan/pass".path;
+                    shell = pkgs.zsh;
+                    sshKeys = [
+                        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAsU69CxfQk58CvItPN426h5Alnpb60SH37wet97Vb57 nathan@laptop"
+                    ];
+                    home-manager = {
+                        enable = true;
+                        standalone = false;
+                        extraModules = [
+                        {
+                            homeconfig = {
+                                minimal = false;
+                                hyprland.enable = true;
+                                hyprlock.enable = true;
+                                wal.enable = true;
+                                mpd.enable = true;
+                                hyprpanel.enable = true;
+                                calcurse.enable = true;
+                                rofi.enable = true;
+                                firefox.enable = true;
+                                #git.enable = true;
+                                nh.enable = true;
+                            };
+                        } 
+                        ];
+                    };
+                };
             };
-        };*/
 
-        system.stateVersion = "24.11";
+            services = {
+                sddm.enable = true;
+                openssh.enable = true;
+                pipewire.enable = true;
+                #kdePlasma6.enable = true;
+                netbird.enable = true;
+                #ollama.enable = true;
+            };
 
-        nix = {
-            nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
-            settings = {
-                experimental-features = [ "nix-command" "flakes" ];
+            programs = {
+                #steam.enable = true;
+                hyprpanel.enable = true;
+                hyprland.enable = true;
+            };
+
+
+            virtualization = {
+
+                wyoming = {
+                    enable = false;
+                };
+
+                homeassistant = {
+                    enable = false;
+                };
             };
         };
 
-        networking.hostName = "live";
+        system.stateVersion = "25.05";
 
-        fonts.packages = with pkgs; [ fira-code-nerdfont ];
+        fonts.packages = with pkgs; [ nerd-fonts.fira-code ];
     };
 }