update hosts

dotfiles/sway/config

@@ -25,6 +25,7 @@ input "1:1:AT_Translated_Set_2_keyboard" xkb_layout de
 input "0:0:TUXEDO_Keyboard" xkb_layout de
 
 output * bg $wallpaper fill
+output "BenQ Corporation BenQ SW2700 83H03922SL0" res --custom 2560x1440@60Hz
 
 # user keybinds
 bindsym $mod+Return exec $term
@@ -33,7 +34,7 @@ bindsym $mod+d exec $menu
 floating_modifier $mod normal
 bindsym $mod+Shift+c reload
 bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit'
-bindsym $mod+Shift+p exec keepassxc
+bindsym $mod+o exec keepassxc
 bindsym $mod+z exec $lock
 bindsym $mod+Up exec light -A 5
 bindsym $mod+Down exec light -U 5
@@ -160,3 +161,8 @@ exec_always {
     gsettings set $gnome-schema icon-theme 'elementary Xfce'
     gsettings set $gnome-schema cursor-theme 'Capitaine Cursors - White'
 }
+
+
+# pastebin
+exec wl-paste --primary -t text --watch clipman store
+bindsym $mod+p exec clipman pick -t "bemenu" --tool-args='-b --fn "CascadiaCode 10" -l 10 --ff=#ff6188 --nf=#fcfcfa --tf=#78dce8 --hf=#78dce8 --tb=#2d2a2e --fb=#2d2a2e --nb=#2d2a2e --hb=#2d2a2e --sb=#2d2a2e'

packages/neovim.nix

@@ -1,8 +1,12 @@
 with import <nixos-unstable> {};
 
 neovim.override {
+  vimAlias = true;
+
   configure = {
     customRC = ''
+      source ${pkgs.fzf}/share/vim-plugins/fzf/plugin/fzf.vim
+
       set hidden
 
       " langserver
@@ -11,7 +15,7 @@ neovim.override {
         \ 'python': ['pyls'],
         \ 'rust': ['rust-analyzer'],
         \ }
-       
+
       " basic builtin
       set background=dark
       set shiftwidth=4
@@ -65,7 +69,8 @@ neovim.override {
 
       let g:which_key_map.f = { 'name': '+files' }
       noremap <leader>ff :FZF<cr>
-      noremap <leader>fc :saveas
+      noremap <leader>fn :NnnPicker %:p:h<cr>
+      noremap <leader>fc :saveas %:p:h
       
       let g:which_key_map.y = { 'name': '+yank' }
       noremap <leader>yp :read !wl-paste<cr>
@@ -79,7 +84,7 @@ neovim.override {
       noremap <leader>bn :bn<cr>
       noremap <leader>bp :bp<cr>
       
-      let g:which_key_map.b = { 'name': '+lang' }
+      let g:which_key_map.m = { 'name': '+lang' }
       noremap <leader>md  :call LanguageClient_textDocument_codeAction()<cr>
       noremap <leader>mc  :call LanguageClient#textDocument_references()<cr>
       noremap <leader>mf  :call LanguageClient#textDocument_formatting()<cr>
@@ -88,6 +93,11 @@ neovim.override {
       noremap <leader>mm  :call LanguageClient#textDocument_hover()<cr>
       noremap <leader>mr  :call LanguageClient#textDocument_rename()<cr>
       noremap <leader>ms  :call LanguageClient#workspace_symbol()<cr>
+      noremap <leader>ma  :fzf_lsp_action<cr>
+      noremap <leader>ml  :fzf_lsp_layout<cr>
+
+      let g:which_key_map.g = { 'name': '+git' }
+      noremap <leader>gs :!lazygit
 
       " lang specifics
       let g:rustfmt_autosave = 1
@@ -99,10 +109,11 @@ neovim.override {
         airline
         easymotion
         editorconfig-vim
-        fugitive
         fzf
+        fzf-lsp-nvim
         LanguageClient-neovim
         ncm2
+        nnn-vim
         surround
         syntastic
         vim-addon-nix

roles/base.nix

@@ -12,6 +12,7 @@ in {
     bash-completion
     bat
     borgbackup
+    curl
     direnv
     fd
     file
@@ -36,7 +37,7 @@ in {
     tmux
     unzip
     wget
-    z-lua
+    zoxide
     (import ../packages/neovim.nix)
   ];
 
@@ -75,7 +76,7 @@ in {
 
       . "$(fzf-share)/key-bindings.bash"
       . "$(fzf-share)/completion.bash"
-      . <(z --init bash)
+      . <(zoxide init bash)
       . <(direnv hook bash)
       . ${pkgs.bash-completion}/etc/profile.d/bash_completion.sh
 

roles/desktop.nix

@@ -131,6 +131,7 @@ in {
     solaar
     gdk-pixbuf
 
+    clipman
     gebaar-libinput
     wdisplays
     wl-clipboard

roles/work.nix

@@ -12,15 +12,9 @@ in {
   ];
 
   networking.extraHosts = ''
-    35.234.109.94 fsi.thomann.de
     10.100.7.11 mon.netzmarkt.de
 
-    172.23.0.2 api.kube.local
-    172.23.0.2 hubble.kube.local
-    172.23.0.2 bonedo.kube.local
-    172.23.0.2 linkerd.kube.local
-    172.23.0.2 argo.kube.local
-
+    172.20.0.2 hubble.kind
   '';
 
   environment.systemPackages = with pkgs; [