diff --git a/flake.lock b/flake.lock index db8c9a5..c425ab5 100644 --- a/flake.lock +++ b/flake.lock @@ -139,11 +139,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1753176825, - "narHash": "sha256-a2SRRDqZJRBM1PsqyCS9mUjTVvf7DoOZHE9CCQpHV0Y=", + "lastModified": 1753471400, + "narHash": "sha256-HFoF82El1cjuiz5se+SeawMwWseUUtYBimq3Iu6G2D0=", "owner": "catppuccin", "repo": "nix", - "rev": "77508ef18131ba2c3c304dbdeacb945299a09d8d", + "rev": "bc6d2b7b57dd29389538f8c4465e408c07187404", "type": "github" }, "original": { @@ -161,11 +161,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1753152674, - "narHash": "sha256-01a6b+JM6yllIHwwGPa1rQcJ8LZtJbZN4LtGvhRsdpM=", + "lastModified": 1753636422, + "narHash": "sha256-ceRdWC7sUdO5moEz1ta/bmDMzv/0PP6bfiJRjsOmGwo=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "32629fb6bb48310024b5aff8fbec6f82738ef3c0", + "rev": "b7298823fe92a8667fbeb73a03ef0d6a85e387c5", "type": "github" }, "original": { @@ -174,7 +174,46 @@ "type": "github" } }, + "ciderd": { + "inputs": { + "crane": "crane", + "flake-parts": "flake-parts", + "nixpkgs": [ + "nixpkgs" + ], + "rust-overlay": "rust-overlay_2", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1753646135, + "narHash": "sha256-2u+EWR5ivcoGyfjvchoRoyiFdZMvia2uJv/W3JhNN88=", + "ref": "refs/heads/main", + "rev": "c12b4787ca1d99d5bcb2172a625c31c0ac306daa", + "revCount": 4, + "type": "git", + "url": "https://code.zoeys.cloud/zoey/ciderd" + }, + "original": { + "type": "git", + "url": "https://code.zoeys.cloud/zoey/ciderd" + } + }, "crane": { + "locked": { + "lastModified": 1753316655, + "narHash": "sha256-tzWa2kmTEN69OEMhxFy+J2oWSvZP5QhEgXp3TROOzl0=", + "owner": "ipetkov", + "repo": "crane", + "rev": "f35a3372d070c9e9ccb63ba7ce347f0634ddf3d2", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "crane_2": { "locked": { "lastModified": 1733016477, "narHash": "sha256-Hh0khbqBeCtiNS0SJgqdWrQDem9WlPEc2KF5pAY+st0=", @@ -189,7 +228,7 @@ "type": "github" } }, - "crane_2": { + "crane_3": { "inputs": { "nixpkgs": [ "lanzaboote", @@ -234,7 +273,7 @@ }, "darwin_2": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1751313918, @@ -272,15 +311,15 @@ }, "emacs-overlay": { "inputs": { - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_9", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1753175664, - "narHash": "sha256-QQcX9OM92bSVOLbVuGtnwD0z3HUMqciRIGruyFtO0pU=", + "lastModified": 1753636057, + "narHash": "sha256-JvPCxlERHVuqXg+ekcTumbe8gCL4rB0vpHF/+G7Nwmc=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "713a1c668be353a338eb42436f355ba3f411cd97", + "rev": "06e3e3be8aff792547dfd0825c7e5dc0c65bd4db", "type": "github" }, "original": { @@ -297,11 +336,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1753157005, - "narHash": "sha256-fTdJ2yYjR8O3kEWsveBGu/d8ilEFxVnGkF4wS3N1Was=", + "lastModified": 1753589020, + "narHash": "sha256-rFZWFBjYRXNli1rZvRLOJVKLznk3Fj/eHJJdcWB0zWE=", "owner": "rycee", "repo": "nur-expressions", - "rev": "a38f383959d8bf0c1d5d555469a4c63c4632701f", + "rev": "2988587ae70864239861389dbd84efdbfa9fa2c5", "type": "gitlab" }, "original": { @@ -475,6 +514,24 @@ "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, + "locked": { + "lastModified": 1753121425, + "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "644e0fc48951a860279da645ba77fe4a6e814c5e", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_2" + }, "locked": { "lastModified": 1733269028, "narHash": "sha256-kVq/jAKKtbvWwbL9wf0SKDxtxsC5Gb+nlIYEFnyXhGA=", @@ -489,7 +546,7 @@ "type": "github" } }, - "flake-parts_2": { + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "lanzaboote", @@ -510,7 +567,7 @@ "type": "github" } }, - "flake-parts_3": { + "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "neovim-nightly-overlay", @@ -531,7 +588,7 @@ "type": "github" } }, - "flake-parts_4": { + "flake-parts_5": { "inputs": { "nixpkgs-lib": [ "neovim-nightly-overlay", @@ -552,16 +609,16 @@ "type": "indirect" } }, - "flake-parts_5": { + "flake-parts_6": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" + "nixpkgs-lib": "nixpkgs-lib_3" }, "locked": { - "lastModified": 1751413152, - "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", + "lastModified": 1753121425, + "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", + "rev": "644e0fc48951a860279da645ba77fe4a6e814c5e", "type": "github" }, "original": { @@ -570,9 +627,9 @@ "type": "github" } }, - "flake-parts_6": { + "flake-parts_7": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_3" + "nixpkgs-lib": "nixpkgs-lib_4" }, "locked": { "lastModified": 1727826117, @@ -588,9 +645,9 @@ "type": "github" } }, - "flake-parts_7": { + "flake-parts_8": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_4" + "nixpkgs-lib": "nixpkgs-lib_5" }, "locked": { "lastModified": 1719994518, @@ -821,16 +878,16 @@ "inputs": { "flake-compat": "flake-compat", "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_10", "zig": "zig", "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1753158281, - "narHash": "sha256-tldNTDLgRHHO14MlbrUVGC7sa5XhgkzVi+e/lTKsg0I=", + "lastModified": 1753557429, + "narHash": "sha256-gy/K5KBktVbzq4u6wx0YytOAxefmKrEbcnEMNdcl8JY=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "820879d2efb5679e1e1fee0d78ccaa29fb8a8312", + "rev": "18831374caf2617235717cf30705c89b657934bb", "type": "github" }, "original": { @@ -978,7 +1035,7 @@ }, "hercules-ci-effects": { "inputs": { - "flake-parts": "flake-parts_4", + "flake-parts": "flake-parts_5", "nixpkgs": [ "neovim-nightly-overlay", "nixpkgs" @@ -1027,11 +1084,11 @@ ] }, "locked": { - "lastModified": 1753132348, - "narHash": "sha256-0i3jU9AHuNXb0wYGzImnVwaw+miE0yW13qfjC0F+fIE=", + "lastModified": 1753470191, + "narHash": "sha256-hOUWU5L62G9sm8NxdiLWlLIJZz9H52VuFiDllHdwmVA=", "owner": "nix-community", "repo": "home-manager", - "rev": "e4bf85da687027cfc4a8853ca11b6b86ce41d732", + "rev": "a1817d1c0e5eabe7dfdfe4caa46c94d9d8f3fdb6", "type": "github" }, "original": { @@ -1047,11 +1104,11 @@ ] }, "locked": { - "lastModified": 1753180535, - "narHash": "sha256-KEtlzMs2O7FDvciFtjk9W4hyau013Pj9qZNK9a0PxEc=", + "lastModified": 1753617834, + "narHash": "sha256-WEVfKrdIdu5CpppJ0Va3vzP0DKlS+ZTLbBjugMO2Drg=", "owner": "nix-community", "repo": "home-manager", - "rev": "847711c7ffa9944b0c5c39a8342ac8eb6a9f9abc", + "rev": "72cc1e3134a35005006f06640724319caa424737", "type": "github" }, "original": { @@ -1174,17 +1231,17 @@ "hyprlang": "hyprlang_2", "hyprutils": "hyprutils_2", "hyprwayland-scanner": "hyprwayland-scanner_2", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_11", "pre-commit-hooks": "pre-commit-hooks", "systems": "systems_8", "xdph": "xdph" }, "locked": { - "lastModified": 1753175652, - "narHash": "sha256-bZvBovQ/c/F26QaOEm3IVOnLCxa17oc9QZ5ot18mqck=", + "lastModified": 1753634783, + "narHash": "sha256-Rl/voNjvcQH6E1vi4wNt5AY6CWaYkqfnkpm9GxrqKGg=", "ref": "refs/heads/main", - "rev": "fdbbad04bbf2382e9a980418c976668fc062f195", - "revCount": 6305, + "rev": "c63d0003a1e5155248695f19778f815a8ad34c67", + "revCount": 6317, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -1480,11 +1537,11 @@ ] }, "locked": { - "lastModified": 1752755091, - "narHash": "sha256-H/k35QJLyQxkFnXR5ckMv/Z+ElNa5f22qNKdyGBMAn4=", + "lastModified": 1753418232, + "narHash": "sha256-fMVYDv0/7v4qrbZmzfqkFeEpelME4bT5JQBfXL9zl/E=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "0d09755fe1df1886e5f07dbb16f7ed373080f86a", + "rev": "ca1145d927d177194fec4b0bf47a4b7dd2ed613d", "type": "github" }, "original": { @@ -1495,14 +1552,14 @@ }, "kb-gui": { "inputs": { - "crane": "crane", - "flake-parts": "flake-parts", + "crane": "crane_2", + "flake-parts": "flake-parts_2", "nixpkgs": [ "nixpkgs" ], - "rust-overlay": "rust-overlay_2", + "rust-overlay": "rust-overlay_3", "systems": "systems_9", - "treefmt-nix": "treefmt-nix" + "treefmt-nix": "treefmt-nix_2" }, "locked": { "lastModified": 1733281564, @@ -1520,15 +1577,15 @@ }, "lanzaboote": { "inputs": { - "crane": "crane_2", + "crane": "crane_3", "flake-compat": "flake-compat_3", - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts_3", "flake-utils": "flake-utils_4", "nixpkgs": [ "nixpkgs" ], "pre-commit-hooks-nix": "pre-commit-hooks-nix", - "rust-overlay": "rust-overlay_3" + "rust-overlay": "rust-overlay_4" }, "locked": { "lastModified": 1718178907, @@ -1547,8 +1604,8 @@ }, "lexical": { "inputs": { - "flake-parts": "flake-parts_7", - "nixpkgs": "nixpkgs_24", + "flake-parts": "flake-parts_8", + "nixpkgs": "nixpkgs_26", "systems": "systems_21" }, "locked": { @@ -1605,15 +1662,15 @@ "blobs": "blobs", "flake-compat": "flake-compat_4", "git-hooks": "git-hooks", - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_14", "nixpkgs-25_05": "nixpkgs-25_05" }, "locked": { - "lastModified": 1752060039, - "narHash": "sha256-MqcbN/PgfXOv8S4q6GcmlORd6kJZ3UlFNhzCvLOEe4I=", + "lastModified": 1753285640, + "narHash": "sha256-ofa021NeHDXAxg5J8mSnn8rHa393PAlD85ZCetP4Qa0=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "80d21ed7a1ab8007597f7cd9adc26ebc98b9611f", + "rev": "ce87c8a9771d1a20c3fa3b60113b9b0821627dcb", "type": "gitlab" }, "original": { @@ -1625,19 +1682,19 @@ "neovim-nightly-overlay": { "inputs": { "flake-compat": "flake-compat_5", - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_4", "git-hooks": "git-hooks_2", "hercules-ci-effects": "hercules-ci-effects", "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs_13", - "treefmt-nix": "treefmt-nix_2" + "nixpkgs": "nixpkgs_15", + "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1753169948, - "narHash": "sha256-jXH3WaCM7fI4QkMq4onMdIqfOADa6k+okGYkZq46hzU=", + "lastModified": 1753637925, + "narHash": "sha256-0a+a6cv95THQvQ5/Pqy2yKTbnZrvq0OkOY9Wdvr06/A=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "983247ba3ec5b3ded43735aae04465417200d1d1", + "rev": "06556188ee8c7ddfbe7b39d652cf409d0f912705", "type": "github" }, "original": { @@ -1649,11 +1706,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1753070525, - "narHash": "sha256-icX8UgwqD0XrqxW1IMp/oWCNkOGZr0dQkA6DU53uFlI=", + "lastModified": 1753559931, + "narHash": "sha256-QIsckK2f4A1PG8hF3TboXYWrYEv3DtVtz+tTFs9V00w=", "owner": "neovim", "repo": "neovim", - "rev": "ea2d226df6f344451306274f3f99911d459fb9dd", + "rev": "b4ba27c238ec342bcb01fa59ab1eaf6996a4c6ee", "type": "github" }, "original": { @@ -1666,17 +1723,17 @@ "inputs": { "niri-stable": "niri-stable", "niri-unstable": "niri-unstable", - "nixpkgs": "nixpkgs_14", + "nixpkgs": "nixpkgs_16", "nixpkgs-stable": "nixpkgs-stable_3", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1753180174, - "narHash": "sha256-YeCLUjYOjTN2c29ch5ELoYGRW/BMmyv+a0Q16FhmlnQ=", + "lastModified": 1753514742, + "narHash": "sha256-OP7hZTjnOLP3X6cWldPLcxQ4vvDYid6SlOf1mw+XRCg=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "fdeb0c5367f6e183f19ee1521644cb0440582bde", + "rev": "af1af659e690b3e535d94c54a64700767bfc9544", "type": "github" }, "original": { @@ -1690,7 +1747,7 @@ "nixpkgs": [ "nixpkgs" ], - "rust-overlay": "rust-overlay_4" + "rust-overlay": "rust-overlay_5" }, "locked": { "lastModified": 1752870529, @@ -1819,11 +1876,11 @@ }, "nixos-stable": { "locked": { - "lastModified": 1753115646, - "narHash": "sha256-yLuz5cz5Z+sn8DRAfNkrd2Z1cV6DaYO9JMrEz4KZo/c=", + "lastModified": 1753345091, + "narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "92c2e04a475523e723c67ef872d8037379073681", + "rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9", "type": "github" }, "original": { @@ -1835,11 +1892,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1752950548, - "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", + "lastModified": 1753429684, + "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c87b95e25065c028d31a94f06a62927d18763fdf", + "rev": "7fd36ee82c0275fb545775cc5e4d30542899511d", "type": "github" }, "original": { @@ -1866,6 +1923,21 @@ } }, "nixpkgs-lib": { + "locked": { + "lastModified": 1751159883, + "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "14a40a1d7fb9afa4739275ac642ed7301a9ba1ab", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixpkgs-lib_2": { "locked": { "lastModified": 1733096140, "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=", @@ -1877,7 +1949,7 @@ "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" } }, - "nixpkgs-lib_2": { + "nixpkgs-lib_3": { "locked": { "lastModified": 1751159883, "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=", @@ -1892,7 +1964,7 @@ "type": "github" } }, - "nixpkgs-lib_3": { + "nixpkgs-lib_4": { "locked": { "lastModified": 1727825735, "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=", @@ -1904,7 +1976,7 @@ "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" } }, - "nixpkgs-lib_4": { + "nixpkgs-lib_5": { "locked": { "lastModified": 1719876945, "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=", @@ -1950,11 +2022,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1753115646, - "narHash": "sha256-yLuz5cz5Z+sn8DRAfNkrd2Z1cV6DaYO9JMrEz4KZo/c=", + "lastModified": 1753345091, + "narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "92c2e04a475523e723c67ef872d8037379073681", + "rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9", "type": "github" }, "original": { @@ -1965,6 +2037,35 @@ } }, "nixpkgs_10": { + "locked": { + "lastModified": 1748189127, + "narHash": "sha256-zRDR+EbbeObu4V2X5QCd2Bk5eltfDlCr5yvhBwUT6pY=", + "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334", + "type": "tarball", + "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.802491.7c43f080a7f2/nixexprs.tar.xz" + }, + "original": { + "type": "tarball", + "url": "https://channels.nixos.org/nixos-25.05/nixexprs.tar.xz" + } + }, + "nixpkgs_11": { + "locked": { + "lastModified": 1752687322, + "narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_12": { "locked": { "lastModified": 1728538411, "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=", @@ -1980,7 +2081,7 @@ "type": "github" } }, - "nixpkgs_11": { + "nixpkgs_13": { "locked": { "lastModified": 1731890469, "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=", @@ -1996,7 +2097,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_14": { "locked": { "lastModified": 1751792365, "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", @@ -2012,13 +2113,13 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_15": { "locked": { - "lastModified": 1752997324, - "narHash": "sha256-vtTM4oDke3SeDj+1ey6DjmzXdq8ZZSCLWSaApADDvIE=", + "lastModified": 1753432016, + "narHash": "sha256-cnL5WWn/xkZoyH/03NNUS7QgW5vI7D1i74g48qplCvg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7c688a0875df5a8c28a53fb55ae45e94eae0dddb", + "rev": "6027c30c8e9810896b92429f0092f624f7b1aace", "type": "github" }, "original": { @@ -2028,39 +2129,39 @@ "type": "github" } }, - "nixpkgs_14": { - "locked": { - "lastModified": 1752950548, - "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c87b95e25065c028d31a94f06a62927d18763fdf", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_15": { - "locked": { - "lastModified": 1752950548, - "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "c87b95e25065c028d31a94f06a62927d18763fdf", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_16": { + "locked": { + "lastModified": 1753429684, + "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7fd36ee82c0275fb545775cc5e4d30542899511d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_17": { + "locked": { + "lastModified": 1753429684, + "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "7fd36ee82c0275fb545775cc5e4d30542899511d", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_18": { "locked": { "lastModified": 1702151865, "narHash": "sha256-9VAt19t6yQa7pHZLDbil/QctAgVsA66DLnzdRGqDisg=", @@ -2076,7 +2177,7 @@ "type": "github" } }, - "nixpkgs_17": { + "nixpkgs_19": { "locked": { "lastModified": 1736189585, "narHash": "sha256-GBC2LIBk9BuJR4HXfjuNlIWeY15U6jFvaqc7PeToGLw=", @@ -2092,38 +2193,6 @@ "type": "github" } }, - "nixpkgs_18": { - "locked": { - "lastModified": 1712883908, - "narHash": "sha256-icE1IJE9fHcbDfJ0+qWoDdcBXUoZCcIJxME4lMHwvSM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a0c9e3aee1000ac2bfb0e5b98c94c946a5d180a9", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_19": { - "locked": { - "lastModified": 1744536153, - "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1712883908, @@ -2141,6 +2210,38 @@ } }, "nixpkgs_20": { + "locked": { + "lastModified": 1712883908, + "narHash": "sha256-icE1IJE9fHcbDfJ0+qWoDdcBXUoZCcIJxME4lMHwvSM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a0c9e3aee1000ac2bfb0e5b98c94c946a5d180a9", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_21": { + "locked": { + "lastModified": 1744536153, + "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_22": { "locked": { "lastModified": 1744868846, "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", @@ -2156,7 +2257,7 @@ "type": "github" } }, - "nixpkgs_21": { + "nixpkgs_23": { "locked": { "lastModified": 1740547748, "narHash": "sha256-Ly2fBL1LscV+KyCqPRufUBuiw+zmWrlJzpWOWbahplg=", @@ -2172,7 +2273,7 @@ "type": "github" } }, - "nixpkgs_22": { + "nixpkgs_24": { "locked": { "lastModified": 1747542820, "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", @@ -2188,7 +2289,7 @@ "type": "github" } }, - "nixpkgs_23": { + "nixpkgs_25": { "locked": { "lastModified": 1752480373, "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", @@ -2204,7 +2305,7 @@ "type": "github" } }, - "nixpkgs_24": { + "nixpkgs_26": { "locked": { "lastModified": 1719931832, "narHash": "sha256-0LD+KePCKKEb4CcPsTBOwf019wDtZJanjoKm1S8q3Do=", @@ -2236,11 +2337,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1752950548, - "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", + "lastModified": 1753250450, + "narHash": "sha256-i+CQV2rPmP8wHxj0aq4siYyohHwVlsh40kV89f3nw1s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c87b95e25065c028d31a94f06a62927d18763fdf", + "rev": "fc02ee70efb805d3b2865908a13ddd4474557ecf", "type": "github" }, "original": { @@ -2252,11 +2353,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1752950548, - "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", + "lastModified": 1753429684, + "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c87b95e25065c028d31a94f06a62927d18763fdf", + "rev": "7fd36ee82c0275fb545775cc5e4d30542899511d", "type": "github" }, "original": { @@ -2267,6 +2368,38 @@ } }, "nixpkgs_6": { + "locked": { + "lastModified": 1744536153, + "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { + "locked": { + "lastModified": 1747958103, + "narHash": "sha256-qmmFCrfBwSHoWw7cVK4Aj+fns+c54EBP8cGqp/yK410=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "fe51d34885f7b5e3e7b59572796e1bcb427eccb1", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { "locked": { "lastModified": 1747728033, "narHash": "sha256-NnXFQu7g4LnvPIPfJmBuZF7LFy/fey2g2+LCzjQhTUk=", @@ -2282,42 +2415,13 @@ "type": "github" } }, - "nixpkgs_7": { - "locked": { - "lastModified": 1752950548, - "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c87b95e25065c028d31a94f06a62927d18763fdf", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_8": { - "locked": { - "lastModified": 1748189127, - "narHash": "sha256-zRDR+EbbeObu4V2X5QCd2Bk5eltfDlCr5yvhBwUT6pY=", - "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334", - "type": "tarball", - "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.802491.7c43f080a7f2/nixexprs.tar.xz" - }, - "original": { - "type": "tarball", - "url": "https://channels.nixos.org/nixos-25.05/nixexprs.tar.xz" - } - }, "nixpkgs_9": { "locked": { - "lastModified": 1752687322, - "narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=", + "lastModified": 1753429684, + "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251", + "rev": "7fd36ee82c0275fb545775cc5e4d30542899511d", "type": "github" }, "original": { @@ -2349,7 +2453,7 @@ "pnpm2nix_2": { "inputs": { "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_16" + "nixpkgs": "nixpkgs_18" }, "locked": { "lastModified": 1706694632, @@ -2367,7 +2471,7 @@ }, "posting": { "inputs": { - "nixpkgs": "nixpkgs_17", + "nixpkgs": "nixpkgs_19", "utils": "utils" }, "locked": { @@ -2456,11 +2560,11 @@ ] }, "locked": { - "lastModified": 1753090730, - "narHash": "sha256-QG14m53ZGp2Gk7xD2Q+Tf7RYCKfk/BYRaBtX3X4IKbc=", + "lastModified": 1753595452, + "narHash": "sha256-vqkSDvh7hWhPvNjMjEDV4KbSCv2jyl2Arh73ZXe274k=", "ref": "refs/heads/master", - "rev": "db77c71c216530159c2dcf5b269ebb4706b2e2dd", - "revCount": 653, + "rev": "a5431dd02dc23d9ef1680e67777fed00fe5f7cda", + "revCount": 665, "type": "git", "url": "https://git.outfoxxed.me/outfoxxed/quickshell" }, @@ -2471,7 +2575,7 @@ }, "resume": { "inputs": { - "nixpkgs": "nixpkgs_18", + "nixpkgs": "nixpkgs_20", "systems": "systems_14" }, "locked": { @@ -2490,19 +2594,19 @@ }, "rio-term": { "inputs": { - "flake-parts": "flake-parts_5", + "flake-parts": "flake-parts_6", "nixpkgs": [ "nixpkgs" ], - "rust-overlay": "rust-overlay_5", + "rust-overlay": "rust-overlay_6", "systems": "systems_15" }, "locked": { - "lastModified": 1753005854, - "narHash": "sha256-8mDVqTKmlyETAng04JZXPHrNVVOWuNQj1cpm6yiI/2U=", + "lastModified": 1753605791, + "narHash": "sha256-ZYhWptgNKUIkEsy1QPb+9OavmTA7BS0PSqmxuFmy+kc=", "owner": "raphamorim", "repo": "rio", - "rev": "96bf02873ada3c1bc85d88c76a4699e00f726aa6", + "rev": "06f7f9afd38389095dcfd1325ba4e68d55ed5f84", "type": "github" }, "original": { @@ -2519,6 +2623,7 @@ "blog": "blog", "catppuccin": "catppuccin", "chaotic": "chaotic", + "ciderd": "ciderd", "darwin": "darwin_2", "disko": "disko", "emacs-overlay": "emacs-overlay", @@ -2537,13 +2642,13 @@ "nix-darwin": "nix-darwin", "nixos-generators": "nixos-generators", "nixos-stable": "nixos-stable", - "nixpkgs": "nixpkgs_15", + "nixpkgs": "nixpkgs_17", "pnpm2nix": "pnpm2nix_2", "posting": "posting", "quickshell": "quickshell", "resume": "resume", "rio-term": "rio-term", - "rust-overlay": "rust-overlay_6", + "rust-overlay": "rust-overlay_7", "snowfall-lib": "snowfall-lib", "solaar": "solaar", "sops-nix": "sops-nix", @@ -2565,11 +2670,11 @@ ] }, "locked": { - "lastModified": 1753066249, - "narHash": "sha256-j2UBrfDRIePGx3532Bbb9UeosNX2F73hfOAHtmACfnM=", + "lastModified": 1753497720, + "narHash": "sha256-yzZkDMVfPpNyTciQOfriWpRXrgGNT/cvrFAEQZ//SZs=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "0751b65633a1785743ca44fd7c14a633c54c1f91", + "rev": "c8b8b812010515b7d9bd7e538f06a9f4edb373ff", "type": "github" }, "original": { @@ -2580,7 +2685,25 @@ }, "rust-overlay_2": { "inputs": { - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_6" + }, + "locked": { + "lastModified": 1753584741, + "narHash": "sha256-i147iFSy4K4PJvID+zoszLbRi2o+YV8AyG4TUiDQ3+I=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "69dfe029679e73b8d159011c9547f6148a85ca6b", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_3": { + "inputs": { + "nixpkgs": "nixpkgs_12" }, "locked": { "lastModified": 1733279627, @@ -2596,7 +2719,7 @@ "type": "github" } }, - "rust-overlay_3": { + "rust-overlay_4": { "inputs": { "flake-utils": [ "lanzaboote", @@ -2621,7 +2744,7 @@ "type": "github" } }, - "rust-overlay_4": { + "rust-overlay_5": { "inputs": { "nixpkgs": [ "niri-src", @@ -2642,16 +2765,16 @@ "type": "github" } }, - "rust-overlay_5": { + "rust-overlay_6": { "inputs": { - "nixpkgs": "nixpkgs_19" + "nixpkgs": "nixpkgs_21" }, "locked": { - "lastModified": 1752892850, - "narHash": "sha256-LLvDqLiK2+dr7bQqKTnZIZ8F1H67DLt3FUyVrGolGVw=", + "lastModified": 1753497720, + "narHash": "sha256-yzZkDMVfPpNyTciQOfriWpRXrgGNT/cvrFAEQZ//SZs=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "742248f12aed0183a124637e8b27a238a47f46a2", + "rev": "c8b8b812010515b7d9bd7e538f06a9f4edb373ff", "type": "github" }, "original": { @@ -2660,18 +2783,18 @@ "type": "github" } }, - "rust-overlay_6": { + "rust-overlay_7": { "inputs": { "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1753156081, - "narHash": "sha256-N+8LM+zvS6cP+VG2vxgEEDCyX1T9EUq9wXTSvGwX9TM=", + "lastModified": 1753584741, + "narHash": "sha256-i147iFSy4K4PJvID+zoszLbRi2o+YV8AyG4TUiDQ3+I=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8610c0f3801fc8dec7eb4b79c95fb39d16f38a80", + "rev": "69dfe029679e73b8d159011c9547f6148a85ca6b", "type": "github" }, "original": { @@ -2751,7 +2874,7 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_20" + "nixpkgs": "nixpkgs_22" }, "locked": { "lastModified": 1752544651, @@ -2775,11 +2898,11 @@ "systems": "systems_18" }, "locked": { - "lastModified": 1752986956, - "narHash": "sha256-1AK8+W7d5eNyGRkcWHa+9oIChLJbY6jt7ujSJo+ft4M=", + "lastModified": 1753591727, + "narHash": "sha256-Ow+qyFckroPS4SQFHcFZ8mKh3HIQ2pQdC6DRjiYF9EE=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "51ac0aee7e7ee21ca0874b913f07f9004bc9311f", + "rev": "26c488b60360e15db372483d826cec89ac532980", "type": "github" }, "original": { @@ -3121,7 +3244,25 @@ }, "treefmt-nix": { "inputs": { - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_7" + }, + "locked": { + "lastModified": 1753439394, + "narHash": "sha256-Bv9h1AJegLI8uAhiJ1sZ4XAndYxhgf38tMgCQwiEpmc=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "2673921c03d6e75fdf4aa93e025772608d1482cf", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_2": { + "inputs": { + "nixpkgs": "nixpkgs_13" }, "locked": { "lastModified": 1733222881, @@ -3137,7 +3278,7 @@ "type": "github" } }, - "treefmt-nix_2": { + "treefmt-nix_3": { "inputs": { "nixpkgs": [ "neovim-nightly-overlay", @@ -3145,11 +3286,11 @@ ] }, "locked": { - "lastModified": 1753006367, - "narHash": "sha256-tzbhc4XttkyEhswByk5R38l+ztN9UDbnj0cTcP6Hp9A=", + "lastModified": 1753439394, + "narHash": "sha256-Bv9h1AJegLI8uAhiJ1sZ4XAndYxhgf38tMgCQwiEpmc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "421b56313c65a0815a52b424777f55acf0b56ddf", + "rev": "2673921c03d6e75fdf4aa93e025772608d1482cf", "type": "github" }, "original": { @@ -3160,7 +3301,7 @@ }, "umu": { "inputs": { - "nixpkgs": "nixpkgs_21" + "nixpkgs": "nixpkgs_23" }, "locked": { "dir": "packaging/nix", @@ -3213,15 +3354,15 @@ }, "walker": { "inputs": { - "nixpkgs": "nixpkgs_22", + "nixpkgs": "nixpkgs_24", "systems": "systems_20" }, "locked": { - "lastModified": 1753172754, - "narHash": "sha256-Ee2C1geslZX72HNegfOWdj/jYOm5FWETSw9r/V28+cM=", + "lastModified": 1753511060, + "narHash": "sha256-/wxmsPTYncQSZVVhujU5Vlt/XS4gAymKpw0oU/Uiirc=", "owner": "abenz1267", "repo": "walker", - "rev": "9d7f6e5f1524f505ebfacb060060254d7f056698", + "rev": "9aa95738324a9826dc05cbd52391d50c8ef149d0", "type": "github" }, "original": { @@ -3238,11 +3379,11 @@ ] }, "locked": { - "lastModified": 1753075618, - "narHash": "sha256-vP6t4dwiV3R+HRBLlsRr9kU5OtAJvQ9oTVbMsYqwxnc=", + "lastModified": 1753252308, + "narHash": "sha256-rwN74KZdAQVLdengxHpUwkyaZTdoRzFjJ3SSr6rx2/o=", "owner": "Alexays", "repo": "Waybar", - "rev": "39d6d80f6419b05e3358d950d9ee8601b152b8f9", + "rev": "0776e694df56c2c849b682369148210d81324e93", "type": "github" }, "original": { @@ -3328,14 +3469,14 @@ "zen-browser": { "inputs": { "home-manager": "home-manager_4", - "nixpkgs": "nixpkgs_23" + "nixpkgs": "nixpkgs_25" }, "locked": { - "lastModified": 1753069499, - "narHash": "sha256-YtgY0ueqKNrBma4Euu8WH23BhUkBujirJDMDE1KujnU=", + "lastModified": 1753623063, + "narHash": "sha256-fS4zlM4Bs0sk9rGS1t1wp4SLQRzkpIr7vXCfMc8NpNY=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "c64b94235ae24e3b9e01a08f0331d8bb0e5b037a", + "rev": "4d72beff27e2152b2b1df05202b2dc50397d4c0d", "type": "github" }, "original": { @@ -3375,7 +3516,7 @@ }, "zoeycomputer": { "inputs": { - "flake-parts": "flake-parts_6", + "flake-parts": "flake-parts_7", "lexical": "lexical", "nixpkgs": [ "nixpkgs" diff --git a/flake.nix b/flake.nix index 8bdef04..ead2416 100644 --- a/flake.nix +++ b/flake.nix @@ -68,6 +68,12 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + ciderd = { + url = "git+https://code.zoeys.cloud/zoey/ciderd"; + + inputs.nixpkgs.follows = "nixpkgs"; + }; + hypridle = { url = "github:hyprwm/hypridle"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/homes/x86_64-linux/zoey@earth/default.nix b/homes/x86_64-linux/zoey@earth/default.nix index f12e2aa..ea09c4c 100644 --- a/homes/x86_64-linux/zoey@earth/default.nix +++ b/homes/x86_64-linux/zoey@earth/default.nix @@ -150,8 +150,10 @@ awscli2 monero-cli - zoom-us pandoc + cider-2 + + feather qt6Packages.qt5compat libsForQt5.qt5.qtgraphicaleffects diff --git a/modules/home/apps/helpers/waybar/default.nix b/modules/home/apps/helpers/waybar/default.nix index 4855d97..bf85926 100644 --- a/modules/home/apps/helpers/waybar/default.nix +++ b/modules/home/apps/helpers/waybar/default.nix @@ -81,7 +81,7 @@ in { passthrough = false; "fixed-center" = true; "modules-left" = ["hyprland/workspaces" "hyprland/window" "niri/workspaces" "niri/window" "network#speed" "custom/cava-system" "custom/cava-tt"]; - "modules-center" = ["mpris"]; + "modules-center" = ["custom/spotify"]; "modules-right" = [ "cpu" "memory" @@ -102,10 +102,10 @@ in { "custom/spotify" = { format = "{}"; "return-type" = "json"; - "on-click" = "playerctl -p spotify play-pause"; - "on-click-right" = "spotifatius toggle-liked"; - "on-click-middle" = "playerctl -p spotify next"; - exec = "spotifatius monitor"; + "on-click" = "${lib.getExe inputs.ciderd.packages.${pkgs.system}.default} play-pause"; + "on-click-right" = "${lib.getExe inputs.ciderd.packages.${pkgs.system}.default} like"; + "on-click-middle" = "${lib.getExe inputs.ciderd.packages.${pkgs.system}.default} skip"; + exec = "${lib.getExe inputs.ciderd.packages.${pkgs.system}.default} monitor"; }; "custom/mullvad" = { diff --git a/modules/home/apps/helpers/waybar/style.css b/modules/home/apps/helpers/waybar/style.css index 8c755d7..342423c 100644 --- a/modules/home/apps/helpers/waybar/style.css +++ b/modules/home/apps/helpers/waybar/style.css @@ -105,6 +105,11 @@ menu, border-radius: 6px; } +#custom-spotify.paused { + font-style: italic; + opacity: 0.75; +} + #custom-mullvad, #custom-notification { padding-left: 12px; diff --git a/modules/home/wms/niri/default.nix b/modules/home/wms/niri/default.nix index 37400e6..01dd096 100644 --- a/modules/home/wms/niri/default.nix +++ b/modules/home/wms/niri/default.nix @@ -177,7 +177,7 @@ with lib.custom; { {command = ["${pkgs.writeShellScriptBin "thunderbird-delayed" ''sleep 5; thunderbird''}/bin/thunderbird-delayed"];} {command = ["${pkgs.writeShellScriptBin "zen-delayed" ''sleep 5; zen''}/bin/zen-delayed"];} {command = ["vesktop"];} - {command = ["spotify"];} + {command = ["cider-2"];} {command = ["${spawnSlackOnWeekday}/bin/spawn-slack-on-weekday"];} ]; diff --git a/modules/nixos/services/vpn/default.nix b/modules/nixos/services/vpn/default.nix index f2c4be0..a264fc9 100644 --- a/modules/nixos/services/vpn/default.nix +++ b/modules/nixos/services/vpn/default.nix @@ -10,25 +10,12 @@ with lib.custom; let in { options.services.vpn = with types; { enable = mkBoolOpt false "Enable VPN service(s)"; - - mullvad = mkBoolOpt false "Enable Mullvad VPN Daemon"; }; config = mkIf cfg.enable { services.mullvad-vpn = { - enable = cfg.mullvad; + enable = true; package = nixos-stable.mullvad; }; - - services.openvpn = { - servers = { - work = { - config = ''config /home/zoey/Downloads/zachary_myers.ovpn''; - updateResolvConf = true; - }; - }; - }; - - systemd.services.openvpn-work.wantedBy = lib.mkForce []; }; } diff --git a/systems/x86_64-linux/earth/default.nix b/systems/x86_64-linux/earth/default.nix index 5771f1d..cb9a466 100644 --- a/systems/x86_64-linux/earth/default.nix +++ b/systems/x86_64-linux/earth/default.nix @@ -106,15 +106,12 @@ protocols.wayland.enable = true; - programs.openvpn3.enable = true; - services.udev.extraRules = '' KERNEL=="hidraw*", SUBSYSTEM=="hidraw", MODE="0664", GROUP="plugdev" ''; services.fstrim.enable = true; services.vpn.enable = true; services.xserver.enable = true; - services.vpn.mullvad = true; services.lorri.enable = true; services.udisks2.enable = true; services.crypto.enable = true; @@ -143,6 +140,7 @@ networking.extraHosts = '' 127.0.0.1 blahaj.local 127.0.0.1 test.blahaj.local + 127.0.0.2 earth ''; networking.networkmanager = { @@ -227,7 +225,6 @@ withDeltaUpdates = true; }) inputs.agenix.packages.${system}.agenix - inputs.awsvpnclient.packages.${system}.awsvpnclient ]; programs.fish.enable = true;