From 4c5728fa1f40c3c47ca121515b12c6c72dc5f861 Mon Sep 17 00:00:00 2001 From: TheWanderingCrow Date: Sat, 21 Sep 2024 17:02:58 -0400 Subject: [PATCH] x11 --- modules/hypr/default.nix | 11 -- modules/i3/default.nix | 31 ++++++ modules/i3/i3.conf | 190 +++++++++++++++++++++++++++++++++++ modules/users/crow/hypr.conf | 122 ---------------------- 4 files changed, 221 insertions(+), 133 deletions(-) create mode 100644 modules/i3/default.nix create mode 100644 modules/i3/i3.conf delete mode 100644 modules/users/crow/hypr.conf diff --git a/modules/hypr/default.nix b/modules/hypr/default.nix index bb2605e..8f0f356 100644 --- a/modules/hypr/default.nix +++ b/modules/hypr/default.nix @@ -1,6 +1,5 @@ { inputs, pkgs, lib, config, ...}: { options.hyprland.enable = lib.mkEnableOption "enables hyprland"; - options.hypr.enable = lib.mkEnableOption "enables hypr"; config = { programs.hyprland = lib.mkIf config.hyprland.enable { @@ -8,16 +7,6 @@ package = inputs.hyprland.packages.${pkgs.system}.hyprland; portalPackage = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland; }; - - services.xserver = lib.mkIf config.hypr.enable { - enable = true; - windowManager.hypr = { - enable = true; - }; - displayManager = { - startx.enable = true; - }; - }; }; diff --git a/modules/i3/default.nix b/modules/i3/default.nix new file mode 100644 index 0000000..9ed6c18 --- /dev/null +++ b/modules/i3/default.nix @@ -0,0 +1,31 @@ +{ + pkgs, + lib, + config, + ... +}: { + + options.i3.enable = lib.mkEnableOption "enables i3wm"; + + config = lib.mkIf config.i3.enable { + + services = { + libinput = { + enable = true; + touchpad.naturalScrolling = true; + }; + + xserver = { + enable = true; + autoRepeatDelay = 225; + autoRepeatInterval = 20; + + windowManager.i3 = { + enable = true; + configFile = ./i3.config; + }; + displayManager.lightdm.enable = false; + }; + }; + }; +} diff --git a/modules/i3/i3.conf b/modules/i3/i3.conf new file mode 100644 index 0000000..bb2750b --- /dev/null +++ b/modules/i3/i3.conf @@ -0,0 +1,190 @@ +# This file has been auto-generated by i3-config-wizard(1). +# It will not be overwritten, so edit it as you like. +# +# Should you change your keyboard layout some time, delete +# this file and re-run i3-config-wizard(1). +# + +# i3 config file (v4) +# +# Please see https://i3wm.org/docs/userguide.html for a complete reference! + +set $mod Mod4 + +# Font for window titles. Will also be used by the bar unless a different font +# is used in the bar {} block below. +font pango:monospace 8 + +# This font is widely installed, provides lots of unicode glyphs, right-to-left +# text rendering and scalability on retina/hidpi displays (thanks to pango). +#font pango:DejaVu Sans Mono 8 + +# Start XDG autostart .desktop files using dex. See also +# https://wiki.archlinux.org/index.php/XDG_Autostart +exec --no-startup-id dex --autostart --environment i3 + +# The combination of xss-lock, nm-applet and pactl is a popular choice, so +# they are included here as an example. Modify as you see fit. + +# xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the +# screen before suspend. Use loginctl lock-session to lock your screen. +exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork + +# NetworkManager is the most popular way to manage wireless networks on Linux, +# and nm-applet is a desktop environment-independent system tray GUI for it. +exec --no-startup-id nm-applet + +# Use pactl to adjust volume in PulseAudio. +set $refresh_i3status killall -SIGUSR1 i3status +bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status +bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10% && $refresh_i3status +bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status +bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status + +# Use Mouse+$mod to drag floating windows to their wanted position +floating_modifier $mod + +# move tiling windows via drag & drop by left-clicking into the title bar, +# or left-clicking anywhere into the window while holding the floating modifier. +tiling_drag modifier titlebar + +# start a terminal +bindsym $mod+Return exec i3-sensible-terminal + +# kill focused window +bindsym $mod+Shift+q kill + +# start dmenu (a program launcher) +bindsym $mod+d exec --no-startup-id dmenu_run +# A more modern dmenu replacement is rofi: +# bindcode $mod+40 exec "rofi -modi drun,run -show drun" +# There also is i3-dmenu-desktop which only displays applications shipping a +# .desktop file. It is a wrapper around dmenu, so you need that installed. +# bindcode $mod+40 exec --no-startup-id i3-dmenu-desktop + +# change focus +bindsym $mod+j focus left +bindsym $mod+k focus down +bindsym $mod+l focus up +bindsym $mod+semicolon focus right + +# alternatively, you can use the cursor keys: +bindsym $mod+Left focus left +bindsym $mod+Down focus down +bindsym $mod+Up focus up +bindsym $mod+Right focus right + +# move focused window +bindsym $mod+Shift+j move left +bindsym $mod+Shift+k move down +bindsym $mod+Shift+l move up +bindsym $mod+Shift+semicolon move right + +# alternatively, you can use the cursor keys: +bindsym $mod+Shift+Left move left +bindsym $mod+Shift+Down move down +bindsym $mod+Shift+Up move up +bindsym $mod+Shift+Right move right + +# split in horizontal orientation +bindsym $mod+h split h + +# split in vertical orientation +bindsym $mod+v split v + +# enter fullscreen mode for the focused container +bindsym $mod+f fullscreen toggle + +# change container layout (stacked, tabbed, toggle split) +bindsym $mod+s layout stacking +bindsym $mod+w layout tabbed +bindsym $mod+e layout toggle split + +# toggle tiling / floating +bindsym $mod+Shift+space floating toggle + +# change focus between tiling / floating windows +bindsym $mod+space focus mode_toggle + +# focus the parent container +bindsym $mod+a focus parent + +# focus the child container +#bindsym $mod+d focus child + +# Define names for default workspaces for which we configure key bindings later on. +# We use variables to avoid repeating the names in multiple places. +set $ws1 "1" +set $ws2 "2" +set $ws3 "3" +set $ws4 "4" +set $ws5 "5" +set $ws6 "6" +set $ws7 "7" +set $ws8 "8" +set $ws9 "9" +set $ws10 "10" + +# switch to workspace +bindsym $mod+1 workspace number $ws1 +bindsym $mod+2 workspace number $ws2 +bindsym $mod+3 workspace number $ws3 +bindsym $mod+4 workspace number $ws4 +bindsym $mod+5 workspace number $ws5 +bindsym $mod+6 workspace number $ws6 +bindsym $mod+7 workspace number $ws7 +bindsym $mod+8 workspace number $ws8 +bindsym $mod+9 workspace number $ws9 +bindsym $mod+0 workspace number $ws10 + +# move focused container to workspace +bindsym $mod+Shift+1 move container to workspace number $ws1 +bindsym $mod+Shift+2 move container to workspace number $ws2 +bindsym $mod+Shift+3 move container to workspace number $ws3 +bindsym $mod+Shift+4 move container to workspace number $ws4 +bindsym $mod+Shift+5 move container to workspace number $ws5 +bindsym $mod+Shift+6 move container to workspace number $ws6 +bindsym $mod+Shift+7 move container to workspace number $ws7 +bindsym $mod+Shift+8 move container to workspace number $ws8 +bindsym $mod+Shift+9 move container to workspace number $ws9 +bindsym $mod+Shift+0 move container to workspace number $ws10 + +# reload the configuration file +bindsym $mod+Shift+c reload +# restart i3 inplace (preserves your layout/session, can be used to upgrade i3) +bindsym $mod+Shift+r restart +# exit i3 (logs you out of your X session) +bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'" + +# resize window (you can also use the mouse for that) +mode "resize" { + # These bindings trigger as soon as you enter the resize mode + + # Pressing left will shrink the window’s width. + # Pressing right will grow the window’s width. + # Pressing up will shrink the window’s height. + # Pressing down will grow the window’s height. + bindsym j resize shrink width 10 px or 10 ppt + bindsym k resize grow height 10 px or 10 ppt + bindsym l resize shrink height 10 px or 10 ppt + bindsym semicolon resize grow width 10 px or 10 ppt + + # same bindings, but for the arrow keys + bindsym Left resize shrink width 10 px or 10 ppt + bindsym Down resize grow height 10 px or 10 ppt + bindsym Up resize shrink height 10 px or 10 ppt + bindsym Right resize grow width 10 px or 10 ppt + + # back to normal: Enter or Escape or $mod+r + bindsym Return mode "default" + bindsym Escape mode "default" + bindsym $mod+r mode "default" +} + +bindsym $mod+r mode "resize" + +# Start i3bar to display a workspace bar (plus the system information i3status +# finds out, if available) +bar { + status_command i3status +} diff --git a/modules/users/crow/hypr.conf b/modules/users/crow/hypr.conf deleted file mode 100644 index 3750984..0000000 --- a/modules/users/crow/hypr.conf +++ /dev/null @@ -1,122 +0,0 @@ -# Hypr example config file -# -# -# =) - -gaps_in=5 -border_size=1 -gaps_out=20 -rounding=0 -max_fps=60 # max fps for updates of config & animations -focus_when_hover=1 # 0 - do not switch the focus when hover (only for tiling) -main_mod=SUPER # For moving, resizing -intelligent_transients=1 # keeps transients always on top. -no_unmap_saving=1 # disables saving unmapped windows (seems to break sometimes) -scratchpad_mon=0 # self-explanatory - -# Execs -# exec-once=/home/me/MyEpicShellScript # will exec the script only when the WM launches -# exec=/home/me/MyEpicShellScript # will exec the script every time the config is reloaded - -# Layout -layout=0 # 0 - dwindle (default), 1 - master -layout { - no_gaps_when_only=0 # disables gaps and borders when only window on screen -} - -# Bar config -Bar { - height=20 - monitor=0 - enabled=1 - mod_pad_in=8 - no_tray_saving=1 # using this doesnt save the tray between reloads but fixes an issue with the bar disappearing. - - font.main=Noto Sans - font.secondary=Noto Sans - - col.bg=0xff111111 - col.high=0xffff3333 - - module=left,X,0xff8000ff,0xffffffff,1,workspaces - module=pad,left,10 - module=left,,0xff7000dd,0xff7000dd,1,tray - module=right,X,0xffffffff,0xff00ff33,1000,$date +%a,\ %b\ %Y\ \ %I:%M\ %p$ -} - -# colors -col.active_border=0x77ff3333 -col.inactive_border=0x77222222 - -# status command -# deprecated -# status_command=date +%a,\ %b\ %Y\ \ %I:%M\ %p -# - -# animations -Animations { - enabled=1 # For windows - window_resize_speed=5 # This is for windows resizing - workspaces=1 # For workspace animations (fixed, enabling by default) - speed=5 # This is for workspaces - cheap=1 # highly recommended - borders=0 -} - -# example window rules, more in the wiki - -# windowrule=float,class:krunner -# windowrule=float,role:pop-up -# windowrule=float,role:task_dialog -# windowrule=monitor 0,class:krunner -# windowrule=size 500 50,class:krunner -# windowrule=move 700 500,class:krunner -# windowrule=pseudo,class:discord - -# keybinds -bind=SUPER,R,exec,dmenu_run -bind=SUPER,Q,exec,kitty -bind=SUPER,RETURN,exec,xterm -bind=SUPER,G,exec,google-chrome-stable - -bind=SUPER,C,killactive, - -bind=SUPER,LEFT,movewindow,l -bind=SUPER,RIGHT,movewindow,r -bind=SUPER,UP,movewindow,u -bind=SUPER,DOWN,movewindow,d - -bind=SUPER,LEFT,movefocus,l -bind=SUPER,RIGHT,movefocus,r -bind=SUPER,UP,movefocus,u -bind=SUPER,DOWN,movefocus,d - -bind=SUPER,F,fullscreen, - -bind=SUPER,1,workspace,1 -bind=SUPER,2,workspace,2 -bind=SUPER,3,workspace,3 -bind=SUPER,4,workspace,4 -bind=SUPER,5,workspace,5 -bind=SUPER,6,workspace,6 -bind=SUPER,7,workspace,7 -bind=SUPER,8,workspace,8 -bind=SUPER,9,workspace,9 - -bind=SUPERSHIFT,1,movetoworkspace,1 -bind=SUPERSHIFT,2,movetoworkspace,2 -bind=SUPERSHIFT,3,movetoworkspace,3 -bind=SUPERSHIFT,4,movetoworkspace,4 -bind=SUPERSHIFT,5,movetoworkspace,5 -bind=SUPERSHIFT,6,movetoworkspace,6 -bind=SUPERSHIFT,7,movetoworkspace,7 -bind=SUPERSHIFT,8,movetoworkspace,8 -bind=SUPERSHIFT,9,movetoworkspace,9 - -bind=SUPERSHIFT,S,movetoworkspace,scratchpad -bind=SUPER,S,scratchpad, - -bind=SUPER,SPACE,togglefloating, - -bind=SUPER,equal,splitratio,+ -bind=SUPER,minus,splitratio,-