summaryrefslogtreecommitdiff
path: root/users/seth
diff options
context:
space:
mode:
authorseth <[email protected]>2023-02-20 15:06:56 -0500
committerseth <[email protected]>2023-02-20 15:09:41 -0500
commitc29ebfedcad3ef36557608926aeea68d3106157c (patch)
tree74dd0e357ccf1f87f0725a8ad7f3842f2b13c7fb /users/seth
parent62489eb982d1343a104782337a33305368afacc7 (diff)
switch back to fish
i don't know why i have to do this but it works so :shurg:
Diffstat (limited to 'users/seth')
-rw-r--r--users/seth/default.nix4
-rw-r--r--users/seth/shell/bash.nix8
-rw-r--r--users/seth/shell/fish.nix2
-rw-r--r--users/seth/shell/zsh.nix (renamed from users/seth/shell/zsh/default.nix)14
4 files changed, 5 insertions, 23 deletions
diff --git a/users/seth/default.nix b/users/seth/default.nix
index 909fb84..0675eb4 100644
--- a/users/seth/default.nix
+++ b/users/seth/default.nix
@@ -8,9 +8,11 @@
extraGroups = [ "wheel" ];
isNormalUser = true;
hashedPassword = "***REMOVED***";
- shell = pkgs.zsh;
+ shell = pkgs.fish;
};
+ programs.fish.enable = true;
+
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
diff --git a/users/seth/shell/bash.nix b/users/seth/shell/bash.nix
index a80f409..03f4985 100644
--- a/users/seth/shell/bash.nix
+++ b/users/seth/shell/bash.nix
@@ -4,14 +4,6 @@
historyFile = "${config.xdg.stateHome}/bash/history";
historyFileSize = 1000;
historySize = 100;
- sessionVariables = {
- EDITOR = "nvim";
- VISUAL = "nvim";
- CARGO_HOME = "${config.xdg.dataHome}/cargo";
- RUSTUP_HOME = "${config.xdg.dataHome}/rustup";
- LESSHISTFILE = "${config.xdg.stateHome}/less/history";
- NPM_CONFIG_USERCONFIG = "${config.xdg.configHome}/npm/npmrc";
- };
shellOptions = [
"cdspell"
"checkjobs"
diff --git a/users/seth/shell/fish.nix b/users/seth/shell/fish.nix
index 1cfcac1..f00174f 100644
--- a/users/seth/shell/fish.nix
+++ b/users/seth/shell/fish.nix
@@ -1,6 +1,6 @@
{ pkgs, ... }: {
programs.fish = {
- enable = false;
+ enable = true;
plugins = [
{
name = "autopair-fish";
diff --git a/users/seth/shell/zsh/default.nix b/users/seth/shell/zsh.nix
index 0b5a5dd..dd2b58c 100644
--- a/users/seth/shell/zsh/default.nix
+++ b/users/seth/shell/zsh.nix
@@ -3,7 +3,7 @@
, ...
}: {
programs.zsh = {
- enable = true;
+ enable = false;
enableAutosuggestions = true;
enableVteIntegration = true;
completionInit = ''
@@ -59,12 +59,6 @@
size = 100;
};
plugins = [
- # {
- # name = "powerlevel10k";
- # src = pkgs.zsh-powerlevel10k;
- # file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme";
- # }
-
{
name = "zsh-completions";
src = pkgs.zsh-completions;
@@ -82,12 +76,6 @@
file = "themes/catppuccin_mocha-zsh-syntax-highlighting.zsh";
}
-
- # {
- # name = "powerlevel10k-config";
- # src = ./files;
- # file = ".p10k.zsh";
- # }
];
enableSyntaxHighlighting = true;
};