zoey/config
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

feat: switch to btrfs

Browse source
This commit is contained in:
zoey 2025-06-18 12:07:36 -04:00
parent 0ad695abcf
commit 90cbe489f6
Signed by: zoey
GPG key ID: 81FB9FECDD6A33E2
10 changed files with 154 additions and 163 deletions
Download patch file Download diff file Expand all files Collapse all files

164
flake.lock generated
View file

@ -139,11 +139,11 @@
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1750013871, "lastModified": 1750153510,
"narHash": "sha256-UQx3rC3QDjD/sIen51+5Juk1rqN3y/sTeMY1WinmhqQ=", "narHash": "sha256-NYHXXJZ9m4fJpKk9tKn/EExX87SqcBcRINOGF7hKRLI=",
"owner": "catppuccin", "owner": "catppuccin",
"repo": "nix", "repo": "nix",
"rev": "fe78fa558d6603481c03eb03a946eadb970d1801", "rev": "4e95eaf8a351956d75cc400318579967ca2b6d0f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -258,11 +258,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1749436314, "lastModified": 1750040002,
"narHash": "sha256-CqmqU5FRg5AadtIkxwu8ulDSOSoIisUMZRLlcED3Q5w=", "narHash": "sha256-KrC9iOVYIn6ukpVlHbqSA4hYCZ6oDyJKrcLqv4c5v84=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "dfa4d1b9c39c0342ef133795127a3af14598017a", "rev": "7f1857b31522062a6a00f88cbccf86b43acceed1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -277,11 +277,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1750007756, "lastModified": 1750152107,
"narHash": "sha256-ubcXh/a2YWJlsnW2XomABgRzBuIRigz3YwHzB5WBTfM=", "narHash": "sha256-EtSUmvOKU7mfocPNsBSmgjOcqPBKWshSN/jsxmHZqfI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "c545e874be1fa5453ad4f365e90e9b3dcf6f81ee", "rev": "cff16fc129c76889ddfb0ebb17b53b6633c77ba5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -827,11 +827,11 @@
"zon2nix": "zon2nix" "zon2nix": "zon2nix"
}, },
"locked": { "locked": {
"lastModified": 1749999431, "lastModified": 1750168134,
"narHash": "sha256-NYeQIpFu4gHrEo+gcvTgBvLyIQnUDgeiMNTtJDHUl+c=", "narHash": "sha256-4+cF1IH67WNb5IhnEMSDSOl8cTP7yqTA7G0zK0ckxl8=",
"owner": "ghostty-org", "owner": "ghostty-org",
"repo": "ghostty", "repo": "ghostty",
"rev": "b46673e63151f495c973d3043bf20612f80deda0", "rev": "f794693bdc161efc18942bbc5cd26cc3b7b71336",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1048,11 +1048,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1749999552, "lastModified": 1750127463,
"narHash": "sha256-iCUuEq9qXUh8L1c2bRyCayAqfuUEs9nGAUlXv2RcoF8=", "narHash": "sha256-K2xFtlD3PcKAZriOE3LaBLYmVfGQu+rIF4Jr1RFYR0Q=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "04672588c61aebd18c0d0ada66dd7bb4d8edab0d", "rev": "28eef8722d1af18ca13e687dbf485e1c653a0402",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1181,11 +1181,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1750022037, "lastModified": 1750106438,
"narHash": "sha256-VGH144n/mkDn97qECPyaiVNo2Ga8ARBSyJKR0jbZoIw=", "narHash": "sha256-hJKE++mkJU3Ux5fMo5xi3TACrt7gujHRrQVDNpfrsVQ=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "bd5703d5c6f09e07321de58b19da438ac715b668", "rev": "0ece4af36a988ad06b28ed666011d84372d9e4dc",
"revCount": 6194, "revCount": 6198,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland" "url": "https://github.com/hyprwm/Hyprland"
@ -1610,11 +1610,11 @@
"nixpkgs-25_05": "nixpkgs-25_05" "nixpkgs-25_05": "nixpkgs-25_05"
}, },
"locked": { "locked": {
"lastModified": 1749959313, "lastModified": 1750052062,
"narHash": "sha256-4ACYwiWQgx/MUVqon4/7hRwGgs4budZeupwLQ5eJ+KY=", "narHash": "sha256-sRiACsZZgKfm5zqz/2Kzd/R7MsldTI2FlxYGhBUD4pY=",
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"rev": "67b0a7e946861d8e3b3f3930b73625f7e2fec0e2", "rev": "7405122ddeefa690b9fa6f25a23195ba57f5f599",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -1634,11 +1634,11 @@
"treefmt-nix": "treefmt-nix_2" "treefmt-nix": "treefmt-nix_2"
}, },
"locked": { "locked": {
"lastModified": 1749968275, "lastModified": 1750119416,
"narHash": "sha256-PXVWCsdJwHnveLuhFoH4sIMEVtKEt8rviGqrMGZ3GWs=", "narHash": "sha256-wGa5HXzU9lK4Q7ODv8/n5oY/QbIl8R2wUyDxcLsV3B4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "e2f2d0bf44d32dba49004ae974a9e93812d3b11b", "rev": "5b231a9c0efd15547569bd753dbec420b90c8c98",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1650,11 +1650,11 @@
"neovim-src": { "neovim-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1749937343, "lastModified": 1750116292,
"narHash": "sha256-UWQpnJ46TMdnB4TUFuYZ3qhZaIttXYuGuWnn+MdpRQU=", "narHash": "sha256-JTG1BFIIKmFfuT+sIhwrphAIjREgV4FfRcyuztr89P0=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "0d658660c29e920e74c4dade3819d80dccad0dde", "rev": "3e984cf02bdcebe2d4f31792505b6a3784fd1b1b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1673,11 +1673,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1749991461, "lastModified": 1750146866,
"narHash": "sha256-6wXRZuUe5JmIVLiyP0NQ+2Rv4TOITtUxnhKhAvT6ep8=", "narHash": "sha256-Eu3/uTRnenjCJUY76T3zDWiUtIGG+RMQoDu1QdIU8AI=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "3f3f1573fcd823a45c7fbb21110fdadb9563fa27", "rev": "e2401ec11b2ed71337931aa1123faf469c4df327",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1695,11 +1695,11 @@
"rust-overlay": "rust-overlay_3" "rust-overlay": "rust-overlay_3"
}, },
"locked": { "locked": {
"lastModified": 1749797708, "lastModified": 1750142220,
"narHash": "sha256-P5x0U6AW5Zn20bARv4D83d8XlNaWK1st9QwBfSe+Vfg=", "narHash": "sha256-5gUJXh0/mm1YIsLhWgaGitUtGsQvrYRsT4zmGmRHn9M=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "f3f6e79eeca8924ff9cfea4b30006e5b782bc93e", "rev": "e53f8527b0517cf965961ae729b7dd631ed76db5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1711,16 +1711,16 @@
"niri-stable": { "niri-stable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1740117926, "lastModified": 1748151941,
"narHash": "sha256-mTTHA0RAaQcdYe+9A3Jx77cmmyLFHmRoZdd8RpWa+m8=", "narHash": "sha256-z4viQZLgC2bIJ3VrzQnR+q2F3gAOEQpU1H5xHtX/2fs=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "b94a5db8790339cf9134873d8b490be69e02ac71", "rev": "8ba57fcf25d2fc9565131684a839d58703f1dae7",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "YaLTeR", "owner": "YaLTeR",
"ref": "v25.02", "ref": "v25.05.1",
"repo": "niri", "repo": "niri",
"type": "github" "type": "github"
} }
@ -1728,11 +1728,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1749797708, "lastModified": 1750142220,
"narHash": "sha256-P5x0U6AW5Zn20bARv4D83d8XlNaWK1st9QwBfSe+Vfg=", "narHash": "sha256-5gUJXh0/mm1YIsLhWgaGitUtGsQvrYRsT4zmGmRHn9M=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "f3f6e79eeca8924ff9cfea4b30006e5b782bc93e", "rev": "e53f8527b0517cf965961ae729b7dd631ed76db5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1836,11 +1836,11 @@
}, },
"nixos-stable": { "nixos-stable": {
"locked": { "locked": {
"lastModified": 1749834526, "lastModified": 1749995256,
"narHash": "sha256-izgPGLeUeFB9loC+n2X6TO2n8pOGvVcR3jKqxTGOwgc=", "narHash": "sha256-LEGfcombb0otUf23oAmYCXR4+lMQKa49XmU0G5HItGI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "db8414903dd6b3042e1ac471eafc18ca4ccb54a4", "rev": "daa45f10955cc2207ac9c5f0206774d2f757c162",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1852,16 +1852,18 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1749794982, "lastModified": 1750134718,
"narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "owner": "nixos",
"type": "indirect" "ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
} }
}, },
"nixpkgs-25_05": { "nixpkgs-25_05": {
@ -1933,11 +1935,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1749834526, "lastModified": 1749995256,
"narHash": "sha256-izgPGLeUeFB9loC+n2X6TO2n8pOGvVcR3jKqxTGOwgc=", "narHash": "sha256-LEGfcombb0otUf23oAmYCXR4+lMQKa49XmU0G5HItGI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "db8414903dd6b3042e1ac471eafc18ca4ccb54a4", "rev": "daa45f10955cc2207ac9c5f0206774d2f757c162",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1965,11 +1967,11 @@
}, },
"nixpkgs-stable_3": { "nixpkgs-stable_3": {
"locked": { "locked": {
"lastModified": 1749857119, "lastModified": 1750005367,
"narHash": "sha256-tG5xUn3hFaPpAHYIvr2F88b+ovcIO5k1HqajFy7ZFPM=", "narHash": "sha256-h/aac1dGLhS3qpaD2aZt25NdKY7b+JT0ZIP2WuGsJMU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5f4f306bea96741f1588ea4f450b2a2e29f42b98", "rev": "6c64dabd3aa85e0c02ef1cdcb6e1213de64baee3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2029,11 +2031,11 @@
}, },
"nixpkgs_13": { "nixpkgs_13": {
"locked": { "locked": {
"lastModified": 1749871736, "lastModified": 1749903597,
"narHash": "sha256-K9yBph93OLTNw02Q6e9CYFGrUhvEXnh45vrZqIRWfvQ=", "narHash": "sha256-jp0D4vzBcRKwNZwfY4BcWHemLGUs4JrS3X9w5k/JYDA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6afe187897bef7933475e6af374c893f4c84a293", "rev": "41da1e3ea8e23e094e5e3eeb1e6b830468a7399e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2471,11 +2473,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1749982371, "lastModified": 1750053656,
"narHash": "sha256-+lrgH2+Hwmoo13DvztAj6D+a4kiTl08LFFzpXcnPHAw=", "narHash": "sha256-RLICfwDvIEFtLc3GrVsPu46sdGLlPe3ULGz4gSgLxCA=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "d9164578a2fc4f0721aaf61c2af8bc6c5cdb11b4", "rev": "9a3033340529881ae5e564d1aedf6884f53e3ea1",
"revCount": 581, "revCount": 582,
"type": "git", "type": "git",
"url": "https://git.outfoxxed.me/outfoxxed/quickshell" "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
}, },
@ -2513,11 +2515,11 @@
"systems": "systems_15" "systems": "systems_15"
}, },
"locked": { "locked": {
"lastModified": 1749997335, "lastModified": 1750169389,
"narHash": "sha256-doeCv2CvZwmt4Zrk7H7zryTlmMWfmW1URDWrTuAn8f0=", "narHash": "sha256-wl0+V2s355Pq6/HNZxCWsxPbH4s8Vj2K6d4C/zCxiZo=",
"owner": "raphamorim", "owner": "raphamorim",
"repo": "rio", "repo": "rio",
"rev": "8eba9cb7b246c378c3d10f76da65b8175202621a", "rev": "1a94ff5d1637e22aaffeb50977d81b0de25bc8cc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2676,11 +2678,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1749955444, "lastModified": 1750127910,
"narHash": "sha256-CllTHvHX8KAdAZ+Lxzd23AmZTxO1Pfy+zC43/5tYkAE=", "narHash": "sha256-FIgEIS0RAlOyXGqoj/OufTfcKItYq668yPYL4SXdU0M=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "539ba15741f0e6691a2448743dbc601d8910edce", "rev": "45418795a73b77b7726c62ce265d68cf541ffb49",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2763,11 +2765,11 @@
"nixpkgs": "nixpkgs_20" "nixpkgs": "nixpkgs_20"
}, },
"locked": { "locked": {
"lastModified": 1749592509, "lastModified": 1750119275,
"narHash": "sha256-VunQzfZFA+Y6x3wYi2UE4DEQ8qKoAZZCnZPUlSoqC+A=", "narHash": "sha256-Rr7Pooz9zQbhdVxux16h7URa6mA80Pb/G07T4lHvh0M=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "50754dfaa0e24e313c626900d44ef431f3210138", "rev": "77c423a03b9b2b79709ea2cb63336312e78b72e2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -3173,11 +3175,11 @@
}, },
"locked": { "locked": {
"dir": "packaging/nix", "dir": "packaging/nix",
"lastModified": 1749871705, "lastModified": 1750119474,
"narHash": "sha256-h8MqN18V27ZYsWnrDyNioGSMgXCeXqfwqK4jvwdTXkc=", "narHash": "sha256-Xx7KHIUjCBsUhFPsxtcZ3+j6GZdlTP+akd0Aj5xs2IA=",
"owner": "Open-Wine-Components", "owner": "Open-Wine-Components",
"repo": "umu-launcher", "repo": "umu-launcher",
"rev": "5194507371d76025ffbd9199b833dcc55324e372", "rev": "42f553b2ed8e6c786a10ce05e111f436349af8f4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -3289,16 +3291,16 @@
"xwayland-satellite-stable": { "xwayland-satellite-stable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1739246919, "lastModified": 1748488455,
"narHash": "sha256-/hBM43/Gd0/tW+egrhlWgOIISeJxEs2uAOIYVpfDKeU=", "narHash": "sha256-IiLr1alzKFIy5tGGpDlabQbe6LV1c9ABvkH6T5WmyRI=",
"owner": "Supreeeme", "owner": "Supreeeme",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"rev": "44590a416d4a3e8220e19e29e0b6efe64a80315d", "rev": "3ba30b149f9eb2bbf42cf4758d2158ca8cceef73",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "Supreeeme", "owner": "Supreeeme",
"ref": "v0.5.1", "ref": "v0.6",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"type": "github" "type": "github"
} }
@ -3325,11 +3327,11 @@
"nixpkgs": "nixpkgs_23" "nixpkgs": "nixpkgs_23"
}, },
"locked": { "locked": {
"lastModified": 1749991041, "lastModified": 1750152169,
"narHash": "sha256-+jss4bkSbzURttaspRke/LVtrthBRDoafJmn/xem5f0=", "narHash": "sha256-XN5OBCCXKmPBL+UXyyScI5HGgs4U8OFGQTnKuxurBFI=",
"owner": "0xc000022070", "owner": "0xc000022070",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "ff841ca63c73796117f298c730d9f1dc2b18e7e7", "rev": "ed811ab0d0b407b59cda1023820e9986fd28c8c3",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
homes/x86_64-linux/zoey@earth/default.nix
View file

@ -7,7 +7,7 @@
... ...
}: { }: {
wms.hyprland.enable = false; wms.hyprland.enable = false;
wms.niri.enable = false; wms.niri.enable = true;
apps = { apps = {
web.librewolf.enable = true; web.librewolf.enable = true;
web.zen.setDefault = true; web.zen.setDefault = true;
@ -261,7 +261,7 @@
options = ["--cmd cd"]; options = ["--cmd cd"];
}; };
services.quickshell.enable = true; services.quickshell.enable = false;
home.file.".mozilla/native-messaging-hosts/gpgmejson.json".text = builtins.toJSON { home.file.".mozilla/native-messaging-hosts/gpgmejson.json".text = builtins.toJSON {
name = "gpgmejson"; name = "gpgmejson";

BIN
lib/theme/bg.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 10 MiB

2
lib/theme/default.nix
View file

@ -211,7 +211,7 @@ in {
}; };
}; };
wallpaper = ./svema_26_big.jpg; wallpaper = ./bg.png;
lerpColor = lerpColorFunc; lerpColor = lerpColorFunc;
} }

2
modules/home/apps/term/kitty/default.nix
View file

@ -31,7 +31,7 @@ in {
settings = { settings = {
window_padding_width = 20; window_padding_width = 20;
background_opacity = "0.9"; # background_opacity = "0.9";
background = colors.crust.hex; background = colors.crust.hex;
foreground = colors.text.hex; foreground = colors.text.hex;

6
modules/nixos/protocols/wayland/default.nix
View file

@ -21,8 +21,8 @@ in {
enable = true; enable = true;
settings = { settings = {
default_session = { default_session = {
command = "${tuigreet} --time --remember --remember-session"; command = "niri-session";
user = "greeter"; user = "zoey";
}; };
}; };
}; };
@ -54,7 +54,7 @@ in {
programs.hyprland = { programs.hyprland = {
withUWSM = true; withUWSM = true;
enable = true; enable = false;
xwayland.enable = true; xwayland.enable = true;
package = inputs.hyprland.packages.${pkgs.system}.hyprland; package = inputs.hyprland.packages.${pkgs.system}.hyprland;
portalPackage = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland; portalPackage = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland;

1
modules/nixos/services/mail/default.nix
View file

@ -66,6 +66,7 @@ in {
certificateScheme = "acme-nginx"; certificateScheme = "acme-nginx";
virusScanning = true; virusScanning = true;
stateVersion = 1;
}; };
# services.nginx = { # services.nginx = {

3
req.json Normal file
View file

@ -0,0 +1,3 @@
{
"language": "en_us"
}

26
systems/x86_64-linux/earth/default.nix
View file

@ -25,6 +25,31 @@
options = "--delete-older-than 1d"; options = "--delete-older-than 1d";
}; };
boot.initrd.postResumeCommands = lib.mkAfter ''
mkdir /btrfs_tmp
mount /dev/root_vg/root /btrfs_tmp
if [[ -e /btrfs_tmp/root ]]; then
mkdir -p /btrfs_tmp/old_roots
timestamp=$(date --date="@$(stat -c %Y /btrfs_tmp/root)" "+%Y-%m-%-d_%H:%M:%S")
mv /btrfs_tmp/root "/btrfs_tmp/old_roots/$timestamp"
fi
delete_subvolume_recursively() {
IFS=$'\n'
for i in $(btrfs subvolume list -o "$1" | cut -f 9- -d ' '); do
delete_subvolume_recursively "/btrfs_tmp/$i"
done
btrfs subvolume delete "$1"
}
for i in $(find /btrfs_tmp/old_roots/ -maxdepth 1 -mtime +30); do
delete_subvolume_recursively "$i"
done
btrfs subvolume create /btrfs_tmp/root
umount /btrfs_tmp
'';
hardware.audio.enable = true; hardware.audio.enable = true;
hardware.nvidia.enable = true; hardware.nvidia.enable = true;
hardware.keyboard.qmk.enable = true; hardware.keyboard.qmk.enable = true;
@ -209,6 +234,7 @@
pkgs.winetricks pkgs.winetricks
]; ];
}) })
pkgs.vulkan-hdr-layer-kwin6
pkgs.bottles pkgs.bottles
pkgs.file-roller pkgs.file-roller
pkgs.podman-tui pkgs.podman-tui

103
systems/x86_64-linux/earth/disk-config.nix
View file

@ -17,11 +17,31 @@
mountOptions = ["umask=0077" "nofail"]; mountOptions = ["umask=0077" "nofail"];
}; };
}; };
zfs = { root = {
name = "root";
size = "100%"; size = "100%";
content = { content = {
type = "zfs"; type = "btrfs";
pool = "zroot"; extraArgs = ["-f"];
subvolumes = {
"/rootfs" = {
mountpoint = "/";
};
"/home" = {
mountOptions = ["compress=zstd"];
mountpoint = "/home";
};
"/home/zoey" = {};
"/nix" = {
mountOptions = [
"compress=zstd"
];
mountpoint = "/nix";
};
};
}; };
}; };
}; };
@ -36,80 +56,19 @@
zbk = { zbk = {
size = "100%"; size = "100%";
content = { content = {
type = "zfs"; type = "btrfs";
pool = "zbk"; extraArgs = ["-f"];
}; subvolumes = {
}; "/mnt/zbk" = {
}; mountOptions = [
}; "compress=zstd"
}; "noatime"
}; ];
zpool = {
zbk = {
type = "zpool";
rootFsOptions = {
acltype = "posixacl";
atime = "off";
compression = "zstd";
mountpoint = "none";
xattr = "sa";
autotrim = "on";
};
options.ashift = "12";
datasets = {
"zbk" = {
type = "zfs_fs";
options.mountpoint = "none";
};
"zbk/zbk" = {
type = "zfs_fs";
mountpoint = "/mnt/zbk"; mountpoint = "/mnt/zbk";
options."sharesmb" = "on";
# Used by services.zfs.autoSnapshot options.
options."com.sun:auto-snapshot" = "true";
}; };
}; };
}; };
zroot = {
type = "zpool";
rootFsOptions = {
# https://wiki.archlinux.org/title/Install_Arch_Linux_on_ZFS
acltype = "posixacl";
atime = "off";
compression = "zstd";
mountpoint = "none";
xattr = "sa";
autotrim = "on";
}; };
options.ashift = "12";
datasets = {
"local" = {
type = "zfs_fs";
options.mountpoint = "none";
};
"local/home" = {
type = "zfs_fs";
mountpoint = "/home";
# Used by services.zfs.autoSnapshot options.
options."com.sun:auto-snapshot" = "true";
};
"local/nix" = {
type = "zfs_fs";
mountpoint = "/nix";
options."com.sun:auto-snapshot" = "false";
};
"local/persist" = {
type = "zfs_fs";
mountpoint = "/persist";
options."com.sun:auto-snapshot" = "false";
};
"local/root" = {
type = "zfs_fs";
mountpoint = "/";
options."com.sun:auto-snapshot" = "false";
postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot/local/root@blank$' || zfs snapshot zroot/local/root@blank";
}; };
}; };
}; };