kylekrein/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes + Update

Browse source
This commit is contained in:
Aleksandr Lebedev 2025-09-17 23:33:10 +02:00
parent ba8ee5e161
commit fb0d8526ff
4 changed files with 99 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

98
flake.lock generated
View file

@ -198,11 +198,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1757789833, "lastModified": 1758033778,
"narHash": "sha256-cpYiHtQ9ROyutuFEkqDNkc3sOVayEeNHAtCVQI5reoc=", "narHash": "sha256-oQH2wLOWLFHXT3NE+gcsFOX+Pq40bKjlOH1xw0wcmT8=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "5a088eb3f84aeea80b2d240e25c4f72a0fbdea4e", "rev": "b3efa297b9c6a9e55a44f3b6905d55f80738704f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -324,11 +324,11 @@
"quickshell": "quickshell" "quickshell": "quickshell"
}, },
"locked": { "locked": {
"lastModified": 1757904745, "lastModified": 1758135274,
"narHash": "sha256-CKSBaGvjrlvFQiC/ywvK9XMl8JF55Ea+kT6fkgIYTPA=", "narHash": "sha256-pipK0UDAGMTt2OrbiaZSMfVyx/L4Tjej5cNF/+9JPM4=",
"owner": "KyleKrein", "owner": "KyleKrein",
"repo": "DesktopShell", "repo": "DesktopShell",
"rev": "8ee43de145ce8776c353d3aea0286e1c968d290c", "rev": "6c81aa09089befa2ce836b7596ba0d8f2a330966",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1149,11 +1149,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1757698511, "lastModified": 1757920978,
"narHash": "sha256-UqHHGydF/q3jfYXCpvYLA0TWtvByOp1NwOKCUjhYmPs=", "narHash": "sha256-Mv16aegXLulgyDunijP6SPFJNm8lSXb2w3Q0X+vZ9TY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a3fcc92180c7462082cd849498369591dfb20855", "rev": "11cc5449c50e0e5b785be3dfcb88245232633eb8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1283,11 +1283,11 @@
}, },
"master": { "master": {
"locked": { "locked": {
"lastModified": 1757950338, "lastModified": 1758137497,
"narHash": "sha256-CM9/wKVTXc33YqSD/eK/MfFh3C5t6LIuirdSu45CGm8=", "narHash": "sha256-PibXYPPoWHnehpHWTdG4R3C6xZuXNB3703hJ9W9RzAY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9f71df050317b7ab47fc0725d134d1335fae35ec", "rev": "e04396ffc1d4ce00b04eb0a37bcea568b2e7f80b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1371,11 +1371,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1757942412, "lastModified": 1758113295,
"narHash": "sha256-iDnEKwUYNOJZU/2B4bt8tfKUwN0J7RFJ7BXmf17VJOM=", "narHash": "sha256-5O83S7Df8XJ0x08VLZFdSBP+vhHa9vrLMVM3tWdNVj8=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "1da07fd6a9d44a7875d2843cccab1179085edb2c", "rev": "75513eba0b3b8185241654d835d2a9a3d174e90d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1404,11 +1404,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1757916394, "lastModified": 1758035401,
"narHash": "sha256-nSmVJLjTGwQYC+pqD7GLt7Yt6oktawAMRld6oyFwMd0=", "narHash": "sha256-yDFq5/uwQV9NetcKduw0A/3XmGN/Z3ovMCTZkUv0B6Y=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "cd0d45fdb88641aa5211c81e69301e85c5dd53a2", "rev": "08f5c6fecb3c5c81d63a0bf7248c85ae3299a4a5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1465,11 +1465,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1757430124, "lastModified": 1758102940,
"narHash": "sha256-MhDltfXesGH8VkGv3hmJ1QEKl1ChTIj9wmGAFfWj/Wk=", "narHash": "sha256-wwqf3+A8EiqwWpcAaPN20QXJLlpGPpwtLTrzgnngI2o=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "830b3f0b50045cf0bcfd4dab65fad05bf882e196", "rev": "ebd0bfc11fc2b5cff37401e9b3703881ad5fabbd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1679,11 +1679,11 @@
"nixpkgs": "nixpkgs_12" "nixpkgs": "nixpkgs_12"
}, },
"locked": { "locked": {
"lastModified": 1757937573, "lastModified": 1758123407,
"narHash": "sha256-B+MT526k5th4x22h213/CgzdkKWIaeaa0+Y0uuCkH/I=", "narHash": "sha256-4qwMlR0Q4Zr2rjUFauYIldfjzffYt3G5tZ1uPFPPYGU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "134e117c969f42277f1c5e60c8fbcac103c2c454", "rev": "ba2b3b6c0bc42442559a3b090f032bc8d501f5e3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1786,11 +1786,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1757810152, "lastModified": 1757941119,
"narHash": "sha256-Vp9K5ol6h0J90jG7Rm4RWZsCB3x7v5VPx588TQ1dkfs=", "narHash": "sha256-TssJZFzMRYdWgpHySzKv4YQg6DUv5SDENiWbVgNTo0M=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9a094440e02a699be5c57453a092a8baf569bdad", "rev": "7ff837017c3b82bd3671932599a119d7bc672ff0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1850,11 +1850,11 @@
}, },
"nixpkgs_13": { "nixpkgs_13": {
"locked": { "locked": {
"lastModified": 1757810152, "lastModified": 1758070117,
"narHash": "sha256-Vp9K5ol6h0J90jG7Rm4RWZsCB3x7v5VPx588TQ1dkfs=", "narHash": "sha256-uLwwHFCZnT1c3N3biVe/0hCkag2GSrf9+M56+Okf+WY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9a094440e02a699be5c57453a092a8baf569bdad", "rev": "e9b7f2ff62b35f711568b1f0866243c7c302028d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1898,11 +1898,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1757598577, "lastModified": 1758029758,
"narHash": "sha256-+PccWxBVh1cFy2sDWHlpSBG+OP0b6o/DE2EzCxsB0ns=", "narHash": "sha256-fKqsvznISxVSBo6aaiGGXMRiBG4IIuV3sSySxx80pcQ=",
"owner": "PedroHLC", "owner": "PedroHLC",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7bbfafff0e9f1c9a0d10ca4d4c26aaa49a13d893", "rev": "4eb5897225c3d7e78a0b9d1542197ee7c8d270a5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -4213,11 +4213,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1757588530, "lastModified": 1758108966,
"narHash": "sha256-tJ7A8mID3ct69n9WCvZ3PzIIl3rXTdptn/lZmqSS95U=", "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "b084b2c2b6bc23e83bbfe583b03664eb0b18c411", "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -4280,11 +4280,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1756981260, "lastModified": 1758006913,
"narHash": "sha256-GhuD9QVimjynHI0OOyZsqJsnlXr2orowh9H+HYz4YMs=", "narHash": "sha256-lU00BAdiKAhm96M6o0AzBdZY6+bBSfB2a0zm4xJYl/U=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "6eb12551baf924f8fdecdd04113863a754259c34", "rev": "49646e4407fce5925920b178872ddd9f8e495218",
"revCount": 672, "revCount": 673,
"type": "git", "type": "git",
"url": "https://git.outfoxxed.me/outfoxxed/quickshell" "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
}, },
@ -4392,11 +4392,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1757730403, "lastModified": 1757930296,
"narHash": "sha256-Jxl4OZRVsXs8JxEHUVQn3oPu6zcqFyGGKaFrlNgbzp0=", "narHash": "sha256-Z9u5VszKs8rfEvg2AsFucWEjl7wMtAln9l1b78cfBh4=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "3232f7f8bd07849fc6f4ae77fe695e0abb2eba2c", "rev": "09442765a05c2ca617c20ed68d9613da92a2d96b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -4561,11 +4561,11 @@
"nixpkgs": "nixpkgs_14" "nixpkgs": "nixpkgs_14"
}, },
"locked": { "locked": {
"lastModified": 1757847158, "lastModified": 1758007585,
"narHash": "sha256-TumOaykhZO8SOs/faz6GQhqkOcFLoQvESLSF1cJ4mZc=", "narHash": "sha256-HYnwlbY6RE5xVd5rh0bYw77pnD8lOgbT4mlrfjgNZ0c=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "ee6f91c1c11acf7957d94a130de77561ec24b8ab", "rev": "f77d4cfa075c3de66fc9976b80e0c4fc69e2c139",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -4593,11 +4593,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1757361712, "lastModified": 1757957798,
"narHash": "sha256-GwObJtrAqVim66e4Jb5VzAKT6zGFJ3KOi63rfcrfMV4=", "narHash": "sha256-FT4O5imFJ+FUIGhYj/aFwEEgyvLhuyJ2my8f6mCLtTY=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "3bf1430ed85a4484e4e1facee2344d2bb20288e6", "rev": "e6fc25cd12e8f461e402cf34649cc73ad93c7bdd",
"type": "github" "type": "github"
}, },
"original": { "original": {

3
homes/x86_64-linux/kylekrein/kitty.nix
View file

@ -1,9 +1,10 @@
{ {
osConfig, osConfig,
config,
pkgs, pkgs,
... ...
}: { }: {
home.packages = with pkgs; [kitty-themes]; home.packages = with pkgs; lib.optionals (config.programs.kitty.enable) [kitty-themes];
programs.fzf = { programs.fzf = {
enable = true; enable = true;
enableBashIntegration = true; enableBashIntegration = true;

4
modules/nixos/presets/disko/impermanenceBtrfsLuks/default.nix
View file

@ -18,7 +18,7 @@ in {
options.${namespace}.presets.disko.impermanenceBtrfsLuks = with types; { options.${namespace}.presets.disko.impermanenceBtrfsLuks = with types; {
enable = mkBoolOpt false "Enable preset"; enable = mkBoolOpt false "Enable preset";
device = mkOpt' str "/dev/nvme0n1"; device = mkOpt' str "/dev/nvme0n1";
swapSize = mkOpt' int 32; swapSize = mkOpt' (nullOr int) 32;
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
@ -77,7 +77,7 @@ in {
mountpoint = "/persist"; mountpoint = "/persist";
mountOptions = ["subvol=persist" "compress=zstd" "noatime"]; mountOptions = ["subvol=persist" "compress=zstd" "noatime"];
}; };
"/swap" = { "/swap" = mkIf (cfg.swapSize != null) {
mountpoint = "/swap"; mountpoint = "/swap";
swap.swapfile.size = "${builtins.toString cfg.swapSize}G"; swap.swapfile.size = "${builtins.toString cfg.swapSize}G";
}; };

50
systems/x86_64-linux/stargate/default.nix
View file

@ -13,13 +13,55 @@
}: }:
with lib; with lib;
with lib.custom; { with lib.custom; {
facter.reportPath = ./facter.json; #facter.reportPath = ./facter.json;
imports = lib.snowfall.fs.get-nix-files ./.; imports = lib.snowfall.fs.get-non-default-nix-files ./. ++ [./services];
systemd.network.wait-online.enable = lib.mkForce false; #facter #systemd.network.wait-online.enable = lib.mkForce false; #facter
boot.supportedFilesystems = ["zfs"];
networking.hostId = "049b86a7"; # head -c4 /dev/urandom | od -A none -t x4
services.zfs.autoScrub = {
enable = true;
interval = "*-*-1,15 02:30";
};
services.sanoid = {
enable = true;
templates.backup = {
hourly = 36;
daily = 30;
monthly = 3;
autoprune = true;
autosnap = true;
};
datasets."zstorage/services" = {
useTemplate = ["backup"];
};
datasets."zstorage/media" = {
useTemplate = ["backup"];
};
datasets."zstorage/backup" = {
useTemplate = ["backup"];
};
};
services.syncoid = {
enable = false; #TODO Configure backups
user = "backupuser";
commonArgs = ["--no-sync-snap" "--skip-parent" "--recursive"];
sshKey = "/var/lib/syncoid/backup";
commands."backup1" = {
source = "rpool/data";
target = "backup1";
};
commands."truenas" = {
source = "rpool/data";
target = "backupuser@192.168.200.103:backuppool/data";
extraArgs = ["--sshoption=StrictHostKeyChecking=off"];
};
};
custom.presets.disko.impermanenceBtrfsLuks = { custom.presets.disko.impermanenceBtrfsLuks = {
enable = true; enable = true;
swapSize = 16; swapSize = null;
}; };
custom.hardware.secureBoot = enabled; custom.hardware.secureBoot = enabled;
custom.impermanence = enabled; custom.impermanence = enabled;