From 519735bdfbc456be00ae131a52bcd2cdd721e08f Mon Sep 17 00:00:00 2001
From: adamstuck <adam.moloney.stuck@gmail.com>
Date: Thu, 5 Aug 2021 16:25:02 +0200
Subject: Pulseaudio should be working, added lock screen keybind

---
 .config/i3/config | 60 +++++++++++++++++++++++--------------------------------
 .xinitrc          |  7 -------
 2 files changed, 25 insertions(+), 42 deletions(-)

diff --git a/.config/i3/config b/.config/i3/config
index 133079c..2974c7f 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -1,54 +1,51 @@
+##### i3 config
+
 set $mod Mod4
 floating_modifier $mod
 
-# i3 reload cfg / restart i3 / exit i3
+
+##### Bindings 
+
 bindsym $mod+Shift+c reload
 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'"
 bindsym $mod+Shift+q kill
-
+bindsym $mod+Escape exec betterlockscreen -l dim
 bindsym $mod+Return exec alacritty
 bindsym $mod+b exec firefox
 bindsym $mod+e exec pcmanfm
+bindsym $mod+f fullscreen toggle
 
-# rofi/drun
+# Rofi
 bindsym $mod+d exec rofi -show drun -show-icons -theme rofi
 bindsym $mod+Shift+space exec rofi -show run -show-icons -theme rofi
 bindsym $mod+Ctrl+space exec rofi -show window -show-icons -theme rofi
 bindsym Mod1+b exec rofi -modi "clipboard:greenclip print" -show clipboard -run-command '{cmd}' -show-icons -theme rofi
 
-# kill focused window
+# PulseAudio
+bindsym XF86AudioRaiseVolume pactl set-sink-volume @DEFAULT_SINK@ +10%
+bindsym XF86AudioLowerVolume pactl set-sink-volume @DEFAULT_SINK@ -10%
+bindsym XF86AudioMute pactl set-sink-mute @DEFAULT_SINK@ toggle
 
-# change focus
+# Change focus
 bindsym $mod+h focus left
 bindsym $mod+j focus down
 bindsym $mod+k focus up
 bindsym $mod+l focus right
 
-# move focused window
+# Move focused window
 bindsym $mod+Shift+h move left
 bindsym $mod+Shift+j move down
 bindsym $mod+Shift+k move up
 bindsym $mod+Shift+l move right
+bindsym $mod+a focus parent  # Focus the parent container
+bindsym $mod+Shift+t focus mode_toggle # Focus tiled / floating windows
 
-# split orientation
+# Window orientation
 bindsym $mod+g split h
 bindsym $mod+v split v
-
-# enter fullscreen mode for the focused container
-bindsym $mod+f fullscreen toggle
-
-# toggle tiling / floating
-bindsym $mod+Shift+f floating toggle
-
-# toggle tiling / tabbed mode
 bindsym $mod+t layout toggle tabbed splith splitv
-
-# change focus between tiling / floating windows
-bindsym $mod+Shift+t focus mode_toggle
-
-# focus the parent container
-bindsym $mod+a focus parent
+bindsym $mod+Shift+f floating toggle
 
 # Define names for default workspaces for which we configure key bindings later on.
 # We use variables to avoid repeating the names in multiple places.
@@ -113,19 +110,18 @@ bindsym $mod+r mode "Resize Mode"
 
 ##### Appearance
 
-default_border pixel 1
-default_floating_border pixel 1
+font pango:monospace 6
 
 gaps inner 5
 gaps outer 0
+default_border pixel 1
+default_floating_border pixel 1
 
 smart_gaps on
 hide_edge_borders smart
 popup_during_fullscreen smart
 focus_follows_mouse no
 
-font pango:monospace 6
-
 
 ##### Force floating windows
 
@@ -165,17 +161,11 @@ for_window [title="^Steam Keyboard$"] floating enable
 
 ##### Misc/Exec
 
-# 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
+exec --no-startup-id nitrogen --restore
+exec --no-startup-id greenclip daemon
+exec --no-startup-id picom --config $HOME/.config/picom/picom.conf -b
+exec_always --no-startup-id $HOME/.config/polybar/launch.sh
diff --git a/.xinitrc b/.xinitrc
index a8a364f..b651fb2 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -47,10 +47,3 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then
  done
  unset f
 fi
-
-nitrogen --restore &
-greenclip daemon &
-pulseaudio --daemonize &
-polybar bar1 &
-picom &
-exec i3
-- 
cgit v1.2.3-70-g09d2