diff --git a/flake.lock b/flake.lock index 7d49a80..3bfe690 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ ] }, "locked": { - "lastModified": 1744289235, - "narHash": "sha256-ZFkHLdimtFzQACsVVyZkZlfYdj4iNy3PkzXfrwmlse8=", + "lastModified": 1742213273, + "narHash": "sha256-0l0vDb4anfsBu1rOs94bC73Hub+xEivgBAo6QXl2MmU=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "c8282f4982b56dfa5e9b9f659809da93f8d37e7a", + "rev": "484b732195cc53f4536ce4bd59a5c6402b1e7ccf", "type": "github" }, "original": { @@ -98,11 +98,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1744447794, - "narHash": "sha256-z5uK5BDmFg0L/0EW2XYLGr39FbQeXyNVnIEhkZrG8+Q=", + "lastModified": 1742599566, + "narHash": "sha256-xr6ntmiUPXSh9o9mJ7og9vxALMQs1EQhIhWUAO2D1M0=", "owner": "catppuccin", "repo": "nix", - "rev": "c44fe73ed8e5d5809eded7cc6156ca9c40044e42", + "rev": "5e303e8d7e251868fa79f83bbda69da90aa62402", "type": "github" }, "original": { @@ -141,11 +141,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1744618085, - "narHash": "sha256-+VdhZsIiIDtyOL88c4U/Os1PsCMLOCyScIeWL4hxJRM=", + "lastModified": 1742452566, + "narHash": "sha256-sVuLDQ2UIWfXUBbctzrZrXM2X05YjX08K7XHMztt36E=", "owner": "nix-community", "repo": "fenix", - "rev": "a85d390a5607188dca2dbc39b5b37571651d69ce", + "rev": "7d9ba794daf5e8cc7ee728859bc688d8e26d5f06", "type": "github" }, "original": { @@ -272,11 +272,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1741352980, + "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", "type": "github" }, "original": { @@ -515,11 +515,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1744385517, - "narHash": "sha256-pqiSmtbquoBM3cVHELcXHl8CLT8moXVkwbtc5xd5Br0=", + "lastModified": 1742649450, + "narHash": "sha256-926Ij64Qz9TJqvkc+gJqCexdmJZqhEvU+BGJVVF2e7I=", "owner": "helix-editor", "repo": "helix", - "rev": "340934db92aea902a61b9f79b9e6f4bd15111044", + "rev": "2d4c2a170cab5f625139b829b2d3f00b303a8550", "type": "github" }, "original": { @@ -535,11 +535,11 @@ ] }, "locked": { - "lastModified": 1744637364, - "narHash": "sha256-ZVINTNMJS6W3fqPYV549DSmjYQW5I9ceKBl83FwPP7k=", + "lastModified": 1742588233, + "narHash": "sha256-Fi5g8H5FXMSRqy+mU6gPG0v+C9pzjYbkkiePtz8+PpA=", "owner": "nix-community", "repo": "home-manager", - "rev": "337541447773985f825512afd0f9821a975186be", + "rev": "296ddc64627f4a6a4eb447852d7346b9dd16197d", "type": "github" }, "original": { @@ -549,27 +549,6 @@ "type": "github" } }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "zen-browser", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1743604125, - "narHash": "sha256-ZD61DNbsBt1mQbinAaaEqKaJk2RFo9R/j+eYWeGMx7A=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "180fd43eea296e62ae68e079fcf56aba268b9a1a", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, "hy3": { "inputs": { "hyprland": [ @@ -577,11 +556,11 @@ ] }, "locked": { - "lastModified": 1743128724, - "narHash": "sha256-CUlxc2u1Y8gpeAl7NKrZxxpeZjyU2DBxOYb8b0haM2M=", + "lastModified": 1742615834, + "narHash": "sha256-ptyKCuiD7rG0kuYrfN6ugyqUQIIQ7nXfHQbvG9j7nLE=", "owner": "outfoxxed", "repo": "hy3", - "rev": "4014433d1c3d1bf36c6684cff14c23d538337070", + "rev": "a1f892fa218f6def606ccb1f81ddc2e57d0551b8", "type": "github" }, "original": { @@ -635,11 +614,11 @@ ] }, "locked": { - "lastModified": 1743953322, - "narHash": "sha256-prQ5JKopXtzCMX2eT3dXbaVvGmzjMRE2bXStQDdazpM=", + "lastModified": 1739049071, + "narHash": "sha256-3+7TpXMrbsUXSwgr5VAKAnmkzMb6JO+Rvc9XRb5NMg4=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "9d7f2687c84c729afbc3b13f7937655570f2978d", + "rev": "175c6b29b6ff82100539e7c4363a35a02c74dd73", "type": "github" }, "original": { @@ -693,11 +672,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1744646317, - "narHash": "sha256-Vs5vKsYOtUBdUyHZ9zmKZxhcEnwm9KM8LUhww44JKtE=", + "lastModified": 1742584793, + "narHash": "sha256-Zhau0ocCNRDg/+MTIutjPkN1+pYjYzgyW3P7eqL/LkQ=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "8b7b169043de2a9d95f8505edb8b6576fac586fd", + "rev": "ccbdba7ee2ccb835306de89a6023134fa6b8006f", "type": "github" }, "original": { @@ -723,11 +702,11 @@ ] }, "locked": { - "lastModified": 1743950622, - "narHash": "sha256-8qjDapcQeDqxQUIm5gA0x6XZtowV/14bOs3K0tCSMoU=", + "lastModified": 1742550672, + "narHash": "sha256-q6v3nkJZdu45bwCuymQ+q3U7uwfA+M3GqsvZ0TgNsi4=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "be6b9875dd5c586fb401d294bb98c31973849651", + "rev": "7429a0ea78353dab6a7a9a3e8101db98a306957d", "type": "github" }, "original": { @@ -748,11 +727,11 @@ ] }, "locked": { - "lastModified": 1743714874, - "narHash": "sha256-yt8F7NhMFCFHUHy/lNjH/pjZyIDFNk52Q4tivQ31WFo=", + "lastModified": 1738422629, + "narHash": "sha256-5v+bv75wJWvahyM2xcMTSNNxmV8a7hb01Eey5zYnBJw=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "3a5c2bda1c1a4e55cc1330c782547695a93f05b2", + "rev": "755aef8dab49d0fc4663c715fa4ad221b2aedaed", "type": "github" }, "original": { @@ -845,11 +824,11 @@ ] }, "locked": { - "lastModified": 1744468525, - "narHash": "sha256-9HySx+EtsbbKlZDlY+naqqOV679VdxP6x6fP3wxDXJk=", + "lastModified": 1741191527, + "narHash": "sha256-kM+11Nch47Xwfgtw2EpRitJuORy4miwoMuRi5tyMBDY=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "f1000c54d266e6e4e9d646df0774fac5b8a652df", + "rev": "72df3861f1197e41b078faa3e38eedd60e00018d", "type": "github" }, "original": { @@ -897,11 +876,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1744458473, - "narHash": "sha256-Z+MiLf2OdJ7DUf4Hx11KtlJFa5ZvMsi3Ymfs6gxPVtQ=", + "lastModified": 1742460722, + "narHash": "sha256-u23NzXN2yez0nO2zEtEaChE/4jhtC8WvpM8OpwUsls8=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "d9532962274602c2134e0a3240673a4add39ced6", + "rev": "f883e669d147ac189b64ce403300a5a3e4de2c66", "type": "github" }, "original": { @@ -916,11 +895,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1744513377, - "narHash": "sha256-2ocy+qAVxTBmaK8MpAy7mpKIH+DYEzwf+KzXZX83oZ4=", + "lastModified": 1742402033, + "narHash": "sha256-aaBdTUJIAo9LBPpjNX96AoAi0H+O/oW8o+7SCVBAzXI=", "owner": "Jas-SinghFSU", "repo": "HyprPanel", - "rev": "42943b3def85d8787d703778951944c8e791202b", + "rev": "3a5ad2a1db420f0238895f2cb1ff64acd0d2cc54", "type": "github" }, "original": { @@ -941,11 +920,11 @@ ] }, "locked": { - "lastModified": 1743950287, - "narHash": "sha256-/6IAEWyb8gC/NKZElxiHChkouiUOrVYNq9YqG0Pzm4Y=", + "lastModified": 1741534688, + "narHash": "sha256-EV3945SnjOCuRVbGRghsWx/9D89FyshnSO1Q6/TuQ14=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "f2dc70e448b994cef627a157ee340135bd68fbc6", + "rev": "dd1f720cbc2dbb3c71167c9598045dd3261d27b3", "type": "github" }, "original": { @@ -1069,11 +1048,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1744611256, - "narHash": "sha256-NOtgDZm7BWODs9adMiveepo/+VTiTClTokD66pWxXE4=", + "lastModified": 1742607855, + "narHash": "sha256-lUF/tpSON29qNIqhECX/Ue4qVmI3FOvMaW4iUnK49C4=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "cba45fc4da306733ae06853302ee8428feb29ea3", + "rev": "9818734e2117dac703767585d48b805fad3e7a5e", "type": "github" }, "original": { @@ -1089,11 +1068,11 @@ ] }, "locked": { - "lastModified": 1744621833, - "narHash": "sha256-II6a32kRc+KbLhU/jS8EbuXYt1PNCvsRvuBw2becgQM=", + "lastModified": 1742204505, + "narHash": "sha256-sHBzuG9K/VrvOrcLd9GwoCLaQZDVedi/00YmFfdKq/A=", "owner": "Mic92", "repo": "nix-ld", - "rev": "9a3812797e25def1d4aed62b517606b7b93989dc", + "rev": "bc1ecb8ca83507c764a3909f02f1acf53c033585", "type": "github" }, "original": { @@ -1104,11 +1083,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1744633460, - "narHash": "sha256-fbWE4Xpw6eH0Q6in+ymNuDwTkqmFmtxcQEmtRuKDTTk=", + "lastModified": 1742631601, + "narHash": "sha256-yJ3OOAmsGAxSl0bTmKUp3+cEYtSS+V6hUPK2rYhIPr8=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "9a049b4a421076d27fee3eec664a18b2066824cb", + "rev": "380ed15bcd6440606c6856db44a99140d422b46f", "type": "github" }, "original": { @@ -1125,11 +1104,11 @@ ] }, "locked": { - "lastModified": 1744290088, - "narHash": "sha256-/X9XVEl0EiyisNbF5srrxXRSVoRqdwExuqyspYqqEjQ=", + "lastModified": 1742481215, + "narHash": "sha256-m7I/2UaGEFOI+Cy0RoADBi10NZt1WD5N3q2jUwPprE4=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "60b4904a1390ac4c89e93d95f6ed928975e525ed", + "rev": "96d7df91cce0d7cd30d1958fe1aefcb5f9bfced7", "type": "github" }, "original": { @@ -1140,11 +1119,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744098102, - "narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=", + "lastModified": 1742288794, + "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7", + "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42", "type": "github" }, "original": { @@ -1156,11 +1135,11 @@ }, "nixpkgs-24_11": { "locked": { - "lastModified": 1734083684, - "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=", + "lastModified": 1742937945, + "narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", + "rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7", "type": "github" }, "original": { @@ -1187,11 +1166,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1743296961, - "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=", + "lastModified": 1740877520, + "narHash": "sha256-oiwv/ZK/2FhGxrCkQkB83i7GnWXPPLzoqFHpDD3uYpk=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa", + "rev": "147dee35aab2193b174e4c0868bd80ead5ce755c", "type": "github" }, "original": { @@ -1202,11 +1181,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1744647640, - "narHash": "sha256-BENSfeh0rCDX85LKyurMDbc0gejJXNf4dI1bvZcTBpU=", + "lastModified": 1742653812, + "narHash": "sha256-MhKQxlMmDDzWnrQbT7CnBoyp6mOW5mYdVh7d6y9YqJ0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "12d4e48d621a9697d82dd8518f06e153d380ac8a", + "rev": "39fec49349b9f05de69ee5604ce42528e5dd95ad", "type": "github" }, "original": { @@ -1250,11 +1229,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "lastModified": 1742422364, + "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", "type": "github" }, "original": { @@ -1266,11 +1245,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "lastModified": 1742069588, + "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", "type": "github" }, "original": { @@ -1314,11 +1293,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1744502386, - "narHash": "sha256-QAd1L37eU7ktL2WeLLLTmI6P9moz9+a/ONO8qNBYJgM=", + "lastModified": 1741865919, + "narHash": "sha256-4thdbnP6dlbdq+qZWTsm4ffAwoS8Tiq1YResB+RP6WE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f6db44a8daa59c40ae41ba6e5823ec77fe0d2124", + "rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a", "type": "github" }, "original": { @@ -1330,11 +1309,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "lastModified": 1742422364, + "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", "type": "github" }, "original": { @@ -1346,11 +1325,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "lastModified": 1717602782, + "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6", "type": "github" }, "original": { @@ -1361,11 +1340,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1744502386, - "narHash": "sha256-QAd1L37eU7ktL2WeLLLTmI6P9moz9+a/ONO8qNBYJgM=", + "lastModified": 1741865919, + "narHash": "sha256-4thdbnP6dlbdq+qZWTsm4ffAwoS8Tiq1YResB+RP6WE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f6db44a8daa59c40ae41ba6e5823ec77fe0d2124", + "rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a", "type": "github" }, "original": { @@ -1377,11 +1356,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1743448293, - "narHash": "sha256-bmEPmSjJakAp/JojZRrUvNcDX2R5/nuX6bm+seVaGhs=", + "lastModified": 1742288794, + "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "77b584d61ff80b4cef9245829a6f1dfad5afdfa3", + "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42", "type": "github" }, "original": { @@ -1401,11 +1380,11 @@ ] }, "locked": { - "lastModified": 1742649964, - "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", + "lastModified": 1742058297, + "narHash": "sha256-b4SZc6TkKw8WQQssbN5O2DaCEzmFfvSTPYHlx/SFW9Y=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", + "rev": "59f17850021620cd348ad2e9c0c64f4e6325ce2a", "type": "github" }, "original": { @@ -1623,11 +1602,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1744539868, - "narHash": "sha256-NPUnfDAwLD69aKetxjC7lV5ysrvs1IKC0Sy4Zai10Mw=", + "lastModified": 1742296961, + "narHash": "sha256-gCpvEQOrugHWLimD1wTFOJHagnSEP6VYBDspq96Idu0=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "8365cf853e791c93fa8bc924f031f11949bb1a3c", + "rev": "15d87419f1a123d8f888d608129c3ce3ff8f13d4", "type": "github" }, "original": { @@ -1753,11 +1732,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1744518500, - "narHash": "sha256-lv52pnfiRGp5+xkZEgWr56DWiRgkMFXpiGba3eJ3krE=", + "lastModified": 1742595978, + "narHash": "sha256-05onsoMrLyXE4XleDCeLC3bXnC4nyUbKWInGwM7v6hU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "7e147a1ae90f0d4a374938cdc3df3cdaecb9d388", + "rev": "b7756921b002de60fb66782effad3ce8bdb5b25d", "type": "github" }, "original": { @@ -1981,11 +1960,11 @@ ] }, "locked": { - "lastModified": 1744644585, - "narHash": "sha256-p0D/e4J6Sv6GSb+9u8OQcVHSE2gPNYB5ygIfGDyEiXQ=", + "lastModified": 1741934139, + "narHash": "sha256-ZhTcTH9FoeAtbPfWGrhkH7RjLJZ7GeF18nygLAMR+WE=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "be6771e754345f18244fb00aae5c9e5ab21ccc26", + "rev": "150b0b6f52bb422a1b232a53698606fe0320dde0", "type": "github" }, "original": { @@ -1996,15 +1975,14 @@ }, "zen-browser": { "inputs": { - "home-manager": "home-manager_2", "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1744604540, - "narHash": "sha256-E6dII+yAH7nwsx7ktIC7sZXk8PAw5M0zu1z2Ozzt3ho=", + "lastModified": 1742614294, + "narHash": "sha256-bZbYlP/xqGyW2aVle742dFbc0npFnwJBzcEnXNywJgY=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "35e69b61338b322596dcb24fbd74a3a1aad5853c", + "rev": "7fa9ec4e14d89e568ebaac302049980df7cf0cc9", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4f69630..7777517 100644 --- a/flake.nix +++ b/flake.nix @@ -136,7 +136,7 @@ homes.modules = with inputs; [ sops-nix.homeManagerModules.sops - catppuccin.homeModules.catppuccin + catppuccin.homeManagerModules.catppuccin ]; systems.modules.nixos = with inputs; [ diff --git a/modules/nixos/apps/zen-browser/default.nix b/modules/nixos/apps/zen-browser/default.nix index 9593ea0..c952e2d 100644 --- a/modules/nixos/apps/zen-browser/default.nix +++ b/modules/nixos/apps/zen-browser/default.nix @@ -29,7 +29,6 @@ in "1password/custom_allowed_browsers" = { text = '' .zen-wrapped - .zen-beta-wrapp ''; mode = "0755"; }; diff --git a/modules/nixos/security/gpg/default.nix b/modules/nixos/security/gpg/default.nix index 55075ea..4b98939 100644 --- a/modules/nixos/security/gpg/default.nix +++ b/modules/nixos/security/gpg/default.nix @@ -43,7 +43,7 @@ in pinentry-qt yubikey-manager - yubioath-flutter + yubikey-manager-qt reload-yubikey ]; diff --git a/modules/nixos/system/boot/default.nix b/modules/nixos/system/boot/default.nix index 53759a1..e56df05 100644 --- a/modules/nixos/system/boot/default.nix +++ b/modules/nixos/system/boot/default.nix @@ -17,7 +17,7 @@ in config = mkIf cfg.enable { boot = { - kernelPackages = pkgs.linuxPackages_latest; + kernelPackages = pkgs.linuxPackages_6_12; loader = { systemd-boot.enable = true; efi.canTouchEfiVariables = true; diff --git a/systems/x86_64-linux/yggdrasil/default.nix b/systems/x86_64-linux/yggdrasil/default.nix index d7efa90..24eaf0c 100644 --- a/systems/x86_64-linux/yggdrasil/default.nix +++ b/systems/x86_64-linux/yggdrasil/default.nix @@ -9,10 +9,7 @@ let inherit (lib.${namespace}) enabled disabled; in { - imports = [ - ./hardware.nix - ./hyprland_config.nix - ]; + imports = [ ./hardware.nix ]; environment.systemPackages = with pkgs; [ path-of-building @@ -74,6 +71,45 @@ in desktop.hyprland = { enable = true; + settings = { + monitor = [ + #Ultrawide + "DP-2,3440x1440@144, 0x0, 1" + #Vertical + "HDMI-A-1, 1920x1080@144, auto-right, 1, transform, 1" + # nividia kernel issues + "Unknown-1, disable" + ]; + + cursor = { + no_hardware_cursors = true; + }; + + exec-once = [ + "[workspace 1 silent] obsidian --disabled-gpu" + "[workspace 9 silent] git-butler" + + "${pkgs.xorg.xrandr}/bin/xrandr --output DP-2 --primary" + ]; + + workspace = [ + "1, monitor:DP-2" + "2, monitor:DP-2" + "3, monitor:DP-2" + "4, monitor:DP-2" + "5, monitor:DP-2" + "6, monitor:DP-2" + "7, monitor:HDMI-A-1" + "8, monitor:HDMI-A-1" + "9, monitor:HDMI-A-1" + ]; + + windowrulev2 = [ + "workspace 8 silent, class:^(steam)$, title:^(Friends List)" + "workspace 8 silent, class:^(vesktop)$, title:^(Discord)" + "workspace 7 silent, class:^(com.obsproject.Studio)$" + ]; + }; }; services = { diff --git a/systems/x86_64-linux/yggdrasil/hyprland_config.nix b/systems/x86_64-linux/yggdrasil/hyprland_config.nix deleted file mode 100644 index 93ba5c3..0000000 --- a/systems/x86_64-linux/yggdrasil/hyprland_config.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - lib, - namespace, - pkgs, - ... -}: -let -in -{ - ${namespace}.desktop.hyprland.settings = { - monitor = [ - #Ultrawide - "DP-2,3440x1440@144, 0x0, 1" - #Vertical - "HDMI-A-1, 1920x1080@144, auto-right, 1, transform, 1" - # nividia kernel issues - "Unknown-1, disable" - ]; - - cursor = { - no_hardware_cursors = true; - }; - - exec-once = [ - "[workspace 7 silent] obsidian" - - "${lib.getExe pkgs.xorg.xrandr} --output DP-2 --primary" - ]; - - workspace = [ - "1, monitor:DP-2" - "2, monitor:DP-2" - "3, monitor:DP-2" - "4, monitor:DP-2" - "5, monitor:DP-2" - "6, monitor:DP-2" - "7, monitor:HDMI-A-1" - "8, monitor:HDMI-A-1" - "9, monitor:HDMI-A-1" - ]; - - windowrulev2 = [ - "workspace 8 silent, class:^(steam)$, title:^(Friends List)" - "workspace 8 silent, class:^(vesktop)$, title:^(Discord)" - "workspace 7 silent, class:^(com.obsproject.Studio)$" - ]; - }; -}