From fa08add56ef1118c22f1b1dc6819b51a643c5d46 Mon Sep 17 00:00:00 2001 From: Hazem Fahmi Date: Sat, 19 Oct 2024 12:26:24 +0300 Subject: [PATCH] Upgrade to 24.05 --- TODO.md | 4 +- flake.lock | 344 +++++------------- flake.nix | 27 +- homes/x86_64-linux/hfahmi@nixos/default.nix | 6 +- .../home/desktop/addons/alacritty/default.nix | 64 ++-- .../home/desktop/addons/clipmenu/default.nix | 17 - modules/home/theme/default.nix | 11 + modules/home/tools/yazi/default.nix | 34 ++ modules/home/tools/zellij/default.nix | 2 +- .../nixos/desktop/addons/cliphist/default.nix | 20 + modules/nixos/desktop/sway/default.nix | 3 +- modules/nixos/home/default.nix | 1 + modules/nixos/nix/default.nix | 2 +- modules/nixos/security/gpg/default.nix | 2 +- modules/nixos/suites/development/default.nix | 2 +- modules/nixos/suites/games/default.nix | 1 - .../nixos/suites/music-production/default.nix | 2 +- .../nixos/tools/activity-watch/default.nix | 2 +- modules/nixos/tools/git/default.nix | 3 +- 19 files changed, 212 insertions(+), 335 deletions(-) delete mode 100644 modules/home/desktop/addons/clipmenu/default.nix create mode 100644 modules/home/theme/default.nix create mode 100644 modules/home/tools/yazi/default.nix create mode 100644 modules/nixos/desktop/addons/cliphist/default.nix diff --git a/TODO.md b/TODO.md index e02154e..4aa7a3a 100644 --- a/TODO.md +++ b/TODO.md @@ -35,6 +35,7 @@ fwcd.kotlin --> Install and configure paths for JDK and stuff or disable those f - Set "Ask download location" - Add add-on Highlighter + Notes - Fix KDE Connect connection issue + - activity watchers to add and configure: - aw-watcher-utilization - aw-watcher-netstatus (This might be useful in conjunction with vnstat data to determine how much of my personal internet quota is spent on work-related things. @@ -42,7 +43,6 @@ fwcd.kotlin --> Install and configure paths for JDK and stuff or disable those f ## Packages to try out - lensfun - timelens -- jasp-desktop - Add dua to UNIX utils @@ -76,4 +76,4 @@ fwcd.kotlin --> Install and configure paths for JDK and stuff or disable those f - User Vim keybindings again - Emoji selector with wofi -- Restart my note-taking practice \ No newline at end of file +- Use activity-watch home manager module \ No newline at end of file diff --git a/flake.lock b/flake.lock index d5c174b..5745323 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "base16-schemes": { "flake": false, "locked": { - "lastModified": 1689473676, - "narHash": "sha256-L0RhUr9+W5EPWBpLcmkKpUeCEWRs/kLzVMF3Vao2ZU0=", + "lastModified": 1696158499, + "narHash": "sha256-5yIHgDTPjoX/3oDEfLSQ0eJZdFL1SaCfb9d6M0RmOTM=", "owner": "tinted-theming", "repo": "base16-schemes", - "rev": "d95123ca6377cd849cfdce92c0a24406b0c6a789", + "rev": "a9112eaae86d9dd8ee6bb9445b664fba2f94037a", "type": "github" }, "original": { @@ -16,26 +16,18 @@ "type": "github" } }, - "comma": { - "inputs": { - "flake-compat": "flake-compat", - "naersk": "naersk", - "nixpkgs": [ - "unstable" - ], - "utils": "utils" - }, + "catppuccin": { "locked": { - "lastModified": 1705423848, - "narHash": "sha256-SdgQvh8XGQ6qYPG4SzNoMCrBXcRUw+7IOZBCn26IN6A=", - "owner": "nix-community", - "repo": "comma", - "rev": "f0c8a5cef39713a37b92e2bf207dd221c6432cc0", + "lastModified": 1728407414, + "narHash": "sha256-B8LaxUP93eh+it8RW1pGq4SsU2kj7f0ipzFuhBvpON8=", + "owner": "catppuccin", + "repo": "nix", + "rev": "96cf8b4a05fb23a53c027621b1147b5cf9e5439f", "type": "github" }, "original": { - "owner": "nix-community", - "repo": "comma", + "owner": "catppuccin", + "repo": "nix", "type": "github" } }, @@ -69,28 +61,6 @@ "type": "github" } }, - "deploy-rs": { - "inputs": { - "flake-compat": "flake-compat_2", - "nixpkgs": [ - "unstable" - ], - "utils": "utils_2" - }, - "locked": { - "lastModified": 1704875591, - "narHash": "sha256-eWRLbqRcrILgztU/m/k7CYLzETKNbv0OsT2GjkaNm8A=", - "owner": "serokell", - "repo": "deploy-rs", - "rev": "1776009f1f3fb2b5d236b84d9815f2edee463a9b", - "type": "github" - }, - "original": { - "owner": "serokell", - "repo": "deploy-rs", - "type": "github" - } - }, "firefox-addons": { "inputs": { "flake-utils": "flake-utils", @@ -100,11 +70,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1705485344, - "narHash": "sha256-4ORDaMpXQhVSuekX90CB6OI+aECKr4D9I4TW6AjCKPU=", + "lastModified": 1729198744, + "narHash": "sha256-sJXRhptdX5y77360VgcW2fYlZoazg/lOh4upx8nUiVo=", "owner": "rycee", "repo": "nur-expressions", - "rev": "93917bd879c7ed63f9efe80843744f14dd8895ea", + "rev": "fb7273920513b4c1ef70a79a83f87292b54ae91a", "type": "gitlab" }, "original": { @@ -116,18 +86,18 @@ }, "flake": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat", "nixpkgs": [ - "unstable" + "nixpkgs" ], "snowfall-lib": "snowfall-lib" }, "locked": { - "lastModified": 1694679761, - "narHash": "sha256-ApeB7FrOs22I2m1UZq8SaGYj3wEGm5lV9J51aDQsCCE=", + "lastModified": 1716675632, + "narHash": "sha256-AOgmoVZvMPUMSlHMrRjWaPykNS5YWxnUNp7STgfjGdA=", "owner": "snowfallorg", "repo": "flake", - "rev": "2cf0254ec8c537a4ef95a57f59ba8db469a21e12", + "rev": "d3b1167f7265d28549930b95b98327c277ef8afd", "type": "github" }, "original": { @@ -139,7 +109,7 @@ "flake-checker": { "inputs": { "crane": "crane", - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_3", "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" @@ -173,43 +143,12 @@ }, "original": { "owner": "edolstra", + "ref": "v1.0.1", "repo": "flake-compat", "type": "github" } }, "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1668681692, - "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "009399224d5e398d03b22badca40a37ac85412a1", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_4": { "flake": false, "locked": { "lastModified": 1650374568, @@ -225,7 +164,7 @@ "type": "github" } }, - "flake-compat_5": { + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1673956053, @@ -241,7 +180,7 @@ "type": "github" } }, - "flake-compat_6": { + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1650374568, @@ -277,16 +216,17 @@ "flake-utils": "flake-utils_2" }, "locked": { - "lastModified": 1657226504, - "narHash": "sha256-GIYNjuq4mJlFgqKsZ+YrgzWm0IpA4axA3MCrdKYj7gs=", + "lastModified": 1715533576, + "narHash": "sha256-fT4ppWeCJ0uR300EH3i7kmgRZnAVxrH+XtK09jQWihk=", "owner": "gytis-ivaskevicius", "repo": "flake-utils-plus", - "rev": "2bf0f91643c2e5ae38c1b26893ac2927ac9bd82a", + "rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f", "type": "github" }, "original": { "owner": "gytis-ivaskevicius", "repo": "flake-utils-plus", + "rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f", "type": "github" } }, @@ -295,16 +235,17 @@ "flake-utils": "flake-utils_4" }, "locked": { - "lastModified": 1696331477, - "narHash": "sha256-YkbRa/1wQWdWkVJ01JvV+75KIdM37UErqKgTf0L54Fk=", + "lastModified": 1722363685, + "narHash": "sha256-XCf2PIAT6lH7BwytgioPmVf/wkzXjSKScC4KzcZgb64=", "owner": "gytis-ivaskevicius", "repo": "flake-utils-plus", - "rev": "bfc53579db89de750b25b0c5e7af299e0c06d7d3", + "rev": "6b10f51ff73a66bb29f3bc8151a59d217713f496", "type": "github" }, "original": { "owner": "gytis-ivaskevicius", "repo": "flake-utils-plus", + "rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f", "type": "github" } }, @@ -325,7 +266,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_3" + "systems": "systems" }, "locked": { "lastModified": 1681202837, @@ -342,7 +283,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_4" + "systems": "systems_2" }, "locked": { "lastModified": 1694529238, @@ -361,11 +302,11 @@ "gpg-base-conf": { "flake": false, "locked": { - "lastModified": 1697417581, - "narHash": "sha256-R45L/Xv3z0lJhGt781wDbjaq1qc+sGTmsUt+XHwgf4A=", + "lastModified": 1724021581, + "narHash": "sha256-f+ghj8qiljbHyIPZb6b2IAxxQU9GvbYpTdEEjSN9g8E=", "owner": "drduh", "repo": "config", - "rev": "8c21617100795fea2313656abdf25f93b98fdc30", + "rev": "eedb4ecf4bb2b5fd71bb27768f76da0f2e2605c8", "type": "github" }, "original": { @@ -381,16 +322,16 @@ ] }, "locked": { - "lastModified": 1705476964, - "narHash": "sha256-W5OK1fnj4qdn1HWOlxV2S3YiUvfaVjQM5ldWVpGV1fs=", + "lastModified": 1726989464, + "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", "owner": "nix-community", "repo": "home-manager", - "rev": "85c3b600f660abd86e94cbcd1c46733943197a07", + "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.11", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } @@ -400,11 +341,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1714858707, - "narHash": "sha256-2DJ4F/v3WJsXaFWMmaMc1Rmz4XRv4OVudUhbIhuwJqc=", + "lastModified": 1729112290, + "narHash": "sha256-6yqnhnzgM99mzY4/yrKR1Xlkjt+VQg4gP6cMlIKxQs0=", "owner": "musnix", "repo": "musnix", - "rev": "700460ea297ab5172fecc60ec8c9c36d86c5985f", + "rev": "64356c2b84abb26b8ccf1e01df8448635cbfde64", "type": "github" }, "original": { @@ -413,39 +354,17 @@ "type": "github" } }, - "naersk": { - "inputs": { - "nixpkgs": [ - "comma", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1697664192, - "narHash": "sha256-nRTG3rYEGFV2+putRiC96+kNXDyKaPJgT6K/1FWN7yo=", - "owner": "nix-community", - "repo": "naersk", - "rev": "636a9b5dd7f2ad7d7c3af929ecf95e4d4fab9e97", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "master", - "repo": "naersk", - "type": "github" - } - }, "nix-colors": { "inputs": { "base16-schemes": "base16-schemes", "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1695388192, - "narHash": "sha256-2jelpE7xK+4M7jZNyWL7QYOYegQLYBDQS5bvdo8XRUQ=", + "lastModified": 1707825078, + "narHash": "sha256-hTfge2J2W+42SZ7VHXkf4kjU+qzFqPeC9k66jAUBMHk=", "owner": "misterio77", "repo": "nix-colors", - "rev": "37227f274b34a3b51649166deb94ce7fec2c6a4c", + "rev": "b01f024090d2c4fc3152cd0cf12027a7b8453ba1", "type": "github" }, "original": { @@ -454,33 +373,13 @@ "type": "github" } }, - "nix-ld": { - "inputs": { - "nixpkgs": [ - "unstable" - ] - }, - "locked": { - "lastModified": 1701153607, - "narHash": "sha256-h+odOVyiGmEERMECoFOj5P7FPiMR8IPRzroFA4sKivg=", - "owner": "Mic92", - "repo": "nix-ld", - "rev": "bf5aa84a713c31d95b4307e442e966d6c7fd7ae7", - "type": "github" - }, - "original": { - "owner": "Mic92", - "repo": "nix-ld", - "type": "github" - } - }, "nixlib": { "locked": { - "lastModified": 1693701915, - "narHash": "sha256-waHPLdDYUOHSEtMKKabcKIMhlUOHPOOPQ9UyFeEoovs=", + "lastModified": 1728781282, + "narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "f5af57d3ef9947a70ac86e42695231ac1ad00c25", + "rev": "16340f605f4e8e5cf07fd74dcbe692eee2d4f51b", "type": "github" }, "original": { @@ -497,11 +396,11 @@ ] }, "locked": { - "lastModified": 1705400161, - "narHash": "sha256-0MFaNIwwpVWB1N9m7cfHAM2pSVtYESQ7tlHxnDTOhM4=", + "lastModified": 1729127034, + "narHash": "sha256-42AMGl+dh4I2wGgICSeDI1mqYaDEJhwqquHJ1vA0QiQ=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "521fb4cdd8a2e1a00d1adf0fea7135d1faf04234", + "rev": "dd28a0806e7124fe392c33c9ccaa12f21970401f", "type": "github" }, "original": { @@ -512,11 +411,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1705312285, - "narHash": "sha256-rd+dY+v61Y8w3u9bukO/hB55Xl4wXv4/yC8rCGVnK5U=", + "lastModified": 1728729581, + "narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "bee2202bec57e521e3bd8acd526884b9767d7fa0", + "rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806", "type": "github" }, "original": { @@ -527,11 +426,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1711703276, - "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", + "lastModified": 1726755586, + "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", + "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e", "type": "github" }, "original": { @@ -543,11 +442,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1694911725, - "narHash": "sha256-8YqI+YU1DGclEjHsnrrGfqsQg3Wyga1DfTbJrN3Ud0c=", + "lastModified": 1697935651, + "narHash": "sha256-qOfWjQ2JQSQL15KLh6D7xQhx0qgZlYZTYlcEiRuAMMw=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "819180647f428a3826bfc917a54449da1e532ce0", + "rev": "e1e11fdbb01113d85c7f41cada9d2847660e3902", "type": "github" }, "original": { @@ -558,40 +457,39 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1705033721, - "narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=", + "lastModified": 1728156290, + "narHash": "sha256-uogSvuAp+1BYtdu6UWuObjHqSbBohpyARXDWqgI12Ss=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a1982c92d8980a0114372973cbdfe0a307f1bdea", + "rev": "17ae88b569bb15590549ff478bab6494dde4a907", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-23.05", + "ref": "release-24.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1714971268, - "narHash": "sha256-IKwMSwHj9+ec660l+I4tki/1NRoeGpyA2GdtdYpAgEw=", + "lastModified": 1729044727, + "narHash": "sha256-GKJjtPY+SXfLF/yTN7M2cAnQB6RERFKnQhD8UvPSf3M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "27c13997bf450a01219899f5a83bd6ffbfc70d3c", + "rev": "dc2e0028d274394f73653c7c90cc63edbb696be1", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } }, "root": { "inputs": { - "comma": "comma", - "deploy-rs": "deploy-rs", + "catppuccin": "catppuccin", "firefox-addons": "firefox-addons", "flake": "flake", "flake-checker": "flake-checker", @@ -599,7 +497,6 @@ "home-manager": "home-manager", "musnix": "musnix", "nix-colors": "nix-colors", - "nix-ld": "nix-ld", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", @@ -664,7 +561,7 @@ }, "snowfall-lib": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_2", "flake-utils-plus": "flake-utils-plus", "nixpkgs": [ "flake", @@ -672,33 +569,34 @@ ] }, "locked": { - "lastModified": 1694679207, - "narHash": "sha256-g6lYb6nXMpxYUVRZNRZPZI+L31xWlwF/r/oWZmiSYpo=", + "lastModified": 1716675292, + "narHash": "sha256-7TFvVE4HR/b65/0AAhewYHEJzUXxIEJn82ow5bCkrDo=", "owner": "snowfallorg", "repo": "lib", - "rev": "8df9cb69f2ee4199c2879baaafce4e13864496a7", + "rev": "5d6e9f235735393c28e1145bec919610b172a20f", "type": "github" }, "original": { "owner": "snowfallorg", + "ref": "v3.0.2", "repo": "lib", "type": "github" } }, "snowfall-lib_2": { "inputs": { - "flake-compat": "flake-compat_6", + "flake-compat": "flake-compat_4", "flake-utils-plus": "flake-utils-plus_2", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1696432959, - "narHash": "sha256-oJQZv2MYyJaVyVJY5IeevzqpGvMGKu5pZcCCJvb+xjc=", + "lastModified": 1719005984, + "narHash": "sha256-mpFl3Jv4fKnn+5znYXG6SsBjfXHJdRG5FEqNSPx0GLA=", "owner": "snowfallorg", "repo": "lib", - "rev": "92803a029b5314d4436a8d9311d8707b71d9f0b6", + "rev": "c6238c83de101729c5de3a29586ba166a9a65622", "type": "github" }, "original": { @@ -715,11 +613,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1705356877, - "narHash": "sha256-274jL1cH64DcXUXebVMZBRUsTs3FvFlPIPkCN/yhSnI=", + "lastModified": 1728345710, + "narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=", "owner": "Mic92", "repo": "sops-nix", - "rev": "87755331580fdf23df7e39b46d63ac88236bf42c", + "rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b", "type": "github" }, "original": { @@ -758,36 +656,6 @@ "type": "github" } }, - "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": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -795,11 +663,11 @@ ] }, "locked": { - "lastModified": 1704649711, - "narHash": "sha256-+qxqJrZwvZGilGiLQj3QbYssPdYCwl7ejwMImgH7VBQ=", + "lastModified": 1729077719, + "narHash": "sha256-zayHqZO9gA1U85c4CPvVSnLV8/cBgc2yVrSKWaKeBUs=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "04f25d7bec9fb29d2c3bacaa48a3304840000d36", + "rev": "5307ba60125bb024d7e52d71d582eafd511f3fee", "type": "github" }, "original": { @@ -810,11 +678,11 @@ }, "unstable": { "locked": { - "lastModified": 1705316053, - "narHash": "sha256-J2Ey5mPFT8gdfL2XC0JTZvKaBw/b2pnyudEXFvl+dQM=", + "lastModified": 1728888510, + "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c3e128f3c0ecc1fb04aef9f72b3dcc2f6cecf370", + "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", "type": "github" }, "original": { @@ -824,42 +692,6 @@ "type": "github" } }, - "utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "utils_2": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "vault-service": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index c9e9173..f419de7 100644 --- a/flake.nix +++ b/flake.nix @@ -3,15 +3,16 @@ inputs = { # NixPkgs (nixos-23.11) - nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; # NixPkgs Unstable (nixos-unstable) unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nix-colors.url = "github:misterio77/nix-colors"; + catppuccin.url = "github:catppuccin/nix"; # Home Manager (release-23.11) - home-manager.url = "github:nix-community/home-manager/release-23.11"; + home-manager.url = "github:nix-community/home-manager/release-24.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; firefox-addons = { @@ -35,19 +36,7 @@ # Snowfall Flake flake.url = "github:snowfallorg/flake"; - flake.inputs.nixpkgs.follows = "unstable"; - - # Comma - comma.url = "github:nix-community/comma"; - comma.inputs.nixpkgs.follows = "unstable"; - - # System Deployment - deploy-rs.url = "github:serokell/deploy-rs"; - deploy-rs.inputs.nixpkgs.follows = "unstable"; - - # Run unpatched dynamically compiled binaries - nix-ld.url = "github:Mic92/nix-ld"; - nix-ld.inputs.nixpkgs.follows = "unstable"; + flake.inputs.nixpkgs.follows = "nixpkgs"; # Vault Integration vault-service = { @@ -113,15 +102,17 @@ }; systems.modules.nixos = with inputs; [ + catppuccin.nixosModules.catppuccin home-manager.nixosModules.home-manager - nix-ld.nixosModules.nix-ld vault-service.nixosModules.nixos-vault-service sops-nix.nixosModules.sops musnix.nixosModules.musnix ]; - homes.users."hfahmi@nixos".modules = with inputs; - [ nix-colors.homeManagerModules.default ]; + homes.users."hfahmi@nixos".modules = with inputs; [ + nix-colors.homeManagerModules.default + catppuccin.homeManagerModules.catppuccin + ]; # deploy = lib.mkDeploy {inherit (inputs) self;}; diff --git a/homes/x86_64-linux/hfahmi@nixos/default.nix b/homes/x86_64-linux/hfahmi@nixos/default.nix index 3610d8d..895a7e7 100644 --- a/homes/x86_64-linux/hfahmi@nixos/default.nix +++ b/homes/x86_64-linux/hfahmi@nixos/default.nix @@ -3,7 +3,11 @@ with lib; with lib.caramelmint; { colorScheme = inputs.nix-colors.colorSchemes.gruvbox-light-medium; caramelmint = { - tools = { zellij = enabled; }; + tools = { + zellij = enabled; + yazi = enabled; + }; + theme = enabled; desktop = { addons = { alacritty = enabled; diff --git a/modules/home/desktop/addons/alacritty/default.nix b/modules/home/desktop/addons/alacritty/default.nix index b851719..3f16c9b 100644 --- a/modules/home/desktop/addons/alacritty/default.nix +++ b/modules/home/desktop/addons/alacritty/default.nix @@ -13,38 +13,38 @@ in { config = mkIf cfg.enable { programs.alacritty = { enable = true; - settings = { - colors = with config.colorScheme.colors; { - bright = { - black = "0x${base00}"; - blue = "0x${base0D}"; - cyan = "0x${base0C}"; - green = "0x${base0B}"; - magenta = "0x${base0E}"; - red = "0x${base08}"; - white = "0x${base06}"; - yellow = "0x${base09}"; - }; - cursor = { - cursor = "0x${base06}"; - text = "0x${base06}"; - }; - normal = { - black = "0x${base00}"; - blue = "0x${base0D}"; - cyan = "0x${base0C}"; - green = "0x${base0B}"; - magenta = "0x${base0E}"; - red = "0x${base08}"; - white = "0x${base06}"; - yellow = "0x${base0A}"; - }; - primary = { - background = "0x${base00}"; - foreground = "0x${base06}"; - }; - }; - }; + # settings = { + # colors = with config.colorScheme.colors; { + # bright = { + # black = "0x${base00}"; + # blue = "0x${base0D}"; + # cyan = "0x${base0C}"; + # green = "0x${base0B}"; + # magenta = "0x${base0E}"; + # red = "0x${base08}"; + # white = "0x${base06}"; + # yellow = "0x${base09}"; + # }; + # cursor = { + # cursor = "0x${base06}"; + # text = "0x${base06}"; + # }; + # normal = { + # black = "0x${base00}"; + # blue = "0x${base0D}"; + # cyan = "0x${base0C}"; + # green = "0x${base0B}"; + # magenta = "0x${base0E}"; + # red = "0x${base08}"; + # white = "0x${base06}"; + # yellow = "0x${base0A}"; + # }; + # primary = { + # background = "0x${base00}"; + # foreground = "0x${base06}"; + # }; + # }; + # }; }; }; } diff --git a/modules/home/desktop/addons/clipmenu/default.nix b/modules/home/desktop/addons/clipmenu/default.nix deleted file mode 100644 index d9470a1..0000000 --- a/modules/home/desktop/addons/clipmenu/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ options, config, pkgs, lib, ... }: -with lib; -with lib.caramelmint; -let cfg = config.caramelmint.desktop.addons.clipmenu; -in { - options.caramelmint.desktop.addons.clipmenu = with types; { - enable = - mkBoolOpt false "Whether or not to install and configure clipmenu."; - }; - - config = mkIf cfg.enable { - services.clipmenu = { - enable = true; - launcher = "${pkgs.wofi}/bin/wofi"; - }; - }; -} diff --git a/modules/home/theme/default.nix b/modules/home/theme/default.nix new file mode 100644 index 0000000..e156577 --- /dev/null +++ b/modules/home/theme/default.nix @@ -0,0 +1,11 @@ +{ options, config, lib, pkgs, ... }: +with lib; +with lib.caramelmint; +let cfg = config.caramelmint.theme; +in { + options.caramelmint.theme = with types; { + enable = mkBoolOpt false "Whether or not to enable catppuccin theme."; + }; + + config = mkIf cfg.enable { catppuccin = { enable = true; }; }; +} diff --git a/modules/home/tools/yazi/default.nix b/modules/home/tools/yazi/default.nix new file mode 100644 index 0000000..5da6656 --- /dev/null +++ b/modules/home/tools/yazi/default.nix @@ -0,0 +1,34 @@ +{ options, config, lib, pkgs, ... }: +with lib; +with lib.caramelmint; +let cfg = config.caramelmint.tools.zellij; +in { + options.caramelmint.tools.yazi = with types; { + enable = mkBoolOpt false "Whether or not to enable yazi."; + }; + + config = mkIf cfg.enable { + programs.yazi = { + enable = true; + enableFishIntegration = true; + settings = { + log = { enabled = false; }; + manager = { + show_hidden = false; + show_symlink = true; + linemode = "mtime"; + sort_by = "modified"; + sort_dir_first = true; + sort_reverse = true; + }; + }; + }; + + # Extra packages for preview functionality + # https://yazi-rs.github.io/docs/installation/ + home.packages = with pkgs; [ + imagemagick + poppler # + ]; + }; +} diff --git a/modules/home/tools/zellij/default.nix b/modules/home/tools/zellij/default.nix index 7fb11f8..c0f9951 100644 --- a/modules/home/tools/zellij/default.nix +++ b/modules/home/tools/zellij/default.nix @@ -12,7 +12,7 @@ in { enable = true; enableFishIntegration = true; settings = { - theme = "default"; + # theme = "default"; themes = { default = with config.colorScheme.colors; { bg = "#${base00}"; diff --git a/modules/nixos/desktop/addons/cliphist/default.nix b/modules/nixos/desktop/addons/cliphist/default.nix new file mode 100644 index 0000000..db5ac59 --- /dev/null +++ b/modules/nixos/desktop/addons/cliphist/default.nix @@ -0,0 +1,20 @@ +{ options, config, pkgs, lib, ... }: +with lib; +with lib.caramelmint; +let cfg = config.caramelmint.desktop.addons.cliphist; +in { + options.caramelmint.desktop.addons.cliphist = with types; { + enable = + mkBoolOpt false "Whether or not to install and configure cliphist."; + }; + + config = mkIf cfg.enable { + # caramelmint.desktop.addons.wofi = enabled; + caramelmint.home.extraOptions = { + services.cliphist = { enable = true; }; + home.packages = with pkgs; [ wl-clipboard ]; + wayland.windowManager.sway.config.keycodebindings."Mod1+Shift+50" = # Mod1+Shift+p + "exec cliphist list | wofi -S dmenu | cliphist decode | wl-copy"; + }; + }; +} diff --git a/modules/nixos/desktop/sway/default.nix b/modules/nixos/desktop/sway/default.nix index 714d021..355657d 100644 --- a/modules/nixos/desktop/sway/default.nix +++ b/modules/nixos/desktop/sway/default.nix @@ -11,7 +11,8 @@ in { # Desktop additions caramelmint.desktop.addons = { gtk = enabled; - # wlogout = enabled; + wlogout = enabled; + cliphist = enabled; xdg-portal = enabled; light = enabled; }; diff --git a/modules/nixos/home/default.nix b/modules/nixos/home/default.nix index 983e34e..4bcdb1b 100644 --- a/modules/nixos/home/default.nix +++ b/modules/nixos/home/default.nix @@ -25,6 +25,7 @@ in { home-manager = { useUserPackages = true; useGlobalPkgs = true; + backupFileExtension = "backup"; users.${config.caramelmint.user.name} = mkAliasDefinitions options.caramelmint.home.extraOptions; diff --git a/modules/nixos/nix/default.nix b/modules/nixos/nix/default.nix index 3521649..bddc349 100644 --- a/modules/nixos/nix/default.nix +++ b/modules/nixos/nix/default.nix @@ -13,7 +13,7 @@ let in { options.caramelmint.nix = with types; { enable = mkBoolOpt true "Whether or not to manage nix configuration."; - package = mkOpt package pkgs.nixUnstable "Which nix package to use."; + package = mkOpt package pkgs.nixVersions.latest "Which nix package to use."; default-substituter = { url = mkOpt str "https://cache.nixos.org" "The url for the substituter."; diff --git a/modules/nixos/security/gpg/default.nix b/modules/nixos/security/gpg/default.nix index fa86dc6..22f74f7 100644 --- a/modules/nixos/security/gpg/default.nix +++ b/modules/nixos/security/gpg/default.nix @@ -44,7 +44,7 @@ in { enable = true; enableSSHSupport = true; enableExtraSocket = true; - pinentryFlavor = "qt"; + # pinentryPackage = "qt"; }; }; diff --git a/modules/nixos/suites/development/default.nix b/modules/nixos/suites/development/default.nix index 1c0261d..792ea98 100644 --- a/modules/nixos/suites/development/default.nix +++ b/modules/nixos/suites/development/default.nix @@ -36,7 +36,7 @@ in { jetbrains.idea-community mongodb-compass - dbeaver + dbeaver-bin sway-launcher-desktop curlie diff --git a/modules/nixos/suites/games/default.nix b/modules/nixos/suites/games/default.nix index 2097206..a45dd90 100644 --- a/modules/nixos/suites/games/default.nix +++ b/modules/nixos/suites/games/default.nix @@ -25,7 +25,6 @@ in { extraPackages = with pkgs; [ mesa_drivers intel-ocl - beignet intel-media-driver nvidia-vaapi-driver vaapiIntel diff --git a/modules/nixos/suites/music-production/default.nix b/modules/nixos/suites/music-production/default.nix index cc968e1..8cdd380 100644 --- a/modules/nixos/suites/music-production/default.nix +++ b/modules/nixos/suites/music-production/default.nix @@ -18,7 +18,7 @@ in { kdenlive audacity unstable.ardour - unstable.decent-sampler + # unstable.decent-sampler carla x42-plugins x42-avldrums diff --git a/modules/nixos/tools/activity-watch/default.nix b/modules/nixos/tools/activity-watch/default.nix index afd7fee..4af8176 100644 --- a/modules/nixos/tools/activity-watch/default.nix +++ b/modules/nixos/tools/activity-watch/default.nix @@ -34,7 +34,7 @@ in { Service = { ExecStart = - "${pkgs.caramelmint.aw-watcher-window-wayland}/bin/aw-watcher-window-wayland"; + "${pkgs.aw-watcher-window-wayland}/bin/aw-watcher-window-wayland"; }; Install = { WantedBy = [ "graphical-session.target" ]; }; diff --git a/modules/nixos/tools/git/default.nix b/modules/nixos/tools/git/default.nix index 6f9d9cd..7b7496b 100644 --- a/modules/nixos/tools/git/default.nix +++ b/modules/nixos/tools/git/default.nix @@ -48,7 +48,8 @@ in { push = { autoSetupRemote = true; }; core = { whitespace = "trailing-space,space-before-tab"; }; safe = { - directory = "${config.users.users.${user.name}.home}/work/config"; + # directory = "${config.users.users.${user.name}.home}/personal/config"; + directory = "*"; }; }; };