t\P

This reverts commit b6911bc045.

.gitignore

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

README.md

@@ -1,58 +1,46 @@
-# Sakamoto NixOS
+# Nix Sakamoto
-
+A rewrite of the original Sakamoto NixOS configuration.
-Sakamoto NixOS is built with various profiles intended for reproducibility.
-
-## Available Hosts
-
-- MacBook M series
-- Linux
 
 ## Installation
+Installing Sakamoto Nix configuration may vary on your current operating system.
 
-1. Install [Nix](https://nixos.org/download/).
+| Hosts    | Description  |
+|----------|--------------|
+| hakase   | gaming desktop (linux) |
+| sakamoto | \[unavailable] server that uses containers (linux) |
+| nano | \[unavailable] windows configuration |
+| macos    | macos configuration       |
 
-2. Ensure Nix is installed properly by running the following (this also gives you `nano` for editing later):
+**Note: Replace `${Hosts}` with one of the options from the table above.**
 
+### Linux Installation
+
+1.  Install [Nix](https://nixos.org).
+2.  Clone this directory.
     ```sh
-    nix-shell -p nano
+    $ git clone https://git.sakamoto.dev/kenji/nixos.git ~/.config/nixos
     ```
-
+3.  Create a hardware-configuration.conf
-3. Clone the git repository:
-
     ```sh
-    git clone https://git.sakamoto.dev/kenji/nixos.git ~/.config/nixos && cd ~/.config/nixos/
+    $ sudo nixos-generate-config --dir ~/.config/nixos/hosts/${Hosts}/
     ```
-
+4.  ⚠️ Modify `config.nix` that suits your configuration. **Be sure to edit `config.nix`! Most especially `myConfig.essentials.Username`. Otherwise, your OS could break!!!**
-4. Copy `info.default.nix` and rename it to `info.local.nix`:
+5.  Rebuild.
-
     ```sh
-    cp ~/.config/nixos/info.default.nix ~/.config/nixos/info.local.nix
+    $ sudo nixos-rebuild switch --flake ~/.config/nixos/hosts/#${Hosts}
     ```
-
+6. Install unstable channel (fixes `pkgs.fish` misconfiguration).
-    🚨 **CRITICAL STEP:** Edit `info.local.nix`:
-
     ```sh
-    nano ~/.config/nixos/info.local.nix
+    $ nix-channel --add https://nixos.org/channels/nixos-unstable nixos nix-channel --update 
+    ```
+### MacOS (Darwin) Installation
+1.  Install [Nix](https://nixos.org).
+2.  Clone this directory.
+    ```sh
+    $ git clone https://git.sakamoto.dev/kenji/nixos.git ~/.config/nixos
+    ```
+3.  ⚠️ Modify `config.nix` that suits your configuration. **Be sure to edit `config.nix`! Most especially `myConfig.essentials.Username`. Otherwise, configuration would not work!!!**
+4. Rebuild.
+    ```sh
+    $ sudo nix run nix-darwin --extra-experimental-features "nix-command flakes" -- switch --flake ~/.config/nixos#macos
     ```
-
-    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`.**
-
-5. Execute the following command based on your host:
-
-    - **MacBook M series:**
-
-        ```sh
-        sudo nix run nix-darwin --extra-experimental-features "nix-command flakes" -- switch --flake ~/.config/nixos#macos
-        ```
-
-    - **Linux:**
-
-        ```sh
-        sudo nixos-rebuild --flake ~/.config/nixos#desktop --impure
-        sudo nix run home-manager -- init --switch
-        home-manager switch --flake ~/.config/nixos#desktop --impure
-        nix-channel --add https://nixos.org/channels/nixos-unstable nixos nix-channel --update 
-        reboot
-        ```

config.nix

@@ -1,91 +1,66 @@
 {
   myConfig = {
+    essentials = {
+      # !!! replace it with your own, else system might malfunction.
+      Username = "lsoriano";
+    };
     general = {
-      Hostname = "hakase";
+      Terminal = {
-      Username = "kenji";
+        font = "JetBrainsMono Nerd Font";
-      Timezone = "America/Chicago";
+        size = "12";
-
+        shell = "fish"; # or zsh
-      allowUnfree = true; # allows installation of commercial apps.
+        aliases = {
-
-      terminal = {
-        Font = "JetBrainsMono Nerd Font"; # e.g., JetBrainsMono Nerd Font
-        Size = "18";
-        Shell = "fish";
-        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 = {
+      allowUnfree = true;
-        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 = {
+    nixos = {
-      builder = {
+      Hostname = "nixos";
-        trustedUsers = [
+      Timezone = "America/Chicago";
-          "@groups"
+
-          "biscuit"
+      Boot = {
-        ];
+        mode = "grub"; # systemd or grub
-        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"];
-          }
-        ];
       };
-    };
+      Gaming = {
-
+        enable = true;
-    linux = {
-      system = "x86_64";
-      gaming = true;
-
-      vpn = {
-        Enable = false;
-        secretFile = builtins.toPath ./secrets/.vpn.yaml;
       };
-
+      Apps = {
-      touchpadSupport = false;
+        packages = pkgs:
-      logitech-hardware.enable = true;
-
-      # Custom Applications
-      apps = {
-        gaming = true;
-        apps = pkgs:
           with pkgs; [
             jellyfin-media-player
           ];
       };
-      hyprconf = {
+      Hyprland = {
-        Monitor = [
+        monitors = [];
-          # hyprctl monitors all
+      };
-          # monitor, resolution@refreshrate, position (e.g., 0x0 is middle, 0x1080 is top), scale
+      Git = {
-          "DP-1,highres@165,0x1080,auto"
+        user = "";
-          "DP-2,highres@highrr,0x0,auto"
+        email = "";
-          "HDMI-A-1, preferred, 20000x20000,1"
+        defaultBranch = "master";
+      };
+    };
+    optionals = {
+      Builds = {
+        trustedUsers = [
+          "@groups"
         ];
+        buildMachines = [
+          {
+            hostName = "";
+            sshUser = "";
+            sshKey = "";
+            system = "";
+            supportedFeatures = ["big-parallel" "kvm" "nixos-test"];
+          }
+        ];
+      };
+      Ssh = {
+        extraConfig = ''
+          Host macair
+            User biscuit
+            HostName 192.168.68.81
+        '';
       };
     };
   };

flake.lock

@@ -1,80 +1,5 @@
 {
   "nodes": {
-    "ags": {
-      "inputs": {
-        "astal": "astal",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1744557573,
-        "narHash": "sha256-XAyj0iDuI51BytJ1PwN53uLpzTDdznPDQFG4RwihlTQ=",
-        "owner": "aylur",
-        "repo": "ags",
-        "rev": "3ed9737bdbc8fc7a7c7ceef2165c9109f336bff6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "aylur",
-        "repo": "ags",
-        "type": "github"
-      }
-    },
-    "aquamarine": {
-      "inputs": {
-        "hyprutils": [
-          "hyprland",
-          "hyprutils"
-        ],
-        "hyprwayland-scanner": [
-          "hyprland",
-          "hyprwayland-scanner"
-        ],
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1747864449,
-        "narHash": "sha256-PIjVAWghZhr3L0EFM2UObhX84UQxIACbON0IC0zzSKA=",
-        "owner": "hyprwm",
-        "repo": "aquamarine",
-        "rev": "389372c5f4dc1ac0e7645ed29a35fd6d71672ef5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "aquamarine",
-        "type": "github"
-      }
-    },
-    "astal": {
-      "inputs": {
-        "nixpkgs": [
-          "ags",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1742571008,
-        "narHash": "sha256-5WgfJAeBpxiKbTR/gJvxrGYfqQRge5aUDcGKmU1YZ1Q=",
-        "owner": "aylur",
-        "repo": "astal",
-        "rev": "dc0e5d37abe9424c53dcbd2506a4886ffee6296e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "aylur",
-        "repo": "astal",
-        "type": "github"
-      }
-    },
     "darwin": {
       "inputs": {
         "nixpkgs": [
@@ -82,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1749194393,
+        "lastModified": 1751313918,
-        "narHash": "sha256-vt6hM9DNywnXXuW1qPDLzECmbDcmxhh58wpb0EEQjAo=",
+        "narHash": "sha256-HsJM3XLa43WpG+665aGEh8iS8AfEwOIQWk3Mke3e7nk=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "19346808c445f23b08652971be198b9df6c33edc",
+        "rev": "e04a388232d9a6ba56967ce5b53a8a6f713cdfcf",
         "type": "github"
       },
       "original": {
@@ -118,22 +43,6 @@
       }
     },
     "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_2": {
       "locked": {
         "lastModified": 1733328505,
         "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
@@ -151,24 +60,6 @@
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib"
       },
-      "locked": {
-        "lastModified": 1749398372,
-        "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-parts_2": {
-      "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib_2"
-      },
       "locked": {
         "lastModified": 1738453229,
         "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
@@ -183,7 +74,7 @@
         "type": "github"
       }
     },
-    "flake-parts_3": {
+    "flake-parts_2": {
       "inputs": {
         "nixpkgs-lib": [
           "nixovim",
@@ -205,9 +96,30 @@
         "type": "github"
       }
     },
+    "flake-parts_3": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "nur",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1733312601,
+        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "inputs": {
-        "systems": "systems_3"
+        "systems": "systems"
       },
       "locked": {
         "lastModified": 1731533236,
@@ -225,7 +137,7 @@
     },
     "flake-utils_2": {
       "inputs": {
-        "systems": "systems_4"
+        "systems": "systems_2"
       },
       "locked": {
         "lastModified": 1731533236,
@@ -248,7 +160,7 @@
           "nixvim",
           "flake-compat"
         ],
-        "gitignore": "gitignore_2",
+        "gitignore": "gitignore",
         "nixpkgs": [
           "nixovim",
           "nixvim",
@@ -270,28 +182,6 @@
       }
     },
     "gitignore": {
-      "inputs": {
-        "nixpkgs": [
-          "hyprland",
-          "pre-commit-hooks",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1709087332,
-        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
-    "gitignore_2": {
       "inputs": {
         "nixpkgs": [
           "nixovim",
@@ -321,11 +211,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1748979197,
+        "lastModified": 1751578154,
-        "narHash": "sha256-mKYwYcO9RmA2AcAFIXGDBOw5iv/fbjw6adWvMbnfIuk=",
+        "narHash": "sha256-7zfDzmaidDESMZpdmzK/+APeKN432CJuphHHETX88Ls=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "34a13086148cbb3ae65a79f753eb451ce5cac3d3",
+        "rev": "7044c3eced5319148c09fe9612659765b9297d4a",
         "type": "github"
       },
       "original": {
@@ -356,267 +246,6 @@
         "type": "github"
       }
     },
-    "hyprcursor": {
-      "inputs": {
-        "hyprlang": [
-          "hyprland",
-          "hyprlang"
-        ],
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1745948457,
-        "narHash": "sha256-lzTV10FJTCGNtMdgW5YAhCAqezeAzKOd/97HbQK8GTU=",
-        "owner": "hyprwm",
-        "repo": "hyprcursor",
-        "rev": "ac903e80b33ba6a88df83d02232483d99f327573",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprcursor",
-        "type": "github"
-      }
-    },
-    "hyprgraphics": {
-      "inputs": {
-        "hyprutils": [
-          "hyprland",
-          "hyprutils"
-        ],
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1745015490,
-        "narHash": "sha256-apEJ9zoSzmslhJ2vOKFcXTMZLUFYzh1ghfB6Rbw3Low=",
-        "owner": "hyprwm",
-        "repo": "hyprgraphics",
-        "rev": "60754910946b4e2dc1377b967b7156cb989c5873",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprgraphics",
-        "type": "github"
-      }
-    },
-    "hyprland": {
-      "inputs": {
-        "aquamarine": "aquamarine",
-        "hyprcursor": "hyprcursor",
-        "hyprgraphics": "hyprgraphics",
-        "hyprland-protocols": "hyprland-protocols",
-        "hyprland-qtutils": "hyprland-qtutils",
-        "hyprlang": "hyprlang",
-        "hyprutils": "hyprutils",
-        "hyprwayland-scanner": "hyprwayland-scanner",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "pre-commit-hooks": "pre-commit-hooks",
-        "systems": "systems",
-        "xdph": "xdph"
-      },
-      "locked": {
-        "lastModified": 1749049255,
-        "narHash": "sha256-QXg2B/bF/f9IeSiZwJuhdnz2xcnpu/hDfz4eIHWVhz8=",
-        "owner": "hyprwm",
-        "repo": "Hyprland",
-        "rev": "d7a87ce6e2535f1029fc93b062d2828e8549c525",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "Hyprland",
-        "type": "github"
-      }
-    },
-    "hyprland-protocols": {
-      "inputs": {
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1743714874,
-        "narHash": "sha256-yt8F7NhMFCFHUHy/lNjH/pjZyIDFNk52Q4tivQ31WFo=",
-        "owner": "hyprwm",
-        "repo": "hyprland-protocols",
-        "rev": "3a5c2bda1c1a4e55cc1330c782547695a93f05b2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprland-protocols",
-        "type": "github"
-      }
-    },
-    "hyprland-qt-support": {
-      "inputs": {
-        "hyprlang": [
-          "hyprland",
-          "hyprland-qtutils",
-          "hyprlang"
-        ],
-        "nixpkgs": [
-          "hyprland",
-          "hyprland-qtutils",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "hyprland-qtutils",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1737634706,
-        "narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=",
-        "owner": "hyprwm",
-        "repo": "hyprland-qt-support",
-        "rev": "8810df502cdee755993cb803eba7b23f189db795",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprland-qt-support",
-        "type": "github"
-      }
-    },
-    "hyprland-qtutils": {
-      "inputs": {
-        "hyprland-qt-support": "hyprland-qt-support",
-        "hyprlang": [
-          "hyprland",
-          "hyprlang"
-        ],
-        "hyprutils": [
-          "hyprland",
-          "hyprland-qtutils",
-          "hyprlang",
-          "hyprutils"
-        ],
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1745951494,
-        "narHash": "sha256-2dModE32doiyQMmd6EDAQeZnz+5LOs6KXyE0qX76WIg=",
-        "owner": "hyprwm",
-        "repo": "hyprland-qtutils",
-        "rev": "4be1d324faf8d6e82c2be9f8510d299984dfdd2e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprland-qtutils",
-        "type": "github"
-      }
-    },
-    "hyprlang": {
-      "inputs": {
-        "hyprutils": [
-          "hyprland",
-          "hyprutils"
-        ],
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1747484975,
-        "narHash": "sha256-+LAQ81HBwG0lwshHlWe0kfWg4KcChIPpnwtnwqmnoEU=",
-        "owner": "hyprwm",
-        "repo": "hyprlang",
-        "rev": "163c83b3db48a17c113729c220a60b94596c9291",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprlang",
-        "type": "github"
-      }
-    },
-    "hyprutils": {
-      "inputs": {
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1746635225,
-        "narHash": "sha256-W9G9bb0zRYDBRseHbVez0J8qVpD5QbizX67H/vsudhM=",
-        "owner": "hyprwm",
-        "repo": "hyprutils",
-        "rev": "674ea57373f08b7609ce93baff131117a0dfe70d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprutils",
-        "type": "github"
-      }
-    },
-    "hyprwayland-scanner": {
-      "inputs": {
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1747584298,
-        "narHash": "sha256-PH9qZqWLHvSBQiUnA0NzAyQA3tu2no2z8kz0ZeHWj4w=",
-        "owner": "hyprwm",
-        "repo": "hyprwayland-scanner",
-        "rev": "e511882b9c2e1d7a75d45d8fddd2160daeafcbc3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprwayland-scanner",
-        "type": "github"
-      }
-    },
     "ixx": {
       "inputs": {
         "flake-utils": [
@@ -647,27 +276,6 @@
         "type": "github"
       }
     },
-    "matugen": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1745334376,
-        "narHash": "sha256-GZAesQW51EwCEB9w5caxgi87LiAMhVfP6GqZmet9VZc=",
-        "owner": "InioX",
-        "repo": "Matugen",
-        "rev": "4619cca93513470dc2a1833d9a138297cbccaf2e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "InioX",
-        "repo": "Matugen",
-        "type": "github"
-      }
-    },
     "nix-darwin": {
       "inputs": {
         "nixpkgs": [
@@ -690,30 +298,9 @@
         "type": "github"
       }
     },
-    "nix-gaming": {
-      "inputs": {
-        "flake-parts": "flake-parts",
-        "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",
+        "flake-parts": "flake-parts",
         "nixpkgs": [
           "nixpkgs"
         ],
@@ -721,11 +308,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1749068064,
+        "lastModified": 1751734292,
-        "narHash": "sha256-pxszYA1LsrW89Z++jMshDqRpNx99QcvfpFIK5mdmneA=",
+        "narHash": "sha256-AeW333kvHQPHyhF1MH4ogtAuQmReNeCOJmOcvD2IHcM=",
         "ref": "refs/heads/master",
-        "rev": "be2e51f4ddec2389d282280871ca484f3f1f0892",
+        "rev": "13cd454fb30d75a204ed245ec094210635cc22a6",
-        "revCount": 60,
+        "revCount": 67,
         "type": "git",
         "url": "https://git.sakamoto.dev/kenji/nixovim.git"
       },
@@ -751,21 +338,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=",
@@ -795,15 +367,15 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1748693115,
+        "lastModified": 1751271578,
-        "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=",
+        "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=",
-        "owner": "nixos",
+        "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc",
+        "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
+        "owner": "NixOS",
         "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
@@ -812,8 +384,8 @@
     "nixvim": {
       "inputs": {
         "devshell": "devshell",
-        "flake-compat": "flake-compat_2",
+        "flake-compat": "flake-compat",
-        "flake-parts": "flake-parts_3",
+        "flake-parts": "flake-parts_2",
         "git-hooks": "git-hooks",
         "home-manager": "home-manager_2",
         "nix-darwin": "nix-darwin",
@@ -835,9 +407,31 @@
         "type": "github"
       }
     },
+    "nur": {
+      "inputs": {
+        "flake-parts": "flake-parts_3",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "treefmt-nix": "treefmt-nix_2"
+      },
+      "locked": {
+        "lastModified": 1751596056,
+        "narHash": "sha256-YYSPbbr900ciunCWYPIvUbSnnchcMWH907w4LY7uyZs=",
+        "owner": "nix-community",
+        "repo": "NUR",
+        "rev": "8062772f4de4a7ce091bfdb88322e236cffcff30",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "NUR",
+        "type": "github"
+      }
+    },
     "nuschtosSearch": {
       "inputs": {
-        "flake-utils": "flake-utils",
+        "flake-utils": "flake-utils_2",
         "ixx": "ixx",
         "nixpkgs": [
           "nixovim",
@@ -859,62 +453,14 @@
         "type": "github"
       }
     },
-    "pre-commit-hooks": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "gitignore": "gitignore",
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1747372754,
-        "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=",
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "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",
         "darwin": "darwin",
+        "flake-utils": "flake-utils",
         "home-manager": "home-manager",
-        "hyprland": "hyprland",
-        "matugen": "matugen",
-        "nix-gaming": "nix-gaming",
         "nixovim": "nixovim",
         "nixpkgs": "nixpkgs_3",
-        "quickshell": "quickshell",
+        "nur": "nur"
-        "sops-nix": "sops-nix",
-        "unlisted-fonts": "unlisted-fonts"
       }
     },
     "rust-overlay": {
@@ -935,57 +481,7 @@
         "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,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "type": "github"
-      }
-    },
-    "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,7 +496,7 @@
         "type": "github"
       }
     },
-    "systems_4": {
+    "systems_2": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -1037,65 +533,24 @@
         "type": "github"
       }
     },
-    "unlisted-fonts": {
+    "treefmt-nix_2": {
       "inputs": {
-        "flake-utils": "flake-utils_2",
         "nixpkgs": [
+          "nur",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1748987994,
+        "lastModified": 1733222881,
-        "narHash": "sha256-13QQRwZx9tRDmL79+XBM1YaC4W68mVrVW2NCv2w25WA=",
+        "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
-        "ref": "refs/heads/master",
+        "owner": "numtide",
-        "rev": "468d51f24d3dd22c543e657c359fb333ff4df726",
+        "repo": "treefmt-nix",
-        "revCount": 1,
+        "rev": "49717b5af6f80172275d47a418c9719a31a78b53",
-        "type": "git",
-        "url": "https://git.sakamoto.dev/kenji/nix-fonts.git"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.sakamoto.dev/kenji/nix-fonts.git"
-      }
-    },
-    "xdph": {
-      "inputs": {
-        "hyprland-protocols": [
-          "hyprland",
-          "hyprland-protocols"
-        ],
-        "hyprlang": [
-          "hyprland",
-          "hyprlang"
-        ],
-        "hyprutils": [
-          "hyprland",
-          "hyprutils"
-        ],
-        "hyprwayland-scanner": [
-          "hyprland",
-          "hyprwayland-scanner"
-        ],
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1745871725,
-        "narHash": "sha256-M24SNc2flblWGXFkGQfqSlEOzAGZnMc9QG3GH4K/KbE=",
-        "owner": "hyprwm",
-        "repo": "xdg-desktop-portal-hyprland",
-        "rev": "76bbf1a6b1378e4ab5230bad00ad04bc287c969e",
         "type": "github"
       },
       "original": {
-        "owner": "hyprwm",
+        "owner": "numtide",
-        "repo": "xdg-desktop-portal-hyprland",
+        "repo": "treefmt-nix",
         "type": "github"
       }
     }

flake.nix

@@ -1,117 +1,82 @@
 {
-  description = "Sakamoto's NixOS Configuration";
+  description = "A rewrite of the original Sakamoto NixOS config.";
-
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    home-manager.url = "github:nix-community/home-manager";
+    flake-utils.url = "github:numtide/flake-utils";
-    home-manager.inputs.nixpkgs.follows = "nixpkgs"; # `follows` ensure it follows nixpkgs versiona. Avoids breaking updates.
-    darwin.url = "github:lnl7/nix-darwin";
-    darwin.inputs.nixpkgs.follows = "nixpkgs";
 
-    ags.url = "github:aylur/ags";
+    nur = {
-    ags.inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:nix-community/NUR";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
-    hyprland.url = "github:hyprwm/Hyprland";
+    home-manager = {
-    hyprland.inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:nix-community/home-manager";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
-    unlisted-fonts.url = "git+https://git.sakamoto.dev/kenji/nix-fonts.git";
+    darwin = {
-    unlisted-fonts.inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:lnl7/nix-darwin";
-
+      inputs.nixpkgs.follows = "nixpkgs";
-    nixovim.url = "git+https://git.sakamoto.dev/kenji/nixovim.git";
+    };
-    nixovim.inputs.nixpkgs.follows = "nixpkgs";
+    nixovim = {
-
+      url = "git+https://git.sakamoto.dev/kenji/nixovim.git";
-    matugen.url = "github:/InioX/Matugen";
+      inputs.nixpkgs.follows = "nixpkgs";
-    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 = {
     self,
     nixpkgs,
+    flake-utils,
     home-manager,
     darwin,
-    ags,
-    hyprland,
-    unlisted-fonts,
-    nixovim,
     ...
   } @ inputs: let
+    # Define common arguments or functions here if needed
     config = import ./config.nix;
-    lib = nixpkgs.lib;
+    # A helper function to create arguments for modules
-    system = "x86_64-linux";
+    mkArgs = system:
-    # pkgs = nixpkgs.legacyPackages.${system}; # alternative, without overlays. Unused.
-    args =
       {
         inherit inputs system;
       }
       // config;
-  in {
+  in
-    # nixosConfiguration for linux system
+    flake-utils.lib.eachDefaultSystem (
-    nixosConfigurations = {
+      system: let
-      desktop = lib.nixosSystem {
+        lib = nixpkgs.lib;
-        inherit system;
+        pkgs = nixpkgs.legacyPackages.${system};
-        specialArgs = args;
+        args = mkArgs system; # Use the helper for common args
-        modules = [
+      in {
-          ./hosts/desktop/configuration.nix
+        nixosConfigurations = {
-        ];
+          desktop = lib.nixosSystem {
-      };
+            inherit system;
-    };
+            specialArgs = args;
-    homeConfigurations = {
+            modules = []; # Add your NixOS modules here
-      desktop = home-manager.lib.homeManagerConfiguration {
+          };
-        pkgs = import nixpkgs {
+        };
-          inherit system;
+        homeConfigurations = {
-          overlays = [
+          # Assuming you want home-manager configurations for all default systems
-            # (final: prev: {
+          desktop = home-manager.lib.homeManagerConfiguration {
-            #   ags_1 = prev.ags_1.overrideAttrs (old: {
+            pkgs = import nixpkgs {
-            #     buildInputs = old.buildInputs ++ [pkgs.libdbusmenu-gtk3];
+              inherit system;
-            #   });
+              extraSpecialArgs = args;
-            # })
+            };
+            modules = []; # Add your Home Manager modules here
+          };
+        };
+      }
+    )
+    // {
+      darwinConfigurations = {
+        macos = darwin.lib.darwinSystem {
+          system = "aarch64-darwin";
+          # *** CRITICAL CHANGE HERE ***
+          # Pass the result of mkArgs, AND the mkArgs function itself
+          specialArgs = (mkArgs "aarch64-darwin") // {inherit mkArgs;};
+          modules = [
+            ./hosts/macos/darwin.nix
           ];
         };
-        extraSpecialArgs = args;
-        modules = [./home/desktop.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
-    darwinConfigurations = {
-      macos = darwin.lib.darwinSystem {
-        system = "aarch64-darwin";
-        specialArgs = args;
-        modules = [
-          ./hosts/macos/darwin.nix
-          home-manager.darwinModules.home-manager
-          {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.extraSpecialArgs = args;
-          }
-        ];
-      };
-    };
-  };
 }

home/darwin.nix

@@ -5,11 +5,11 @@
   ...
 }: {
   imports = [
-    ../modules/terminal.nix
+    ../modules/home/terminal.nix
   ];
 
   programs.home-manager.enable = true;
 
   home.packages = [];
-  home.stateVersion = "23.05";
+  home.stateVersion = "25.11";
 }

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/hakase.nix

@@ -0,0 +1,9 @@
+{pkgs, ...}: let
+  info = import ../config.nix;
+in {
+  imports = [
+    ../modules/home/desktop.nix
+    ../modules/home/terminal.nix
+  ];
+  home.packages = info.myConfig.nixos.Apps.packages pkgs;
+}

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";
-}

hosts/hakase/configuration.nix

@@ -0,0 +1,123 @@
+{
+  pkgs,
+  myConfig,
+  inputs,
+  lib,
+  ...
+}: {
+  imports = [
+    inputs.home-manager.nixosModules.home-manager
+    ./hardware-configuration.nix
+  ];
+
+  environment.systemPackages = with pkgs; [
+    pavucontrol
+  ];
+
+  users = {
+    defaultUserShell = pkgs.${myConfig.general.Terminal.shell};
+    users = {
+      ${myConfig.essentials.Username} = {
+        isNormalUser = true;
+        extraGroups = ["wheel" "networkmanager" "input" "video"];
+        initialHashedPassword = "$y$j9T$NHFtSwF4NJtEmgMjy4Xdg.$9WQltjEx3eEfZ7GbpGLW8lBhJtiXPOeIawrxdmx0.vB";
+        useDefaultShell = true;
+        packages = [];
+      };
+    };
+  };
+  home-manager = {
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    users.${myConfig.essentials.Username} = import ../../home/hakase.nix;
+  };
+
+  nixpkgs.config.allowUnfree = myConfig.general.allowUnfree;
+
+  hardware.graphics = {
+    enable = true;
+    enable32Bit = true;
+  };
+
+  i18.defaultLocale = "en_US.UTF-8";
+  time.timeZone = "${myConfig.nixos.Timezone}";
+
+  boot.loader = {
+    systemd-boot = lib.mkIf (myConfig.nixos.Boot.mode == "systemd") {
+      enable = false;
+    };
+    grub = lib.mkIf (myConfig.nixos.Boot.mode == "grub") {
+      enable = true;
+      device = "nodev";
+    };
+    efi = {
+      canTouchEfiVariables = true;
+    };
+  };
+
+  programs.ssh.extraConfig = myConfig.general.ssh.extraConfig;
+
+  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;
+  };
+
+  services = {
+    openssh.enable = true;
+    libinput.enable = true;
+    blueman.enable = true;
+    printing.enable = true;
+    displayManager.gdm.enable = false;
+    pipewire = {
+      enable = true;
+      alsa.enable = true;
+      alsa.support32Bit = true;
+      pulse.enable = true;
+
+      lowLatency = {
+        enable = true;
+        quantum = 64;
+        rate = 48000;
+      };
+    };
+  };
+  # make pipewire realtime-capable
+  security.rtkit.enable = true;
+
+  nix = {
+    distributedBuilds = true;
+    settings = {
+      builders-use-substitutes = true;
+      trusted-users = myConfig.optionals.Builds.trustedUsers;
+      experimental-features = ["nix-command" "flakes"];
+    };
+  };
+
+  networking = {
+    firewall = {
+      enable = false;
+      allowedTCPPorts = [22 80];
+      allowedUDPPorts = [53];
+      proxy.default = null;
+      proxy.noProxy = null;
+    };
+  };
+  # 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.stateVersion = "25.05";
+}

hosts/macos/darwin.nix

@@ -2,16 +2,17 @@
   pkgs,
   myConfig,
   inputs,
+  system,
+  mkArgs,
   ...
 }: {
   imports = [
-    ../../modules/macosDev.nix
+    ../../modules/default/darwin.nix
-    inputs.sops-nix.darwinModules.sops
+    inputs.home-manager.darwinModules.home-manager
   ];
   # List packages installed in system profile. To search by name, run:
   # $ nix-env -qaP | grep wget
-  environment.systemPackages = with pkgs; [
+  environment.systemPackages = [];
-  ];
 
   # Auto upgrade nix package and the daemon service.
   # services.nix-daemon.enable = true;
@@ -20,7 +21,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 = myConfig.optionals.Builds.trustedUsers;
 
   # Create /etc/zshrc that loads the nix-darwin environment.
   programs.zsh.enable = true; # default shell on catalina
@@ -33,11 +34,14 @@
   nixpkgs.hostPlatform = "aarch64-darwin";
   security.pam.services.sudo_local.touchIdAuth = true;
 
-  users.users.${myConfig.general.Username} = {
+  users.users.${myConfig.essentials.Username} = {
-    name = "${myConfig.general.Username}";
+    name = "${myConfig.essentials.Username}";
-    home = "/Users/${myConfig.general.Username}";
+    home = "/Users/${myConfig.essentials.Username}";
     # shell = pkgs.${myConfig.general.terminal.Shell}; # no support for nix-darwin, but can be changed via chsh.
   };
 
-  home-manager.users.${myConfig.general.Username} = import ../../home/macos.nix;
+  home-manager.useGlobalPkgs = true;
+  home-manager.useUserPackages = true;
+  home-manager.extraSpecialArgs = mkArgs system;
+  home-manager.users.${myConfig.essentials.Username} = import ../../home/darwin.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/default/darwin.nix

@@ -0,0 +1,5 @@
+{
+  imports = [
+    ../../packages/python/default.nix
+  ];
+}

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/gaming.nix

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

modules/home/desktop.nix

@@ -0,0 +1,6 @@
+{
+  imports = [
+    ../../packages/fonts/home.nix
+    ../../packages/firefox/home.nix
+  ];
+}

modules/home/terminal.nix

@@ -0,0 +1,17 @@
+{
+  imports = [
+    ../../packages/fish/home.nix
+    ../../packages/kitty/home.nix
+    ../../packages/neovim/home.nix
+    ../../packages/starship/home.nix
+    ../../packages/fastfetch/home.nix
+    ../../packages/zsh/home.nix
+    ../../packages/zoxide/home.nix
+    ../../packages/fonts/home.nix
+
+    ../../packages/git/home.nix
+
+    ../../packages/btop/home.nix
+    ../../packages/eza/home.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 +0,0 @@
-{...}: {
-  imports = [
-    ../system/users.nix
-    ../system/hardware.nix
-    ../system/locale.nix
-    ../system/network.nix
-    ../system/programs.nix
-    ../system/services.nix
-    ../system/tty.nix
-    ../system/firewall.nix
-    ../system/boot.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
-  ];
-}

packages/ags/home.nix

@@ -8,7 +8,7 @@
 
   programs.ags = {
     enable = true;
-    configDir = ./biscuit;
+    configDir = ./custom;
 
     extraPackages = let
       agsPkgs = inputs.ags.packages.${system};

packages/btop/home.nix

@@ -0,0 +1,9 @@
+{
+  programs.btop = {
+    enable = true;
+    settings = {
+      vim_keys = true;
+      theme_background = false;
+    };
+  };
+}

packages/eza/home.nix

@@ -0,0 +1,12 @@
+{pkgs, ...}: {
+  programs.eza = {
+    enable = true;
+    git = true;
+    colors = "auto";
+    icons = "auto";
+
+    enableZshIntegration = true;
+    enableFishIntegration = true;
+    enableBashIntegration = true;
+  };
+}

packages/firefox/home.nix

@@ -0,0 +1,126 @@
+{
+  programs.firefox = {
+    enable = true;
+    languagePacks = [
+      "en-US"
+    ];
+    profiles = {
+      hakase = {
+        isDefault = true;
+        search.default = "DuckDuckGo";
+        settings = {
+          "browser.startup.homepage" = "https://nixos.org";
+          "browser.newtabpage.pinned" = [
+            {
+              title = "NixOS";
+              url = "https://nixos.org";
+            }
+          ];
+        };
+        bookmarks = {
+          force = true;
+          settings = [
+            {
+              name = "wikipedia";
+              tags = ["wiki"];
+              keyword = "wiki";
+              url = "https://en.wikipedia.org/wiki/Special:Search?search=%s&go=Go";
+            }
+            {
+              name = "kernel.org";
+              url = "https://www.kernel.org";
+            }
+            {
+              name = "Nix sites";
+              toolbar = true;
+              bookmarks = [
+                {
+                  name = "homepage";
+                  url = "https://nixos.org/";
+                }
+                {
+                  name = "wiki";
+                  tags = ["wiki" "nix"];
+                  url = "https://wiki.nixos.org/";
+                }
+              ];
+            }
+          ];
+        };
+      };
+    };
+
+    policies = {
+      DisableTelemetry = true;
+      DisableFirefoxStudies = true;
+      EnableTrackingProtection = {
+        Value = true;
+        Locked = true;
+        Cryptomining = true;
+        Fingerprinting = true;
+      };
+      DisablePocket = true;
+      DisableFirefoxAccounts = true;
+      DisableAccounts = true;
+      DisableFirefoxScreenshots = true;
+      OverrideFirstRunPage = "";
+      OverridePostUpdatePage = "";
+      DontCheckDefaultBrowser = true;
+      DisplayBookmarksToolbar = "always"; # alternatives: "always" or "newtab"
+      DisplayMenuBar = "default-off"; # alternatives: "always", "never" or "default-on"
+      SearchBar = "unified"; # alternative: "separate"
+
+      /*
+      ---- EXTENSIONS ----
+      */
+      # Check about:support for extension/add-on ID strings.
+      # Valid strings for installation_mode are "allowed", "blocked",
+      # "force_installed" and "normal_installed".
+      ExtensionSettings = {
+        "*".installation_mode = "blocked"; # blocks all addons except the ones specified below
+        # uBlock Origin:
+        "uBlock0@raymondhill.net" = {
+          install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
+          installation_mode = "force_installed";
+        };
+        "{446900e4-71c2-419f-a6a7-df9c091e268b}" = {
+          install_url = "https://addons.mozilla.org/firefox/downloads/file/4493940/bitwarden_password_manager-2025.5.0.xpi";
+          installation_mode = "force_installed";
+        };
+        "tridactyl.vim@cmcaine.co.uk" = {
+          install_url = "https://addons.mozilla.org/firefox/downloads/file/4405615/tridactyl_vim-1.24.2.xpi";
+          installation_mode = "force_installed";
+        };
+        # Privacy Badger:
+        # "jid1-MnnxcxisBPnSXQ@jetpack" = {
+        #   install_url = "https://addons.mozilla.org/firefox/downloads/latest/privacy-badger17/latest.xpi";
+        #   installation_mode = "force_installed";
+        # };
+        # 1Password:
+        # "{d634138d-c276-4fc8-924b-40a0ea21d284}" = {
+        #   install_url = "https://addons.mozilla.org/firefox/downloads/latest/1password-x-password-manager/latest.xpi";
+        #   installation_mode = "force_installed";
+      };
+    };
+    preferences = {
+      "browser.contentblocking.category" = "strict";
+      "extensions.pocket.enabled" = false;
+      "extensions.screenshots.disabled" = true;
+      "browser.topsites.contile.enabled" = false;
+      "browser.formfill.enable" = false;
+      "browser.search.suggest.enabled" = false;
+      "browser.search.suggest.enabled.private" = false;
+      "browser.urlbar.suggest.searches" = false;
+      "browser.urlbar.showSearchSuggestionsFirst" = false;
+      "browser.newtabpage.activity-stream.feeds.section.topstories" = false;
+      "browser.newtabpage.activity-stream.feeds.snippets" = false;
+      "browser.newtabpage.activity-stream.section.highlights.includePocket" = false;
+      "browser.newtabpage.activity-stream.section.highlights.includeBookmarks" = false;
+      "browser.newtabpage.activity-stream.section.highlights.includeDownloads" = false;
+      "browser.newtabpage.activity-stream.section.highlights.includeVisited" = false;
+      "browser.newtabpage.activity-stream.showSponsored" = false;
+      "browser.newtabpage.activity-stream.system.showSponsored" = false;
+      "browser.newtabpage.activity-stream.showSponsoredTopSites" = false;
+    };
+  };
+}

packages/fish/home.nix

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

packages/fonts/home.nix

@@ -0,0 +1,8 @@
+{pkgs, ...}: {
+  fonts = {
+    fontconfig.enable = true;
+  };
+  home.packages = with pkgs; [
+    nerd-fonts.jetbrains-mono
+  ];
+}

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/git/home.nix

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

packages/kitty/home.nix

@@ -1,4 +1,8 @@
-{myConfig, ...}: {
+{
+  myConfig,
+  pkgs,
+  ...
+}: {
   programs.kitty = {
     enable = true;
 
@@ -7,11 +11,12 @@
       confirm_os_window_close = 0;
       window_padding_width = 10;
 
-      font_size = myConfig.general.terminal.Size;
+      font_size = myConfig.general.Terminal.size;
-      font_family = myConfig.general.terminal.Font;
+      font_family = myConfig.general.Terminal.font;
       bold_font = "auto";
       italic_font = "auto";
       bold_italic_font = "auto";
+      shell = "${pkgs.${myConfig.general.Terminal.shell}}/bin/${myConfig.general.Terminal.shell}";
 
       # optimization
       input_delay = 0;

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/neovim/home.nix

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

packages/python/default.nix

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

packages/quickshell/home.nix

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

packages/steam/home.nix

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

packages/zoxide/home.nix

@@ -0,0 +1,8 @@
+{
+  programs.zoxide = {
+    enable = true;
+    enableFishIntegration = true;
+    enableZshIntegration = true;
+    enableBashIntegration = true;
+  };
+}

packages/zsh/home.nix

@@ -13,7 +13,7 @@
   programs.zsh = {
     enableCompletion = false;
     syntaxHighlighting.enable = false;
-    shellAliases = myConfig.general.terminal.Aliases;
+    shellAliases = myConfig.general.Terminal.aliases;
     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/browser.nix

@@ -1,107 +0,0 @@
-{
-  config,
-  pkgs,
-  ...
-}: let
-  lock-false = {
-    Value = false;
-    Status = "locked";
-  };
-  lock-true = {
-    Value = true;
-    Status = "locked";
-  };
-in {
-  programs = {
-    firefox = {
-      enable = true;
-      languagePacks = ["en-US"];
-
-      /*
-      ---- POLICIES ----
-      */
-      # Check about:policies#documentation for options.
-      policies = {
-        DisableTelemetry = true;
-        DisableFirefoxStudies = true;
-        EnableTrackingProtection = {
-          Value = true;
-          Locked = true;
-          Cryptomining = true;
-          Fingerprinting = true;
-        };
-        DisablePocket = true;
-        DisableFirefoxAccounts = true;
-        DisableAccounts = true;
-        DisableFirefoxScreenshots = true;
-        OverrideFirstRunPage = "";
-        OverridePostUpdatePage = "";
-        DontCheckDefaultBrowser = true;
-        DisplayBookmarksToolbar = "never"; # alternatives: "always" or "newtab"
-        DisplayMenuBar = "default-off"; # alternatives: "always", "never" or "default-on"
-        SearchBar = "unified"; # alternative: "separate"
-
-        /*
-        ---- EXTENSIONS ----
-        */
-        # Check about:support for extension/add-on ID strings.
-        # Valid strings for installation_mode are "allowed", "blocked",
-        # "force_installed" and "normal_installed".
-        ExtensionSettings = {
-          "*".installation_mode = "blocked"; # blocks all addons except the ones specified below
-          # uBlock Origin:
-          "uBlock0@raymondhill.net" = {
-            install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
-            installation_mode = "force_installed";
-          };
-          "{446900e4-71c2-419f-a6a7-df9c091e268b}" = {
-            install_url = "https://addons.mozilla.org/firefox/downloads/file/4493940/bitwarden_password_manager-2025.5.0.xpi";
-            installation_mode = "force_installed";
-          };
-          "tridactyl.vim@cmcaine.co.uk" = {
-            install_url = "https://addons.mozilla.org/firefox/downloads/file/4405615/tridactyl_vim-1.24.2.xpi";
-            installation_mode = "force_installed";
-          };
-          # Privacy Badger:
-          # "jid1-MnnxcxisBPnSXQ@jetpack" = {
-          #   install_url = "https://addons.mozilla.org/firefox/downloads/latest/privacy-badger17/latest.xpi";
-          #   installation_mode = "force_installed";
-          # };
-          # 1Password:
-          # "{d634138d-c276-4fc8-924b-40a0ea21d284}" = {
-          #   install_url = "https://addons.mozilla.org/firefox/downloads/latest/1password-x-password-manager/latest.xpi";
-          #   installation_mode = "force_installed";
-        };
-      };
-
-      /*
-      ---- PREFERENCES ----
-      */
-      # Check about:config for options.
-      preferences = {
-        # "browser.contentblocking.category" = {
-        #   Value = "strict";
-        #   Status = "locked";
-        # };
-        "browser.contentblocking.category" = "strict";
-        "extensions.pocket.enabled" = false;
-        "extensions.screenshots.disabled" = true;
-        "browser.topsites.contile.enabled" = false;
-        "browser.formfill.enable" = false;
-        "browser.search.suggest.enabled" = false;
-        "browser.search.suggest.enabled.private" = false;
-        "browser.urlbar.suggest.searches" = false;
-        "browser.urlbar.showSearchSuggestionsFirst" = false;
-        "browser.newtabpage.activity-stream.feeds.section.topstories" = false;
-        "browser.newtabpage.activity-stream.feeds.snippets" = false;
-        "browser.newtabpage.activity-stream.section.highlights.includePocket" = false;
-        "browser.newtabpage.activity-stream.section.highlights.includeBookmarks" = false;
-        "browser.newtabpage.activity-stream.section.highlights.includeDownloads" = false;
-        "browser.newtabpage.activity-stream.section.highlights.includeVisited" = false;
-        "browser.newtabpage.activity-stream.showSponsored" = false;
-        "browser.newtabpage.activity-stream.system.showSponsored" = false;
-        "browser.newtabpage.activity-stream.showSponsoredTopSites" = false;
-      };
-    };
-  };
-}

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/font.nix

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

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,19 +0,0 @@
-{
-  pkgs,
-  myConfig,
-  ...
-}: {
-  users = {
-    defaultUserShell = pkgs.${myConfig.general.terminal.Shell};
-    users = {
-      ${myConfig.general.Username} = {
-        isNormalUser = true;
-        extraGroups = ["wheel" "networkmanager" "input" "corectrl" "video"];
-        initialHashedPassword = "$y$j9T$NHFtSwF4NJtEmgMjy4Xdg.$9WQltjEx3eEfZ7GbpGLW8lBhJtiXPOeIawrxdmx0.vB";
-        useDefaultShell = true;
-        packages = [
-        ];
-      };
-    };
-  };
-}

system/wayland.nix

@@ -1,24 +0,0 @@
-{
-  pkgs,
-  inputs,
-  ...
-}: {
-  environment.systemPackages = with pkgs; [
-    wl-clipboard
-    hypridle
-    hyprlock
-    brightnessctl
-  ];
-  programs.hyprland = {
-    enable = true;
-    package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
-    portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
-  };
-  hardware = {
-    graphics.enable = true;
-  };
-  services = {
-    # displayManager.sddm.wayland = true;
-    displayManager.gdm.enable = true;
-  };
-}