diff --git a/flake.lock b/flake.lock index c84eb66..d8e0c36 100644 --- a/flake.lock +++ b/flake.lock @@ -324,11 +324,11 @@ "quickshell": "quickshell" }, "locked": { - "lastModified": 1757882409, - "narHash": "sha256-WVwvhMcX5QOi/149MaYiPVPNgho42EByaYdeqm3XSWs=", + "lastModified": 1757904745, + "narHash": "sha256-CKSBaGvjrlvFQiC/ywvK9XMl8JF55Ea+kT6fkgIYTPA=", "owner": "KyleKrein", "repo": "DesktopShell", - "rev": "76ee483b275f7cd501c2625a1711d50e13b5101c", + "rev": "8ee43de145ce8776c353d3aea0286e1c968d290c", "type": "github" }, "original": { @@ -1283,11 +1283,11 @@ }, "master": { "locked": { - "lastModified": 1757849838, - "narHash": "sha256-1z1OdFWwsmWZ87xZ6FYuzhe5fxHcmj4puDTPwvxWN7Q=", + "lastModified": 1757950338, + "narHash": "sha256-CM9/wKVTXc33YqSD/eK/MfFh3C5t6LIuirdSu45CGm8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dfa87d116e876b1e7bf85b0ed78f41abbb8e6c3a", + "rev": "9f71df050317b7ab47fc0725d134d1335fae35ec", "type": "github" }, "original": { @@ -1371,11 +1371,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1757836781, - "narHash": "sha256-1OSxFylf3orQ+UjLlrYIm7gibhDUm1heXVZC/kdJ5LA=", + "lastModified": 1757942412, + "narHash": "sha256-iDnEKwUYNOJZU/2B4bt8tfKUwN0J7RFJ7BXmf17VJOM=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "8354fa85074d42cf0743458c316cabf55c1ab553", + "rev": "1da07fd6a9d44a7875d2843cccab1179085edb2c", "type": "github" }, "original": { @@ -1404,11 +1404,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1757832020, - "narHash": "sha256-SCdus7r4IS8l3jzF8mcMFMlDvACTdmDCcsPnGUEqll0=", + "lastModified": 1757916394, + "narHash": "sha256-nSmVJLjTGwQYC+pqD7GLt7Yt6oktawAMRld6oyFwMd0=", "owner": "YaLTeR", "repo": "niri", - "rev": "e6a8ad38479eb179dc7301755316f993e3e872ea", + "rev": "cd0d45fdb88641aa5211c81e69301e85c5dd53a2", "type": "github" }, "original": { @@ -1659,11 +1659,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1757775351, - "narHash": "sha256-xWsxmNHwt9jV/yFJqzsNeilpH4BR8MPe44Yt0eaGAIM=", + "lastModified": 1757943327, + "narHash": "sha256-w6cDExPBqbq7fTLo4dZ1ozDGeq3yV6dSN4n/sAaS6OM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f89c620d3d6e584d98280b48f0af7be4f8506ab5", + "rev": "67a709cfe5d0643dafd798b0b613ed579de8be05", "type": "github" }, "original": { @@ -1679,11 +1679,11 @@ "nixpkgs": "nixpkgs_12" }, "locked": { - "lastModified": 1757671225, - "narHash": "sha256-ZzoQXe7GV7QX3B3Iw59BogmrtHSP5Ig7MAPPD0cOFW4=", + "lastModified": 1757937573, + "narHash": "sha256-B+MT526k5th4x22h213/CgzdkKWIaeaa0+Y0uuCkH/I=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "42666441c3ddf34a8583a77f07a2c7cae32513c3", + "rev": "134e117c969f42277f1c5e60c8fbcac103c2c454", "type": "github" }, "original": { @@ -1786,11 +1786,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1757545623, - "narHash": "sha256-mCxPABZ6jRjUQx3bPP4vjA68ETbPLNz9V2pk9tO7pRQ=", + "lastModified": 1757810152, + "narHash": "sha256-Vp9K5ol6h0J90jG7Rm4RWZsCB3x7v5VPx588TQ1dkfs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8cd5ce828d5d1d16feff37340171a98fc3bf6526", + "rev": "9a094440e02a699be5c57453a092a8baf569bdad", "type": "github" }, "original": { @@ -1834,11 +1834,11 @@ }, "nixpkgs_12": { "locked": { - "lastModified": 1757068644, - "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", + "lastModified": 1757745802, + "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", + "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", "type": "github" }, "original": { @@ -1850,11 +1850,11 @@ }, "nixpkgs_13": { "locked": { - "lastModified": 1757545623, - "narHash": "sha256-mCxPABZ6jRjUQx3bPP4vjA68ETbPLNz9V2pk9tO7pRQ=", + "lastModified": 1757810152, + "narHash": "sha256-Vp9K5ol6h0J90jG7Rm4RWZsCB3x7v5VPx588TQ1dkfs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8cd5ce828d5d1d16feff37340171a98fc3bf6526", + "rev": "9a094440e02a699be5c57453a092a8baf569bdad", "type": "github" }, "original": { diff --git a/homes/x86_64-linux/kylekrein/niri/niri.nix b/homes/x86_64-linux/kylekrein/niri/niri.nix index 346dd50..db21436 100644 --- a/homes/x86_64-linux/kylekrein/niri/niri.nix +++ b/homes/x86_64-linux/kylekrein/niri/niri.nix @@ -61,7 +61,7 @@ in binds = with config.lib.niri.actions; let sh = spawn "sh" "-c"; emacs = action: sh "emacsclient -c --eval \"${action}\""; - screenshot-annotate = sh ''${lib.getExe pkgs.grim} -g "$(${lib.getExe pkgs.slurp} -w 0)" -t ppm - | ${lib.getExe pkgs.satty} --early-exit --copy-command 'wl-copy' --filename '~/Pictures/Screenshots/Screenshot-%Y-%m-%d_%H:%M:%S.png' --initial-tool brush''; + screenshot-annotate = sh ''${lib.getExe pkgs.grim} -g "$(${lib.getExe pkgs.slurp} -w 0)" -t ppm - | ${lib.getExe pkgs.satty} --early-exit --copy-command 'wl-copy' --filename='-' -o '~/Pictures/Screenshots/Screenshot-%Y-%m-%d_%H:%M:%S.png' --initial-tool brush''; in { "Mod+E".action = sh "emacsclient -c"; "Mod+Shift+C".action = sh "nautilus"; diff --git a/homes/x86_64-linux/kylekrein/niri/theme.nix b/homes/x86_64-linux/kylekrein/niri/theme.nix index fe5ff62..e409db3 100644 --- a/homes/x86_64-linux/kylekrein/niri/theme.nix +++ b/homes/x86_64-linux/kylekrein/niri/theme.nix @@ -19,7 +19,7 @@ in programs.niri = { settings = { - cursor.theme = "Nordic-cursors"; + cursor.theme = "Nordic-cursors"; }; }; } diff --git a/modules/nixos/impermanence/default.nix b/modules/nixos/impermanence/default.nix index 3f060fa..ad2e4be 100644 --- a/modules/nixos/impermanence/default.nix +++ b/modules/nixos/impermanence/default.nix @@ -42,7 +42,7 @@ in { "/var/lib/flatpak" "/var/lib/zerotier-one" "/var/lib/systemd/coredump" - "/var/lib/systemd/timers" + "/var/lib/systemd/timers" "/var/lib/acme" "/var/lib/upower" "/var/lib/power-profiles-daemon" diff --git a/packages/lisgd-kylekrein/lisgd-config.h b/packages/lisgd-kylekrein/lisgd-config.h index 1df3498..4eb93c7 100644 --- a/packages/lisgd-kylekrein/lisgd-config.h +++ b/packages/lisgd-kylekrein/lisgd-config.h @@ -52,7 +52,7 @@ Gesture gestures[] = { {3, SwipeUD, EdgeTop, DistanceLong, ActModeReleased, "systemctl --user restart desktop-shell.service"}, {2, SwipeUD, EdgeTop, DistanceLong, ActModeReleased, - "grim -g \"$(slurp -w 0)\" -t ppm - | satty --early-exit --copy-command 'wl-copy' --filename '~/Pictures/Screenshots/Screenshot-%Y-%m-%d_%H:%M:%S.png' --initial-tool brush"}, + "grim -g \"$(slurp -w 0)\" -t ppm - | satty --early-exit --copy-command 'wl-copy' --filename='-' -o '~/Pictures/Screenshots/Screenshot-%Y-%m-%d_%H:%M:%S.png' --initial-tool brush"}, //{2, SwipeUD, EdgeBottom, DistanceAny, ActModeReleased, //"pkill -9 -f wvkbd-mobintl"}, {3, SwipeDU, EdgeAny, DistanceAny, ActModeReleased, diff --git a/systems/x86_64-linux/stargate/default.nix b/systems/x86_64-linux/stargate/default.nix new file mode 100644 index 0000000..3e5aad7 --- /dev/null +++ b/systems/x86_64-linux/stargate/default.nix @@ -0,0 +1,35 @@ +{ + lib, + pkgs, + inputs, + namespace, + system, + target, + format, + virtual, + systems, + config, + ... +}: +with lib; +with lib.custom; { + facter.reportPath = ./facter.json; + imports = lib.snowfall.fs.get-nix-files ./.; + systemd.network.wait-online.enable = lib.mkForce false; #facter + + custom.presets.disko.impermanenceBtrfsLuks = { + enable = true; + swapSize = 16; + }; + custom.hardware.secureBoot = enabled; + custom.impermanence = enabled; + + custom.users.kylekrein = { + enable = true; + config = {}; + }; + networking.firewall.allowedTCPPorts = [80 443 22]; + # ======================== DO NOT CHANGE THIS ======================== + system.stateVersion = "25.05"; + # ======================== DO NOT CHANGE THIS ======================== +} diff --git a/systems/x86_64-linux/stargate/disko.nix b/systems/x86_64-linux/stargate/disko.nix new file mode 100644 index 0000000..3510ca1 --- /dev/null +++ b/systems/x86_64-linux/stargate/disko.nix @@ -0,0 +1,70 @@ +{lib, ...}: let + addHdd = device: name: { + type = "disk"; + inherit device; + content = { + type = "gpt"; + partitions = { + luks = { + size = "100%"; + label = "luks"; + content = { + type = "luks"; + inherit name; + extraOpenArgs = [ + "--allow-discards" + "--perf-no_read_workqueue" + "--perf-no_write_workqueue" + ]; + # https://0pointer.net/blog/unlocking-luks2-volumes-with-tpm2-fido2-pkcs11-security-hardware-on-systemd-248.html + settings = {crypttabExtraOpts = ["fido2-device=auto" "token-timeout=10"];}; + content = { + type = "zfs"; + pool = "zstorage"; + }; + }; + }; + }; + }; + }; +in { + disko.devices = { + disk = { + hdd1 = addHdd "/dev/sda" "crypt-hdd1"; + hdd2 = addHdd "/dev/sdb" "crypt-hdd2"; + hdd3 = addHdd "/dev/sdc" "crypt-hdd3"; + hdd4 = addHdd "/dev/sdd" "crypt-hdd4"; + }; + zpool = { + zstorage = { + type = "zpool"; + mode = "raidz2"; + rootFsOptions = { + mountpoint = "none"; + compression = "zstd"; + acltype = "posixacl"; + xattr = "sa"; + "com.sun:auto-snapshot" = "true"; + }; + options.ashift = "12"; + datasets = { + "services" = { + type = "zfs_fs"; + mountpoint = "/var/lib"; + options."com.sun:auto-snapshot" = "true"; + }; + "backups" = { + type = "zfs_fs"; + mountpoint = "/backups"; + options."com.sun:auto-snapshot" = "true"; + }; + "media" = { + type = "zfs_fs"; + mountpoint = "/media"; + options."com.sun:auto-snapshot" = "true"; + }; + }; + }; + }; + }; +} diff --git a/systems/x86_64-linux/stargate/services/default.nix b/systems/x86_64-linux/stargate/services/default.nix new file mode 100644 index 0000000..11347cb --- /dev/null +++ b/systems/x86_64-linux/stargate/services/default.nix @@ -0,0 +1,16 @@ +{ + lib, + pkgs, + inputs, + namespace, + system, + target, + format, + virtual, + systems, + config, + ... +}: +with lib; +with lib.custom; { +}