From e0b8e2dfff934bee0edc93342402fe363dfd4e19 Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Thu, 6 Mar 2025 09:39:53 +0100 Subject: [PATCH 1/4] flake: bump inputs flake: bump inputs --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index dd6178e..bff6ae8 100644 --- a/flake.lock +++ b/flake.lock @@ -17,11 +17,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739866667, - "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=", + "lastModified": 1741246872, + "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680", + "rev": "10069ef4cf863633f57238f179a0297de84bd8d3", "type": "github" }, "original": { From 841c7192ec91d1eef6742fa1b861270f1b0d1913 Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Thu, 6 Mar 2025 09:41:07 +0100 Subject: [PATCH 2/4] nix/module.nix: remove helix cache --- modules/system/nix/module.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/system/nix/module.nix b/modules/system/nix/module.nix index d57d631..696f22c 100644 --- a/modules/system/nix/module.nix +++ b/modules/system/nix/module.nix @@ -138,12 +138,10 @@ in { # Substituters to pull from. substituters = [ "https://cache.nixos.org" # funny binary cache - "https://helix.cachix.org" # a chache for helix ]; trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" - "helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs=" ]; }; }; From b624ea249d08f392677abc30249d09f205affe9d Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Fri, 7 Mar 2025 09:52:19 +0100 Subject: [PATCH 3/4] hermit/programs.nix: update programs --- hosts/hermit/programs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/hermit/programs.nix b/hosts/hermit/programs.nix index dba8834..e20b0d4 100644 --- a/hosts/hermit/programs.nix +++ b/hosts/hermit/programs.nix @@ -13,12 +13,13 @@ calc # calibre cbonsai + cinny-desktop cmus difftastic element element-desktop emacs30-pgtk - # evince + evince eza firefox fftw @@ -68,7 +69,6 @@ ripgrep rmpc signal-desktop - sioyek smartmontools taskwarrior3 taskwarrior-tui From b59c352f7394c582a1c9f484c3e96377d8729b85 Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Fri, 7 Mar 2025 09:53:41 +0100 Subject: [PATCH 4/4] shell: update fish-on-tmpfs.patch Fish switched to rust on 4.0, so this patch needed to be updated to match that. --- packages/shell/fish-on-tmpfs.patch | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/shell/fish-on-tmpfs.patch b/packages/shell/fish-on-tmpfs.patch index d477186..1ff7c1b 100644 --- a/packages/shell/fish-on-tmpfs.patch +++ b/packages/shell/fish-on-tmpfs.patch @@ -1,10 +1,10 @@ ---- a/src/path.cpp -+++ b/src/path.cpp -@@ -384,7 +384,7 @@ static const base_directory_t &get_data_directory() { - } - - static const base_directory_t &get_config_directory() { -- static base_directory_t s_dir = make_base_directory(L"XDG_CONFIG_HOME", L"/.config/fish"); -+ static base_directory_t s_dir = make_base_directory(L"XDG_RUNTIME_DIR", L"/.config/fish"); - return s_dir; +--- a/src/path.rs ++++ b/src/path.rs +@@ -781,7 +781,7 @@ fn get_cache_directory() -> &'static BaseDirectory { + + fn get_config_directory() -> &'static BaseDirectory { + static DIR: Lazy = +- Lazy::new(|| make_base_directory(L!("XDG_CONFIG_HOME"), L!("/.config/fish"))); ++ Lazy::new(|| make_base_directory(L!("XDG_RUNTIME_DIR"), L!("/.config/fish"))); + &DIR }