diff --git a/files/.config/configstore/update-notifier-npm.json b/files/.config/configstore/update-notifier-npm.json index 62d960e..8c99a28 100644 --- a/files/.config/configstore/update-notifier-npm.json +++ b/files/.config/configstore/update-notifier-npm.json @@ -1,4 +1,4 @@ { "optOut": false, - "lastUpdateCheck": 1593814336821 + "lastUpdateCheck": 1593941718293 } \ No newline at end of file diff --git a/files/.config/htop/htoprc b/files/.config/htop/htoprc deleted file mode 100644 index 93c9e4f..0000000 --- a/files/.config/htop/htoprc +++ /dev/null @@ -1,26 +0,0 @@ -# Beware! This file is rewritten by htop when settings are changed in the interface. -# The parser is also very primitive, and not human-friendly. -fields=0 48 17 18 38 39 40 2 46 47 49 1 -sort_key=47 -sort_direction=1 -hide_threads=1 -hide_kernel_threads=1 -hide_userland_threads=1 -shadow_other_users=0 -show_thread_names=0 -show_program_path=1 -highlight_base_name=0 -highlight_megabytes=1 -highlight_threads=1 -tree_view=0 -header_margin=1 -detailed_cpu_time=0 -cpu_count_from_zero=0 -update_process_names=0 -account_guest_in_cpu_meter=0 -color_scheme=0 -delay=15 -left_meters=AllCPUs Memory Swap -left_meter_modes=1 1 1 -right_meters=Tasks LoadAverage Uptime -right_meter_modes=2 2 2 diff --git a/files/.config/htop/htoprc b/files/.config/htop/htoprc new file mode 120000 index 0000000..4dd1bb0 --- /dev/null +++ b/files/.config/htop/htoprc @@ -0,0 +1 @@ +/nix/store/695xfp0r77bhs2m9yvxzd78f8wr7s0bb-home-manager-files/.config/htop/htoprc \ No newline at end of file diff --git a/files/nix-stuff/nixpkgs/config/prompt.zsh b/files/nix-stuff/nixpkgs/config/prompt.zsh index e1bf11b..321aab4 100644 --- a/files/nix-stuff/nixpkgs/config/prompt.zsh +++ b/files/nix-stuff/nixpkgs/config/prompt.zsh @@ -33,7 +33,7 @@ function _my_prompt() { echo -n "%F{$__bright_white} $(git_status)" echo # %3{stuff%} tell's zsh that the characters are printed as 3 chars wide - echo -n "%3{╰─λ%} " + echo -n "%F{$__bright_white}%3{╰─λ%} " } diff --git a/files/nix-stuff/nixpkgs/config/zsh.nix b/files/nix-stuff/nixpkgs/config/zsh.nix index a5fbf90..04e6c70 100644 --- a/files/nix-stuff/nixpkgs/config/zsh.nix +++ b/files/nix-stuff/nixpkgs/config/zsh.nix @@ -84,8 +84,10 @@ let realpath=\''${(Qe)~realpath} " - zstyle ':fzf-tab:complete:cd:*' extra-opts --preview=$extract'lsd -1 --color=always $realpath' - zstyle ':fzf-tab:complete:ls:*' extra-opts --preview=$extract'lsd -1 --color=always $realpath' + #zstyle ':fzf-tab:complete:cd:*' extra-opts --preview=$extract'lsd -1 --color=always $realpath' + #zstyle ':fzf-tab:complete:ls:*' extra-opts --preview=$extract'lsd -1 --color=always $realpath' + #zstyle ':fzf-tab:complete:nvim:*' extra-opts --preview=$extract'bat --color=always $realpath' + zstyle ':fzf-tab:complete:*:*' extra-opts --preview=$extract'if [ -f $realpath ]; then bat -p --color=always $realpath; else lsd -1 --color=always $realpath; fi' ''; @@ -97,6 +99,7 @@ in enableAutosuggestions = true; enableCompletion = true; + dotDir = ".config/zsh"; #defaultKeymap = "viins"; history = { save = 10000; @@ -111,6 +114,7 @@ in }; initExtraBeforeCompInit = '' + zstyle ':completion:*' menu select zstyle ':completion::complete:*' gain-privileges 1 zstyle ':completion:*' list-prompt "" diff --git a/files/nix-stuff/nixpkgs/home.nix b/files/nix-stuff/nixpkgs/home.nix index 2a0d208..1db6ec0 100644 --- a/files/nix-stuff/nixpkgs/home.nix +++ b/files/nix-stuff/nixpkgs/home.nix @@ -21,7 +21,6 @@ in home.packages = with pkgs; [ elkowar_local.bashtop - htop direnv rnix-lsp nix-prefetch-git @@ -44,6 +43,52 @@ in zsh = import ./config/zsh.nix { inherit pkgs; inherit myConf; }; + htop = { + enable = true; + }; + + tmux = { + enable = true; + clock24 = true; + historyLimit = 10000; + keyMode = "vi"; + shortcut = "y"; + terminal = "tmux-256color"; + customPaneNavigationAndResize = true; + extraConfig = '' + bind v split-window -h -c "#{pane_current_oath}" + bind b split-window -v -c "#{pane_current_oath}" + bind c new-window -c "#{pane_current_path}" + unbind '"' + unbind % + set -g mouse on + + bind-key -T copy-mode-vi v send-keys -X begin-selection + bind-key -T copy-mode-vi y send-keys -X copy-selection + bind-key -T copy-mode-vi r send-keys -X rectangle-toggle + unbind [ + bind < copy-mode + unbind p + bind > paste-buffer + bind-key C-a set -g status off + bind-key C-s set -g status on + bind -T copy-mode-vi MouseDragEnd1Pane send-keys -M -X copy-pipe 'xclip -in -selection clipboard' + + set-option -g visual-activity off + set-option -g visual-bell off + set-option -g visual-silence off + set-window-option -g monitor-activity off + set-option -g bell-action none + ''; + + plugins = with pkgs.tmuxPlugins; [ + { + plugin = prefix-highlight; + } + + ]; + }; + lsd = { enable = true; enableAliases = true; @@ -64,6 +109,7 @@ in fzf = { enable = true; enableFishIntegration = true; + enableZshIntegration = true; defaultCommand = "rg --files"; fileWidgetCommand = "fd --type f"; changeDirWidgetCommand = "rg --files --null | xargs -0 dirname | sort -u";