diff --git a/home-manager/nathan/dotfiles/hypr/main.conf b/home-manager/nathan/dotfiles/hypr/main.conf index 17ec729..f4ec19a 100644 --- a/home-manager/nathan/dotfiles/hypr/main.conf +++ b/home-manager/nathan/dotfiles/hypr/main.conf @@ -107,7 +107,7 @@ misc { # Binds $mainMod = ALT -bind = $mainMod, E, exec, colorPrefix kitty +bind = $mainMod SHIFT, E, exec, colorPrefix kitty bind = $mainMod, B, exec, firefox @@ -119,7 +119,7 @@ bind = $mainMod, R, exec, colorPrefix kitty -e _systemRebuild bind = $mainMod SHIFT, R, exec, colorPrefix kitty -e _homeRebuild -bind = $mainMod, C, exec, colorPrefix kitty -e bash -c "cd ~/Projects/System; nvim ~/Projects/System/flake.nix" +bind = $mainMod, C, exec, colorPrefix kitty -e bash -c "cd ~/Projects/Olympus; nvim ~/Projects/Olympus/" bind = $mainMod, F, exec, thunar bind = $mainMod SHIFT, F, fullscreen @@ -153,7 +153,6 @@ bind = $mainMod, XF86AudioPlay, exec, mpc load casual bind = , XF86AudioPlay, exec, playerctl play-pause bind = , XF86AudioPause, exec, playerctl pause -bind = $mainMod, F9, exec, playerctl pause bind = , XF86AudioNext, exec, playerctl next @@ -225,7 +224,7 @@ bind = , XF86MonBrightnessDown, exec, brightnessctl set 10%- binde = , XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_SINK@ 10%+ binde = , XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_SINK@ 10%- bind = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_SINK@ toggle - +bind = $mainMod, F9, exec, pavucontrol #screen lock key bind = $mainMod, F12, exec, swaylock @@ -235,10 +234,10 @@ bind = CTRL ALT, Delete, exec, loginctl kill-session self # Move/resize windows with mainMod + LMB/RMB and dragging -bind = $mainMod SHIFT, W, movewindow, u -bind = $mainMod SHIFT, S, movewindow, d -bind = $mainMod SHIFT, A, movewindow, l -bind = $mainMod SHIFT, D, movewindow, r +bind = $mainMod SHIFT, J, movewindow, u +bind = $mainMod SHIFT, K, movewindow, d +bind = $mainMod SHIFT, H, movewindow, l +bind = $mainMod SHIFT, L, movewindow, r bindm = $mainMod, mouse:272, movewindow bindm = $mainMod SHIFT, mouse:272, resizewindow @@ -260,14 +259,12 @@ windowrulev2 = float, $nvim windowrulev2 = $scratchpadsize, $nvim windowrulev2 = workspace special silent, $nvim -bind = $mainMod SHIFT, N, exec, colorPrefix pypr toggle nvim -bind = $mainMod SHIFT, E, exec, colorPrefix pypr toggle free +bind = $mainMod, N, exec, colorPrefix pypr toggle nvim +bind = $mainMod, E, exec, colorPrefix pypr toggle free -bind = CTRL SHIFT, Home, exec, ssh -i ~/.ssh/key nathan@69.150.99.129 -fL 5900:localhost:5900 sleep 10; vncviewer localhost:5900 -fullscreen -bind = CTRL SHIFT, End, exec, ssh -i ~/.ssh/key nathan@173.242.244.184 -fL 5900:localhost:5900 sleep 10; vncviewer localhost:5900 -fullscreen +bind = CTRL SHIFT, Home, exec, ssh nathan@blunkall.us -fL 5900:localhost:5900 sleep 10; vncviewer localhost:5900 -fullscreen bind = CTRL SHIFT, Home, submap, clean -bind = CTRL SHIFT, End, submap, clean bind = $mainMod CTRL, Home, submap, clean diff --git a/home-manager/nathan/dotfiles/wayvnc/config b/home-manager/nathan/dotfiles/wayvnc/config deleted file mode 100644 index c240f24..0000000 --- a/home-manager/nathan/dotfiles/wayvnc/config +++ /dev/null @@ -1,6 +0,0 @@ -use_relative_paths=true -address=0.0.0.0 -enable_auth=false -username=nathan -password=//falconAdjacent42 -rsa_private_key_file=rsa_key.pem diff --git a/home-manager/nathan/dotfiles/wayvnc/rsa_key.pem b/home-manager/nathan/dotfiles/wayvnc/rsa_key.pem deleted file mode 100644 index fdcdea6..0000000 --- a/home-manager/nathan/dotfiles/wayvnc/rsa_key.pem +++ /dev/null @@ -1,39 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -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 ------END RSA PRIVATE KEY----- diff --git a/home-manager/nathan/dotfiles/wayvnc/rsa_key.pem.pub b/home-manager/nathan/dotfiles/wayvnc/rsa_key.pem.pub deleted file mode 100644 index 852b274..0000000 --- a/home-manager/nathan/dotfiles/wayvnc/rsa_key.pem.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCyRlNZ+ePi5QOw+rnV4BeTFd64d7FPYfhDewUuCc/4HXO/2Z5iBB4Mry1I3Tz0q6TPqNgD9Z3xTrqKrRMocayCP8Ci0vTQpqf4nvmG6+c75psaOQii+Xv7P4T3CeqWbFsULyvnEPmdpBvAv5MqMabqNwjok+nf4YjYwycLphhQ7xmuezorqZv9ME2Ny0efcMZEv1AXSf8siU6FW/5WQGIyO9qdrbOjth0Q+YQ0bwc8hHq1FAj+AjxQTGWAvh3o7tHElMCiAgSetnGwcAA6ebMNVcinedK6Dimx6IdsBz05U2ifmI1nehEr9JBZ2RVL/gdn9f4xkuHbrv7as5kQDzyJzDc4h523TiXfeXxkBSUnj84qk96yi1RG92Rhg8IftRyD1MEtEnF6Ri4nEZXmKHiKZYVGQbOgYoETkPuJimmMNbBVSZyTdI8xpcgDGM13FKBiHzhiy+6G3acGgjez4PjKgGp9fvp87Po6xAcg67Fjc8oznsSDDi74jvN/PbuWC3U= root@homebox diff --git a/home-manager/nathan/packages/scripts/default.nix b/home-manager/nathan/packages/scripts/default.nix index 62d4776..7252103 100644 --- a/home-manager/nathan/packages/scripts/default.nix +++ b/home-manager/nathan/packages/scripts/default.nix @@ -79,7 +79,6 @@ lxqt-policykit-agent & # nmcli device wifi connect EagleNet password '~?C#@ZiH' & hyprctl setcursor Bibata-Modern-Classic 16 & - wayvnc & sleep 3 hyprctl reload & novnc & diff --git a/home-manager/nathan/programs/firefox/default.nix b/home-manager/nathan/programs/firefox/default.nix index aebcf9c..153571e 100644 --- a/home-manager/nathan/programs/firefox/default.nix +++ b/home-manager/nathan/programs/firefox/default.nix @@ -7,6 +7,8 @@ config = lib.mkIf config.homeconfig.firefox.enable { + home.sessionVariables.BROWSER = "${config.programs.firefox.package}/bin/firefox"; + programs.firefox = { enable = true; diff --git a/home-manager/nathan/programs/wayvnc/default.nix b/home-manager/nathan/programs/wayvnc/default.nix index e99be07..a1c187c 100644 --- a/home-manager/nathan/programs/wayvnc/default.nix +++ b/home-manager/nathan/programs/wayvnc/default.nix @@ -7,8 +7,19 @@ config = lib.mkIf config.homeconfig.wayvnc.enable { home.packages = with pkgs; [ - wayvnc novnc ]; + + services.wayvnc = { + enable = true; + + autoStart = true; + + settings = { + address = "0.0.0.0"; + + port = 5900; + }; + }; }; }