test

This reverts commit b6911bc045.

.gitignore

@@ -1 +0,0 @@
-hosts/desktop/hardware-configuration.nix

README.md

@@ -37,7 +37,7 @@ Sakamoto NixOS is built with various profiles intended for reproducibility.
 
     Modify it to fit your system — especially your **username**.  
     If you accidentally leave the default `biscuit`, that user will be created.  
-    **Login password for `biscuit` is `Your-generic-password`.**
+    **Login password for `biscuit` is `<PLACEHOLDER>`.**
 
 5. Execute the following command based on your host:
 

config.nix

@@ -1,92 +1,82 @@
 {
-  myConfig = {
+  hostname = "hakase";
-    general = {
+  username = "kenji";
-      Hostname = "hakase";
+  timezone = "America/Chicago";
-      Username = "kenji";
-      Timezone = "America/Chicago";
 
-      allowUnfree = true; # allows installation of commercial apps.
+  vpn = {
+    vpnEnable = false;
+    vpnSecretFile = "/home/kenji/Wireguard/secret";
+  };
 
-      terminal = {
+  gitProfile = {
-        Font = "JetBrainsMono Nerd Font"; # e.g., JetBrainsMono Nerd Font
+    user = "biscuit";
-        Size = "18";
+    email = "biscuit@sakamoto.dev";
-        Shell = "fish";
+    defaultBranch = "master";
-        Aliases = {
+  };
-          ls = "ls --color=auto";
-          update = ''
-            sh -c '
-              if [ "$(uname)" = "Darwin" ]; then
-                sudo darwin-rebuild switch --flake ~/.config/nixos#macos
-              else
-                sudo nixos-rebuild switch --flake ~/.config/nixos#desktop && home-manager switch --flake ~/.config/nixos#desktop
-              fi
-            '
-          '';
-          agu = "pkill gjs & ags run ~/.config/nixos/packages/ags/biscuit/app.ts & disown (jobs -p) &";
-        };
-      };
-      gitProfile = {
-        User = "kenji";
-        Email = "kenji@sakamoto.dev";
-        defaultBranch = "master";
-      };
-      ssh = {
-        extraConfig = ''
-          Host gitea.sakamoto.dev
-            User kenji
-            ProxyCommand cloudflared access ssh --hostname %h
-            HostName gitea.sakamoto.dev
-        '';
-      };
-    };
 
-    builds = {
+  terminal = {
-      builder = {
+    termFont = "JetBrainsMono Nerd Font"; # e.g., JetBrainsMono Nerd Font
-        trustedUsers = [
+    termSize = "20";
-          "@groups"
+    termShell = "fish";
-          "biscuit"
+    shellAliases = {
-        ];
+      ls = "ls --color=auto";
-        buildMachines = [
+      update = ''
-          {
+        sh -c '
-            hostName = "192.168.68.81";
+          if [ "$(uname)" = "Darwin" ]; then
-            sshUser = "biscuit";
+            sudo darwin-rebuild switch --flake ~/.config/nixos#macos
-            sshKey = "/home/biscuit/.ssh/id_rsa.pub";
+          else
-            system = "x86_64-linux";
+            sudo nixos-rebuild switch --flake ~/.config/nixos#desktop && home-manager switch --flake ~/.config/nixos#desktop
-            supportedFeatures = ["big-parallel" "kvm" "nixos-test"];
+          fi
-          }
+        '
-        ];
+      '';
-      };
+      agu = "pkill gjs & ags run ~/.config/nixos/pkgs/ags/biscuit/app.ts & disown (jobs -p) &";
-    };
-
-    linux = {
-      system = "x86_64";
-      gaming = true;
-
-      vpn = {
-        Enable = false;
-        secretFile = builtins.toPath ./secrets/.vpn.yaml;
-      };
-
-      touchpadSupport = false;
-      logitech-hardware.enable = true;
-
-      # Custom Applications
-      apps = {
-        gaming = true;
-        apps = pkgs:
-          with pkgs; [
-            jellyfin-media-player
-          ];
-      };
-      hyprconf = {
-        Monitor = [
-          # hyprctl monitors all
-          # monitor, resolution@refreshrate, position (e.g., 0x0 is middle, 0x1080 is top), scale
-          "DP-1,highres@165,0x1080,auto"
-          "DP-2,highres@highrr,0x0,auto"
-          "HDMI-A-1, preferred, 20000x20000,1"
-        ];
-      };
     };
   };
+
+  allowUnfree = true; # allows installation of commercial apps.
+  touchpadSupport = false;
+
+  logitech-hardware = {
+    enable = true;
+  };
+
+  # Custom Applications
+  linux-apps = {
+    gamingDesktop = true; # adds steam
+    my-apps = pkgs:
+      with pkgs; [
+        jellyfin-media-player
+        mangohud
+      ];
+  };
+
+  hyprconf = {
+    monitor = [
+      "DP-1,highres@165,0x1080,auto"
+      "DP-2,highres@highrr,0x0,auto"
+    ];
+  };
+
+  sshExtraConfig = ''
+    Host macair
+      User biscuit
+      HostName 192.168.68.81
+  '';
+
+  # BUILD (optional), you can remove these blocks.
+  builder = {
+    trustedUsers = [
+      "@groups"
+      "biscuit"
+    ];
+    buildMachines = [
+      {
+        hostName = "192.168.68.81";
+        sshUser = "biscuit";
+        sshKey = "/home/biscuit/.ssh/id_rsa.pub";
+        system = "x86_64-linux";
+        supportedFeatures = ["big-parallel" "kvm" "nixos-test"];
+      }
+    ];
+  };
 }

flake.lock

@@ -3,9 +3,7 @@
     "ags": {
       "inputs": {
         "astal": "astal",
-        "nixpkgs": [
+        "nixpkgs": ["nixpkgs"]
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1744557573,
@@ -23,22 +21,10 @@
     },
     "aquamarine": {
       "inputs": {
-        "hyprutils": [
+        "hyprutils": ["hyprland", "hyprutils"],
-          "hyprland",
+        "hyprwayland-scanner": ["hyprland", "hyprwayland-scanner"],
-          "hyprutils"
+        "nixpkgs": ["hyprland", "nixpkgs"],
-        ],
+        "systems": ["hyprland", "systems"]
-        "hyprwayland-scanner": [
-          "hyprland",
-          "hyprwayland-scanner"
-        ],
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
       },
       "locked": {
         "lastModified": 1747864449,
@@ -56,10 +42,7 @@
     },
     "astal": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": ["ags", "nixpkgs"]
-          "ags",
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1742571008,
@@ -77,9 +60,7 @@
     },
     "darwin": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": ["nixpkgs"]
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1749194393,
@@ -97,11 +78,7 @@
     },
     "devshell": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": ["nix-neovim", "nixvim", "nixpkgs"]
-          "nixovim",
-          "nixvim",
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1735644329,
@@ -152,11 +129,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1749398372,
+        "lastModified": 1738453229,
-        "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=",
+        "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569",
+        "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
         "type": "github"
       },
       "original": {
@@ -167,7 +144,7 @@
     },
     "flake-parts_2": {
       "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib_2"
+        "nixpkgs-lib": ["nix-neovim", "nixvim", "nixpkgs"]
       },
       "locked": {
         "lastModified": 1738453229,
@@ -185,18 +162,14 @@
     },
     "flake-parts_3": {
       "inputs": {
-        "nixpkgs-lib": [
+        "nixpkgs-lib": ["nixvim", "nixpkgs"]
-          "nixovim",
-          "nixvim",
-          "nixpkgs"
-        ]
       },
       "locked": {
-        "lastModified": 1738453229,
+        "lastModified": 1743550720,
-        "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
+        "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
+        "rev": "c621e8422220273271f52058f618c94e405bb0f5",
         "type": "github"
       },
       "original": {
@@ -207,7 +180,7 @@
     },
     "flake-utils": {
       "inputs": {
-        "systems": "systems_3"
+        "systems": "systems_2"
       },
       "locked": {
         "lastModified": 1731533236,
@@ -241,19 +214,47 @@
         "type": "github"
       }
     },
+    "flake-utils_3": {
+      "inputs": {
+        "systems": "systems_5"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_4": {
+      "inputs": {
+        "systems": "systems_7"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "git-hooks": {
       "inputs": {
-        "flake-compat": [
+        "flake-compat": ["nix-neovim", "nixvim", "flake-compat"],
-          "nixovim",
-          "nixvim",
-          "flake-compat"
-        ],
         "gitignore": "gitignore_2",
-        "nixpkgs": [
+        "nixpkgs": ["nix-neovim", "nixvim", "nixpkgs"]
-          "nixovim",
-          "nixvim",
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1737465171,
@@ -271,11 +272,7 @@
     },
     "gitignore": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": ["hyprland", "pre-commit-hooks", "nixpkgs"]
-          "hyprland",
-          "pre-commit-hooks",
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1709087332,
@@ -293,12 +290,7 @@
     },
     "gitignore_2": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": ["nix-neovim", "nixvim", "git-hooks", "nixpkgs"]
-          "nixovim",
-          "nixvim",
-          "git-hooks",
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1709087332,
@@ -316,9 +308,7 @@
     },
     "home-manager": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": ["nixpkgs"]
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1748979197,
@@ -336,11 +326,7 @@
     },
     "home-manager_2": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": ["nix-neovim", "nixvim", "nixpkgs"]
-          "nixovim",
-          "nixvim",
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1738878603,
@@ -358,18 +344,9 @@
     },
     "hyprcursor": {
       "inputs": {
-        "hyprlang": [
+        "hyprlang": ["hyprland", "hyprlang"],
-          "hyprland",
+        "nixpkgs": ["hyprland", "nixpkgs"],
-          "hyprlang"
+        "systems": ["hyprland", "systems"]
-        ],
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
       },
       "locked": {
         "lastModified": 1745948457,
@@ -387,18 +364,9 @@
     },
     "hyprgraphics": {
       "inputs": {
-        "hyprutils": [
+        "hyprutils": ["hyprland", "hyprutils"],
-          "hyprland",
+        "nixpkgs": ["hyprland", "nixpkgs"],
-          "hyprutils"
+        "systems": ["hyprland", "systems"]
-        ],
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
       },
       "locked": {
         "lastModified": 1745015490,
@@ -424,9 +392,7 @@
         "hyprlang": "hyprlang",
         "hyprutils": "hyprutils",
         "hyprwayland-scanner": "hyprwayland-scanner",
-        "nixpkgs": [
+        "nixpkgs": ["nixpkgs"],
-          "nixpkgs"
-        ],
         "pre-commit-hooks": "pre-commit-hooks",
         "systems": "systems",
         "xdph": "xdph"
@@ -447,14 +413,8 @@
     },
     "hyprland-protocols": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": ["hyprland", "nixpkgs"],
-          "hyprland",
+        "systems": ["hyprland", "systems"]
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
       },
       "locked": {
         "lastModified": 1743714874,
@@ -472,21 +432,9 @@
     },
     "hyprland-qt-support": {
       "inputs": {
-        "hyprlang": [
+        "hyprlang": ["hyprland", "hyprland-qtutils", "hyprlang"],
-          "hyprland",
+        "nixpkgs": ["hyprland", "hyprland-qtutils", "nixpkgs"],
-          "hyprland-qtutils",
+        "systems": ["hyprland", "hyprland-qtutils", "systems"]
-          "hyprlang"
-        ],
-        "nixpkgs": [
-          "hyprland",
-          "hyprland-qtutils",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "hyprland-qtutils",
-          "systems"
-        ]
       },
       "locked": {
         "lastModified": 1737634706,
@@ -505,24 +453,10 @@
     "hyprland-qtutils": {
       "inputs": {
         "hyprland-qt-support": "hyprland-qt-support",
-        "hyprlang": [
+        "hyprlang": ["hyprland", "hyprlang"],
-          "hyprland",
+        "hyprutils": ["hyprland", "hyprland-qtutils", "hyprlang", "hyprutils"],
-          "hyprlang"
+        "nixpkgs": ["hyprland", "nixpkgs"],
-        ],
+        "systems": ["hyprland", "systems"]
-        "hyprutils": [
-          "hyprland",
-          "hyprland-qtutils",
-          "hyprlang",
-          "hyprutils"
-        ],
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
       },
       "locked": {
         "lastModified": 1745951494,
@@ -540,18 +474,9 @@
     },
     "hyprlang": {
       "inputs": {
-        "hyprutils": [
+        "hyprutils": ["hyprland", "hyprutils"],
-          "hyprland",
+        "nixpkgs": ["hyprland", "nixpkgs"],
-          "hyprutils"
+        "systems": ["hyprland", "systems"]
-        ],
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
       },
       "locked": {
         "lastModified": 1747484975,
@@ -569,14 +494,8 @@
     },
     "hyprutils": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": ["hyprland", "nixpkgs"],
-          "hyprland",
+        "systems": ["hyprland", "systems"]
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
       },
       "locked": {
         "lastModified": 1746635225,
@@ -594,14 +513,8 @@
     },
     "hyprwayland-scanner": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": ["hyprland", "nixpkgs"],
-          "hyprland",
+        "systems": ["hyprland", "systems"]
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
       },
       "locked": {
         "lastModified": 1747584298,
@@ -620,17 +533,12 @@
     "ixx": {
       "inputs": {
         "flake-utils": [
-          "nixovim",
+          "nix-neovim",
           "nixvim",
           "nuschtosSearch",
           "flake-utils"
         ],
-        "nixpkgs": [
+        "nixpkgs": ["nix-neovim", "nixvim", "nuschtosSearch", "nixpkgs"]
-          "nixovim",
-          "nixvim",
-          "nuschtosSearch",
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1729958008,
@@ -647,12 +555,30 @@
         "type": "github"
       }
     },
+    "ixx_2": {
+      "inputs": {
+        "flake-utils": ["nixvim", "nuschtosSearch", "flake-utils"],
+        "nixpkgs": ["nixvim", "nuschtosSearch", "nixpkgs"]
+      },
+      "locked": {
+        "lastModified": 1748294338,
+        "narHash": "sha256-FVO01jdmUNArzBS7NmaktLdGA5qA3lUMJ4B7a05Iynw=",
+        "owner": "NuschtOS",
+        "repo": "ixx",
+        "rev": "cc5f390f7caf265461d4aab37e98d2292ebbdb85",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NuschtOS",
+        "ref": "v0.0.8",
+        "repo": "ixx",
+        "type": "github"
+      }
+    },
     "matugen": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": ["nixpkgs"],
-          "nixpkgs"
+        "systems": "systems_3"
-        ],
-        "systems": "systems_2"
       },
       "locked": {
         "lastModified": 1745334376,
@@ -670,11 +596,7 @@
     },
     "nix-darwin": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": ["nix-neovim", "nixvim", "nixpkgs"]
-          "nixovim",
-          "nixvim",
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1738743987,
@@ -690,33 +612,10 @@
         "type": "github"
       }
     },
-    "nix-gaming": {
+    "nix-neovim": {
       "inputs": {
         "flake-parts": "flake-parts",
-        "nixpkgs": [
+        "nixpkgs": ["nixpkgs"],
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1751075759,
-        "narHash": "sha256-MNAlH/IlSkg5ODfLEgYuDvs4XrM8n3Ukmh6OqQxoJ6s=",
-        "owner": "fufexan",
-        "repo": "nix-gaming",
-        "rev": "622e26d86942642483e1a49d4f0dea2cbb80e6c1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "fufexan",
-        "repo": "nix-gaming",
-        "type": "github"
-      }
-    },
-    "nixovim": {
-      "inputs": {
-        "flake-parts": "flake-parts_2",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
         "nixvim": "nixvim",
         "rust-overlay": "rust-overlay"
       },
@@ -727,11 +626,11 @@
         "rev": "be2e51f4ddec2389d282280871ca484f3f1f0892",
         "revCount": 60,
         "type": "git",
-        "url": "https://git.sakamoto.dev/kenji/nixovim.git"
+        "url": "https://git.sakamoto.dev/kenji/nix-neovim.git"
       },
       "original": {
         "type": "git",
-        "url": "https://git.sakamoto.dev/kenji/nixovim.git"
+        "url": "https://git.sakamoto.dev/kenji/nix-neovim.git"
       }
     },
     "nixpkgs": {
@@ -751,21 +650,6 @@
       }
     },
     "nixpkgs-lib": {
-      "locked": {
-        "lastModified": 1748740939,
-        "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=",
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "rev": "656a64127e9d791a334452c6b6606d17539476e2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "type": "github"
-      }
-    },
-    "nixpkgs-lib_2": {
       "locked": {
         "lastModified": 1738452942,
         "narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=",
@@ -813,7 +697,7 @@
       "inputs": {
         "devshell": "devshell",
         "flake-compat": "flake-compat_2",
-        "flake-parts": "flake-parts_3",
+        "flake-parts": "flake-parts_2",
         "git-hooks": "git-hooks",
         "home-manager": "home-manager_2",
         "nix-darwin": "nix-darwin",
@@ -835,15 +719,32 @@
         "type": "github"
       }
     },
+    "nixvim_2": {
+      "inputs": {
+        "flake-parts": "flake-parts_3",
+        "nixpkgs": ["nixpkgs"],
+        "nuschtosSearch": "nuschtosSearch_2",
+        "systems": "systems_6"
+      },
+      "locked": {
+        "lastModified": 1748942960,
+        "narHash": "sha256-gJf3WxvDbvCpzIBVju/5GY/olW7zs/B1zDmB52AWMUM=",
+        "owner": "nix-community",
+        "repo": "nixvim",
+        "rev": "9328f4437d5f788d1c066b274a0aea492dc5fde2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixvim",
+        "type": "github"
+      }
+    },
     "nuschtosSearch": {
       "inputs": {
-        "flake-utils": "flake-utils",
+        "flake-utils": "flake-utils_2",
         "ixx": "ixx",
-        "nixpkgs": [
+        "nixpkgs": ["nix-neovim", "nixvim", "nixpkgs"]
-          "nixovim",
-          "nixvim",
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1738508923,
@@ -859,14 +760,31 @@
         "type": "github"
       }
     },
+    "nuschtosSearch_2": {
+      "inputs": {
+        "flake-utils": "flake-utils_3",
+        "ixx": "ixx_2",
+        "nixpkgs": ["nixvim", "nixpkgs"]
+      },
+      "locked": {
+        "lastModified": 1748298102,
+        "narHash": "sha256-PP11GVwUt7F4ZZi5A5+99isuq39C59CKc5u5yVisU/U=",
+        "owner": "NuschtOS",
+        "repo": "search",
+        "rev": "f8a1c221afb8b4c642ed11ac5ee6746b0fe1d32f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NuschtOS",
+        "repo": "search",
+        "type": "github"
+      }
+    },
     "pre-commit-hooks": {
       "inputs": {
         "flake-compat": "flake-compat",
         "gitignore": "gitignore",
-        "nixpkgs": [
+        "nixpkgs": ["hyprland", "nixpkgs"]
-          "hyprland",
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1747372754,
@@ -882,26 +800,6 @@
         "type": "github"
       }
     },
-    "quickshell": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1751354716,
-        "narHash": "sha256-bLMNn3gh09gtkIEwZW3USt4ehLrmwmfnb3rqahYBI+4=",
-        "ref": "refs/heads/master",
-        "rev": "f681e2016fd71b42985bd520b3a20c62488582e9",
-        "revCount": 599,
-        "type": "git",
-        "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
-      }
-    },
     "root": {
       "inputs": {
         "ags": "ags",
@@ -909,11 +807,9 @@
         "home-manager": "home-manager",
         "hyprland": "hyprland",
         "matugen": "matugen",
-        "nix-gaming": "nix-gaming",
+        "nix-neovim": "nix-neovim",
-        "nixovim": "nixovim",
         "nixpkgs": "nixpkgs_3",
-        "quickshell": "quickshell",
+        "nixvim": "nixvim_2",
-        "sops-nix": "sops-nix",
         "unlisted-fonts": "unlisted-fonts"
       }
     },
@@ -935,26 +831,6 @@
         "type": "github"
       }
     },
-    "sops-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1750119275,
-        "narHash": "sha256-Rr7Pooz9zQbhdVxux16h7URa6mA80Pb/G07T4lHvh0M=",
-        "owner": "Mic92",
-        "repo": "sops-nix",
-        "rev": "77c423a03b9b2b79709ea2cb63336312e78b72e2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Mic92",
-        "repo": "sops-nix",
-        "type": "github"
-      }
-    },
     "systems": {
       "locked": {
         "lastModified": 1689347949,
@@ -971,21 +847,6 @@
       }
     },
     "systems_2": {
-      "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "type": "github"
-      }
-    },
-    "systems_3": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -1000,6 +861,21 @@
         "type": "github"
       }
     },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1689347949,
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "type": "github"
+      }
+    },
     "systems_4": {
       "locked": {
         "lastModified": 1681028828,
@@ -1015,13 +891,54 @@
         "type": "github"
       }
     },
+    "systems_5": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_6": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_7": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "treefmt-nix": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": ["nix-neovim", "nixvim", "nixpkgs"]
-          "nixovim",
-          "nixvim",
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1738680491,
@@ -1039,10 +956,8 @@
     },
     "unlisted-fonts": {
       "inputs": {
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils_4",
-        "nixpkgs": [
+        "nixpkgs": ["nixpkgs"]
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1748987994,
@@ -1060,30 +975,12 @@
     },
     "xdph": {
       "inputs": {
-        "hyprland-protocols": [
+        "hyprland-protocols": ["hyprland", "hyprland-protocols"],
-          "hyprland",
+        "hyprlang": ["hyprland", "hyprlang"],
-          "hyprland-protocols"
+        "hyprutils": ["hyprland", "hyprutils"],
-        ],
+        "hyprwayland-scanner": ["hyprland", "hyprwayland-scanner"],
-        "hyprlang": [
+        "nixpkgs": ["hyprland", "nixpkgs"],
-          "hyprland",
+        "systems": ["hyprland", "systems"]
-          "hyprlang"
-        ],
-        "hyprutils": [
-          "hyprland",
-          "hyprutils"
-        ],
-        "hyprwayland-scanner": [
-          "hyprland",
-          "hyprwayland-scanner"
-        ],
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
       },
       "locked": {
         "lastModified": 1745871725,

flake.nix

@@ -1,5 +1,5 @@
 {
-  description = "Sakamoto's NixOS Configuration";
+  description = "A very basic flake";
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
@@ -17,20 +17,17 @@
     unlisted-fonts.url = "git+https://git.sakamoto.dev/kenji/nix-fonts.git";
     unlisted-fonts.inputs.nixpkgs.follows = "nixpkgs";
 
-    nixovim.url = "git+https://git.sakamoto.dev/kenji/nixovim.git";
+    nixvim.url = "github:nix-community/nixvim";
-    nixovim.inputs.nixpkgs.follows = "nixpkgs";
+    nixvim.inputs.nixpkgs.follows = "nixpkgs";
+
+    nix-neovim.url = "git+https://git.sakamoto.dev/kenji/nix-neovim.git";
+    nix-neovim.inputs.nixpkgs.follows = "nixpkgs";
+
+    # kitty-catppuccin.url = "git+https://git.sakamoto.dev/kenji/nix-kitty-catppuccin.git";
+    # kitty-catppuccin.inputs.nixpkgs.follows = "nixpkgs";
 
     matugen.url = "github:/InioX/Matugen";
     matugen.inputs.nixpkgs.follows = "nixpkgs";
-
-    nix-gaming.url = "github:fufexan/nix-gaming";
-    nix-gaming.inputs.nixpkgs.follows = "nixpkgs";
-
-    sops-nix.url = "github:Mic92/sops-nix";
-    sops-nix.inputs.nixpkgs.follows = "nixpkgs";
-
-    quickshell.url = "git+https://git.outfoxxed.me/outfoxxed/quickshell";
-    quickshell.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   outputs = {
@@ -41,7 +38,7 @@
     ags,
     hyprland,
     unlisted-fonts,
-    nixovim,
+    nix-neovim,
     ...
   } @ inputs: let
     config = import ./config.nix;
@@ -54,13 +51,13 @@
       }
       // config;
   in {
-    # nixosConfiguration for linux system
+    # linux only
     nixosConfigurations = {
       desktop = lib.nixosSystem {
         inherit system;
         specialArgs = args;
         modules = [
-          ./hosts/desktop/configuration.nix
+          ./nixos/desktop/configuration.nix
         ];
       };
     };
@@ -77,33 +74,16 @@
           ];
         };
         extraSpecialArgs = args;
-        modules = [./home/desktop.nix];
+        modules = [./home/desktop/home.nix];
-      };
-
-      gaming = home-manager.lib.homeManagerConfiguration {
-        pkgs = import nixpkgs {
-          inherit system;
-          overlays = [];
-        };
-        extraSpecialArgs = args;
-        modules = [./home/gaming.nix];
-      };
-      headless = home-manager.lib.homeManagerConfiguration {
-        pkgs = import nixpkgs {
-          inherit system;
-          overlays = [];
-        };
-        extraSpecialArgs = args;
-        modules = [./home/headless.nix];
       };
     };
-    # darwinConfiguration for macOS M series
+    # exclusive to macos M series
     darwinConfigurations = {
       macos = darwin.lib.darwinSystem {
         system = "aarch64-darwin";
         specialArgs = args;
         modules = [
-          ./hosts/macos/darwin.nix
+          ./nixos/macos/darwin.nix
           home-manager.darwinModules.home-manager
           {
             home-manager.useGlobalPkgs = true;

home/desktop.nix

@@ -1,22 +0,0 @@
-{
-  myConfig,
-  lib,
-  ...
-}: {
-  imports = [
-    ../modules/terminal.nix
-    ../modules/desktop.nix
-  ];
-
-  programs.home-manager.enable = true;
-
-  home = {
-    username = "${myConfig.general.Username}";
-    homeDirectory = "/home/${myConfig.general.Username}";
-    packages = [];
-    sessionVariables = {};
-  };
-
-  systemd.user.startServices = "sd-switch";
-  home.stateVersion = "23.05";
-}

home/desktop/home.nix

@@ -0,0 +1,20 @@
+{username, ...}: {
+  imports = [
+    ../../modules/editor.nix
+    ../../modules/desktop/display-manager.nix
+    ../../modules/desktop/misc.nix
+    ../../modules/desktop/app.nix
+  ];
+
+  programs.home-manager.enable = true;
+
+  home = {
+    username = "${username}";
+    homeDirectory = "/home/${username}";
+    packages = [];
+    sessionVariables = {};
+  };
+
+  systemd.user.startServices = "sd-switch";
+  home.stateVersion = "23.05";
+}

home/macos/home.nix

@@ -5,7 +5,7 @@
   ...
 }: {
   imports = [
-    ../modules/terminal.nix
+    ../../modules/editor.nix
   ];
 
   programs.home-manager.enable = true;

hosts/desktop/configuration.nix

@@ -1,36 +0,0 @@
-{
-  pkgs,
-  myConfig,
-  inputs,
-  lib,
-  ...
-}: {
-  imports =
-    [
-      inputs.sops-nix.nixosModules.sops
-      ./hardware-configuration.nix
-      ../../modules/linuxDev.nix
-      ../../modules/system.nix
-      ../../modules/de.nix
-    ]
-    ++ lib.optionals (myConfig.linux.apps.gaming == true) [
-      ../../modules/gaming.nix
-    ];
-
-  environment.systemPackages = [];
-
-  nixpkgs.config.allowUnfree = true;
-
-  nix.settings = {
-    trusted-users = myConfig.builds.builder.trustedUsers;
-    experimental-features = ["nix-command" "flakes"];
-  };
-
-  programs.ssh.extraConfig = myConfig.general.ssh.extraConfig;
-
-  nix.distributedBuilds = true;
-  nix.settings.builders-use-substitutes = true;
-
-  # nix.buildMachines = builder.buildMachines;
-  system.stateVersion = "25.05";
-}

modules/app.nix

@@ -0,0 +1,13 @@
+{
+  linux-apps,
+  lib,
+  ...
+}: {
+  imports =
+    [
+    ]
+    ++ lib.optionals (linux-apps.gamingDesktop == true) [
+      ../pkgs/steam/default.nix
+      ../pkgs/heroic/default.nix
+    ];
+}

modules/de.nix

@@ -1,19 +0,0 @@
-{
-  lib,
-  myConfig,
-  ...
-}: {
-  imports =
-    [
-      ../system/font.nix
-      ../system/browser.nix
-      ../system/wayland.nix
-      ../system/graphics.nix
-      ../system/security.nix
-
-      # FIXME
-      ../system/amd.nix
-    ]
-    ++ lib.optionals (myConfig.linux.gaming == true) [
-    ];
-}

modules/desktop.nix

@@ -1,20 +0,0 @@
-{
-  lib,
-  myConfig,
-  ...
-}: {
-  imports =
-    [
-      ../packages/hyprland/default.nix
-      ../packages/hypridle/default.nix
-      ../packages/hyprlock/default.nix
-      ../packages/rofi/default.nix
-      ../packages/matugen/default.nix
-      ../packages/swww/default.nix
-      ../packages/quickshell/default.nix
-      ../packages/ags/default.nix
-    ]
-    ++ lib.optionals (myConfig.linux.gaming == true) [
-      ../packages/mangohud/default.nix
-    ];
-}

modules/desktop/app.nix

@@ -0,0 +1,5 @@
+{pkgs, ...}: let
+  info = import ../../config.nix;
+in {
+  home.packages = info.linux-apps.my-apps pkgs;
+}

modules/desktop/display-manager.nix

@@ -0,0 +1,11 @@
+{...}: {
+  imports = [
+    ../../pkgs/hyprland/default.nix
+    ../../pkgs/ags/default.nix
+    ../../pkgs/swww/default.nix
+    ../../pkgs/waybar/default.nix
+    ../../pkgs/rofi/default.nix
+    ../../pkgs/hypridle/default.nix
+    ../../pkgs/hyprlock/default.nix
+  ];
+}

modules/desktop/misc.nix

@@ -0,0 +1,6 @@
+{...}: {
+  imports = [
+    ../../pkgs/btop/default.nix
+    ../../pkgs/matugen/default.nix
+  ];
+}

modules/display-manager.nix

@@ -0,0 +1,11 @@
+{...}: {
+  imports = [
+    ../system/desktop/wayland.nix
+    ../system/desktop/sound.nix
+    ../system/desktop/misc.nix
+    ../system/desktop/browser.nix
+    ../system/desktop/font.nix
+    ../system/desktop/theme.nix
+    ../system/desktop/cursor.nix
+  ];
+}

modules/editor.nix

@@ -0,0 +1,11 @@
+{...}: {
+  imports = [
+    ../pkgs/fastfetch/default.nix
+    ../pkgs/git/default.nix
+    ../pkgs/kitty/default.nix
+    ../pkgs/neovim/default.nix
+    ../pkgs/fish/default.nix
+    ../pkgs/starship/default.nix
+    ../pkgs/zsh/default.nix
+  ];
+}

modules/gaming.nix

@@ -1,7 +0,0 @@
-{
-  imports = [
-    ../system/stream.nix
-    ../system/gaming.nix
-    ../system/appimage.nix
-  ];
-}

modules/linuxDev.nix

@@ -1,7 +0,0 @@
-{...}: {
-  imports = [
-    ../system/dev/tools.nix
-    ../system/dev/python.nix
-    ../system/dev/linux.nix
-  ];
-}

modules/macosDev.nix

@@ -1,6 +0,0 @@
-{...}: {
-  imports = [
-    ../system/dev/tools.nix
-    ../system/dev/python.nix
-  ];
-}

modules/system.nix

@@ -1,13 +1,14 @@
-{...}: {
+{
-  imports = [
+  vpn,
-    ../system/users.nix
+  lib,
-    ../system/hardware.nix
+  ...
-    ../system/locale.nix
+}: {
-    ../system/network.nix
+  imports =
-    ../system/programs.nix
+    [
-    ../system/services.nix
+      ../system/default.nix
-    ../system/tty.nix
+      ../system/users.nix
-    ../system/firewall.nix
+    ]
-    ../system/boot.nix
+    ++ lib.optionals (vpn.vpnEnable == true) [
-  ];
+      ../system/vpn.nix
+    ];
 }

modules/terminal.nix

@@ -1,11 +0,0 @@
-{...}: {
-  imports = [
-    ../packages/git/default.nix
-    ../packages/fish/default.nix
-    ../packages/kitty/default.nix
-    ../packages/neovim/default.nix
-    ../packages/starship/default.nix
-    ../packages/fastfetch/default.nix
-    ../packages/zsh/default.nix
-  ];
-}

nixos/desktop/configuration.nix

@@ -0,0 +1,35 @@
+{
+  pkgs,
+  allowUnfree,
+  builder,
+  sshExtraConfig,
+  ...
+}: {
+  imports = [
+    # Include the results of the hardware scan.
+    /etc/nixos/hardware-configuration.nix
+    ../../modules/system.nix
+    ../../modules/display-manager.nix
+    ../../modules/app.nix
+  ];
+
+  environment.systemPackages = with pkgs; [
+    vim
+    wget
+  ];
+
+  nixpkgs.config.allowUnfree = allowUnfree;
+
+  nix.settings = {
+    trusted-users = builder.trustedUsers;
+    experimental-features = ["nix-command" "flakes"];
+  };
+
+  programs.ssh.extraConfig = sshExtraConfig;
+
+  nix.distributedBuilds = true;
+  nix.settings.builders-use-substitutes = true;
+
+  # nix.buildMachines = builder.buildMachines;
+  system.stateVersion = "25.05";
+}

nixos/desktop/hardware-configuration.nix

@@ -0,0 +1,48 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/3f2c4a5a-3124-462a-9fb9-cccc933bac63";
+      fsType = "btrfs";
+      options = [ "subvol=@" ];
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/18F8-7DC1";
+      fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
+    };
+
+  fileSystems."/mnt/CRUCIAL" =
+    { device = "/dev/disk/by-uuid/394f67b9-e75b-40cc-9b15-28bbda40fff4";
+      fsType = "ext4";
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/bbe1e281-4b1d-4d85-ba6a-6f5265f0e3a3"; }
+    ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.biscuit-default.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp11s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp10s0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

nixos/macos/darwin.nix

@@ -1,16 +1,14 @@
 {
   pkgs,
-  myConfig,
+  builder,
-  inputs,
+  terminal,
+  username,
   ...
 }: {
-  imports = [
-    ../../modules/macosDev.nix
-    inputs.sops-nix.darwinModules.sops
-  ];
   # List packages installed in system profile. To search by name, run:
   # $ nix-env -qaP | grep wget
   environment.systemPackages = with pkgs; [
+    python313
   ];
 
   # Auto upgrade nix package and the daemon service.
@@ -20,7 +18,7 @@
 
   # Necessary for using flakes on this system.
   nix.settings.experimental-features = "nix-command flakes";
-  nix.settings.trusted-users = myConfig.builds.builder.trustedUsers;
+  nix.settings.trusted-users = builder.trustedUsers;
 
   # Create /etc/zshrc that loads the nix-darwin environment.
   programs.zsh.enable = true; # default shell on catalina
@@ -31,13 +29,12 @@
 
   # The platform the configuration will be used on.
   nixpkgs.hostPlatform = "aarch64-darwin";
-  security.pam.services.sudo_local.touchIdAuth = true;
 
-  users.users.${myConfig.general.Username} = {
+  users.users.${username} = {
-    name = "${myConfig.general.Username}";
+    name = "${username}";
-    home = "/Users/${myConfig.general.Username}";
+    home = "/Users/${username}";
-    # shell = pkgs.${myConfig.general.terminal.Shell}; # no support for nix-darwin, but can be changed via chsh.
+    shell = pkgs.${terminal.termShell};
   };
 
-  home-manager.users.${myConfig.general.Username} = import ../../home/macos.nix;
+  home-manager.users.${username} = import ../../home/macos/home.nix;
 }

packages/git/default.nix

@@ -1,10 +0,0 @@
-{myConfig, ...}: {
-  programs.git = {
-    enable = true;
-    extraConfig = {
-      user.name = "${myConfig.general.gitProfile.User}";
-      user.email = "${myConfig.general.gitProfile.Email}";
-      init.defaultBranch = "${myConfig.general.gitProfile.defaultBranch}";
-    };
-  };
-}

packages/mangohud/default.nix

@@ -1,23 +0,0 @@
-{...}: {
-  programs.mangohud = {
-    enable = true;
-    enableSessionWide = true;
-    settings = {
-      toggle_hud = "Shift_R+F12";
-
-      full = true;
-      gpu_temp = true;
-      cpu_temp = true;
-      fps_only = false;
-
-      blacklist = [
-        "pamac-manager"
-        "lact"
-        "ghb"
-        "bitwig-studio"
-        "ptyxis"
-        "yumex"
-      ];
-    };
-  };
-}

packages/neovim/default.nix

@@ -1,12 +0,0 @@
-{
-  pkgs,
-  inputs,
-  ...
-}: let
-  nixovim = inputs.nixovim.packages.${pkgs.system}.default;
-in {
-  home.packages = [
-    nixovim
-    pkgs.lazygit
-  ];
-}

packages/quickshell/default.nix

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

pkgs/btop/default.nix

@@ -0,0 +1,8 @@
+{...}: {
+  programs.btop = {
+    enable = true;
+    settings = {
+      vim_keys = true;
+    };
+  };
+}

pkgs/fish/default.nix

@@ -1,6 +1,6 @@
 {
   pkgs,
-  myConfig,
+  terminal,
   ...
 }: {
   programs.zoxide.enable = true;
@@ -12,7 +12,7 @@
       zoxide init fish | source
 
     '';
-    shellAliases = myConfig.general.terminal.Aliases;
+    shellAliases = terminal.shellAliases;
 
     plugins = with pkgs.fishPlugins; [
     ];

pkgs/git/default.nix

@@ -0,0 +1,10 @@
+{gitProfile, ...}: {
+  programs.git = {
+    enable = true;
+    extraConfig = {
+      user.name = "${gitProfile.user}";
+      user.email = "${gitProfile.email}";
+      init.defaultBranch = "${gitProfile.defaultBranch}";
+    };
+  };
+}

pkgs/heroic/default.nix

@@ -1,5 +1,5 @@
 {pkgs, ...}: {
   environment.systemPackages = with pkgs; [
-    busybox
+    heroic
   ];
 }

pkgs/hyprland/default.nix

@@ -1,4 +1,9 @@
-{myConfig, ...}: {
+{
+  hyprconf,
+  username,
+  terminal,
+  ...
+}: {
   wayland.windowManager.hyprland = {
     enable = true;
     xwayland.enable = true;
@@ -7,14 +12,14 @@
       "$term" = "kitty --single-instance";
       "$browser" = "firefox";
 
-      monitor = myConfig.linux.hyprconf.Monitor;
+      monitor = hyprconf.monitor;
 
       exec-once = [
         "[workspace 20 silent] kitty --single-insance --hold fastfetch"
         "[workspace 20 silent] firefox"
         "[workspace 1] kitty --single-instance --hold fastfetch"
         "pkill gjs & ags run"
-        "matugen image /home/${myConfig.general.Username}/.config/nixos/assets/wallpapers/ultrawide-nixos-default.png"
+        # "matugen image /home/${username}/.config/nixos/assets/wallpapers/ultrawide-nixos-default.png"
         "hyprctl setcursor Bibata-Original-Classic 24"
         "solaar -w hide"
       ];

pkgs/kitty/default.nix

@@ -1,4 +1,4 @@
-{myConfig, ...}: {
+{terminal, ...}: {
   programs.kitty = {
     enable = true;
 
@@ -7,12 +7,11 @@
       confirm_os_window_close = 0;
       window_padding_width = 10;
 
-      font_size = myConfig.general.terminal.Size;
+      font_size = terminal.termSize;
-      font_family = myConfig.general.terminal.Font;
+      font_family = terminal.termFont;
       bold_font = "auto";
       italic_font = "auto";
       bold_italic_font = "auto";
-
       # optimization
       input_delay = 0;
       repaint_delay = 2;

pkgs/neovim/custom/dashboard.nix

@@ -0,0 +1,174 @@
+{
+  plugins = {
+    alpha = {
+      enable = true;
+      layout = [
+        {
+          type = "padding";
+          val = 2;
+        }
+        {
+          type = "text";
+          val = [
+            "      █████ █     ██"
+            "   ██████  ██    ████ █                                 █"
+            "  ██   █  █ ██    ████                    ██           ███"
+            " █    █  █  ██    █ █                     ██            █"
+            "     █  █    ██   █                ████    ██    ███"
+            "    ██ ██    ██   █       ███     █ ███  █  ██    ███ ███    ███ ████ ████"
+            "    ██ ██     ██  █      █ ███   █   ████   ██     ███ ███    ███ ████ ███  █"
+            "    ██ ██     ██  █     █   ███ ██    ██    ██      ██  ██     ██  ████ ████"
+            "    ██ ██      ██ █    ██    █████    ██    ██      ██  ██     ██   ██   ██"
+            "    ██ ██      ██ █    ████████ ██    ██    ██      ██  ██     ██   ██   ██"
+            "    █  ██       ███    ███████  ██    ██    ██      ██  ██     ██   ██   ██"
+            "       █        ███    ██       ██    ██    ██      █   ██     ██   ██   ██"
+            "   ████          ██    ████    █ ██████      ███████    ██     ██   ██   ██"
+            "  █  █████              ███████   ████        █████     ███ █  ███  ███  ███"
+            " █     ██                █████                           ███    ███  ███  ███"
+            " █"
+            "  █"
+            "   ██"
+          ];
+          opts = {
+            position = "center";
+            hl = "Type";
+          };
+        }
+        {
+          type = "padding";
+          val = 4;
+        }
+        {
+          type = "group";
+          val = [
+            {
+              type = "button";
+              val = "      New File    ";
+              on_press.__raw = "function() vim.cmd[[ene]] end";
+              opts = {
+                shortcut = "n";
+                keymap = [
+                  "n"
+                  "n"
+                  "<cmd>ene<CR>"
+                  {
+                    noremap = true;
+                    silent = true;
+                    nowait = true;
+                  }
+                ];
+                position = "center";
+                width = 50;
+                align_shortcut = "right";
+                hl_shortcut = "Keyword";
+              };
+            }
+            {
+              type = "padding";
+              val = 2;
+            }
+            {
+              type = "button";
+              val = "      Find File    ";
+              opts = {
+                shortcut = "f";
+                keymap = [
+                  "n"
+                  "f"
+                  "<cmd>lua require('fzf-lua').files({ cwd = vim.loop.cwd() })<CR>"
+                  {
+                    noremap = true;
+                    silent = true;
+                    nowait = true;
+                  }
+                ];
+                position = "center";
+                width = 50;
+                align_shortcut = "right";
+                hl_shortcut = "Keyword";
+              };
+            }
+            {
+              type = "padding";
+              val = 2;
+            }
+            {
+              type = "button";
+              val = "      Recent Files    ";
+              on_press.__raw = "function() require('telescope.builtin').oldfiles() end";
+              opts = {
+                shortcut = "r";
+                keymap = [
+                  "n"
+                  "r"
+                  "<cmd>lua require('fzf-lua').oldfiles({ cwd = vim.loop.cwd() })<CR>"
+                  {
+                    noremap = true;
+                    silent = true;
+                    nowait = true;
+                  }
+                ];
+                position = "center";
+                width = 50;
+                align_shortcut = "right";
+                hl_shortcut = "Keyword";
+              };
+            }
+            {
+              type = "padding";
+              val = 2;
+            }
+            {
+              type = "button";
+              val = "      Find Text    ";
+              on_press.__raw = "function() require('telescope.builtin').live_grep() end";
+              opts = {
+                shortcut = "g";
+                keymap = [
+                  "n"
+                  "g"
+                  "<cmd>lua require('fzf-lua').live_grep()<CR>"
+                  {
+                    noremap = true;
+                    silent = true;
+                    nowait = true;
+                  }
+                ];
+                position = "center";
+                width = 50;
+                align_shortcut = "right";
+                hl_shortcut = "Keyword";
+              };
+            }
+            {
+              type = "padding";
+              val = 2;
+            }
+            {
+              type = "button";
+              val = "      Quit Neovim    ";
+              on_press.__raw = "function() vim.cmd[[qa]] end";
+              opts = {
+                shortcut = "q";
+                keymap = [
+                  "n"
+                  "q"
+                  "<cmd>qa<CR>"
+                  {
+                    noremap = true;
+                    silent = true;
+                    nowait = true;
+                  }
+                ];
+                position = "center";
+                width = 50;
+                align_shortcut = "right";
+                hl_shortcut = "Keyword";
+              };
+            }
+          ];
+        }
+      ];
+    };
+  };
+}

pkgs/neovim/custom/telescope.nix

@@ -0,0 +1,18 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
+  # `plugins.mini.enable` with `plugins.mini.modules.icons` and `plugins.mini.mockDevIcons`.
+  # plugins.web-devicons.enable = true;
+  plugins.mini = {
+    enable = true;
+    mockDevIcons = true;
+    modules = [
+    ];
+  };
+  plugins.telescope = {
+    enable = true;
+  };
+}

pkgs/neovim/default.nix

@@ -0,0 +1,14 @@
+{
+  pkgs,
+  inputs,
+  ...
+}: let
+  nix-neovim = inputs.nix-neovim.packages.${pkgs.system}.default;
+in {
+  programs.neovim.enable = false;
+  home.packages = [
+    nix-neovim
+    pkgs.lazygit
+    # ripgrep
+  ];
+}

pkgs/rofi/launcher/colors/onedark.rasi

@@ -0,0 +1,16 @@
+/**
+ *
+ * Author : Aditya Shakya (adi1090x)
+ * Github : @adi1090x
+ * 
+ * Colors
+ **/
+
+* {
+    background:     #1E2127FF;
+    background-alt: #282B31FF;
+    foreground:     #FFFFFFFF;
+    selected:       #61AFEFFF;
+    active:         #98C379FF;
+    urgent:         #E06C75FF;
+}

pkgs/rofi/launcher/config.rasi

@@ -0,0 +1,171 @@
+/**
+ *
+ * Author : Aditya Shakya (adi1090x)
+ * Github : @adi1090x
+ * 
+ * Rofi Theme File
+ * Rofi Version: 1.7.3
+ **/
+
+/*****----- Configuration -----*****/
+configuration {
+	modi:                       "drun";
+    show-icons:                 true;
+    display-drun:               "";
+	drun-display-format:        "{name}";
+}
+
+/*****----- Global Properties -----*****/
+@import                          "shared/colors.rasi"
+@import                          "shared/fonts.rasi"
+
+/*****----- Main Window -----*****/
+window {
+    transparency:                "real";
+    location:                    center;
+    anchor:                      center;
+    fullscreen:                  false;
+    width:                       400px;
+    x-offset:                    0px;
+    y-offset:                    0px;
+
+    enabled:                     true;
+    margin:                      0px;
+    padding:                     0px;
+    border:                      0px solid;
+    border-radius:               12px;
+    border-color:                @selected;
+    background-color:            @background;
+    cursor:                      "default";
+}
+
+/*****----- Main Box -----*****/
+mainbox {
+    enabled:                     true;
+    spacing:                     0px;
+    margin:                      0px;
+    padding:                     0px;
+    border:                      0px solid;
+    border-radius:               0px 0px 0px 0px;
+    border-color:                @selected;
+    background-color:            transparent;
+    children:                    [ "inputbar", "listview" ];
+}
+
+/*****----- Inputbar -----*****/
+inputbar {
+    enabled:                     true;
+    spacing:                     10px;
+    margin:                      0px;
+    padding:                     15px;
+    border:                      0px solid;
+    border-radius:               0px;
+    border-color:                @selected;
+    background-color:            @selected;
+    text-color:                  @background;
+    children:                    [ "prompt", "entry" ];
+}
+
+prompt {
+    enabled:                     true;
+    background-color:            inherit;
+    text-color:                  inherit;
+}
+textbox-prompt-colon {
+    enabled:                     true;
+    expand:                      false;
+    str:                         "::";
+    background-color:            inherit;
+    text-color:                  inherit;
+}
+entry {
+    enabled:                     true;
+    background-color:            inherit;
+    text-color:                  inherit;
+    cursor:                      text;
+    placeholder:                 "Search...";
+    placeholder-color:           inherit;
+}
+
+/*****----- Listview -----*****/
+listview {
+    enabled:                     true;
+    columns:                     1;
+    lines:                       6;
+    cycle:                       true;
+    dynamic:                     true;
+    scrollbar:                   false;
+    layout:                      vertical;
+    reverse:                     false;
+    fixed-height:                true;
+    fixed-columns:               true;
+    
+    spacing:                     5px;
+    margin:                      0px;
+    padding:                     0px;
+    border:                      0px solid;
+    border-radius:               0px;
+    border-color:                @selected;
+    background-color:            transparent;
+    text-color:                  @foreground;
+    cursor:                      "default";
+}
+scrollbar {
+    handle-width:                5px ;
+    handle-color:                @selected;
+    border-radius:               0px;
+    background-color:            @background-alt;
+}
+
+/*****----- Elements -----*****/
+element {
+    enabled:                     true;
+    spacing:                     10px;
+    margin:                      0px;
+    padding:                     8px;
+    border:                      0px solid;
+    border-radius:               0px;
+    border-color:                @selected;
+    background-color:            transparent;
+    text-color:                  @foreground;
+    cursor:                      pointer;
+}
+element normal.normal {
+    background-color:            @background;
+    text-color:                  @foreground;
+}
+element selected.normal {
+    background-color:            @background-alt;
+    text-color:                  @foreground;
+}
+element-icon {
+    background-color:            transparent;
+    text-color:                  inherit;
+    size:                        32px;
+    cursor:                      inherit;
+}
+element-text {
+    background-color:            transparent;
+    text-color:                  inherit;
+    highlight:                   inherit;
+    cursor:                      inherit;
+    vertical-align:              0.5;
+    horizontal-align:            0.0;
+}
+
+/*****----- Message -----*****/
+error-message {
+    padding:                     15px;
+    border:                      2px solid;
+    border-radius:               12px;
+    border-color:                @selected;
+    background-color:            @background;
+    text-color:                  @foreground;
+}
+textbox {
+    background-color:            @background;
+    text-color:                  @foreground;
+    vertical-align:              0.5;
+    horizontal-align:            0.0;
+    highlight:                   none;
+}

pkgs/rofi/launcher/launcher.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+## Author : Aditya Shakya (adi1090x)
+## Github : @adi1090x
+#
+## Rofi   : Launcher (Modi Drun, Run, File Browser, Window)
+#
+## Available Styles
+#
+## style-1     style-2     style-3     style-4     style-5
+## style-6     style-7     style-8     style-9     style-10
+## style-11    style-12    style-13    style-14    style-15
+
+dir="$HOME/.config/wofi/launcher/config.rasi"
+theme='style-1'
+
+## Run
+wofi \
+    -show drun \
+    -theme ${dir}/${theme}.rasi

pkgs/rofi/launcher/shared/colors.rasi

@@ -0,0 +1,18 @@
+/**
+ *
+ * Author : Aditya Shakya (adi1090x)
+ * Github : @adi1090x
+ * 
+ * Colors
+ *
+ * Available Colors Schemes
+ *
+ * adapta    catppuccin    everforest    navy       paper
+ * arc       cyberpunk     gruvbox       nord       solarized
+ * black     dracula       lovelace      onedark    yousai
+ *
+ **/
+
+/* Import color-scheme from `colors` directory */
+
+@import "~/.config/wofi/colors/onedark.rasi"

pkgs/rofi/launcher/shared/fonts.rasi

@@ -0,0 +1,12 @@
+/**
+ *
+ * Author : Aditya Shakya (adi1090x)
+ * Github : @adi1090x
+ * 
+ * Fonts
+ *
+ **/
+
+* {
+    font: "Iosevka Nerd Font 10";
+}

pkgs/steam/default.nix

@@ -0,0 +1,5 @@
+{
+  programs.steam = {
+    enable = true;
+  };
+}

pkgs/waybar/default.nix

@@ -0,0 +1,229 @@
+{ username, hostname, ... }: {
+  programs.waybar = {
+    enable = true;
+    settings = [
+      {
+        margin-top = 10;
+        margin-left = 10;
+        margin-right = 10;
+        layer = "top";
+        position = "top";
+
+        modules-left = [
+          "custom/start"
+          "hyprland/submap"
+          "hyprland/workspaces"
+          "hyprland/window"
+        ];
+        modules-right = [
+          "tray"
+          "temperature"
+          "cpu"
+          "memory"
+          "disk"
+          "network"
+          "pulseaudio"
+          "battery"
+          "power-profiles-daemon"
+          "clock"
+        ];
+        "cpu" = {
+          states = {
+            critical = 85;
+          };
+          interval = 1;
+          format = " {usage:2}%";
+          on-click = "kitty btop";
+        };
+        "memory" = {
+          states = {
+            critical = 85;
+          };
+          interval = 1;
+          format = " {percentage}%";
+          on-click = "kitty btop";
+        };
+        "disk" = {
+          states = {
+            critical = 85;
+          };
+          interval = 5;
+          format = " {percentage_used}%";
+          on-click = "kitty btop";
+        };
+        "network" = {
+          format-ethernet = " {bandwidthDownOctets}";
+          format-wifi = " {signalStrength}%";
+          format-disconnected = "";
+          format-disabled = "";
+          tooltip = false;
+          on-click = "rofi-network-manager";
+        };
+        "temperature" = {
+          critical-threshold = 80;
+          format = " {temperatureC}°C";
+          interval = 1;
+          on-click = "kitty btop";
+        };
+        "power-profiles-daemon" = {
+          format = "{icon} {profile}";
+          format-icons = {
+            performance = "";
+            power-saver = "";
+            balanced = "";
+          };
+        };
+        "hyprland/workspaces" = {
+          format = "{name}";
+          format-icons = {
+            default = " ";
+            active = " ";
+            urgent = " ";
+          };
+          on-scroll-down = "hyprctl dispatch workspace e+1";
+          on-scroll-up = "hyprctl dispatch workspace e-1";
+        };
+        "hyprland/window" = {
+          icon = true;
+          max-length = 45;
+          separate-outputs = false;
+          rewrite = {
+            "" = "${username}@${hostname}";
+            "~" = "${username}@${hostname}";
+          };
+          on-click-right = "hyprctl dispatch fullscreen 0";
+          on-click-middle = "hyprctl dispatch killactive";
+          on-click = "hyprctl dispatch fullscreen 1";
+        };
+        "hyprland/submap" = {
+          format = " {}";
+          on-click = "hyprctl dispatch submap reset";
+        };
+        "clock" = {
+          format = "{:%b %d, %I:%M %p}";
+        };
+        "tray" = {
+          spacing = 12;
+        };
+        "taskbar" = {
+          icon-size = 10;
+          icon-theme = "Papirus-Dark";
+          on-click = "activate";
+          on-click-right = "fullscreen";
+          on-click-middle = "close";
+          on-scroll-up = "maximize";
+          on-scroll-down = "minimize";
+        };
+        "pulseaudio" = {
+          format = "{icon} {volume}% {format_source}";
+          format-bluetooth = "{volume}% {icon} {format_source}";
+          format-bluetooth-muted = " {icon} {volume}% {format_source_muted}";
+          format-muted = " {volume}% {format_source_muted}";
+          format-source = "";
+          format-source-muted = "";
+          format-icons = {
+            headphone = "";
+            hands-free = "";
+            headset = "";
+            phone = "";
+            portable = "";
+            car = "";
+            default = [
+              ""
+              ""
+              ""
+            ];
+          };
+          on-click = "pavucontrol";
+          on-click-right = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
+        };
+        "battery" = {
+          states = {
+            warning = 30;
+            critical = 15;
+          };
+          format = "{icon} {capacity}%";
+          format-charging = " {capacity}%";
+          format-plugged = " {capacity}%";
+          format-icons = [
+            ""
+            ""
+            ""
+            ""
+            ""
+          ];
+          interval = 1;
+          on-click = "";
+        };
+        "custom/start" = {
+          format = "";
+          on-click-right = "rofi -show power-menu -modi power-menu:rofi-power-menu";
+          on-click = "rofi -show drun";
+        };
+      }
+    ];
+    style = ''
+      * {
+        font-size: 12px;
+        font-family: Font Awesome, monospace;
+        font-weight: bold;
+        color: @text;
+        transition: none;
+      }
+
+      window#waybar {
+        background: rgba(0,0,0,0);
+        border: none;
+      }
+      
+      #workspaces button {
+        border-radius: 0px;
+        margin: 0px;
+        background: none;
+        border: none;
+      }
+
+      #workspaces button:hover, #custom-start:hover, #window:hover {
+        border: none;
+        outline: none;
+        background: none;
+        color: @text;
+        background-size: 300% 300%;
+        background: @surface0;
+      }
+
+      #workspaces button.active, #submap {
+        background: @surface1;
+      }
+
+      #custom-start {
+        padding: 0px 5px;
+        color: @sky;
+        font-size: 16px;
+      }
+
+      #window, #submap {
+        padding: 0px 5px;
+      }
+
+      .modules-left, .modules-right {
+        background-color: @crust;
+        border: 2px solid @surface1;
+        border-radius: 10px;
+        padding: 0 5px;
+      }
+      #submap, #workspaces, #cpu, #memory, #disk, #clock, #window, #tray, #pulseaudio, #battery, #network, #temperature, #power-profiles-daemon, #custom-exit, #custom-start {
+        margin: 0 5px;
+      }
+      .critical, .muted, .performance {
+        color: @red;
+      }
+      .warning, .urgent {
+        color: @yellow;
+      }
+      .charging, .plugged, .power-saver {
+        color: @green;
+      }
+    '';
+  };
+}

pkgs/zsh/custom/config.omp.json

@@ -0,0 +1,55 @@
+{
+  "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json",
+  "blocks": [
+    {
+      "alignment": "left",
+      "segments": [
+        {
+          "foreground": "#ffdd86",
+          "style": "plain",
+          "template": "{{ .UserName }}@{{ .HostName }} ",
+          "type": "session"
+        },
+        {
+          "foreground": "#42a9ff",
+          "style": "plain",
+          "properties": {
+            "style": "full"
+          },
+          "template": "{{ .Path }} ",
+          "type": "path"
+        },
+        {
+          "properties": {
+            "branch_icon": "",
+            "fetch_status": true
+          },
+          "style": "plain",
+          "template": "git:{{ if or (.Working.Changed) (.Staging.Changed) (gt .StashCount 0) }}<#ffdd86>{{ .HEAD }}</>{{ else }}{{ .HEAD }}{{ end }}{{ if .Staging.Changed }} <#98c379>{{ .Staging.String }}</>{{ end }}{{ if .Working.Changed }} <#d16971>{{ .Working.String }}</>{{ end }}",
+          "type": "git"
+        }
+      ],
+      "type": "prompt"
+    },
+    {
+      "alignment": "left",
+      "newline": true,
+      "segments": [
+        {
+          "foreground": "#ffdd86",
+          "foreground_templates": [
+            "{{ if gt .Code 0 }}#42a9ff{{ end }}"
+          ],
+          "properties": {
+            "always_enabled": true
+          },
+          "style": "plain",
+          "template": "> ",
+          "type": "status"
+        }
+      ],
+      "type": "prompt"
+    }
+  ],
+  "version": 3
+}

pkgs/zsh/default.nix

@@ -1,6 +1,6 @@
 {
   pkgs,
-  myConfig,
+  terminal,
   ...
 }: {
   home.packages = with pkgs; [
@@ -13,7 +13,7 @@
   programs.zsh = {
     enableCompletion = false;
     syntaxHighlighting.enable = false;
-    shellAliases = myConfig.general.terminal.Aliases;
+    shellAliases = terminal.shellAliases;
     history.size = 10000;
     antidote = {
       enable = true;

secrets/secrets.sops.yaml

@@ -1,11 +0,0 @@
-keys:
-  - &admin_kenji age19pf5unuk3hcap0vrrlqr9lkh5eg24aw7z3skf0kverpjdqsltdxsdx88r8
-creation_rules:
-  - path_regex: secrets/[^/]+\.(yaml|json|env|ini)$
-    key_groups:
-      age:
-        - *admin_kenji
-  - path_regex: secrets/azmidi/[^/]+\.(yaml|json|env|ini)$
-    key_groups:
-      age:
-        - *admin_kenji

secrets/secrets.yaml

@@ -1 +0,0 @@
-abcd: hello-world

system/amd.nix

@@ -1,14 +0,0 @@
-{pkgs, ...}: {
-  environment.systemPackages = with pkgs; [
-    glxinfo
-    vulkan-tools
-    lact
-  ];
-  systemd.packages = with pkgs; [
-    lact
-  ];
-  systemd.services.lactd = {
-    enable = true;
-    wantedBy = ["multi-user.target"];
-  };
-}

system/appimage.nix

@@ -1,15 +0,0 @@
-{
-  programs.appimage = {
-    enable = true;
-    binfmt = true;
-    # If moondeck-buddy.AppImage requires specific libraries not included by default
-    # you might need to add them here. For example:
-    # package = pkgs.appimage-run.override {
-    #   extraPkgs = pkgs: with pkgs; [
-    #     # Add any missing libraries here, e.g.,
-    #     # libthai
-    #     # qt5.full
-    #   ];
-    # };
-  };
-}

system/boot.nix

@@ -1,14 +0,0 @@
-{...}: {
-  boot.loader = {
-    systemd-boot = {
-      enable = false;
-    };
-    efi = {
-      canTouchEfiVariables = true;
-    };
-    grub = {
-      enable = true;
-      device = "nodev";
-    };
-  };
-}

system/default.nix

@@ -0,0 +1,119 @@
+{
+  pkgs,
+  hostname,
+  timezone,
+  touchpadSupport,
+  inputs,
+  logitech-hardware,
+  ...
+}: {
+  environment.systemPackages = with pkgs;
+    [
+      python313Full
+
+      gobject-introspection
+      gtk3
+      libxml2
+
+      git
+
+      cargo
+      gcc
+      rustc
+      nodejs
+      yarn
+
+      busybox
+
+      p7zip
+
+      btop
+      tldr
+
+      jq
+      lm_sensors
+      gparted
+
+      notify
+
+      mangohud
+    ]
+    ++ [
+      inputs.matugen.packages.${pkgs.system}.default
+    ]
+    ++ lib.optionals (logitech-hardware.enable == true) [
+      solaar
+    ];
+  boot.loader = {
+    systemd-boot = {
+      enable = false;
+    };
+    efi = {
+      canTouchEfiVariables = true;
+    };
+    grub = {
+      enable = true;
+      device = "nodev";
+    };
+  };
+
+  hardware = {
+    logitech.wireless.enable = logitech-hardware.enable;
+    bluetooth = {
+      enable = true;
+      powerOnBoot = true;
+    };
+  };
+
+  i18n.defaultLocale = "en_US.UTF-8";
+  console = {
+    font = "Lat2-Terminus16";
+    useXkbConfig = true; # use xkb.options in tty.
+  };
+
+  networking.hostName = "${hostname}";
+  networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.
+
+  time.timeZone = "${timezone}";
+
+  services = {
+    openssh = {
+      enable = true;
+      ports = [22];
+      settings = {
+        PasswordAuthentication = true;
+      };
+    };
+    libinput.enable = touchpadSupport;
+    blueman.enable = true;
+  };
+
+  programs.bash = {
+    interactiveShellInit = ''
+      if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
+      then
+        shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
+        exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
+      fi
+    '';
+  };
+
+  programs = {
+    zsh.enable = true;
+    fish.enable = true;
+  };
+
+  # networking.firewall.allowedTCPPorts = [ ... ];
+  # networking.firewall.allowedUDPPorts = [ ... ];
+  # Or disable the firewall altogether.
+  # networking.firewall.enable = false;
+
+  # networking.proxy.default = "http://user:password@proxy:port/";
+  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
+
+  # Copy the NixOS configuration file and link it from the resulting system
+  # (/run/current-system/configuration.nix). This is useful in case you
+  # accidentally delete configuration.nix.
+  # ONLY WORKS non-flake
+  # system.copySystemConfiguration = true;
+}

system/desktop/cursor.nix

@@ -0,0 +1,6 @@
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [
+    bibata-cursors
+    hyprcursor
+  ];
+}

system/desktop/font.nix

@@ -1,13 +1,16 @@
 {
   pkgs,
   inputs,
+  system,
   ...
 }: let
   unlisted-fonts = inputs.unlisted-fonts.packages.${pkgs.system};
 in {
   fonts.packages = with pkgs; [
+    unlisted-fonts.monolisa
     unlisted-fonts.rubik
+    nerd-fonts.fira-code
     nerd-fonts.jetbrains-mono
-    material-symbols
+    nerd-fonts.iosevka
-  ];
+    ];
 }

system/desktop/misc.nix

@@ -0,0 +1,3 @@
+{pkgs, ...}: {
+  services.printing.enable = true;
+}

system/desktop/sound.nix

@@ -0,0 +1,13 @@
+{ pkgs, ... }: {
+  # Enable sound.
+  # services.pulseaudio.enable = true;
+  # OR
+  environment.systemPackages = with pkgs; [
+    pavucontrol
+  ];
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    pulse.enable = true;
+  };
+}

system/desktop/theme.nix

@@ -0,0 +1,4 @@
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [
+  ];
+}

system/desktop/wayland.nix

@@ -11,8 +11,8 @@
   ];
   programs.hyprland = {
     enable = true;
-    package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
+    # package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
-    portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
+    # portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
   };
   hardware = {
     graphics.enable = true;

system/dev/python.nix

@@ -1,8 +0,0 @@
-{pkgs, ...}: {
-  environment.systemPackages = with pkgs; [
-    python3Full
-    python3Packages.build
-    python3Packages.pip
-    python3Packages.installer
-  ];
-}

system/dev/tools.nix

@@ -1,12 +0,0 @@
-{pkgs, ...}: {
-  environment.systemPackages = with pkgs; [
-    git
-    p7zip
-    tldr
-    jq
-    btop
-    rar
-
-    cloudflared
-  ];
-}

system/firewall.nix

@@ -1,9 +0,0 @@
-{...}: {
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
-
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
-}

system/gaming.nix

@@ -1,16 +0,0 @@
-{
-  pkgs,
-  inputs,
-  ...
-}: {
-  programs.steam = {
-    enable = true;
-    gamescopeSession.enable = true;
-  };
-  environment.systemPackages = [
-    # inputs.nix-gaming.packages.${pkgs.system}.default
-    pkgs.protonup-qt
-    pkgs.geekbench
-  ];
-  # programs.steam.platformOptimizations.enable = true;
-}

system/graphics.nix

@@ -1,6 +0,0 @@
-{pkgs, ...}: {
-  hardware.graphics = {
-    enable = true;
-    enable32Bit = true; # Crucial for 32-bit games
-  };
-}

system/hardware.nix

@@ -1,20 +0,0 @@
-{
-  myConfig,
-  pkgs,
-  lib,
-  ...
-}: {
-  hardware = {
-    logitech.wireless.enable = myConfig.linux.logitech-hardware.enable;
-    bluetooth = {
-      enable = true;
-      powerOnBoot = true;
-    };
-  };
-  environment.systemPackages = with pkgs;
-    [
-    ]
-    ++ lib.optionals (myConfig.linux.logitech-hardware.enable == true) [
-      solaar
-    ];
-}

system/locale.nix

@@ -1,4 +0,0 @@
-{myConfig, ...}: {
-  i18n.defaultLocale = "en_US.UTF-8";
-  time.timeZone = "${myConfig.general.Timezone}";
-}

system/network.nix

@@ -1,4 +0,0 @@
-{myConfig, ...}: {
-  networking.hostName = "${myConfig.general.Hostname}";
-  networking.networkmanager.enable = true;
-}

system/programs.nix

@@ -1,16 +0,0 @@
-{pkgs, ...}: {
-  programs.bash = {
-    interactiveShellInit = ''
-      if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
-      then
-        shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
-        exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
-      fi
-    '';
-  };
-
-  programs = {
-    zsh.enable = true;
-    fish.enable = true;
-  };
-}

system/security.nix

@@ -1,12 +0,0 @@
-{...}: {
-  security.polkit.enable = true;
-  security.polkit.extraConfig = ''
-    polkit.addRule(function(action, subject) {
-      if ((action.id == "org.corectrl.helper.gpu.set" ||
-           action.id == "org.corectrl.helper.gpu.apply") &&
-          subject.isInGroup("wheel")) {
-        return polkit.Result.YES;
-      }
-    });
-  '';
-}

system/services.nix

@@ -1,9 +0,0 @@
-{...}: {
-  services = {
-    openssh.enable = true;
-    libinput.enable = true;
-    blueman.enable = true;
-    printing.enable = true;
-    # sensors.enable = true;
-  };
-}

system/sound.nix

@@ -1,22 +0,0 @@
-{pkgs, ...}: {
-  environment.systemPackages = [
-    pkgs.pavucontrol
-  ];
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-
-    lowLatency = {
-      # enable this module
-      enable = true;
-      # defaults (no need to be set unless modified)
-      quantum = 64;
-      rate = 48000;
-    };
-  };
-
-  # make pipewire realtime-capable
-  security.rtkit.enable = true;
-}

system/stream.nix

@@ -1,11 +0,0 @@
-{pkgs, ...}: {
-  environment.systemPackages = with pkgs; [
-    sunshine
-  ];
-  services.sunshine = {
-    enable = true;
-    autoStart = true;
-    capSysAdmin = true;
-    openFirewall = true;
-  };
-}

system/tty.nix

@@ -1,6 +0,0 @@
-{...}: {
-  console = {
-    font = "Lat2-Terminus16";
-    useXkbConfig = true;
-  };
-}

system/users.nix

@@ -1,15 +1,16 @@
 {
   pkgs,
-  myConfig,
+  username,
+  terminal,
   ...
 }: {
   users = {
-    defaultUserShell = pkgs.${myConfig.general.terminal.Shell};
+    defaultUserShell = pkgs.${terminal.termShell};
     users = {
-      ${myConfig.general.Username} = {
+      ${username} = {
         isNormalUser = true;
-        extraGroups = ["wheel" "networkmanager" "input" "corectrl" "video"];
+        extraGroups = ["wheel" "networkmanager" "input"];
-        initialHashedPassword = "$y$j9T$NHFtSwF4NJtEmgMjy4Xdg.$9WQltjEx3eEfZ7GbpGLW8lBhJtiXPOeIawrxdmx0.vB";
+        initialHashedPassword = "$6$Qab6SSvEJM2YRtVA$7Oyl7E3pp/FKtCC.2Tb2tyzp3yp7BFHFAKngUYJssQJ.v1Q2mqsgW9m7njpaKNcka2vyCwrnmw1R.YPlFqR0p1";
         useDefaultShell = true;
         packages = [
         ];

system/vpn.nix

@@ -0,0 +1,23 @@
+{
+  vpn,
+  username,
+  ...
+}: {
+  networking.wg-quick.interfaces = {
+    biscuit-default = {
+      address = ["10.2.0.2/32"];
+      # listenPort = 51820;
+      # FIXME change privateKey to variable and add env (make sure it is inaccessible!)
+      privateKeyFile = vpn.vpnSecretFile;
+      dns = ["10.2.0.1"];
+      peers = [
+        {
+          publicKey = "GbuOJ8Dho0iXlS0+ma2teQ4RxhBALWK6RB94qA1GZDA=";
+          allowedIPs = ["0.0.0.0/0"];
+          endpoint = "79.127.147.2:51820";
+          # persistentKeepAlive = 25;
+        }
+      ];
+    };
+  };
+}