diff --git a/flake.nix b/flake.nix index 04d44094..3adbbe53 100644 --- a/flake.nix +++ b/flake.nix @@ -121,20 +121,16 @@ home-config ./hosts/Ronin ./desktop/bspwm.nix - ./desktop/awesome.nix - ./desktop/qtile.nix ./services/syncthing/Ronin.nix ({pkgs, ...}: { services.xserver.displayManager = { autoLogin.user = "elitherl"; defaultSession = "xfce+bspwm"; - # defaultSession = "xfce+awesome"; }; home-manager.users.elitherl = { imports = [ ./home/work.nix ./home/desktop/bspwm.nix - ./home/desktop/awesome ./home/gui ]; home = { diff --git a/home/env/zsh.nix b/home/env/zsh.nix index 71a48820..83887ce5 100644 --- a/home/env/zsh.nix +++ b/home/env/zsh.nix @@ -1,16 +1,19 @@ {config, ...}: { - programs.zsh = { - enable = true; - enableAutosuggestions = true; - enableCompletion = true; - syntaxHighlighting.enable = true; - enableVteIntegration = true; - autocd = true; - dotDir = ".config/zsh"; - historySubstringSearch.enable = true; - history.path = "${config.xdg.dataHome}/zsh/history"; + programs = { + zsh = { + enable = true; + enableAutosuggestions = true; + enableCompletion = true; + syntaxHighlighting.enable = true; + enableVteIntegration = true; + autocd = true; + dotDir = ".config/zsh"; + historySubstringSearch.enable = true; + history.path = "${config.xdg.dataHome}/zsh/history"; + }; + keychain.enableZshIntegration = true; + starship.enableZshIntegration = true; + direnv.enableZshIntegration = true; + nix-index.enableZshIntegration = true; }; - programs.keychain.enableZshIntegration = true; - programs.starship.enableZshIntegration = true; - programs.nix-index.enableZshIntegration = true; } diff --git a/hosts/Ronin/configuration.nix b/hosts/Ronin/configuration.nix index abf139b5..efa8c9f3 100644 --- a/hosts/Ronin/configuration.nix +++ b/hosts/Ronin/configuration.nix @@ -31,7 +31,7 @@ isNormalUser = true; description = "Evie Litherland-Smith"; extraGroups = ["networkmanager" "wheel"]; - shell = pkgs.fish; + shell = pkgs.zsh; }; services.greetd.settings.initial_session.user = "elitherl";