From 95e68c60f83747538639091d7a95d39005492d42 Mon Sep 17 00:00:00 2001 From: Alexandre LUCAZEAU Date: Sat, 29 Jul 2023 11:56:49 +0200 Subject: [PATCH] ADD starship config file --- hosts/dell-5590/home-manager/home-manager | 1 - hosts/dell-5590/home-manager/home.nix | 2 +- hosts/dell-5590/home-manager/packages.nix | 3 - hosts/dell-5590/home-manager/variables.nix | 2 +- hosts/dell-5590/nixos/configuration.nix | 6 +- hosts/dell-5590/nixos/packages.nix | 2 +- modules/configs/starship.toml | 81 ++++++++++++++++++++++ modules/neovim.nix | 14 ++-- 8 files changed, 95 insertions(+), 16 deletions(-) delete mode 120000 hosts/dell-5590/home-manager/home-manager create mode 100644 modules/configs/starship.toml diff --git a/hosts/dell-5590/home-manager/home-manager b/hosts/dell-5590/home-manager/home-manager deleted file mode 120000 index d9c09ef..0000000 --- a/hosts/dell-5590/home-manager/home-manager +++ /dev/null @@ -1 +0,0 @@ -/home/alexandre/git/nixos-config/hosts/dell-5590/home-manager/ \ No newline at end of file diff --git a/hosts/dell-5590/home-manager/home.nix b/hosts/dell-5590/home-manager/home.nix index 41fa1f2..085f786 100644 --- a/hosts/dell-5590/home-manager/home.nix +++ b/hosts/dell-5590/home-manager/home.nix @@ -10,7 +10,7 @@ ./dunst.nix ./bat.nix # ./redshift.nix -# ../../../modules/neovim.nix + ../../../modules/neovim.nix ../../../modules/rust.nix ../../../modules/tmux.nix ../../../modules/git.nix diff --git a/hosts/dell-5590/home-manager/packages.nix b/hosts/dell-5590/home-manager/packages.nix index bcc5748..a698e16 100644 --- a/hosts/dell-5590/home-manager/packages.nix +++ b/hosts/dell-5590/home-manager/packages.nix @@ -3,7 +3,6 @@ home.packages = with pkgs; [ firefox thunderbird - vim jq nextcloud-client libreoffice @@ -44,7 +43,6 @@ zola exa bat - vimPlugins.vim-markdown-composer python3 mtr powertop @@ -68,7 +66,6 @@ graphviz evince kdeconnect - neovim ]; nixpkgs.config.permittedInsecurePackages = [ "ferdi-5.8.1" diff --git a/hosts/dell-5590/home-manager/variables.nix b/hosts/dell-5590/home-manager/variables.nix index 5011333..33ae19a 100644 --- a/hosts/dell-5590/home-manager/variables.nix +++ b/hosts/dell-5590/home-manager/variables.nix @@ -3,7 +3,7 @@ #config ={ home.sessionVariables = { LESS = "--quit-if-one-screen --RAW-CONTROL-CHARS"; - EDITOR = "vim"; + EDITOR = "nvim"; TERMINAL = "xfce4-terminal"; BROWSER = "firefox"; PRIVATE_BROWSER = "firefox -private"; diff --git a/hosts/dell-5590/nixos/configuration.nix b/hosts/dell-5590/nixos/configuration.nix index 385ea09..f00a4e4 100644 --- a/hosts/dell-5590/nixos/configuration.nix +++ b/hosts/dell-5590/nixos/configuration.nix @@ -24,13 +24,15 @@ }; programs = { - zsh.enable = true; htop = { enable = true; settings.show_cpu_temperature = 1; }; fish = { enable = true; + interactiveShellInit = '' + set -gx EDITOR nvim + ''; shellAliases = { ll = "ls -l"; ls = "lsd"; @@ -176,7 +178,7 @@ nix.settings.auto-optimise-store = true; system.stateVersion = "21.05"; # Did you read the comment? environment.variables = { - EDITOR = "vim"; + EDITOR = "nvim"; BROWSER = "firefox"; LESS = "--quit-if-one-screen --RAW-CONTROL-CHARS"; TERMINAL = "xfce4-terminal"; diff --git a/hosts/dell-5590/nixos/packages.nix b/hosts/dell-5590/nixos/packages.nix index 6d2dd32..e68f43d 100644 --- a/hosts/dell-5590/nixos/packages.nix +++ b/hosts/dell-5590/nixos/packages.nix @@ -4,7 +4,7 @@ environment.systemPackages = with pkgs; [ - wget lshw openssh bc unzip zip file which vim gnumake tmux + wget lshw openssh bc unzip zip file which gnumake tmux gitAndTools.gitFull dmenu pkgs.dconf diff --git a/modules/configs/starship.toml b/modules/configs/starship.toml new file mode 100644 index 0000000..c0cb836 --- /dev/null +++ b/modules/configs/starship.toml @@ -0,0 +1,81 @@ +# ~/.config/starship.toml + +[battery] +full_symbol = "🔋" +charging_symbol = "🔌" +discharging_symbol = "⚡" + +[[battery.display]] +threshold = 30 +style = "bold red" + +[character] +error_symbol = "[✖](bold red) " + +[cmd_duration] +min_time = 10_000 # Show command duration over 10,000 milliseconds (=10 sec) +format = " took [$duration]($style)" + +[directory] +truncation_length = 5 +format = "[$path]($style)[$lock_symbol]($lock_style) " + +[git_branch] +format = " [$symbol$branch]($style) " +symbol = "🍣 " +style = "bold yellow" + +[git_commit] +commit_hash_length = 8 +style = "bold white" + +[git_state] +format = '[\($state( $progress_current of $progress_total)\)]($style) ' + +[git_status] +conflicted = "⚔️ " +ahead = "🏎️ 💨 ×${count}" +behind = "🐢 ×${count}" +diverged = "🔱 🏎️ 💨 ×${ahead_count} 🐢 ×${behind_count}" +untracked = "🛤️ ×${count}" +stashed = "📦 " +modified = "📝 ×${count}" +staged = "🗃️ ×${count}" +renamed = "📛 ×${count}" +deleted = "🗑️ ×${count}" +style = "bright-white" +format = "$all_status$ahead_behind" + +[hostname] +ssh_only = false +format = "<[$hostname]($style)>" +trim_at = "-" +style = "bold dimmed white" +disabled = false + +[memory_usage] +format = "$symbol[${ram}( | ${swap})]($style) " +threshold = 70 +style = "bold dimmed white" +disabled = false + +[package] +disabled = true + +[python] +format = "[$symbol$version]($style) " +style = "bold green" + +[rust] +format = "[$symbol$version]($style) " +style = "bold green" + +[time] +time_format = "%T" +format = "🕙 $time($style) " +style = "bright-white" +disabled = false + +[username] +style_user = "bold dimmed blue" +show_always = false diff --git a/modules/neovim.nix b/modules/neovim.nix index 572208d..ed7f435 100644 --- a/modules/neovim.nix +++ b/modules/neovim.nix @@ -4,12 +4,12 @@ programs.neovim = { viAlias = true; vimAlias = true; vimdiffAlias = true; - plugins = with pkgs.vimPlugins;[ - nvim-lspconfig - nvim-treesitter.withAllGrammars - plenary-nvim - gruvbox-material - mini-nvim - ]; +# plugins = with pkgs.vimPlugins;[ +# nvim-lspconfig +# nvim-treesitter.withAllGrammars +# plenary-nvim +# gruvbox-material +# mini-nvim +# ]; }; }