Cleanup nix

This commit is contained in:
Leon Kowarschick 2020-07-07 11:11:11 +02:00
parent 259eeec59e
commit cb3a18acbe
6 changed files with 65 additions and 60 deletions

View file

@ -1,4 +1,4 @@
{
"optOut": false,
"lastUpdateCheck": 1593941718293
"lastUpdateCheck": 1594112599222
}

View file

@ -1 +1 @@
/nix/store/695xfp0r77bhs2m9yvxzd78f8wr7s0bb-home-manager-files/.config/htop/htoprc
/nix/store/ycvaahbhlki69ivwdwawmrllglzsy404-home-manager-files/.config/htop/htoprc

View file

@ -33,7 +33,7 @@
#normal.family = "Iosevka";
normal.family = "Terminus (TTF)";
offset.x = 0;
offset.y = 0;
offset.y = -2;
};
colors = myConf.colors;
};

View file

@ -0,0 +1,42 @@
{ myConf, pkgs ? import <nixpkgs> }:
{
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;
}
];
}

View file

@ -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

View file

@ -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;
};
};