Compare commits

..

No commits in common. "bde12865f895f7632d8cc663f80345d6d69168d5" and "2af0a820eeebb1228d1e612609ded72e238fc3a9" have entirely different histories.

3 changed files with 69 additions and 67 deletions

108
flake.lock generated
View file

@ -99,11 +99,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732645828, "lastModified": 1731746438,
"narHash": "sha256-+4U2I2653JvPFxcux837ulwYS864QvEueIljUkwytsk=", "narHash": "sha256-f3SSp1axoOk0NAI7oFdRzbxG2XPBSIXC+/DaAXnvS1A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "869ba3a87486289a4197b52a6c9e7222edf00b3e", "rev": "cb64993826fa7a477490be6ccb38ba1fa1e18fa8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -143,11 +143,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1732593794, "lastModified": 1731816193,
"narHash": "sha256-VhS+81/eTDiin5ULZLWvqI+9ggI+qXNUSvi3dIQfBX4=", "narHash": "sha256-Y/u1O6GpvOYRbGOnwGo0Gofg5jjfaHNGP9G7yGFFfzg=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "9b7d4fb4739c0bf808d31e2b66b337f1234e4447", "rev": "02c98c9ba4491db49ab759161fcc0ba9830d7aa0",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -340,11 +340,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732021966, "lastModified": 1731363552,
"narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "3308484d1a443fc5bc92012435d79e80458fe43c", "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -382,11 +382,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732482255, "lastModified": 1731880681,
"narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=", "narHash": "sha256-FmYTkIyPBUxSWgA7DPIVTsCCMvSSbs56yOtHpLNSnKg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a9953635d7f34e7358d5189751110f87e3ac17da", "rev": "aecd341dfead1c3ef7a3c15468ecd71e8343b7c6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -475,11 +475,11 @@
"treefmt-nix": "treefmt-nix_2" "treefmt-nix": "treefmt-nix_2"
}, },
"locked": { "locked": {
"lastModified": 1732368528, "lastModified": 1726220014,
"narHash": "sha256-WO0NAN1OLXGY9+OnFS673pEoPVOhSbOSB1Pwd0vcb4s=", "narHash": "sha256-odPLIVURZbm41KjKyIU4kIkhe6Oj4QH4wgp4g+U2nYY=",
"owner": "Lassulus", "owner": "Lassulus",
"repo": "nether", "repo": "nether",
"rev": "c242b4f6d61185edfadaccd9df4bb4e086627d32", "rev": "02c13404745d5102e1e5488815fc8fd58a8861b9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -496,11 +496,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732324260, "lastModified": 1731642829,
"narHash": "sha256-0xzQvoId/P008QkTSAdFVv465P9rL9nYkIOWXL5pdsY=", "narHash": "sha256-vG+O2RZRzYZ8BUMNNJ+BLSj6PUoGW7taDQbp6QNJ3Xo=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "698a62c628c2ec423aa770d8ec0e1d0bcf4fca1a", "rev": "f86f158efd4bab8dce3e207e4621f1df3a760b7a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -511,11 +511,11 @@
}, },
"nixlib": { "nixlib": {
"locked": { "locked": {
"lastModified": 1732410305, "lastModified": 1731200463,
"narHash": "sha256-/hxIKRTBsdrnudJWDGaBN8wIjHovqVAVxXdi8ByVtck=", "narHash": "sha256-qDaAweJjdFbVExqs8aG27urUgcgKufkIngHW3Rzustg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "87b6978992e2eb605732fba842cad0a7e14b2047", "rev": "e04234d263750db01c78a412690363dc2226e68a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -569,11 +569,11 @@
}, },
"nixos-facter-modules_2": { "nixos-facter-modules_2": {
"locked": { "locked": {
"lastModified": 1732288619, "lastModified": 1731843871,
"narHash": "sha256-zSQ2cR+NRJfHUVfkv+O6Wi53wXfzX8KHiO8fRfnvc0M=", "narHash": "sha256-aIy8m4jjr/BFXzniNzoH16sF7HEFV/01/5b3FhtUHrw=",
"owner": "numtide", "owner": "numtide",
"repo": "nixos-facter-modules", "repo": "nixos-facter-modules",
"rev": "862648589993a96480c2255197a28feea712f68f", "rev": "5a1c2a28589e34f8a44d46dd1909cfacf928cb1a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -590,11 +590,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732496924, "lastModified": 1731546190,
"narHash": "sha256-/MNhZLR0eh9z/d3l+ammq+F5XxHln0RHgO4Bhtjr0IM=", "narHash": "sha256-kJix8nLyFIJ3EC7VtoXK/85C4ZN2dC5oWoS8+ErehqI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-generators", "repo": "nixos-generators",
"rev": "098e8b6ff72c86944a8d54b64ddd7b7e6635830a", "rev": "06ffce1a8d95e95c06a4bcfa117dd960b14a7101",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -605,11 +605,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1732483221, "lastModified": 1731797098,
"narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=", "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405", "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -661,11 +661,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1732014248, "lastModified": 1731676054,
"narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -707,11 +707,11 @@
"treefmt-nix": "treefmt-nix_4" "treefmt-nix": "treefmt-nix_4"
}, },
"locked": { "locked": {
"lastModified": 1732629460, "lastModified": 1731780782,
"narHash": "sha256-Cr8EyxEFPbVmX6p8LsslFBjDEuVlFNPILrWlwbBNnNA=", "narHash": "sha256-CG3rcxcZEViYEUTAXatqXrW0Gn9tQvydF+lLYH+0VPA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "8b19d154823619af7ced464185e8d13ec80a758b", "rev": "9d99d7cfdbd7f94da9571a4d7bbb9de185241935",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -729,11 +729,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731936508, "lastModified": 1731874326,
"narHash": "sha256-z0BSSf78LkxIrrFXZYmCoRRAxAmxMUKpK7CyxQRvkZI=", "narHash": "sha256-FVodEap6GQT/1DSG5KOcpsrKXfG9gMNObQxW+HNJnW8=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "fe07070f811b717a4626d01fab714a87d422a9e1", "rev": "64832c4cf885350ad0e63a27fd7055bcfc7955f6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -752,11 +752,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731936508, "lastModified": 1731582522,
"narHash": "sha256-z0BSSf78LkxIrrFXZYmCoRRAxAmxMUKpK7CyxQRvkZI=", "narHash": "sha256-1w6aM4bG5cl2E4jHLPnMKkrUO4tY1jUX1NI6/RwJN7Y=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "fe07070f811b717a4626d01fab714a87d422a9e1", "rev": "13300b2297c51368e0892c3ebe220f688014fe15",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -841,11 +841,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732575825, "lastModified": 1731862312,
"narHash": "sha256-xtt95+c7OUMoqZf4OvA/7AemiH3aVuWHQbErYQoPwFk=", "narHash": "sha256-NVUTFxKrJp/hjehlF1IvkPnlRYg/O9HFVutbxOM8zNM=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "3433ea14fbd9e6671d0ff0dd45ed15ee4c156ffa", "rev": "472741cf3fee089241ac9ea705bb2b9e0bfa2978",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -861,11 +861,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732570520, "lastModified": 1730940990,
"narHash": "sha256-ANPZf+osgErYUs27N7ItYovc0d/TJKwOpMtlpk6W9+M=", "narHash": "sha256-FyRDs/jlmaBDL1ryf3tM9rFaOrlYn5wSa1VUr4k2w+4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "srvos", "repo": "srvos",
"rev": "0ba8119cd4077eaea0f2406b8e1ec491429b8fc4", "rev": "dabae9d2062afd45f343d13d819eea1029d08162",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -991,11 +991,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732292307, "lastModified": 1730321837,
"narHash": "sha256-5WSng844vXt8uytT5djmqBCkopyle6ciFgteuA9bJpw=", "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "705df92694af7093dfbb27109ce16d828a79155f", "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1011,11 +1011,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732643199, "lastModified": 1730321837,
"narHash": "sha256-uI7TXEb231o8dkwB5AUCecx3AQtosRmL6hKgnckvjps=", "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "84637a7ab04179bdc42aa8fd0af1909fba76ad0c", "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -3,13 +3,13 @@
disko.devices = { disko.devices = {
disk = { disk = {
main = { main = {
type = "disk";
device = "/dev/nvme0n1"; device = "/dev/nvme0n1";
type = "disk";
content = { content = {
type = "gpt"; type = "gpt";
partitions = { partitions = {
ESP = { ESP = {
size = "500M"; end = "500M";
type = "EF00"; type = "EF00";
content = { content = {
type = "filesystem"; type = "filesystem";
@ -18,16 +18,18 @@
mountOptions = [ "umask=0077" ]; mountOptions = [ "umask=0077" ];
}; };
}; };
luks = { root = {
size = "100%"; name = "root";
end = "-0";
content = { content = {
type = "luks"; type = "luks";
name = "crypted"; name = "crypto";
settings.allowDiscards = true; settings = {
passwordFile = "/tmp/secret.key"; allowDiscards = true;
};
content = { content = {
type = "filesystem"; type = "filesystem";
format = "ext4"; format = "bcachefs";
mountpoint = "/"; mountpoint = "/";
}; };
}; };

View file

@ -9,11 +9,11 @@
}: }:
{ {
fileSystems."/home/jopejoe1/Public/games" = { # fileSystems."/home/jopejoe1/Public/games" = {
device = "/dev/sda"; # device = "/dev/sda";
fsType = "bcachefs"; # fsType = "bcachefs";
options = [ "compression=zstd" ]; # options = [ "compression=zstd" ];
}; # };
powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand"; powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
} }