diff options
34 files changed, 663 insertions, 519 deletions
diff --git a/flake.lock b/flake.lock index 0785352..12f7e10 100644 --- a/flake.lock +++ b/flake.lock @@ -16,11 +16,11 @@ ] }, "locked": { - "lastModified": 1736955230, - "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=", + "lastModified": 1754433428, + "narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=", "owner": "ryantm", "repo": "agenix", - "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c", + "rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d", "type": "github" }, "original": { @@ -32,11 +32,11 @@ "arkenfox-user-js": { "flake": false, "locked": { - "lastModified": 1736708527, - "narHash": "sha256-/JQo2XnLF8qfSQKvjuFDtvzzz/QHO/dLBHJO4vLOXNk=", + "lastModified": 1755109759, + "narHash": "sha256-+DN5bKev9IyefMikOqEWZf/u0flJbLAxwEotGhKSSS4=", "owner": "arkenfox", "repo": "user.js", - "rev": "c25187332e19c633b956a6755a7971a6591d3e8d", + "rev": "9103afafff2b5287b495c1a1268968fdb447d66f", "type": "github" }, "original": { @@ -50,11 +50,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1732200724, - "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=", + "lastModified": 1755819240, + "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "153d52373b0fb2d343592871009a286ec8837aec", + "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6", "type": "github" }, "original": { @@ -82,11 +82,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1736852337, - "narHash": "sha256-esD42YdgLlEh7koBrSqcT7p2fsMctPAcGl/+2sYJa2o=", + "lastModified": 1752979451, + "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "03860521c40b0b9c04818f2218d9cc9efc21e7a5", + "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac", "type": "github" }, "original": { @@ -114,11 +114,11 @@ }, "crane": { "locked": { - "lastModified": 1739053031, - "narHash": "sha256-LrMDRuwAlRFD2T4MgBSRd1s2VtOE+Vl1oMCNu3RpPE0=", + "lastModified": 1757183466, + "narHash": "sha256-kTdCCMuRE+/HNHES5JYsbRHmgtr+l9mOtf5dpcMppVc=", "owner": "ipetkov", "repo": "crane", - "rev": "112e6591b2d6313b1bd05a80a754a8ee42432a7e", + "rev": "d599ae4847e7f87603e7082d73ca673aa93c916d", "type": "github" }, "original": { @@ -127,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": [ @@ -155,11 +134,11 @@ ] }, "locked": { - "lastModified": 1739353546, - "narHash": "sha256-YTqXhBZvCdZLMBupWlCDvRFaTEhaHa2/Xc/p1sUdSZU=", + "lastModified": 1757508292, + "narHash": "sha256-7lVWL5bC6xBIMWWDal41LlGAG+9u2zUorqo3QCUL4p4=", "owner": "nix-community", "repo": "disko", - "rev": "26ade1005191e0602a78b0f141970648445bafd9", + "rev": "146f45bee02b8bd88812cfce6ffc0f933788875a", "type": "github" }, "original": { @@ -171,11 +150,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1736899990, - "narHash": "sha256-S79Hqn2EtSxU4kp99t8tRschSifWD4p/51++0xNWUxw=", + "lastModified": 1756083905, + "narHash": "sha256-UqYGTBgI5ypGh0Kf6zZjom/vABg7HQocB4gmxzl12uo=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "91ca1f82d717b02ceb03a3f423cbe8082ebbb26d", + "rev": "b655eaf16d4cbec9c3472f62eee285d4b419a808", "type": "github" }, "original": { @@ -187,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": { @@ -200,20 +179,6 @@ "type": "github" } }, - "flake-compat_2": { - "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "revCount": 69, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -221,11 +186,11 @@ ] }, "locked": { - "lastModified": 1738453229, - "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", + "rev": "4524271976b625a4a605beefd893f270620fd751", "type": "github" }, "original": { @@ -234,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": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "4524271976b625a4a605beefd893f270620fd751", "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, @@ -272,12 +240,9 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_2": { "inputs": { - "systems": [ - "stylix", - "systems" - ] + "systems": "systems" }, "locked": { "lastModified": 1731533236, @@ -322,37 +287,11 @@ ] }, "locked": { - "lastModified": 1737465171, - "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", - "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" - ] - }, - "locked": { - "lastModified": 1735882644, - "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", + "lastModified": 1757588530, + "narHash": "sha256-tJ7A8mID3ct69n9WCvZ3PzIIl3rXTdptn/lZmqSS95U=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", + "rev": "b084b2c2b6bc23e83bbfe583b03664eb0b18c411", "type": "github" }, "original": { @@ -381,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" } @@ -427,11 +344,11 @@ ] }, "locked": { - "lastModified": 1739458725, - "narHash": "sha256-k9AeUzs3phaTgfljRslR4iNTX9svBNhxoIw4QLd/V70=", + "lastModified": 1757598712, + "narHash": "sha256-5PWVrdMp8u31Q247jqnJcwxKg3MJrs1TadTyTBRVBDY=", "owner": "nix-community", "repo": "home-manager", - "rev": "22b418c13fb0be43f4bc5c185f323a3237028594", + "rev": "6d7c11a0adee0db21e3a8ef90ae07bb89bc20b8f", "type": "github" }, "original": { @@ -469,16 +386,16 @@ ] }, "locked": { - "lastModified": 1729958008, - "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", + "lastModified": 1754860581, + "narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=", "owner": "NuschtOS", "repo": "ixx", - "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", + "rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281", "type": "github" }, "original": { "owner": "NuschtOS", - "ref": "v0.0.6", + "ref": "v0.1.1", "repo": "ixx", "type": "github" } @@ -522,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": { @@ -542,11 +459,11 @@ ] }, "locked": { - "lastModified": 1739302241, - "narHash": "sha256-NXQXFU6HOschZ+8ZKrNOlwlHelez8vPl+dCiUaJ82/U=", + "lastModified": 1757430124, + "narHash": "sha256-MhDltfXesGH8VkGv3hmJ1QEKl1ChTIj9wmGAFfWj/Wk=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "a6746213b138fe7add88b19bafacd446de574ca7", + "rev": "830b3f0b50045cf0bcfd4dab65fad05bf882e196", "type": "github" }, "original": { @@ -555,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": [ @@ -592,11 +494,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739214665, - "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", + "lastModified": 1757487488, + "narHash": "sha256-zwE/e7CuPJUWKdvvTCB7iunV4E/+G0lKfv4kk/5Izdg=", "owner": "NixOs", "repo": "nixpkgs", - "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", + "rev": "ab0f3607a6c7486ea22229b92ed2d355f1482ee0", "type": "github" }, "original": { @@ -609,11 +511,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1739214665, - "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", + "lastModified": 1757487488, + "narHash": "sha256-zwE/e7CuPJUWKdvvTCB7iunV4E/+G0lKfv4kk/5Izdg=", "owner": "NixOs", "repo": "nixpkgs", - "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", + "rev": "ab0f3607a6c7486ea22229b92ed2d355f1482ee0", "type": "github" }, "original": { @@ -658,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": 1739353096, - "narHash": "sha256-w/T2uYCoq4k6K46GX2CMGWsKfMvcqnxC41LIgnvGifE=", + "lastModified": 1757619215, + "narHash": "sha256-AAg3S94zMF4BtByF2k9/K/tbC0awNHCc50GxCjccUhw=", "owner": "nix-community", "repo": "nixvim", - "rev": "78b6f8e1e5b37a7789216e17a96ebc117660f0e7", + "rev": "43c6f7293eba3fa5ff699e339e55270305e51cab", "type": "github" }, "original": { @@ -692,6 +583,31 @@ "type": "github" } }, + "nur": { + "inputs": { + "flake-parts": [ + "stylix", + "flake-parts" + ], + "nixpkgs": [ + "stylix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1756961635, + "narHash": "sha256-hETvQcILTg5kChjYNns1fD5ELdsYB/VVgVmBtqKQj9A=", + "owner": "nix-community", + "repo": "NUR", + "rev": "6ca27b2654ac55e3f6e0ca434c1b4589ae22b370", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NUR", + "type": "github" + } + }, "nuschtosSearch": { "inputs": { "flake-utils": "flake-utils_2", @@ -702,11 +618,11 @@ ] }, "locked": { - "lastModified": 1738508923, - "narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=", + "lastModified": 1756738487, + "narHash": "sha256-8QX7Ab5CcICp7zktL47VQVS+QeaU4YDNAjzty7l7TQE=", "owner": "NuschtOS", "repo": "search", - "rev": "86e2038290859006e05ca7201425ea5b5de4aecb", + "rev": "5feeaeefb571e6ca2700888b944f436f7c05149b", "type": "github" }, "original": { @@ -717,23 +633,20 @@ }, "prismlauncher": { "inputs": { - "flake-compat": [ - "flake-compat" - ], "libnbtplusplus": [ "libnbtplusplus" ], - "nix-filter": "nix-filter", "nixpkgs": [ "nixpkgs" - ] + ], + "qrcodegenerator": "qrcodegenerator" }, "locked": { - "lastModified": 1739447041, - "narHash": "sha256-2ic0ztS7/A1++UYkbNkWXz4SGqQf31qHD2TnXHzOijw=", + "lastModified": 1757345386, + "narHash": "sha256-ZuP+3O2i1gR63OFw/7Rqe5GNkgdXjruXH7FLqz1r5Cg=", "owner": "PrismLauncher", "repo": "PrismLauncher", - "rev": "3e4fc2ff3b5a314e5c618053137ce5c8f8c41eb8", + "rev": "2ed5650c4fa5d48965515644311520c38c181167", "type": "github" }, "original": { @@ -742,6 +655,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": [ @@ -761,11 +690,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": { @@ -801,8 +730,8 @@ "rust-overlay": "rust-overlay", "sops-nix": "sops-nix", "stylix": "stylix", - "systems": "systems_3", - "treefmt-nix": "treefmt-nix_2", + "systems": "systems_4", + "treefmt-nix": "treefmt-nix", "wl-togglescreens": "wl-togglescreens" } }, @@ -813,11 +742,11 @@ ] }, "locked": { - "lastModified": 1739413688, - "narHash": "sha256-57OAXXYhOibG7Rqhhr4ecI1H8mtDJB2uj0T8rbQVGLY=", + "lastModified": 1757558036, + "narHash": "sha256-DyZaeaHy8iibckZ63XOqYJtEHc3kmVy8JrBIBV/GQHI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "675a6427d505f140dab8c56379afb66d4f55800b", + "rev": "b8adf899786b7b77b8c3636a9b753e3622f00db0", "type": "github" }, "original": { @@ -833,11 +762,11 @@ ] }, "locked": { - "lastModified": 1739262228, - "narHash": "sha256-7JAGezJ0Dn5qIyA2+T4Dt/xQgAbhCglh6lzCekTVMeU=", + "lastModified": 1757503115, + "narHash": "sha256-S9F6bHUBh+CFEUalv/qxNImRapCxvSnOzWBUZgK1zDU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "07af005bb7d60c7f118d9d9f5530485da5d1e975", + "rev": "0bf793823386187dff101ee2a9d4ed26de8bbf8c", "type": "github" }, "original": { @@ -853,19 +782,13 @@ "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", @@ -873,11 +796,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1739375014, - "narHash": "sha256-0fNbvZ1Dod4rDIfwGnC7CzJ3wRFSF1v5AvNCmNkVgXo=", + "lastModified": 1757360005, + "narHash": "sha256-VwzdFEQCpYMU9mc7BSQGQe5wA1MuTYPJnRc9TQCTMcM=", "owner": "danth", "repo": "stylix", - "rev": "e86de61bb8f5f2b6459d0be3e3291ad16db4b777", + "rev": "834a743c11d66ea18e8c54872fbcc72ce48bc57f", "type": "github" }, "original": { @@ -918,6 +841,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", @@ -951,28 +889,27 @@ "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": 1737565458, - "narHash": "sha256-y+9cvOA6BLKT0WfebDsyUpUa/YxKow9hTjBp6HpQv68=", + "lastModified": 1754779259, + "narHash": "sha256-8KG2lXGaXLUE0F/JVwLQe7kOVm21IDfNEo0gfga5P4M=", "owner": "tinted-theming", "repo": "schemes", - "rev": "ae31625ba47aeaa4bf6a98cf11a8d4886f9463d9", + "rev": "097d751b9e3c8b97ce158e7d141e5a292545b502", "type": "github" }, "original": { @@ -984,11 +921,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1735737224, - "narHash": "sha256-FO2hRBkZsjlIRqzNHCPc/52yxg11kHGA8MEtSun9RwE=", + "lastModified": 1754788770, + "narHash": "sha256-LAu5nBr7pM/jD9jwFc6/kyFY4h7Us4bZz7dvVvehuwo=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "aead506a9930c717ebf81cc83a2126e9ca08fa64", + "rev": "fb2175accef8935f6955503ec9dd3c973eec385c", "type": "github" }, "original": { @@ -1000,11 +937,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1725758778, - "narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=", + "lastModified": 1755613540, + "narHash": "sha256-zBFrrTxHLDMDX/OYxkCwGGbAhPXLi8FrnLhYLsSOKeY=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "122c9e5c0e6f27211361a04fae92df97940eccf9", + "rev": "937bada16cd3200bdbd3a2f5776fc3b686d5cba0", "type": "github" }, "original": { @@ -1016,36 +953,15 @@ "treefmt-nix": { "inputs": { "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1738680491, - "narHash": "sha256-8X7tR3kFGkE7WEF5EXVkt4apgaN85oHZdoTGutCFs6I=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "64dbb922d51a42c0ced6a7668ca008dded61c483", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt-nix_2": { - "inputs": { - "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1738953846, - "narHash": "sha256-yrK3Hjcr8F7qS/j2F+r7C7o010eVWWlm4T1PrbKBOxQ=", + "lastModified": 1756662192, + "narHash": "sha256-F1oFfV51AE259I85av+MAia221XwMHCOtZCMcZLK2Jk=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "4f09b473c936d41582dd744e19f34ec27592c5fd", + "rev": "1aabc6c05ccbcbf4a635fb7a90400e44282f61c4", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ef57e44..2d8eef5 100644 --- a/flake.nix +++ b/flake.nix @@ -30,7 +30,6 @@ flake-compat.follows = "flake-compat"; gitignore.follows = "gitignore"; nixpkgs.follows = "nixpkgs"; - nixpkgs-stable.follows = "nixpkgs-stable"; }; }; @@ -67,9 +66,6 @@ inputs = { nixpkgs.follows = "nixpkgs"; flake-parts.follows = "flake-parts"; - git-hooks.follows = "git-hooks"; - home-manager.follows = "home-manager"; - nix-darwin.follows = "nix-darwin"; }; }; lanzaboote = { @@ -79,7 +75,6 @@ nixpkgs.follows = "nixpkgs"; flake-compat.follows = "flake-compat"; flake-parts.follows = "flake-parts"; - flake-utils.follows = "flake-utils"; pre-commit-hooks-nix.follows = "git-hooks"; rust-overlay.follows = "rust-overlay"; }; @@ -90,13 +85,11 @@ url = "github:danth/stylix"; inputs = { nixpkgs.follows = "nixpkgs"; - home-manager.follows = "home-manager"; - flake-compat.follows = "flake-compat"; }; }; systems = { - url = "git+https://codeberg.org/sils/systems"; # specify systems to evaluate + url = "git+https://codeberg.org/sils/systems"; # specify systems to evaluate }; sops-nix = { url = "github:Mic92/sops-nix"; @@ -130,7 +123,6 @@ prismlauncher = { url = "github:PrismLauncher/PrismLauncher"; inputs = { - flake-compat.follows = "flake-compat"; libnbtplusplus.follows = "libnbtplusplus"; nixpkgs.follows = "nixpkgs"; }; 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/mako/default.nix b/hm/mako/default.nix deleted file mode 100644 index 503ca1b..0000000 --- a/hm/mako/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{...}: { - 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"; - #extraConfig = '' - # [urgency=low] - # border-color=#cccccc - - # [urgency=normal] - # border-color=#d08770 - - # [urgency=high] - # border-size=3 - # border-color=#bf616a - # default-timeout=0 - - # [urgency=critical] - # border-size=4 - # border-color=#bf616a - # default-timeout=0 - - # [category=mpd] - # default-timeout=2000 - # group-by=category - #''; - }; -} diff --git a/hm/nixvim/config.nix b/hm/nixvim/config.nix index 58753b0..cedf950 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 = { @@ -140,7 +141,7 @@ pkgs: { lspkind = { enable = true; - cmp = { + settings.cmp = { enable = true; menu = { nvim_lsp = "[LSP]"; @@ -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 9108d24..458d979 100644 --- a/hm/packages/default.nix +++ b/hm/packages/default.nix @@ -8,143 +8,144 @@ pkgs-pinned = nixpkgs-pinned.legacyPackages.${pkgs.system}; in { home.packages = with pkgs; - with pkgs.libsForQt5; [ - godot_4 # gameengine - # core tools - neofetch # a must-have - lsd # ls in good - ripgrep # amazing grep - lf # file manager - kitty # terminal - alacritty # terminal - glow # markdown rendering - restic # backups - tree # tree view of directories - nmap # network scanning - rofi-wayland # application launcher - wofi # rofi with gtk - xdg-utils # mainly used for xdg-openA - git-crypt # obscure git repos - wl-clipboard # clipboard cli for wayland - htop # resource usage - exiftool # edit (photo) metadata - - playerctl # for music control in eww + [ + godot_4 # gameengine + # core tools + neofetch # a must-have + lsd # ls in good + ripgrep # amazing grep + lf # file manager + kitty # terminal + alacritty # terminal + glow # markdown rendering + restic # backups + tree # tree view of directories + nmap # network scanning + rofi-wayland # application launcher + xdg-utils # mainly used for xdg-openA + git-crypt # obscure git repos + wl-clipboard # clipboard cli for wayland + htop # resource usage + exiftool # edit (photo) metadata - # notification daemon - mako - libnotify - - gnome-boxes # virtualisation - - hugo # ssg - - # wallpaper deamon - swww - - networkmanagerapplet - - nextcloud-client - - grim # screenshots - slurp # select utility - - #database - sqlitebrowser # graphical interactive sqlitedb management - - # Hardware - sbctl # secure boot management - - # text production/office - libreoffice # graphical office suite - pdfarranger # gui for pdf arranging - - # LaTeX - texlive.combined.scheme-full # LaTeX - texlab # latex language server - - pkgs-pinned.calibre # ebook management - - html-tidy # html formatter - ltex-ls # lsp language server for languagetool - - musescore # notesetting program - - # communication - signal-desktop # the ecosystem is moving :( - signal-cli # use signal without phone - mumble # voice chat - element-desktop # chat - tdesktop # telegram messenger - thunderbird # emails - briar-desktop # privacy first - - # Browser - ungoogled-chromium # just in case - tor-browser-bundle-bin # tor-browser - - # archives - unzip - zip - _7zz - - qtstyleplugin-kvantum # theming - - # image editing - inkscape # vector graphics - imagemagick # powerful cli-tool - - # multimedia - sayonara # audioplayer - vlc # audio and video - mpv # videos - pulseaudio # audio control - imv # image viewing cli - - # Compiler - gcc - execline - - # Programming Languages - jdk # java - python39 # python - - # Rust - cargo # rust package manager - rustfmt # rust formatter - rust-analyzer # rust language server - rustc # rust compiler + gimp # image manipulation - # Nix Stuff - alejandra # nix code formatter - nil # nix language-server - statix # nix linter + playerctl # for music control in eww + + # notification daemon + libnotify + + logseq # structured notes + + gnome-boxes # virtualisation + + hugo # ssg + + # wallpaper deamon + swww + + networkmanagerapplet + + nextcloud-client + + grim # screenshots + slurp # select utility + + #database + sqlitebrowser # graphical interactive sqlitedb management + + # Hardware + sbctl # secure boot management + + # text production/office + libreoffice # graphical office suite + pdfarranger # gui for pdf arranging + + # LaTeX + texlive.combined.scheme-full # LaTeX + texlab # latex language server + + pkgs-pinned.calibre # ebook management + + html-tidy # html formatter + ltex-ls # lsp language server for languagetool + + musescore # notesetting program + + # communication + signal-desktop # the ecosystem is moving :( + signal-cli # use signal without phone + mumble # voice chat + element-desktop # chat + tdesktop # telegram messenger + thunderbird # emails + briar-desktop # privacy first + + # Browser + ungoogled-chromium # just in case + tor-browser-bundle-bin # tor-browser + + # archives + unzip + zip + _7zz + + # image editing + inkscape # vector graphics + imagemagick # powerful cli-tool + + # multimedia + sayonara # audioplayer + vlc # audio and video + mpv # videos + pulseaudio # audio control + imv # image viewing cli + + # Compiler + gcc + execline + + # Programming Languages + jdk # java + python3 # python + + # Rust + cargo # rust package manager + rustfmt # rust formatter + rust-analyzer # rust language server + rustc # rust compiler - keepassxc # password manager + # Nix Stuff + alejandra # nix code formatter + nil # nix language-server + statix # nix linter - styx # static site generator in nix - cmatrix # hacker tool + keepassxc # password manager - lutris-free # another wine manager - wineWowPackages.waylandFull # wine + #styx # static site generator in nix + cmatrix # hacker tool - okular # pdf viewer + lutris-free # another wine manager + wineWowPackages.waylandFull # wine - # windowmanager - nwg-panel - brightnessctl # control brightness - river - yambar - swaylock - swaybg # wallpaper - prismlauncher.packages.${pkgs.system}.prismlauncher # minecraft-launcher - luanti # gameengine + # windowmanager + nwg-panel + brightnessctl # control brightness + yambar + 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 + wl-togglescreens.packages.${pkgs.system}.wl-togglescreens # toggle screens + wlr-randr # xrand for wayland, needed by wl-togglescreens - # soispha + # soispha - #grades.outputs.packages.${system}.default - ]; + #grades.outputs.packages.${system}.default + ] + ++ (with pkgs.kdePackages; [ + okular # pdf viewer + qtstyleplugin-kvantum # theming + ]); } diff --git a/hm/silas/default.nix b/hm/silas/default.nix index 89551a8..6c54d0a 100644 --- a/hm/silas/default.nix +++ b/hm/silas/default.nix @@ -3,7 +3,6 @@ ../../modules/hm ../gpg ../gtk - ../mako ../nixvim ../packages ../rofi @@ -15,7 +14,7 @@ ../waybar ../xdg ../zsh - nixvim.homeManagerModules.nixvim + nixvim.homeModules.nixvim ]; home = { @@ -32,9 +31,11 @@ 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; @@ -43,6 +44,7 @@ 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 c7343de..bd3ccf6 100644 --- a/hm/sils/default.nix +++ b/hm/sils/default.nix @@ -3,7 +3,6 @@ ../../modules/hm ../gpg ../gtk - ../mako ../nixvim ../packages ../rofi @@ -15,7 +14,7 @@ ../waybar ../xdg ../zsh - nixvim.homeManagerModules.nixvim + nixvim.homeModules.nixvim ]; home = { @@ -32,17 +31,23 @@ 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; + poweralertd.enable = true; sway.enable = true; + swaync.enable = true; theming.enable = true; + wofi.enable = true; yt-dlp.enable = true; zathura.enable = true; + zellij.enable = true; }; programs.home-manager.enable = true; } diff --git a/hm/ssh/default.nix b/hm/ssh/default.nix index c7b8e20..d123a6a 100644 --- a/hm/ssh/default.nix +++ b/hm/ssh/default.nix @@ -1,8 +1,9 @@ {...}: { - services.ssh-agent.enable = false; + services.ssh-agent.enable = true; programs.ssh = { enable = true; + enableDefaultConfig = false; matchBlocks = let genBox = user: { inherit user; @@ -10,6 +11,18 @@ }; username = "u384702"; in { + "*" = { + forwardAgent = false; + addKeysToAgent = "no"; + compression = false; + serverAliveInterval = 0; + serverAliveCountMax = 3; + hashKnownHosts = false; + userKnownHostsFile = "~/.ssh/known_hosts"; + controlMaster = "no"; + controlPath = "~/.ssh/master-%r@%n:%p"; + controlPersist = "no"; + }; "storagebox" = genBox username; "storagebox-1" = genBox "${username}-sub1"; }; diff --git a/hm/waybar/default.nix b/hm/waybar/default.nix index 18b659c..201e15d 100644 --- a/hm/waybar/default.nix +++ b/hm/waybar/default.nix @@ -5,9 +5,19 @@ mainBar = { layer = "top"; position = "top"; - modules-left = ["hyprland/workspaces" "clock"]; + modules-left = [ + "hyprland/workspaces" + "clock" + ]; modules-center = ["hyprland/window"]; - modules-right = ["pulseaudio" "network" "backlight" "battery" "tray"]; + modules-right = [ + "pulseaudio" + "network" + "backlight" + "battery" + "custom/notification" + "tray" + ]; "hyprland/workspaces" = { disable-scroll = false; @@ -27,7 +37,11 @@ pulseaudio = { format = " {icon} "; format-muted = "ﱝ"; - format-icons = ["奄" "奔" "墳"]; + format-icons = [ + "奄" + "奔" + "墳" + ]; tooltip = true; tooltip-format = "{volume}%"; }; @@ -43,7 +57,17 @@ backlight = { device = "intel_backlight"; format = "{icon}"; - format-icons = ["" "" "" "" "" "" "" "" ""]; + format-icons = [ + "" + "" + "" + "" + "" + "" + "" + "" + "" + ]; tooltip = true; tooltip-format = "{percent}%"; }; @@ -52,11 +76,30 @@ states = { warning = 30; critical = 15; + catastrophic = 10; + }; + events = { + on-discharging-warning = "${pkgs.libnotify}/bin/notify-send -u normal 'Low Battery'"; + on-discharging-critical = "${pkgs.libnotify}/bin/notify-send -u critical 'Very Low Battery' 'Hibernating soon'"; + on-discharging-catastrophic = "${pkgs.libnotify}/bin/notify-send -u critical 'Very Low Battery' 'Hibernating now' && sleep 30 && ${pkgs.systemd}/bin/systemctl hibernate --check-inhibitors=no"; }; format = "{capacity}% {icon}"; format-charging = ""; format-plugged = ""; - format-icons = ["" "" "" "" "" "" "" "" "" "" "" ""]; + format-icons = [ + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + ]; tooltip = true; tooltip-format = "{capacity}%"; }; @@ -71,15 +114,33 @@ tooltip-format = '' <big>{:%Y %B}</big> <tt><small>{calendar}</small></tt>''; - format-alt = '' - {:%d %m %Y}''; - format = '' - {:%H %M}''; + format-alt = ''{:%d %m %Y}''; + format = ''{:%H %M}''; }; tray = { - icon-size = 21; - spacing = 10; + icon-size = 10; + spacing = 5; + }; + "custom/notification" = { + tooltip = false; + format = "{icon}"; + format-icons = { + notification = " "; + none = " "; + dnd-notification = " "; + dnd-none = " "; + inhibited-notification = " "; + inhibited-none = " "; + dnd-inhibited-notification = " "; + dnd-inhibited-none = " "; + }; + return-type = "json"; + exec-if = "which swaync-client"; + exec = "swaync-client -swb"; + on-click = "swaync-client -t -sw"; + on-click-right = "swaync-client -d -sw"; + escape = true; }; }; }; diff --git a/hm/zsh/default.nix b/hm/zsh/default.nix index 684493f..899bce5 100644 --- a/hm/zsh/default.nix +++ b/hm/zsh/default.nix @@ -2,6 +2,7 @@ config, pkgs, self, + lib, ... }: { programs.zsh = { @@ -12,7 +13,7 @@ enableCompletion = true; autocd = true; - dotDir = ".config/zsh"; + dotDir = "${config.xdg.configHome}/zsh"; history = { path = "${config.xdg.stateHome}/zsh/zsh_history"; @@ -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 d21e6c1..ed4e189 100644 --- a/hosts/hplappi.nix +++ b/hosts/hplappi.nix @@ -1,5 +1,20 @@ -{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; 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 46e0794..c27a29c 100644 --- a/modules/hm/sils/default.nix +++ b/modules/hm/sils/default.nix @@ -7,16 +7,22 @@ ./fastfetch.nix ./firefox ./foot.nix + ./ghostty.nix ./git.nix ./hyfetch.nix ./hyprland.nix + ./iamb.nix ./jameica.nix ./kdeconnect.nix ./mail.nix ./nextcloud.nix + ./poweralertd ./sway.nix + ./swaync ./theming.nix + ./wofi ./yt-dlp.nix ./zathura.nix + ./zellij.nix ]; } 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/firefox/user-overrides.js b/modules/hm/sils/firefox/user-overrides.js index f5ff8d6..331a506 100755 --- a/modules/hm/sils/firefox/user-overrides.js +++ b/modules/hm/sils/firefox/user-overrides.js @@ -3,7 +3,7 @@ user_pref("_user.js.parrot", "overrides section syntax error"); //Fingerprinting resistance doesn't make sense in any browser other than Tor. //user_pref("privacy.window.maxInnerWidth", 1000); //user_pref("privacy.window.maxInnerHeight", 1900); -user_pref("privacy.resistFingerprinting", true); +user_pref("privacy.resistFingerprinting", false); user_pref("privacy.resistFingerprinting.letterboxing", false); /* override recipe: enable session restore ***/ @@ -17,6 +17,7 @@ user_pref("privacy.clearOnShutdown.formdata", false); // 2803 optional user_pref("privacy.cpd.history", false); // 2804 to match when you use Ctrl-Shift-Del // user_pref("privacy.cpd.cookies", false); // 2804 optional // user_pref("privacy.cpd.formdata", false); // 2804 optional +user_pref("privacy.clearOnShutdown_v2.browsingHistoryAndDownloads", false); // 2812 FF136+ user_pref("network.cookie.lifetimePolicy", 0); // I want to use Google Earth sometimes. user_pref("webgl.disabled", false); 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 84a7d32..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 = { diff --git a/modules/hm/sils/hyfetch.nix b/modules/hm/sils/hyfetch.nix index b40a37e..08321e6 100644 --- a/modules/hm/sils/hyfetch.nix +++ b/modules/hm/sils/hyfetch.nix @@ -13,7 +13,7 @@ in { programs.hyfetch = { enable = true; settings = { - preset = "rainbow"; + preset = "nonbinary"; mode = "rgb"; light_dark = "dark"; lightness = 0.5; @@ -22,7 +22,7 @@ in { custom_colors = []; fore_back = null; }; - backend = "neofetch"; + backend = "fastfetch"; distro = null; pride_month_shown = []; }; diff --git a/modules/hm/sils/hyprland.nix b/modules/hm/sils/hyprland.nix index 39f0920..5c4a452 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"; @@ -46,9 +58,9 @@ in { general = { # See https://wiki.hyprland.org/Configuring/Variables/ for more - gaps_in = "1"; - gaps_out = "2"; - border_size = "1"; + gaps_in = "5"; + gaps_out = "10"; + border_size = "3"; #"col.active_border" = "rgba(000000cc)"; #"col.inactive_border" = "rgba(595959aa)"; @@ -58,24 +70,25 @@ in { decoration = { # See https://wiki.hyprland.org/Configuring/Variables/ for more - inactive_opacity = "1"; + inactive_opacity = "0.8"; active_opacity = "1"; - rounding = "1"; + rounding = "10"; blur = { - enabled = false; - #size = "3"; - #passes = "1"; - #new_optimizations = "on"; + enabled = true; + size = "3"; + passes = "1"; + new_optimizations = "on"; }; - # drop_shadow = "yes"; - # shadow_range = "4"; - # shadow_render_power = "3"; + #drop_shadow = "yes"; + + #shadow_range = "4"; + #shadow_render_power = "3"; #"col.shadow" = "rgba(1a1a1aee)"; }; animations = { - enabled = "no"; + enabled = "yes"; # Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more @@ -104,7 +117,7 @@ in { gestures = { # See https://wiki.hyprland.org/Configuring/Variables/ for more - workspace_swipe = "off"; + workspace_swipe = "on"; }; # Example windowrule v1 @@ -118,12 +131,12 @@ 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 " "$mainMod, V, togglefloating, " - "$mainMod, R, exec, rofi -show drun" + "$mainMod, R, exec, wofi --show drun" "$mainMod, P, pseudo, " # dwindle "$mainMod, J, togglesplit, " # dwindle "$mainMod, L, exec, swaylock" # screenlock @@ -138,16 +151,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,10 +199,10 @@ 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/poweralertd/default.nix b/modules/hm/sils/poweralertd/default.nix new file mode 100644 index 0000000..15cfdc9 --- /dev/null +++ b/modules/hm/sils/poweralertd/default.nix @@ -0,0 +1,14 @@ +{ + config, + lib, + ... +}: let + cfg = config.sils.poweralertd; +in { + options.sils.poweralertd.enable = lib.mkEnableOption "poweralertd"; + config = lib.mkIf cfg.enable { + services.poweralertd = { + enable = true; + }; + }; +} diff --git a/modules/hm/sils/swaync/default.nix b/modules/hm/sils/swaync/default.nix new file mode 100644 index 0000000..328888b --- /dev/null +++ b/modules/hm/sils/swaync/default.nix @@ -0,0 +1,32 @@ +{ + config, + lib, + pkgs, + ... +}: let + cfg = config.sils.swaync; +in { + options.sils.swaync.enable = lib.mkEnableOption "swaync"; + config = lib.mkIf cfg.enable { + services.swaync = { + enable = true; + settings = { + positionX = "right"; + positionY = "top"; + layer = "overlay"; + control-center-layer = "top"; + layer-shell = true; + cssPriority = "application"; + control-center-margin-top = 0; + control-center-margin-bottom = 0; + control-center-margin-right = 0; + control-center-margin-left = 0; + notification-2fa-action = true; + notification-inline-replies = false; + notification-icon-size = 64; + notification-body-image-height = 100; + notification-body-image-width = 200; + }; + }; + }; +} diff --git a/modules/hm/sils/theming.nix b/modules/hm/sils/theming.nix index 958560d..9b7535c 100644 --- a/modules/hm/sils/theming.nix +++ b/modules/hm/sils/theming.nix @@ -19,6 +19,14 @@ in { accent = "mauve"; }; }; + targets = { + waybar = { + enableCenterBackColors = false; + enableLeftBackColors = false; + enableRightBackColors = false; + font = "sansSerif"; + }; + }; }; }; } diff --git a/modules/hm/sils/wofi/default.nix b/modules/hm/sils/wofi/default.nix new file mode 100644 index 0000000..36f5916 --- /dev/null +++ b/modules/hm/sils/wofi/default.nix @@ -0,0 +1,14 @@ +{ + config, + lib, + ... +}: let + cfg = config.sils.wofi; +in { + options.sils.wofi.enable = lib.mkEnableOption "wofi"; + config = lib.mkIf cfg.enable { + programs.wofi = { + enable = true; + }; + }; +} 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/docker.nix b/modules/nixos/sils/docker.nix index dd62d8a..7d6f046 100644 --- a/modules/nixos/sils/docker.nix +++ b/modules/nixos/sils/docker.nix @@ -7,7 +7,10 @@ in { options.sils.docker.enable = lib.mkEnableOption "docker"; config = lib.mkIf cfg.enable { - virtualisation.docker.enable = true; + virtualisation.docker = { + enable = true; + storageDriver = "btrfs"; + }; users.users.sils.extraGroups = ["docker"]; environment.persistence."/srv".directories = [ { 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/theming/default.nix b/modules/nixos/sils/theming/default.nix index e8cf7bf..2d5d2fd 100644 --- a/modules/nixos/sils/theming/default.nix +++ b/modules/nixos/sils/theming/default.nix @@ -1,6 +1,7 @@ { config, lib, + pkgs, ... }: let cfg = config.sils.theming; @@ -9,7 +10,7 @@ in { config = lib.mkIf cfg.enable { stylix = { enable = true; - base16Scheme = ./tokyo-night-dark.yaml; + base16Scheme = "${pkgs.base16-schemes}/share/themes/ayu-dark.yaml"; image = ../../../../files/wallpaper.jpg; polarity = "dark"; }; diff --git a/readme.md b/readme.md new file mode 100644 index 0000000..7ff6c7a --- /dev/null +++ b/readme.md @@ -0,0 +1,16 @@ +# My Nix(Os) Configuration + +This repository hosts my full NixOs Configuration. +It lacks certain features I'd like to add, but as I'm really bad at staying +focused I'll probably "finish" this someday in the not so foreseeable future. + + +## ToDos + +- [] Documentation + - [] How to add Printers (very important!) +- [] Switch back to declarative Wifi +- [] Automate Installation + - [] Make adding new Hosts interactive + - [] Build batteries included ISO +- [] Switch away from Hyprland - just to anything else diff --git a/result-man b/result-man new file mode 120000 index 0000000..6bd4f75 --- /dev/null +++ b/result-man @@ -0,0 +1 @@ +/nix/store/rw3a44jhk6jm0742yh56kpcl7f9kv4cb-libnotify-0.8.6-man \ No newline at end of file diff --git a/sys/services/flatpak/default.nix b/sys/services/flatpak/default.nix index 47f50b8..0cc6108 100644 --- a/sys/services/flatpak/default.nix +++ b/sys/services/flatpak/default.nix @@ -4,8 +4,8 @@ device = "/srv/flatpak"; options = ["bind"]; }; - #xdg.portal = { - # enable = true; - # extraPortals = [pkgs.xdg-desktop-portal-gtk]; - # }; + xdg.portal = { + enable = true; + extraPortals = [pkgs.xdg-desktop-portal-gtk]; + }; } diff --git a/sys/services/greetd/default.nix b/sys/services/greetd/default.nix index 9b9d5f6..f94828f 100644 --- a/sys/services/greetd/default.nix +++ b/sys/services/greetd/default.nix @@ -4,10 +4,10 @@ restart = true; settings = { default_session = { - command = "${pkgs.greetd.tuigreet}/bin/tuigreet --cmd Hyprland"; + command = "${pkgs.tuigreet}/bin/tuigreet --cmd Hyprland"; }; sway_session = { - command = "${pkgs.greetd.tuigreet}/bin/tuigreetswayway"; + command = "${pkgs.tuigreet}/bin/tuigreetswayway"; }; }; }; diff --git a/sys/services/logind/default.nix b/sys/services/logind/default.nix index a3dd040..b883bcb 100644 --- a/sys/services/logind/default.nix +++ b/sys/services/logind/default.nix @@ -1,10 +1,8 @@ {...}: { - services.logind = { - lidSwitch = "suspend-then-hibernate"; - extraConfig = '' - IdleAction=ignore - HandlePowerKey=hibernate - HandlePowerKeyLongPress=poweroff - ''; + services.logind.settings.Login = { + HandleLidSwitch = "suspend-then-hibernate"; + IdleAction = "ignore"; + HandlePowerKey = "hibernate"; + HandlePowerKeyLongPress = "poweroff"; }; } |