From cb3a18acbebd7526dae44afb7a7ecbaf59db3551 Mon Sep 17 00:00:00 2001 From: Leon Kowarschick <5300871+elkowar@users.noreply.github.com> Date: Tue, 7 Jul 2020 11:11:11 +0200 Subject: [PATCH] Cleanup nix --- .../configstore/update-notifier-npm.json | 2 +- files/.config/htop/htoprc | 2 +- files/nix-stuff/nixpkgs/config/alacritty.nix | 2 +- files/nix-stuff/nixpkgs/config/tmux.nix | 42 +++++++++++++ files/nix-stuff/nixpkgs/config/zsh.nix | 14 +++-- files/nix-stuff/nixpkgs/home.nix | 63 +++---------------- 6 files changed, 65 insertions(+), 60 deletions(-) create mode 100644 files/nix-stuff/nixpkgs/config/tmux.nix diff --git a/files/.config/configstore/update-notifier-npm.json b/files/.config/configstore/update-notifier-npm.json index 8c99a28..e8b6db0 100644 --- a/files/.config/configstore/update-notifier-npm.json +++ b/files/.config/configstore/update-notifier-npm.json @@ -1,4 +1,4 @@ { "optOut": false, - "lastUpdateCheck": 1593941718293 + "lastUpdateCheck": 1594112599222 } \ No newline at end of file diff --git a/files/.config/htop/htoprc b/files/.config/htop/htoprc index 4dd1bb0..03c57d8 120000 --- a/files/.config/htop/htoprc +++ b/files/.config/htop/htoprc @@ -1 +1 @@ -/nix/store/695xfp0r77bhs2m9yvxzd78f8wr7s0bb-home-manager-files/.config/htop/htoprc \ No newline at end of file +/nix/store/ycvaahbhlki69ivwdwawmrllglzsy404-home-manager-files/.config/htop/htoprc \ No newline at end of file diff --git a/files/nix-stuff/nixpkgs/config/alacritty.nix b/files/nix-stuff/nixpkgs/config/alacritty.nix index 6a0d7d9..c106bcd 100644 --- a/files/nix-stuff/nixpkgs/config/alacritty.nix +++ b/files/nix-stuff/nixpkgs/config/alacritty.nix @@ -33,7 +33,7 @@ #normal.family = "Iosevka"; normal.family = "Terminus (TTF)"; offset.x = 0; - offset.y = 0; + offset.y = -2; }; colors = myConf.colors; }; diff --git a/files/nix-stuff/nixpkgs/config/tmux.nix b/files/nix-stuff/nixpkgs/config/tmux.nix new file mode 100644 index 0000000..47aa747 --- /dev/null +++ b/files/nix-stuff/nixpkgs/config/tmux.nix @@ -0,0 +1,42 @@ +{ myConf, pkgs ? import }: +{ + 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; + } + + ]; +} diff --git a/files/nix-stuff/nixpkgs/config/zsh.nix b/files/nix-stuff/nixpkgs/config/zsh.nix index 04e6c70..3001db6 100644 --- a/files/nix-stuff/nixpkgs/config/zsh.nix +++ b/files/nix-stuff/nixpkgs/config/zsh.nix @@ -84,10 +84,11 @@ 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: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' + zstyle ':fzf-tab:complete:cd:*' extra-opts --preview=$extract'exa --icons -1 --color=always $realpath' + zstyle ':fzf-tab:complete:nvim:*' extra-opts --preview=$extract'bat -p --color=always $realpath' + + #zstyle ':fzf-tab:complete:ls:*' extra-opts --preview=$extract'exa --icons -1 --color=always $realpath' + #zstyle ':fzf-tab:complete:*:*' extra-opts --preview=$extract'if [ -f $realpath ]; then bat -p --color=always $realpath; else exa --icons -1 --color=always $realpath; fi' ''; @@ -104,6 +105,7 @@ in history = { save = 10000; share = false; + extended = true; ignoreDups = true; ignoreSpace = true; }; @@ -113,6 +115,10 @@ in ZSH_AUTOSUGGEST_USE_ASYNC = 1; }; + shellAliases = { + ls = "exa --icons"; + }; + initExtraBeforeCompInit = '' zstyle ':completion:*' menu select diff --git a/files/nix-stuff/nixpkgs/home.nix b/files/nix-stuff/nixpkgs/home.nix index 1db6ec0..0288acc 100644 --- a/files/nix-stuff/nixpkgs/home.nix +++ b/files/nix-stuff/nixpkgs/home.nix @@ -27,72 +27,28 @@ in gtop simplescreenrecorder bat - fontforge websocat - #zsh-completions niv - #pkgs.timg + exa + zsh-completions ]; programs = { home-manager.enable = true; alacritty = import ./config/alacritty.nix { inherit pkgs; inherit myConf; }; # <- https://github.com/guibou/nixGL - #firefox = import ./config/firefox.nix; - feh = import ./config/feh.nix; zsh = import ./config/zsh.nix { inherit pkgs; inherit myConf; }; - + tmux = import ./config/tmux.nix { inherit pkgs; inherit myConf; }; + feh = import ./config/feh.nix; 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; - }; + #lsd = { + #enable = true; + #enableAliases = true; + #}; mpv = { enable = true; @@ -118,7 +74,8 @@ in direnv = { enable = true; enableFishIntegration = true; - #enableNixDirenvIntegration = true; + enableZshIntegration = true; + enableNixDirenvIntegration = true; }; };