13 files changed, 196 insertions, 59 deletions

diff --git a/programs/alacritty.nix b/programs/alacritty.nix
new file mode 100644
index 0000000..280c667
--- /dev/null
+++ b/programs/alacritty.nix
@@ -0,0 +1,63 @@
+{ config
+, pkgs
+, lib
+, theme
+, font
+, ...
+}:
+let
+
+  fontConfig = {
+    normal = { family = "${font.name}"; style = "Regular"; };
+    bold = { family = "${font.name}"; style = "Bold"; };
+    italic = { family = "${font.name}"; style = "Italic"; };
+    size = 10.0;
+  };
+in
+{
+  programs.alacritty = {
+    enable = true;
+    settings = {
+      env = {
+        TERM = "xterm-256color";
+      };
+      window = {
+        padding.x = 20;
+        padding.y = 20;
+        dynamic_padding = true;
+        decorations = "None";
+      };
+
+      font = fontConfig;
+
+      colors = {
+        primary = {
+          background = "${theme.base00}";
+          foreground = "${theme.base05}";
+        };
+        normal = {
+          black = "${theme.base00}";
+          red = "${theme.base08}";
+          green = "${theme.base0B}";
+          yellow = "${theme.base0A}";
+          blue = "${theme.base0D}";
+          magenta = "${theme.base0E}";
+          cyan = "${theme.base0C}";
+          white = "${theme.base05}";
+        };
+        bright = {
+          black = "${theme.base03}";
+          red = "${theme.base09}";
+          green = "${theme.base01}";
+          yellow = "${theme.base02}";
+          blue = "${theme.base04}";
+          magenta = "${theme.base06}";
+          cyan = "${theme.base0F}";
+          white = "${theme.base07}";
+        };
+      };
+
+    };
+  };
+}
+
diff --git a/programs/atuin.nix b/programs/atuin.nix
new file mode 100644
index 0000000..39e5d89
--- /dev/null
+++ b/programs/atuin.nix
@@ -0,0 +1,20 @@
+{
+  programs.atuin = {
+    enable = true;
+    enableBashIntegration = true;
+    flags = [
+      "--disable-up-arrow"
+    ];
+    settings = {
+      invert = true;
+      history_format = "{command}";
+      theme.name = "minimal";
+      style = "compact";
+      inline_height = 15;
+      prefers_reduced_motion = true;
+      show_help = false;
+      show_tabs = false;
+      enter_accept = true;
+    };
+  };
+}
diff --git a/programs/bash.nix b/programs/bash.nix
index 7d3c25e..d4a52f2 100644
--- a/programs/bash.nix
+++ b/programs/bash.nix
@@ -53,27 +53,15 @@
     ];
 
     sessionVariables = {
-
-      PF_INFO = "ascii title os kernel uptime pkgs shell";
-      PF_SEP = " ";
-      PF_COL1 = 7;
-      PF_COL2 = 7;
-      PF_COL3 = 6;
-      PF_ALIGN = "9";
-      PF_ASCII = "nixos";
-
-      _JAVA_AWT_WM_NONREPARENTING = 1;
-
-      TERM = "xterm-256color-italic";
+      TERM = "alacritty";
       EDITOR = "nvim";
       MANPAGER = "nvim +Man!";
       GPG_TTY = "\$(tty)";
-
     };
 
     initExtra = ''
       export PATH=$PATH:"$HOME/scripts"
-      export PROMPT_COMMAND="tmux refresh-client -S > /dev/null";
+      export PROMPT_COMMAND="tmux refresh-client -S &> /dev/null";
       export PS1="\n\001\e[0;36m\002λ\001\e[0m\002 ";
       export PS2="> ";
 
diff --git a/programs/default.nix b/programs/default.nix
index 70ded22..d7911cc 100644
--- a/programs/default.nix
+++ b/programs/default.nix
@@ -8,6 +8,7 @@
 {
 
   imports = [
+    ./atuin.nix
     ./bash.nix
     ./chromium.nix
     ./feh.nix
@@ -16,9 +17,11 @@
     ./htop.nix
     ./neovim.nix
     ./readline.nix
+    ./rofi.nix
+    ./alacritty.nix
     ./tmux.nix
     ./zathura.nix
-    ./rofi.nix
+    ./fuzzel.nix
   ];
 
   programs = {
@@ -48,5 +51,22 @@
     };
     gpg.enable = true;
     info.enable = true;
+    broot = {
+      enable = true;
+      enableBashIntegration = true;
+      settings = {
+        imports = [
+          "native-16.hjson"
+        ];
+        verbs = [
+          {
+            key = "enter";
+            working_dir = "{root}";
+            execution = ''$EDITOR +{line} {file}'';
+            leave_broot = true;
+          }
+        ];
+      };
+    };
   };
 }
diff --git a/programs/fuzzel.nix b/programs/fuzzel.nix
new file mode 100644
index 0000000..8a87911
--- /dev/null
+++ b/programs/fuzzel.nix
@@ -0,0 +1,42 @@
+{ config
+, pkgs
+, theme
+, font
+, ...
+}:
+
+with theme;
+let
+  fuzzelColor = themeColor: (builtins.replaceStrings [ "#" ] [ "" ] themeColor) + "ff";
+in
+{
+  programs.fuzzel = {
+    enable = true;
+    settings = {
+      main = {
+        font = "${font.name}:size=12";
+        prompt = "";
+        anchor = "top-left";
+        icons-enabled = "no";
+        fields = "filename,exec,name,generic";
+        horizontal-pad = 12;
+        vertical-pad = 12;
+      };
+      colors = {
+        background = "${fuzzelColor theme.base00}";
+        text = "${fuzzelColor theme.base02}";
+        match = "${fuzzelColor theme.base0C}";
+        selection = "${fuzzelColor theme.base00}";
+        selection-text = "${fuzzelColor theme.base05}";
+        selection-match = "${fuzzelColor theme.base0C}";
+        border = "${fuzzelColor theme.base02}";
+      };
+      border = {
+        width = 2;
+        radius = 0;
+      };
+    };
+  };
+}
+
+
diff --git a/programs/fzf.nix b/programs/fzf.nix
index 92ee4d0..c1e6bdb 100644
--- a/programs/fzf.nix
+++ b/programs/fzf.nix
@@ -8,6 +8,8 @@
       "--color bw"
       "--no-scrollbar"
       "--no-separator"
+      "--no-unicode"
+      "--pointer '>'"
     ];
     defaultCommand = "rg -L --files";
     changeDirWidgetCommand = "fd --type d";
diff --git a/programs/git.nix b/programs/git.nix
index e4b5e0f..d4fac67 100644
--- a/programs/git.nix
+++ b/programs/git.nix
@@ -19,7 +19,13 @@ with theme;
         syntax-theme = "none";
         zero-style = "8";
         navigate = "true";
+        line-numbers = "true";
         keep-plus-minus-markers = "true";
+        line-numbers-zero-style = "8";
+        line-numbers-left-style = "8";
+        line-numbers-right-style = "8";
+        line-numbers-minus-style = "${base08}";
+        line-numbers-plus-style = "${base0B}";
         decorations = {
           file-decoration-style = "none";
           whitespace-error-style = "22 reverse";
@@ -27,7 +33,7 @@ with theme;
           minus-emph-style = "${base08} bold";
           plus-style = "${base0B}";
           plus-emph-style = "${base0B} bold";
-          file-style = "7 italic";
+          file-style = "7 bold";
           hunk-header-style = "7";
           hunk-header-decoration-style = "8 ul";
         };
@@ -39,11 +45,6 @@ with theme;
         };
       };
     };
-    # difftastic = {
-    #   enable = true;
-    #   background = "dark";
-    #   display = "inline";
-    # };
     aliases = {
       co = "checkout";
       rb = "rebase";
@@ -67,6 +68,7 @@ with theme;
         enabled = true;
         autoUpdate = true;
       };
+      merge.conflictstyle = "diff3";
     };
   };
 }
diff --git a/programs/init.vim b/programs/init.vim
index c62f419..e7a70c1 100644
--- a/programs/init.vim
+++ b/programs/init.vim
@@ -55,6 +55,8 @@ set dir=/tmp
 
 syntax on
 
+set nocursorline
+set notermguicolors
 set omnifunc=syntaxcomplete#Complete
 set completefunc=LanguageClient#complete
 set list
@@ -76,6 +78,7 @@ set path+=**
 set backspace=indent,eol,start
 set hidden
 set wildmenu
+set pumheight=8
 set complete=.,w,b,i,u,t,
 set background=dark
 set mouse=a
@@ -83,7 +86,7 @@ set conceallevel=0
 set nonumber
 set grepprg=rg\ --vimgrep\ --no-heading
 set grepformat=%f:%l:%c:%m,%f:%l:%m
-set cmdheight=2
+set cmdheight=1
 set shortmess+=c
 set updatetime=300
 set signcolumn=yes
@@ -97,7 +100,7 @@ let g:netrw_banner=0
 let g:netrw_browsex_viewer="xdg-open"
 let g:netrw_winsize=30
 
-colorscheme plain
+colorscheme agila
 
 set shiftwidth=4     " indent = 4 spaces
 set expandtab
@@ -129,35 +132,25 @@ cab bfd bufdo
 " man pages
 let g:ft_man_open_mode = 'tab'
 
-let g:gitgutter_override_sign_column_highlight = 0
-let g:gitgutter_sign_added                     = '+'
-let g:gitgutter_sign_modified                  = '~'
-let g:gitgutter_sign_removed                   = '-'
-let g:gitgutter_sign_removed_first_line        = '-'
-let g:gitgutter_sign_modified_removed          = '~'
-
 let g:fzf_colors =
-            \ { 'fg':      ['fg', 'Noise'],
-            \ 'bg':      ['bg', 'Noise'],
-            \ 'hl':      ['fg', 'Statement'],
-            \ 'fg+':     ['fg', 'CursorLine', 'CursorColumn', 'Normal'],
-            \ 'bg+':     ['bg', 'CursorLine', 'CursorColumn'],
-            \ 'hl+':     ['fg', 'Statement'],
+            \ { 'fg':    ['fg', 'Normal'],
+            \ 'bg':      ['bg', 'Normal'],
+            \ 'hl':      ['fg', 'Normal'],
+            \ 'fg+':     ['fg', 'StatusLine'],
+            \ 'bg+':     ['bg', 'Normal'],
+            \ 'hl+':     ['fg', 'Normal'],
+            \ 'gutter':  ['bg', 'Normal'],
             \ 'info':    ['fg', 'PreProc'],
             \ 'border':  ['fg', 'Ignore'],
             \ 'prompt':  ['fg', 'Conditional'],
-            \ 'pointer': ['fg', 'Exception'],
+            \ 'pointer': ['fg', 'Directory'],
             \ 'marker':  ['fg', 'Keyword'],
             \ 'spinner': ['fg', 'Label'],
             \ 'header':  ['fg', 'Comment'] }
 let g:fzf_layout = { 'down': '40%' }
 let g:fzf_preview_window = []
 
-highlight GitGutterAdd    ctermfg=8
-highlight GitGutterChange ctermfg=8
-highlight GitGutterDelete ctermfg=8
-
-let g:rustfmt_autosave = 1
+let g:rustfmt_autosave = 0
 
 let g:latex_view_general_viewer = "zathura"
 let g:vimtex_view_method = "zathura"
@@ -177,4 +170,5 @@ require 'lsp'
 require 'treesitter'
 require 'completions'
 require 'leap'
+require 'clipboard'
 EOF
diff --git a/programs/neovim.nix b/programs/neovim.nix
index 08a1ada..6a09ba4 100644
--- a/programs/neovim.nix
+++ b/programs/neovim.nix
@@ -42,7 +42,9 @@
       # syntax
       rust-vim
       haskell-vim
+      typescript-vim
       vim-nix
+      vim-javascript
 
       # handy
       tabular
diff --git a/programs/readline.nix b/programs/readline.nix
index 8afdd82..c4d5046 100644
--- a/programs/readline.nix
+++ b/programs/readline.nix
@@ -8,6 +8,7 @@
     enable = true;
     bindings = {
       "\\C-o" = ''"tmux-fzf\n"'';
+      "\\C-b" = ''"br\n"'';
       "\\t" = "menu-complete";
       "\\e[Z" = "menu-complete-backward";
     };
diff --git a/programs/rofi.nix b/programs/rofi.nix
index 8ce77bf..b6105fc 100644
--- a/programs/rofi.nix
+++ b/programs/rofi.nix
@@ -35,17 +35,15 @@ let
 
     inputbar.children = [ "entry" ];
 
-    element.padding = 10;
     entry = {
-      padding = 10;
       placeholder = "type to filter";
     };
     listview.border = 0;
     scrollbar.handle-width = 0;
     window = {
       padding = 40;
-      width = 800;
-      height = 600;
+      width = 600;
+      height = 400;
       border = mkLiteral "3px solid";
       border-color = mkLiteral theme.base01;
     };
@@ -53,11 +51,12 @@ let
 in
 {
   programs.rofi = {
+    package = pkgs.rofi-wayland;
     enable = true;
-    font = "${font.name} 21";
-    location = "top-left";
-    xoffset = 20;
-    yoffset = 20;
+    font = "${font.name} 12";
+    location = "center";
+    # xoffset = 40;
+    # yoffset = 40;
     cycle = true;
     theme = rofi-theme;
     extraConfig = {
@@ -65,8 +64,8 @@ in
       combi-modes = mkLiteral "[ window, run ]";
       # window = mkLiteral ''{ display-name: "[w]"; }'';
       # run = mkLiteral ''{ display-name: "[r]"; }'';
-      kb-clear-line = "Control+c";
-      kb-remove-word-back = "Control+w";
+      # kb-clear-line = "Control+u";
+      # kb-remove-word-back = "Control+w";
     };
   };
 }
diff --git a/programs/st/config.h b/programs/st/config.h
index c9fca58..d6402f9 100644
--- a/programs/st/config.h
+++ b/programs/st/config.h
@@ -27,7 +27,7 @@ char *stty_args = "stty raw pass8 nl -echo -iexten -cstopb 38400";
 char *vtiden = "\033[?6c";
 
 /* Kerning / character bounding-box multipliers */
-static float cwscale = 0.9;
+static float cwscale = 1.0;
 static float chscale = 1.0;
 
 /*
@@ -46,7 +46,7 @@ int allowaltscreen = 1;
 
 /* allow certain non-interactive (insecure) window operations such as:
    setting the clipboard text */
-int allowwindowops = 0;
+int allowwindowops = 1;
 
 /*
  * draw latency range in ms - from new content/keypress/etc until drawing.
diff --git a/programs/tmux.nix b/programs/tmux.nix
index 43778dd..10cbf5f 100644
--- a/programs/tmux.nix
+++ b/programs/tmux.nix
@@ -28,12 +28,15 @@ let
   date-bst = date-tz "Europe/London";
   date-hel = date-tz "Europe/Helsinki";
 
+  copy = "${pkgs.wl-clipboard-rs}/bin/wl-copy";
+  paste = "${pkgs.wl-clipboard-rs}/bin/wl-paste";
+
   # plugins
   thumbs = {
     plugin = pkgs.tmuxPlugins.tmux-thumbs;
     extraConfig = ''
       set -g @thumbs-key F
-      set -g @thumbs-command 'echo -n {} | xclip -i -sel p -f | xclip -i -sel c'
+      set -g @thumbs-command 'echo -n {} | ${copy}'
       set -g @thumbs-fg-color white
       set -g @thumbs-hint-bg-color yellow
       set -g @thumbs-hint-fg-color black
@@ -65,7 +68,7 @@ in
     plugins = [ thumbs ];
     prefix = "C-t";
     keyMode = "vi";
-    terminal = "xterm-256color-italic";
+    terminal = "alacritty";
     extraConfig = ''
       bind r source-file ~/.config/tmux/tmux.conf
 
@@ -112,9 +115,10 @@ in
       bind-key -r ">" swap-window -d -t +1
 
       bind-key -T copy-mode-vi v send-keys -X begin-selection
-      bind-key -T copy-mode-vi y send-keys -X copy-pipe "xclip -i -sel p -f | xclip -i -sel c "
+      bind-key -T copy-mode-vi y send-keys -X copy-pipe "${copy}"
       bind-key -T copy-mode-vi r send-keys -X rectangle-toggle
-      bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-no-clear "xclip -i -sel p -f | xclip -i -sel c "
+      bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-no-clear "${copy}"
+      set -s set-clipboard on
       bind P paste-buffer
 
       set-window-option -g allow-rename off
@@ -138,7 +142,7 @@ in
       # status left
       set -g  status-left-length 70
       set -g  status-left "#[fg=colour7]#(bat -q)  "
-      set -ag status-left "#[fg=colour15]#(${cmus-np}/bin/cmus-np) #[fg=colour8]#(${cmus-status}/bin/cmus-status)"
+      # set -ag status-left "#[fg=colour15]#(${cmus-np}/bin/cmus-np) #[fg=colour8]#(${cmus-status}/bin/cmus-status)"
 
       # include pwd and branch in pane border
       set -g pane-border-status top