added virtualbox

README.md

@@ -53,3 +53,11 @@ Installing Sakamoto Nix configuration may vary on your current operating system.
     ```sh
     $ sudo nix run nix-darwin --extra-experimental-features "nix-command flakes" -- switch --flake ~/.config/nixos#macos
     ```
+
+## Problems:
+* XDG defaults (file manager default is terminal)
+* File Manager must be TUI
+* Bluetooth and WiFi should open at TUI
+* Steam and Heroic incompatible
+* Broken switchwall.sh
+* Box fonts

config.nix

@@ -28,6 +28,7 @@
       Apps = {
         packages = pkgs:
           with pkgs; [
+            adwaita-icon-theme
             jellyfin-media-player
             delfin
             goverlay
@@ -44,14 +45,14 @@
           # "DP-2, highres@165,0x1080,1,vrr,1"
           # "DP-2, highres@180,0x1080,1,cm,hdr, sdrbrightness, 1.5, sdrsaturation, 0.98"
           "DP-2, highres@180,0x1080,1,bitdepth,10,cm,hdr,sdrbrightness,1.4,sdrsaturation,0.98"
-          "DP-1, highres@highrr,0x0,1"
+          "DP-1, highres@highrr,760x0,1"
           "HDMI-A-1, 1920x1080@120, 20000x20000,1"
           # "HDMI-A-1, disabled"
         ];
       };
       Git = {
-        user = "";
+        user = "kenji";
-        email = "";
+        email = "kenji@hakase";
         defaultBranch = "master";
       };
     };

flake.lock

@@ -20,11 +20,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1751740947,
+        "lastModified": 1753216019,
-        "narHash": "sha256-35040CHH7P3JGmhGVfEb2oJHL/A5mI2IXumhkxrBnao=",
+        "narHash": "sha256-zik7WISrR1ks2l6T1MZqZHb/OqroHdJnSnAehkE0kCk=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "dfc1db15a08c4cd234288f66e1199c653495301f",
+        "rev": "be166e11d86ba4186db93e10c54a141058bdce49",
         "type": "github"
       },
       "original": {
@@ -70,6 +70,59 @@
         "type": "github"
       }
     },
+    "aquamarine_3": {
+      "inputs": {
+        "hyprutils": [
+          "omarchy-nix",
+          "hyprland",
+          "hyprutils"
+        ],
+        "hyprwayland-scanner": [
+          "omarchy-nix",
+          "hyprland",
+          "hyprwayland-scanner"
+        ],
+        "nixpkgs": [
+          "omarchy-nix",
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "omarchy-nix",
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1753216019,
+        "narHash": "sha256-zik7WISrR1ks2l6T1MZqZHb/OqroHdJnSnAehkE0kCk=",
+        "owner": "hyprwm",
+        "repo": "aquamarine",
+        "rev": "be166e11d86ba4186db93e10c54a141058bdce49",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "aquamarine",
+        "type": "github"
+      }
+    },
+    "base16-schemes": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696158499,
+        "narHash": "sha256-5yIHgDTPjoX/3oDEfLSQ0eJZdFL1SaCfb9d6M0RmOTM=",
+        "owner": "tinted-theming",
+        "repo": "base16-schemes",
+        "rev": "a9112eaae86d9dd8ee6bb9445b664fba2f94037a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "base16-schemes",
+        "type": "github"
+      }
+    },
     "chaotic": {
       "inputs": {
         "flake-schemas": "flake-schemas",
@@ -135,14 +188,35 @@
         "type": "github"
       }
     },
+    "erosanix": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1755873371,
+        "narHash": "sha256-XuIcd9zzF956yf6TCEK633hsbfdA7HWzyEyykwIoARU=",
+        "owner": "emmanuelrosa",
+        "repo": "erosanix",
+        "rev": "daaaa165f3746dbf5fb133f5c50b99a207376bee",
+        "type": "github"
+      },
+      "original": {
+        "owner": "emmanuelrosa",
+        "repo": "erosanix",
+        "type": "github"
+      }
+    },
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1696426674,
+        "lastModified": 1673956053,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
         "type": "github"
       },
       "original": {
@@ -152,6 +226,22 @@
       }
     },
     "flake-compat_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1747046372,
+        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_3": {
       "flake": false,
       "locked": {
         "lastModified": 1696426674,
@@ -167,7 +257,7 @@
         "type": "github"
       }
     },
-    "flake-compat_3": {
+    "flake-compat_4": {
       "locked": {
         "lastModified": 1733328505,
         "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
@@ -181,6 +271,22 @@
         "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
       }
     },
+    "flake-compat_5": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1747046372,
+        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib"
@@ -367,6 +473,29 @@
         "type": "github"
       }
     },
+    "gitignore_4": {
+      "inputs": {
+        "nixpkgs": [
+          "omarchy-nix",
+          "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"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -467,11 +596,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1749155331,
+        "lastModified": 1753964049,
-        "narHash": "sha256-XR9fsI0zwLiFWfqi/pdS/VD+YNorKb3XIykgTg4l1nA=",
+        "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=",
         "owner": "hyprwm",
         "repo": "hyprcursor",
-        "rev": "45fcc10b4c282746d93ec406a740c43b48b4ef80",
+        "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5",
         "type": "github"
       },
       "original": {
@@ -512,6 +641,38 @@
         "type": "github"
       }
     },
+    "hyprcursor_3": {
+      "inputs": {
+        "hyprlang": [
+          "omarchy-nix",
+          "hyprland",
+          "hyprlang"
+        ],
+        "nixpkgs": [
+          "omarchy-nix",
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "omarchy-nix",
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1753964049,
+        "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=",
+        "owner": "hyprwm",
+        "repo": "hyprcursor",
+        "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprcursor",
+        "type": "github"
+      }
+    },
     "hyprgraphics": {
       "inputs": {
         "hyprutils": [
@@ -528,11 +689,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1751808145,
+        "lastModified": 1754305013,
-        "narHash": "sha256-OXgL0XaKMmfX2rRQkt9SkJw+QNfv0jExlySt1D6O72g=",
+        "narHash": "sha256-u+M2f0Xf1lVHzIPQ7DsNCDkM1NYxykOSsRr4t3TbSM4=",
         "owner": "hyprwm",
         "repo": "hyprgraphics",
-        "rev": "b841473a0bd4a1a74a0b64f1ec2ab199035c349f",
+        "rev": "4c1d63a0f22135db123fc789f174b89544c6ec2d",
         "type": "github"
       },
       "original": {
@@ -573,6 +734,38 @@
         "type": "github"
       }
     },
+    "hyprgraphics_3": {
+      "inputs": {
+        "hyprutils": [
+          "omarchy-nix",
+          "hyprland",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "omarchy-nix",
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "omarchy-nix",
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1754305013,
+        "narHash": "sha256-u+M2f0Xf1lVHzIPQ7DsNCDkM1NYxykOSsRr4t3TbSM4=",
+        "owner": "hyprwm",
+        "repo": "hyprgraphics",
+        "rev": "4c1d63a0f22135db123fc789f174b89544c6ec2d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprgraphics",
+        "type": "github"
+      }
+    },
     "hyprland": {
       "inputs": {
         "aquamarine": "aquamarine",
@@ -591,17 +784,19 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1751995875,
+        "lastModified": 1755687691,
-        "narHash": "sha256-ud9sl1RjmzAzalH2ocmGPs182xvr7GktjVIYvzJamwo=",
+        "narHash": "sha256-o9co4SENS25l3L5RQJ4PY3pCJAs35jjz7K8GU905Chs=",
-        "owner": "hyprwm",
+        "ref": "refs/heads/main",
-        "repo": "Hyprland",
+        "rev": "1ac1ff457ab8ef1ae6a8f2ab17ee7965adfa729f",
-        "rev": "9517d0eaa4ef93de67dc80fecca7a826f7ad556d",
+        "revCount": 6383,
-        "type": "github"
+        "submodules": true,
+        "type": "git",
+        "url": "https://github.com/hyprwm/Hyprland"
       },
       "original": {
-        "owner": "hyprwm",
+        "submodules": true,
-        "repo": "Hyprland",
+        "type": "git",
-        "type": "github"
+        "url": "https://github.com/hyprwm/Hyprland"
       }
     },
     "hyprland-protocols": {
@@ -656,6 +851,33 @@
         "type": "github"
       }
     },
+    "hyprland-protocols_3": {
+      "inputs": {
+        "nixpkgs": [
+          "omarchy-nix",
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "omarchy-nix",
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1749046714,
+        "narHash": "sha256-kymV5FMnddYGI+UjwIw8ceDjdeg7ToDVjbHCvUlhn14=",
+        "owner": "hyprwm",
+        "repo": "hyprland-protocols",
+        "rev": "613878cb6f459c5e323aaafe1e6f388ac8a36330",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-protocols",
+        "type": "github"
+      }
+    },
     "hyprland-qt-support": {
       "inputs": {
         "hyprlang": [
@@ -723,6 +945,41 @@
         "type": "github"
       }
     },
+    "hyprland-qt-support_3": {
+      "inputs": {
+        "hyprlang": [
+          "omarchy-nix",
+          "hyprland",
+          "hyprland-qtutils",
+          "hyprlang"
+        ],
+        "nixpkgs": [
+          "omarchy-nix",
+          "hyprland",
+          "hyprland-qtutils",
+          "nixpkgs"
+        ],
+        "systems": [
+          "omarchy-nix",
+          "hyprland",
+          "hyprland-qtutils",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1749154592,
+        "narHash": "sha256-DO7z5CeT/ddSGDEnK9mAXm1qlGL47L3VAHLlLXoCjhE=",
+        "owner": "hyprwm",
+        "repo": "hyprland-qt-support",
+        "rev": "4c8053c3c888138a30c3a6c45c2e45f5484f2074",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-qt-support",
+        "type": "github"
+      }
+    },
     "hyprland-qtutils": {
       "inputs": {
         "hyprland-qt-support": "hyprland-qt-support",
@@ -746,11 +1003,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1750371812,
+        "lastModified": 1753819801,
-        "narHash": "sha256-D868K1dVEACw17elVxRgXC6hOxY+54wIEjURztDWLk8=",
+        "narHash": "sha256-tHe6XeNeVeKapkNM3tcjW4RuD+tB2iwwoogWJOtsqTI=",
         "owner": "hyprwm",
         "repo": "hyprland-qtutils",
-        "rev": "b13c7481e37856f322177010bdf75fccacd1adc8",
+        "rev": "b308a818b9dcaa7ab8ccab891c1b84ebde2152bc",
         "type": "github"
       },
       "original": {
@@ -799,6 +1056,46 @@
         "type": "github"
       }
     },
+    "hyprland-qtutils_3": {
+      "inputs": {
+        "hyprland-qt-support": "hyprland-qt-support_3",
+        "hyprlang": [
+          "omarchy-nix",
+          "hyprland",
+          "hyprlang"
+        ],
+        "hyprutils": [
+          "omarchy-nix",
+          "hyprland",
+          "hyprland-qtutils",
+          "hyprlang",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "omarchy-nix",
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "omarchy-nix",
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1753819801,
+        "narHash": "sha256-tHe6XeNeVeKapkNM3tcjW4RuD+tB2iwwoogWJOtsqTI=",
+        "owner": "hyprwm",
+        "repo": "hyprland-qtutils",
+        "rev": "b308a818b9dcaa7ab8ccab891c1b84ebde2152bc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-qtutils",
+        "type": "github"
+      }
+    },
     "hyprland_2": {
       "inputs": {
         "aquamarine": "aquamarine_2",
@@ -831,6 +1128,35 @@
         "type": "github"
       }
     },
+    "hyprland_3": {
+      "inputs": {
+        "aquamarine": "aquamarine_3",
+        "hyprcursor": "hyprcursor_3",
+        "hyprgraphics": "hyprgraphics_3",
+        "hyprland-protocols": "hyprland-protocols_3",
+        "hyprland-qtutils": "hyprland-qtutils_3",
+        "hyprlang": "hyprlang_3",
+        "hyprutils": "hyprutils_3",
+        "hyprwayland-scanner": "hyprwayland-scanner_3",
+        "nixpkgs": "nixpkgs_5",
+        "pre-commit-hooks": "pre-commit-hooks_3",
+        "systems": "systems_7",
+        "xdph": "xdph_3"
+      },
+      "locked": {
+        "lastModified": 1755184403,
+        "narHash": "sha256-VI+ZPD/uIFjzYW8IcyvBgvwyDIvUe4/xh/kOHTbITX8=",
+        "owner": "hyprwm",
+        "repo": "Hyprland",
+        "rev": "60d769a89908c29e19100059985db15a7b6bab6a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "Hyprland",
+        "type": "github"
+      }
+    },
     "hyprlang": {
       "inputs": {
         "hyprutils": [
@@ -847,11 +1173,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1750371198,
+        "lastModified": 1753622892,
-        "narHash": "sha256-/iuJ1paQOBoSLqHflRNNGyroqfF/yvPNurxzcCT0cAE=",
+        "narHash": "sha256-0K+A+gmOI8IklSg5It1nyRNv0kCNL51duwnhUO/B8JA=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "cee01452bca58d6cadb3224e21e370de8bc20f0b",
+        "rev": "23f0debd2003f17bd65f851cd3f930cff8a8c809",
         "type": "github"
       },
       "original": {
@@ -892,6 +1218,38 @@
         "type": "github"
       }
     },
+    "hyprlang_3": {
+      "inputs": {
+        "hyprutils": [
+          "omarchy-nix",
+          "hyprland",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "omarchy-nix",
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "omarchy-nix",
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1753622892,
+        "narHash": "sha256-0K+A+gmOI8IklSg5It1nyRNv0kCNL51duwnhUO/B8JA=",
+        "owner": "hyprwm",
+        "repo": "hyprlang",
+        "rev": "23f0debd2003f17bd65f851cd3f930cff8a8c809",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprlang",
+        "type": "github"
+      }
+    },
     "hyprutils": {
       "inputs": {
         "nixpkgs": [
@@ -904,11 +1262,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1751888065,
+        "lastModified": 1754481650,
-        "narHash": "sha256-F2SV9WGqgtRsXIdUrl3sRe0wXlQD+kRRZcSfbepjPJY=",
+        "narHash": "sha256-6u6HdEFJh5gY6VfyMQbhP7zDdVcqOrCDTkbiHJmAtMI=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "a8229739cf36d159001cfc203871917b83fdf917",
+        "rev": "df6b8820c4a0835d83d0c7c7be86fbc555f1f7fd",
         "type": "github"
       },
       "original": {
@@ -944,6 +1302,33 @@
         "type": "github"
       }
     },
+    "hyprutils_3": {
+      "inputs": {
+        "nixpkgs": [
+          "omarchy-nix",
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "omarchy-nix",
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1754481650,
+        "narHash": "sha256-6u6HdEFJh5gY6VfyMQbhP7zDdVcqOrCDTkbiHJmAtMI=",
+        "owner": "hyprwm",
+        "repo": "hyprutils",
+        "rev": "df6b8820c4a0835d83d0c7c7be86fbc555f1f7fd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprutils",
+        "type": "github"
+      }
+    },
     "hyprwayland-scanner": {
       "inputs": {
         "nixpkgs": [
@@ -956,11 +1341,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1751881472,
+        "lastModified": 1751897909,
-        "narHash": "sha256-meB0SnXbwIe2trD041MLKEv6R7NZ759QwBcVIhlSBfE=",
+        "narHash": "sha256-FnhBENxihITZldThvbO7883PdXC/2dzW4eiNvtoV5Ao=",
         "owner": "hyprwm",
         "repo": "hyprwayland-scanner",
-        "rev": "8fb426b3e5452fd9169453fd6c10f8c14ca37120",
+        "rev": "fcca0c61f988a9d092cbb33e906775014c61579d",
         "type": "github"
       },
       "original": {
@@ -996,6 +1381,33 @@
         "type": "github"
       }
     },
+    "hyprwayland-scanner_3": {
+      "inputs": {
+        "nixpkgs": [
+          "omarchy-nix",
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "omarchy-nix",
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1751897909,
+        "narHash": "sha256-FnhBENxihITZldThvbO7883PdXC/2dzW4eiNvtoV5Ao=",
+        "owner": "hyprwm",
+        "repo": "hyprwayland-scanner",
+        "rev": "fcca0c61f988a9d092cbb33e906775014c61579d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprwayland-scanner",
+        "type": "github"
+      }
+    },
     "illogical-impulse": {
       "inputs": {
         "home-manager": "home-manager_3",
@@ -1009,11 +1421,11 @@
         "quickshell": "quickshell"
       },
       "locked": {
-        "lastModified": 1755093801,
+        "lastModified": 1765640384,
-        "narHash": "sha256-4/FVSWspms9VadN8rc91wh54/StJ67Xt102uWDKevx0=",
+        "narHash": "sha256-+p1beG+5nCMt+0DdPRHCjWs1uKNmlWD8E8mYy5D1oc8=",
         "ref": "refs/heads/main",
-        "rev": "d729f277555cd27b7d38fa42750dfb79a0e0b9dd",
+        "rev": "c61fe63bae34b84af7cc41b7ae9f27ec3a73e834",
-        "revCount": 3728,
+        "revCount": 3773,
         "type": "git",
         "url": "https://git.sakamoto.dev/kenji/illogical-impulse.git"
       },
@@ -1138,6 +1550,25 @@
         "type": "github"
       }
     },
+    "nix-colors": {
+      "inputs": {
+        "base16-schemes": "base16-schemes",
+        "nixpkgs-lib": "nixpkgs-lib_2"
+      },
+      "locked": {
+        "lastModified": 1707825078,
+        "narHash": "sha256-hTfge2J2W+42SZ7VHXkf4kjU+qzFqPeC9k66jAUBMHk=",
+        "owner": "misterio77",
+        "repo": "nix-colors",
+        "rev": "b01f024090d2c4fc3152cd0cf12027a7b8453ba1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "misterio77",
+        "repo": "nix-colors",
+        "type": "github"
+      }
+    },
     "nix-darwin": {
       "inputs": {
         "nixpkgs": [
@@ -1277,6 +1708,21 @@
         "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
       }
     },
+    "nixpkgs-lib_2": {
+      "locked": {
+        "lastModified": 1697935651,
+        "narHash": "sha256-qOfWjQ2JQSQL15KLh6D7xQhx0qgZlYZTYlcEiRuAMMw=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "e1e11fdbb01113d85c7f41cada9d2847660e3902",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1738797219,
@@ -1311,11 +1757,27 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1751271578,
+        "lastModified": 1755186698,
-        "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=",
+        "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df",
+        "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1754725699,
+        "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054",
         "type": "github"
       },
       "original": {
@@ -1328,7 +1790,7 @@
     "nixvim": {
       "inputs": {
         "devshell": "devshell",
-        "flake-compat": "flake-compat_3",
+        "flake-compat": "flake-compat_4",
         "flake-parts": "flake-parts_2",
         "git-hooks": "git-hooks",
         "home-manager": "home-manager_4",
@@ -1375,6 +1837,31 @@
         "type": "github"
       }
     },
+    "omarchy-nix": {
+      "inputs": {
+        "home-manager": [
+          "home-manager"
+        ],
+        "hyprland": "hyprland_3",
+        "nix-colors": "nix-colors",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1762999930,
+        "narHash": "sha256-uKyxLwiN6sD6EmRSno66y1a8oqISr1XiWxbWHoMJT7I=",
+        "ref": "refs/heads/main",
+        "rev": "308e0f85a0deb820c01cfbe1b4faee1daab4da12",
+        "revCount": 61,
+        "type": "git",
+        "url": "https://git.sakamoto.dev/kenji/omarchy-nix.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.sakamoto.dev/kenji/omarchy-nix.git"
+      }
+    },
     "oneUI": {
       "flake": false,
       "locked": {
@@ -1393,13 +1880,37 @@
     },
     "pre-commit-hooks": {
       "inputs": {
-        "flake-compat": "flake-compat",
+        "flake-compat": "flake-compat_2",
         "gitignore": "gitignore",
         "nixpkgs": [
           "hyprland",
           "nixpkgs"
         ]
       },
+      "locked": {
+        "lastModified": 1754416808,
+        "narHash": "sha256-c6yg0EQ9xVESx6HGDOCMcyRSjaTpNJP10ef+6fRcofA=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "9c52372878df6911f9afc1e2a1391f55e4dfc864",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
+    "pre-commit-hooks_2": {
+      "inputs": {
+        "flake-compat": "flake-compat_3",
+        "gitignore": "gitignore_2",
+        "nixpkgs": [
+          "illogical-impulse",
+          "hyprland",
+          "nixpkgs"
+        ]
+      },
       "locked": {
         "lastModified": 1750779888,
         "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=",
@@ -1414,22 +1925,22 @@
         "type": "github"
       }
     },
-    "pre-commit-hooks_2": {
+    "pre-commit-hooks_3": {
       "inputs": {
-        "flake-compat": "flake-compat_2",
+        "flake-compat": "flake-compat_5",
-        "gitignore": "gitignore_2",
+        "gitignore": "gitignore_4",
         "nixpkgs": [
-          "illogical-impulse",
+          "omarchy-nix",
           "hyprland",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1750779888,
+        "lastModified": 1754416808,
-        "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=",
+        "narHash": "sha256-c6yg0EQ9xVESx6HGDOCMcyRSjaTpNJP10ef+6fRcofA=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d",
+        "rev": "9c52372878df6911f9afc1e2a1391f55e4dfc864",
         "type": "github"
       },
       "original": {
@@ -1463,6 +1974,7 @@
       "inputs": {
         "chaotic": "chaotic",
         "darwin": "darwin",
+        "erosanix": "erosanix",
         "flake-utils": "flake-utils",
         "home-manager": "home-manager_2",
         "hyprland": "hyprland",
@@ -1470,7 +1982,8 @@
         "jovian": "jovian_2",
         "matugen": "matugen_2",
         "nixovim": "nixovim",
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs_4",
+        "omarchy-nix": "omarchy-nix"
       }
     },
     "rust-overlay": {
@@ -1602,6 +2115,21 @@
         "type": "github"
       }
     },
+    "systems_7": {
+      "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"
+      }
+    },
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
@@ -1652,11 +2180,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1751300244,
+        "lastModified": 1753633878,
-        "narHash": "sha256-PFuv1TZVYvQhha0ac53E3YgdtmLShrN0t4T6xqHl0jE=",
+        "narHash": "sha256-js2sLRtsOUA/aT10OCDaTjO80yplqwOIaLUqEe0nMx0=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "6115f3fdcb2c1a57b4a80a69f3c797e47607b90a",
+        "rev": "371b96bd11ad2006ed4f21229dbd1be69bed3e8a",
         "type": "github"
       },
       "original": {
@@ -1711,6 +2239,53 @@
         "repo": "xdg-desktop-portal-hyprland",
         "type": "github"
       }
+    },
+    "xdph_3": {
+      "inputs": {
+        "hyprland-protocols": [
+          "omarchy-nix",
+          "hyprland",
+          "hyprland-protocols"
+        ],
+        "hyprlang": [
+          "omarchy-nix",
+          "hyprland",
+          "hyprlang"
+        ],
+        "hyprutils": [
+          "omarchy-nix",
+          "hyprland",
+          "hyprutils"
+        ],
+        "hyprwayland-scanner": [
+          "omarchy-nix",
+          "hyprland",
+          "hyprwayland-scanner"
+        ],
+        "nixpkgs": [
+          "omarchy-nix",
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "omarchy-nix",
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1753633878,
+        "narHash": "sha256-js2sLRtsOUA/aT10OCDaTjO80yplqwOIaLUqEe0nMx0=",
+        "owner": "hyprwm",
+        "repo": "xdg-desktop-portal-hyprland",
+        "rev": "371b96bd11ad2006ed4f21229dbd1be69bed3e8a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "xdg-desktop-portal-hyprland",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -17,8 +17,13 @@
       # ref = "refs/tags/matugen-v0.10.0";
     };
 
+    erosanix = {
+      url = "github:emmanuelrosa/erosanix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     hyprland = {
-      url = "github:hyprwm/Hyprland";
+      url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
@@ -41,6 +46,12 @@
       url = "git+https://git.sakamoto.dev/kenji/illogical-impulse.git";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    omarchy-nix = {
+      url = "git+https://git.sakamoto.dev/kenji/omarchy-nix.git";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.home-manager.follows = "home-manager";
+    };
   };
 
   outputs = {
@@ -52,6 +63,8 @@
     jovian,
     nixovim,
     illogical-impulse,
+    erosanix,
+    omarchy-nix,
     ...
   } @ inputs: let
     config = import ./config.nix;
@@ -69,9 +82,19 @@
           chaotic.nixosModules.default
           home-manager.nixosModules.home-manager
           jovian.nixosModules.default
+          erosanix.nixosModules.protonvpn
           ./hosts/hakase/configuration.nix
         ];
       };
+      hakase-omarchy = nixpkgs.lib.nixosSystem {
+        specialArgs = args;
+        modules = [
+          chaotic.nixosModules.default
+          omarchy-nix.nixosModules.default
+          home-manager.nixosModules.home-manager
+          ./hosts/hakase-omarchy/configuration.nix
+        ];
+      };
       vanilla = nixpkgs.lib.nixosSystem {
         specialArgs = args;
         modules = [
@@ -92,6 +115,16 @@
           ./home/hakase.nix
         ];
       };
+      hakase-omarchy = home-manager.lib.homeManagerConfiguration {
+        pkgs = import nixpkgs {
+          config.allowUnfree = true;
+          extraSpecialArgs = args;
+        };
+        modules = [
+          home-manager.nixosModules.home-manager
+          ./home/hakase-omarchy.nix
+        ];
+      };
     };
     darwinConfigurations = {
       macos = darwin.lib.darwinSystem {

home/hakase-omarchy.nix

@@ -0,0 +1,15 @@
+{
+  config,
+  pkgs,
+  inputs,
+  ...
+}: {
+  imports = [
+    # ... your other imports
+    inputs.omarchy-nix.homeManagerModules.default # Assuming you have a system module too
+  ];
+
+  # ADD THIS BLOCK
+
+  home.stateVersion = "25.05";
+}

hosts/hakase-omarchy/configuration.nix

@@ -0,0 +1,156 @@
+{
+  pkgs,
+  myConfig,
+  specialArgs,
+  ...
+}: {
+  imports = [
+    ../../modules/default/boot.nix
+    ./hardware-configuration.nix
+  ];
+
+  system.stateVersion = "25.05";
+
+  i18n.defaultLocale = "en_US.UTF-8";
+  time.timeZone = "${myConfig.nixos.Timezone}";
+  nixpkgs.config.allowUnfree = myConfig.general.allowUnfree;
+
+  console = {
+    earlySetup = false;
+    font = "${pkgs.terminus_font}/share/consolefonts/ter-132n.psf.gz";
+    packages = with pkgs; [terminus_font];
+    useXkbConfig = true;
+  };
+
+  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 = [];
+      };
+    };
+  };
+
+  omarchy = {
+    full_name = "${myConfig.essentials.Username}"; # Or variable
+    email_address = "${myConfig.nixos.Git.email}";
+  };
+
+  home-manager = {
+    backupFileExtension = "backup";
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    extraSpecialArgs = specialArgs;
+    users.${myConfig.essentials.Username} = import ../../home/hakase-omarchy.nix;
+  };
+  networking = {
+    useDHCP = false;
+    wireless = {
+      enable = false;
+    };
+
+    networkmanager.enable = true;
+    firewall = {
+      enable = true;
+      allowedTCPPorts = [22 80 531];
+      allowedUDPPorts = [53 531 5353];
+    };
+    proxy = {
+      default = null;
+      noProxy = null;
+    };
+  };
+
+  systemd = {
+    # network.enable = true;
+    # extraConfig = "DefaultTimeoutStopSec=5s";
+  };
+
+  nix = {
+    settings = {
+      experimental-features = ["nix-command" "flakes"];
+    };
+  };
+  #
+  # hardware = {
+  #   enableAllFirmware = true;
+  #   logitech.wireless.enable = true;
+  #
+  #   bluetooth = {
+  #     enable = true;
+  #     powerOnBoot = true;
+  #     settings = {
+  #       General = {
+  #         # AutoEnable = true;
+  #         Experimental = true;
+  #         MultiProfile = "multiple";
+  #         FastConnectable = true;
+  #         # ControllerMode = "bredr";
+  #       };
+  #       Policy = {
+  #         AutoEnable = true;
+  #       };
+  #     };
+  #   };
+  #
+  #   graphics = {
+  #     enable = true;
+  #     enable32Bit = true;
+  #   };
+  #
+  #   xone.enable = true;
+  # };
+  #
+
+  # security.rtkit.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
+  #   '';
+  #   zsh.enable = true;
+  #   fish.enable = true;
+  #
+  #   appimage = {
+  #     enable = true;
+  #     binfmt = true;
+  #   };
+  #
+  #   ssh.extraConfig = myConfig.optionals.Ssh.extraConfig;
+  # };
+
+  # jovian.steamos.enableMesaPatches = true;
+  #
+  # services = {
+  #   displayManager.sessionPackages = [
+  #     inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland
+  #   ];
+  #
+  #   getty.autologinUser = lib.mkOverride 10 "${myConfig.essentials.Username}";
+  #
+  #   flatpak.enable = true;
+  #   seatd.enable = true;
+  #   upower.enable = true;
+  #   scx.enable = true;
+  #   libinput.enable = true;
+  #   blueman.enable = true;
+  #   printing.enable = true;
+  #   openssh.enable = true;
+  #
+  #   pipewire = {
+  #     enable = true;
+  #     alsa = {
+  #       enable = true;
+  #       support32Bit = true;
+  #     };
+  #     pulse.enable = true;
+  #   };
+  # };
+}

hosts/hakase-omarchy/hardware-configuration.nix

@@ -0,0 +1,33 @@
+# 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" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/mapper/luks-9091013c-0763-40a6-8316-d44d52df3530";
+      fsType = "ext4";
+    };
+
+  boot.initrd.luks.devices."luks-9091013c-0763-40a6-8316-d44d52df3530".device = "/dev/disk/by-uuid/9091013c-0763-40a6-8316-d44d52df3530";
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/B332-BF84";
+      fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
+    };
+
+  swapDevices = [ ];
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

hosts/hakase/configuration.nix

@@ -6,16 +6,21 @@
   specialArgs,
   ...
 }: {
-  imports = [
+  imports =
-    ./hardware-configuration.nix
+    [
-    ../../modules/default/apps.nix
+      ./hardware-configuration.nix
-    ../../modules/default/desktop.nix
+      ../../modules/default/apps.nix
-    ../../modules/default/remote.nix
+      ../../modules/default/desktop.nix
-    ../../modules/default/gaming.nix
+      ../../modules/default/remote.nix
-    ../../modules/default/udev.nix
+      ../../modules/default/gaming.nix
-    ../../modules/default/boot.nix
+      ../../modules/default/udev.nix
-    ../../modules/default/dev.nix
+      ../../modules/default/boot.nix
-  ];
+      ../../modules/default/dev.nix
+      ../../modules/default/security.nix
+    ]
+    ++ lib.optionals (myConfig.nixos.enableSteamOS == false) [
+      ../../modules/default/login.nix
+    ];
 
   system.stateVersion = "25.05";
 
@@ -70,6 +75,7 @@
       powerOnBoot = true;
       settings = {
         General = {
+          Enable = "Source,Sink,Media,Socket";
           # AutoEnable = true;
           Experimental = true;
           MultiProfile = "multiple";
@@ -91,6 +97,11 @@
   };
 
   networking = {
+    useDHCP = false;
+    wireless = {
+      enable = false;
+    };
+
     networkmanager.enable = true;
     firewall = {
       enable = true;
@@ -104,8 +115,8 @@
   };
 
   systemd = {
-    network.enable = true;
+    # network.enable = true;
-    extraConfig = "DefaultTimeoutStopSec=5s";
+    # extraConfig = "DefaultTimeoutStopSec=5s";
   };
 
   security.rtkit.enable = true;
@@ -128,6 +139,8 @@
     ssh.extraConfig = myConfig.optionals.Ssh.extraConfig;
   };
 
+  # jovian.steamos.enableMesaPatches = true;
+
   services = {
     displayManager.sessionPackages = [
       inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland
@@ -135,14 +148,6 @@
 
     getty.autologinUser = lib.mkOverride 10 "${myConfig.essentials.Username}";
 
-    # greetd = {
-    #   enable = true;
-    #   settings.default_session = {
-    #     user = lib.mkOverride 10 "${myConfig.essentials.Username}";
-    #     command = lib.mkOverride 10 "Hyprland";
-    #   };
-    # };
-
     flatpak.enable = true;
     seatd.enable = true;
     upower.enable = true;
@@ -160,5 +165,10 @@
       };
       pulse.enable = true;
     };
+    avahi = {
+      enable = true;
+      nssmdns4 = true;
+      openFirewall = true;
+    };
   };
 }

hosts/hakase/hardware-configuration.nix

@@ -8,39 +8,25 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/43a2db2f-a691-4094-b4c7-11853627de39";
+    { device = "/dev/mapper/luks-f8bd85aa-b08e-472a-b7f6-5e190b9b9714";
-      fsType = "btrfs";
+      fsType = "ext4";
-      options = [ "subvol=@" ];
     };
 
+  boot.initrd.luks.devices."luks-f8bd85aa-b08e-472a-b7f6-5e190b9b9714".device = "/dev/disk/by-uuid/f8bd85aa-b08e-472a-b7f6-5e190b9b9714";
+
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/C4BB-A8B7";
+    { device = "/dev/disk/by-uuid/72BA-AF9B";
       fsType = "vfat";
       options = [ "fmask=0077" "dmask=0077" ];
     };
 
-  fileSystems."/home" =
+  swapDevices = [ ];
-    { device = "/dev/disk/by-uuid/780aa81f-c4d6-478b-9c51-2d60362fdb07";
-      fsType = "ext4";
-    };
-
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/b02ef55c-4caf-4a24-a6a2-fb8001eafe22"; }
-    ];
-
-  # 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.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;

modules/default/apps.nix

@@ -7,5 +7,22 @@
     dualsensectl
     protontricks
     wl-clipboard
+    tldr
+    anki
+    lact
+    lm_sensors
+    grim
   ];
+  imports = [
+    ../../packages/virtualbox/default.nix
+    # ../../packages/lact/default.nix
+  ];
+  hardware.amdgpu.overdrive.enable = true;
+  services.lact.enable = true;
+  # services = {
+  #   protonvpn = {
+  #     enable = true;
+  #     autostart = true;
+  #   };
+  # };
 }

modules/default/boot.nix

@@ -11,16 +11,27 @@
         canTouchEfiVariables = true;
         efiSysMountPoint = "/boot";
       };
+
+      limine = lib.mkIf (myConfig.nixos.Boot.mode == "limine") {
+        enable = true;
+        maxGenerations = 5;
+      };
+
       systemd-boot = lib.mkIf (myConfig.nixos.Boot.mode == "systemd") {
         enable = true;
+        # xbootldrMountPoint = "/boot";
+
+        edk2-uefi-shell.enable = true;
+        edk2-uefi-shell.sortKey = "z_edk2";
       };
+
+      # grub ain't that great for advanced setups such as using a secure boot.
       grub = lib.mkIf (myConfig.nixos.Boot.mode == "grub") {
         enable = true;
         efiSupport = true;
         device = "nodev";
         useOSProber = true;
       };
-      limine.maxGenerations = 5;
     };
 
     plymouth = {
@@ -33,6 +44,8 @@
       ];
     };
 
+    # blacklistedKernelModules = ["tpm_crb" "tpm_tis" "tpm"];
+
     kernelPackages = pkgs.linuxPackages_cachyos;
     kernelParams = [
       # "quiet"

modules/default/desktop.nix

@@ -1,10 +1,12 @@
 {
   lib,
   myConfig,
+  pkgs,
   ...
 }: {
   imports = [
     # ../../packages/quickshell/default.nix
     ../../packages/hyprland/default.nix
+    ../../packages/sunshine/default.nix
   ];
 }

modules/default/lanzaboote.nix

@@ -0,0 +1,27 @@
+# file: configuration.nix
+{
+  pkgs,
+  lib,
+  ...
+}: let
+  sources = import ./nix/sources.nix;
+  lanzaboote = import sources.lanzaboote;
+in {
+  imports = [lanzaboote.nixosModules.lanzaboote];
+
+  environment.systemPackages = [
+    # For debugging and troubleshooting Secure Boot.
+    pkgs.sbctl
+  ];
+
+  # Lanzaboote currently replaces the systemd-boot module.
+  # This setting is usually set to true in configuration.nix
+  # generated at installation time. So we force it to false
+  # for now.
+  boot.loader.systemd-boot.enable = lib.mkForce false;
+
+  boot.lanzaboote = {
+    enable = true;
+    pkiBundle = "/var/lib/sbctl";
+  };
+}

modules/default/login.nix

@@ -0,0 +1,13 @@
+{
+  lib,
+  myConfig,
+  ...
+}: {
+  services.greetd = {
+    enable = true;
+    settings.default_session = {
+      user = lib.mkOverride 10 "${myConfig.essentials.Username}";
+      command = lib.mkOverride 10 "Hyprland";
+    };
+  };
+}

modules/default/security.nix

@@ -0,0 +1,9 @@
+{pkgs, ...}: {
+  imports = [
+    # ./lanzaboote.nix
+  ];
+  environment.systemPackages = with pkgs; [
+    niv
+    sbctl
+  ];
+}

modules/default/udev.nix

@@ -1,8 +1,8 @@
 {pkgs, ...}: {
-  services.udev.extraRules = ''
+  # services.udev.extraRules = ''
-    SUBSYSTEM=="usb", ATTR{idVendor}=="0e8d", ATTR{idProduct}=="0616", ATTR{power/wakeup}="enabled"
+  #   SUBSYSTEM=="usb", ATTR{idVendor}=="0e8d", ATTR{idProduct}=="0616", ATTR{power/wakeup}="enabled"
-
+  #
-  '';
+  # '';
   services.udev.packages = with pkgs; [
     game-devices-udev-rules
   ];

modules/home/apps.nix

@@ -5,9 +5,15 @@
 
   home.packages = with pkgs; [
     heroic
-    fcitx5
+    # fcitx5
-    fcitx5-mozc-ut
+    # fcitx5-mozc-ut
-    kdePackages.fcitx5-configtool
+    # kdePackages.fcitx5-configtool
     solaar
+    parted
+    edk2-uefi-shell
+    libreoffice
   ];
+  services.easyeffects = {
+    enable = true;
+  };
 }

modules/home/desktop.nix

@@ -1,6 +1,7 @@
 {
   inputs,
   pkgs,
+  lib,
   ...
 }: {
   imports = [
@@ -8,7 +9,19 @@
     ../../packages/fonts/home.nix
   ];
   programs.illogical-impulse.enable = true;
-  programs.illogical-impulse.settings.simpleStarship.enable = true;
+  programs.illogical-impulse.settings = {
+    hyprland.useNixForConf = false;
+    simpleStarship.enable = true;
+  };
+
+  # wayland.windowManager.hyprland = {
+  #   settings = {
+  #     monitor = lib.mkForce [
+  #       "DP-1, highres@180,0x1080,1,bitdepth,10,cm,hdr,sdrbrightness,1.4,sdrsaturation,0.98"
+  #       "DP-2, highres@highrr,760x0,1"
+  #     ];
+  #   };
+  # };
   # programs.illogical-impulse.settings.simpleStarship.enable = true;
   home.packages = [
   ];

nix/sources.json

@@ -0,0 +1,27 @@
+{
+    "lanzaboote": {
+        "branch": "master",
+        "description": "Secure Boot for NixOS [maintainers=@blitz @raitobezarius @nikstur]",
+        "homepage": "",
+        "owner": "nix-community",
+        "repo": "lanzaboote",
+        "rev": "v0.4.2",
+        "sha256": "0xc1wawnb0297h5khxblmf9pd1fry950xkcm7mwlck19s2906h80",
+        "type": "tarball",
+        "url": "https://github.com/nix-community/lanzaboote/archive/v0.4.2.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
+        "version": "0.4.2"
+    },
+    "nixpkgs": {
+        "branch": "nixos-unstable",
+        "description": "Nix Packages collection",
+        "homepage": null,
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "6c43a3495a11e261e5f41e5d7eda2d71dae1b2fe",
+        "sha256": "16f329z831bq7l3wn1dfvbkh95l2gcggdwn6rk3cisdmv2aa3189",
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/6c43a3495a11e261e5f41e5d7eda2d71dae1b2fe.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    }
+}

nix/sources.nix

@@ -0,0 +1,198 @@
+# This file has been generated by Niv.
+
+let
+
+  #
+  # The fetchers. fetch_<type> fetches specs of type <type>.
+  #
+
+  fetch_file = pkgs: name: spec:
+    let
+      name' = sanitizeName name + "-src";
+    in
+    if spec.builtin or true then
+      builtins_fetchurl { inherit (spec) url sha256; name = name'; }
+    else
+      pkgs.fetchurl { inherit (spec) url sha256; name = name'; };
+
+  fetch_tarball = pkgs: name: spec:
+    let
+      name' = sanitizeName name + "-src";
+    in
+    if spec.builtin or true then
+      builtins_fetchTarball { name = name'; inherit (spec) url sha256; }
+    else
+      pkgs.fetchzip { name = name'; inherit (spec) url sha256; };
+
+  fetch_git = name: spec:
+    let
+      ref =
+        spec.ref or (
+          if spec ? branch then "refs/heads/${spec.branch}" else
+          if spec ? tag then "refs/tags/${spec.tag}" else
+          abort "In git source '${name}': Please specify `ref`, `tag` or `branch`!"
+        );
+      submodules = spec.submodules or false;
+      submoduleArg =
+        let
+          nixSupportsSubmodules = builtins.compareVersions builtins.nixVersion "2.4" >= 0;
+          emptyArgWithWarning =
+            if submodules
+            then
+              builtins.trace
+                (
+                  "The niv input \"${name}\" uses submodules "
+                  + "but your nix's (${builtins.nixVersion}) builtins.fetchGit "
+                  + "does not support them"
+                )
+                { }
+            else { };
+        in
+        if nixSupportsSubmodules
+        then { inherit submodules; }
+        else emptyArgWithWarning;
+    in
+    builtins.fetchGit
+      ({ url = spec.repo; inherit (spec) rev; inherit ref; } // submoduleArg);
+
+  fetch_local = spec: spec.path;
+
+  fetch_builtin-tarball = name: throw
+    ''[${name}] The niv type "builtin-tarball" is deprecated. You should instead use `builtin = true`.
+        $ niv modify ${name} -a type=tarball -a builtin=true'';
+
+  fetch_builtin-url = name: throw
+    ''[${name}] The niv type "builtin-url" will soon be deprecated. You should instead use `builtin = true`.
+        $ niv modify ${name} -a type=file -a builtin=true'';
+
+  #
+  # Various helpers
+  #
+
+  # https://github.com/NixOS/nixpkgs/pull/83241/files#diff-c6f540a4f3bfa4b0e8b6bafd4cd54e8bR695
+  sanitizeName = name:
+    (
+      concatMapStrings (s: if builtins.isList s then "-" else s)
+        (
+          builtins.split "[^[:alnum:]+._?=-]+"
+            ((x: builtins.elemAt (builtins.match "\\.*(.*)" x) 0) name)
+        )
+    );
+
+  # The set of packages used when specs are fetched using non-builtins.
+  mkPkgs = sources: system:
+    let
+      sourcesNixpkgs =
+        import (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; }) { inherit system; };
+      hasNixpkgsPath = builtins.any (x: x.prefix == "nixpkgs") builtins.nixPath;
+      hasThisAsNixpkgsPath = <nixpkgs> == ./.;
+    in
+    if builtins.hasAttr "nixpkgs" sources
+    then sourcesNixpkgs
+    else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then
+      import <nixpkgs> { }
+    else
+      abort
+        ''
+          Please specify either <nixpkgs> (through -I or NIX_PATH=nixpkgs=...) or
+          add a package called "nixpkgs" to your sources.json.
+        '';
+
+  # The actual fetching function.
+  fetch = pkgs: name: spec:
+
+    if ! builtins.hasAttr "type" spec then
+      abort "ERROR: niv spec ${name} does not have a 'type' attribute"
+    else if spec.type == "file" then fetch_file pkgs name spec
+    else if spec.type == "tarball" then fetch_tarball pkgs name spec
+    else if spec.type == "git" then fetch_git name spec
+    else if spec.type == "local" then fetch_local spec
+    else if spec.type == "builtin-tarball" then fetch_builtin-tarball name
+    else if spec.type == "builtin-url" then fetch_builtin-url name
+    else
+      abort "ERROR: niv spec ${name} has unknown type ${builtins.toJSON spec.type}";
+
+  # If the environment variable NIV_OVERRIDE_${name} is set, then use
+  # the path directly as opposed to the fetched source.
+  replace = name: drv:
+    let
+      saneName = stringAsChars (c: if (builtins.match "[a-zA-Z0-9]" c) == null then "_" else c) name;
+      ersatz = builtins.getEnv "NIV_OVERRIDE_${saneName}";
+    in
+    if ersatz == "" then drv else
+      # this turns the string into an actual Nix path (for both absolute and
+      # relative paths)
+    if builtins.substring 0 1 ersatz == "/" then /. + ersatz else /. + builtins.getEnv "PWD" + "/${ersatz}";
+
+  # Ports of functions for older nix versions
+
+  # a Nix version of mapAttrs if the built-in doesn't exist
+  mapAttrs = builtins.mapAttrs or (
+    f: set: with builtins;
+    listToAttrs (map (attr: { name = attr; value = f attr set.${attr}; }) (attrNames set))
+  );
+
+  # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/lists.nix#L295
+  range = first: last: if first > last then [ ] else builtins.genList (n: first + n) (last - first + 1);
+
+  # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L257
+  stringToCharacters = s: map (p: builtins.substring p 1 s) (range 0 (builtins.stringLength s - 1));
+
+  # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L269
+  stringAsChars = f: s: concatStrings (map f (stringToCharacters s));
+  concatMapStrings = f: list: concatStrings (map f list);
+  concatStrings = builtins.concatStringsSep "";
+
+  # https://github.com/NixOS/nixpkgs/blob/8a9f58a375c401b96da862d969f66429def1d118/lib/attrsets.nix#L331
+  optionalAttrs = cond: as: if cond then as else { };
+
+  # fetchTarball version that is compatible between all the versions of Nix
+  builtins_fetchTarball = { url, name ? null, sha256 }@attrs:
+    let
+      inherit (builtins) lessThan nixVersion fetchTarball;
+    in
+    if lessThan nixVersion "1.12" then
+      fetchTarball ({ inherit url; } // (optionalAttrs (name != null) { inherit name; }))
+    else
+      fetchTarball attrs;
+
+  # fetchurl version that is compatible between all the versions of Nix
+  builtins_fetchurl = { url, name ? null, sha256 }@attrs:
+    let
+      inherit (builtins) lessThan nixVersion fetchurl;
+    in
+    if lessThan nixVersion "1.12" then
+      fetchurl ({ inherit url; } // (optionalAttrs (name != null) { inherit name; }))
+    else
+      fetchurl attrs;
+
+  # Create the final "sources" from the config
+  mkSources = config:
+    mapAttrs
+      (
+        name: spec:
+          if builtins.hasAttr "outPath" spec
+          then
+            abort
+              "The values in sources.json should not have an 'outPath' attribute"
+          else
+            spec // { outPath = replace name (fetch config.pkgs name spec); }
+      )
+      config.sources;
+
+  # The "config" used by the fetchers
+  mkConfig =
+    { sourcesFile ? if builtins.pathExists ./sources.json then ./sources.json else null
+    , sources ? if sourcesFile == null then { } else builtins.fromJSON (builtins.readFile sourcesFile)
+    , system ? builtins.currentSystem
+    , pkgs ? mkPkgs sources system
+    }: rec {
+      # The sources, i.e. the attribute set of spec name to spec
+      inherit sources;
+
+      # The "pkgs" (evaluated nixpkgs) to use for e.g. non-builtin fetchers
+      inherit pkgs;
+    };
+
+in
+mkSources (mkConfig { }) // { __functor = _: settings: mkSources (mkConfig settings); }

packages/firefox/home.nix

@@ -84,7 +84,7 @@
       # Valid strings for installation_mode are "allowed", "blocked",
       # "force_installed" and "normal_installed".
       ExtensionSettings = {
-        "*".installation_mode = "blocked";
+        "*".installation_mode = "allowed";
         "uBlock0@raymondhill.net" = {
           install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
           installation_mode = "force_installed";

packages/lact/default.nix

@@ -0,0 +1,50 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  inherit (lib) mkEnableOption mkOption mkIf;
+  this = config.custom.lact;
+
+  configFile =
+    pkgs.runCommand "lact-config.yaml" {
+      json = pkgs.writers.writeJSON "lact-config.json" this.settings;
+    } ''
+      # Merge with the defaults
+      ${lib.getExe pkgs.yq} -s '.[0] * .[1]' $json ${./lact-default-config.yaml} > config.json
+      # Convert keys to numeric values where possible. It depends on this for some reason.
+      ${lib.getExe pkgs.yj} -jy -k < config.json > $out
+    '';
+in {
+  options.custom.lact = {
+    enable = mkEnableOption "my LACT module";
+    settings = mkOption {
+      default = {};
+      type = lib.types.submodule {
+        freeformType = (pkgs.formats.yaml {}).type;
+      };
+      description = ''
+        Settings for LACT. Settings are merged with the defaults.
+
+        The easiest method of acquiring the settings is to delete
+        `/etc/lact/config.yaml`, enter your settings and look at the file.
+      '';
+    };
+  };
+
+  config = mkIf this.enable {
+    systemd.packages = with pkgs; [
+      lact
+    ];
+    systemd.services.lactd.wantedBy = ["multi-user.target"];
+
+    environment.etc."lact/config.yaml" = mkIf (this.settings != {}) {
+      source = configFile;
+    };
+    systemd.services.lactd = {
+      # Restart if config changed
+      restartTriggers = mkIf (this.settings != {}) [configFile];
+    };
+  };
+}

packages/lact/lact-default-config.yaml

@@ -0,0 +1,8 @@
+daemon:
+  log_level: info
+  admin_groups:
+    - wheel
+    - sudo
+  disable_clocks_cleanup: false
+apply_settings_timer: 5
+gpus: {}

packages/steam/jovian.nix

@@ -11,18 +11,36 @@
     DECKY_HOME = "/home/${myConfig.essentials.Username}/homebrew";
     DECKY_USER_HOME = "/home/${myConfig.essentials.Username}";
   };
+
   # environment.systemPackages = with pkgs; [inputs.jovian.packages.${system}.default];
-  jovian.steam.enable = true;
+  jovian.steam = {
-  jovian.steam.autoStart = false;
+    enable = true;
-  jovian.steam.desktopSession = "hyprland";
+    autoStart = true;
-  jovian.steam.user = "${myConfig.essentials.Username}";
+    desktopSession = "hyprland";
+    user = "${myConfig.essentials.Username}";
+    environment = {
+      OUTPUT_CONNECTOR = "DP-1"; # Keep this
+      STEAM_GAMESCOPE_CMD_OPTIONS = "-O DP-1"; # Force override flag
+    };
+  };
+
+  jovian.decky-loader = {
+    enable = true;
+    stateDir = "/home/${myConfig.essentials.Username}/Games/Decky";
+    user = "${myConfig.essentials.Username}";
+  };
+
+  jovian.devices.steamdeck = {
+    enableControllerUdevRules = true;
+  };
+
+  # programs.gamescope = {
+  #   enable = true;
+  #   args = ["--output-name" "DP-1"];
+  # };
+
   jovian.hardware.has.amd.gpu = true;
-
+  jovian.steamos.enableBluetoothConfig = true;
-  jovian.decky-loader.enable = true;
-  jovian.decky-loader.user = "${myConfig.essentials.Username}";
-
-  # jovian.steamos.enableBluetoothConfig = true;
   # jovian.steamos.useSteamOSConfig = true;
-  # jovian.steamos.enableMesaPatches = true;
   # jovian.devices.steamdeck.enableControllerUdevRules = true;
 }

packages/virtualbox/default.nix

@@ -1,5 +1,5 @@
-{
+{myConfig, ...}: {
   virtualisation.virtualbox.host.enable = true;
-  users.extraGroups.vboxusers.members = ["user-with-access-to-virtualbox"];
+  users.extraGroups.vboxusers.members = ["${myConfig.essentials.Username}"];
   virtualisation.virtualbox.host.enableExtensionPack = true;
 }