diff --git a/flake.nix b/flake.nix index f09b37f..40957c5 100644 --- a/flake.nix +++ b/flake.nix @@ -123,7 +123,6 @@ nixd ]; shellHook = '' - export PS1=" $PS1" export PATH=$PATH:$(pwd)/bin ''; }; @@ -135,8 +134,7 @@ # None-NIXOS LINUX Setups # ------------- homeConfigurations."${user.name}" = lib.makeHomeManagerUsers { - user = user // { enableDevelopmentKit = true; }; - homeManagerVersion = homeManagerVersion; + inherit user homeManagerVersion; }; # NIXOS LINUX Setups @@ -146,9 +144,7 @@ # ------------- fwbook = lib.makeNixOsModule { system = "x86_64-linux"; - user = user // { - enableDevelopmentKit = true; - }; + user = user; systemStateVersion = "23.11"; hostName = "fwbook"; # localNixCaches = localNixCaches; diff --git a/modules/core/user.nix b/modules/core/user.nix index 31f286a..dd10381 100644 --- a/modules/core/user.nix +++ b/modules/core/user.nix @@ -32,10 +32,6 @@ in }); default = [ ]; }; - enableDevelopmentKit = mkOption { - type = types.bool; - default = false; - }; }; }; diff --git a/modules/home/default.nix b/modules/home/default.nix index c972196..3a69216 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -18,7 +18,7 @@ in jq kubectl kubectx - htop + htop ]; }; programs = (programsModule { @@ -38,8 +38,7 @@ in }; makeCommonUser = - { enableDevelopmentKit ? false - , fullName + { fullName , email , extraGitConfigs ? [ ] , name @@ -60,13 +59,8 @@ in fastfetch kubectl kubectx - ] - ++ (if enableDevelopmentKit then [ - devenv - devbox terraform - ] else - [ ]); + ]; }; programs = (programsModule { inherit pkgs user; diff --git a/modules/home/programs.nix b/modules/home/programs.nix index d1782aa..bcfa1eb 100644 --- a/modules/home/programs.nix +++ b/modules/home/programs.nix @@ -14,23 +14,57 @@ statix ]; }; - direnv.enable = true; + direnv = { + enable = true; + enableNushellIntegration = true; + }; lsd = { enable = true; enableAliases = true; }; + starship = { + enable = true; + enableNushellIntegration = true; + enableBashIntegration = true; + enableZshIntegration = true; + settings = { + kubernetes = { + disabled = false; + }; + nix_shell = { + disabled = false; + }; + localip = { + disabled = false; + ssh_only = false; + }; + hostname = { + disabled = false; + ssh_only = false; + }; + direnv = { + disabled = false; + }; + gcloud = { + disabled = true; + }; + sudo = { + disabled = false; + }; + }; + }; + nushell = { + enable = true; + }; + carapace = { + enable = true; + enableNushellIntegration = true; + enableBashIntegration = true; + enableZshIntegration = true; + }; zsh = { enable = true; autosuggestion.enable = true; - initExtra = '' - export RPS1='$KUBE_PS1_SYMBOL_DEFAULT $(kubectx_prompt_info)/$(kubens -c)' - export PROMPT='%(!.%{%F{yellow}%}.)$USER@%{$fg[white]%}%M %{$fg[cyan]%}%c%{$reset_color%} $(git_prompt_info)' - ''; - oh-my-zsh = { - enable = true; - plugins = [ "git" "sudo" "kubectx" "kube-ps1" ]; - theme = "robbyrussell"; - }; }; zellij = { enable = true; @@ -64,7 +98,7 @@ italic = { family = "Fira Code"; style = "Italic"; }; }; terminal.shell = { - program = "/home/${user.name}/.nix-profile/bin/zsh"; + program = "/home/${user.name}/.nix-profile/bin/nu"; }; }; }; diff --git a/modules/nixos/common/user.nix b/modules/nixos/common/user.nix index 673bec2..9c2d375 100644 --- a/modules/nixos/common/user.nix +++ b/modules/nixos/common/user.nix @@ -1,10 +1,10 @@ { config, pkgs, ... }: { users.users.root = { - shell = pkgs.zsh; + shell = pkgs.nushell; }; users.users.${config.skyg.user.name} = { - shell = pkgs.zsh; + shell = pkgs.nushell; isNormalUser = true; description = config.skyg.user.name; extraGroups = [