feat: add nixos facter

flake.lock

@@ -43,11 +43,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1728902391,
+        "lastModified": 1729527199,
-        "narHash": "sha256-44bnoY0nAvbBQ/lVjmn511yL39Sv7SknV0BDxn34P3Q=",
+        "narHash": "sha256-D5/YksfRga8Akd04ZtIkuYSIOjXVrAzQIQBSeplokzU=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "9874e08eec85b5542ca22494e127b0cdce46b786",
+        "rev": "8d732fa8aff8b12ef2b1e2f00fc8153e41312b72",
         "type": "github"
       },
       "original": {
@@ -134,11 +134,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1729281548,
+        "lastModified": 1729712798,
-        "narHash": "sha256-MuojlSnwAJAwfhgmW8ZtZrwm2Sko4fqubCvReqbUzYw=",
+        "narHash": "sha256-a+Aakkb+amHw4biOZ0iMo8xYl37uUL48YEXIC5PYJ/8=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "a6a3179ddf396dfc28a078e2f169354d0c137125",
+        "rev": "09a776702b004fdf9c41a024e1299d575ee18a7d",
         "type": "github"
       },
       "original": {
@@ -383,11 +383,11 @@
         "zig": "zig"
       },
       "locked": {
-        "lastModified": 1729372614,
+        "lastModified": 1729829295,
-        "narHash": "sha256-WqbbdfXbayKTGplZ6GntKq1blX3YTI7WzXEPWhqo0fA=",
+        "narHash": "sha256-r9bRVnLdsLPsuFb+iqUiKzxgSHWAOCt9BYxNWKwHy9Y=",
         "ref": "refs/heads/main",
-        "rev": "1134a9cbea571a3303df352636b1329753b4d443",
+        "rev": "582b8d039a9e36a370c9a60d702e27e06dc2e19d",
-        "revCount": 7757,
+        "revCount": 7809,
         "type": "git",
         "url": "ssh://git@github.com/ghostty-org/ghostty"
       },
@@ -621,11 +621,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1729459288,
+        "lastModified": 1729716953,
-        "narHash": "sha256-gBOVJv+q6Mx8jGvwX7cE6J8+sZmi1uxpRVsO7WxvVuQ=",
+        "narHash": "sha256-FbRKGRRd0amsk/WS/UV9ukJ8jT1dZ2pJBISxkX+uq6A=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "1e27f213d77fc842603628bcf2df6681d7d08f7e",
+        "rev": "a4353cc43d1b4dd6bdeacea90eb92a8b7b78a9d7",
         "type": "github"
       },
       "original": {
@@ -695,11 +695,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1729378105,
+        "lastModified": 1729781453,
-        "narHash": "sha256-pcrrLHaHXct4I985PZhNZVYLghwZvQnnjGNToL56DFY=",
+        "narHash": "sha256-vSZSNXXNEPN5JJcUobCBl6FaDvXjmLHhAJWoX3ZmHUQ=",
         "ref": "refs/heads/main",
-        "rev": "08cc063e175e48cea44d26b7e3762f4b8611f0c5",
+        "rev": "3cec45d82113051d35e846e5d80719d8ea0f7002",
-        "revCount": 5362,
+        "revCount": 5372,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland"
@@ -829,6 +829,34 @@
         "type": "github"
       }
     },
+    "ixx": {
+      "inputs": {
+        "flake-utils": [
+          "nixvim",
+          "nuschtosSearch",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixvim",
+          "nuschtosSearch",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1729544999,
+        "narHash": "sha256-YcyJLvTmN6uLEBGCvYoMLwsinblXMkoYkNLEO4WnKus=",
+        "owner": "NuschtOS",
+        "repo": "ixx",
+        "rev": "65c207c92befec93e22086da9456d3906a4e999c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NuschtOS",
+        "ref": "v0.0.5",
+        "repo": "ixx",
+        "type": "github"
+      }
+    },
     "libgit2": {
       "flake": false,
       "locked": {
@@ -848,11 +876,11 @@
     },
     "master": {
       "locked": {
-        "lastModified": 1729502391,
+        "lastModified": 1729839280,
-        "narHash": "sha256-maI+uLuGbgwkvNp+FzzhLiGvd80+MS0gASpHjU6B0hY=",
+        "narHash": "sha256-1sU4rzJow2Fphk3G5IGjudBtI3y9sgNM9a4BN2Us/Qs=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d3503200cd28f0ecba42a9a4f82988f469932320",
+        "rev": "e9eca9b6e9828be9ccddf1007f6f30feb9a40e24",
         "type": "github"
       },
       "original": {
@@ -930,11 +958,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1728901530,
+        "lastModified": 1729757100,
-        "narHash": "sha256-I9Qd0LnAsEGHtKE9+uVR0iDFmsijWSy7GT0g3jihG4Q=",
+        "narHash": "sha256-x+8uGaX66V5+fUBHY23Q/OQyibQ38nISzxgj7A7Jqds=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "a60ac02f9466f85f092e576fd8364dfc4406b5a6",
+        "rev": "04193f188e4144d7047f83ad1de81d6034d175cd",
         "type": "github"
       },
       "original": {
@@ -1007,6 +1035,21 @@
         "type": "github"
       }
     },
+    "nixos-facter-modules": {
+      "locked": {
+        "lastModified": 1728725827,
+        "narHash": "sha256-io1UeGaV2HcmK1zCZPnawJu3CxKHhiZ83NBJ+qshWIo=",
+        "owner": "numtide",
+        "repo": "nixos-facter-modules",
+        "rev": "9f2a45b372830d28412160413d1d83f5ee11cc2f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "nixos-facter-modules",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1722073938,
@@ -1181,11 +1224,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1728888510,
+        "lastModified": 1729413321,
-        "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=",
+        "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c",
+        "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26",
         "type": "github"
       },
       "original": {
@@ -1229,11 +1272,11 @@
     },
     "nixpkgs_7": {
       "locked": {
-        "lastModified": 1729265718,
+        "lastModified": 1729788628,
-        "narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=",
+        "narHash": "sha256-3suayUinicnvE/4shMZwp9FHT5izUM8gMpdEO/NHBTo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ccc0c2126893dd20963580b6478d1a10a4512185",
+        "rev": "63487b2f26fa065cfeeaa47dddb08e2856ba53e8",
         "type": "github"
       },
       "original": {
@@ -1245,11 +1288,11 @@
     },
     "nixpkgs_8": {
       "locked": {
-        "lastModified": 1729070438,
+        "lastModified": 1729665710,
-        "narHash": "sha256-KOTTUfPkugH52avUvXGxvWy8ibKKj4genodIYUED+Kc=",
+        "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5785b6bb5eaae44e627d541023034e1601455827",
+        "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d",
         "type": "github"
       },
       "original": {
@@ -1294,11 +1337,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1729438888,
+        "lastModified": 1729791159,
-        "narHash": "sha256-TGTDOX2/5OIoSzlcRReVn4BbbfL6Ami/eassiPPGqNA=",
+        "narHash": "sha256-i5TKYCs9tJ2qaYTsjQh3WwExmj4O0EU+L1jq6ZBVMfM=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "47b563d4e1410bff6a9481b3dd8b01b1e5ed70d2",
+        "rev": "4726334e4413ff55f1db3768c8d08722abbf09cf",
         "type": "github"
       },
       "original": {
@@ -1309,11 +1352,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1729491640,
+        "lastModified": 1729839538,
-        "narHash": "sha256-k2mR4w+yvko/JsWaH+1fIqjWRFixEs+jv/lNw8qnfkQ=",
+        "narHash": "sha256-uS2m5oW/Jhi3UxMfCChj64NndOsE2+4Px+jYDXmpcjM=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "41ca6cfe238fdfab2831386c5a65f5c0a01e1cfd",
+        "rev": "6f557f568d3a16cda792132ad82e9f0c14ba5ef0",
         "type": "github"
       },
       "original": {
@@ -1325,17 +1368,18 @@
     "nuschtosSearch": {
       "inputs": {
         "flake-utils": "flake-utils_3",
+        "ixx": "ixx",
         "nixpkgs": [
           "nixvim",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1728905062,
+        "lastModified": 1729763753,
-        "narHash": "sha256-W/lClt0bRgFRO0WFtytX/LEILpPNq+FOjIfESpkeu5c=",
+        "narHash": "sha256-M8WAUgKFBU5TvFt92g/dHBtGJmBP33LHird+solHt0g=",
         "owner": "NuschtOS",
         "repo": "search",
-        "rev": "f82d3e1c1c9d1eaeb91878519e2d27b27c66ce84",
+        "rev": "bedc2f2ada220815a98a896e10f5e61bfc329bfc",
         "type": "github"
       },
       "original": {
@@ -1355,11 +1399,11 @@
         "nixpkgs-stable": "nixpkgs-stable_2"
       },
       "locked": {
-        "lastModified": 1728778939,
+        "lastModified": 1729104314,
-        "narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=",
+        "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "ff68f91754be6f3427e4986d7949e6273659be1d",
+        "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6",
         "type": "github"
       },
       "original": {
@@ -1392,11 +1436,11 @@
     "river": {
       "flake": false,
       "locked": {
-        "lastModified": 1727948541,
+        "lastModified": 1729764469,
-        "narHash": "sha256-pC8D581CMhh3XCVBbwZ/8woAuD58ilGCrBX4ic5G9Zo=",
+        "narHash": "sha256-uhgvV+GTxeTJNxZ4lUpqPlaonnon7MD/qFi3a6OU5t0=",
         "ref": "refs/heads/master",
-        "rev": "fd55f51ba1b53af95fe3a24611490d42a895ef98",
+        "rev": "1b5dd21ee610b30d13c9165dfde23989c5e97e8d",
-        "revCount": 1297,
+        "revCount": 1299,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/riverwm/river"
@@ -1426,6 +1470,7 @@
         "nix-index-database": "nix-index-database",
         "nix-monitored": "nix-monitored",
         "nix-super": "nix-super",
+        "nixos-facter-modules": "nixos-facter-modules",
         "nixpkgs": "nixpkgs_7",
         "nixvim": "nixvim",
         "nur": "nur",
@@ -1437,11 +1482,11 @@
     },
     "stable": {
       "locked": {
-        "lastModified": 1729307008,
+        "lastModified": 1729691686,
-        "narHash": "sha256-QUvb6epgKi9pCu9CttRQW4y5NqJ+snKr1FZpG/x3Wtc=",
+        "narHash": "sha256-BAuPWW+9fa1moZTU+jFh+1cUtmsuF8asgzFwejM4wac=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a9b86fc2290b69375c5542b622088eb6eca2a7c3",
+        "rev": "32e940c7c420600ef0d1ef396dc63b04ee9cad37",
         "type": "github"
       },
       "original": {
@@ -1569,11 +1614,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1729242555,
+        "lastModified": 1729613947,
-        "narHash": "sha256-6jWSWxv2crIXmYSEb3LEVsFkCkyVHNllk61X4uhqfCs=",
+        "narHash": "sha256-XGOvuIPW1XRfPgHtGYXd5MAmJzZtOuwlfKDgxX5KT3s=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "d986489c1c757f6921a48c1439f19bfb9b8ecab5",
+        "rev": "aac86347fb5063960eccb19493e0cadcdb4205ca",
         "type": "github"
       },
       "original": {

flake.nix

@@ -56,6 +56,8 @@
 
     ghostty.url = "git+ssh://git@github.com/ghostty-org/ghostty";
     # ghostty.url = "/home/moritz/Documents/ghostty";
+
+    nixos-facter-modules.url = "github:numtide/nixos-facter-modules";
   };
 
   outputs = inputs@{ self, flake-parts, ... }:
@@ -158,6 +160,7 @@
                 inputs.home-manager.nixosModule
                 inputs.impermanence.nixosModules.impermanence
                 inputs.nix-index-database.nixosModules.nix-index
+                inputs.nixos-facter-modules.nixosModules.facter
                 path
               ];
           })

hosts/nixos-laptop/default.nix

@@ -6,11 +6,11 @@
 , ...
 }: {
   imports = [
-    # Include the results of the hardware scan.
-    ./hardware-configuration.nix
     ./disko.nix
   ];
 
+  facter.reportPath = ./facter.json;
+
   my = {
     virtualisation.libvirtd.enable = true;
     yubikey.luksSupport.enable = false;
@@ -143,6 +143,7 @@
     supportedFilesystems = [ "zfs" ];
     loader.systemd-boot.enable = true;
     loader.efi.canTouchEfiVariables = true;
+    initrd.availableKernelModules = [ "rtsx_pci_sdmmc" ];
   };
 
   # SERVICES
@@ -152,7 +153,6 @@
     printing.enable = true;
     logind.lidSwitch = "hybrid-sleep";
   };
-  hardware.bluetooth.enable = true;
 
   # NETWORKING
   networking = {
@@ -173,6 +173,7 @@
   # Powersaving
   services.tlp.enable = true;
   powerManagement.enable = true;
+  powerManagement.powertop.enable = true;
 
   systemd = {
     # Hibernare on low battery

hosts/nixos-laptop/hardware-configuration.nix

@@ -1,17 +0,0 @@
-# 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.
-{ modulesPath
-, lib
-, ...
-}: {
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-  boot = {
-    initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "rtsx_pci_sdmmc" ];
-    initrd.kernelModules = [ ];
-    kernelModules = [ "kvm-amd" ];
-    extraModulePackages = [ ];
-  };
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-}

modules/programs/nix.nix

@@ -44,12 +44,17 @@ in
       nix = config.nix.package;
     };
 
+    age.secrets.nix-github-token.file = ../../secrets/nix-github-token.age;
+
     nix = {
       nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
 
       package = pkgs.nix;
 
-      extraOptions = "experimental-features = nix-command flakes";
+      extraOptions = ''
+        !include ${config.age.secrets.nix-github-token.path}
+        experimental-features = nix-command flakes
+      '';
 
       gc = {
         automatic = cfg.gc.enable;

secrets/nix-github-token.age

@@ -0,0 +1,10 @@
+age-encryption.org/v1
+-> ssh-ed25519 CjuqfA H1gL8k/o7kvJoVEZ0UrbUv1G7Ceb3cUCIVFhch9rDhc
+0531muHlievVhT5piGLXC+/zOymCkPM9P9csRxLsnpM
+-> ssh-ed25519 wG6LYg Z9cm/TUZbV35tzgHywx1AHmF8jrFFqBl3sCIELEvcH0
+OmLY/ThgZ4f8CFFA5YpYFiRK+ro7cBqoFY6UY7/VS8I
+-> ssh-ed25519 ZYd7Zg xpjSILAYRyQ4kkbdLAVJQXChX+t/DeL3qWWJae2sczI
+wamYh70/AGSh5j4uqsPFTvn36E3TmGoVL8XlxbSfX9g
+--- NNsTU7Fsi/WLegSpkuoNaxN0kFQG38mgdhCQ8y+CSQE
+vâî"²úÃF
+‘=‹‰rûazÜ6h<>ÍQâN÷&DpvðGÄXQ$d7tíˆ݈ElÃIèÀXŠãYrV'‚ç×ï)J¬€Hí<48>ɦ Úƒ?fåœÊWÃH_Ô®Ô±‰ª"

secrets/secrets.nix

@@ -28,4 +28,5 @@ in
   "exercism.age".publicKeys = personal;
   "openai.age".publicKeys = personal;
   "anthropic.age".publicKeys = personal;
+  "nix-github-token.age".publicKeys = personal;
 }