diff --git a/hosts/Parzival/default.nix b/hosts/Parzival/default.nix index bc5ce44..a6aefa7 100644 --- a/hosts/Parzival/default.nix +++ b/hosts/Parzival/default.nix @@ -15,7 +15,6 @@ user.crow.enable = true; desktop.sway.enable = true; - desktop.i3.enable = true; module.gui.enable = true; module.programming.enable = true; diff --git a/modules/desktops/default.nix b/modules/desktops/default.nix index 3bab843..2375ef3 100644 --- a/modules/desktops/default.nix +++ b/modules/desktops/default.nix @@ -5,10 +5,7 @@ }: { imports = [ # Wayland desktops here - ./wayland/sway.nix - ./wayland/kde.nix - - # X11 desktops here - ./x11/i3.nix + ./sway.nix + ./kde.nix ]; } diff --git a/modules/desktops/wayland/kde.nix b/modules/desktops/kde.nix similarity index 100% rename from modules/desktops/wayland/kde.nix rename to modules/desktops/kde.nix diff --git a/modules/desktops/wayland/sway.nix b/modules/desktops/sway.nix similarity index 100% rename from modules/desktops/wayland/sway.nix rename to modules/desktops/sway.nix diff --git a/modules/desktops/x11/i3.nix b/modules/desktops/x11/i3.nix deleted file mode 100644 index 652cbbe..0000000 --- a/modules/desktops/x11/i3.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - inputs, - pkgs, - lib, - config, - ... -}: { - config = lib.mkIf config.desktop.i3.enable { - services.xserver = { - displayManager.startx.enable = true; - windowManager.i3 = { - enable = true; - extraPackages = with pkgs; [ - xorg.xrandr - xterm - rofi - ]; - }; - }; - }; -} diff --git a/modules/options.nix b/modules/options.nix index 457465a..4fd5daa 100644 --- a/modules/options.nix +++ b/modules/options.nix @@ -48,7 +48,6 @@ sway.enable = lib.mkEnableOption "enables sway"; swayfx.enable = lib.mkEnableOption "enable sway with eye candy"; niri.enable = lib.mkEnableOption "enable niri window manager"; - i3.enable = lib.mkEnableOption "enables i3"; kde.enable = lib.mkEnableOption "KDE with Plasma6"; }; @@ -104,7 +103,6 @@ sway.enable = lib.mkDefault false; swayfx.enable = lib.mkDefault false; niri.enable = lib.mkDefault false; - i3.enable = lib.mkDefault false; kde.enable = lib.mkDefault false; }; diff --git a/modules/users/crow/configs/i3/i3.conf b/modules/users/crow/configs/i3/i3.conf deleted file mode 100644 index 94862cf..0000000 --- a/modules/users/crow/configs/i3/i3.conf +++ /dev/null @@ -1,135 +0,0 @@ -################ -### MONITORS ### -################ - -#include /home/crow/.config/i3/monitors.conf - - -################### -### MY PROGRAMS ### -################### - -set $term xterm -set $menu rofi - -exec /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 - -################### -### IDLE CONFIG ### -################### - - -################### -### KEYBINDINGS ### -################### - -set $mod Mod4 - -bindsym $mod+Return exec $term -bindsym $mod+Shift+q kill -#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+n exec networkmanager_dmenu -#bindsym $mod+n exec swaync-client -t -sw -bindsym $mod+d exec $menu -#bindsym $mod+Shift+d exec UDISKIE_DMENU_LAUNCHER="wofi" udiskie-dmenu -matching regex -dmenu -i -no-custom -multi-select -# Reload the configuration file -bindsym $mod+Shift+c reload - -bindsym $mod+Left focus left -bindsym $mod+Down focus down -bindsym $mod+Up focus up -bindsym $mod+Right focus right - -bindsym $mod+Shift+Left move left -bindsym $mod+Shift+Down move down -bindsym $mod+Shift+Up move up -bindsym $mod+Shift+Right move right - -################## -### WORKSPACES ### -################## - -bindsym $mod+1 workspace number 1 -bindsym $mod+2 workspace number 2 -bindsym $mod+3 workspace number 3 -bindsym $mod+4 workspace number 4 -bindsym $mod+5 workspace number 5 -bindsym $mod+6 workspace number 6 -bindsym $mod+7 workspace number 7 -bindsym $mod+8 workspace number 8 -bindsym $mod+9 workspace number 9 -bindsym $mod+0 workspace number 10 -# Move focused container to workspace -bindsym $mod+Shift+1 move container to workspace number 1 -bindsym $mod+Shift+2 move container to workspace number 2 -bindsym $mod+Shift+3 move container to workspace number 3 -bindsym $mod+Shift+4 move container to workspace number 4 -bindsym $mod+Shift+5 move container to workspace number 5 -bindsym $mod+Shift+6 move container to workspace number 6 -bindsym $mod+Shift+7 move container to workspace number 7 -bindsym $mod+Shift+8 move container to workspace number 8 -bindsym $mod+Shift+9 move container to workspace number 9 -bindsym $mod+Shift+0 move container to workspace number 10 -# -# Layout stuff: -# - # You can "split" the current object of your focus with - # $mod+b or $mod+v, for horizontal and vertical splits - # respectively. - bindsym $mod+b splith - bindsym $mod+v splitv - - # Switch the current container between different layout styles - bindsym $mod+s layout stacking - bindsym $mod+w layout tabbed - bindsym $mod+e layout toggle split - - # Make the current focus fullscreen - bindsym $mod+f fullscreen - - # Toggle the current focus between tiling and floating mode - bindsym $mod+Shift+space floating toggle - - # Swap focus between the tiling area and the floating area - bindsym $mod+space focus mode_toggle - - # Move focus to the parent container - bindsym $mod+a focus parent -# -# Scratchpad: -# - # Sway has a "scratchpad", which is a bag of holding for windows. - # You can send windows there and get them back later. - - # Move the currently focused window to the scratchpad - bindsym $mod+Shift+minus move scratchpad - - # Show the next scratchpad window or hide the focused scratchpad window. - # If there are multiple scratchpad windows, this command cycles through them. - bindsym $mod+minus scratchpad show -# -# Resizing containers: -# -mode "resize" { - bindsym Left resize shrink width 10px - bindsym Down resize grow height 10px - bindsym Up resize shrink height 10px - bindsym Right resize grow width 10px - - # Return to default mode - bindsym Return mode "default" - bindsym Escape mode "default" -} -bindsym $mod+r mode "resize" - -# Media controls: -bindsym XF86AudioRaiseVolume exec pulseaudio-ctl up -bindsym XF86AudioLowerVolume exec pulseaudio-ctl down -bindsym XF86AudioMute exec pulseaudio-ctl mute -bindsym XF86AudioMicMute exec pulseaudio-ctl mute-input -bindsym XF86AudioPlay exec playerctl play-pause -bindsym XF86AudioNext exec playerctl next -bindsym XF86AudioPrev exec playerctl previous -bindsym XF86MonBrightnessUp exec brightnessctl s +5% -bindsym XF86MonBrightnessDown exec brightnessctl s 5%- -bindsym Print exec grimshot --cursor copy area diff --git a/modules/users/crow/home.nix b/modules/users/crow/home.nix index 57cd2a8..8c8eee3 100644 --- a/modules/users/crow/home.nix +++ b/modules/users/crow/home.nix @@ -47,9 +47,6 @@ in { file.".config/sway/background-2".source = ./configs/wallpapers/cyber_skyscrapers.jpg; file.".config/sway/background-3".source = ./configs/wallpapers/kali_lol.jpg; file.".config/hypr/lockscreen-1".source = ./configs/wallpapers/wrecked_ship.jpg; - - # i3 - file.".config/i3/config".source = ./configs/i3/i3.conf; }; xdg = {