diff options
Diffstat (limited to '')
-rw-r--r-- | flake.lock | 269 | ||||
-rw-r--r-- | flake.nix | 2 | ||||
-rw-r--r-- | hm/hyfetch/default.nix | 19 | ||||
-rw-r--r-- | hm/packages/default.nix | 3 | ||||
-rw-r--r-- | hm/silas/default.nix | 5 | ||||
-rw-r--r-- | hm/sils/default.nix | 5 | ||||
-rw-r--r-- | modules/hm/sils/default.nix | 4 | ||||
-rw-r--r-- | modules/hm/sils/fastfetch.nix | 16 | ||||
-rw-r--r-- | modules/hm/sils/fd.nix | 17 | ||||
-rw-r--r-- | modules/hm/sils/git.nix | 2 | ||||
-rw-r--r-- | modules/hm/sils/hyfetch.nix | 31 | ||||
-rw-r--r-- | modules/hm/sils/mail.nix | 4 | ||||
-rw-r--r-- | modules/hm/sils/theming.nix | 24 | ||||
-rw-r--r-- | modules/nixos/sils/default.nix | 1 | ||||
-rw-r--r-- | modules/nixos/sils/impermanence.nix | 6 | ||||
-rw-r--r-- | modules/nixos/sils/printing.nix | 23 | ||||
-rw-r--r-- | modules/nixos/sils/roles.nix | 3 | ||||
-rw-r--r-- | modules/nixos/sils/sound.nix | 20 | ||||
-rw-r--r-- | sys/default.nix | 1 | ||||
-rw-r--r-- | sys/services/default.nix | 1 | ||||
-rw-r--r-- | sys/sound/default.nix | 11 | ||||
-rw-r--r-- | sys/systemd/default.nix | 2 |
22 files changed, 341 insertions, 128 deletions
diff --git a/flake.lock b/flake.lock index 03a69c6..0785352 100644 --- a/flake.lock +++ b/flake.lock @@ -16,11 +16,11 @@ ] }, "locked": { - "lastModified": 1723293904, - "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=", + "lastModified": 1736955230, + "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=", "owner": "ryantm", "repo": "agenix", - "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41", + "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c", "type": "github" }, "original": { @@ -32,11 +32,11 @@ "arkenfox-user-js": { "flake": false, "locked": { - "lastModified": 1731156949, - "narHash": "sha256-0qwqVc3hrpbQMMJOhbelSrR8cZOqLLWs4T+qyeHfiAc=", + "lastModified": 1736708527, + "narHash": "sha256-/JQo2XnLF8qfSQKvjuFDtvzzz/QHO/dLBHJO4vLOXNk=", "owner": "arkenfox", "repo": "user.js", - "rev": "eae5762d29f18115fbffd73d89bd9e2510b25427", + "rev": "c25187332e19c633b956a6755a7971a6591d3e8d", "type": "github" }, "original": { @@ -82,11 +82,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1725860795, - "narHash": "sha256-Z2o8VBPW3I+KKTSfe25kskz0EUj7MpUh8u355Z1nVsU=", + "lastModified": 1736852337, + "narHash": "sha256-esD42YdgLlEh7koBrSqcT7p2fsMctPAcGl/+2sYJa2o=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "7f795bf75d38e0eea9fed287264067ca187b88a9", + "rev": "03860521c40b0b9c04818f2218d9cc9efc21e7a5", "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": 1734808813, - "narHash": "sha256-3aH/0Y6ajIlfy7j52FGZ+s4icVX0oHhqBzRdlOeztqg=", + "lastModified": 1739053031, + "narHash": "sha256-LrMDRuwAlRFD2T4MgBSRd1s2VtOE+Vl1oMCNu3RpPE0=", "owner": "ipetkov", "repo": "crane", - "rev": "72e2d02dbac80c8c86bf6bf3e785536acf8ee926", + "rev": "112e6591b2d6313b1bd05a80a754a8ee42432a7e", "type": "github" }, "original": { @@ -134,11 +135,11 @@ ] }, "locked": { - "lastModified": 1728330715, - "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", + "lastModified": 1735644329, + "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=", "owner": "numtide", "repo": "devshell", - "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", + "rev": "f7795ede5b02664b57035b3b757876703e2c3eac", "type": "github" }, "original": { @@ -154,11 +155,11 @@ ] }, "locked": { - "lastModified": 1735468753, - "narHash": "sha256-2dt1nOe9zf9pDkf5Kn7FUFyPRo581s0n90jxYXJ94l0=", + "lastModified": 1739353546, + "narHash": "sha256-YTqXhBZvCdZLMBupWlCDvRFaTEhaHa2/Xc/p1sUdSZU=", "owner": "nix-community", "repo": "disko", - "rev": "84a5b93637cc16cbfcc61b6e1684d626df61eb21", + "rev": "26ade1005191e0602a78b0f141970648445bafd9", "type": "github" }, "original": { @@ -167,6 +168,22 @@ "type": "github" } }, + "firefox-gnome-theme": { + "flake": false, + "locked": { + "lastModified": 1736899990, + "narHash": "sha256-S79Hqn2EtSxU4kp99t8tRschSifWD4p/51++0xNWUxw=", + "owner": "rafaelmardojai", + "repo": "firefox-gnome-theme", + "rev": "91ca1f82d717b02ceb03a3f423cbe8082ebbb26d", + "type": "github" + }, + "original": { + "owner": "rafaelmardojai", + "repo": "firefox-gnome-theme", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -185,12 +202,12 @@ }, "flake-compat_2": { "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "revCount": 69, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz" }, "original": { "type": "tarball", @@ -204,11 +221,11 @@ ] }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1738453229, + "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", "type": "github" }, "original": { @@ -302,17 +319,40 @@ ], "nixpkgs": [ "nixpkgs" + ] + }, + "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" ], - "nixpkgs-stable": [ - "nixpkgs-stable" + "gitignore": "gitignore_2", + "nixpkgs": [ + "stylix", + "nixpkgs" ] }, "locked": { - "lastModified": 1734797603, - "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=", + "lastModified": 1735882644, + "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498", + "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", "type": "github" }, "original": { @@ -341,6 +381,28 @@ "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": { @@ -365,11 +427,11 @@ ] }, "locked": { - "lastModified": 1735381016, - "narHash": "sha256-CyCZFhMUkuYbSD6bxB/r43EdmDE7hYeZZPTCv0GudO4=", + "lastModified": 1739458725, + "narHash": "sha256-k9AeUzs3phaTgfljRslR4iNTX9svBNhxoIw4QLd/V70=", "owner": "nix-community", "repo": "home-manager", - "rev": "10e99c43cdf4a0713b4e81d90691d22c6a58bdf2", + "rev": "22b418c13fb0be43f4bc5c185f323a3237028594", "type": "github" }, "original": { @@ -380,11 +442,11 @@ }, "impermanence": { "locked": { - "lastModified": 1734945620, - "narHash": "sha256-olIfsfJK4/GFmPH8mXMmBDAkzVQ1TWJmeGT3wBGfQPY=", + "lastModified": 1737831083, + "narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=", "owner": "nix-community", "repo": "impermanence", - "rev": "d000479f4f41390ff7cf9204979660ad5dd16176", + "rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170", "type": "github" }, "original": { @@ -432,9 +494,6 @@ "flake-parts": [ "flake-parts" ], - "flake-utils": [ - "flake-utils" - ], "nixpkgs": [ "nixpkgs" ], @@ -446,16 +505,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" } @@ -483,11 +542,11 @@ ] }, "locked": { - "lastModified": 1735478292, - "narHash": "sha256-Ys9pSP9ch0SthhpbjnkCSJ9ZLfaNKnt/dcy7swjmS1A=", + "lastModified": 1739302241, + "narHash": "sha256-NXQXFU6HOschZ+8ZKrNOlwlHelez8vPl+dCiUaJ82/U=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "71a3a075e3229a7518d76636bb762aef2bcb73ac", + "rev": "a6746213b138fe7add88b19bafacd446de574ca7", "type": "github" }, "original": { @@ -518,11 +577,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": { @@ -533,11 +592,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1735291276, - "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", + "lastModified": 1739214665, + "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", "owner": "NixOs", "repo": "nixpkgs", - "rev": "634fd46801442d760e09493a794c4f15db2d0cbb", + "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", "type": "github" }, "original": { @@ -550,11 +609,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1735291276, - "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", + "lastModified": 1739214665, + "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", "owner": "NixOs", "repo": "nixpkgs", - "rev": "634fd46801442d760e09493a794c4f15db2d0cbb", + "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", "type": "github" }, "original": { @@ -620,11 +679,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1735378670, - "narHash": "sha256-A8aQA+YhJfA8mUpzXOZdlXNnKiZg2EcpCn1srgtBjTs=", + "lastModified": 1739353096, + "narHash": "sha256-w/T2uYCoq4k6K46GX2CMGWsKfMvcqnxC41LIgnvGifE=", "owner": "nix-community", "repo": "nixvim", - "rev": "f4b0b81ef9eb4e37e75f32caf1f02d5501594811", + "rev": "78b6f8e1e5b37a7789216e17a96ebc117660f0e7", "type": "github" }, "original": { @@ -643,11 +702,11 @@ ] }, "locked": { - "lastModified": 1733773348, - "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=", + "lastModified": 1738508923, + "narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=", "owner": "NuschtOS", "repo": "search", - "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9", + "rev": "86e2038290859006e05ca7201425ea5b5de4aecb", "type": "github" }, "original": { @@ -670,11 +729,11 @@ ] }, "locked": { - "lastModified": 1734592619, - "narHash": "sha256-Nzpn8O7n+cWg5+DO6Y/Ca0rV3yNB8IN3jUOAv9JrHyA=", + "lastModified": 1739447041, + "narHash": "sha256-2ic0ztS7/A1++UYkbNkWXz4SGqQf31qHD2TnXHzOijw=", "owner": "PrismLauncher", "repo": "PrismLauncher", - "rev": "0b6ce5525dbe4d617788b740dc4fefc93bee0e5f", + "rev": "3e4fc2ff3b5a314e5c618053137ce5c8f8c41eb8", "type": "github" }, "original": { @@ -754,11 +813,11 @@ ] }, "locked": { - "lastModified": 1735439489, - "narHash": "sha256-IysonaW/cItfmMuvg43flOqMgS4N0C6yKJobCa09XOQ=", + "lastModified": 1739413688, + "narHash": "sha256-57OAXXYhOibG7Rqhhr4ecI1H8mtDJB2uj0T8rbQVGLY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "915d7c42a706f9191696d1b779cf1ea1769d34a8", + "rev": "675a6427d505f140dab8c56379afb66d4f55800b", "type": "github" }, "original": { @@ -774,11 +833,11 @@ ] }, "locked": { - "lastModified": 1735468296, - "narHash": "sha256-ZjUjbvS06jf4fElOF4ve8EHjbpbRVHHypStoY8HGzk8=", + "lastModified": 1739262228, + "narHash": "sha256-7JAGezJ0Dn5qIyA2+T4Dt/xQgAbhCglh6lzCekTVMeU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "bcb8b65aa596866eb7e5c3e1a6cccbf5d1560b27", + "rev": "07af005bb7d60c7f118d9d9f5530485da5d1e975", "type": "github" }, "original": { @@ -793,10 +852,12 @@ "base16-fish": "base16-fish", "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", "gnome-shell": "gnome-shell", "home-manager": [ "home-manager" @@ -807,14 +868,16 @@ "systems": "systems_2", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", - "tinted-tmux": "tinted-tmux" + "tinted-schemes": "tinted-schemes", + "tinted-tmux": "tinted-tmux", + "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1735253599, - "narHash": "sha256-aKLAUkdeMH2N5gMDNiOC7KghRNy1necLtLa9+zUcj1g=", + "lastModified": 1739375014, + "narHash": "sha256-0fNbvZ1Dod4rDIfwGnC7CzJ3wRFSF1v5AvNCmNkVgXo=", "owner": "danth", "repo": "stylix", - "rev": "963e77a3a4fc2be670d5a9a6cbeb249b8a43808a", + "rev": "e86de61bb8f5f2b6459d0be3e3291ad16db4b777", "type": "github" }, "original": { @@ -902,14 +965,30 @@ "type": "github" } }, + "tinted-schemes": { + "flake": false, + "locked": { + "lastModified": 1737565458, + "narHash": "sha256-y+9cvOA6BLKT0WfebDsyUpUa/YxKow9hTjBp6HpQv68=", + "owner": "tinted-theming", + "repo": "schemes", + "rev": "ae31625ba47aeaa4bf6a98cf11a8d4886f9463d9", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "schemes", + "type": "github" + } + }, "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1729501581, - "narHash": "sha256-1ohEFMC23elnl39kxWnjzH1l2DFWWx4DhFNNYDTYt54=", + "lastModified": 1735737224, + "narHash": "sha256-FO2hRBkZsjlIRqzNHCPc/52yxg11kHGA8MEtSun9RwE=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "f0e7f7974a6441033eb0a172a0342e96722b4f14", + "rev": "aead506a9930c717ebf81cc83a2126e9ca08fa64", "type": "github" }, "original": { @@ -918,6 +997,22 @@ "type": "github" } }, + "tinted-zed": { + "flake": false, + "locked": { + "lastModified": 1725758778, + "narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=", + "owner": "tinted-theming", + "repo": "base16-zed", + "rev": "122c9e5c0e6f27211361a04fae92df97940eccf9", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-zed", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -926,11 +1021,11 @@ ] }, "locked": { - "lastModified": 1734704479, - "narHash": "sha256-MMi74+WckoyEWBRcg/oaGRvXC9BVVxDZNRMpL+72wBI=", + "lastModified": 1738680491, + "narHash": "sha256-8X7tR3kFGkE7WEF5EXVkt4apgaN85oHZdoTGutCFs6I=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "65712f5af67234dad91a5a4baee986a8b62dbf8f", + "rev": "64dbb922d51a42c0ced6a7668ca008dded61c483", "type": "github" }, "original": { @@ -946,11 +1041,11 @@ ] }, "locked": { - "lastModified": 1735135567, - "narHash": "sha256-8T3K5amndEavxnludPyfj3Z1IkcFdRpR23q+T0BVeZE=", + "lastModified": 1738953846, + "narHash": "sha256-yrK3Hjcr8F7qS/j2F+r7C7o010eVWWlm4T1PrbKBOxQ=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "9e09d30a644c57257715902efbb3adc56c79cf28", + "rev": "4f09b473c936d41582dd744e19f34ec27592c5fd", "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/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/packages/default.nix b/hm/packages/default.nix index d37ff18..9108d24 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 @@ -140,6 +138,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..89551a8 100644 --- a/hm/silas/default.nix +++ b/hm/silas/default.nix @@ -3,7 +3,6 @@ ../../modules/hm ../gpg ../gtk - ../hyfetch ../mako ../nixvim ../packages @@ -29,15 +28,19 @@ bat.enable = true; direnv.enable = true; etesync-dav.enable = true; + fd.enable = true; + fastfetch.enable = true; firefox.enable = true; foot.enable = true; git.enable = true; + hyfetch.enable = true; hyprland.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; }; diff --git a/hm/sils/default.nix b/hm/sils/default.nix index a078a7b..c7343de 100644 --- a/hm/sils/default.nix +++ b/hm/sils/default.nix @@ -3,7 +3,6 @@ ../../modules/hm ../gpg ../gtk - ../hyfetch ../mako ../nixvim ../packages @@ -29,15 +28,19 @@ bat.enable = true; direnv.enable = true; etesync-dav.enable = true; + fd.enable = true; + fastfetch.enable = true; firefox.enable = true; foot.enable = true; git.enable = true; + hyfetch.enable = true; hyprland.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; }; diff --git a/modules/hm/sils/default.nix b/modules/hm/sils/default.nix index a3ff1ed..46e0794 100644 --- a/modules/hm/sils/default.nix +++ b/modules/hm/sils/default.nix @@ -3,15 +3,19 @@ ./bat.nix ./direnv.nix ./etesync-dav.nix + ./fd.nix + ./fastfetch.nix ./firefox ./foot.nix ./git.nix + ./hyfetch.nix ./hyprland.nix ./jameica.nix ./kdeconnect.nix ./mail.nix ./nextcloud.nix ./sway.nix + ./theming.nix ./yt-dlp.nix ./zathura.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/git.nix b/modules/hm/sils/git.nix index 5bd4dd2..84a7d32 100644 --- a/modules/hm/sils/git.nix +++ b/modules/hm/sils/git.nix @@ -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..b40a37e --- /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 = "neofetch"; + distro = null; + pride_month_shown = []; + }; + }; + }; +} 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/nixos/sils/default.nix b/modules/nixos/sils/default.nix index 0f714f7..89aa111 100644 --- a/modules/nixos/sils/default.nix +++ b/modules/nixos/sils/default.nix @@ -19,6 +19,7 @@ ./plymouth.nix ./printing.nix ./roles.nix + ./sound.nix ./sudo.nix ./sway.nix ./theming 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/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/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 ''; } |