diff options
Diffstat (limited to '')
37 files changed, 554 insertions, 343 deletions
diff --git a/flake.lock b/flake.lock index 6038225..f944aee 100644 --- a/flake.lock +++ b/flake.lock @@ -16,11 +16,11 @@ ] }, "locked": { - "lastModified": 1723293904, - "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=", + "lastModified": 1750173260, + "narHash": "sha256-9P1FziAwl5+3edkfFcr5HeGtQUtrSdk/MksX39GieoA=", "owner": "ryantm", "repo": "agenix", - "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41", + "rev": "531beac616433bac6f9e2a19feb8e99a22a66baf", "type": "github" }, "original": { @@ -32,11 +32,11 @@ "arkenfox-user-js": { "flake": false, "locked": { - "lastModified": 1736708527, - "narHash": "sha256-/JQo2XnLF8qfSQKvjuFDtvzzz/QHO/dLBHJO4vLOXNk=", + "lastModified": 1745247844, + "narHash": "sha256-YfgmhyqLH067pjqRSeCpfqFkeaac1nBvsKcrRNkKw7o=", "owner": "arkenfox", "repo": "user.js", - "rev": "c25187332e19c633b956a6755a7971a6591d3e8d", + "rev": "7f852e94fc80fd0aa19f1c948319974e3301187f", "type": "github" }, "original": { @@ -50,11 +50,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1732200724, - "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=", + "lastModified": 1746562888, + "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "153d52373b0fb2d343592871009a286ec8837aec", + "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89", "type": "github" }, "original": { @@ -82,11 +82,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1725860795, - "narHash": "sha256-Z2o8VBPW3I+KKTSfe25kskz0EUj7MpUh8u355Z1nVsU=", + "lastModified": 1748408240, + "narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "7f795bf75d38e0eea9fed287264067ca187b88a9", + "rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e", "type": "github" }, "original": { @@ -98,26 +98,27 @@ "base16-vim": { "flake": false, "locked": { - "lastModified": 1731949548, - "narHash": "sha256-XIDexXM66sSh5j/x70e054BnUsviibUShW7XhbDGhYo=", + "lastModified": 1732806396, + "narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=", "owner": "tinted-theming", "repo": "base16-vim", - "rev": "61165b1632409bd55e530f3dbdd4477f011cadc6", + "rev": "577fe8125d74ff456cf942c733a85d769afe58b7", "type": "github" }, "original": { "owner": "tinted-theming", "repo": "base16-vim", + "rev": "577fe8125d74ff456cf942c733a85d769afe58b7", "type": "github" } }, "crane": { "locked": { - "lastModified": 1736566337, - "narHash": "sha256-SC0eDcZPqISVt6R0UfGPyQLrI0+BppjjtQ3wcSlk0oI=", + "lastModified": 1751562746, + "narHash": "sha256-smpugNIkmDeicNz301Ll1bD7nFOty97T79m4GUMUczA=", "owner": "ipetkov", "repo": "crane", - "rev": "9172acc1ee6c7e1cbafc3044ff850c568c75a5a3", + "rev": "aed2020fd3dc26e1e857d4107a5a67a33ab6c1fd", "type": "github" }, "original": { @@ -126,27 +127,6 @@ "type": "github" } }, - "devshell": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1735644329, - "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=", - "owner": "numtide", - "repo": "devshell", - "rev": "f7795ede5b02664b57035b3b757876703e2c3eac", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, "disko": { "inputs": { "nixpkgs": [ @@ -154,11 +134,11 @@ ] }, "locked": { - "lastModified": 1736711425, - "narHash": "sha256-8hKhPQuMtXfJi+4lPvw3FBk/zSJVHeb726Zo0uF1PP8=", + "lastModified": 1751854533, + "narHash": "sha256-U/OQFplExOR1jazZY4KkaQkJqOl59xlh21HP9mI79Vc=", "owner": "nix-community", "repo": "disko", - "rev": "f720e64ec37fa16ebba6354eadf310f81555cc07", + "rev": "16b74a1e304197248a1bc663280f2548dbfcae3c", "type": "github" }, "original": { @@ -170,11 +150,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1734969791, - "narHash": "sha256-A9PxLienMYJ/WUvqFie9qXrNC2MeRRYw7TG/q7DRjZg=", + "lastModified": 1748383148, + "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "92f4890bd150fc9d97b61b3583680c0524a8cafe", + "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf", "type": "github" }, "original": { @@ -186,11 +166,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -199,20 +179,6 @@ "type": "github" } }, - "flake-compat_2": { - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -220,11 +186,11 @@ ] }, "locked": { - "lastModified": 1736143030, - "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", + "lastModified": 1751413152, + "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", + "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", "type": "github" }, "original": { @@ -233,29 +199,32 @@ "type": "github" } }, - "flake-utils": { + "flake-parts_2": { "inputs": { - "systems": [ - "systems" + "nixpkgs-lib": [ + "stylix", + "nixpkgs" ] }, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { - "owner": "numtide", - "repo": "flake-utils", + "owner": "hercules-ci", + "repo": "flake-parts", "type": "github" } }, - "flake-utils_2": { + "flake-utils": { "inputs": { - "systems": "systems" + "systems": [ + "systems" + ] }, "locked": { "lastModified": 1731533236, @@ -271,12 +240,9 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_2": { "inputs": { - "systems": [ - "stylix", - "systems" - ] + "systems": "systems" }, "locked": { "lastModified": 1731533236, @@ -321,42 +287,11 @@ ] }, "locked": { - "lastModified": 1735882644, - "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", + "lastModified": 1750779888, + "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "git-hooks_2": { - "inputs": { - "flake-compat": [ - "stylix", - "flake-compat" - ], - "gitignore": "gitignore_2", - "nixpkgs": [ - "stylix", - "nixpkgs" - ], - "nixpkgs-stable": [ - "stylix", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1731363552, - "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", + "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", "type": "github" }, "original": { @@ -385,41 +320,19 @@ "type": "github" } }, - "gitignore_2": { - "inputs": { - "nixpkgs": [ - "stylix", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "gnome-shell": { "flake": false, "locked": { - "lastModified": 1732369855, - "narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=", + "lastModified": 1748186689, + "narHash": "sha256-UaD7Y9f8iuLBMGHXeJlRu6U1Ggw5B9JnkFs3enZlap0=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "dadd58f630eeea41d645ee225a63f719390829dc", + "rev": "8c88f917db0f1f0d80fa55206c863d3746fa18d0", "type": "github" }, "original": { "owner": "GNOME", - "ref": "47.2", + "ref": "48.2", "repo": "gnome-shell", "type": "github" } @@ -431,11 +344,11 @@ ] }, "locked": { - "lastModified": 1736785676, - "narHash": "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=", + "lastModified": 1751824240, + "narHash": "sha256-aDDC0CHTlL7QDKWWhdbEgVPK6KwWt+ca0QkmHYZxMzI=", "owner": "nix-community", "repo": "home-manager", - "rev": "fc52a210b60f2f52c74eac41a8647c1573d2071d", + "rev": "fd9e55f5fac45a26f6169310afca64d56b681935", "type": "github" }, "original": { @@ -446,11 +359,11 @@ }, "impermanence": { "locked": { - "lastModified": 1736688610, - "narHash": "sha256-1Zl9xahw399UiZSJ9Vxs1W4WRFjO1SsNdVZQD4nghz0=", + "lastModified": 1737831083, + "narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=", "owner": "nix-community", "repo": "impermanence", - "rev": "c64bed13b562fc3bb454b48773d4155023ac31b7", + "rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170", "type": "github" }, "original": { @@ -473,16 +386,16 @@ ] }, "locked": { - "lastModified": 1729958008, - "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", + "lastModified": 1748294338, + "narHash": "sha256-FVO01jdmUNArzBS7NmaktLdGA5qA3lUMJ4B7a05Iynw=", "owner": "NuschtOS", "repo": "ixx", - "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", + "rev": "cc5f390f7caf265461d4aab37e98d2292ebbdb85", "type": "github" }, "original": { "owner": "NuschtOS", - "ref": "v0.0.6", + "ref": "v0.0.8", "repo": "ixx", "type": "github" } @@ -498,9 +411,6 @@ "flake-parts": [ "flake-parts" ], - "flake-utils": [ - "flake-utils" - ], "nixpkgs": [ "nixpkgs" ], @@ -512,16 +422,16 @@ ] }, "locked": { - "lastModified": 1718178907, - "narHash": "sha256-eSZyrQ9uoPB9iPQ8Y5H7gAmAgAvCw3InStmU3oEjqsE=", + "lastModified": 1737639419, + "narHash": "sha256-AEEDktApTEZ5PZXNDkry2YV2k6t0dTgLPEmAZbnigXU=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "b627ccd97d0159214cee5c7db1412b75e4be6086", + "rev": "a65905a09e2c43ff63be8c0e86a93712361f871e", "type": "github" }, "original": { "owner": "nix-community", - "ref": "v0.4.1", + "ref": "v0.4.2", "repo": "lanzaboote", "type": "github" } @@ -529,11 +439,11 @@ "libnbtplusplus": { "flake": false, "locked": { - "lastModified": 1699286814, - "narHash": "sha256-yy0q+bky80LtK1GWzz7qpM+aAGrOqLuewbid8WT1ilk=", + "lastModified": 1744811532, + "narHash": "sha256-qhmjaRkt+O7A+gu6HjUkl7QzOEb4r8y8vWZMG2R/C6o=", "owner": "PrismLauncher", "repo": "libnbtplusplus", - "rev": "23b955121b8217c1c348a9ed2483167a6f3ff4ad", + "rev": "531449ba1c930c98e0bcf5d332b237a8566f9d78", "type": "github" }, "original": { @@ -549,11 +459,11 @@ ] }, "locked": { - "lastModified": 1736819234, - "narHash": "sha256-deQVtIH4UJueELJqluAICUtX7OosD9paTP+5FgbiSwI=", + "lastModified": 1751313918, + "narHash": "sha256-HsJM3XLa43WpG+665aGEh8iS8AfEwOIQWk3Mke3e7nk=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "bd921223ba7cdac346477d7ea5204d6f4736fcc6", + "rev": "e04a388232d9a6ba56967ce5b53a8a6f713cdfcf", "type": "github" }, "original": { @@ -562,21 +472,6 @@ "type": "github" } }, - "nix-filter": { - "locked": { - "lastModified": 1731533336, - "narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "f7653272fd234696ae94229839a99b73c9ab7de0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "nix-filter", - "type": "github" - } - }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -584,11 +479,11 @@ ] }, "locked": { - "lastModified": 1731952509, - "narHash": "sha256-p4gB3Rhw8R6Ak4eMl8pqjCPOLCZRqaehZxdZ/mbFClM=", + "lastModified": 1737420293, + "narHash": "sha256-F1G5ifvqTpJq7fdkT34e/Jy9VCyzd5XfJ9TO8fHhJWE=", "owner": "nix-community", "repo": "nix-github-actions", - "rev": "7b5f051df789b6b20d259924d349a9ba3319b226", + "rev": "f4158fa080ef4503c8f4c820967d946c2af31ec9", "type": "github" }, "original": { @@ -599,11 +494,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1736798957, - "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=", + "lastModified": 1751792365, + "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", "owner": "NixOs", "repo": "nixpkgs", - "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3", + "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", "type": "github" }, "original": { @@ -616,11 +511,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1736798957, - "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=", + "lastModified": 1751792365, + "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", "owner": "NixOs", "repo": "nixpkgs", - "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3", + "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", "type": "github" }, "original": { @@ -665,32 +560,21 @@ }, "nixvim": { "inputs": { - "devshell": "devshell", - "flake-compat": "flake-compat_2", "flake-parts": [ "flake-parts" ], - "git-hooks": [ - "git-hooks" - ], - "home-manager": [ - "home-manager" - ], - "nix-darwin": [ - "nix-darwin" - ], "nixpkgs": [ "nixpkgs" ], "nuschtosSearch": "nuschtosSearch", - "treefmt-nix": "treefmt-nix" + "systems": "systems_2" }, "locked": { - "lastModified": 1736784172, - "narHash": "sha256-dXvzw4LmupgZb2VfwclzygiIyfqjnmKhTdjHDun2rDg=", + "lastModified": 1751904655, + "narHash": "sha256-lHAj9Xh/vBf3cXns1wN5HPw/zwGTO/Uv/ttloBok1n4=", "owner": "nix-community", "repo": "nixvim", - "rev": "a54b752259ff16d340d270928ee603b4b9599192", + "rev": "bc997a240953bda9fa526e8a3d6f798a6072308a", "type": "github" }, "original": { @@ -699,6 +583,32 @@ "type": "github" } }, + "nur": { + "inputs": { + "flake-parts": [ + "stylix", + "flake-parts" + ], + "nixpkgs": [ + "stylix", + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1748730660, + "narHash": "sha256-5LKmRYKdPuhm8j5GFe3AfrJL8dd8o57BQ34AGjJl1R0=", + "owner": "nix-community", + "repo": "NUR", + "rev": "2c0bc52fe14681e9ef60e3553888c4f086e46ecb", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NUR", + "type": "github" + } + }, "nuschtosSearch": { "inputs": { "flake-utils": "flake-utils_2", @@ -709,11 +619,11 @@ ] }, "locked": { - "lastModified": 1735854821, - "narHash": "sha256-Iv59gMDZajNfezTO0Fw6LHE7uKAShxbvMidmZREit7c=", + "lastModified": 1749730855, + "narHash": "sha256-L3x2nSlFkXkM6tQPLJP3oCBMIsRifhIDPMQQdHO5xWo=", "owner": "NuschtOS", "repo": "search", - "rev": "836908e3bddd837ae0f13e215dd48767aee355f0", + "rev": "8dfe5879dd009ff4742b668d9c699bc4b9761742", "type": "github" }, "original": { @@ -724,23 +634,20 @@ }, "prismlauncher": { "inputs": { - "flake-compat": [ - "flake-compat" - ], "libnbtplusplus": [ "libnbtplusplus" ], - "nix-filter": "nix-filter", "nixpkgs": [ "nixpkgs" - ] + ], + "qrcodegenerator": "qrcodegenerator" }, "locked": { - "lastModified": 1736374332, - "narHash": "sha256-GCOFgmO7euF9wYXtURx04J97kcQP2prUEejIkYnE5YA=", + "lastModified": 1751829858, + "narHash": "sha256-4Vm9dgf4SdOmxjAs9LW7td+Di+Ji+AW2c+bLvEbINfU=", "owner": "PrismLauncher", "repo": "PrismLauncher", - "rev": "f4f1d5f0d7ef6f518843ac5ecfec3ed04ddfaf6e", + "rev": "9559204c8fab02629aa97a14a4d7c7f0fb3680d3", "type": "github" }, "original": { @@ -749,6 +656,22 @@ "type": "github" } }, + "qrcodegenerator": { + "flake": false, + "locked": { + "lastModified": 1737616857, + "narHash": "sha256-6SugPt0lp1Gz7nV23FLmsmpfzgFItkSw7jpGftsDPWc=", + "owner": "nayuki", + "repo": "QR-Code-generator", + "rev": "2c9044de6b049ca25cb3cd1649ed7e27aa055138", + "type": "github" + }, + "original": { + "owner": "nayuki", + "repo": "QR-Code-generator", + "type": "github" + } + }, "ragenix": { "inputs": { "agenix": [ @@ -768,11 +691,11 @@ ] }, "locked": { - "lastModified": 1726755133, - "narHash": "sha256-03XIEjHeZEjHXctsXYUB+ZLQmM0WuhR6qWQjwekFk/M=", + "lastModified": 1744897914, + "narHash": "sha256-GIVU92o2TZBnKQXTb76zpQbWR4zjU2rFqWKNIIpXnqA=", "owner": "yaxitech", "repo": "ragenix", - "rev": "687ee92114bce9c4724376cf6b21235abe880bfa", + "rev": "40f2e17ecaeab4d78ec323e96a04548c0aaa5223", "type": "github" }, "original": { @@ -808,7 +731,7 @@ "rust-overlay": "rust-overlay", "sops-nix": "sops-nix", "stylix": "stylix", - "systems": "systems_3", + "systems": "systems_4", "treefmt-nix": "treefmt-nix_2", "wl-togglescreens": "wl-togglescreens" } @@ -820,11 +743,11 @@ ] }, "locked": { - "lastModified": 1736735482, - "narHash": "sha256-QOA4jCDyyUM9Y2Vba+HSZ/5LdtCMGaTE/7NkkUzBr50=", + "lastModified": 1751856221, + "narHash": "sha256-/QE1eV0ckFvgRMcKjZqgdJDoXFNwSMepwRoBjaw2MCk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "cf960a1938ee91200fe0d2f7b2582fde2429d562", + "rev": "34cae4b56929c5b340e1c5b10d9a98a425b2a51e", "type": "github" }, "original": { @@ -840,11 +763,11 @@ ] }, "locked": { - "lastModified": 1736808430, - "narHash": "sha256-wlgdf/n7bJMLBheqt1jmPoxJFrUP6FByKQFXuM9YvIk=", + "lastModified": 1751606940, + "narHash": "sha256-KrDPXobG7DFKTOteqdSVeL1bMVitDcy7otpVZWDE6MA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "553c7cb22fed19fd60eb310423fdc93045c51ba8", + "rev": "3633fc4acf03f43b260244d94c71e9e14a2f6e0d", "type": "github" }, "original": { @@ -860,30 +783,25 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-compat": [ - "flake-compat" - ], - "flake-utils": "flake-utils_3", - "git-hooks": "git-hooks_2", + "flake-parts": "flake-parts_2", "gnome-shell": "gnome-shell", - "home-manager": [ - "home-manager" - ], "nixpkgs": [ "nixpkgs" ], - "systems": "systems_2", + "nur": "nur", + "systems": "systems_3", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", + "tinted-schemes": "tinted-schemes", "tinted-tmux": "tinted-tmux", "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1736779864, - "narHash": "sha256-OgKIMua33t0ZcdcFiUntFKidwhZrRZUTLlVHJ+mAiZQ=", + "lastModified": 1751906932, + "narHash": "sha256-vRZH3bq24I/heef0AIFnaBmDGdQSpTmyjT4vtpa7qqk=", "owner": "danth", "repo": "stylix", - "rev": "934e2bfe7954d6c94f25d45cb12a8b3547825699", + "rev": "c538d1a3571386eaaca31aef7bb5fd5c155327b0", "type": "github" }, "original": { @@ -924,6 +842,21 @@ }, "systems_3": { "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_4": { + "locked": { "lastModified": 1700773236, "narHash": "sha256-yW1VEbKEYQwZfPKaHCORAS8JU08wQMKzPFkvXyDI/D8=", "ref": "refs/heads/main", @@ -957,28 +890,43 @@ "tinted-kitty": { "flake": false, "locked": { - "lastModified": 1716423189, - "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=", + "lastModified": 1735730497, + "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=", "owner": "tinted-theming", "repo": "tinted-kitty", - "rev": "eb39e141db14baef052893285df9f266df041ff8", + "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa", "type": "github" }, "original": { "owner": "tinted-theming", "repo": "tinted-kitty", - "rev": "eb39e141db14baef052893285df9f266df041ff8", + "type": "github" + } + }, + "tinted-schemes": { + "flake": false, + "locked": { + "lastModified": 1748180480, + "narHash": "sha256-7n0XiZiEHl2zRhDwZd/g+p38xwEoWtT0/aESwTMXWG4=", + "owner": "tinted-theming", + "repo": "schemes", + "rev": "87d652edd26f5c0c99deda5ae13dfb8ece2ffe31", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "schemes", "type": "github" } }, "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1729501581, - "narHash": "sha256-1ohEFMC23elnl39kxWnjzH1l2DFWWx4DhFNNYDTYt54=", + "lastModified": 1748740859, + "narHash": "sha256-OEM12bg7F4N5WjZOcV7FHJbqRI6jtCqL6u8FtPrlZz4=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "f0e7f7974a6441033eb0a172a0342e96722b4f14", + "rev": "57d5f9683ff9a3b590643beeaf0364da819aedda", "type": "github" }, "original": { @@ -1006,16 +954,17 @@ "treefmt-nix": { "inputs": { "nixpkgs": [ - "nixvim", + "stylix", + "nur", "nixpkgs" ] }, "locked": { - "lastModified": 1736154270, - "narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=", + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", "type": "github" }, "original": { @@ -1031,11 +980,11 @@ ] }, "locked": { - "lastModified": 1736154270, - "narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=", + "lastModified": 1750931469, + "narHash": "sha256-0IEdQB1nS+uViQw4k3VGUXntjkDp7aAlqcxdewb/hAc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b", + "rev": "ac8e6f32e11e9c7f153823abc3ab007f2a65d3e1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a5666a0..ef57e44 100644 --- a/flake.nix +++ b/flake.nix @@ -73,7 +73,7 @@ }; }; lanzaboote = { - url = "github:nix-community/lanzaboote/v0.4.1"; + url = "github:nix-community/lanzaboote/v0.4.2"; inputs = { crane.follows = "crane"; nixpkgs.follows = "nixpkgs"; diff --git a/flake/default.nix b/flake/default.nix index 8b8d634..63d8446 100644 --- a/flake/default.nix +++ b/flake/default.nix @@ -21,6 +21,7 @@ inherit (hooks) shellHook; buildInputs = hooks.enabledPackages; packages = with pkgs; [ + git-bug nil statix alejandra diff --git a/hm/gpg/default.nix b/hm/gpg/default.nix index 2632874..8bbfb22 100644 --- a/hm/gpg/default.nix +++ b/hm/gpg/default.nix @@ -7,21 +7,21 @@ enable = true; }; services.gpg-agent = { - enable = true; + enable = false; defaultCacheTtl = 60 * 50; defaultCacheTtlSsh = 60 * 50; maxCacheTtl = 60 * 50; maxCacheTtlSsh = 60 * 50; - pinentryPackage = pkgs.pinentry-curses; + pinentry.package = pkgs.pinentry-curses; enableSshSupport = true; sshKeys = ["4077454831C98FE4BE4A9C167186C5A63615B790"]; }; - programs.zsh.initExtraFirst = lib.mkBefore '' - current_tty="$(tty)" - tty() { echo "$current_tty"; } - SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) - gpg-connect-agent /bye - ''; + #programs.zsh.initContent = lib.mkBefore '' + # current_tty="$(tty)" + # tty() { echo "$current_tty"; } + # SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) + # gpg-connect-agent /bye + #''; #home.sessionVariables = { # GNUPGHOME = lib.mkForce ""; #}; diff --git a/hm/hyfetch/default.nix b/hm/hyfetch/default.nix deleted file mode 100644 index 596b26d..0000000 --- a/hm/hyfetch/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{...}: { - programs.hyfetch = { - enable = true; - settings = { - preset = "rainbow"; - mode = "rgb"; - light_dark = "dark"; - lightness = 0.5; - color_align = { - mode = "horizontal"; - custom_colors = []; - fore_back = null; - }; - backend = "neofetch"; - distro = null; - pride_month_shown = []; - }; - }; -} diff --git a/hm/mako/default.nix b/hm/mako/default.nix index 503ca1b..92e1b16 100644 --- a/hm/mako/default.nix +++ b/hm/mako/default.nix @@ -1,20 +1,22 @@ {...}: { services.mako = { enable = true; - #backgroundColor = "#2e3440"; - #borderColor = "#88c0d0"; - borderRadius = 25; - borderSize = 2; - defaultTimeout = 5000; - #font = "Source Code Pro 10"; - width = 500; - height = 500; - icons = true; - ignoreTimeout = true; - layer = "overlay"; - markup = true; # TODO - maxIconSize = 64; - sort = "-time"; + settings = { + #backgroundColor = "#2e3440"; + #borderColor = "#88c0d0"; + borderRadius = 25; + borderSize = 2; + defaultTimeout = 5000; + #font = "Source Code Pro 10"; + width = 500; + height = 500; + icons = true; + ignoreTimeout = true; + layer = "overlay"; + markup = true; # TODO + maxIconSize = 64; + sort = "-time"; + }; #extraConfig = '' # [urgency=low] # border-color=#cccccc diff --git a/hm/nixvim/config.nix b/hm/nixvim/config.nix index 58753b0..e333324 100644 --- a/hm/nixvim/config.nix +++ b/hm/nixvim/config.nix @@ -78,6 +78,7 @@ pkgs: { enable = true; settings = { powerline_fonts = 1; + theme = "base16_black_metal"; #"base16_gruvbox_dark_pale"; }; }; cmp = { @@ -191,6 +192,9 @@ pkgs: { }; vimtex = { enable = true; + settings = { + view_method = "zathura"; + }; }; web-devicons = { enable = true; diff --git a/hm/packages/default.nix b/hm/packages/default.nix index d37ff18..e94879a 100644 --- a/hm/packages/default.nix +++ b/hm/packages/default.nix @@ -12,8 +12,6 @@ in { godot_4 # gameengine # core tools neofetch # a must-have - hyfetch # permanent suggestions have their moments - fd # fast find lsd # ls in good ripgrep # amazing grep lf # file manager @@ -31,12 +29,16 @@ in { htop # resource usage exiftool # edit (photo) metadata + gimp # image manipulation + playerctl # for music control in eww # notification daemon mako libnotify + logseq # structured notes + gnome-boxes # virtualisation hugo # ssg @@ -109,7 +111,7 @@ in { # Programming Languages jdk # java - python39 # python + python3 # python # Rust cargo # rust package manager @@ -124,7 +126,7 @@ in { keepassxc # password manager - styx # static site generator in nix + #styx # static site generator in nix cmatrix # hacker tool lutris-free # another wine manager @@ -140,6 +142,7 @@ in { swaylock swaybg # wallpaper prismlauncher.packages.${pkgs.system}.prismlauncher # minecraft-launcher + luanti # gameengine wl-togglescreens.packages.${pkgs.system}.wl-togglescreens # toggle screens wlr-randr # xrand for wayland, needed by wl-togglescreens diff --git a/hm/silas/default.nix b/hm/silas/default.nix index e108aa4..d83289a 100644 --- a/hm/silas/default.nix +++ b/hm/silas/default.nix @@ -3,7 +3,6 @@ ../../modules/hm ../gpg ../gtk - ../hyfetch ../mako ../nixvim ../packages @@ -29,17 +28,24 @@ bat.enable = true; direnv.enable = true; etesync-dav.enable = true; + fd.enable = true; + fastfetch.enable = true; firefox.enable = true; foot.enable = true; + ghostty.enable = true; git.enable = true; + hyfetch.enable = true; hyprland.enable = true; + iamb.enable = true; jameica.enable = true; kdeconnect.enable = true; mail.enable = true; nextcloud.enable = true; sway.enable = true; + theming.enable = true; yt-dlp.enable = true; zathura.enable = true; + zellij.enable = true; }; programs.home-manager.enable = true; } diff --git a/hm/sils/default.nix b/hm/sils/default.nix index a078a7b..fcd29fb 100644 --- a/hm/sils/default.nix +++ b/hm/sils/default.nix @@ -3,7 +3,6 @@ ../../modules/hm ../gpg ../gtk - ../hyfetch ../mako ../nixvim ../packages @@ -29,17 +28,24 @@ bat.enable = true; direnv.enable = true; etesync-dav.enable = true; + fd.enable = true; + fastfetch.enable = true; firefox.enable = true; foot.enable = true; + ghostty.enable = true; git.enable = true; + hyfetch.enable = true; hyprland.enable = true; + iamb.enable = true; jameica.enable = true; kdeconnect.enable = true; mail.enable = true; nextcloud.enable = true; sway.enable = true; + theming.enable = true; yt-dlp.enable = true; zathura.enable = true; + zellij.enable = true; }; programs.home-manager.enable = true; } diff --git a/hm/zsh/default.nix b/hm/zsh/default.nix index 684493f..88a429d 100644 --- a/hm/zsh/default.nix +++ b/hm/zsh/default.nix @@ -2,6 +2,7 @@ config, pkgs, self, + lib, ... }: { programs.zsh = { @@ -61,12 +62,10 @@ addapache = "curl https://www.apache.org/licenses/LICENSE-2.0.txt > LICENSE"; }; - initExtraFirst = - builtins.readFile ./config/instant-prompt.zsh - + "source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme"; - # + - initExtra = - '' + initContent = lib.mkBefore (builtins.readFile ./config/instant-prompt.zsh + + "source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme" + + '' + rm -rf ~/.mozilla/firefox/default/containers.json.backup export ZSH=${pkgs.oh-my-zsh}/share/oh-my-zsh/ @@ -80,6 +79,6 @@ source $ZSH/oh-my-zsh.sh '' + builtins.readFile ./config/p10k.zsh - + builtins.readFile ./config/functions.zsh; + + builtins.readFile ./config/functions.zsh); }; } diff --git a/hosts/hplappi.nix b/hosts/hplappi.nix index 1e3dd45..ed4e189 100644 --- a/hosts/hplappi.nix +++ b/hosts/hplappi.nix @@ -1,7 +1,23 @@ -{config, ...}: { +{ + config, + lib, + pkgs, + ... +}: { role.sils = "laptop"; + + #services.xserver.enable = true; + #services.displayManager.gdm.enable = true; + #services.desktopManager.gnome.enable = true; + #services.tlp.enable = lib.mkForce false; + #services.greetd.enable = lib.mkForce false; + #services.gnome.gnome-keyring.enable = lib.mkForce false; + + environment.systemPackages = [pkgs.gnome-browser-connector]; + sils = { disks.enable = false; + docker.enable = true; meta = { bootPart = "/dev/disk/by-uuid/4064-2D6C"; globalDataDir = "/srv"; diff --git a/hosts/thinklappi-bootstrap/default.nix b/hosts/thinklappi-bootstrap/default.nix index 8fc94a7..3e1ed15 100644 --- a/hosts/thinklappi-bootstrap/default.nix +++ b/hosts/thinklappi-bootstrap/default.nix @@ -9,11 +9,12 @@ ]; hardware = { - opengl.enable = true; + graphics.enable = true; bluetooth.enable = true; + }; + services = { pulseaudio.enable = false; }; - security = { rtkit.enable = true; pam.services.swaylock = {}; diff --git a/modules/hm/sils/default.nix b/modules/hm/sils/default.nix index a3ff1ed..03cfaef 100644 --- a/modules/hm/sils/default.nix +++ b/modules/hm/sils/default.nix @@ -3,16 +3,23 @@ ./bat.nix ./direnv.nix ./etesync-dav.nix + ./fd.nix + ./fastfetch.nix ./firefox ./foot.nix + ./ghostty.nix ./git.nix + ./hyfetch.nix ./hyprland.nix + ./iamb.nix ./jameica.nix ./kdeconnect.nix ./mail.nix ./nextcloud.nix ./sway.nix + ./theming.nix ./yt-dlp.nix ./zathura.nix + ./zellij.nix ]; } diff --git a/modules/hm/sils/fastfetch.nix b/modules/hm/sils/fastfetch.nix new file mode 100644 index 0000000..f3efcab --- /dev/null +++ b/modules/hm/sils/fastfetch.nix @@ -0,0 +1,16 @@ +{ + config, + lib, + ... +}: let + cfg = config.sils.fastfetch; +in { + options.sils.fastfetch = { + enable = lib.mkEnableOption "fastfetch"; + }; + config = lib.mkIf cfg.enable { + programs.fastfetch = { + enable = true; + }; + }; +} diff --git a/modules/hm/sils/fd.nix b/modules/hm/sils/fd.nix new file mode 100644 index 0000000..7f8e35c --- /dev/null +++ b/modules/hm/sils/fd.nix @@ -0,0 +1,17 @@ +{ + config, + lib, + ... +}: let + cfg = config.sils.fd; +in { + options.sils.fd = { + enable = lib.mkEnableOption "fd, a fast find alternative"; + }; + + config = lib.mkIf cfg.enable { + programs.fd = { + enable = true; + }; + }; +} diff --git a/modules/hm/sils/firefox/default.nix b/modules/hm/sils/firefox/default.nix index b877c34..43d21b1 100644 --- a/modules/hm/sils/firefox/default.nix +++ b/modules/hm/sils/firefox/default.nix @@ -17,6 +17,7 @@ in { enable = lib.mkEnableOption "opinionated firefox configuration"; }; config = lib.mkIf cfg.enable { + stylix.targets.firefox.profileNames = ["default"]; programs.firefox = { enable = true; profiles = { @@ -38,8 +39,8 @@ in { isDefault = true; name = "default"; search = { - default = "DuckDuckGo"; - privateDefault = "DuckDuckGo"; + default = "ddg"; + privateDefault = "ddg"; force = true; }; }; diff --git a/modules/hm/sils/ghostty.nix b/modules/hm/sils/ghostty.nix new file mode 100644 index 0000000..cd871bc --- /dev/null +++ b/modules/hm/sils/ghostty.nix @@ -0,0 +1,15 @@ +{ + config, + lib, + ... +}: let + cfg = config.sils.ghostty; +in { + options.sils.ghostty.enable = lib.mkEnableOption "the ghostty terminal emulator"; + config = lib.mkIf cfg.enable { + programs.ghostty = { + enable = true; + enableZshIntegration = true; + }; + }; +} diff --git a/modules/hm/sils/git.nix b/modules/hm/sils/git.nix index 5bd4dd2..61093ac 100644 --- a/modules/hm/sils/git.nix +++ b/modules/hm/sils/git.nix @@ -27,7 +27,7 @@ in { }; signing = { key = "467B7D129EA73AC9"; - signByDefault = true; + signByDefault = false; }; extraConfig = { core = { @@ -46,7 +46,7 @@ in { verbose = true; }; sendemail = { - smtpserver = "server1.vhack.eu"; + smtpserver = "mail.foss-syndicate.org"; smtpuser = "sils@sils.li"; smtpencryption = "ssl"; smtpserverport = "465"; diff --git a/modules/hm/sils/hyfetch.nix b/modules/hm/sils/hyfetch.nix new file mode 100644 index 0000000..c06d8b0 --- /dev/null +++ b/modules/hm/sils/hyfetch.nix @@ -0,0 +1,31 @@ +{ + config, + lib, + ... +}: let + cfg = config.sils.hyfetch; +in { + options.sils.hyfetch = { + enable = lib.mkEnableOption "hyfetch"; + }; + + config = lib.mkIf cfg.enable { + programs.hyfetch = { + enable = true; + settings = { + preset = "rainbow"; + mode = "rgb"; + light_dark = "dark"; + lightness = 0.5; + color_align = { + mode = "horizontal"; + custom_colors = []; + fore_back = null; + }; + backend = "fastfetch"; + distro = null; + pride_month_shown = []; + }; + }; + }; +} diff --git a/modules/hm/sils/hyprland.nix b/modules/hm/sils/hyprland.nix index 39f0920..4de6524 100644 --- a/modules/hm/sils/hyprland.nix +++ b/modules/hm/sils/hyprland.nix @@ -9,6 +9,14 @@ in { options.sils.hyprland.enable = lib.mkEnableOption "sils hyprland config"; config = lib.mkIf cfg.enable { + home.pointerCursor = { + enable = true; + name = "Adwaita"; + gtk.enable = true; + x11.enable = true; + size = 24; + package = pkgs.adwaita-icon-theme; + }; wayland.windowManager.hyprland = { enable = true; settings = { @@ -23,6 +31,10 @@ in { # Source a file (multi-file configs) # source = ~/.config/hypr/myColors.conf + ecosystem = { + no_update_news = true; + }; + # Some default env vars. env = "XCURSOR_SIZE,24"; @@ -118,7 +130,7 @@ in { # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more bind = [ - "$mainMod, T, exec, foot" + "$mainMod, T, exec, ghostty" "$mainMod, C, killactive, " "$mainMod, M, exit, " "$mainMod, E, exec, dolphin " @@ -138,16 +150,16 @@ in { "$mainMod, down, movefocus, d" # Switch workspaces with mainMod + [0-9] - "$mainMod, 1, focusworkspaceoncurrentmonitor, 1" - "$mainMod, 2, focusworkspaceoncurrentmonitor, 2" - "$mainMod, 3, focusworkspaceoncurrentmonitor, 3" - "$mainMod, 4, focusworkspaceoncurrentmonitor, 4" - "$mainMod, 5, focusworkspaceoncurrentmonitor, 5" - "$mainMod, 6, focusworkspaceoncurrentmonitor, 6" - "$mainMod, 7, focusworkspaceoncurrentmonitor, 7" - "$mainMod, 8, focusworkspaceoncurrentmonitor, 8" - "$mainMod, 9, focusworkspaceoncurrentmonitor, 9" - "$mainMod, 0, focusworkspaceoncurrentmonitor, 10" + "$mainMod, 1, workspace, 1" + "$mainMod, 2, workspace, 2" + "$mainMod, 3, workspace, 3" + "$mainMod, 4, workspace, 4" + "$mainMod, 5, workspace, 5" + "$mainMod, 6, workspace, 6" + "$mainMod, 7, workspace, 7" + "$mainMod, 8, workspace, 8" + "$mainMod, 9, workspace, 9" + "$mainMod, 0, workspace, 10" # Move active window to a workspace with mainMod + SHIFT + [0-9] "$mainMod SHIFT, 1, movetoworkspace, 1" @@ -186,8 +198,9 @@ in { #exec-once=bash ~/.config/hypr/start.sh #exec-once=swww init & exec-once = [ + "${pkgs.hyprland}/bin/hyprctl ${config.home.pointerCursor.name} ${toString config.home.pointerCursor.size}" #"${pkgs.nwg-panel}/bin/nwg-panel" - #"nm-applet --indicator" + "${pkgs.networkmanagerapplet}/bin/nm-applet --indicator" #"${pkgs.waybar}/bin/waybar" "${pkgs.mako}/bin/mako" "${pkgs.swaybg}/bin/swaybg -i ${self}/files/wallpaper.jpg" diff --git a/modules/hm/sils/iamb.nix b/modules/hm/sils/iamb.nix new file mode 100644 index 0000000..2c6932a --- /dev/null +++ b/modules/hm/sils/iamb.nix @@ -0,0 +1,38 @@ +{ + config, + lib, + ... +}: let + cfg = config.sils.iamb; +in { + options = { + sils.iamb.enable = lib.mkEnableOption "iamb, a matrix tui client"; + }; + config = lib.mkIf cfg.enable { + programs.iamb = { + enable = true; + settings = { + profiles = { + ljs = { + user_id = "@sils:linksjugend-solid.de"; + url = "https://matrix.bak-it.de"; + }; + vhack = { + user_id = "@sils:vhack.eu"; + url = "https://matrix.vhack.eu"; + }; + }; + settings = { + notifications.enabled = true; + image_preview.protocol = { + type = "kitty"; + size = { + height = 10; + width = 66; + }; + }; + }; + }; + }; + }; +} diff --git a/modules/hm/sils/mail.nix b/modules/hm/sils/mail.nix index 06f6917..85583a2 100644 --- a/modules/hm/sils/mail.nix +++ b/modules/hm/sils/mail.nix @@ -6,11 +6,11 @@ }: let cfg = config.sils.mail; vhackImap = { - host = "server1.vhack.eu"; + host = "mail.foss-syndicate.org"; port = 993; }; vhackSmtp = { - host = "server1.vhack.eu"; + host = "mail.foss-syndicate.org"; port = 993; }; in { diff --git a/modules/hm/sils/theming.nix b/modules/hm/sils/theming.nix new file mode 100644 index 0000000..958560d --- /dev/null +++ b/modules/hm/sils/theming.nix @@ -0,0 +1,24 @@ +{ + config, + lib, + pkgs, + ... +}: let + cfg = config.sils.theming; +in { + options.sils.theming.enable = lib.mkEnableOption "theming"; + config = lib.mkIf cfg.enable { + stylix = { + enable = true; + iconTheme = { + enable = true; + dark = "Papirus-dark"; + light = "Papirus-light"; + package = pkgs.catppuccin-papirus-folders.override { + flavor = "mocha"; + accent = "mauve"; + }; + }; + }; + }; +} diff --git a/modules/hm/sils/zellij.nix b/modules/hm/sils/zellij.nix new file mode 100644 index 0000000..1038a0c --- /dev/null +++ b/modules/hm/sils/zellij.nix @@ -0,0 +1,14 @@ +{ + config, + lib, + ... +}: let + cfg = config.sils.zellij; +in { + options.sils.zellij.enable = lib.mkEnableOption "zellij"; + config = lib.mkIf cfg.enable { + programs.zellij = { + enable = true; + }; + }; +} diff --git a/modules/nixos/sils/default.nix b/modules/nixos/sils/default.nix index 0f714f7..01870c8 100644 --- a/modules/nixos/sils/default.nix +++ b/modules/nixos/sils/default.nix @@ -5,6 +5,7 @@ ./bluetooth.nix ./bootloader.nix ./disks.nix + ./docker.nix ./environment.nix ./firejail.nix ./font.nix @@ -19,6 +20,7 @@ ./plymouth.nix ./printing.nix ./roles.nix + ./sound.nix ./sudo.nix ./sway.nix ./theming diff --git a/modules/nixos/sils/docker.nix b/modules/nixos/sils/docker.nix new file mode 100644 index 0000000..7d6f046 --- /dev/null +++ b/modules/nixos/sils/docker.nix @@ -0,0 +1,24 @@ +{ + config, + lib, + ... +}: let + cfg = config.sils.docker; +in { + options.sils.docker.enable = lib.mkEnableOption "docker"; + config = lib.mkIf cfg.enable { + virtualisation.docker = { + enable = true; + storageDriver = "btrfs"; + }; + users.users.sils.extraGroups = ["docker"]; + environment.persistence."/srv".directories = [ + { + directory = "/var/lib/docker"; + user = "docker"; + group = "docker"; + mode = "0755"; + } + ]; + }; +} diff --git a/modules/nixos/sils/impermanence.nix b/modules/nixos/sils/impermanence.nix index 4acdc6f..cf67a91 100644 --- a/modules/nixos/sils/impermanence.nix +++ b/modules/nixos/sils/impermanence.nix @@ -32,6 +32,12 @@ in { group = "root"; mode = "0755"; } + { + directory = "/var/log"; + user = "root"; + group = "root"; + mode = "0755"; + } ]; }; } diff --git a/modules/nixos/sils/nix.nix b/modules/nixos/sils/nix.nix index c23fdce..9d73fcd 100644 --- a/modules/nixos/sils/nix.nix +++ b/modules/nixos/sils/nix.nix @@ -14,8 +14,8 @@ in { config = { nix = { registry = { - nixpkgs.flake = nixpkgs; - n.flake = nixpkgs; + nixpkgs.flake = self.inputs.nixpkgs; + n.flake = self.inputs.nixpkgs; self.flake = self; s.flake = self; }; diff --git a/modules/nixos/sils/printing.nix b/modules/nixos/sils/printing.nix index d447255..9247146 100644 --- a/modules/nixos/sils/printing.nix +++ b/modules/nixos/sils/printing.nix @@ -11,12 +11,33 @@ in { services = { printing = { enable = true; - #drivers = with pkgs; [hplip]; # if building again: epson-escpr + startWhenNeeded = true; + webInterface = true; + stateless = true; + drivers = with pkgs; [epson-escpr epson-escpr2 hplip]; }; avahi = { enable = true; + nssmdns4 = true; + nssmdns6 = true; openFirewall = true; }; }; + + hardware.printers = { + ensureDefaultPrinter = "EPSON_ET-2720_Series"; + ensurePrinters = [ + { + name = "EPSON_ET-2720_Series"; + description = "EPSON ET-2720 Series"; + model = "epson-inkjet-printer-escpr/Epson-ET-2720_Series-epson-escpr-en.ppd"; + location = "Home Network"; + deviceUri = "dnssd://EPSON%20ET-2720%20Series._ipp._tcp.local/?uuid=cfe92100-67c4-11d4-a45f-e0bb9edcdbb9"; + ppdOptions = { + PageSize = "A4"; + }; + } + ]; + }; }; } diff --git a/modules/nixos/sils/roles.nix b/modules/nixos/sils/roles.nix index cca3cf6..346149c 100644 --- a/modules/nixos/sils/roles.nix +++ b/modules/nixos/sils/roles.nix @@ -24,6 +24,7 @@ in { pamconfig.enable = lib.mkDefault true; plymouth.enable = lib.mkDefault true; printing.enable = lib.mkDefault true; + sound.enable = lib.mkDefault true; sway.enable = lib.mkDefault false; theming.enable = lib.mkDefault true; } @@ -45,6 +46,7 @@ in { pamconfig.enable = lib.mkDefault true; plymouth.enable = lib.mkDefault false; printing.enable = lib.mkDefault true; + sound.enable = lib.mkDefault true; sway.enable = lib.mkDefault false; theming.enable = lib.mkDefault true; } @@ -68,6 +70,7 @@ in { pamconfig.enable = lib.mkDefault true; plymouth.enable = lib.mkDefault false; printing.enable = lib.mkDefault true; + sound.enable = lib.mkDefault true; sway.enable = lib.mkDefault false; theming.enable = lib.mkDefault true; } diff --git a/modules/nixos/sils/sound.nix b/modules/nixos/sils/sound.nix new file mode 100644 index 0000000..3ad26fb --- /dev/null +++ b/modules/nixos/sils/sound.nix @@ -0,0 +1,20 @@ +{ + config, + lib, + ... +}: let + cfg = config.sils.sound; +in { + options.sils.sound.enable = lib.mkEnableOption "sound config"; + config = lib.mkIf cfg.enable { + services.pipewire = { + enable = true; + alsa = { + enable = true; + support32Bit = true; + }; + pulse.enable = true; + jack.enable = true; + }; + }; +} diff --git a/sys/default.nix b/sys/default.nix index 0eeeb35..ac71548 100644 --- a/sys/default.nix +++ b/sys/default.nix @@ -2,7 +2,6 @@ imports = [ ./packages ./services - ./sound ./systemd ./users ./virtualisation diff --git a/sys/packages/default.nix b/sys/packages/default.nix index 666fb21..93ec0c5 100644 --- a/sys/packages/default.nix +++ b/sys/packages/default.nix @@ -18,5 +18,7 @@ mosh # ssh in great zsh-you-should-use # reminder for aliasses + + adwaita-icon-theme ]; } diff --git a/sys/services/default.nix b/sys/services/default.nix index 7546fcc..22c7621 100644 --- a/sys/services/default.nix +++ b/sys/services/default.nix @@ -1,5 +1,6 @@ {...}: { imports = [ + ./flatpak ./fwupd ./greetd ./logind diff --git a/sys/sound/default.nix b/sys/sound/default.nix deleted file mode 100644 index 3007098..0000000 --- a/sys/sound/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{...}: { - services.pipewire = { - enable = true; - alsa = { - enable = true; - support32Bit = true; - }; - pulse.enable = true; - jack.enable = true; - }; -} diff --git a/sys/systemd/default.nix b/sys/systemd/default.nix index 2325e4c..b7bdbfb 100644 --- a/sys/systemd/default.nix +++ b/sys/systemd/default.nix @@ -1,5 +1,5 @@ {...}: { systemd.sleep.extraConfig = '' - HibernateDelaySec=5m + HibernateDelaySec=10m ''; } |