diff --git a/system/.config/environment.d/10_xdg.conf b/system/.config/environment.d/10_xdg.conf index 58deec6..577a693 100644 --- a/system/.config/environment.d/10_xdg.conf +++ b/system/.config/environment.d/10_xdg.conf @@ -23,6 +23,8 @@ ZDOTDIR="${XDG_CONFIG_HOME}/zsh" NPM_CONFIG_USERCONFIG="${XDG_CONFIG_HOME}/npm/config" _JAVA_OPTIONS="-Djava.util.prefs.userRoot=${XDG_CONFIG_HOME}/java" PYTHONSTARTUP="${XDG_CONFIG_HOME}/python/startup.py" +XINITRC="${XDG_CONFIG_HOME}/X11/xinitrc" +XSERVERRC="${XDG_CONFIG_HOME}/X11/xserverrc" # XDG Cache CUDA_CACHE_PATH="${XDG_CACHE_HOME}/nv" diff --git a/system/.config/i3/config.base b/system/.config/i3/config.base deleted file mode 100644 index 66703e1..0000000 --- a/system/.config/i3/config.base +++ /dev/null @@ -1,196 +0,0 @@ -# SCRIPT NAME: -# .config/i3/config.base -# -# AUTHOR: -# Severin Kaderli -# -# DESCRIPTION: -# This file contains my i3 configuration. -# -# USAGE: -# This file is automatically merged together with the local i3 configuration -# on start. - -# Disable window titlebars and borders -for_window [class="^.*"] border pixel 0 - -# Make dropdown terminal always float -for_window [class="dropdown-terminal"] floating enable - -# Gaps -gaps top 45 -gaps bottom 45 -gaps inner 10 - -new_window none - -# Font for window titles. Will also be used by the bar unless a different font -# is used in the bar {} block below. -font pango:Noto Sans, Font Awesome 5 Free 15px - -# Use Mouse+$mod to drag floating windows to their wanted position -floating_modifier $mod - -############################################################################### -# Modifiers # -############################################################################### -set $mod Mod4 -set $alt Mod1 - - -############################################################################### -# Workspaces # -############################################################################### -# Define workspaces -set $workspace1 "1: " -set $workspace2 "2: " -set $workspace3 "3: " -set $workspace4 "4: " -set $workspace5 "5: " -set $workspace6 "6: " -set $workspace7 "7: " -set $workspace8 "8: " -set $workspace9 "9: " -set $workspace10 "10: " - -# Assign workspaces to outputs -workspace $workspace1 output $output1 -workspace $workspace2 output $output2 -workspace $workspace3 output $output2 -workspace $workspace4 output $output2 -workspace $workspace5 output $output1 -workspace $workspace6 output $output1 -workspace $workspace7 output $output2 -workspace $workspace8 output $output1 -workspace $workspace9 output $output2 -workspace $workspace10 output $output2 - -# Assign applications to workspaces -assign [class="Google-chrome-beta"] $workspace1 -assign [class="Chromium"] $workspace1 -assign [class="firefox"] $workspace1 -assign [class="code-oss"] $workspace3 -assign [class="jetbrains-phpstorm"] $workspace3 -assign [class="Nemo"] $workspace4 -assign [class="Thunar"] $workspace4 -assign [class="discord"] $workspace5 -assign [class="Element"] $workspace5 -assign [class="Riot"] $workspace5 -assign [class="Slack"] $workspace5 -assign [class="Rambox"] $workspace5 -assign [class="Hamsket"] $workspace5 -assign [class="Ferdi"] $workspace5 -assign [class="Steam"] $workspace6 -assign [class="Lutris"] $workspace6 -assign [class="minecraft-launcher"] $workspace6 -assign [class="Notable"] $workspace7 -assign [class="Joplin"] $workspace7 -assign [class="KeePassXC"] $workspace8 -assign [class="vlc"] $workspace9 -assign [class="mpv"] $workspace9 -assign [instance="cmus"] $workspace10 - - -############################################################################### -# Keybindings # -############################################################################### -# Kill focused window -bindsym $mod+Shift+q kill - -# Change focus -bindsym $mod+Left focus left -bindsym $mod+H focus left -bindsym $mod+Down focus down -bindsym $mod+J focus down -bindsym $mod+Up focus up -bindsym $mod+K focus up -bindsym $mod+Right focus right -bindsym $mod+L focus right - -# Move focused window -bindsym $mod+Shift+Left move left -bindsym $mod+Shift+H move left -bindsym $mod+Shift+Down move down -bindsym $mod+Shift+J move down -bindsym $mod+Shift+Up move up -bindsym $mod+Shift+K move up -bindsym $mod+Shift+Right move right -bindsym $mod+Shift+L move right - -# Moving workspaces to other displays -bindsym $mod+$alt+Left move workspace to output left -bindsym $mod+$alt+H move workspace to output left -bindsym $mod+$alt+Right move workspace to output right -bindsym $mod+$alt+L move workspace to output right - -# Toggle split orientation -bindsym $mod+T split toggle - -# Fullscreen toggle -bindsym $mod+F11 fullscreen toggle - -# Toggle between floating / tilling mode -bindsym $mod+S floating toggle - -# Workspace switching -bindsym $mod+1 workspace $workspace1 -bindsym $mod+KP_1 workspace $workspace1 -bindsym $mod+2 workspace $workspace2 -bindsym $mod+KP_2 workspace $workspace2 -bindsym $mod+3 workspace $workspace3 -bindsym $mod+KP_3 workspace $workspace3 -bindsym $mod+4 workspace $workspace4 -bindsym $mod+KP_4 workspace $workspace4 -bindsym $mod+5 workspace $workspace5 -bindsym $mod+KP_5 workspace $workspace5 -bindsym $mod+6 workspace $workspace6 -bindsym $mod+KP_6 workspace $workspace6 -bindsym $mod+7 workspace $workspace7 -bindsym $mod+KP_7 workspace $workspace7 -bindsym $mod+8 workspace $workspace8 -bindsym $mod+KP_8 workspace $workspace8 -bindsym $mod+9 workspace $workspace9 -bindsym $mod+KP_9 workspace $workspace9 -bindsym $mod+0 workspace $workspace10 -bindsym $mod+KP_0 workspace $workspace10 - -# Moving container to workspace -bindsym $mod+Shift+1 move container to workspace $workspace1 -bindsym $mod+Shift+KP_1 move container to workspace $workspace1 -bindsym $mod+Shift+2 move container to workspace $workspace2 -bindsym $mod+Shift+KP_2 move container to workspace $workspace2 -bindsym $mod+Shift+3 move container to workspace $workspace3 -bindsym $mod+Shift+KP_3 move container to workspace $workspace3 -bindsym $mod+Shift+4 move container to workspace $workspace4 -bindsym $mod+Shift+KP_4 move container to workspace $workspace4 -bindsym $mod+Shift+5 move container to workspace $workspace5 -bindsym $mod+Shift+KP_5 move container to workspace $workspace5 -bindsym $mod+Shift+6 move container to workspace $workspace6 -bindsym $mod+Shift+KP_6 move container to workspace $workspace6 -bindsym $mod+Shift+7 move container to workspace $workspace7 -bindsym $mod+Shift+KP_7 move container to workspace $workspace7 -bindsym $mod+Shift+8 move container to workspace $workspace8 -bindsym $mod+Shift+KP_8 move container to workspace $workspace8 -bindsym $mod+Shift+9 move container to workspace $workspace9 -bindsym $mod+Shift+KP_9 move container to workspace $workspace9 -bindsym $mod+Shift+0 move container to workspace $workspace10 -bindsym $mod+Shift+KP_0 move container to workspace $workspace10 - -# Restart i3 -bindsym $mod+Shift+r restart - -# resize window (you can also use the mouse for that) -mode "resize" { -# These bindings trigger as soon as you enter the resize mode - -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 -bindsym Return mode "default" -bindsym Escape mode "default" -} - -bindsym $mod+x mode "resize" diff --git a/system/.config/i3/config.intel b/system/.config/i3/config.intel deleted file mode 100644 index e57c647..0000000 --- a/system/.config/i3/config.intel +++ /dev/null @@ -1,5 +0,0 @@ -############################################################################### -# Outputs # -############################################################################### -set $output1 HDMI1 -set $output2 eDP1 diff --git a/system/.config/i3/config.nvidia b/system/.config/i3/config.nvidia deleted file mode 100644 index 6a9d7ad..0000000 --- a/system/.config/i3/config.nvidia +++ /dev/null @@ -1,5 +0,0 @@ -############################################################################### -# Outputs # -############################################################################### -set $output1 HDMI-1-1 -set $output2 eDP-1-1 diff --git a/system/.config/i3/config.odin b/system/.config/i3/config.odin deleted file mode 100644 index 98023f3..0000000 --- a/system/.config/i3/config.odin +++ /dev/null @@ -1,21 +0,0 @@ -############################################################################### -# Layouts # -############################################################################### -exec --no-startup-id "i3-msg 'workspace 2: ; exec kitty'" -exec --no-startup-id "i3-msg 'workspace 1: '" - -############################################################################### -# Startup applications # -############################################################################### -# Setup monitor -exec_always --no-startup-id monitor-setup -exec_always --no-startup-id picom -b --experimental-backends - -# Other applications -exec firefox - -exec discord -exec joplin-desktop -exec thunar -exec thunar -exec keepassxc diff --git a/system/.config/kanshi/config b/system/.config/kanshi/config index dcb7e6c..9fc72d0 100644 --- a/system/.config/kanshi/config +++ b/system/.config/kanshi/config @@ -7,11 +7,11 @@ profile home { exec xrandr --output XWAYLAND1 --primary } -profile mobile { - output eDP-1 mode 1920x1080@60.031Hz position 0,0 - - exec xrandr --output XWAYLAND0 --primary -} +#profile mobile { +# output eDP-1 mode 1920x1080@60.031Hz position 0,0 +# +# exec xrandr --output XWAYLAND0 --primary +#} profile gw2 { output eDP-1 mode 1920x1080@60.031Hz position 0,0 @@ -24,3 +24,12 @@ profile presentation { output eDP-1 enable mode 1920x1080@60.031Hz position 0,0 output HDMI-A-1 mode 1920x1200@59.950Hz position 1920,-120 } + +profile tyr-home { + output eDP-1 mode 2560x1600@165.004Hz position 1920,0 scale 1.25 + output DP-1 mode 1920x1080@74.998Hz position 0,0 scale 1 +} + +profile tyr-mobile { + output "BOE 0x0A9B Unknown" mode 2560x1600@165.004Hz position 0,0 scale 1.25 +} \ No newline at end of file diff --git a/system/.config/zsh/.zprofile b/system/.config/zsh/.zprofile index 9acfba1..afd608f 100644 --- a/system/.config/zsh/.zprofile +++ b/system/.config/zsh/.zprofile @@ -29,5 +29,14 @@ fi dconf load / < "${XDG_CONFIG_HOME}/dconf/root.conf" if [ "$(tty)" = "/dev/tty1" ]; then - sway > "${XDG_LOG_HOME}/sway.log" 2>&1 && exit + sway --unsupported-gpu >> "${XDG_LOG_HOME}/sway.log" 2>&1 && exit fi + +if [ "$(tty)" = "/dev/tty2" ]; then + startx "${XDG_CONFIG_HOME}/X11/xinitrc" -- -keeptty >> "${XDG_LOG_HOME}/xorg.log" 2>&1 && exit +fi + +if [ "$(tty)" = "/dev/tty3" ]; then + XDG_SESSION_TYPE=wayland gnome-session && exit +fi +