From 7353f2ff23aa3c40c6e1251bb38bad6eb24db89b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Tue, 1 Apr 2025 20:04:26 +0200 Subject: [PATCH 1/3] fix(jpassmenu): PASSWORD_STORE_DIR not set Because of the switch to `fish`, the hm session vars are no longer sourced. --- modules/hm/default.nix | 1 + modules/nixos/default.nix | 6 +----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/modules/hm/default.nix b/modules/hm/default.nix index 3f31f26..98de725 100644 --- a/modules/hm/default.nix +++ b/modules/hm/default.nix @@ -59,6 +59,7 @@ in icons = "auto"; }; # Shell + bash.enable = true; # ensure HM variables are passed to `bash` too (otherwise `jpassmenu` doesn't work) fish = { enable = true; preferAbbrs = true; # when defining an alias, prefer instead to define an abbreviation diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index d6eeff7..875044b 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -38,11 +38,7 @@ in # Launch fish if shell is interactive (from https://wiki.nixos.org/wiki/Fish) bash.interactiveShellInit = # bash '' - if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]] - then - shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION="" - exec ${pkgs.fish}/bin/fish $LOGIN_OPTION - fi + if [[ "$(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm)" != "fish" && -z "$BASH_EXECUTION_STRING" ]]; then shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""; exec ${pkgs.fish}/bin/fish "$LOGIN_OPTION"; fi ''; # Default shell fish.enable = true; From 93eaa6d9f66d20df9f7293be4129dd28fd637f2b Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 1 Apr 2025 22:00:09 +0200 Subject: [PATCH 2/3] fix(deps): update rust crate env_logger to v0.11.8 | datasource | package | from | to | | ---------- | ---------- | ------ | ------ | | crate | env_logger | 0.11.7 | 0.11.8 | --- scripts/jpassmenu/Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/jpassmenu/Cargo.lock b/scripts/jpassmenu/Cargo.lock index cfd1d1d..bfefd24 100644 --- a/scripts/jpassmenu/Cargo.lock +++ b/scripts/jpassmenu/Cargo.lock @@ -217,9 +217,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.7" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3716d7a920fb4fac5d84e9d4bce8ceb321e9414b4409da61b07b75c1e3d0697" +checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f" dependencies = [ "anstream", "anstyle", From 4c90de34e9ca520560bd50f095c2d37200f6ecaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Sun, 16 Mar 2025 22:25:58 +0100 Subject: [PATCH 3/3] wip: niri take 2 Take two, since one wasn't enough. --- flake-modules/nixos-modules.nix | 1 + flake.lock | 62 +++++++++++++++++++++++++++++++++ flake.nix | 11 ++++++ 3 files changed, 74 insertions(+) diff --git a/flake-modules/nixos-modules.nix b/flake-modules/nixos-modules.nix index ef8355e..44ec630 100644 --- a/flake-modules/nixos-modules.nix +++ b/flake-modules/nixos-modules.nix @@ -9,6 +9,7 @@ let nixosModule = { imports = [ + inputs.niri.nixosModules.niri inputs.stylix.nixosModules.stylix inputs.home-manager.nixosModules.home-manager ../modules/nixos diff --git a/flake.lock b/flake.lock index 4c24de6..a494396 100644 --- a/flake.lock +++ b/flake.lock @@ -301,6 +301,50 @@ "url": "https://git.lix.systems/lix-project/nixos-module/archive/release-2.92.tar.gz" } }, + "niri": { + "inputs": { + "niri-stable": "niri-stable", + "niri-unstable": [], + "nixpkgs": [ + "unstable" + ], + "nixpkgs-stable": [ + "nixpkgs" + ], + "xwayland-satellite-stable": "xwayland-satellite-stable", + "xwayland-satellite-unstable": [] + }, + "locked": { + "lastModified": 1742108116, + "narHash": "sha256-NrV9ysEfSbeRUPo0jdCBeesuNLTVrpHGXg40snH1YGE=", + "owner": "sodiboo", + "repo": "niri-flake", + "rev": "824f10012de455a1d0ef795a605f28948ee10467", + "type": "github" + }, + "original": { + "owner": "sodiboo", + "repo": "niri-flake", + "type": "github" + } + }, + "niri-stable": { + "flake": false, + "locked": { + "lastModified": 1740117926, + "narHash": "sha256-mTTHA0RAaQcdYe+9A3Jx77cmmyLFHmRoZdd8RpWa+m8=", + "owner": "YaLTeR", + "repo": "niri", + "rev": "b94a5db8790339cf9134873d8b490be69e02ac71", + "type": "github" + }, + "original": { + "owner": "YaLTeR", + "ref": "v25.02", + "repo": "niri", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1743367904, @@ -385,6 +429,7 @@ "flake-parts": "flake-parts", "home-manager": "home-manager", "lix-module": "lix-module", + "niri": "niri", "nixpkgs": "nixpkgs", "nixvim": "nixvim", "nuschtosSearch": "nuschtosSearch", @@ -523,6 +568,23 @@ "repo": "treefmt-nix", "type": "github" } + }, + "xwayland-satellite-stable": { + "flake": false, + "locked": { + "lastModified": 1739246919, + "narHash": "sha256-/hBM43/Gd0/tW+egrhlWgOIISeJxEs2uAOIYVpfDKeU=", + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "rev": "44590a416d4a3e8220e19e29e0b6efe64a80315d", + "type": "github" + }, + "original": { + "owner": "Supreeeme", + "ref": "v0.5.1", + "repo": "xwayland-satellite", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 04aaea2..5f68856 100644 --- a/flake.nix +++ b/flake.nix @@ -43,6 +43,17 @@ nuschtosSearch.follows = ""; }; }; + niri = { + url = "github:sodiboo/niri-flake"; + inputs = { + # Deduplicate + nixpkgs.follows = "unstable"; + nixpkgs-stable.follows = "nixpkgs"; + # Unused + niri-unstable.follows = ""; + xwayland-satellite-unstable.follows = ""; + }; + }; flake-parts = { url = "github:hercules-ci/flake-parts"; inputs.nixpkgs-lib.follows = "nixpkgs";