mantis: .

14 files changed, 71 insertions, 38 deletions

diff --git a/flake.nix b/flake.nix
index 61b529a..b21b5a3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -114,12 +114,12 @@
               };
             }
 
-            {
-              imports = [niri.nixosModules.niri];
-              nixpkgs.overlays = [niri.overlays.niri];
-              programs.niri.enable = true;
-              programs.niri.config = builtins.readFile ./hosts/mantis/niri-config.kdl;
-            }
+            # {
+            #   imports = [niri.nixosModules.niri];
+            #   nixpkgs.overlays = [niri.overlays.niri];
+            #   programs.niri.enable = true;
+            #   programs.niri.config = builtins.readFile ./hosts/mantis/niri-config.kdl;
+            # }
 
           ];
         };
diff --git a/font.nix b/font.nix
index 74afcdd..17b3978 100644
--- a/font.nix
+++ b/font.nix
@@ -1,3 +1,3 @@
 {
-  name = "Nerd Input";
+  name = "InputMono";
 }
diff --git a/hosts/mantis/configuration.nix b/hosts/mantis/configuration.nix
index 76bf237..d96f321 100644
--- a/hosts/mantis/configuration.nix
+++ b/hosts/mantis/configuration.nix
@@ -55,7 +55,7 @@
     systemPackages = with pkgs; [
       man-pages
       man-pages-posix
-      (lib.hiPrio pkgs.bashInteractive_5)
+      (lib.hiPrio pkgs.bashInteractive)
       _2bwm
     ];
     variables = {
@@ -80,7 +80,7 @@
     };
   };
 
-  hardware.opengl.extraPackages = [
+  hardware.graphics.extraPackages = [
     pkgs.vpl-gpu-rt
   ];
 
diff --git a/hosts/mantis/home.nix b/hosts/mantis/home.nix
index e196052..dfabeed 100644
--- a/hosts/mantis/home.nix
+++ b/hosts/mantis/home.nix
@@ -14,8 +14,8 @@
     # ./mail.nix
   ];
 
-  programs.niri.enable = true;
-  programs.niri.config = builtins.readFile ./niri-config.kdl;
+  # programs.niri.enable = false;
+  # programs.niri.config = builtins.readFile ./niri-config.kdl;
 
   home.stateVersion = "22.11";
   home.username = "op";
@@ -71,8 +71,9 @@
     libinput
 
     # wayland stuff
-    wl-clipboard-rs
-    swaybg
+    xclip
+    # wl-clipboard-rs
+    # swaybg
 
     nixpkgs-fmt
 
diff --git a/patches/2bwm/nerd-patch.diff b/patches/2bwm/nerd-patch.diff
index 9e315be..cdb6a00 100644
--- a/patches/2bwm/nerd-patch.diff
+++ b/patches/2bwm/nerd-patch.diff
@@ -8,7 +8,7 @@ index 0985d2e..baa77f8 100644
  ///--Menus and Programs---///
 -static const char *menucmd[]   = { "", NULL };
 +// static const char *menucmd[]   = { "", NULL };
-+static const char *terminal[]   = { "st", NULL };
++static const char *terminal[]   = { "alacritty", NULL };
 +static const char *rofi_run[]   = { "rofi", "-show", "combi" };
 +static const char *rofi_window[]   = { "rofi", "-show", "window" };
  ///--Custom foo---///
diff --git a/programs/init.vim b/programs/init.vim
index 3dbd4b5..e7a70c1 100644
--- a/programs/init.vim
+++ b/programs/init.vim
@@ -100,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
@@ -132,34 +132,24 @@ 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 = 0
 
 let g:latex_view_general_viewer = "zathura"
@@ -180,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/st/config.h b/programs/st/config.h
index e7f79e3..d6402f9 100644
--- a/programs/st/config.h
+++ b/programs/st/config.h
@@ -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 bfda915..10cbf5f 100644
--- a/programs/tmux.nix
+++ b/programs/tmux.nix
@@ -118,6 +118,7 @@ in
       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 "${copy}"
+      set -s set-clipboard on
       bind P paste-buffer
 
       set-window-option -g allow-rename off
diff --git a/services/sxhkd.nix b/services/sxhkd.nix
index 58b8340..fab1316 100644
--- a/services/sxhkd.nix
+++ b/services/sxhkd.nix
@@ -10,8 +10,8 @@ let
       ${pkgs.libnotify}/bin/notify-send ${text} -h int:value:${value} -h string:synchronous:volume -h string:hlcolor:"${theme.base0C}"
     '';
   volume = pkgs.writeScriptBin "volume" ''
-    ${pkgs.alsaUtils}/bin/amixer $@
-    v=$(${pkgs.alsaUtils}/bin/amixer sget Master | ${pkgs.gawk}/bin/awk -F"[][%]" '/Left:/ {print $2}')
+    ${pkgs.alsa-utils}/bin/amixer $@
+    v=$(${pkgs.alsa-utils}/bin/amixer sget Master | ${pkgs.gawk}/bin/awk -F"[][%]" '/Left:/ {print $2}')
     ${progress "volume" "$v"}
   '';
 
diff --git a/theme/default.nix b/theme/default.nix
index b3af086..7e1108b 100644
--- a/theme/default.nix
+++ b/theme/default.nix
@@ -2,5 +2,7 @@ let
   day = import ./day.nix;
   night = import ./night.nix;
   gruvbox = import ./gruvbox.nix;
+  tomorrow-night = import ./tomorrow-night.nix;
+  material-darker = import ./material-darker.nix;
 in
-night
+material-darker
diff --git a/theme/material-darker.nix b/theme/material-darker.nix
new file mode 100644
index 0000000..ded97fe
--- /dev/null
+++ b/theme/material-darker.nix
@@ -0,0 +1,18 @@
+{
+  base00 = "#111111";
+  base01 = "#202020";
+  base02 = "#242424";
+  base03 = "#393939";
+  base04 = "#4A4A4A";
+  base05 = "#CCCCCC";
+  base06 = "#EEFFFF";
+  base07 = "#FFFFFF";
+  base08 = "#cc6666";
+  base09 = "#de935f";
+  base0A = "#f0c674";
+  base0B = "#b5bd68";
+  base0C = "#8abeb7";
+  base0D = "#81a2be";
+  base0E = "#b294bb";
+  base0F = "#a3685a";
+}
diff --git a/theme/tomorrow-night.nix b/theme/tomorrow-night.nix
new file mode 100644
index 0000000..93552b3
--- /dev/null
+++ b/theme/tomorrow-night.nix
@@ -0,0 +1,18 @@
+{
+  base00 = "#1d1f21";
+  base01 = "#282a2e";
+  base02 = "#373b41";
+  base03 = "#969896";
+  base04 = "#b4b7b4";
+  base05 = "#c5c8c6";
+  base06 = "#e0e0e0";
+  base07 = "#ffffff";
+  base08 = "#cc6666";
+  base09 = "#de935f";
+  base0A = "#f0c674";
+  base0B = "#b5bd68";
+  base0C = "#8abeb7";
+  base0D = "#81a2be";
+  base0E = "#b294bb";
+  base0F = "#a3685a";
+}
diff --git a/x/xft.nix b/x/xft.nix
index e4479e1..5d886bb 100644
--- a/x/xft.nix
+++ b/x/xft.nix
@@ -11,6 +11,6 @@
     "Xft.hintstyle" = "hintslight";
     "Xft.hinting" = true;
     "Xft.rgba" = "rgb";
-    # "Xft.dpi" = 96;
+    "Xft.dpi" = 160;
   };
 }