diff --git a/core/display.nix b/core/display.nix index a7f98aa..f8f6428 100755 --- a/core/display.nix +++ b/core/display.nix @@ -94,6 +94,10 @@ #package = [ ]; #defaultFontPath = "/run/current-system/sw/share/X11/fonts"; }; + niri = { + enable = true; + package = with pkgs; niri-unstable; + }; sway = { # enable sway window manager enable = true; package = pkgs.swayfx; @@ -137,14 +141,6 @@ programs = { - niri = { - enable = true; - package = with pkgs; niri-unstable; - #settings = { - #binds = { "Mod+Enter".action = { spawn = [ "kitty" ]; }; }; - #}; - }; - gnome-disks.enable = true; # For when bimbo needs to manage disks seahorse.enable = true; # GTK secrets management droidcam.enable = true; # Use android device as a webcam diff --git a/core/regreet.nix b/core/regreet.nix index 79edec2..c8ad329 100755 --- a/core/regreet.nix +++ b/core/regreet.nix @@ -26,8 +26,8 @@ in { environment = { # adds sway and fish environments to launch from regreet etc."greetd/environments".text = '' - sway niri + sway fish ''; }; diff --git a/home/desktop/default.nix b/home/desktop/default.nix index c5734b2..52dee8f 100755 --- a/home/desktop/default.nix +++ b/home/desktop/default.nix @@ -18,7 +18,7 @@ in { ./waybar.nix # statusbar ./dunst.nix # notifier ./wofi.nix # app menu - ./sway.nix # desktop + #./sway.nix # desktop #./niri.nix # desktop 2? ]; diff --git a/home/desktop/keybinds.nix b/home/desktop/keybinds.nix deleted file mode 100755 index 5d7f7c4..0000000 --- a/home/desktop/keybinds.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ pkgs, config, ... }: - -with pkgs; - -let - - modifier = "Mod4"; - left = "h"; - down = "j"; - up = "k"; - right = "l"; - -in { - - ## Application binds - "${modifier}+Tab" = "exec ${wofi}/bin/wofi"; - "${modifier}+q" = "kill"; - "${modifier}+Return" = "exec ${kitty}/bin/kitty"; - "${modifier}+Shift+Return" = "exec ${kitty}/bin/kitty --floating"; - "${modifier}+Shift+r" = "reload"; - "${modifier}+Alt+Shift+r" = "restart"; - "${modifier}+Escape" = "exec ${hyprlock}/bin/hyprlock"; - - ## Screenshot binds - "Print" = "exec screenshot window"; - "Print+Shift" = "exec screenshot monitor"; - "Print+${modifier}" = "exec screenshot region"; - - ## Brightness, volume, and media controls - XF86MonBrightnessUp = "exec ${xorg.xbacklight} -inc 20"; - XF86MonBrightnessDown = "exec ${xorg.xbacklight} -dec 20"; - XF86AudioRaiseVolume = - "exec ${pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ +5%"; - XF86AudioLowerVolume = - "exec ${pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ -5%"; - XF86AudioMute = - "exec ${pulseaudio}/bin/pactl set-sink-mute @DEFAULT_SINK@ toggle"; - XF86AudioPlay = "exec ${playerctl}/bin/playerctl play"; - XF86AudioPause = "exec ${playerctl}/bin/playerctl pause"; - XF86AudioNext = "exec ${playerctl}/bin/playerctl next"; - XF86AudioPrev = "exec ${playerctl}/bin/playerctl prev"; - - ## Window controls - "${modifier}+Shift+Alt+Q" = "focus mode_toggle"; - "${modifier}+c" = "split h"; - "${modifier}+v" = "split v"; - "${modifier}+T" = "floating toggle"; - "${modifier}+f" = "fullscreen toggle"; - "${modifier}+s" = "layout stacking"; - #"${modifier}+t" = "layout tabbed"; - #"${modifier}+e" = "layout toggle split"; - "${modifier}+Shift+${left}" = "move left"; - "${modifier}+Shift+${down}" = "move down"; - "${modifier}+Shift+${up}" = "move up"; - "${modifier}+Shift+${right}" = "move right"; - "${modifier}+${left}" = "focus left; exec $movemouse"; - "${modifier}+${down}" = "focus down; exec $movemouse"; - "${modifier}+${up}" = "focus up; exec $movemouse"; - "${modifier}+${right}" = "focus right; exec $movemouse"; - - ## Workspace controls - "${modifier}+1" = "workspace number 1"; - "${modifier}+2" = "workspace number 2"; - "${modifier}+3" = "workspace number 3"; - "${modifier}+4" = "workspace number 4"; - "${modifier}+5" = "workspace number 5"; - "${modifier}+6" = "workspace number 6"; - "${modifier}+7" = "workspace number 7"; - "${modifier}+8" = "workspace number 8"; - "${modifier}+9" = "workspace number 9"; - "${modifier}+0" = "workspace number 0"; - "${modifier}+Shift+1" = "move container to workspace number 1"; - "${modifier}+Shift+2" = "move container to workspace number 2"; - "${modifier}+Shift+3" = "move container to workspace number 3"; - "${modifier}+Shift+4" = "move container to workspace number 4"; - "${modifier}+Shift+5" = "move container to workspace number 5"; - "${modifier}+Shift+6" = "move container to workspace number 6"; - "${modifier}+Shift+7" = "move container to workspace number 7"; - "${modifier}+Shift+8" = "move container to workspace number 8"; - "${modifier}+Shift+9" = "move container to workspace number 9"; - "${modifier}+Shift+0" = "move container to workspace number 0"; - "${modifier}+Alt+${up}" = "move workspace to output up"; - "${modifier}+Alt+${down}" = "move workspace to output down"; - "${modifier}+Alt+${left}" = "move workspace to output left"; - "${modifier}+Alt+${right}" = "move workspace to output right"; - -}