From f806db9a114ce37b23e6ab3cf3cddbedfbe9ae73 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Thu, 28 Nov 2024 10:53:57 +0100 Subject: [PATCH] Remove unused configuration and commented code Eliminated obsolete systemPath entry from Darwin services default configuration. Removed unused foreign-env plugin and commented code related to shell initialization in Fish configuration. Additionally, commented out unnecessary SSH configuration options in user-specific settings. --- homes/aarch64-darwin/harald@m4/default.nix | 4 ++-- modules/darwin/services/base/default.nix | 2 -- modules/home/cli-apps/fish/default.nix | 25 ---------------------- 3 files changed, 2 insertions(+), 29 deletions(-) diff --git a/homes/aarch64-darwin/harald@m4/default.nix b/homes/aarch64-darwin/harald@m4/default.nix index 3f55c74..511fb47 100644 --- a/homes/aarch64-darwin/harald@m4/default.nix +++ b/homes/aarch64-darwin/harald@m4/default.nix @@ -12,8 +12,8 @@ }; programs.ssh.extraConfig = '' - UseKeychain yes - AddKeysToAgent yes + #UseKeychain yes + #AddKeysToAgent yes IdentityFile ~/.ssh/id_ed25519 ''; diff --git a/modules/darwin/services/base/default.nix b/modules/darwin/services/base/default.nix index 60aa399..eb11f90 100644 --- a/modules/darwin/services/base/default.nix +++ b/modules/darwin/services/base/default.nix @@ -49,8 +49,6 @@ in fish.enable = true; }; - environment.systemPath = [ /run/current-system/sw/bin ]; - programs = { bash = { ## shellInit = '' diff --git a/modules/home/cli-apps/fish/default.nix b/modules/home/cli-apps/fish/default.nix index e1247fd..6581ef7 100644 --- a/modules/home/cli-apps/fish/default.nix +++ b/modules/home/cli-apps/fish/default.nix @@ -33,31 +33,6 @@ in end end ''; - - plugins = [ - { - name = "foreign-env"; - src = pkgs.fetchFromGitHub { - owner = "oh-my-fish"; - repo = "plugin-foreign-env"; - rev = "dddd9213272a0ab848d474d0cbde12ad034e65bc"; - sha256 = "00xqlyl3lffc5l0viin1nyp819wf81fncqyz87jx8ljjdhilmgbs"; - }; - } - ]; - - # shellInit = - # '' - # # nix - # if test -e /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh - # fenv source /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh - # end - # - # # home-manager - # if test -e $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh - # fenv source $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh - # end - # ''; }; }; }