From c8a58b150e8e944bf20e09d9ca26a84970021839 Mon Sep 17 00:00:00 2001 From: foosinn Date: Thu, 23 Dec 2021 13:03:41 +0100 Subject: [PATCH 1/4] fix home screen resolution --- dotfiles/sway/config | 1 + 1 file changed, 1 insertion(+) diff --git a/dotfiles/sway/config b/dotfiles/sway/config index f1adefd..3f15b86 100644 --- a/dotfiles/sway/config +++ b/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 From 135c93c226a23f15d42a6c2369f976ad53cadf12 Mon Sep 17 00:00:00 2001 From: foosinn Date: Mon, 3 Jan 2022 16:06:51 +0100 Subject: [PATCH 2/4] keepass and clipboard history --- dotfiles/sway/config | 7 ++++++- roles/base.nix | 1 + roles/desktop.nix | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dotfiles/sway/config b/dotfiles/sway/config index 3f15b86..3bddfe4 100644 --- a/dotfiles/sway/config +++ b/dotfiles/sway/config @@ -34,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 @@ -161,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' diff --git a/roles/base.nix b/roles/base.nix index 68b4341..e374695 100644 --- a/roles/base.nix +++ b/roles/base.nix @@ -12,6 +12,7 @@ in { bash-completion bat borgbackup + curl direnv fd file diff --git a/roles/desktop.nix b/roles/desktop.nix index 42bd933..efbfc06 100644 --- a/roles/desktop.nix +++ b/roles/desktop.nix @@ -131,6 +131,7 @@ in { solaar gdk-pixbuf + clipman gebaar-libinput wdisplays wl-clipboard From 3c8239a55fd65d1ff0b886d5ec604a9e892dac08 Mon Sep 17 00:00:00 2001 From: foosinn Date: Mon, 3 Jan 2022 16:07:36 +0100 Subject: [PATCH 3/4] vim & zoxide --- packages/neovim.nix | 19 +++++++++++++++---- roles/base.nix | 4 ++-- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/packages/neovim.nix b/packages/neovim.nix index 54f3cc9..49c9cf0 100644 --- a/packages/neovim.nix +++ b/packages/neovim.nix @@ -1,8 +1,12 @@ with import {}; 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 ff :FZF - noremap fc :saveas + noremap fn :NnnPicker %:p:h + noremap fc :saveas %:p:h let g:which_key_map.y = { 'name': '+yank' } noremap yp :read !wl-paste @@ -79,7 +84,7 @@ neovim.override { noremap bn :bn noremap bp :bp - let g:which_key_map.b = { 'name': '+lang' } + let g:which_key_map.m = { 'name': '+lang' } noremap md :call LanguageClient_textDocument_codeAction() noremap mc :call LanguageClient#textDocument_references() noremap mf :call LanguageClient#textDocument_formatting() @@ -88,6 +93,11 @@ neovim.override { noremap mm :call LanguageClient#textDocument_hover() noremap mr :call LanguageClient#textDocument_rename() noremap ms :call LanguageClient#workspace_symbol() + noremap ma :fzf_lsp_action + noremap ml :fzf_lsp_layout + + let g:which_key_map.g = { 'name': '+git' } + noremap 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 diff --git a/roles/base.nix b/roles/base.nix index e374695..027eb8c 100644 --- a/roles/base.nix +++ b/roles/base.nix @@ -37,7 +37,7 @@ in { tmux unzip wget - z-lua + zoxide (import ../packages/neovim.nix) ]; @@ -76,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 From a1710f0f8f975c306b141a8cf8c2d875626683b4 Mon Sep 17 00:00:00 2001 From: foosinn Date: Mon, 3 Jan 2022 16:07:46 +0100 Subject: [PATCH 4/4] update hosts --- roles/work.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/roles/work.nix b/roles/work.nix index 5d7d56f..19830a0 100644 --- a/roles/work.nix +++ b/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; [