From d6e57adf57e03673ce133070f05d1b94994e1029 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 25 Dec 2024 19:20:43 -0500 Subject: [PATCH] [flake] update and switch to new catppuccin options --- flake.lock | 367 ++++++++++++------ flake.nix | 2 +- modules/home/profiles/cli/default.nix | 6 +- modules/home/programs/fish/default.nix | 2 +- modules/home/programs/git/default.nix | 4 +- modules/home/programs/helix/default.nix | 6 +- modules/home/programs/kitty/default.nix | 2 +- .../home/programs/misc-programs/default.nix | 7 +- modules/home/programs/starship/default.nix | 2 +- modules/home/services/mako/default.nix | 2 +- modules/home/wayland/sway.nix | 4 +- modules/home/wayland/swaylock.nix | 4 +- modules/home/wayland/waybar.nix | 2 +- modules/nixos/default-config/default.nix | 7 +- packages/olympus/default.nix | 2 +- systems/x86_64-linux/zaphod/fonts.nix | 12 +- .../x86_64-linux/zaphod/services/kmscon.nix | 2 +- 17 files changed, 278 insertions(+), 155 deletions(-) diff --git a/flake.lock b/flake.lock index 8c0a3cdb..430b24c3 100644 --- a/flake.lock +++ b/flake.lock @@ -47,11 +47,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1731622832, - "narHash": "sha256-uTdeXrKRhkBaDAGSxw7s8YYvbU2JN6bbWh2ngUjmnUM=", + "lastModified": 1733851514, + "narHash": "sha256-fQt/HzF+OBC8xLRYeHiYLSEzjrgOLNWhyd102aY2oLU=", "owner": "nix-community", "repo": "authentik-nix", - "rev": "91ff8d93f089104d3d75c85758832252989c6a04", + "rev": "b059e1d6e7a94bbeabb4e87d47b5f5097fd61823", "type": "github" }, "original": { @@ -63,16 +63,16 @@ "authentik-src": { "flake": false, "locked": { - "lastModified": 1731600340, - "narHash": "sha256-7uQteE+Ywiu04Ymhl3G8IRH6JJXPyd0mg61tJJMeGvg=", + "lastModified": 1733849292, + "narHash": "sha256-gJYgrRxytoGHkjeEsiKY/tl06D8XOnZZ9SDpK1WSyUw=", "owner": "goauthentik", "repo": "authentik", - "rev": "66a4970014da49ceec0715e5dec8c9aa032a3146", + "rev": "0edd7531a152910e6bdd4f7d3d0cde3ed5fdd956", "type": "github" }, "original": { "owner": "goauthentik", - "ref": "version/2024.10.2", + "ref": "version/2024.10.5", "repo": "authentik", "type": "github" } @@ -98,17 +98,18 @@ "flake-parts": [ "flake-parts" ], + "hercules-ci-effects": "hercules-ci-effects", "nixpkgs": [ "nixpkgs" ], "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1731935413, - "narHash": "sha256-vyRa33ZDGrcaBQ3xgnehF8DalaXTc4cPuwmEy4SOCyI=", + "lastModified": 1734833734, + "narHash": "sha256-CGB1DifhWz3sbeLEFrQ8gxQQltbGonqrxD6xWvccQ+o=", "owner": "Mic92", "repo": "buildbot-nix", - "rev": "33d713436a9756fab37278901acf6d3765ba2df9", + "rev": "c4452c6f95cebde539f316d806644837f8b5e75f", "type": "github" }, "original": { @@ -119,11 +120,11 @@ }, "ctp": { "locked": { - "lastModified": 1731232837, - "narHash": "sha256-0aIwr/RC/oe7rYkfJb47xjdEQDSNcqpFGsEa+EPlDEs=", + "lastModified": 1735028008, + "narHash": "sha256-crbQNRVQgPH0hX5vZk8xL9JStXo74Es7zDBjRcc4i+A=", "owner": "catppuccin", "repo": "nix", - "rev": "32359bf226fe874d3b7a0a5753d291a4da9616fe", + "rev": "bfd20bcf45f1de0e97b551be51495abf8a727f1a", "type": "github" }, "original": { @@ -211,11 +212,11 @@ ] }, "locked": { - "lastModified": 1726867691, - "narHash": "sha256-IK3r16N9pizf53AipOmrcrcyjVsPJwC4PI5hIqEyKwQ=", + "lastModified": 1733919067, + "narHash": "sha256-ZsL5pKwEDhcZhVJh+3IwgHus7kSW/N8qOlBscwB6BCI=", "owner": "nix-community", "repo": "dns.nix", - "rev": "a3196708a56dee76186a9415c187473b94e6cbae", + "rev": "a23f43f9762aa96d3e35c8eeefa7610bd0cdf456", "type": "github" }, "original": { @@ -226,11 +227,11 @@ }, "flake-compat": { "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -294,11 +295,11 @@ ] }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -308,6 +309,27 @@ } }, "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "nvim", @@ -316,11 +338,11 @@ ] }, "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -328,7 +350,7 @@ "type": "indirect" } }, - "flake-parts_3": { + "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "wayland", @@ -352,11 +374,11 @@ }, "flake-root": { "locked": { - "lastModified": 1713493429, - "narHash": "sha256-ztz8JQkI08tjKnsTpfLqzWoKFQF4JGu2LRz8bkdnYUk=", + "lastModified": 1723604017, + "narHash": "sha256-rBtQ8gg+Dn4Sx/s+pvjdq3CB2wQNzx9XGFq/JVGCB6k=", "owner": "srid", "repo": "flake-root", - "rev": "bc748b93b86ee76e2032eecda33440ceb2532fcd", + "rev": "b759a56851e10cb13f6b8e5698af7b59c44be26e", "type": "github" }, "original": { @@ -454,11 +476,11 @@ ] }, "locked": { - "lastModified": 1731363552, - "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", + "lastModified": 1734797603, + "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", + "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498", "type": "github" }, "original": { @@ -521,11 +543,11 @@ ] }, "locked": { - "lastModified": 1729038018, - "narHash": "sha256-UMAQj/qfMp/8V7foUQ+vZl4NxrGHF7ihv7QXwbAPbkg=", + "lastModified": 1733941744, + "narHash": "sha256-cIml0ewF5j2cQySLHkMmV1rl7cVH8wuoPFeFDCARi1A=", "owner": "tailscale", "repo": "golink", - "rev": "701eb193420b16655a6060802faa5caf494ecc5f", + "rev": "d55b2a3302777d7f9943863644d4c84ecacb31b7", "type": "github" }, "original": { @@ -536,11 +558,11 @@ }, "hardware": { "locked": { - "lastModified": 1731797098, - "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=", + "lastModified": 1734954597, + "narHash": "sha256-QIhd8/0x30gEv8XEE1iAnrdMlKuQ0EzthfDR7Hwl+fk=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6", + "rev": "def1d472c832d77885f174089b0d34854b007198", "type": "github" }, "original": { @@ -551,18 +573,43 @@ }, "hercules-ci-effects": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": [ + "buildbot-nix", + "flake-parts" + ], + "nixpkgs": [ + "buildbot-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733333617, + "narHash": "sha256-nMMQXREGvLOLvUa0ByhYFdaL0Jov0t1wzLbKjr05P2w=", + "owner": "hercules-ci", + "repo": "hercules-ci-effects", + "rev": "56f8ea8d502c87cf62444bec4ee04512e8ea24ea", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "hercules-ci-effects", + "type": "github" + } + }, + "hercules-ci-effects_2": { + "inputs": { + "flake-parts": "flake-parts_3", "nixpkgs": [ "nvim", "nixpkgs" ] }, "locked": { - "lastModified": 1730903510, - "narHash": "sha256-mnynlrPeiW0nUQ8KGZHb3WyxAxA3Ye/BH8gMjdoKP6E=", + "lastModified": 1733333617, + "narHash": "sha256-nMMQXREGvLOLvUa0ByhYFdaL0Jov0t1wzLbKjr05P2w=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "b89ac4d66d618b915b1f0a408e2775fe3821d141", + "rev": "56f8ea8d502c87cf62444bec4ee04512e8ea24ea", "type": "github" }, "original": { @@ -578,11 +625,11 @@ ] }, "locked": { - "lastModified": 1731968878, - "narHash": "sha256-+hTCwETOE9N8voTAaF+IzdUZz28Ws3LDpH90FWADrEE=", + "lastModified": 1735053786, + "narHash": "sha256-Gm+0DcbUS338vvkwyYWms5jsWlx8z8MeQBzcnIDuIkw=", "owner": "nix-community", "repo": "home-manager", - "rev": "a42fa14b53ceab66274a21da480c9f8e06204173", + "rev": "35b98d20ca8f4ca1f6a2c30b8a2c8bb305a36d84", "type": "github" }, "original": { @@ -617,11 +664,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1731845570, - "narHash": "sha256-5reOtlm18XLnh3ezruPOg2wQO+MB7ztsFaIzSUAzeh8=", + "lastModified": 1734869532, + "narHash": "sha256-tMWJ1gDqNkCaH6jmZRXAUUhfhIrLMWJBiM+CtAtQqoY=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "7a1d37b2b16f32536628df9cea6a2003d79a49f9", + "rev": "1451a8a6902c85c90dae3c253df5401b7eb3581f", "type": "github" }, "original": { @@ -655,14 +702,14 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-24_05": "nixpkgs-24_05" + "nixpkgs-24_11": "nixpkgs-24_11" }, "locked": { - "lastModified": 1722877200, - "narHash": "sha256-qgKDNJXs+od+1UbRy62uk7dYal3h98I4WojfIqMoGcg=", + "lastModified": 1734884447, + "narHash": "sha256-HA9fAmGNGf0cOYrhgoa+B6BxNVqGAYXfLyx8zIS0ZBY=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "af7d3bf5daeba3fc28089b015c0dd43f06b176f2", + "rev": "63209b1def2c9fc891ad271f474a3464a5833294", "type": "gitlab" }, "original": { @@ -762,11 +809,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1731886414, - "narHash": "sha256-Fyve6sUYgL0VcPgMysOIJIDVuAHcgTeXB8kLwx6rB5c=", + "lastModified": 1734989976, + "narHash": "sha256-DVlI7ua+VOkqC70WpSbJO+FjQyBEarGZnKoql7I7Unk=", "owner": "neovim", "repo": "neovim", - "rev": "965dc81f818e50b5078d4b7efa5fbb8b771560f8", + "rev": "c51bf5a6b24928ac04d0bb129b1b424d4c78f28d", "type": "github" }, "original": { @@ -782,11 +829,11 @@ ] }, "locked": { - "lastModified": 1731939910, - "narHash": "sha256-sx79w4tHyWnybaqSymMFEymPZO+gjQRgbEKs/GBhsVM=", + "lastModified": 1733912267, + "narHash": "sha256-I3ubew5jt8YZ27AOtIodRAYo0aew6wxY8UkWCSqz6B4=", "owner": "viperML", "repo": "nh", - "rev": "b22e96f7cae9cfb7aa7f24eea6ec58fbde41545b", + "rev": "6a69a145b0c7dbd5616bbded512b8bf8b5d2f8a4", "type": "github" }, "original": { @@ -797,17 +844,17 @@ }, "nix-eval-jobs": { "inputs": { - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_4", "nix-github-actions": "nix-github-actions_2", - "nixpkgs": "nixpkgs_2", - "treefmt-nix": "treefmt-nix_4" + "nixpkgs": "nixpkgs_3", + "treefmt-nix": "treefmt-nix_6" }, "locked": { - "lastModified": 1731682758, - "narHash": "sha256-o54e8oNPPNmU7zHm3uTvsbbQLi7EKX3S6EEndXFG594=", + "lastModified": 1733909753, + "narHash": "sha256-5GChR6LKh6EwGXLfR3HLW2Z0AWoyce4Hyp3VB5C4FCk=", "owner": "nix-community", "repo": "nix-eval-jobs", - "rev": "d926bcd5206c0b7afe47bed92557c8cd5e882b36", + "rev": "b1f94fed4af8e7f30665a3bf8b369dc3b8a95884", "type": "github" }, "original": { @@ -818,11 +865,11 @@ }, "nix-filter": { "locked": { - "lastModified": 1730207686, - "narHash": "sha256-SCHiL+1f7q9TAnxpasriP6fMarWE5H43t25F5/9e28I=", + "lastModified": 1731533336, + "narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=", "owner": "numtide", "repo": "nix-filter", - "rev": "776e68c1d014c3adde193a18db9d738458cd2ba4", + "rev": "f7653272fd234696ae94229839a99b73c9ab7de0", "type": "github" }, "original": { @@ -862,11 +909,11 @@ ] }, "locked": { - "lastModified": 1720066371, - "narHash": "sha256-uPlLYH2S0ACj0IcgaK9Lsf4spmJoGejR9DotXiXSBZQ=", + "lastModified": 1731952509, + "narHash": "sha256-p4gB3Rhw8R6Ak4eMl8pqjCPOLCZRqaehZxdZ/mbFClM=", "owner": "nix-community", "repo": "nix-github-actions", - "rev": "622f829f5fe69310a866c8a6cd07e747c44ef820", + "rev": "7b5f051df789b6b20d259924d349a9ba3319b226", "type": "github" }, "original": { @@ -905,11 +952,11 @@ ] }, "locked": { - "lastModified": 1731814505, - "narHash": "sha256-l9ryrx1Twh08a+gxrMGM9O/aZKEimZfa6sZVyPCImgI=", + "lastModified": 1735160596, + "narHash": "sha256-zD8ciZm42wi1ijHyS7J0dmBE3QXMA/qBfwW/SEXhiwI=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "bdba246946fb079b87b4cada4df9b1cdf1c06132", + "rev": "c8470746a9f4d1ab4c7563db7da995595ed64ca2", "type": "github" }, "original": { @@ -956,11 +1003,11 @@ "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1731645784, - "narHash": "sha256-VBmrvzXm+jtvl9CKBvGjcMWfBx/FCtsbn/7D4//Ru2k=", + "lastModified": 1734926609, + "narHash": "sha256-c1VS+suA1WaHag1a4Gafg6U2vfwyFKktjMQNtJExe0A=", "owner": "nix-community", "repo": "nixd", - "rev": "0f3c0c730e5cb9414f3b269dc9b36062a0e5236e", + "rev": "f97db14905a050534b2b28355061f790d171f12f", "type": "github" }, "original": { @@ -979,11 +1026,11 @@ ] }, "locked": { - "lastModified": 1731892054, - "narHash": "sha256-BJtD9NGUWaBe4OZ1JO77w8qBP9yHDJJUjsxkG/milFc=", + "lastModified": 1734915500, + "narHash": "sha256-A7CTIQ8SW0hfbhKlwK+vSsu4pD+Oaelw3v6goX6go+U=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "15a87ccb45e06d24a9fd5f99a49782efe11b23f0", + "rev": "051d1b2dda3b2e81b38d82e2b691e5c2f4d335f4", "type": "github" }, "original": { @@ -994,11 +1041,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731890469, - "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=", + "lastModified": 1734988233, + "narHash": "sha256-Ucfnxq1rF/GjNP3kTL+uTfgdoE9a3fxDftSfeLIS8mA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5083ec887760adfe12af64830a66807423a859a7", + "rev": "de1864217bfa9b5845f465e771e0ecb48b30e02d", "type": "github" }, "original": { @@ -1008,28 +1055,28 @@ "type": "github" } }, - "nixpkgs-24_05": { + "nixpkgs-24_11": { "locked": { - "lastModified": 1717144377, - "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", + "lastModified": 1734083684, + "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "805a384895c696f802a9bf5bf4720f37385df547", + "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "type": "indirect" } }, "nixpkgs-lib": { "locked": { - "lastModified": 1731805462, - "narHash": "sha256-yhEMW4MBi+IAyEJyiKbnFvY1uARyMKJpLUhkczI49wk=", + "lastModified": 1734829460, + "narHash": "sha256-dPhc+f2wkmhMqMIfq+hColJdysgVxKP9ilZ5bR0NRZI=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "b9f04e3cf71c23bea21d2768051e6b3068d44734", + "rev": "0a31e8d833173ae63e43fd9dbff1ccf09c4f778c", "type": "github" }, "original": { @@ -1040,11 +1087,11 @@ }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1731805462, - "narHash": "sha256-yhEMW4MBi+IAyEJyiKbnFvY1uARyMKJpLUhkczI49wk=", + "lastModified": 1734829460, + "narHash": "sha256-dPhc+f2wkmhMqMIfq+hColJdysgVxKP9ilZ5bR0NRZI=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "b9f04e3cf71c23bea21d2768051e6b3068d44734", + "rev": "0a31e8d833173ae63e43fd9dbff1ccf09c4f778c", "type": "github" }, "original": { @@ -1055,11 +1102,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1730958623, - "narHash": "sha256-JwQZIGSYnRNOgDDoIgqKITrPVil+RMWHsZH1eE1VGN0=", + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1732238832, + "narHash": "sha256-sQxuJm8rHY20xq6Ah+GwIUkF95tWjGRd1X8xF+Pkk38=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "85f7e662eda4fa3a995556527c87b2524b691933", + "rev": "8edf06bea5bcbee082df1b7369ff973b91618b8d", "type": "github" }, "original": { @@ -1070,12 +1133,17 @@ } }, "nur": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_2", + "treefmt-nix": "treefmt-nix_4" + }, "locked": { - "lastModified": 1731989548, - "narHash": "sha256-R8R1zo6wNi9awwRgoQ5wKlvgSXW/PrYF9vs8eLGvxtU=", + "lastModified": 1735155985, + "narHash": "sha256-FCc7Ow6gB1b1Q5klGwdQKFZroZWSyLB1NZ1yV1cXxBY=", "owner": "nix-community", "repo": "nur", - "rev": "c3ee535c374f56110be3d1f4c219f3c45b14664b", + "rev": "fff50315d620a788edd5e198ef741c08c4ec80a1", "type": "github" }, "original": { @@ -1093,18 +1161,19 @@ "flake-parts" ], "git-hooks": "git-hooks", - "hercules-ci-effects": "hercules-ci-effects", + "hercules-ci-effects": "hercules-ci-effects_2", "neovim-src": "neovim-src", "nixpkgs": [ "nixpkgs" - ] + ], + "treefmt-nix": "treefmt-nix_5" }, "locked": { - "lastModified": 1731911800, - "narHash": "sha256-XexksBtvDiT3J1JaA3JSXvPvd40mU6tsf1GsE6mceqA=", + "lastModified": 1735143314, + "narHash": "sha256-e+0LQ1ROseQid473/orCI+KuuqGl3epTc5bwX+iVxjw=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "cddd55515fe5f8c5af730838583a0c68759c4fd3", + "rev": "141f2db491ab484a2372ee8368fcd3a31422ec2f", "type": "github" }, "original": { @@ -1183,11 +1252,11 @@ ] }, "locked": { - "lastModified": 1731712168, - "narHash": "sha256-M2hCupf4qfjghL/SgEosjzyyv7HvfZklCas6p5WK9d4=", + "lastModified": 1734592619, + "narHash": "sha256-Nzpn8O7n+cWg5+DO6Y/Ca0rV3yNB8IN3jUOAv9JrHyA=", "owner": "PrismLauncher", "repo": "PrismLauncher", - "rev": "48235f5b71be19bb905a12cf45f4abe5499f85ea", + "rev": "0b6ce5525dbe4d617788b740dc4fefc93bee0e5f", "type": "github" }, "original": { @@ -1243,11 +1312,11 @@ ] }, "locked": { - "lastModified": 1730136121, - "narHash": "sha256-tfVayj13Zw+zzOKrmJhnvBod7Hdb9ixBR6/4GUlyMA0=", + "lastModified": 1732544274, + "narHash": "sha256-qvzLIxuqukl0nxpXHEh5+iw1BLeLxYOwRC0+7cFUbPo=", "owner": "snowfallorg", "repo": "lib", - "rev": "dd348182c1a010993e68004eada86cf0341fe2c4", + "rev": "cfeacd055545ab5de0ecfd41e09324dcd8fb2bbb", "type": "github" }, "original": { @@ -1258,11 +1327,11 @@ }, "stable": { "locked": { - "lastModified": 1731797254, - "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", + "lastModified": 1734835170, + "narHash": "sha256-JG6n9tQET7ZLjvwjH9BdYE6pES/Alcduxv2FDXliuBM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", + "rev": "6df924734e1b626efd70925545de844b1c25246f", "type": "github" }, "original": { @@ -1344,11 +1413,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1730803396, - "narHash": "sha256-5ycWNOxmR/wPftlSWLQEZ3odOIE3rPvSd2qjd5+nLAE=", + "lastModified": 1734639503, + "narHash": "sha256-Z58HeNQpfbi94Cw8VxdF1GtU1S5AoWO0hfJTxA6wu78=", "owner": "oddlama", "repo": "nix-topology", - "rev": "82dbbdc3c4f8f86fefdee8d8875fd4fd9276881a", + "rev": "d6edd49bac68dc70e19b5e91617b9f04e8ac1c43", "type": "github" }, "original": { @@ -1387,11 +1456,11 @@ ] }, "locked": { - "lastModified": 1730321837, - "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=", + "lastModified": 1734704479, + "narHash": "sha256-MMi74+WckoyEWBRcg/oaGRvXC9BVVxDZNRMpL+72wBI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc", + "rev": "65712f5af67234dad91a5a4baee986a8b62dbf8f", "type": "github" }, "original": { @@ -1408,11 +1477,11 @@ ] }, "locked": { - "lastModified": 1722330636, - "narHash": "sha256-uru7JzOa33YlSRwf9sfXpJG+UAV+bnBEYMjrzKrQZFw=", + "lastModified": 1734704479, + "narHash": "sha256-MMi74+WckoyEWBRcg/oaGRvXC9BVVxDZNRMpL+72wBI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "768acdb06968e53aa1ee8de207fd955335c754b7", + "rev": "65712f5af67234dad91a5a4baee986a8b62dbf8f", "type": "github" }, "original": { @@ -1422,6 +1491,48 @@ } }, "treefmt-nix_4": { + "inputs": { + "nixpkgs": [ + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_5": { + "inputs": { + "nixpkgs": [ + "nvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1734982074, + "narHash": "sha256-N7M37KP7cHWoXicuE536GrVvU8nMDT/gpI1kja2hkdg=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "e41e948cf097cbf96ba4dff47a30ea6891af9f33", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_6": { "inputs": { "nixpkgs": [ "wayland", @@ -1453,11 +1564,11 @@ ] }, "locked": { - "lastModified": 1731512188, - "narHash": "sha256-fELrde5IDAgdYQQL/EAPBPFZIN73p/zd33rtfJQsA4s=", + "lastModified": 1733561910, + "narHash": "sha256-TkyWMLnLd5QhAlfAGtuU3n8Gtl2Gp4+8Ye/rE4hs46A=", "owner": "Alexays", "repo": "Waybar", - "rev": "86451156190e69afafb2162fb5891c0fc68c26e7", + "rev": "e959f1d2300c5f7fcc818630c9eae59d834024ce", "type": "github" }, "original": { @@ -1478,11 +1589,11 @@ ] }, "locked": { - "lastModified": 1731979707, - "narHash": "sha256-yaSFmLgsfkMFXSbk04jO/jCd7LqnpRKnfRL7rfJcTlM=", + "lastModified": 1734896070, + "narHash": "sha256-HECsyS551+KtffczDgx7w/xvruXHKoUf4JX7xW+Ecbo=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "12abb5302542162346d009888ce3d26936587010", + "rev": "8988b0603fed7e3d303718328cf4cd8dd137575e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index df9ea31e..ae478303 100644 --- a/flake.nix +++ b/flake.nix @@ -205,7 +205,7 @@ inputs.golink.overlay inputs.neovim.overlay inputs.nixd.overlays.default - inputs.nur.overlay + inputs.nur.overlays.default inputs.prismlauncher.overlays.default inputs.topology.overlays.default inputs.wayland.overlays.default diff --git a/modules/home/profiles/cli/default.nix b/modules/home/profiles/cli/default.nix index d2df7abc..5c616e8f 100644 --- a/modules/home/profiles/cli/default.nix +++ b/modules/home/profiles/cli/default.nix @@ -33,6 +33,10 @@ in wakatime.enable = mkDefault true; zoxide.enable = mkDefault true; }; + catppuccin = { + btop.enable = true; + glamour.enable = true; + }; programs = { eza = { enable = true; @@ -43,9 +47,7 @@ in }; btop = { enable = true; - catppuccin.enable = true; }; - glamour.catppuccin.enable = true; }; xdg.configFile = { "rbw/config.json".source = ./rbw-config.json; diff --git a/modules/home/programs/fish/default.nix b/modules/home/programs/fish/default.nix index 011e55ad..5f4e8f94 100644 --- a/modules/home/programs/fish/default.nix +++ b/modules/home/programs/fish/default.nix @@ -10,9 +10,9 @@ let in { options.py.programs.fish.enable = mkEnableOption "fish shell"; + config.catppuccin.fish.enable = cfg.enable; config.programs.fish = mkIf cfg.enable { enable = true; - catppuccin.enable = true; shellAliases = { "lg" = getExe pkgs.lazygit; "cat" = getExe pkgs.bat; diff --git a/modules/home/programs/git/default.nix b/modules/home/programs/git/default.nix index 2f7a3903..37594227 100644 --- a/modules/home/programs/git/default.nix +++ b/modules/home/programs/git/default.nix @@ -14,6 +14,9 @@ in gh.enable = lib.mkEnableOption "gh configuration"; }; config = { + catppuccin = { + lazygit.enable = cfg.lazygit.enable; + }; programs = { git = lib.mkIf cfg.enable { enable = true; @@ -77,7 +80,6 @@ in }; lazygit = lib.mkIf cfg.lazygit.enable { enable = true; - catppuccin.enable = true; settings = { gui = { nerdFontsVersion = "3"; diff --git a/modules/home/programs/helix/default.nix b/modules/home/programs/helix/default.nix index 1a95b76b..20cfa2fa 100644 --- a/modules/home/programs/helix/default.nix +++ b/modules/home/programs/helix/default.nix @@ -4,10 +4,12 @@ let in { options.py.programs.helix.enable = lib.mkEnableOption "helix editor"; + config.catppuccin.helix = { + enable = cfg.enable; + useItalics = cfg.enable; + }; config.programs.helix = lib.mkIf cfg.enable { enable = true; - catppuccin.enable = true; - catppuccin.useItalics = true; settings = import ./settings.nix; }; } diff --git a/modules/home/programs/kitty/default.nix b/modules/home/programs/kitty/default.nix index 9b721fe4..7c2017ec 100644 --- a/modules/home/programs/kitty/default.nix +++ b/modules/home/programs/kitty/default.nix @@ -4,9 +4,9 @@ let in { options.py.programs.kitty.enable = lib.mkEnableOption "kitty"; + config.catppuccin.kitty.enable = cfg.enable; config.programs.kitty = lib.mkIf cfg.enable { enable = true; - catppuccin.enable = true; font.name = "BlexMono Nerd Font"; font.size = 14; settings = import ./settings.nix; diff --git a/modules/home/programs/misc-programs/default.nix b/modules/home/programs/misc-programs/default.nix index d747a153..63b66c2b 100644 --- a/modules/home/programs/misc-programs/default.nix +++ b/modules/home/programs/misc-programs/default.nix @@ -20,10 +20,14 @@ in zoxide.enable = mkEnableOption "zoxide"; }; config = { + catppuccin = { + bat.enable = cfg.bat.enable; + fzf.enable = cfg.fzf.enable; + obs.enable = cfg.obs.enable; + }; programs = { bat = mkIf cfg.bat.enable { enable = true; - catppuccin.enable = true; }; direnv = mkIf cfg.direnv.enable { enable = true; @@ -37,7 +41,6 @@ in enable = true; enableBashIntegration = true; enableZshIntegration = true; - catppuccin.enable = true; }; nix-index = mkIf cfg.nix-index.enable { enable = true; diff --git a/modules/home/programs/starship/default.nix b/modules/home/programs/starship/default.nix index 6714d867..7cae2ff2 100644 --- a/modules/home/programs/starship/default.nix +++ b/modules/home/programs/starship/default.nix @@ -4,9 +4,9 @@ let in { options.py.programs.starship.enable = lib.mkEnableOption "starship"; + config.catppuccin.starship.enable = cfg.enable; config.programs.starship = lib.mkIf cfg.enable { enable = true; - catppuccin.enable = true; enableFishIntegration = true; enableBashIntegration = true; enableZshIntegration = true; diff --git a/modules/home/services/mako/default.nix b/modules/home/services/mako/default.nix index c84fecc8..963149b2 100644 --- a/modules/home/services/mako/default.nix +++ b/modules/home/services/mako/default.nix @@ -4,9 +4,9 @@ let in { options.py.services.mako.enable = lib.mkEnableOption "mako"; + config.catppuccin.mako.enable = cfg.enable; config.services.mako = lib.mkIf cfg.enable { enable = true; - catppuccin.enable = false; actions = true; defaultTimeout = 10000; font = "IBM Plex Sans 14pt"; diff --git a/modules/home/wayland/sway.nix b/modules/home/wayland/sway.nix index dfc6cf27..c906bdad 100644 --- a/modules/home/wayland/sway.nix +++ b/modules/home/wayland/sway.nix @@ -14,13 +14,15 @@ in enable = lib.mkEnableOption "GUI Configuration"; }; config = lib.mkIf cfg.enable { + catppuccin = { + sway.enable = true; + }; home.sessionVariables = { XDG_CURRENT_DESKTOP = "sway"; }; wayland.windowManager.sway = { enable = lib.mkDefault true; package = null; - catppuccin.enable = true; # nix-community/home-manager/issues/5311 checkConfig = false; wrapperFeatures.base = true; diff --git a/modules/home/wayland/swaylock.nix b/modules/home/wayland/swaylock.nix index 2579dfb1..edddb2e0 100644 --- a/modules/home/wayland/swaylock.nix +++ b/modules/home/wayland/swaylock.nix @@ -3,9 +3,11 @@ let cfg = config.py.gui; in { + catppuccin = { + swaylock.enable = false; + }; programs.swaylock = lib.mkIf cfg.enable { enable = lib.mkDefault true; - catppuccin.enable = false; settings = { daemonize = true; image = "/home/thehedgehog/bgs/ctp-waves.png"; diff --git a/modules/home/wayland/waybar.nix b/modules/home/wayland/waybar.nix index 25be4645..cd251cd5 100644 --- a/modules/home/wayland/waybar.nix +++ b/modules/home/wayland/waybar.nix @@ -15,6 +15,7 @@ in source = ./waybar-mocha.css; recursive = false; }; + catppuccin.waybar.enable = false; programs.waybar = lib.mkIf cfg.enable { enable = lib.mkDefault true; package = ( @@ -22,7 +23,6 @@ in patches = [ ]; } ); - catppuccin.enable = false; systemd.enable = true; systemd.target = "sway-session.target"; style = ./waybar-style.css; diff --git a/modules/nixos/default-config/default.nix b/modules/nixos/default-config/default.nix index baedba59..4eebb154 100644 --- a/modules/nixos/default-config/default.nix +++ b/modules/nixos/default-config/default.nix @@ -16,6 +16,9 @@ system.stateVersion = "24.11"; system.disableInstallerTools = true; nix.package = pkgs.nixVersions.stable; - catppuccin.flavor = "mocha"; - console.catppuccin.enable = true; + catppuccin = { + flavor = "mocha"; + accent = "mauve"; + tty.enable = true; + }; } diff --git a/packages/olympus/default.nix b/packages/olympus/default.nix index 0e74f65a..fb5086d1 100644 --- a/packages/olympus/default.nix +++ b/packages/olympus/default.nix @@ -24,7 +24,7 @@ let ''; }; in -pkgs.buildFHSUserEnv { +pkgs.buildFHSEnv { name = "olympus"; runScript = "${olympus}/opt/olympus/olympus"; targetPkgs = pkgs: [ diff --git a/systems/x86_64-linux/zaphod/fonts.nix b/systems/x86_64-linux/zaphod/fonts.nix index f985b5f8..758ea953 100644 --- a/systems/x86_64-linux/zaphod/fonts.nix +++ b/systems/x86_64-linux/zaphod/fonts.nix @@ -16,14 +16,10 @@ }; packages = with pkgs; [ ibm-plex - (nerdfonts.override { - fonts = [ - "FiraCode" - "FiraMono" - "IBMPlexMono" - "JetBrainsMono" - ]; - }) + nerd-fonts.fira-code + nerd-fonts.fira-mono + nerd-fonts.blex-mono + nerd-fonts.jetbrains-mono ]; }; } diff --git a/systems/x86_64-linux/zaphod/services/kmscon.nix b/systems/x86_64-linux/zaphod/services/kmscon.nix index e6b74c86..c23c1e01 100644 --- a/systems/x86_64-linux/zaphod/services/kmscon.nix +++ b/systems/x86_64-linux/zaphod/services/kmscon.nix @@ -6,7 +6,7 @@ fonts = [ { name = "BlexMono Nerd Font"; - package = pkgs.nerdfonts.override { fonts = [ "IBMPlexMono" ]; }; + package = pkgs.nerd-fonts.blex-mono; } ]; }; -- 2.51.2