diff --git a/flake.lock b/flake.lock index 3a87a7f..890bcd5 100644 --- a/flake.lock +++ b/flake.lock @@ -43,16 +43,17 @@ "base16-fish": { "flake": false, "locked": { - "lastModified": 1622559957, - "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=", + "lastModified": 1754405784, + "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=", "owner": "tomyun", "repo": "base16-fish", - "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe", + "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", "type": "github" }, "original": { "owner": "tomyun", "repo": "base16-fish", + "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", "type": "github" } }, @@ -98,11 +99,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1759532138, - "narHash": "sha256-sLQIlgDwMP3mEY2PwjGW+cL56QQ2n2WXoZ3GpG5QWOY=", + "lastModified": 1760747305, + "narHash": "sha256-SsuuyaFp4TbJ+ofti9EXot9gIOk4vZqccat/zERVQN4=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "bad02bbca5b5c6d45539a0d740ad0e21b1ba9afc", + "rev": "9838e14b30857ac0a50dbe98a5ba2233d6ccb2de", "type": "github" }, "original": { @@ -134,11 +135,11 @@ ] }, "locked": { - "lastModified": 1758287904, - "narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=", + "lastModified": 1760701190, + "narHash": "sha256-y7UhnWlER8r776JsySqsbTUh2Txf7K30smfHlqdaIQw=", "owner": "nix-community", "repo": "disko", - "rev": "67ff9807dd148e704baadbd4fd783b54282ca627", + "rev": "3a9450b26e69dcb6f8de6e2b07b3fc1c288d85f5", "type": "github" }, "original": { @@ -372,11 +373,11 @@ ] }, "locked": { - "lastModified": 1759337100, - "narHash": "sha256-CcT3QvZ74NGfM+lSOILcCEeU+SnqXRvl1XCRHenZ0Us=", + "lastModified": 1760662441, + "narHash": "sha256-mlDqR1Ntgs9uYYEAUR1IhamKBO0lxoNS4zGLzEZaY0A=", "owner": "nix-community", "repo": "home-manager", - "rev": "004753ae6b04c4b18aa07192c1106800aaacf6c3", + "rev": "722792af097dff5790f1a66d271a47759f477755", "type": "github" }, "original": { @@ -392,11 +393,11 @@ ] }, "locked": { - "lastModified": 1759573136, - "narHash": "sha256-ILSPD0Dm8p0w0fCVzOx98ZH8yFDrR75GmwmH3fS2VnE=", + "lastModified": 1760929667, + "narHash": "sha256-nZh6uvc71nVNaf/y+wesnjwsmJ6IZZUnP2EzpZe48To=", "owner": "nix-community", "repo": "home-manager", - "rev": "5f06ceafc6c9b773a776b9195c3f47bbe1defa43", + "rev": "189c21cf879669008ccf06e78a553f17e88d8ef0", "type": "github" }, "original": { @@ -414,11 +415,11 @@ ] }, "locked": { - "lastModified": 1759387127, - "narHash": "sha256-uuwJAP92SkHmnI1zo7rrK/gEuHtb97vFZcMa5w+0SZA=", + "lastModified": 1760534924, + "narHash": "sha256-OIOCC86DxTxp1VG7xAiM+YABtVqp6vTkYIoAiGQMqso=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "0cc290e05882745060fccfe6d7d073f913e0cce7", + "rev": "100b4e000032b865563a9754e5bca189bc544764", "type": "github" }, "original": { @@ -497,11 +498,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1759570525, - "narHash": "sha256-wQbq5QgzlG10u3TzZDEMjyQdOs8tVyMjKsdks+WKmZQ=", + "lastModified": 1760950171, + "narHash": "sha256-E2ySTu/oK7cYBdAI3tlGP9zVjF4mZgWJ1OZInBCMb00=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "069c3908df7e6caf4eae0eaeba9c1a70ec32ca27", + "rev": "f851a923137c0a54719412146fd63d24b3214e60", "type": "github" }, "original": { @@ -530,11 +531,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1759395653, - "narHash": "sha256-sv9J1z6CrTPf9lRJLyCN90fZVdQz7LFeX7pIlInH8BQ=", + "lastModified": 1760940149, + "narHash": "sha256-KbM47vD6E0cx+v4jYQZ8mD5N186AKm2CQlyh34TW58U=", "owner": "YaLTeR", "repo": "niri", - "rev": "ba6e5e082a79901dc89b0d49c5da1b769d652aec", + "rev": "b3245b81a6ed8edfaf5388a74d2e0a23c24941e5", "type": "github" }, "original": { @@ -600,11 +601,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1759609888, - "narHash": "sha256-Fyfuckv15VQOhYTOn9MEDd0UOZ//XUN/Ztp6bC7Mero=", + "lastModified": 1760959718, + "narHash": "sha256-BHneo3Wb4Zg6jDgsLwfsklCR6we8HDrS3dMHmYk7kKY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eef3d81c5755cfeeb610dabe32df0ef68130979d", + "rev": "4fb2921e644ef2e3c84365336f632cae3af4ce0b", "type": "github" }, "original": { @@ -616,11 +617,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1759439645, - "narHash": "sha256-oiAyQaRilPk525Z5aTtTNWNzSrcdJ7IXM0/PL3CGlbI=", + "lastModified": 1760862643, + "narHash": "sha256-PXwG0TM7Ek87DNx4LbGWuD93PbFeKAJs4FfALtp7Wo0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "879bd460b3d3e8571354ce172128fbcbac1ed633", + "rev": "33c6dca0c0cb31d6addcd34e90a63ad61826b28c", "type": "github" }, "original": { @@ -632,11 +633,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1759439645, - "narHash": "sha256-oiAyQaRilPk525Z5aTtTNWNzSrcdJ7IXM0/PL3CGlbI=", + "lastModified": 1760862643, + "narHash": "sha256-PXwG0TM7Ek87DNx4LbGWuD93PbFeKAJs4FfALtp7Wo0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "879bd460b3d3e8571354ce172128fbcbac1ed633", + "rev": "33c6dca0c0cb31d6addcd34e90a63ad61826b28c", "type": "github" }, "original": { @@ -648,11 +649,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1759147044, - "narHash": "sha256-3ZPFytJOcLjTChljeaGgoaNj+tOqzgEpqZAvRe3bU90=", + "lastModified": 1760703608, + "narHash": "sha256-MMIIShabm9KnYTmm0WbJ2h+jxI86gfE7NcByVOaBNNU=", "owner": "PedroHLC", "repo": "nixpkgs", - "rev": "18e83bbe13aa50992777832b52bd0e0d8585fb3b", + "rev": "95d8e5f411dc2fcc7f73a72766aaabfab1a1c456", "type": "github" }, "original": { @@ -680,11 +681,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1759381078, - "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", + "lastModified": 1760878510, + "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", + "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67", "type": "github" }, "original": { @@ -696,11 +697,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1759381078, - "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", + "lastModified": 1760878510, + "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", + "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67", "type": "github" }, "original": { @@ -716,11 +717,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1759610174, - "narHash": "sha256-dDLcJ7wZHJlmkUEobEVAm3GwDh2wt29W+cbRVDC9+Ig=", + "lastModified": 1760957406, + "narHash": "sha256-RbkddCl9zGR2Qokm1XaVy1rx/Thtlt844nrJQexbMpc=", "owner": "nix-community", "repo": "NUR", - "rev": "8ee29d1a8b173400433e46c9db4cd0bcbfc18965", + "rev": "002670169373b0e35a4adb92f02ed2a7edd09ac4", "type": "github" }, "original": { @@ -765,11 +766,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1759512048, - "narHash": "sha256-rEfJ6jyHvjpOyK5oA3rNFN4j/RPMKD2P0RnT0HzUNMc=", + "lastModified": 1760781693, + "narHash": "sha256-kNLWWt/FXqDpPZdmNYCTeeUBYZM0RV0UL7+Cg3CvQMI=", "owner": "notashelf", "repo": "nvf", - "rev": "dde524f7cc4b9e56cf45223a23e1b598f68848d7", + "rev": "ea3ee477fa1814352b30d114f31bf4895eed053e", "type": "github" }, "original": { @@ -874,11 +875,11 @@ ] }, "locked": { - "lastModified": 1759458749, - "narHash": "sha256-WKnbJnm1B2+TO2ZUudgS39EzecQeLl4/bnRtd3y46LI=", + "lastModified": 1760668505, + "narHash": "sha256-Ed0cGwPZtLRiSvMx4KgPx8bhLYzn5jiJ7s5o5vj4oG0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "bbc3a8ae797d1700e57a4f4bcc4e79af727d4138", + "rev": "18234d2c11b10eaec9ccc3a1089a5ea872ec8858", "type": "github" }, "original": { @@ -971,11 +972,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1759595578, - "narHash": "sha256-cYPdsYgZFyvpMbRg9Nbtt3JtcdjE80gXfe/65T1ELco=", + "lastModified": 1760472212, + "narHash": "sha256-4C3I/ssFsq8EgaUmZP0xv5V7RV0oCHgL/Rx+MUkuE+E=", "owner": "nix-community", "repo": "stylix", - "rev": "503d989626aa41174b3a51f18528547da1afe572", + "rev": "8d008296a1b3be9b57ad570f7acea00dd2fc92db", "type": "github" }, "original": { @@ -1115,11 +1116,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1759449168, - "narHash": "sha256-Ka18wfIaNvTN9sr+PBie6P83959Om4j5P62M4RwNeoY=", + "lastModified": 1759707084, + "narHash": "sha256-0pkftKs6/LReNvxw7DVTN2AJEheZVgyeK0Aarbagi70=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "da6693c88ab5edac2ec3c81730f112be67abe278", + "rev": "a9188e70bd748118b4d56a529871b9de5adb9988", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index d4f6669..26b9edd 100644 --- a/flake.nix +++ b/flake.nix @@ -145,7 +145,6 @@ modules = genericModules ++ [ inputs.disko.nixosModules.disko inputs.satisfactory-server.nixosModules.satisfactory - inputs.niri.nixosModules.niri ./hosts/biggerpi/configuration.nix ./modules/satisfactory-server.nix ]; @@ -156,6 +155,7 @@ inherit pkgs; extraSpecialArgs = { inherit inputs; + niri = inputs.niri; }; # Import home-manager modules here modules = [ diff --git a/home-manager/niri.nix b/home-manager/niri.nix index 8f6114f..4e61e97 100644 --- a/home-manager/niri.nix +++ b/home-manager/niri.nix @@ -1,7 +1,8 @@ -{ pkgs, config, lib, ... }: { +{ pkgs, config, lib, niri, ... }: { + nixpkgs.overlays = [ niri.overlays.niri ]; programs.niri = { enable = true; - package = pkgs.niri; # follows nixpkgs version because i am lazy, probably more stable to use the flake one, TODO + package = pkgs.niri-unstable; # provided by the flake settings = { prefer-no-csd = true; # no client-side-decorations hotkey-overlay = { diff --git a/hosts/gabbielaptop/disko.nix b/hosts/gabbielaptop/disko.nix new file mode 100644 index 0000000..a7c9743 --- /dev/null +++ b/hosts/gabbielaptop/disko.nix @@ -0,0 +1,87 @@ +{ + disko.devices = { + disk = { + root = { + type = "disk"; + device = "/dev/sda"; + content = { + type = "gpt"; + partitions = { + ESP = { + size = "1G"; + type = "EF00"; + content = { + type = "filesystem"; + format = "vfat"; + mountpoint = "/boot"; + mountOptions = [ "nofail" ]; + }; + }; + zfs = { + size = "100%"; + content = { + type = "zfs"; + pool = "zroot"; + }; + }; + }; + }; + }; + }; + zpool = { + zroot = { + type = "zpool"; + rootFsOptions = { + mountpoint = "none"; + compression = "zstd"; + acltype = "posixacl"; + xattr = "sa"; + "com.sun:auto-snapshot" = "true"; + }; + options.ashift = "12"; + datasets = { + "root" = { + type = "zfs_fs"; + options = { + encryption = "aes-256-gcm"; + keyformat = "passphrase"; + #keylocation = "file:///tmp/secret.key"; + keylocation = "prompt"; + }; + mountpoint = "/"; + + }; + "root/nix" = { + type = "zfs_fs"; + options.mountpoint = "/nix"; + mountpoint = "/nix"; + }; + + "root/home" = { + type = "zfs_fs"; + options.mountpoint = "/home"; + mountpoint = "/home"; + }; + + # README MORE: https://wiki.archlinux.org/title/ZFS#Swap_volume + "root/swap" = { + type = "zfs_volume"; + size = "10M"; + content = { + type = "swap"; + }; + options = { + volblocksize = "4096"; + compression = "zle"; + logbias = "throughput"; + sync = "always"; + primarycache = "metadata"; + secondarycache = "none"; + "com.sun:auto-snapshot" = "false"; + }; + }; + }; + }; + }; + }; +}