i3/framework.conf

@@ -1,42 +0,0 @@
-# Display
-output eDP-1 scale 1.0
-
-# Desktop background
-output "*" bg ~/Pictures/wallpaper/0000.jpg fill
-
-# Screen brightness controls
-bindsym XF86MonBrightnessUp exec light -A 5 # increase screen brightness
-bindsym XF86MonBrightnessDown exec light -U 5 # decrease screen brightness 
-
-# Pulse Audio controls
-bindsym XF86AudioRaiseVolume exec amixer set Master 3%+ #increase sound volume
-bindsym XF86AudioLowerVolume exec amixer set Master 3%- #decrease sound volume
-bindsym XF86AudioMute exec amixer set Master toggle # toggle sound
-
-# media controls
-bindsym XF86AudioPrev exec playerctl previous
-bindsym XF86AudioPlay exec playerctl play-pause
-bindsym XF86AudioNext exec playerctl next
-
-# Touchpad Settings
-input "2362:628:PIXA3854:00_093A:0274_Touchpad" {
-    accel_profile flat
-    click_method clickfinger
-    dwt disabled
-    natural_scroll enabled
-    scroll_method two_finger
-    tap enabled
-}
-
-# Start up programs
-for_window [class="Firefox"] move to workspace $ws1
-for_window [class="emacs" title="emacs@*"] move to workspace $ws2
-for_window [class="jetbrains-studio"] move to workspace $ws3
-
-
-# Notifications
-exec mako
-
-# Startup Programs
-exec --no-startup-id "firefox"
-

scripts/i3wm-config-gen.sh

@@ -5,8 +5,4 @@
 
 cat ~/.config/i3/shared.conf ~/.config/i3/${computer}.conf > ~/.config/i3/config
 
-if command -v i3-msg &> /dev/null; then
+i3-msg reload
-    i3-msg reload
-elif command -v swaymsg &> /dev/null; then
-    swaymsg reload
-fi

scripts/setup.sh

@@ -1,9 +1,7 @@
 #! /bin/bash
 
 # Load user settings from config file.
-if [ -e ~/.config/settings.conf ]; then 
+. ~/.config/settings.conf
-    . ~/.config/settings.conf
-fi
 
 dotdir=~/dotfiles
 
@@ -21,8 +19,7 @@ files=($dotdir/.zprofile                  ~/                     'n'
        $dotdir/rofi                       ~/.config/             'n'
        $dotdir/scripts                    ~/.config/             'n'
        $dotdir/systemd                    ~/.config/             'n'
-       $dotdir/waybar                     ~/.config/             'n'
+       $dotdir/waybar                     ~/.config/             'n')
-       $dotdir/settings.conf              ~/.config/             'n')
 
 # arg parser
 for arg in "$@"

waybar/config

@@ -1,6 +1,6 @@
 {
     "layer": "top",
-    "output": ["DVI-D-0", "LVDS-1", "eDP-1"],
+    "output": ["DVI-D-0", "LVDS-1"],
     "position": "top",
     "height": 35, // Waybar height (to be removed for auto height)
     "modules-left": ["sway/workspaces", "sway/mode", "custom/media"],