From d9ec914402cb5f7a2741022e4a16a63251280ed3 Mon Sep 17 00:00:00 2001 From: Daniel Patterson Date: Fri, 10 Oct 2025 01:00:50 +0100 Subject: [PATCH] update --- flake.lock | 87 +++++++++++++++--------------- hosts/common/graphical/default.nix | 4 +- users/configs/desktop/default.nix | 2 +- users/daniel/default.nix | 6 +-- 4 files changed, 50 insertions(+), 49 deletions(-) diff --git a/flake.lock b/flake.lock index 4a187de..6d7d16f 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1760836749, + "lastModified": 1762618334, "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=", "owner": "ryantm", "repo": "agenix", - "rev": "2f0f812f69f3eb4140157fe15e12739adf82e32a", + "rev": "fcdea223397448d35d9b31f798479227e80183f6", "type": "github" }, "original": { @@ -29,7 +29,8 @@ "devenv" ], "flake-compat": [ - "devenv" + "devenv", + "flake-compat" ], "git-hooks": [ "devenv", @@ -41,11 +42,11 @@ ] }, "locked": { - "lastModified": 1752264895, - "narHash": "sha256-1zBPE/PNAkPNUsOWFET4J0cjlvziH8DOekesDmjND+w=", + "lastModified": 1760971495, + "narHash": "sha256-IwnNtbNVrlZIHh7h4Wz6VP0Furxg9Hh0ycighvL5cZc=", "owner": "cachix", "repo": "cachix", - "rev": "47053aef762f452e816e44eb9a23fbc3827b241a", + "rev": "c5bfd933d1033672f51a863c47303fc0e093c2d2", "type": "github" }, "original": { @@ -63,11 +64,11 @@ ] }, "locked": { - "lastModified": 1761420116, - "narHash": "sha256-k8v/AvYeJmiKMjDd4xw6oG8idyXYYxKEsObB+Dkv6N4=", + "lastModified": 1762095388, + "narHash": "sha256-7Q8LtcvKWHbP8znARRTOY2tpU5WoV6FHwp5TZJOI8Us=", "owner": "9001", "repo": "copyparty", - "rev": "4fcd2c41932d731b052bf1be6879b4310f4d3e10", + "rev": "ac085b8149ff50e03d260128596dd130ed1c7cae", "type": "github" }, "original": { @@ -110,11 +111,11 @@ ] }, "locked": { - "lastModified": 1761427990, - "narHash": "sha256-MnrJFwdkwt0FHvRj6vbVfCBWoAPW9O9+HOldMM1yeR8=", + "lastModified": 1762791812, + "narHash": "sha256-O7Ne62r8hKE3FPqUsukMblxyYCFTh2jV5gHgIsI3rnE=", "owner": "cachix", "repo": "devenv", - "rev": "7419c04fc798d5d5918413d4cb6c8629f9d4e8a3", + "rev": "1faab0d28c573f2a8dba2cf457b9d383adba252a", "type": "github" }, "original": { @@ -126,11 +127,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -163,11 +164,11 @@ ] }, "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "lastModified": 1760948891, + "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", + "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", "type": "github" }, "original": { @@ -255,11 +256,11 @@ ] }, "locked": { - "lastModified": 1758108966, - "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=", + "lastModified": 1760663237, + "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b", + "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37", "type": "github" }, "original": { @@ -339,11 +340,11 @@ ] }, "locked": { - "lastModified": 1761468550, - "narHash": "sha256-nY4vyN1QdHhC5Gj3545fI2Y7FSr/gs8ID4gPmF8HPww=", + "lastModified": 1762787259, + "narHash": "sha256-t2U/GLLXHa2+kJkwnFNRVc2fEJ/lUfyZXBE5iKzJdcs=", "owner": "nix-community", "repo": "home-manager", - "rev": "1830716059bfee7cbcfbfcc38d7be98e482a5762", + "rev": "37a3d97f2873e0f68711117c34d04b7c7ead8f4e", "type": "github" }, "original": { @@ -361,11 +362,11 @@ ] }, "locked": { - "lastModified": 1752603129, - "narHash": "sha256-S+wmHhwNQ5Ru689L2Gu8n1OD6s9eU9n9mD827JNR+kw=", + "lastModified": 1762351818, + "narHash": "sha256-0ptUDbYwxv1kk/uzEX4+NJjY2e16MaAhtzAOJ6K0TG0=", "owner": "nix-community", "repo": "home-manager", - "rev": "e8c19a3cec2814c754f031ab3ae7316b64da085b", + "rev": "b959c67241cae17fc9e4ee7eaf13dfa8512477ea", "type": "github" }, "original": { @@ -422,16 +423,16 @@ ] }, "locked": { - "lastModified": 1758763079, - "narHash": "sha256-Bx1A+lShhOWwMuy3uDzZQvYiBKBFcKwy6G6NEohhv6A=", + "lastModified": 1761648602, + "narHash": "sha256-H97KSB/luq/aGobKRuHahOvT1r7C03BgB6D5HBZsbN8=", "owner": "cachix", "repo": "nix", - "rev": "6f0140527c2b0346df4afad7497baa08decb929f", + "rev": "3e5644da6830ef65f0a2f7ec22830c46285bfff6", "type": "github" }, "original": { "owner": "cachix", - "ref": "devenv-2.30.5", + "ref": "devenv-2.30.6", "repo": "nix", "type": "github" } @@ -444,11 +445,11 @@ ] }, "locked": { - "lastModified": 1752054764, - "narHash": "sha256-Ob/HuUhANoDs+nvYqyTKrkcPXf4ZgXoqMTQoCK0RFgQ=", + "lastModified": 1762090880, + "narHash": "sha256-fbRQzIGPkjZa83MowjbD2ALaJf9y6KMDdJBQMKFeY/8=", "owner": "guibou", "repo": "nixGL", - "rev": "a8e1ce7d49a149ed70df676785b07f63288f53c5", + "rev": "b6105297e6f0cd041670c3e8628394d4ee247ed5", "type": "github" }, "original": { @@ -459,11 +460,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1761373498, - "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=", + "lastModified": 1762596750, + "narHash": "sha256-rXXuz51Bq7DHBlfIjN7jO8Bu3du5TV+3DSADBX7/9YQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce", + "rev": "b6a8526db03f735b89dd5ff348f53f752e7ddc8e", "type": "github" }, "original": { @@ -587,11 +588,11 @@ ] }, "locked": { - "lastModified": 1761471016, - "narHash": "sha256-sCiTEdvR5bnsAKmm0BcR6DLN4YKSUa43xLopA0VHYww=", + "lastModified": 1762748864, + "narHash": "sha256-YgQ80R6TW9GxS0Ozaqe9mTVewuOWqwRmMUhRUpKsoCs=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "9876658e1abf52bafa06bec7b0c2ba7e03931b0e", + "rev": "02bb5919dab81a3fea4d8d4663ea67922a463cd3", "type": "github" }, "original": { @@ -607,11 +608,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1760747435, - "narHash": "sha256-wNB/W3x+or4mdNxFPNOH5/WFckNpKgFRZk7OnOsLtm0=", + "lastModified": 1762735003, + "narHash": "sha256-F5mQBMc1fNZnyVzBWTB6RsSglWwpTTBekHxzPeGegD4=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "d0f239b887b1ac736c0f3dde91bf5bf2ecf3a420", + "rev": "b4dc0184e0cff5094d4a746a5cd34ef30f6fdc12", "type": "github" }, "original": { diff --git a/hosts/common/graphical/default.nix b/hosts/common/graphical/default.nix index 97ec0c0..3dfeab2 100644 --- a/hosts/common/graphical/default.nix +++ b/hosts/common/graphical/default.nix @@ -43,11 +43,11 @@ fraunces noto-fonts noto-fonts-cjk-sans - noto-fonts-emoji + noto-fonts-color-emoji nerd-fonts.iosevka monocraft source-code-pro - ubuntu_font_family + ubuntu-classic ]; fontDir.enable = true; diff --git a/users/configs/desktop/default.nix b/users/configs/desktop/default.nix index a182e18..ce7cd91 100644 --- a/users/configs/desktop/default.nix +++ b/users/configs/desktop/default.nix @@ -11,5 +11,5 @@ ./waybar ]; - zen-browser.enable = true; + programs.zen-browser.enable = true; } diff --git a/users/daniel/default.nix b/users/daniel/default.nix index 17abaa7..0def80e 100644 --- a/users/daniel/default.nix +++ b/users/daniel/default.nix @@ -158,9 +158,9 @@ in { git = { enable = true; package = pkgs.gitFull; - userName = "Daniel Patterson"; - userEmail = "me@danielpatterson.dev"; - extraConfig = { + settings = { + user.name = "Daniel Patterson"; + user.email = "me@danielpatterson.dev"; pull.rebase = true; init.defaultBranch = "main"; format.signOff = "yes";