diff --git a/flake.lock b/flake.lock index 2d98320..ba530e9 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "advisory-db": { "flake": false, "locked": { - "lastModified": 1766408261, - "narHash": "sha256-cOH3CmAfmcVHph4e31kdVBg/17rvYRTuX+Z16goMSDM=", + "lastModified": 1765465865, + "narHash": "sha256-jAyDD6FKEWZafIKN4KjzdQywcS/gR9sHz4zzjxefXcA=", "owner": "rustsec", "repo": "advisory-db", - "rev": "58d84ca80e02245c680317adb9975f4ba0a5b975", + "rev": "d0bdb37b2b1dc8a81f47e2042d59227b1f06473f", "type": "github" }, "original": { @@ -43,22 +43,6 @@ "type": "github" } }, - "alvr-nixpkgs": { - "locked": { - "lastModified": 1765840429, - "narHash": "sha256-OV/iFdwGWlEJd7kO3YmDa0Co413SiqEHTLMnhlNNJJo=", - "owner": "itepastra", - "repo": "nixpkgs", - "rev": "485513cf380aff6bab5f5991e03d467fd4de5313", - "type": "github" - }, - "original": { - "owner": "itepastra", - "ref": "alvr-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "authentik": { "inputs": { "authentik-src": "authentik-src", @@ -81,11 +65,11 @@ "uv2nix": "uv2nix" }, "locked": { - "lastModified": 1765971510, - "narHash": "sha256-HdGpVTqPguAvkDbgjWi38sGUaI0MvxJJX2bFVZTKXaE=", + "lastModified": 1763643080, + "narHash": "sha256-jlYmjrTw3g5iOYDZBGb5Plw6IyRa+WY60e3GzU19bkk=", "owner": "nix-community", "repo": "authentik-nix", - "rev": "e929253deddb8398c7010b28187d9d43603db950", + "rev": "4a670757083d94a9dceb4929eb88eb9995bc1363", "type": "github" }, "original": { @@ -97,16 +81,16 @@ "authentik-src": { "flake": false, "locked": { - "lastModified": 1765907481, - "narHash": "sha256-d0pPNE2T30COdFse0T15Mx8XW4BGg8hgPQvmW2dAV9s=", + "lastModified": 1763564826, + "narHash": "sha256-xBnAfoAOUslOrxNzY5kV0h67qWMXKZnPC/wgRGXZleQ=", "owner": "goauthentik", "repo": "authentik", - "rev": "0d617e4ad1eb9e4540ba5381e6ce06e971affc63", + "rev": "2fedc3d0a0ba91c16bb71bd4b2432108ca02e890", "type": "github" }, "original": { "owner": "goauthentik", - "ref": "version/2025.10.3", + "ref": "version/2025.10.2", "repo": "authentik", "type": "github" } @@ -152,17 +136,17 @@ "base16-fish": { "flake": false, "locked": { - "lastModified": 1765809053, - "narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=", + "lastModified": 1754405784, + "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=", "owner": "tomyun", "repo": "base16-fish", - "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", + "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", "type": "github" }, "original": { "owner": "tomyun", "repo": "base16-fish", - "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", + "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", "type": "github" } }, @@ -217,11 +201,11 @@ }, "crane": { "locked": { - "lastModified": 1766194365, - "narHash": "sha256-4AFsUZ0kl6MXSm4BaQgItD0VGlEKR3iq7gIaL7TjBvc=", + "lastModified": 1765739568, + "narHash": "sha256-gQYx35Of4UDKUjAYvmxjUEh/DdszYeTtT6MDin4loGE=", "owner": "ipetkov", "repo": "crane", - "rev": "7d8ec2c71771937ab99790b45e6d9b93d15d9379", + "rev": "67d2baff0f9f677af35db61b32b5df6863bcc075", "type": "github" }, "original": { @@ -259,11 +243,11 @@ ] }, "locked": { - "lastModified": 1766150702, - "narHash": "sha256-P0kM+5o+DKnB6raXgFEk3azw8Wqg5FL6wyl9jD+G5a4=", + "lastModified": 1765688338, + "narHash": "sha256-MjrytR2kiHYUnzX11cXaD31tS7kKdhM1KFaac0+KAig=", "owner": "nix-community", "repo": "disko", - "rev": "916506443ecd0d0b4a0f4cf9d40a3c22ce39b378", + "rev": "be1a6b8a05afdd5d5fa69fcaf3c4ead7014c9fd8", "type": "github" }, "original": { @@ -411,11 +395,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1765835352, - "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", + "lastModified": 1762980239, + "narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "a34fae9c08a15ad73f295041fec82323541400a9", + "rev": "52a2caecc898d0b46b2b905f058ccc5081f842da", "type": "github" }, "original": { @@ -429,11 +413,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1765835352, - "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", + "lastModified": 1765495779, + "narHash": "sha256-MhA7wmo/7uogLxiewwRRmIax70g6q1U/YemqTGoFHlM=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "a34fae9c08a15ad73f295041fec82323541400a9", + "rev": "5635c32d666a59ec9a55cab87e898889869f7b71", "type": "github" }, "original": { @@ -600,11 +584,11 @@ ] }, "locked": { - "lastModified": 1766387499, - "narHash": "sha256-AjK3/UKDzeXFeYNLVBaJ3+HLE9he1g5UrlNd4/BM3eA=", + "lastModified": 1765682243, + "narHash": "sha256-yeCxFV/905Wr91yKt5zrVvK6O2CVXWRMSrxqlAZnLp0=", "owner": "nix-community", "repo": "home-manager", - "rev": "527ad07e6625302b648ed3b28c34b62a79bd103e", + "rev": "58bf3ecb2d0bba7bdf363fc8a6c4d49b4d509d03", "type": "github" }, "original": { @@ -627,11 +611,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1766385782, - "narHash": "sha256-Dln76wwiK/Zgbr3I7HYvFn+40GVCqI3rYHmkl6i6X/8=", + "lastModified": 1765741400, + "narHash": "sha256-EcVQf0/btw6hmPdu9MgwT7kociKSw+nP00dnnQTBVLU=", "ref": "refs/heads/main", - "rev": "8f27c09a08f6430f253ee93f35a519e42da19832", - "revCount": 18699, + "rev": "0ebb1c524ddecbf002ccf7fb530711d56ed1e9b2", + "revCount": 18684, "type": "git", "url": "https://git.lix.systems/lix-project/lix.git" }, @@ -654,11 +638,11 @@ ] }, "locked": { - "lastModified": 1766242842, - "narHash": "sha256-WRWsYt3d4xod9+2SVJ1h7RH+rHo4Fjk/R1neEWdecaE=", + "lastModified": 1764519849, + "narHash": "sha256-XnNABKfIYKSimQVvKc9FnlC2H0LurOhd9MS6l0Z67lE=", "ref": "refs/heads/main", - "rev": "9b76a77150b4ed4f7066f641f54791b1ac4c778c", - "revCount": 172, + "rev": "6c95c0b6f73f831226453fc6905c216ab634c30f", + "revCount": 170, "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module.git" }, @@ -766,11 +750,11 @@ ] }, "locked": { - "lastModified": 1766409418, - "narHash": "sha256-t1+XDRfjg4aPZLwEyYH0PVMFlSNDYdtDOS67Z3ggrTo=", + "lastModified": 1765756970, + "narHash": "sha256-svbiQ9Z9Gv64bYH3WxsT1kLOaHLn4Dq1PK0ayPvCV8w=", "owner": "kaylorben", "repo": "nixcord", - "rev": "5d3f4ab1175a550a441d156ed755bad87546bcd6", + "rev": "a75bee9cf2ce5c28cb59425e5482735082aec387", "type": "github" }, "original": { @@ -797,11 +781,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1765674936, - "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", + "lastModified": 1761765539, + "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", + "rev": "719359f4562934ae99f5443f20aa06c2ffff91fc", "type": "github" }, "original": { @@ -812,11 +796,11 @@ }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1765674936, - "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", + "lastModified": 1761765539, + "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", + "rev": "719359f4562934ae99f5443f20aa06c2ffff91fc", "type": "github" }, "original": { @@ -843,11 +827,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1766410004, - "narHash": "sha256-Ft+34bw0TuAH/riEGiFRWDsRA7EUEKuBFoxFoY0ekkA=", + "lastModified": 1765785282, + "narHash": "sha256-4hH6oQwCjdDOUjhY9V87hwW5rBZxojRoTt8M5funqlo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "77bfd99d4f8e597c1ee7388dc259fb5c72bb5c30", + "rev": "846f588350db33d66ea5d5bc7f3e551fd2e561d4", "type": "github" }, "original": { @@ -963,11 +947,11 @@ ] }, "locked": { - "lastModified": 1763662255, - "narHash": "sha256-4bocaOyLa3AfiS8KrWjZQYu+IAta05u3gYZzZ6zXbT0=", + "lastModified": 1761781027, + "narHash": "sha256-YDvxPAm2WnxrznRqWwHLjryBGG5Ey1ATEJXrON+TWt8=", "owner": "pyproject-nix", "repo": "build-system-pkgs", - "rev": "042904167604c681a090c07eb6967b4dd4dae88c", + "rev": "795a980d25301e5133eca37adae37283ec3c8e66", "type": "github" }, "original": { @@ -984,11 +968,11 @@ ] }, "locked": { - "lastModified": 1764134915, - "narHash": "sha256-xaKvtPx6YAnA3HQVp5LwyYG1MaN4LLehpQI8xEdBvBY=", + "lastModified": 1763435975, + "narHash": "sha256-SKdpcVuJKMNEXloIpLXY+jDI42+6Ew21vdkl894DxHo=", "owner": "pyproject-nix", "repo": "pyproject.nix", - "rev": "2c8df1383b32e5443c921f61224b198a2282a657", + "rev": "7d3d8848358ccbd415afe2139f12b9e1508d3ace", "type": "github" }, "original": { @@ -1021,7 +1005,6 @@ "inputs": { "advisory-db": "advisory-db", "agenix": "agenix", - "alvr-nixpkgs": "alvr-nixpkgs", "authentik": "authentik", "automapaper": "automapaper", "crane": "crane", @@ -1069,11 +1052,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1766360762, - "narHash": "sha256-g0aHXl+htuBpBpYxeXemocARRr1xtyNPzIIV1/tofAc=", + "lastModified": 1765785180, + "narHash": "sha256-kia37W83bQcclhUx6nbWpCC9GDDGmDgccwALLIoqk5g=", "owner": "danth", "repo": "stylix", - "rev": "c53b4a548a75895c69811a719bb4ed750ea41a17", + "rev": "f6e9fbaeb3f810cca30ed2056d35a7d0fbccb4ef", "type": "github" }, "original": { @@ -1235,11 +1218,11 @@ ] }, "locked": { - "lastModified": 1765631794, - "narHash": "sha256-90d//IZ4GXipNsngO4sb2SAPbIC/a2P+IAdAWOwpcOM=", + "lastModified": 1763421857, + "narHash": "sha256-8JurcmEzAkrpm+eUDm8W/+KkU/w/viAeyJhJlIX2qOQ=", "owner": "pyproject-nix", "repo": "uv2nix", - "rev": "4cca323a547a1aaa9b94929c4901bed5343eafe8", + "rev": "c9752c6c5915eece99505612d8f7805185cff990", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 82c2e8a..210793e 100644 --- a/flake.nix +++ b/flake.nix @@ -42,8 +42,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - # ALVR fixed - alvr-nixpkgs.url = "github:itepastra/nixpkgs/alvr-unstable"; # for secret management agenix = { url = "github:ryantm/agenix"; diff --git a/hosts/lambdaos/configuration.nix b/hosts/lambdaos/configuration.nix index 0b49d51..b8e87f1 100644 --- a/hosts/lambdaos/configuration.nix +++ b/hosts/lambdaos/configuration.nix @@ -5,7 +5,6 @@ { config, pkgs, - inputs, ... }: { @@ -18,8 +17,6 @@ ./rescue.nix ./restic.nix - - ./disk-config.nix ]; age.identityPaths = [ "${config.users.users.noa.home}/.ssh/id_ed25519" ]; @@ -68,15 +65,15 @@ refresh-rate = 360; scale = "1"; } - # { - # name = "HDMI-A-1"; - # horizontal = 2560; - # vertical = 1440; - # horizontal-offset = 2560; - # vertical-offset = 0; - # refresh-rate = 144; - # scale = "1"; - # } + { + name = "HDMI-A-1"; + horizontal = 2560; + vertical = 1440; + horizontal-offset = 2560; + vertical-offset = 0; + refresh-rate = 144; + scale = "1"; + } ]; extraConfig = { programs.btop.package = pkgs.btop.overrideAttrs (oldAttrs: { diff --git a/hosts/lambdaos/disk-config.nix b/hosts/lambdaos/disk-config.nix deleted file mode 100644 index ddd9e70..0000000 --- a/hosts/lambdaos/disk-config.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ lib, ... }: -{ - disko.devices = { - disk = { - root = { - device = lib.mkDefault "/dev/disk/nvme0n1"; - type = "disk"; - content = { - type = "gpt"; - partitions = { - esp = { - priority = 1; - name = "ESP"; - start = "1M"; - end = "1024M"; - type = "EF00"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - mountOptions = [ "umask=0077" ]; - }; - }; - - root = { - size = "100%"; - content = { - type = "btrfs"; - extraArgs = [ "-f" ]; - subvolumes = { - "/rootfs" = { - mountpoint = "/"; - }; - - "/nix" = { - mountOptions = [ - "compress=zstd" - "noatime" - ]; - mountpoint = "/nix"; - }; - }; - }; - }; - }; - }; - }; - home = { - device = lib.mkDefault "/dev/disk/nvme1n1"; - type = "disk"; - content = { - type = "gpt"; - partitions = { - home = { - size = "100%"; - content = { - type = "btrfs"; - extraArgs = [ "-f" ]; - subvolumes = { - "/home" = { - mountpoint = "/home"; - }; - }; - }; - }; - }; - }; - }; - }; - }; -} diff --git a/hosts/lambdaos/hardware-configuration.nix b/hosts/lambdaos/hardware-configuration.nix index cc3d764..dcdaeb7 100644 --- a/hosts/lambdaos/hardware-configuration.nix +++ b/hosts/lambdaos/hardware-configuration.nix @@ -26,6 +26,26 @@ boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; + fileSystems."/" = { + device = "/dev/disk/by-uuid/263716dd-52cb-4a91-ba0b-e39e492ed0e5"; + fsType = "ext4"; + }; + + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/B08E-916D"; + fsType = "vfat"; + }; + + fileSystems."/nix" = { + device = "/dev/disk/by-uuid/b64dfc95-05c7-40bb-879b-9820c84779dc"; + fsType = "btrfs"; + options = [ + "compress=zstd:7" + "noatime" + "subvol=nix" + ]; + }; + swapDevices = [ ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking diff --git a/hosts/min/configuration.nix b/hosts/min/configuration.nix index 194e758..caa663e 100644 --- a/hosts/min/configuration.nix +++ b/hosts/min/configuration.nix @@ -5,13 +5,13 @@ }: { imports = [ - ../lambdaos/disk-config.nix + ../muos/disk-config.nix ../../common/boot.nix ]; networking.useDHCP = lib.mkDefault true; networking = { - hostName = "lambdaOS"; # Define your hostname. + hostName = "nuOS"; # Define your hostname. networkmanager.enable = true; # Easiest to use and most distros use this by default. }; diff --git a/hosts/muos/hardware-configuration.nix b/hosts/muos/hardware-configuration.nix index 9755d85..a460da2 100644 --- a/hosts/muos/hardware-configuration.nix +++ b/hosts/muos/hardware-configuration.nix @@ -22,7 +22,7 @@ "sd_mod" ]; boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; + boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking