diff options
| author | Franck Cuny <fcuny@roblox.com> | 2024-05-02 09:47:53 -0700 |
|---|---|---|
| committer | Franck Cuny <fcuny@roblox.com> | 2024-05-02 09:47:53 -0700 |
| commit | 80877ab429df0c84231c0df4131045b1f69bfa25 (patch) | |
| tree | 14d96c537d03420b12293f66868454e449bb2509 | |
| parent | i dont know (diff) | |
| download | world-80877ab429df0c84231c0df4131045b1f69bfa25.tar.gz | |
drop zsh
| -rw-r--r-- | nix/hosts/mba/default.nix | 3 | ||||
| -rw-r--r-- | nix/hosts/work/default.nix | 3 | ||||
| -rw-r--r-- | nix/profiles/home-manager/dev.nix | 4 | ||||
| -rw-r--r-- | nix/profiles/home-manager/personal.nix | 1 | ||||
| -rw-r--r-- | nix/profiles/home-manager/shell.nix | 3 | ||||
| -rw-r--r-- | nix/profiles/home-manager/work.nix | 1 |
6 files changed, 5 insertions, 10 deletions
diff --git a/nix/hosts/mba/default.nix b/nix/hosts/mba/default.nix index a9779f8..f8a9771 100644 --- a/nix/hosts/mba/default.nix +++ b/nix/hosts/mba/default.nix @@ -2,10 +2,9 @@ { services.nix-daemon.enable = true; - programs.zsh.enable = true; programs.fish.enable = true; - environment.shells = [ pkgs.fish pkgs.zsh ]; + environment.shells = [ pkgs.fish ]; users.users.fcuny.home = "/Users/fcuny"; users.users.fcuny.shell = pkgs.fish; diff --git a/nix/hosts/work/default.nix b/nix/hosts/work/default.nix index 895d9af..55fae25 100644 --- a/nix/hosts/work/default.nix +++ b/nix/hosts/work/default.nix @@ -2,10 +2,9 @@ { services.nix-daemon.enable = true; - programs.zsh.enable = true; programs.fish.enable = true; - environment.shells = [ pkgs.fish pkgs.zsh ]; + environment.shells = [ pkgs.fish ]; users.users.fcuny.home = "/Users/fcuny"; users.users.fcuny.shell = pkgs.fish; diff --git a/nix/profiles/home-manager/dev.nix b/nix/profiles/home-manager/dev.nix index 49fe83a..740e5c6 100644 --- a/nix/profiles/home-manager/dev.nix +++ b/nix/profiles/home-manager/dev.nix @@ -61,10 +61,6 @@ in config.home.sessionVariables.GOBIN ]; - programs.zsh.shellAliases = { - kc = "kubectl"; - }; - home.sessionVariables = with config.xdg; { IPYTHONDIR = "${cacheHome}/ipython"; PIP_LOG = "${cacheHome}/pip/pip.log"; diff --git a/nix/profiles/home-manager/personal.nix b/nix/profiles/home-manager/personal.nix index 68bcc8f..e535bb4 100644 --- a/nix/profiles/home-manager/personal.nix +++ b/nix/profiles/home-manager/personal.nix @@ -9,7 +9,6 @@ ./git.nix ./shell.nix ./ssh.nix - ./zsh.nix ]; programs.git = { diff --git a/nix/profiles/home-manager/shell.nix b/nix/profiles/home-manager/shell.nix index dfa7f7a..1166bac 100644 --- a/nix/profiles/home-manager/shell.nix +++ b/nix/profiles/home-manager/shell.nix @@ -53,6 +53,8 @@ LESSCHARSET = "utf-8"; PAGER = "less"; ASPELL_CONF = "conf ${config.xdg.configHome}/aspell/config;"; + # for some reason, if I don't set this, zsh is picked up and mess up stuff. + SHELL = "${pkgs.fish}/bin/fish"; }; programs.alacritty = { @@ -85,6 +87,7 @@ baseIndex = 1; shortcut = "z"; clock24 = true; + shell = "${pkgs.fish}/bin/fish"; historyLimit = 50000; # Bigger buffer extraConfig = '' setw -g mouse on diff --git a/nix/profiles/home-manager/work.nix b/nix/profiles/home-manager/work.nix index 56b4bb3..bf32407 100644 --- a/nix/profiles/home-manager/work.nix +++ b/nix/profiles/home-manager/work.nix @@ -9,7 +9,6 @@ ./git.nix ./shell.nix ./ssh.nix - ./zsh.nix ]; home.packages = with pkgs; [ |