diff --git a/hm_modules/helix.nix b/hm_modules/helix.nix index 1c6b50f..7520331 100644 --- a/hm_modules/helix.nix +++ b/hm_modules/helix.nix @@ -5,9 +5,13 @@ EDITOR = "hx"; VISUAL = "hx"; }; - home.packages = [ + home.packages = with pkgs; [ + nodePackages.vscode-langservers-extracted + rnix-lsp + yaml-language-server + (pkgs.makeDesktopItem { - name = "helix"; + name = "Helix"; exec = "hx %F"; icon = "helix"; desktopName = "Helix"; diff --git a/hm_modules/kakoune.nix b/hm_modules/kakoune.nix index f0cc198..8e7ca02 100644 --- a/hm_modules/kakoune.nix +++ b/hm_modules/kakoune.nix @@ -31,10 +31,11 @@ let ''; packages = with pkgs; [ - yaml-language-server + editorconfig-core-c nodePackages.vscode-langservers-extracted rnix-lsp - editorconfig-core-c + yaml-language-server + aspell aspellDicts.en aspellDicts.en-computers @@ -42,7 +43,7 @@ let aspellDicts.it (pkgs.makeDesktopItem { - name = "kakoune"; + name = "Kakoune"; exec = "kak %F"; icon = "kakoune"; desktopName = "Kakoune"; diff --git a/hm_modules/sxhkd.nix b/hm_modules/sxhkd.nix index 47b9e1c..34dddec 100644 --- a/hm_modules/sxhkd.nix +++ b/hm_modules/sxhkd.nix @@ -2,12 +2,12 @@ imports = [ ./nautilus.nix ]; home.packages = with pkgs; [ bc - unstable.bsp-layout gnome.gnome-screenshot lockscreen pamixer playerctl terminator + unstable.bsp-layout unstable.kitty update-background xorg.xbacklight @@ -18,61 +18,55 @@ secondaryTerminal = "terminator"; fileManager = "nautilus"; emojiChooser = "rofimoji --skin-tone light -a copy"; + yad = "${pkgs.yad}/bin/yad"; in { enable = true; keybindings = { "alt + Tab" = "rofi -show window"; "Print" = "gnome-screenshot"; - "super + alt + {h,j,k,l}" = - "bspc node -z {left -20 0,bottom 0 20,top 0 -20,right 20 0}"; + "super + alt + {h,j,k,l}" = "bspc node -z {left -20 0,bottom 0 20,top 0 -20,right 20 0}"; "super + alt + m" = "lockscreen"; "super + alt + p" = "autorandr -c"; - "super + alt + {q,r}" = "bspc {quit,wm -r}"; - "super + alt + {Right,Down,Left}" = - "playerctl {next,play-pause,previous}"; - "super + alt + shift + {h,j,k,l}" = - "bspc node -z {right -20 0,top 0 20,bottom 0 -20,left 20 0}"; + "super + alt + q" = '' + ${yad} --question --center --on-top --sticky --timeout=30 --timeout-indicator=bottom --image=gnome-shutdown --title "Shutdown" --text "Do you want to shutdown?" && bspc quit + ''; + "super + alt + r" = "bspc wm -r"; + "super + alt + {Right,Down,Left}" = "playerctl {next,play-pause,previous}"; + "super + alt + shift + {h,j,k,l}" = "bspc node -z {right -20 0,top 0 20,bottom 0 -20,left 20 0}"; "super + bracket{left,right}" = "bspc desktop -f {prev,next}.local"; "super + b" = "update-background"; "super + ctrl + {1-9}" = "bspc node -o 0.{1-9}"; "super + ctrl + {h,j,k,l}" = "bspc node -p {west,south,north,east}"; - "super + ctrl + {m,x,y,z}" = - "bspc node -g {marked,locked,sticky,private}"; - "super + ctrl + shift + space" = - "bspc query -N -d | xargs -I id -n 1 bspc node id -p cancel"; + "super + ctrl + {m,x,y,z}" = "bspc node -g {marked,locked,sticky,private}"; + "super + ctrl + shift + space" = "bspc query -N -d | xargs -I id -n 1 bspc node id -p cancel"; "super + ctrl + space" = "bspc node -p cancel"; "super + e" = fileManager; "super + Escape" = "pkill -USR1 -x sxhkd"; "super + g" = "bspc node -s biggest"; "super + {grave,Tab}" = "bspc {node,desktop} -f last"; - "super + {h,j,k,l}" = - "dir={west,south,north,east}; bspc node -f $dir || bspc monitor -f $dir"; + "super + {h,j,k,l}" = "dir={west,south,north,east}; bspc node -f $dir || bspc monitor -f $dir"; "super + {Left,Down,Up,Right}" = "bspc node -v {-20 0,0 20,0 -20,20 0}"; "super + m" = "bspc desktop -l next"; "super + n {_, + shift}" = "bsp-layout {next, previous}"; - "super + {o,i}" = - "bspc wm -h off;bspc node {older,newer} -f;bspc wm -h on"; - "super + {p,b,comma,period}" = - "bspc node -f @{parent,brother,first,second}"; - "super + {_,shift + }{1-9,0}" = - "bspc {desktop -f,node -d} 'focused:^{1-9,10}'"; + "super + {o,i}" = "bspc wm -h off;bspc node {older,newer} -f;bspc wm -h on"; + "super + {p,b,comma,period}" = "bspc node -f @{parent,brother,first,second}"; + "super + {_,shift + }{1-9,0}" = "bspc {desktop -f,node -d} 'focused:^{1-9,10}'"; "super + {_,shift + }c" = "bspc node -f {next,prev}.local"; "super + shift + e" = emojiChooser; "super + shift + {h,j,k,l}" = '' - dir={west,south,north,east}; bspc node -s "$dir.local" --follow || bspc node -m "$dir" --follow''; - "super + {_,shift + } Return" = - "{${primaryTerminal} , ${secondaryTerminal}}"; + dir={west,south,north,east}; bspc node -s "$dir.local" --follow || bspc node -m "$dir" --follow + ''; + "super + {_,shift + } Return" = "{${primaryTerminal} , ${secondaryTerminal}}"; "super + {_,shift + }@space " = "rofi -show {drun,run}"; "super + {_,shift + }w" = "bspc node -{c,k}"; - "super + {t,shift + t,s,f}" = - "bspc node -t {tiled,pseudo_tiled,floating,fullscreen}"; + "super + {t,shift + t,s,f}" = "bspc node -t {tiled,pseudo_tiled,floating,fullscreen}"; # "super + y" = "bspc node newest.marked.local -n newest.!automatic.local"; - "{XF86AudioLowerVolume,XF86AudioMute,XF86AudioRaiseVolume}" = - "pamixer {-d 2 -u,-t,-i 2 -u} && dunstify -r 1 Volume `pamixer --get-volume-human`"; + "{XF86AudioLowerVolume,XF86AudioMute,XF86AudioRaiseVolume}" = "pamixer {-d 2 -u,-t,-i 2 -u} && dunstify -r 1 Volume `pamixer --get-volume-human`"; "XF86Audio{Next,Play,Prev}" = "playerctl {next,play-pause,previous}"; "XF86MonBrightness{Up,Down}" = '' - xbacklight -{inc,dec} 10 && dunstify -r 2 Luminosità `printf "%.0f" $(xbacklight -get)`''; + xbacklight -{inc,dec} 10 && dunstify -r 2 Luminosità `printf "%.0f" $(xbacklight -get)` + ''; }; }; } diff --git a/thor/hm.nix b/thor/hm.nix index 44c9bd8..dbefa3b 100644 --- a/thor/hm.nix +++ b/thor/hm.nix @@ -112,6 +112,7 @@ ../hm_modules/nautilus.nix ../hm_modules/nix-index.nix ../hm_modules/noti.nix + ../hm_modules/nushell.nix ../hm_modules/obs-studio.nix ../hm_modules/office.nix ../hm_modules/onedrive.nix