jalil/configuration.nix
1
1
Fork 0
Code Issues 2 Pull requests 3 Projects Activity Actions

Compare commits

base: jalil:dbea825ed3915615be518668dc305e9f54ea6070
Branches Tags
jalil:main
jalil:push-unxtqqrkkxzr
jalil:push-xstqnkxmwxvm
jalil:push-zwplyztqqsnl
...
compare: jalil:4c90de34e9ca520560bd50f095c2d37200f6ecaa
Branches Tags
jalil:main
jalil:push-unxtqqrkkxzr
jalil:push-xstqnkxmwxvm
jalil:push-zwplyztqqsnl

3 commits
dbea825ed3 ... 4c90de34e9

Author SHA1 Message Date
Jalil David Salamé Messina
4c90de34e9
wip: niri take 2
All checks were successful
/ check (push) Successful in 9s
Details
/ check-renovaterc (push) Successful in 3s
Details
/ build-packages (push) Successful in 15s
Details
/ build-vm (push) Successful in 22s
Details
/ report-size (push) Successful in 1m8s
Details 
Take two, since one wasn't enough.
 2025-04-01 22:55:56 +02:00
Renovate Bot
93eaa6d9f6
fix(deps): update rust crate env_logger to v0.11.8
All checks were successful
/ check (push) Successful in 9s
Details
/ check-renovaterc (push) Successful in 3s
Details
/ build-packages (push) Successful in 14s
Details
/ build-vm (push) Successful in 2s
Details
/ report-size (push) Successful in 4s
Details 
| datasource | package    | from   | to     |
| ---------- | ---------- | ------ | ------ |
| crate      | env_logger | 0.11.7 | 0.11.8 |
 2025-04-01 22:00:09 +02:00
Jalil David Salamé Messina
7353f2ff23
fix(jpassmenu): PASSWORD_STORE_DIR not set
All checks were successful
/ check (push) Successful in 9s
Details
/ check-renovaterc (push) Successful in 2s
Details
/ build-packages (push) Successful in 14s
Details
/ build-vm (push) Successful in 2s
Details
/ report-size (push) Successful in 4s
Details 
Because of the switch to `fish`, the hm session vars are no longer
sourced.
 2025-04-01 20:05:08 +02:00
6 changed files with 78 additions and 7 deletions
Show stats Expand all files Collapse all files

1
flake-modules/nixos-modules.nix
View file

@ -9,6 +9,7 @@
let
nixosModule = {
imports = [
inputs.niri.nixosModules.niri
inputs.stylix.nixosModules.stylix
inputs.home-manager.nixosModules.home-manager
../modules/nixos

62
flake.lock generated
View file

@ -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",

11
flake.nix
View file

@ -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";

1
modules/hm/default.nix
View file

@ -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

6
modules/nixos/default.nix
View file

@ -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;

4
scripts/jpassmenu/Cargo.lock generated
View file

@ -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",