diff --git a/flake.nix b/flake.nix index aa260a3..c015bec 100644 --- a/flake.nix +++ b/flake.nix @@ -12,12 +12,12 @@ let stateVersion = "23.11"; in { - # TODO: make a multiarch flake + # TODO: make a multiach flake devShells.x86_64-linux.default = let pkgs = nixpkgs.legacyPackages."x86_64-linux"; in pkgs.mkShell { - name = "nixfiles"; + buildInputs = [ pkgs.shellcheck pkgs.lefthook diff --git a/hosts/luci/home-config.nix b/hosts/luci/home-config.nix index 2f90896..d09db33 100644 --- a/hosts/luci/home-config.nix +++ b/hosts/luci/home-config.nix @@ -10,7 +10,6 @@ ghq.enable = true; git.enable = true; neovim.enable = true; - starship.enable = true; utils.enable = true; vifm.enable = true; zsh.enable = true; diff --git a/modules/home-manager/cli/starship/default.nix b/modules/home-manager/cli/starship/default.nix deleted file mode 100644 index afb8298..0000000 --- a/modules/home-manager/cli/starship/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib, config, ... }: -with lib; -let - cfg = config.modules.cli.starship; -in -{ - options.modules.cli.starship = { - enable = mkEnableOption "enable starship prompt"; - }; - config = mkIf cfg.enable { - programs.starship = { - enable = true; - enableZshIntegration = true; - settings = { - format = "$username$hostname$directory$git_branch$git_state$git_status$cmd_duration$line_break $python$nix_shell$character"; - directory = { - style = "blue"; - truncate_to_repo = false; - }; - character = { - success_symbol = "[󰅂](purple)"; - error_symbol = "[󰅂](red)"; - vimcmd_symbol = "[󰅁](green)"; - }; - git_branch = { - format = "[$branch]($style)"; - style = "bright-black"; - }; - git_status = { - format = "[[( *$conflicted$untracked$modified$staged$renamed$deleted)](218) ($ahead_behind$stashed)]($style) "; - style = "cyan"; - conflicted = "​"; - untracked = "​"; - modified = "​"; - staged = "​"; - renamed = "​"; - deleted = "​"; - stashed = "≡"; - }; - git_state = { - format = "\\([$state( $progress_current/$progress_total)]($style)\\)"; - style = "bright-black"; - }; - cmd_duration = { - format = "[$duration]($style) "; - style = "yellow"; - }; - python = { - format = "[$virtualenv]($style) "; - style = "bright-black"; - }; - nix_shell = { - format = "[$symbol$name]($style) "; - symbol = " "; - style = "bright-black"; - }; - }; - }; - }; -} diff --git a/modules/home-manager/cli/zsh/default.nix b/modules/home-manager/cli/zsh/default.nix index bf4ceeb..413f26d 100644 --- a/modules/home-manager/cli/zsh/default.nix +++ b/modules/home-manager/cli/zsh/default.nix @@ -89,6 +89,15 @@ in compinit -C ''; plugins = [ + { + name = "pure"; + src = pkgs.fetchFromGitHub { + owner = "sindresorhus"; + repo = "pure"; + rev = "v1.22.0"; + hash = "sha256-TR4CyBZ+KoZRs9XDmWE5lJuUXXU1J8E2Z63nt+FS+5w="; + }; + } { name = "base16-shell"; src = pkgs.fetchFromGitHub { diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index 9025c48..435bc9a 100644 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -9,7 +9,6 @@ ./cli/ghq/default.nix ./cli/git ./cli/neovim - ./cli/starship ./cli/utils ./cli/vifm ./cli/zsh