diff --git a/flake.lock b/flake.lock index dac9d31..e48ec70 100644 --- a/flake.lock +++ b/flake.lock @@ -137,11 +137,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1751473619, - "narHash": "sha256-FZpbizfR/KgS7XQWMZV8txEPWkhjBatSNnnwjD1XTKs=", + "lastModified": 1751508915, + "narHash": "sha256-mVnjzM1VGLNrIEC8ghaQVoat68kXh4/AzBE4QPi29QI=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "1de278e46115d49a11ee9b01bfca5b74432e6074", + "rev": "c8c7ef94b6600add651b3d3aea1db5665b1b92eb", "type": "github" }, "original": { @@ -541,11 +541,11 @@ ] }, "locked": { - "lastModified": 1751474656, - "narHash": "sha256-1+wwOHCAj426dUoRmByXT8y8dRVw4VdL1zJDjRd8ICE=", + "lastModified": 1751500614, + "narHash": "sha256-mYiYNsTJkbQouC5YHOTgqVpjpELoNf9f4z5ZeY4NfPg=", "owner": "nix-community", "repo": "home-manager", - "rev": "a7820832c68180b612587a23f46f1b94a28b3407", + "rev": "a5b56720841121d2189c011e445c4be4c943bab5", "type": "github" }, "original": { diff --git a/hosts/eddie/configuration.nix b/hosts/eddie/configuration.nix index 5bd099f..b2090ae 100644 --- a/hosts/eddie/configuration.nix +++ b/hosts/eddie/configuration.nix @@ -352,11 +352,11 @@ # enable alternate shells and launch it from bash for interactive shells programs.fish.enable = true; - # environment.pathsToLink = [ "/share/fish" ]; + environment.pathsToLink = [ "/share/fish" ]; environment.shells = [ pkgs.nushell ]; programs.bash = { interactiveShellInit = '' - if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]] + if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "nu" && -z ''${BASH_EXECUTION_STRING} ]] then shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION="" exec ${pkgs.nushell}/bin/nu $LOGIN_OPTION diff --git a/hosts/media-server/configuration.nix b/hosts/media-server/configuration.nix index 21c632a..ba58ac5 100644 --- a/hosts/media-server/configuration.nix +++ b/hosts/media-server/configuration.nix @@ -145,15 +145,16 @@ package = pkgs.nh; }; - # enable fish and launch it from bash for interactive shells + # enable alternate shells and launch it from bash for interactive shells programs.fish.enable = true; environment.pathsToLink = [ "/share/fish" ]; + environment.shells = [ pkgs.nushell ]; programs.bash = { interactiveShellInit = '' - if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]] + if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "nu" && -z ''${BASH_EXECUTION_STRING} ]] then shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION="" - exec ${pkgs.fish}/bin/fish $LOGIN_OPTION + exec ${pkgs.nushell}/bin/nu $LOGIN_OPTION fi ''; }; diff --git a/modules/home/desktop.nix b/modules/home/desktop.nix index a57afdb..ae6ac71 100644 --- a/modules/home/desktop.nix +++ b/modules/home/desktop.nix @@ -71,7 +71,7 @@ smile impression - zoom-us + # zoom-us nyxt obsidian