summaryrefslogtreecommitdiff
path: root/.config/sway/config
diff options
context:
space:
mode:
Diffstat (limited to '')
-rwxr-xr-x.config/sway/config2
-rw-r--r--.config/sway/config.d/theme6
2 files changed, 1 insertions, 7 deletions
diff --git a/.config/sway/config b/.config/sway/config
index 6e6b86a..88271ad 100755
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -15,7 +15,7 @@ set $menu wofi --allow-images --show=drun --prompt "Search Program"
set $scale 1.25
# Set background
-set $bg ~/.config/sway/wallpapers/blue.jpg
+set $bg ~/.config/desktop-common/wallpapers/blue.jpg
# Set Efects
set $gaps 10
diff --git a/.config/sway/config.d/theme b/.config/sway/config.d/theme
index 597b178..0a85a97 100644
--- a/.config/sway/config.d/theme
+++ b/.config/sway/config.d/theme
@@ -1,14 +1,8 @@
### Set borders
gaps inner $gaps
-<<<<<<< HEAD
-for_window [class="^.*"] border pixel 2
-default_border pixel 2
-default_floating_border pixel 2
-=======
for_window [class="^.*"] border pixel 0
default_border pixel 0
default_floating_border pixel 0
->>>>>>> b688e13 (shinji)
### Colors