From 55c6e872249080dfa173f4d9267734591dd8e870 Mon Sep 17 00:00:00 2001 From: Kate Date: Mon, 17 Feb 2025 12:18:06 +0100 Subject: [PATCH] komashi: updates, flake updates --- flake.lock | 64 ++++++++++++++++----------------- flake.nix | 2 -- nixos/configs/syncthing.nix | 1 + nixos/dotfiles/hm.nix | 3 ++ nixos/hosts/komashi/default.nix | 2 +- nixos/packages/default.pkgs.nix | 2 -- 6 files changed, 37 insertions(+), 37 deletions(-) diff --git a/flake.lock b/flake.lock index 42e0581..eef104d 100644 --- a/flake.lock +++ b/flake.lock @@ -163,11 +163,11 @@ ] }, "locked": { - "lastModified": 1739302241, - "narHash": "sha256-NXQXFU6HOschZ+8ZKrNOlwlHelez8vPl+dCiUaJ82/U=", + "lastModified": 1739548217, + "narHash": "sha256-rlv64erpr36xdmMDPgf9rhRXBYZ0BZb5nrw2ZPSk1sQ=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "a6746213b138fe7add88b19bafacd446de574ca7", + "rev": "678b22642abde2ee77ae2218ab41d802f010e5b0", "type": "github" }, "original": { @@ -483,11 +483,11 @@ ] }, "locked": { - "lastModified": 1739314552, - "narHash": "sha256-ggVf2BclyIW3jexc/uvgsgJH4e2cuG6Nyg54NeXgbFI=", + "lastModified": 1739724290, + "narHash": "sha256-dvByZPuVmBgOBLq8GohBy9hEd0/JXj5goXK2OY1Pvgk=", "owner": "nix-community", "repo": "home-manager", - "rev": "83bd3a26ac0526ae04fa74df46738bb44b89dcdd", + "rev": "ec130e700959ee10b63eedbc87758d20264a9588", "type": "github" }, "original": { @@ -527,11 +527,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1739192059, - "narHash": "sha256-r40TUIL6zij0kWBpqKyI7O2brT3Myaa3aAGamkZEvfc=", + "lastModified": 1739715375, + "narHash": "sha256-JoEraLxp/7wlR95rV0ze59578K36DiguwfFO//BUjf4=", "ref": "refs/heads/main", - "rev": "3bca42eb0049772d9079f29f25186575f8e5a4ae", - "revCount": 17406, + "rev": "e12deec9fb99383392ba3dbb936d2dc77ae50d03", + "revCount": 17415, "type": "git", "url": "https://git@git.lix.systems/lix-project/lix" }, @@ -570,11 +570,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1739339370, - "narHash": "sha256-kvuVhsaVa8j0P9Genf96CLX2cNjForojX5aB1BN+Bwk=", + "lastModified": 1739627445, + "narHash": "sha256-fl1kOwskXXa5dJsRcly9e+UaOTdjdvy8Jqg9WhKe0Nw=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "498e8bbc149b38fd14d4ff7fbf31c49fdaa23282", + "rev": "b4f7ae09bc209e76944fed4648191dac8381ca76", "type": "github" }, "original": { @@ -603,11 +603,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1739336386, - "narHash": "sha256-H9E3lfJibzWwqV9C1pI81uhav1RLWRA8JbH3ADv3X/4=", + "lastModified": 1739625307, + "narHash": "sha256-BVTlrmelSAq+rlxwlRvsyZxHrmcviRu3aHJYG37Yq8c=", "owner": "YaLTeR", "repo": "niri", - "rev": "7e552333a993e83a2dba52392109617e486f5f60", + "rev": "f01c840ebe71f152906dbc6212f077fc72626f89", "type": "github" }, "original": { @@ -852,11 +852,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1739206421, - "narHash": "sha256-PwQASeL2cGVmrtQYlrBur0U20Xy07uSWVnFup2PHnDs=", + "lastModified": 1739484910, + "narHash": "sha256-wjWLzdM7PIq4ZAe7k3vyjtgVJn6b0UeodtRFlM/6W5U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "44534bc021b85c8d78e465021e21f33b856e2540", + "rev": "0b73e36b1962620a8ac551a37229dd8662dac5c8", "type": "github" }, "original": { @@ -915,11 +915,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1739214665, - "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", + "lastModified": 1739446958, + "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", + "rev": "2ff53fe64443980e139eaa286017f53f88336dd0", "type": "github" }, "original": { @@ -931,11 +931,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1739214665, - "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", + "lastModified": 1739446958, + "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", + "rev": "2ff53fe64443980e139eaa286017f53f88336dd0", "type": "github" }, "original": { @@ -962,10 +962,10 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1738142207, - "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=", - "path": "/nix/store/pgg4vm83q0kr4hxzcwhdgdiv2yfnh3dw-source", - "rev": "9d3ae807ebd2981d593cddd0080856873139aa40", + "lastModified": 1739214665, + "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", + "path": "/nix/store/zbvf6xwri9kvf42xl3vai3mx8jry6ax8-source", + "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", "type": "path" }, "original": { @@ -1144,11 +1144,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1739309576, - "narHash": "sha256-IMK19j1b2VH44lUad2/3BSski9T4ecrCHFlkjKWQV2o=", + "lastModified": 1739375014, + "narHash": "sha256-0fNbvZ1Dod4rDIfwGnC7CzJ3wRFSF1v5AvNCmNkVgXo=", "owner": "danth", "repo": "stylix", - "rev": "d8289c3f0e5995863921ea207392c122f5d59f6d", + "rev": "e86de61bb8f5f2b6459d0be3e3291ad16db4b777", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ed6ebcf..3a24bcb 100644 --- a/flake.nix +++ b/flake.nix @@ -145,8 +145,6 @@ ./nixos/configs/mount-rsync-kate.nix ./nixos/configs/mount-fastmail-tmllc.nix - ./nixos/services/taskwarrior.nix - ./nixos/overlays/fixup-canon.nix # diff --git a/nixos/configs/syncthing.nix b/nixos/configs/syncthing.nix index f7e25a4..7c66dd4 100644 --- a/nixos/configs/syncthing.nix +++ b/nixos/configs/syncthing.nix @@ -11,6 +11,7 @@ let "aigis" = { id = "VKRQ6Q4-CCLJR2I-ECOWXRE-TANA2QZ-BJIAPCN-FFVJSB4-GYJNS4R-Z3LLHQ5"; }; "hinata" = { id = "2SFRG2A-AZ3XPMN-H3RK2Z6-UXPBPIN-DJN7AMN-JBOY23D-EZGFYNR-HRBI2AY"; }; "miko" = { id = "BTJ3C7W-DBPNTTV-NBKNLNM-SYSGFRZ-VG7ODVU-66RQTO7-XXHYXEY-HX323A6"; }; + "komashi" = { id = "ND72W65-APMFRHT-LS5UFJV-C4WMOEF-CYCZA25-BQOOD5H-645AT6X-YQTMOAV"; }; }; in { diff --git a/nixos/dotfiles/hm.nix b/nixos/dotfiles/hm.nix index 73e57ef..e1b8620 100644 --- a/nixos/dotfiles/hm.nix +++ b/nixos/dotfiles/hm.nix @@ -6,6 +6,9 @@ # Tie our configruation to the version it was written for. home.stateVersion = "24.05"; + # Disable Home Manager's various asseritons, as many of them break things. T_T + assertions = lib.mkForce []; + # # "Raw file" dotfiles. # These aren't generated by Nix, specifically so we can use them on Windows as well. diff --git a/nixos/hosts/komashi/default.nix b/nixos/hosts/komashi/default.nix index d383a9e..b3027e7 100644 --- a/nixos/hosts/komashi/default.nix +++ b/nixos/hosts/komashi/default.nix @@ -111,7 +111,7 @@ }; # Override stylix font sizes. - stylix.fonts.sizes.desktop = lib.mkForce 24; + stylix.fonts.sizes.desktop = lib.mkForce 16; # # Hardware config. diff --git a/nixos/packages/default.pkgs.nix b/nixos/packages/default.pkgs.nix index e1aa7ad..06ffebf 100644 --- a/nixos/packages/default.pkgs.nix +++ b/nixos/packages/default.pkgs.nix @@ -32,8 +32,6 @@ with pkgs; khal vit tasksh - taskwarrior-tui - taskwarrior3 taskjuggler deprekages.hrvst-cli