Compare commits

..

No commits in common. "2382c79b0857e6ff3d3cdfe7057f4e4d8c33b85c" and "650f817d5a22565ca0768dcdfd3d6b5c781e8a22" have entirely different histories.

7 changed files with 93 additions and 166 deletions

139
flake.lock generated
View file

@ -3,11 +3,11 @@
"advisory-db": { "advisory-db": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1766408261, "lastModified": 1765465865,
"narHash": "sha256-cOH3CmAfmcVHph4e31kdVBg/17rvYRTuX+Z16goMSDM=", "narHash": "sha256-jAyDD6FKEWZafIKN4KjzdQywcS/gR9sHz4zzjxefXcA=",
"owner": "rustsec", "owner": "rustsec",
"repo": "advisory-db", "repo": "advisory-db",
"rev": "58d84ca80e02245c680317adb9975f4ba0a5b975", "rev": "d0bdb37b2b1dc8a81f47e2042d59227b1f06473f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -43,22 +43,6 @@
"type": "github" "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": { "authentik": {
"inputs": { "inputs": {
"authentik-src": "authentik-src", "authentik-src": "authentik-src",
@ -81,11 +65,11 @@
"uv2nix": "uv2nix" "uv2nix": "uv2nix"
}, },
"locked": { "locked": {
"lastModified": 1765971510, "lastModified": 1763643080,
"narHash": "sha256-HdGpVTqPguAvkDbgjWi38sGUaI0MvxJJX2bFVZTKXaE=", "narHash": "sha256-jlYmjrTw3g5iOYDZBGb5Plw6IyRa+WY60e3GzU19bkk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "authentik-nix", "repo": "authentik-nix",
"rev": "e929253deddb8398c7010b28187d9d43603db950", "rev": "4a670757083d94a9dceb4929eb88eb9995bc1363",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -97,16 +81,16 @@
"authentik-src": { "authentik-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1765907481, "lastModified": 1763564826,
"narHash": "sha256-d0pPNE2T30COdFse0T15Mx8XW4BGg8hgPQvmW2dAV9s=", "narHash": "sha256-xBnAfoAOUslOrxNzY5kV0h67qWMXKZnPC/wgRGXZleQ=",
"owner": "goauthentik", "owner": "goauthentik",
"repo": "authentik", "repo": "authentik",
"rev": "0d617e4ad1eb9e4540ba5381e6ce06e971affc63", "rev": "2fedc3d0a0ba91c16bb71bd4b2432108ca02e890",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "goauthentik", "owner": "goauthentik",
"ref": "version/2025.10.3", "ref": "version/2025.10.2",
"repo": "authentik", "repo": "authentik",
"type": "github" "type": "github"
} }
@ -152,17 +136,17 @@
"base16-fish": { "base16-fish": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1765809053, "lastModified": 1754405784,
"narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=", "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=",
"owner": "tomyun", "owner": "tomyun",
"repo": "base16-fish", "repo": "base16-fish",
"rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "tomyun", "owner": "tomyun",
"repo": "base16-fish", "repo": "base16-fish",
"rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
"type": "github" "type": "github"
} }
}, },
@ -217,11 +201,11 @@
}, },
"crane": { "crane": {
"locked": { "locked": {
"lastModified": 1766194365, "lastModified": 1765739568,
"narHash": "sha256-4AFsUZ0kl6MXSm4BaQgItD0VGlEKR3iq7gIaL7TjBvc=", "narHash": "sha256-gQYx35Of4UDKUjAYvmxjUEh/DdszYeTtT6MDin4loGE=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "7d8ec2c71771937ab99790b45e6d9b93d15d9379", "rev": "67d2baff0f9f677af35db61b32b5df6863bcc075",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -259,11 +243,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1766150702, "lastModified": 1765688338,
"narHash": "sha256-P0kM+5o+DKnB6raXgFEk3azw8Wqg5FL6wyl9jD+G5a4=", "narHash": "sha256-MjrytR2kiHYUnzX11cXaD31tS7kKdhM1KFaac0+KAig=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "916506443ecd0d0b4a0f4cf9d40a3c22ce39b378", "rev": "be1a6b8a05afdd5d5fa69fcaf3c4ead7014c9fd8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -411,11 +395,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1765835352, "lastModified": 1762980239,
"narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", "narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "a34fae9c08a15ad73f295041fec82323541400a9", "rev": "52a2caecc898d0b46b2b905f058ccc5081f842da",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -429,11 +413,11 @@
"nixpkgs-lib": "nixpkgs-lib_2" "nixpkgs-lib": "nixpkgs-lib_2"
}, },
"locked": { "locked": {
"lastModified": 1765835352, "lastModified": 1765495779,
"narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", "narHash": "sha256-MhA7wmo/7uogLxiewwRRmIax70g6q1U/YemqTGoFHlM=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "a34fae9c08a15ad73f295041fec82323541400a9", "rev": "5635c32d666a59ec9a55cab87e898889869f7b71",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -600,11 +584,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1766387499, "lastModified": 1765682243,
"narHash": "sha256-AjK3/UKDzeXFeYNLVBaJ3+HLE9he1g5UrlNd4/BM3eA=", "narHash": "sha256-yeCxFV/905Wr91yKt5zrVvK6O2CVXWRMSrxqlAZnLp0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "527ad07e6625302b648ed3b28c34b62a79bd103e", "rev": "58bf3ecb2d0bba7bdf363fc8a6c4d49b4d509d03",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -627,11 +611,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1766385782, "lastModified": 1765741400,
"narHash": "sha256-Dln76wwiK/Zgbr3I7HYvFn+40GVCqI3rYHmkl6i6X/8=", "narHash": "sha256-EcVQf0/btw6hmPdu9MgwT7kociKSw+nP00dnnQTBVLU=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "8f27c09a08f6430f253ee93f35a519e42da19832", "rev": "0ebb1c524ddecbf002ccf7fb530711d56ed1e9b2",
"revCount": 18699, "revCount": 18684,
"type": "git", "type": "git",
"url": "https://git.lix.systems/lix-project/lix.git" "url": "https://git.lix.systems/lix-project/lix.git"
}, },
@ -654,11 +638,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1766242842, "lastModified": 1764519849,
"narHash": "sha256-WRWsYt3d4xod9+2SVJ1h7RH+rHo4Fjk/R1neEWdecaE=", "narHash": "sha256-XnNABKfIYKSimQVvKc9FnlC2H0LurOhd9MS6l0Z67lE=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "9b76a77150b4ed4f7066f641f54791b1ac4c778c", "rev": "6c95c0b6f73f831226453fc6905c216ab634c30f",
"revCount": 172, "revCount": 170,
"type": "git", "type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module.git" "url": "https://git.lix.systems/lix-project/nixos-module.git"
}, },
@ -766,11 +750,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1766409418, "lastModified": 1765756970,
"narHash": "sha256-t1+XDRfjg4aPZLwEyYH0PVMFlSNDYdtDOS67Z3ggrTo=", "narHash": "sha256-svbiQ9Z9Gv64bYH3WxsT1kLOaHLn4Dq1PK0ayPvCV8w=",
"owner": "kaylorben", "owner": "kaylorben",
"repo": "nixcord", "repo": "nixcord",
"rev": "5d3f4ab1175a550a441d156ed755bad87546bcd6", "rev": "a75bee9cf2ce5c28cb59425e5482735082aec387",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -797,11 +781,11 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1765674936, "lastModified": 1761765539,
"narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", "rev": "719359f4562934ae99f5443f20aa06c2ffff91fc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -812,11 +796,11 @@
}, },
"nixpkgs-lib_2": { "nixpkgs-lib_2": {
"locked": { "locked": {
"lastModified": 1765674936, "lastModified": 1761765539,
"narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", "rev": "719359f4562934ae99f5443f20aa06c2ffff91fc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -843,11 +827,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1766410004, "lastModified": 1765785282,
"narHash": "sha256-Ft+34bw0TuAH/riEGiFRWDsRA7EUEKuBFoxFoY0ekkA=", "narHash": "sha256-4hH6oQwCjdDOUjhY9V87hwW5rBZxojRoTt8M5funqlo=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "77bfd99d4f8e597c1ee7388dc259fb5c72bb5c30", "rev": "846f588350db33d66ea5d5bc7f3e551fd2e561d4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -963,11 +947,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1763662255, "lastModified": 1761781027,
"narHash": "sha256-4bocaOyLa3AfiS8KrWjZQYu+IAta05u3gYZzZ6zXbT0=", "narHash": "sha256-YDvxPAm2WnxrznRqWwHLjryBGG5Ey1ATEJXrON+TWt8=",
"owner": "pyproject-nix", "owner": "pyproject-nix",
"repo": "build-system-pkgs", "repo": "build-system-pkgs",
"rev": "042904167604c681a090c07eb6967b4dd4dae88c", "rev": "795a980d25301e5133eca37adae37283ec3c8e66",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -984,11 +968,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1764134915, "lastModified": 1763435975,
"narHash": "sha256-xaKvtPx6YAnA3HQVp5LwyYG1MaN4LLehpQI8xEdBvBY=", "narHash": "sha256-SKdpcVuJKMNEXloIpLXY+jDI42+6Ew21vdkl894DxHo=",
"owner": "pyproject-nix", "owner": "pyproject-nix",
"repo": "pyproject.nix", "repo": "pyproject.nix",
"rev": "2c8df1383b32e5443c921f61224b198a2282a657", "rev": "7d3d8848358ccbd415afe2139f12b9e1508d3ace",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1021,7 +1005,6 @@
"inputs": { "inputs": {
"advisory-db": "advisory-db", "advisory-db": "advisory-db",
"agenix": "agenix", "agenix": "agenix",
"alvr-nixpkgs": "alvr-nixpkgs",
"authentik": "authentik", "authentik": "authentik",
"automapaper": "automapaper", "automapaper": "automapaper",
"crane": "crane", "crane": "crane",
@ -1069,11 +1052,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1766360762, "lastModified": 1765785180,
"narHash": "sha256-g0aHXl+htuBpBpYxeXemocARRr1xtyNPzIIV1/tofAc=", "narHash": "sha256-kia37W83bQcclhUx6nbWpCC9GDDGmDgccwALLIoqk5g=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "c53b4a548a75895c69811a719bb4ed750ea41a17", "rev": "f6e9fbaeb3f810cca30ed2056d35a7d0fbccb4ef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1235,11 +1218,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1765631794, "lastModified": 1763421857,
"narHash": "sha256-90d//IZ4GXipNsngO4sb2SAPbIC/a2P+IAdAWOwpcOM=", "narHash": "sha256-8JurcmEzAkrpm+eUDm8W/+KkU/w/viAeyJhJlIX2qOQ=",
"owner": "pyproject-nix", "owner": "pyproject-nix",
"repo": "uv2nix", "repo": "uv2nix",
"rev": "4cca323a547a1aaa9b94929c4901bed5343eafe8", "rev": "c9752c6c5915eece99505612d8f7805185cff990",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -42,8 +42,6 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
# ALVR fixed
alvr-nixpkgs.url = "github:itepastra/nixpkgs/alvr-unstable";
# for secret management # for secret management
agenix = { agenix = {
url = "github:ryantm/agenix"; url = "github:ryantm/agenix";

View file

@ -5,7 +5,6 @@
{ {
config, config,
pkgs, pkgs,
inputs,
... ...
}: }:
{ {
@ -18,8 +17,6 @@
./rescue.nix ./rescue.nix
./restic.nix ./restic.nix
./disk-config.nix
]; ];
age.identityPaths = [ "${config.users.users.noa.home}/.ssh/id_ed25519" ]; age.identityPaths = [ "${config.users.users.noa.home}/.ssh/id_ed25519" ];
@ -68,15 +65,15 @@
refresh-rate = 360; refresh-rate = 360;
scale = "1"; scale = "1";
} }
# { {
# name = "HDMI-A-1"; name = "HDMI-A-1";
# horizontal = 2560; horizontal = 2560;
# vertical = 1440; vertical = 1440;
# horizontal-offset = 2560; horizontal-offset = 2560;
# vertical-offset = 0; vertical-offset = 0;
# refresh-rate = 144; refresh-rate = 144;
# scale = "1"; scale = "1";
# } }
]; ];
extraConfig = { extraConfig = {
programs.btop.package = pkgs.btop.overrideAttrs (oldAttrs: { programs.btop.package = pkgs.btop.overrideAttrs (oldAttrs: {

View file

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

View file

@ -26,6 +26,26 @@
boot.kernelModules = [ "kvm-amd" ]; boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ]; 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 = [ ]; swapDevices = [ ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking

View file

@ -5,13 +5,13 @@
}: }:
{ {
imports = [ imports = [
../lambdaos/disk-config.nix ../muos/disk-config.nix
../../common/boot.nix ../../common/boot.nix
]; ];
networking.useDHCP = lib.mkDefault true; networking.useDHCP = lib.mkDefault true;
networking = { networking = {
hostName = "lambdaOS"; # Define your hostname. hostName = "nuOS"; # Define your hostname.
networkmanager.enable = true; # Easiest to use and most distros use this by default. networkmanager.enable = true; # Easiest to use and most distros use this by default.
}; };

View file

@ -22,7 +22,7 @@
"sd_mod" "sd_mod"
]; ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking