From cf4103203b915e691924d069d2e47ad86623679b Mon Sep 17 00:00:00 2001 From: "anthonyenr1quez-renovate[bot]" <117547040+anthonyenr1quez-renovate[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2024 12:56:47 -0600 Subject: [PATCH] chore(deps): lock file maintenance (#133) * chore(deps): lock file maintenance * update flake locks * error: nur.hmModules.nur has been replaced by nur.modules.homeManager.default * catppuccin option changes --------- Co-authored-by: anthonyenr1quez-renovate[bot] <117547040+anthonyenr1quez-renovate[bot]@users.noreply.github.com> Co-authored-by: AnthonyEnr1quez <32233059+AnthonyEnr1quez@users.noreply.github.com> --- flake.lock | 109 +++++++++++++----- flake.nix | 12 +- .../MacBook-Pro-2/direnvs/mf/flake.lock | 6 +- hosts/darwin/damascus/default.nix | 3 +- modules/home-manager/catppuccin/default.nix | 13 +-- modules/home-manager/firefox/default.nix | 2 +- 6 files changed, 99 insertions(+), 46 deletions(-) diff --git a/flake.lock b/flake.lock index 7894001..b4bf0e8 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "catppuccin": { "locked": { - "lastModified": 1733001911, - "narHash": "sha256-uX/9m0TbdhEzuWA0muM5mI/AaWcLiDLjCCyu5Qr9MRk=", + "lastModified": 1734734291, + "narHash": "sha256-CFX4diEQHKvZYjnhf7TLg20m3ge1O4vqgplsk/Kuaek=", "owner": "catppuccin", "repo": "nix", - "rev": "a817009ebfd2cca7f70a77884e5098d0a8c83f8e", + "rev": "1e4c3803b8da874ff75224ec8512cb173036bbd8", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1733105089, - "narHash": "sha256-Qs3YmoLYUJ8g4RkFj2rMrzrP91e4ShAioC9s+vG6ENM=", + "lastModified": 1733570843, + "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "c6b65d946097baf3915dd51373251de98199280d", + "rev": "a35b08d09efda83625bef267eb24347b446c80b8", "type": "github" }, "original": { @@ -57,11 +57,11 @@ ] }, "locked": { - "lastModified": 1733101368, - "narHash": "sha256-DCNK2vOSLHQhLJYdArc0U9Urxqu0nni8wnHKjyqLZ1k=", + "lastModified": 1734915482, + "narHash": "sha256-kD3107GK1Tvf+pFTTTHyn8tczwOAi9sOA71O9wF3u8g=", "owner": "bandithedoge", "repo": "nixpkgs-firefox-darwin", - "rev": "d216ec325c9f0f2e35375e8defe9457e720bcefb", + "rev": "0308876ddb656970b4971a337951fb3641de7e74", "type": "github" }, "original": { @@ -90,11 +90,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -103,6 +103,27 @@ "type": "github" } }, + "flake-parts": { + "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-utils": { "inputs": { "systems": [ @@ -128,11 +149,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -166,11 +187,11 @@ ] }, "locked": { - "lastModified": 1733133928, - "narHash": "sha256-gU40r9AfpIr4eq+0noM8yH1Hxf+EA3dqfIpFtQl8Y1E=", + "lastModified": 1734944412, + "narHash": "sha256-36QfCAl8V6nMIRUCgiC79VriJPUXXkHuR8zQA1vAtSU=", "owner": "nix-community", "repo": "home-manager", - "rev": "873e39d5f4437d2f3ab06881fea8e63e45e1d011", + "rev": "8264bfe3a064d704c57df91e34b795b6ac7bad9e", "type": "github" }, "original": { @@ -210,11 +231,11 @@ ] }, "locked": { - "lastModified": 1731682434, - "narHash": "sha256-HnZFPB7akVIy0KuPq/tEkiB+Brt1qi0DUIDzR8z25qI=", + "lastModified": 1733854371, + "narHash": "sha256-K9qGHniYBbjqVcEiwXyiofj/IFf78L5F0/FCf+CKyr0=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "a6b9cf0b7805e2c50829020a73e7bde683fd36dd", + "rev": "dee4425dcee3149475ead0cb6a616b8a028c5888", "type": "github" }, "original": { @@ -241,11 +262,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1733064805, - "narHash": "sha256-7NbtSLfZO0q7MXPl5hzA0sbVJt6pWxxtGWbaVUDDmjs=", + "lastModified": 1734856068, + "narHash": "sha256-Q+CB1ajsJg4Z9HGHTBAGY1q18KpnnkmF/eCTLUY6FQ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "31d66ae40417bb13765b0ad75dd200400e98de84", + "rev": "93ff48c9be84a76319dac293733df09bbbe3f25c", "type": "github" }, "original": { @@ -256,12 +277,19 @@ } }, "nur": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": [ + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix" + }, "locked": { - "lastModified": 1733156167, - "narHash": "sha256-f8SqvJxn+1JnraMjY8wiH8iEbiDJY5u8mj5RAI21poQ=", + "lastModified": 1734972189, + "narHash": "sha256-yE05pfSQEyjhljwjBGA3e/egtNY7ETF7XJkQmwvxreI=", "owner": "nix-community", "repo": "NUR", - "rev": "d16ebc0f37506eb6a382ed415aa91965ad590358", + "rev": "dc7d0b05ee32bb917daa70c723e1707c5ec4f56f", "type": "github" }, "original": { @@ -286,11 +314,11 @@ }, "stable": { "locked": { - "lastModified": 1732981179, - "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=", + "lastModified": 1734875076, + "narHash": "sha256-Pzyb+YNG5u3zP79zoi8HXYMs15Q5dfjDgwCdUI5B0nY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65", + "rev": "1807c2b91223227ad5599d7067a61665c52d1295", "type": "github" }, "original": { @@ -345,6 +373,27 @@ "type": "github" } }, + "treefmt-nix": { + "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" + } + }, "vscode-server": { "inputs": { "flake-utils": "flake-utils_3", diff --git a/flake.nix b/flake.nix index 192a431..1e97c19 100644 --- a/flake.nix +++ b/flake.nix @@ -35,7 +35,10 @@ inputs.nixpkgs.follows = "nixpkgs"; }; catppuccin.url = "github:catppuccin/nix"; - nur.url = "github:nix-community/NUR"; + nur = { + url = "github:nix-community/NUR"; + inputs.nixpkgs.follows = "nixpkgs"; + }; nixos-wsl = { url = "github:nix-community/NixOS-WSL"; @@ -67,11 +70,14 @@ ( { pkgs, config, inputs, ... }: { - nixpkgs.overlays = [ firefox-darwin.overlay ]; + nixpkgs.overlays = [ + firefox-darwin.overlay + nur.overlays.default + ]; home-manager.sharedModules = [ catppuccin.homeManagerModules.catppuccin mac-app-util.homeManagerModules.default - nur.hmModules.nur + nur.modules.homeManager.default ]; } ) diff --git a/hosts/darwin/MacBook-Pro-2/direnvs/mf/flake.lock b/hosts/darwin/MacBook-Pro-2/direnvs/mf/flake.lock index e209cb3..0dafcf3 100644 --- a/hosts/darwin/MacBook-Pro-2/direnvs/mf/flake.lock +++ b/hosts/darwin/MacBook-Pro-2/direnvs/mf/flake.lock @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733064805, - "narHash": "sha256-7NbtSLfZO0q7MXPl5hzA0sbVJt6pWxxtGWbaVUDDmjs=", + "lastModified": 1734856068, + "narHash": "sha256-Q+CB1ajsJg4Z9HGHTBAGY1q18KpnnkmF/eCTLUY6FQ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "31d66ae40417bb13765b0ad75dd200400e98de84", + "rev": "93ff48c9be84a76319dac293733df09bbbe3f25c", "type": "github" }, "original": { diff --git a/hosts/darwin/damascus/default.nix b/hosts/darwin/damascus/default.nix index 79df862..c3c049b 100644 --- a/hosts/darwin/damascus/default.nix +++ b/hosts/darwin/damascus/default.nix @@ -2,8 +2,7 @@ hm = { firefox-dev = { bookmarksToolbar = "never"; - # lol, there has to be an easier way - extraExtensions = with config.home-manager.users.${config.user.name}.nur.repos.rycee.firefox-addons; [ + extraExtensions = with pkgs.nur.repos.rycee.firefox-addons; [ facebook-container multi-account-containers news-feed-eradicator diff --git a/modules/home-manager/catppuccin/default.nix b/modules/home-manager/catppuccin/default.nix index 83df051..5baf26d 100644 --- a/modules/home-manager/catppuccin/default.nix +++ b/modules/home-manager/catppuccin/default.nix @@ -1,11 +1,10 @@ { config, pkgs, ... }: { - catppuccin.flavor = "mocha"; + catppuccin = { + flavor = "mocha"; - # todo, probably should be where we enable these - programs = { - bat.catppuccin.enable = true; - fzf.catppuccin.enable = true; - # k9s.catppuccin.enable = true; - kitty.catppuccin.enable = true; + bat.enable = true; + fzf.enable = true; + # k9s.enable = true; # TODO + kitty.enable = true; }; } diff --git a/modules/home-manager/firefox/default.nix b/modules/home-manager/firefox/default.nix index 5f6b158..287712c 100644 --- a/modules/home-manager/firefox/default.nix +++ b/modules/home-manager/firefox/default.nix @@ -76,7 +76,7 @@ in profiles.default = { isDefault = true; - extensions = with config.nur.repos.rycee.firefox-addons; [ + extensions = with pkgs.nur.repos.rycee.firefox-addons; [ bitwarden privacy-badger refined-github