From 79395ac589bcaa8b1103be9b157eea2bcf085402 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Fri, 28 Oct 2022 16:46:59 +0100 Subject: [PATCH] Remove a bunch of old config to make way for KDE Some of it might need restoring, but will work that out once I know what KDE doesn't do itself. --- files/bin/rofi-powermenu | 34 ----- files/bin/rofi-screenlayout | 15 --- files/dunst.conf | 152 ---------------------- files/global-environment | 6 - files/gtk3-settings.ini | 21 --- files/gtkrc-2.0 | 17 --- files/i3.conf | 158 ----------------------- files/i3status.conf | 17 --- files/keyboard.conf | 5 - files/launch-polybar.sh | 10 -- files/lock-screen.sh | 8 -- files/picom.conf | 50 ------- files/polybar.ini | 165 ------------------------ files/screen-layouts/DabApps/desk.sh | 2 - files/screen-layouts/DabApps/macbook.sh | 2 - files/touchpad.conf | 10 -- files/xfce4-power-manager.xml | 31 ----- tasks/autostart.yml | 13 +- tasks/gnome.yml | 50 ------- tasks/i3.yml | 84 ------------ tasks/input.yml | 17 --- tasks/network.yml | 15 --- tasks/power-saving.yml | 27 ---- tasks/security.yml | 2 - 24 files changed, 1 insertion(+), 910 deletions(-) delete mode 100755 files/bin/rofi-powermenu delete mode 100755 files/bin/rofi-screenlayout delete mode 100644 files/dunst.conf delete mode 100644 files/gtk3-settings.ini delete mode 100644 files/gtkrc-2.0 delete mode 100644 files/i3.conf delete mode 100644 files/i3status.conf delete mode 100644 files/keyboard.conf delete mode 100644 files/launch-polybar.sh delete mode 100644 files/lock-screen.sh delete mode 100644 files/picom.conf delete mode 100644 files/polybar.ini delete mode 100755 files/screen-layouts/DabApps/desk.sh delete mode 100755 files/screen-layouts/DabApps/macbook.sh delete mode 100644 files/touchpad.conf delete mode 100644 files/xfce4-power-manager.xml diff --git a/files/bin/rofi-powermenu b/files/bin/rofi-powermenu deleted file mode 100755 index 49b8b48..0000000 --- a/files/bin/rofi-powermenu +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env bash - -## Modified from https://gitlab.com/vahnrr/rofi-menus/blob/master/scripts/powermenu.sh - -set -e - -power_off="Power Off" -reboot="Reboot" -lock="Lock" -suspend="Suspend" -log_out="Log Out" - -options="Do Nothing\n$power_off\n$reboot\n$lock\n$suspend\n$log_out" - -chosen="$(echo -e "$options" | rofi -dmenu -p Shutdown? -no-custom -lines 5)" - -case $chosen in - $power_off) - systemctl poweroff -i - ;; - $reboot) - systemctl reboot - ;; - $lock) - xdotool key "Super_L+l" - ;; - $suspend) - xdotool key "Super_L+l" - systemctl suspend - ;; - $log_out) - i3-msg exit - ;; -esac diff --git a/files/bin/rofi-screenlayout b/files/bin/rofi-screenlayout deleted file mode 100755 index 798f0c2..0000000 --- a/files/bin/rofi-screenlayout +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash - -set -e - -LAYOUTS_DIR=$HOME/.config/screen-layouts -IFS= -layouts=$(find $LAYOUTS_DIR -name "*.sh" | xargs realpath --relative-to $LAYOUTS_DIR) - -chosen_layout=$(echo -e $layouts | rofi -dmenu -p "Select Layout" -no-custom -lines 5) -chosen_layout_file="${LAYOUTS_DIR}/${chosen_layout}" - -echo "Setting layout to ${chosen_layout}" -bash $chosen_layout_file - -i3-msg restart diff --git a/files/dunst.conf b/files/dunst.conf deleted file mode 100644 index 8d3173b..0000000 --- a/files/dunst.conf +++ /dev/null @@ -1,152 +0,0 @@ -[global] - ### Display ### - - # Which monitor should the notifications be displayed on. - monitor = 0 - - follow = none - - width = (0, 300) - origin = top-left - offset = 10x25 - - # Show how many messages are currently hidden (because of geometry). - indicate_hidden = yes - - # Shrink window if it's smaller than the width. Will be ignored if - # width is 0. - shrink = yes - - # The transparency of the window. Range: [0; 100]. - # This option will only work if a compositing window manager is - # present (e.g. xcompmgr, compiz, etc.). - transparency = 10 - - # Draw a line of "separator_height" pixel height between two - # notifications. - # Set to 0 to disable. - separator_height = 2 - - # Padding between text and separator. - padding = 8 - - # Horizontal padding. - horizontal_padding = 8 - - # Defines width in pixels of frame around the notification window. - # Set to 0 to disable. - frame_width = 1 - - # Defines color of the frame around the notification window. - frame_color = "#aaaaaa" - - separator_color = auto - - # Sort messages by urgency. - sort = yes - - # Don't remove messages, if the user is idle (no mouse or keyboard input) - # for longer than idle_threshold seconds. - # Set to 0 to disable. - # A client can set the 'transient' hint to bypass this. See the rules - # section for how to disable this if necessary - idle_threshold = 120 - - ### Text ### - - font = Monospace 9 - - # The spacing between lines. If the height is smaller than the - # font height, it will get raised to the font height. - line_height = 0 - - markup = full - - format = "%s %p\n%b" - - alignment = left - - show_age_threshold = 120 - - word_wrap = yes - - ellipsize = middle - - ignore_newline = no - - # Stack together notifications with the same content - stack_duplicates = true - - # Hide the count of stacked notifications with the same content - hide_duplicate_count = false - - # Display indicators for URLs (U) and actions (A). - show_indicators = no - - ### Icons ### - - # Align icons left/right/off - icon_position = left - - # Scale larger icons down to this size, set to 0 to disable - max_icon_size = 16 - - # Paths to default icons. - icon_path = /usr/share/icons/Numix/16/status/:/usr/share/icons/Numix/16/devices/ - - ### History ### - - # Should a notification popped up from history be sticky or timeout - # as if it would normally do. - sticky_history = yes - - # Maximum amount of notifications kept in history - history_length = 20 - - ### Misc/Advanced ### - - # dmenu path. - dmenu = /usr/bin/dmenu -p dunst: - - # Browser for opening urls in context menu. - browser = /usr/bin/firefox -new-tab - - # Always run rule-defined scripts, even if the notification is suppressed - always_run_script = true - - # Define the title of the windows spawned by dunst - title = Dunst - - # Define the class of the windows spawned by dunst - class = Dunst - - corner_radius = 0 - - ### Legacy - - force_xinerama = false - - ### mouse - - mouse_left_click = close_current - mouse_middle_click = close_all - mouse_right_click = do_action - -[experimental] - per_monitor_dpi = false - -[urgency_low] - background = "#222222" - foreground = "#888888" - timeout = 10 - -[urgency_normal] - background = "#285577" - foreground = "#ffffff" - timeout = 10 - -[urgency_critical] - background = "#900000" - foreground = "#ffffff" - frame_color = "#ff0000" - timeout = 0 diff --git a/files/global-environment b/files/global-environment index 7af7aab..df83b1a 100644 --- a/files/global-environment +++ b/files/global-environment @@ -1,12 +1,6 @@ -QT_QPA_PLATFORMTHEME=gtk2 GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01' LANG=en_GB.UTF-8 ARCHFLAGS="-arch x86_64" SSH_AUTH_SOCK=/tmp/ssh-agent-{{ user }}.sock NNN_DE_FILE_MANAGER=nautilus -GTK_IM_MODULE=ibus -XMODIFIERS=@im=ibus -QT_IM_MODULE=ibus -QT_AUTO_SCREEN_SCALE_FACTOR=0 -WINIT_HIDPI_FACTOR=1.0 MOZ_USE_XINPUT2=1 diff --git a/files/gtk3-settings.ini b/files/gtk3-settings.ini deleted file mode 100644 index 4dedf6c..0000000 --- a/files/gtk3-settings.ini +++ /dev/null @@ -1,21 +0,0 @@ -[Settings] -gtk-application-prefer-dark-theme=0 -gtk-theme-name=Matcha-dark-aliz -gtk-fallback-icon-theme=Matcha-dark-aliz -gtk-icon-theme-name=Numix-Square -gtk-font-name=Cantarell 11 -gtk-auto-mnemonics=1 -gtk-visible-focus=automatic -gtk-xft-antialias=1 -gtk-xft-hinting=1 -gtk-xft-hintstyle=hintslight -gtk-xft-rgba=rgb -gtk-cursor-theme-name=Adwaita -gtk-cursor-theme-size=24 -gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ -gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR -gtk-button-images=0 -gtk-menu-images=0 -gtk-enable-event-sounds=1 -gtk-enable-input-feedback-sounds=0 -gtk-modules=canberra-gtk-module diff --git a/files/gtkrc-2.0 b/files/gtkrc-2.0 deleted file mode 100644 index 23f1318..0000000 --- a/files/gtkrc-2.0 +++ /dev/null @@ -1,17 +0,0 @@ -include "/home/jake/.gtkrc-2.0.mine" -gtk-theme-name="Matcha-dark-aliz" -gtk-icon-theme-name="Numix-Square" -gtk-font-name="Cantarell 11" -gtk-cursor-theme-name="Adwaita" -gtk-cursor-theme-size=24 -gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ -gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR -gtk-button-images=0 -gtk-menu-images=0 -gtk-enable-event-sounds=1 -gtk-enable-input-feedback-sounds=0 -gtk-xft-antialias=1 -gtk-xft-hinting=1 -gtk-xft-hintstyle="hintslight" -gtk-xft-rgba="rgb" -gtk-modules="canberra-gtk-module" diff --git a/files/i3.conf b/files/i3.conf deleted file mode 100644 index a5f5538..0000000 --- a/files/i3.conf +++ /dev/null @@ -1,158 +0,0 @@ -set $mod Mod4 - -font pango:monospace 8 -focus_follows_mouse no -floating_modifier $mod - -# KDE overrides https://userbase.kde.org/Tutorials/Using_Other_Window_Managers_with_Plasma#Configure_i3 -for_window [title="Desktop — Plasma"] kill; floating enable; border none -for_window [class="plasmashell"] floating enable; -for_window [class="Plasma"] floating enable; border none -for_window [title="plasma-desktop"] floating enable; border none -for_window [title="win7"] floating enable; border none -for_window [class="krunner"] floating enable; border none -for_window [class="Kmix"] floating enable; border none -for_window [class="Klipper"] floating enable; border none -for_window [class="Plasmoidviewer"] floating enable; border none -for_window [class="(?i)*nextcloud*"] floating disable -for_window [class="plasmashell" window_type="notification"] floating enable, border none, move right 700px, move down 450px -no_focus [class="plasmashell" window_type="notification"] - - -# i3 shortcuts -bindsym $mod+Shift+r restart -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'" - -# Media Controls - -set $playerctl playerctl -i firefox # ignore firefox when doing media control - -bindsym XF86AudioRaiseVolume exec --no-startup-id pactl -- set-sink-volume @DEFAULT_SINK@ +2% #increase sound volume -bindsym XF86AudioLowerVolume exec --no-startup-id pactl -- set-sink-volume @DEFAULT_SINK@ -2% #decrease sound volume -bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle # mute sound -bindsym XF86AudioPause exec $aplayerctl play-pause -bindsym XF86AudioNext exec $aplayerctl next -bindsym XF86AudioPrev exec $aplayerctl previous -bindsym $mod+Shift+XF86AudioMute exec --no-startup-id amixer set Capture toggle && amixer get Capture | grep '\[off\]' && notify-send "🎙 MIC OFF" || notify-send "🎙 MIC ON" # mute mic - -# Some of my devices don't have full media controls -bindsym $mod+XF86AudioMute exec $aplayerctl play-pause -bindsym $mod+XF86AudioRaiseVolume exec $aplayerctl next -bindsym $mod+XF86AudioLowerVolume exec $aplayerctl previous - -# Brightness -bindsym XF86MonBrightnessUp exec --no-startup-id brightnessctl s +5% -bindsym XF86MonBrightnessDown exec --no-startup-id brightnessctl s 5%- - -# Colour Temperature -bindsym $mod+F11 exec --no-startup-id redshift -ox -bindsym $mod+F12 exec --no-startup-id redshift -O 3000 - - -# Applications -bindsym $mod+l exec --no-startup-id {{ home }}/.config/i3/lock.sh && sleep 1 -bindsym $mod+Shift+l exec --no-startup-id pranklock -bindsym $mod+K exec --no-startup-id bitwarden -bindsym $mod+d exec --no-startup-id rofi -show drun -sidebar-mode -bindsym $mod+Tab exec --no-startup-id rofi -show window -bindsym $mod+c exec --no-startup-id rofi -show calc -modi calc -no-show-match -no-sort -bindsym $mod+Return exec alacritty -bindsym $mod+n exec --no-startup-id nautilus -bindsym $mod+Shift+g exec --no-startup-id nvim-qt -bindsym Control+Shift+Escape exec --no-startup-id gnome-system-monitor -bindsym Control+Q exec --no-startup-id /bin/false -bindsym $mod+Shift+Delete exec --no-startup-id rofi-powermenu -bindcode 124 exec --no-startup-id rofi-powermenu -bindsym XF86Eject exec --no-startup-id rofi-powermenu -bindsym $mod+P exec --no-startup-id rofi-screenlayout -bindsym $mod+Shift+c exec --no-startup-id vscode-project-list -bindsym $mod+period exec --no-startup-id rofimoji --action clipboard --no-frecency --files emojis emoticons math symbols_for_legacy_computing -bindsym $mod+Shift+w exec --no-startup-id website-link - -# Notifications -bindsym $mod+m exec --no-startup-id dunstctl close -bindsym $mod+Shift+m exec --no-startup-id dunstctl close-all -bindsym $mod+Shift+comma exec --no-startup-id dunstctl history-pop -bindsym $mod+Shift+period exec --no-startup-id dunstctl context - -# Screenshots -bindsym Print exec --no-startup-id flameshot gui -bindsym XF86LaunchB exec --no-startup-id flameshot gui -bindsym Shift+Print exec --no-startup-id flameshot screen -c -bindsym Shift+XF86LaunchB exec --no-startup-id flameshot screen -c -bindsym $mod+Print exec --no-startup-id flameshot-upload -bindsym $mod+XF86LaunchB exec --no-startup-id flameshot-upload - -bindsym $mod+Shift+q kill - -# Focus -bindsym $mod+a focus parent -bindsym $mod+Left focus left -bindsym $mod+Down focus down -bindsym $mod+Up focus up -bindsym $mod+Right focus right - -# Movement -bindsym $mod+Shift+Left move left -bindsym $mod+Shift+Down move down -bindsym $mod+Shift+Up move up -bindsym $mod+Shift+Right move right - -# Layout -bindsym $mod+v split v -bindsym $mod+f fullscreen toggle -bindsym $mod+s layout stacking -bindsym $mod+w layout tabbed -bindsym $mod+e layout toggle split -bindsym $mod+Shift+space floating toggle -bindsym $mod+space focus mode_toggle - -# Workspaces -{% for i in range(1, 10) %} -bindsym $mod+{{ i }} workspace {{ i }} -bindsym $mod+Shift+{{ i }} move container to workspace {{ i }} -{% endfor %} - -bindsym $mod+Shift+minus move scratchpad -bindsym $mod+minus scratchpad show - -# Resize -set $resize_increment 5 -mode "resize" { - bindsym Left resize shrink width $resize_increment px or $resize_increment ppt - bindsym Down resize grow height $resize_increment px or $resize_increment ppt - bindsym Up resize shrink height $resize_increment px or $resize_increment ppt - bindsym Right resize grow width $resize_increment px or $resize_increment ppt - - bindsym Escape mode "default" -} -bindsym $mod+r mode "resize" - -# Gaps -mode "gaps" { - bindsym b border pixel 2 - bindsym Shift+b border normal - - bindsym Up gaps inner all plus 5 - bindsym Down gaps inner all minus 5 - - bindsym Left gaps outer all minus 5 - bindsym Right gaps outer all plus 5 - - bindsym Escape mode "default" -} -bindsym $mod+g mode "gaps" - - -# Autostart -exec /usr/lib/polkit-1/polkitd --no-debug -exec picom --dbus --xrender-sync-fence -exec ssh-agent -Da /tmp/ssh-agent-$USER.sock -exec bitwarden -exec dunst -exec xfce4-power-manager --no-daemon - -exec_always --no-startup-id {{ home }}/.config/polybar/launch.sh -exec_always /usr/bin/ibus-daemon -drx - -exec dex -as ~/.config/autostart diff --git a/files/i3status.conf b/files/i3status.conf deleted file mode 100644 index 114fee0..0000000 --- a/files/i3status.conf +++ /dev/null @@ -1,17 +0,0 @@ -general { - colors = true - interval = 10 -} - -order += "wireless _first_" -order += "ethernet _first_" - -wireless _first_ { - format_up = "W: %ip (%essid)" - format_down = "W: down" -} - -ethernet _first_ { - format_up = "E: %ip" - format_down = "E: down" -} diff --git a/files/keyboard.conf b/files/keyboard.conf deleted file mode 100644 index 2dfde0a..0000000 --- a/files/keyboard.conf +++ /dev/null @@ -1,5 +0,0 @@ -Section "InputClass" - Identifier "system-keyboard" - MatchIsKeyboard "on" - Option "XkbLayout" "gb" -EndSection diff --git a/files/launch-polybar.sh b/files/launch-polybar.sh deleted file mode 100644 index 3c16430..0000000 --- a/files/launch-polybar.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# From: https://github.com/jaagr/polybar/issues/763#issuecomment-392960721 - -pkill polybar - -for m in $(polybar --list-monitors | cut -d":" -f1); do - MONITOR=$m polybar top & - MONITOR=$m polybar bottom & -done diff --git a/files/lock-screen.sh b/files/lock-screen.sh deleted file mode 100644 index 2e88686..0000000 --- a/files/lock-screen.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -set -e - -BG_DIR="$HOME/Upload/bg/" -BG=$(ls "$BG_DIR" | sort -R | tail -n 1) - -i3lock -i "$BG_DIR/$BG" --scale --clock --indicator --inside-color=00000088 --indicator --date-color=FFFFFF --time-color=FFFFFF diff --git a/files/picom.conf b/files/picom.conf deleted file mode 100644 index 3db7de1..0000000 --- a/files/picom.conf +++ /dev/null @@ -1,50 +0,0 @@ -# Shadow -shadow = true; # Enabled client-side shadows on windows. -no-dock-shadow = true; # Avoid drawing shadows on dock/panel windows. -no-dnd-shadow = false; # Don't draw shadows on DND windows. -clear-shadow = true; # Zero the part of the shadow's mask behind the window (experimental). -shadow-radius = 7; # The blur radius for shadows. (default 12) -shadow-offset-x = -7; # The left offset for shadows. (default -15) -shadow-offset-y = -7; # The top offset for shadows. (default -15) -# shadow-opacity = 0.7; # The translucency for shadows. (default .75) -# shadow-red = 0.0; # Red color value of shadow. (0.0 - 1.0, defaults to 0) -# shadow-green = 0.0; # Green color value of shadow. (0.0 - 1.0, defaults to 0) -# shadow-blue = 0.0; # Blue color value of shadow. (0.0 - 1.0, defaults to 0) - -shadow-exclude = [ "n:e:Notification" ]; # Exclude conditions for shadows. -# shadow-exclude = "n:e:Notification"; -# shadow-exclude = "n:a:Conky"; -# shadow-exclude = "synapse"; - -shadow-ignore-shaped = true; - -# Opacity -menu-opacity = 1; # The opacity for menus. (default 1.0) -inactive-opacity = 1; # Opacity of inactive windows. (0.1 - 1.0) -frame-opacity = 1; # Opacity of window titlebars and borders. (0.1 - 1.0) -inactive-opacity-override = true; # Inactive opacity set by 'inactive-opacity' overrides value of _NET_WM_OPACITY. - -# Fading -fading = true; # Fade windows during opacity changes. -fade-delta = 3; # The time between steps in a fade in milliseconds. (default 10). -fade-in-step = 0.03; # Opacity change between steps while fading in. (default 0.028). -fade-out-step = 0.03; # Opacity change between steps while fading out. (default 0.03). -# no-fading-openclose = true; # Fade windows in/out when opening/closing. - -# Other -#inactive-dim = 0.5; # Dim inactive windows. (0.0 - 1.0, defaults to 0). -mark-wmwin-focused = true; # Try to detect WM windows and mark them as active. -mark-ovredir-focused = true; -detect-rounded-corners = true; - -# Window type settings -wintypes: -{ - tooltip = { fade = true; shadow = false; opacity = 0.75; }; -}; - - -##excluded apps -#shadow-exclude = [ "g:si:Conky" ]; - -dbe = false; diff --git a/files/polybar.ini b/files/polybar.ini deleted file mode 100644 index d33c65b..0000000 --- a/files/polybar.ini +++ /dev/null @@ -1,165 +0,0 @@ -[colors] -background = #111 -foreground = #dfdfdf -primary = #285577 -secondary = #333333 -alert = #bd2c40 -success = #0d0 - -[settings] -screenchange-reload = true - -[bar/top] -monitor = ${env:MONITOR:} -width = 100% -height = 25 -fixed-center = true -background = ${colors.background} -foreground = ${colors.foreground} -padding = 2 -font-0 = "DejaVu Sans Mono:size=9;2" -font-1 = "FontAwesome5FreeSolid:size=8;2" -modules-left = xwindow -modules-center = date -modules-right = player_mpris_tail memory cpu temperature wifi eno1 pulseaudio wattage battery power-menu -module-margin = 2 -wm-restack = i3 -scroll-up = i3wm-wsnext -scroll-down = i3wm-wsprev -cursor-click = pointer -cursor-scroll = default - -[bar/bottom] -inherit = bar/top -bottom = true -modules-left = i3 -modules-center = -tray-position = right -modules-right = -padding = 0 -height = 20 - -[module/xwindow] -type = internal/xwindow -label = %title% -label-maxlen = 75 - -[module/i3] -type = internal/i3 -format = -index-sort = true -wrapping-scroll = false -pin-workspaces = true - -label-focused = %index% -label-focused-background = ${colors.primary} -label-focused-padding = 1 - -label-unfocused = ${self.label-focused} -label-unfocused-padding = 1 - -label-visible = ${self.label-focused} -label-visible-background = ${colors.secondary} -label-visible-padding = ${self.label-focused-padding} - -label-urgent = ${self.label-focused} -label-urgent-background = ${colors.alert} -label-urgent-padding = 1 - -[module/date] -type = internal/date -interval = 1 - -date = "%Y-%m-%d" -date-alt = "%c" -time = %H:%M:%S -label = %date% %time% - -[module/pulseaudio] -type = internal/pulseaudio -format-volume = -use-ui-max = false -label-muted =  MUTE -label-muted-foreground = ${colors.alert} -interval = 2 - -ramp-volume-0 =  -ramp-volume-1 =  -ramp-volume-2 =  - -[module/cpu] -type = internal/cpu -interval = 1 -label =  %percentage%% - -[module/memory] -type = internal/memory -interval = 1 -label =  %gb_used% - -[module/player_mpris_tail] -type = custom/script -exec = "python3 {{ polybar_scripts }}/player-mpris-tail/player-mpris-tail.py -f '{icon} {title} - {artist}' --icon-playing  --icon-paused " -tail = true -click-left = playerctl play-pause -click-right = playerctl next -label-maxlen = 50 - -[module/power-menu] -type = custom/menu -label-open =  -label-close =  -label-open-foreground = ${colors.alert} -label-close-foreground = ${colors.alert} -menu-0-0 = Shutdown -menu-0-0-foreground = ${colors.alert} -menu-0-0-exec = shutdown -h now -menu-0-1 = Restart -menu-0-1-foreground = ${colors.success} -menu-0-1-exec = shutdown -r now -label-separator = " | " -expand-right = false - -[module/battery] -type = internal/battery -full-at = 100 -poll-interval = 2 -time-format = %H:%M -ramp-capacity-0 =  -ramp-capacity-1 =  -ramp-capacity-2 =  -ramp-capacity-3 =  -ramp-capacity-4 =  -format-charging = -format-discharging = -label-discharging = %percentage%% (%time%) -label-charging =  %percentage%% - -[module/wattage] -type = internal/battery -full-at = ${module/battery.full-at} -label-discharging =  %consumption%W -label-charging = ${self.label-discharging} -poll-interval = ${module/battery.poll-interval} - -[module/wifi] -type = internal/network -interface = wlp2s0 -label-connected =  %local_ip% (%essid%) -label-connected-foreground = ${colors.success} -label-packetloss = ${self.label-connected} - -[module/eno1] -type = internal/network -inherit = module/wifi -label-connected =  %local_ip% -interface = eno1 - -[module/temperature] -type = internal/temperature -interval = 3 -base-temperature = 20 -warn-temperature = 75 -label-warn-foreground = ${colors.alert} -label =  %temperature-c% -label-warn =  %temperature-c% diff --git a/files/screen-layouts/DabApps/desk.sh b/files/screen-layouts/DabApps/desk.sh deleted file mode 100755 index db43987..0000000 --- a/files/screen-layouts/DabApps/desk.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -xrandr --output eDP-1 --off --output DP-1 --off --output HDMI-1 --mode 1920x1080 --pos 0x0 --rotate normal --output DP-2 --off --output HDMI-2 --mode 1920x1080 --pos 1920x0 --rotate normal diff --git a/files/screen-layouts/DabApps/macbook.sh b/files/screen-layouts/DabApps/macbook.sh deleted file mode 100755 index 27c0d63..0000000 --- a/files/screen-layouts/DabApps/macbook.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -xrandr --output eDP-1 --primary --mode 1920x1200 --pos 0x322 --rotate normal --output DP-1 --off --output HDMI-1 --off --output DP-2 --off --output HDMI-2 --off diff --git a/files/touchpad.conf b/files/touchpad.conf deleted file mode 100644 index 80c3c95..0000000 --- a/files/touchpad.conf +++ /dev/null @@ -1,10 +0,0 @@ -Section "InputClass" - Identifier "libinput touchpad catchall" - Driver "libinput" - MatchIsTouchpad "on" - MatchDevicePath "/dev/input/event*" - Option "ClickMethod" "clickfinger" - Option "NaturalScrolling" "false" - Option "AccelProfile" "flat" - Option "DisableWhileTyping" "true" -EndSection diff --git a/files/xfce4-power-manager.xml b/files/xfce4-power-manager.xml deleted file mode 100644 index 1df2acc..0000000 --- a/files/xfce4-power-manager.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tasks/autostart.yml b/tasks/autostart.yml index b652b5e..d64ae46 100644 --- a/tasks/autostart.yml +++ b/tasks/autostart.yml @@ -1,11 +1,3 @@ -- name: Install autostart-related packages - kewlfft.aur.aur: - name: "{{ item }}" - become: true - become_user: aur_builder - loop: - - dex - - name: Create autostart directory file: path: "{{ home }}/.config/autostart" @@ -22,10 +14,7 @@ state: link force: true loop: - - blueman - - pulseaudio - - nm-applet - - lxqt-policykit-agent + - solaar - name: Autostart applications file: diff --git a/tasks/gnome.yml b/tasks/gnome.yml index 9b05a4a..e726912 100644 --- a/tasks/gnome.yml +++ b/tasks/gnome.yml @@ -41,53 +41,3 @@ - matcha-gtk-theme - numix-square-icon-theme - qt5-styleplugins - -- name: Set GTK theme - dconf: - key: /org/gnome/desktop/interface/gtk-theme - value: "'Matcha-dark-aliz'" - become: true - become_user: "{{ user }}" - -- name: Set GTK icon theme - dconf: - key: /org/gnome/desktop/interface/icon-theme - value: "'Numix-Square'" - become: true - become_user: "{{ user }}" - -- name: Install GTK2 config - copy: - src: ./files/gtkrc-2.0 - dest: "{{ home }}/.gtkrc-2.0" - mode: 0644 - owner: "{{ user }}" - -- name: Create GTK3 config directory - file: - path: "{{ home }}/.config/gtk-3.0/" - state: directory - owner: "{{ user }}" - mode: 0755 - - -- name: Install GTK3 config - copy: - src: ./files/gtk3-settings.ini - dest: "{{ home }}/.config/gtk-3.0/settings.ini" - mode: 0644 - owner: "{{ user }}" - -- name: Autostart gnome-settings services - file: - src: /etc/xdg/autostart/{{ item }}.desktop - dest: "{{ home }}/.config/autostart/{{ item }}.desktop" - mode: 0644 - owner: "{{ user }}" - state: link - force: true - loop: - - org.gnome.SettingsDaemon.XSettings - - org.gnome.SettingsDaemon.DiskUtilityNotify - - org.gnome.SettingsDaemon.Keyboard - - gsettings-data-convert diff --git a/tasks/i3.yml b/tasks/i3.yml index 886f84a..b2d9f4b 100644 --- a/tasks/i3.yml +++ b/tasks/i3.yml @@ -5,80 +5,11 @@ become_user: aur_builder loop: - arandr - - brightnessctl - - picom - - dmenu - - dunst - - feh - flameshot - - i3-gaps - - i3lock-color - - lxrandr - - lxqt-policykit - - polybar - - redshift - rofi - rofi-calc - rofimoji - xdotool - - xorg - - -- name: Set i3 variables - set_fact: - polybar_scripts: "{{ home }}/.config/polybar/polybar-scripts/polybar-scripts" - i3_config_files: - - {src: i3.conf, dest: "{{ home }}/.config/i3/config"} - - {src: i3status.conf, dest: "{{ home }}/.config/i3status/config"} - - {src: picom.conf, dest: "{{ home }}/.config/picom.conf"} - - {src: dunst.conf, dest: "{{ home }}/.config/dunst/dunstrc"} - - {src: polybar.ini, dest: "{{ home }}/.config/polybar/config"} - -- name: Create i3 config file directories - loop: "{{ i3_config_files }}" - loop_control: - label: "{{ item.src }}" - file: - path: "{{ item.dest | dirname }}" - state: directory - owner: "{{ user }}" - mode: 0755 - -- name: Install i3 config files - loop: "{{ i3_config_files }}" - loop_control: - label: "{{ item.src }}" - template: - src: ./files/{{ item.src }} - dest: "{{ item.dest }}" - mode: 0644 - owner: "{{ user }}" - - -- name: Create polybar config directory - file: - path: "{{ home }}/.config/polybar/" - state: directory - owner: "{{ user }}" - mode: 0755 - - -- name: Polybar scripts - git: - repo: https://github.com/x70b1/polybar-scripts - dest: "{{ home }}/.config/polybar/polybar-scripts" - force: true - become: true - become_user: "{{ user }}" - -- name: Install Polybar launcher - copy: - src: ./files/launch-polybar.sh - dest: "{{ home }}/.config/polybar/launch.sh" - mode: 0755 - owner: "{{ user }}" - group: users - - name: Create rofi config directory file: @@ -100,18 +31,3 @@ dest: /usr/bin/pranklock mode: 0755 force: true - -- name: Install Screen Layouts - copy: - src: ./files/screen-layouts - dest: "{{ home }}/.config" - mode: 0755 - directory_mode: 0755 - owner: "{{ user }}" - -- name: Install screen lock script - copy: - src: ./files/lock-screen.sh - dest: "{{ home }}/.config/i3/lock.sh" - mode: 0755 - owner: "{{ user }}" diff --git a/tasks/input.yml b/tasks/input.yml index 336d4a0..18543ae 100644 --- a/tasks/input.yml +++ b/tasks/input.yml @@ -4,29 +4,12 @@ become: true become_user: aur_builder loop: - - gpointing-device-settings - gromit-mpx - - ibus - - ibus-uniemoji - libinput - libinput-gestures - solaar - xorg-xev -- name: Install mouse config - copy: - src: ./files/touchpad.conf - dest: /usr/share/X11/xorg.conf.d/30-touchpad.conf - mode: 0644 - owner: "{{ user }}" - -- name: Install keyboard config - copy: - src: ./files/keyboard.conf - dest: /usr/share/X11/xorg.conf.d/00-keyboard.conf - mode: 0644 - owner: "{{ user }}" - - name: Install libinput-gestures config copy: src: ./files/libinput-gestures.conf diff --git a/tasks/network.yml b/tasks/network.yml index 7c1ffd3..15a0d96 100644 --- a/tasks/network.yml +++ b/tasks/network.yml @@ -7,18 +7,3 @@ - bind-tools - gnu-netcat - nmap - -- name: Install NetworkManager and associated tools - kewlfft.aur.aur: - name: "{{ item }}" - become: true - become_user: aur_builder - loop: - - networkmanager - - network-manager-applet - -- name: Enable NetworkManger - systemd: - name: NetworkManager - enabled: true - state: started diff --git a/tasks/power-saving.yml b/tasks/power-saving.yml index 9c01956..e69de29 100644 --- a/tasks/power-saving.yml +++ b/tasks/power-saving.yml @@ -1,27 +0,0 @@ -- name: Install power-saving stuff - kewlfft.aur.aur: - name: "{{ item }}" - become: true - become_user: aur_builder - loop: - - acpi - - ethtool - - powertop - - psensor - - smartmontools - - sysstat - - xfce4-power-manager - -- name: Create XFCE4 power manager config directory - file: - path: "{{ home }}/.config/xfce4/xfconf/xfce-perchannel-xml" - state: directory - owner: "{{ user }}" - mode: 0755 - -- name: Install XFCE4 power manager config - copy: - src: ./files/xfce4-power-manager.xml - dest: "{{ home }}/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml" - owner: "{{ user }}" - mode: 0644 diff --git a/tasks/security.yml b/tasks/security.yml index e939d53..f574734 100644 --- a/tasks/security.yml +++ b/tasks/security.yml @@ -6,10 +6,8 @@ loop: - bitwarden - bitwarden-cli - - gnome-keyring - firejail - mullvad-vpn-bin - - seahorse - wireguard-tools - yubikey-personalization-gui