switched from i3 to sway

24 files changed, 518 insertions, 380 deletions

diff --git a/.config/X11/Xresources b/.config/X11/Xresources
index 270a56e..a65c7b6 100644
--- a/.config/X11/Xresources
+++ b/.config/X11/Xresources
@@ -1,8 +1,3 @@
 Xft.dpi: 108
 Xcursor.size: 32
 Xcursor.theme: phinger-cursors-light
-
-Nsxiv.window.background: #282c34
-Nsxiv.window.foreground: #a8b4bb
-Nsxiv.bar.background: #31353f
-Nsxiv.bar.font: JetBrainsMono Nerd Font:size=10
diff --git a/.config/X11/xinitrc b/.config/X11/xinitrc
deleted file mode 100755
index 2434e05..0000000
--- a/.config/X11/xinitrc
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-userresources=$XDG_CONFIG_HOME/X11/Xresources
-usermodmap=$XDG_CONFIG_HOME/X11/Xmodmap
-sysresources=/etc/X11/xinit/.Xresources
-sysmodmap=/etc/X11/xinit/.Xmodmap
-
-# merge in defaults and keymaps
-
-if [ -f $sysresources ]; then
-    xrdb -merge $sysresources
-fi
-
-if [ -f $sysmodmap ]; then
-    xmodmap $sysmodmap
-fi
-
-if [ -f "$userresources" ]; then
-    xrdb -merge "$userresources"
-fi
-
-if [ -f "$usermodmap" ]; then
-    xmodmap "$usermodmap"
-fi
-
-# start some nice programs
-
-if [ -d /etc/X11/xinit/xinitrc.d ] ; then
-    for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
-        [ -x "$f" ] && . "$f"
-    done
-    unset f
-fi
-
-~/.local/bin/clipclear &
-clipmenud &
-playerctld daemon &
-redshift -l 55.7:12.6 -t 5700:4000 -g 0.9 -m randr -v &
-unclutter -b &
-xwallpaper --center ~/.local/share/bg &
-xidlehook --detect-sleep --not-when-audio --not-when-fullscreen \
-  --timer 300 '~/.local/bin/lock' '' &
-~/.local/bin/comptoggle &
-~/.local/bin/rate &
-exec i3
diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml
index 7df0820..85ddcb7 100644
--- a/.config/alacritty/alacritty.yml
+++ b/.config/alacritty/alacritty.yml
@@ -132,7 +132,7 @@ font:
     style: Bold Italic
 
   # Point size
-  size: 10.5
+  size: 11.5
   # Offset is the extra space around each character. `offset.y` can be thought
   # of as modifying the line spacing, and `offset.x` as modifying the letter
   # spacing.
diff --git a/.config/aliases b/.config/aliases
index 2bc5182..a0137af 100644
--- a/.config/aliases
+++ b/.config/aliases
@@ -19,6 +19,7 @@ alias pk="checkupdates"
 alias wt="curl wttr.in/$(cat $HOME/.config/forecast/location)"
 alias pub="curl ifconfig.me && echo"
 alias grep="grep -i --color"
+alias pgrep="pgrep -ia"
 alias net="nmcli"
 alias vpn="doas wg-quick up adast"
 alias novpn="doas wg-quick down adast"
diff --git a/.config/foot/foot.ini b/.config/foot/foot.ini
new file mode 100644
index 0000000..6e9797d
--- /dev/null
+++ b/.config/foot/foot.ini
@@ -0,0 +1,198 @@
+# -*- conf -*-
+
+# shell=$SHELL (if set, otherwise user's default shell from /etc/passwd)
+# term=foot (or xterm-256color if built with -Dterminfo=disabled)
+# login-shell=no
+
+# app-id=foot
+# title=foot
+# locked-title=no
+
+ font=JetBrainsMono NerdFont:size=7
+# font-bold=<bold variant of regular font>
+# font-italic=<italic variant of regular font>
+# font-bold-italic=<bold+italic variant of regular font>
+# line-height=<font metrics>
+# letter-spacing=0
+# horizontal-letter-offset=0
+# vertical-letter-offset=0
+# underline-offset=<font metrics>
+# box-drawings-uses-font-glyphs=no
+# dpi-aware=auto
+
+# initial-window-size-pixels=700x500  # Or,
+# initial-window-size-chars=<COLSxROWS>
+# initial-window-mode=windowed
+# pad=2x2                             # optionally append 'center'
+# resize-delay-ms=100
+
+# notify=notify-send -a ${app-id} -i ${app-id} ${title} ${body}
+
+# bold-text-in-bright=no
+# word-delimiters=,│`|:"'()[]{}<>
+# selection-target=primary
+# workers=<number of logical CPUs>
+
+[main]
+include=~/.config/foot/themes/onedark-dark
+
+[environment]
+# name=value
+
+[bell]
+# urgent=no
+# notify=no
+# command=
+# command-focused=no
+
+[scrollback]
+# lines=1000
+# multiplier=3.0
+# indicator-position=relative
+# indicator-format=
+
+[url]
+# launch=xdg-open ${url}
+# label-letters=sadfjklewcmpgh
+# osc8-underline=url-mode
+# protocols=http, https, ftp, ftps, file, gemini, gopher
+# uri-characters=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.,~:;/?#@!$&%*+="'()[]
+
+[cursor]
+# style=block
+# color=<inverse foreground/background>
+# blink=no
+# beam-thickness=1.5
+# underline-thickness=<font underline thickness>
+
+[mouse]
+# hide-when-typing=no
+# alternate-scroll-mode=yes
+
+[colors]
+# alpha=1.0
+# foreground=dcdccc
+# background=111111
+
+## Normal/regular colors (color palette 0-7)
+# regular0=222222  # black
+# regular1=cc9393  # red
+# regular2=7f9f7f  # green
+# regular3=d0bf8f  # yellow
+# regular4=6ca0a3  # blue
+# regular5=dc8cc3  # magenta
+# regular6=93e0e3  # cyan
+# regular7=dcdccc  # white
+
+## Bright colors (color palette 8-15)
+# bright0=666666   # bright black
+# bright1=dca3a3   # bright red
+# bright2=bfebbf   # bright green
+# bright3=f0dfaf   # bright yellow
+# bright4=8cd0d3   # bright blue
+# bright5=fcace3   # bright magenta
+# bright6=b3ffff   # bright cyan
+# bright7=ffffff   # bright white
+
+## dimmed colors (see foot.ini(5) man page)
+# dim0=<not set>
+# ...
+# dim7=<not-set>
+
+## The remaining 256-color palette
+# 16 = <256-color palette #16>
+# ...
+# 255 = <256-color palette #255>
+
+## Misc colors
+# selection-foreground=<inverse foreground/background>
+# selection-background=<inverse foreground/background>
+# jump-labels=<regular0> <regular3>          # black-on-yellow
+# scrollback-indicator=<regular0> <bright4>  # black-on-bright-blue
+# search-box-no-match=<regular0> <regular1>  # black-on-red
+# search-box-match=<regular0> <regular3>     # black-on-yellow
+# urls=<regular3>
+
+[csd]
+# preferred=server
+# size=26
+# font=<primary font>
+# color=<foreground color>
+# hide-when-typing=no
+# border-width=0
+# border-color=<csd.color>
+# button-width=26
+# button-color=<background color>
+# button-minimize-color=<regular4>
+# button-maximize-color=<regular2>
+# button-close-color=<regular1>
+
+[key-bindings]
+# scrollback-up-page=Shift+Page_Up
+# scrollback-up-half-page=none
+# scrollback-up-line=none
+# scrollback-down-page=Shift+Page_Down
+# scrollback-down-half-page=none
+# scrollback-down-line=none
+# clipboard-copy=Control+Shift+c XF86Copy
+# clipboard-paste=Control+Shift+v XF86Paste
+# primary-paste=Shift+Insert
+# search-start=Control+Shift+r
+# font-increase=Control+plus Control+equal Control+KP_Add
+# font-decrease=Control+minus Control+KP_Subtract
+# font-reset=Control+0 Control+KP_0
+# spawn-terminal=Control+Shift+n
+# minimize=none
+# maximize=none
+# fullscreen=none
+# pipe-visible=[sh -c "xurls | fuzzel | xargs -r firefox"] none
+# pipe-scrollback=[sh -c "xurls | fuzzel | xargs -r firefox"] none
+# pipe-selected=[xargs -r firefox] none
+# show-urls-launch=Control+Shift+u
+# show-urls-copy=none
+# show-urls-persistent=none
+# prompt-prev=Control+Shift+z
+# prompt-next=Control+Shift+x
+# unicode-input=none
+# noop=none
+
+[search-bindings]
+# cancel=Control+g Control+c Escape
+# commit=Return
+# find-prev=Control+r
+# find-next=Control+s
+# cursor-left=Left Control+b
+# cursor-left-word=Control+Left Mod1+b
+# cursor-right=Right Control+f
+# cursor-right-word=Control+Right Mod1+f
+# cursor-home=Home Control+a
+# cursor-end=End Control+e
+# delete-prev=BackSpace
+# delete-prev-word=Mod1+BackSpace Control+BackSpace
+# delete-next=Delete
+# delete-next-word=Mod1+d Control+Delete
+# extend-to-word-boundary=Control+w
+# extend-to-next-whitespace=Control+Shift+w
+# clipboard-paste=Control+v Control+Shift+v Control+y XF86Paste
+# primary-paste=Shift+Insert
+# unicode-input=none
+
+[url-bindings]
+# cancel=Control+g Control+c Control+d Escape
+# toggle-url-visible=t
+
+[text-bindings]
+# \x03=Mod4+c  # Map Super+c -> Ctrl+c
+
+[mouse-bindings]
+# selection-override-modifiers=Shift
+# primary-paste=BTN_MIDDLE
+# select-begin=BTN_LEFT
+# select-begin-block=Control+BTN_LEFT
+# select-extend=BTN_RIGHT
+# select-extend-character-wise=Control+BTN_RIGHT
+# select-word=BTN_LEFT-2
+# select-word-whitespace=Control+BTN_LEFT-2
+# select-row=BTN_LEFT-3
+
+# vim: ft=dosini
diff --git a/.config/foot/themes/onedark-dark b/.config/foot/themes/onedark-dark
new file mode 100644
index 0000000..7982dd0
--- /dev/null
+++ b/.config/foot/themes/onedark-dark
@@ -0,0 +1,17 @@
+# Onedark - Dark
+
+[cursor]
+color=3e4451 528bff 
+
+[colors]
+alpha=1.0
+foreground=dcdccc
+background=111111
+regular0=5c6370  # black
+regular1=e06c75  # red
+regular2=98c379  # green
+regular3=e5c07b  # yellow
+regular4=61afef  # blue
+regular5=c678dd  # magenta
+regular6=56b6c2  # cyan
+regular7=bbc2cf  # white
diff --git a/.config/foot/themes/onedark-light b/.config/foot/themes/onedark-light
new file mode 100644
index 0000000..a3c071e
--- /dev/null
+++ b/.config/foot/themes/onedark-light
@@ -0,0 +1,17 @@
+# Onedark - Light
+
+[cursor]
+color=e5e5e6 526eff 
+
+[colors]
+alpha=1.0
+foreground=383a42
+background=fafafa
+regular0=696c77  # black
+regular1=e45649  # red
+regular2=50a14f  # green
+regular3=c18401  # yellow
+regular4=4078f2  # blue
+regular5=a626a4  # magenta
+regular6=0184bc  # cyan
+regular7=383a42  # white
diff --git a/.config/i3/config b/.config/i3/config
index 57081a8..fafd56d 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -105,7 +105,7 @@ mode "Resize Mode" {
 bindsym $mod+r mode "Resize Mode"
 
 font pango:Source Code Pro Medium 11
-gaps inner 5
+gaps inner 0
 gaps outer 0
 default_border pixel 2
 default_floating_border pixel 2
diff --git a/.config/mimeapps.list b/.config/mimeapps.list
index a65ae03..c59a3b2 100644
--- a/.config/mimeapps.list
+++ b/.config/mimeapps.list
@@ -50,3 +50,6 @@ text/x-shellscript=nvim.desktop
 x-scheme-handler/about=org.qutebrowser.qutebrowser.desktop
 x-scheme-handler/unknown=org.qutebrowser.qutebrowser.desktop
 x-scheme-handler/terminal=Alacritty.desktop
+image/png=imv.desktop
+image/jpg=imv.desktop
+image/jpeg=imv.desktop
diff --git a/.config/newsboat/config b/.config/newsboat/config
index 2330a1f..594c8fb 100644
--- a/.config/newsboat/config
+++ b/.config/newsboat/config
@@ -29,7 +29,7 @@ color end-of-text-marker color8  default
 
 browser "setsid xdg-open %u >/dev/null 2>&1 &"
 macro v set browser "setsid mpv %u >/dev/null 2>&1 &" ; open-in-browser ; set browser "setsid xdg-open %u >/dev/null 2>&1 &"
-macro c set browser "echo %u | xclip -r -sel c" ; open-in-browser ; set browser "setsid xdg-open %u >/dev/null 2>&1 &"
+macro c set browser "wl-copy %u" ; open-in-browser ; set browser "setsid xdg-open %u >/dev/null 2>&1 &"
 macro d set browser "nohup yt-dlp -qi --embed-metadata --restrict-filenames %u &" ; open-in-browser ; set browser "setsid xdg-open %u >/dev/null 2>&1 &"
 
 highlight all "---.*---" yellow
diff --git a/.config/nvim/lua/options.lua b/.config/nvim/lua/options.lua
index 860a560..ea4a9f8 100644
--- a/.config/nvim/lua/options.lua
+++ b/.config/nvim/lua/options.lua
@@ -23,8 +23,8 @@ set.shiftwidth = 4
 set.softtabstop = 4
 set.autoindent = true
 set.expandtab = true
-set.showmode = false
-set.ruler = false
+-- set.showmode = false
+-- set.ruler = false
 set.timeout = false
 set.ttimeoutlen = 200
 set.wrap = false
diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua
index 8394d37..e534205 100644
--- a/.config/nvim/lua/plugins.lua
+++ b/.config/nvim/lua/plugins.lua
@@ -32,32 +32,32 @@ return require('packer').startup(function(use)
 
     use {
         "kyazdani42/nvim-web-devicons",
-        after = "onedark.nvim"
+        -- after = "onedark.nvim"
     }
 
-    use {
-        "nvim-lualine/lualine.nvim",
-        after = "nvim-web-devicons",
-        config = function()
-            require "setup.lualine"
-        end,
-    }
+    -- use {
+    --     "nvim-lualine/lualine.nvim",
+    --     after = "nvim-web-devicons",
+    --     config = function()
+    --         require "setup.lualine"
+    --     end,
+    -- }
 
-    use {
-        "lukas-reineke/indent-blankline.nvim",
-        event = { "BufRead", "BufNewFile" },
-        config = function()
-            require "setup.indent-blankline"
-        end,
-    }
+    -- use {
+    --     "lukas-reineke/indent-blankline.nvim",
+    --     event = { "BufRead", "BufNewFile" },
+    --     config = function()
+    --         require "setup.indent-blankline"
+    --     end,
+    -- }
 
-    use {
-        "kyazdani42/nvim-tree.lua",
-        cmd = { "NvimTreeToggle", "NvimTreeFindFile" },
-        config = function()
-            require "setup.nvim-tree"
-        end,
-    }
+    -- use {
+    --     "kyazdani42/nvim-tree.lua",
+    --     cmd = { "NvimTreeToggle", "NvimTreeFindFile" },
+    --     config = function()
+    --         require "setup.nvim-tree"
+    --     end,
+    -- }
 
     use {
         "nvim-treesitter/nvim-treesitter",
@@ -85,52 +85,44 @@ return require('packer').startup(function(use)
         end,
     }
 
-    -- use {
-    --     "williamboman/nvim-lsp-installer",
-    --     after = "nvim-lspconfig",
-    --     config = function()
-    --         require "setup.lspconfig"
-    --     end,
-    -- }
-
     use {
         "ray-x/lsp_signature.nvim",
-        after = "nvim-lspconfig",
+        event = "User lspAttached",
         config = function()
             require "setup.lsp_signature"
         end
     }
 
     use {
-        "L3MON4D3/LuaSnip",
-        wants = "friendly-snippets",
+        "hrsh7th/nvim-cmp",
         event = "User lspAttached",
         config = function()
-            require("luasnip/loaders/from_vscode").lazy_load()
+            require "setup.nvim-cmp"
         end,
     }
 
     use {
-        "rafamadriz/friendly-snippets",
-        module = "cmp_nvim_lsp",
+        "hrsh7th/cmp-nvim-lsp",
+        after = "nvim-cmp",
     }
 
     use {
-        "hrsh7th/nvim-cmp",
-        after = "LuaSnip",
-        config = function()
-            require "setup.nvim-cmp"
-        end,
+        "saadparwaiz1/cmp_luasnip",
+        after = { "LuaSnip", "nvim-cmp" }
     }
 
     use {
-        "saadparwaiz1/cmp_luasnip",
-        after = { "LuaSnip", "nvim-cmp" }
+        "L3MON4D3/LuaSnip",
+        after = "nvim-cmp",
+        wants = "friendly-snippets",
+        config = function()
+            require("luasnip/loaders/from_vscode").lazy_load()
+        end,
     }
 
     use {
-        "hrsh7th/cmp-nvim-lsp",
-        after = "cmp_luasnip",
+        "rafamadriz/friendly-snippets",
+        module = "cmp_nvim_lsp",
     }
 
     use {
@@ -138,13 +130,13 @@ return require('packer').startup(function(use)
         event = { "BufRead", "BufNewFile" },
     }
 
-    use {
-        "tpope/vim-fugitive",
-        cmd = { 'G', 'Ggrep' },
-        config = function()
-            require "setup.fugitive"
-        end,
-    }
+    -- use {
+    --     "tpope/vim-fugitive",
+    --     cmd = { 'G', 'Ggrep' },
+    --     config = function()
+    --         require "setup.fugitive"
+    --     end,
+    -- }
 
     use {
         "b3nj5m1n/kommentary",
@@ -174,20 +166,20 @@ return require('packer').startup(function(use)
         end
     }
 
-    use {
-        "norcalli/nvim-colorizer.lua",
-        cmd = { "ColorizerToggle" },
-        config = function()
-            require "colorizer".setup()
-        end,
-    }
+    -- use {
+    --     "norcalli/nvim-colorizer.lua",
+    --     cmd = { "ColorizerToggle" },
+    --     config = function()
+    --         require "colorizer".setup()
+    --     end,
+    -- }
 
-    use { "iamcco/markdown-preview.nvim",
-        ft = "markdown",
-        run = function()
-            vim.fn['mkdp#util#install']()
-        end,
-    }
+    -- use { "iamcco/markdown-preview.nvim",
+    --     ft = "markdown",
+    --     run = function()
+    --         vim.fn['mkdp#util#install']()
+    --     end,
+    -- }
 
     if Packer_bootstrap then
         require('packer').sync()
diff --git a/.config/nvim/lua/setup/lspconfig.lua b/.config/nvim/lua/setup/lspconfig.lua
index c76ef2d..d22450e 100644
--- a/.config/nvim/lua/setup/lspconfig.lua
+++ b/.config/nvim/lua/setup/lspconfig.lua
@@ -14,6 +14,12 @@ lspconfig.lua_ls.setup {
         }
     }
 }
+lspconfig.bashls.setup {
+    on_attach = on_attach,
+}
+lspconfig.pyright.setup{
+    on_attach = on_attach,
+}
 
 local signs = { Error = " ", Warn = " ", Hint = " ", Info = " " }
 for type, icon in pairs(signs) do
diff --git a/.config/picom/picom.conf b/.config/picom/picom.conf
deleted file mode 100644
index 4c51a40..0000000
--- a/.config/picom/picom.conf
+++ /dev/null
@@ -1,116 +0,0 @@
-backend = "glx";
-vsync = true;
-
-#################################
-#
-# Opacity
-#
-#################################
-
-inactive-opacity = 1;
-active-opacity = 1;
-frame-opacity = 1;
-inactive-opacity-override = false;
-
-# Dim inactive windows. (0.0 - 1.0)
-inactive-dim = 0.04;
-# Do not let dimness adjust based on window opacity.
-inactive-dim-fixed = true;
-# Blur background of transparent windows. Bad performance with X Render backend. GLX backend is preferred.
-blur-background = true;
-
-# Blur background of opaque windows with transparent frames as well.
-# blur-background-frame = true;
-
-# Do not let blur radius adjust based on window opacity.
-blur-background-fixed = false;
-
-blur-background-exclude = [
-    "window_type = 'dock'",
-    "window_type = 'desktop'",
-    "window_type = 'dnd'"
-];
-
-opacity-rule = [
-    "95:class_g = 'URxvt' && !_NET_WM_STATE@:32a",
-    "0:_NET_WM_STATE@[0]:32a *= '_NET_WM_STATE_HIDDEN'",
-    "0:_NET_WM_STATE@[1]:32a *= '_NET_WM_STATE_HIDDEN'",
-    "0:_NET_WM_STATE@[2]:32a *= '_NET_WM_STATE_HIDDEN'",
-    "0:_NET_WM_STATE@[3]:32a *= '_NET_WM_STATE_HIDDEN'",
-    "0:_NET_WM_STATE@[4]:32a *= '_NET_WM_STATE_HIDDEN'",
-    "100:_NET_WM_STATE@[0]:32a = '_NET_WM_STATE_FULLSCREEN'", 
-    "100:_NET_WM_STATE@[1]:32a = '_NET_WM_STATE_FULLSCREEN'",
-    "100:_NET_WM_STATE@[2]:32a = '_NET_WM_STATE_FULLSCREEN'", 
-    "100:_NET_WM_STATE@[3]:32a = '_NET_WM_STATE_FULLSCREEN'",
-    "100:_NET_WM_STATE@[4]:32a = '_NET_WM_STATE_FULLSCREEN'",
-    # "97:class_g = 'Alacritty' && !focused"
-];
-
-
-#################################
-#
-# Other
-#
-#################################
-
-# Try to detect WM windows and mark them as active.
-mark-wmwin-focused = true;
-# Mark all non-WM but override-redirect windows active (e.g. menus).
-mark-ovredir-focused = true;
-# Use EWMH _NET_WM_ACTIVE_WINDOW to determine which window is focused instead of using FocusIn/Out events.
-# Usually more reliable but depends on a EWMH-compliant WM.
-use-ewmh-active-win = true;
-# Detect rounded corners and treat them as rectangular when --shadow-ignore-shaped is on.
-detect-rounded-corners = true;
-
-# Detect _NET_WM_OPACITY on client windows, useful for window managers not passing _NET_WM_OPACITY of client windows to frame windows.
-# This prevents opacity being ignored for some apps.
-# For example without this enabled my xfce4-notifyd is 100% opacity no matter what.
-detect-client-opacity = true;
-
-# Unredirect all windows if a full-screen opaque window is detected, to maximize performance for full-screen windows, like games.
-# Known to cause flickering when redirecting/unredirecting windows.
-# paint-on-overlay may make the flickering less obvious.
-unredir-if-possible = true;
-
-# Specify a list of conditions of windows that should always be considered focused.
-focus-exclude = [ ];
-
-# Use WM_TRANSIENT_FOR to group windows, and consider windows in the same group focused at the same time.
-detect-transient = true;
-# Use WM_CLIENT_LEADER to group windows, and consider windows in the same group focused at the same time.
-# WM_TRANSIENT_FOR has higher priority if --detect-transient is enabled, too.
-detect-client-leader = true;
-
-
-#################################
-#
-# Window type settings
-#
-#################################
-
-wintypes:
-{
-    tooltip =
-    {
-        # fade: Fade the particular type of windows.
-        fade = true;
-        # shadow: Give those windows shadow
-        shadow = false;
-        # opacity: Default opacity for the type of windows.
-        opacity = 0.85;
-        # focus: Whether to always consider windows of this type focused.
-        focus = true;
-    };
-    dock = { shadow = false; }
-    dnd = { shadow = false; }
-    popup_menu = { 
-        opacity = 1.0; 
-        shadow = false;
-        fade = false;
-    }
-    dropdown_menu = { 
-        opacity = 1.0; 
-        fade = false;
-    }
-};
diff --git a/.config/polybar/config.ini b/.config/polybar/config.ini
index 9a79e00..fad40b7 100644
--- a/.config/polybar/config.ini
+++ b/.config/polybar/config.ini
@@ -15,15 +15,15 @@ focused-bg = #1c63a5
 unfocused-bg = #2f333c
 visible-bg = #182858
 
-[bar/bar1]
-bottom = true
+[bar/primary]
+bottom = false
 enable-ipc = true
 fixed-center = true
-monitor-fallback = eDP-1
 cursor-click = pointer
 
 modules-left = i3 xwindow
-modules-right = forecast xkeyboard pulseaudio battery network date
+modules-right = bluetooth forecast xkeyboard pulseaudio battery network date
+tray-position = right
 
 font-0 = Averia Libre:style=bold:size=15;4
 font-1 = Font Awesome 6 Pro Solid:size=14;5
@@ -33,7 +33,7 @@ foreground = ${colors.fg}
 
 height = 28
 padding-left = 3
-padding-right = 1
+padding-right = 0
 
 [module/xkeyboard]
 type = internal/xkeyboard
@@ -110,10 +110,10 @@ type = internal/date
 interval = 5
 format-padding = 3
 
-label = %date% %time%
+label = "%date%  %time%"
 label-foreground = ${colors.blue}
 
-date = "%a %e %b "
+date = "%a %e %b"
 time = %H:%M
 
 [module/pulseaudio]
diff --git a/.config/qutebrowser/greasemonkey/code.js b/.config/qutebrowser/greasemonkey/code.js
index d28a85f..bcbc022 100644..120000
--- a/.config/qutebrowser/greasemonkey/code.js
+++ b/.config/qutebrowser/greasemonkey/code.js
@@ -1,18 +1 @@
-// ==UserScript==
-// @name         AnonymousOverflow
-// @version      1.0
-// @match        *://stackoverflow.com/*
-// @match        *://*.stackoverflow.com/*
-// @grant        none
-// @run-at       document-start
-// ==/UserScript==
-
-(function () {
-    'use strict';
-
-    var instances = [
-        "code.whatever.social",
-    ];
-
-    top.location.hostname = instances[Math.floor(Math.random()*instances.length)];
-})();
+/home/adam/.config/qutebrowser/greasemonkey-available/code.js
\ No newline at end of file
diff --git a/.config/qutebrowser/greasemonkey/darkreader.js b/.config/qutebrowser/greasemonkey/darkreader.js
deleted file mode 100644
index 9ea2139..0000000
--- a/.config/qutebrowser/greasemonkey/darkreader.js
+++ /dev/null
@@ -1,30 +0,0 @@
-// ==UserScript==
-// @name          Dark Reader (Unofficial)
-// @icon          https://darkreader.org/images/darkreader-icon-256x256.png
-// @namespace     DarkReader
-// @description	  Inverts the brightness of pages to reduce eye strain
-// @version       4.7.15
-// @author        https://github.com/darkreader/darkreader#contributors
-// @homepageURL   https://darkreader.org/ | https://github.com/darkreader/darkreader
-// @run-at        document-end
-// @grant         none
-// @include       http*
-// @include       qute*
-// @exclude        *://discord.com/*
-// @exclude        *://github.com/*
-// @exclude        *://*sr.ht*/*
-// @exclude        *://invidious.*
-// @exclude        *://yewtu.be/*
-// @exclude        *://teddit.*
-// @exclude        *://*translate*/*
-// @exclude        *://*.thomann.de/*
-// @exclude        *://*.adast.xyz/*
-// @require       https://cdn.jsdelivr.net/npm/darkreader/darkreader.min.js
-// @noframes
-// ==/UserScript==
-
-DarkReader.enable({
-    brightness: 100,
-    contrast: 100,
-    sepia: 0
-});
diff --git a/.config/qutebrowser/greasemonkey/dumb.js b/.config/qutebrowser/greasemonkey/dumb.js
index 18507ea..38fa4e5 100644..120000
--- a/.config/qutebrowser/greasemonkey/dumb.js
+++ b/.config/qutebrowser/greasemonkey/dumb.js
@@ -1,19 +1 @@
-// ==UserScript==
-// @name         Dumb
-// @version      1.0
-// @description  genius to dumb
-// @match        *://genius.com/*
-// @match        *://*.genius.com/*
-// @grant        none
-// @run-at       document-start
-// ==/UserScript==
-
-(function () {
-    'use strict';
-
-    var instances = [
-        "sing.whatever.social",
-    ];
-
-    top.location.hostname = instances[Math.floor(Math.random()*instances.length)];
-})();
+/home/adam/.config/qutebrowser/greasemonkey-available/dumb.js
\ No newline at end of file
diff --git a/.config/qutebrowser/greasemonkey/invidious.js b/.config/qutebrowser/greasemonkey/invidious.js
index 023ac7d..0c4b1a3 100644..120000
--- a/.config/qutebrowser/greasemonkey/invidious.js
+++ b/.config/qutebrowser/greasemonkey/invidious.js
@@ -1,13 +1 @@
-// ==UserScript==
-// @name         Invidious
-// @description  youtube to invidious
-// @match        *://youtube.com/*
-// @match        *://*.youtube.com/*
-// @grant        none
-// @run-at       document-start
-// ==/UserScript==
-
-(function () {
-    'use strict';
-    top.location.hostname = "yewtu.be";
-})();
+/home/adam/.config/qutebrowser/greasemonkey-available/invidious.js
\ No newline at end of file
diff --git a/.config/qutebrowser/greasemonkey/nitter.js b/.config/qutebrowser/greasemonkey/nitter.js
index 40e99b9..6afba98 100644..120000
--- a/.config/qutebrowser/greasemonkey/nitter.js
+++ b/.config/qutebrowser/greasemonkey/nitter.js
@@ -1,15 +1 @@
-// ==UserScript==
-// @name         Nitter
-// @namespace    https://gist.github.com/bitraid/d1901de54382532a03b9b22a207f0417
-// @version      1.0
-// @description  twitter to nitter
-// @match        *://twitter.com/*
-// @match        *://mobile.twitter.com/*
-// @grant        none
-// @run-at       document-start
-// ==/UserScript==
-
-(function () {
-    'use strict';
-    top.location.hostname = "nitter.net";
-})();
+/home/adam/.config/qutebrowser/greasemonkey-available/nitter.js
\ No newline at end of file
diff --git a/.config/qutebrowser/greasemonkey/rimgo.js b/.config/qutebrowser/greasemonkey/rimgo.js
index 1f65f83..d9dfe71 100644..120000
--- a/.config/qutebrowser/greasemonkey/rimgo.js
+++ b/.config/qutebrowser/greasemonkey/rimgo.js
@@ -1,16 +1 @@
-// ==UserScript==
-// @name           Rimgo
-// @match          http://imgur.com/*
-// @match          https://imgur.com/*
-// @match          http://i.imgur.com/*
-// @match          https://i.imgur.com/*
-// @match          http://www.imgur.com/*
-// @match          https://www.imgur.com/*
-// @grant          none
-// @run-at         document-start
-// ==/UserScript==
-
-(function () {
-    'use strict';
-    top.location.hostname = "rimgo.bus-hit.me";
-})();
+/home/adam/.config/qutebrowser/greasemonkey-available/rimgo.js
\ No newline at end of file
diff --git a/.config/qutebrowser/greasemonkey/teddit.js b/.config/qutebrowser/greasemonkey/teddit.js
index 408e421..9956c1b 100644..120000
--- a/.config/qutebrowser/greasemonkey/teddit.js
+++ b/.config/qutebrowser/greasemonkey/teddit.js
@@ -1,26 +1 @@
-// ==UserScript==
-// @name         Teddit
-// @version      1.0
-// @description  reddit to teddit
-// @match        *://reddit.com/*
-// @match        *://*.reddit.com/*
-// @grant        none
-// @run-at       document-start
-// ==/UserScript==
-
-(function () {
-    'use strict';
-
-    var instances = [
-        "teddit.zaggy.nl",
-        "teddit.namazso.eu",
-        "reddit.lol",
-        "teddit.totaldarkness.net",
-        "teddit.adminforge.de",
-        "teddit.bus-hit.me",
-        "td.vern.cc",
-        "teddit.sethforprivacy.com"
-    ];
-
-    top.location.hostname = instances[Math.floor(Math.random()*instances.length)];
-})();
+/home/adam/.config/qutebrowser/greasemonkey-available/teddit.js
\ No newline at end of file
diff --git a/.config/sway/config b/.config/sway/config
new file mode 100644
index 0000000..593f216
--- /dev/null
+++ b/.config/sway/config
@@ -0,0 +1,185 @@
+include /etc/sway/config.d/*
+
+set $mod Mod4
+set $alt Mod1
+
+set $term alacritty
+set $menu bemenu-run -p "run" | xargs swaymsg exec --
+
+set $left h
+set $down j
+set $up k
+set $right l
+
+output * bg /home/adam/.local/share/bg center #000000
+
+input type:touchpad {
+    tap enabled
+    natural_scroll enabled
+}
+
+input type:keyboard {
+    xkb_layout us,dk
+    xkb_options grp:win_space_toggle
+    repeat_delay 200
+    repeat_rate 30
+}
+
+bindsym $mod+Return exec $term
+bindsym $mod+b exec qutebrowser
+bindsym $mod+Shift+q kill
+bindsym $mod+Escape exec systemctl suspend
+
+floating_modifier $mod normal
+bindsym $mod+Shift+r reload
+bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit'
+bindsym $mod+Shift+d exec ~/.local/bin/dock -d
+bindsym $mod+Shift+u exec ~/.local/bin/dock -u
+
+bindsym $mod+d exec $menu
+bindsym $mod+p exec ~/.local/bin/menu/pass
+bindsym $mod+Shift+p exec ~/.local/bin/menu/power
+bindsym $alt+b exec  clipman pick -t bemenu -T'-p "clip"'
+
+bindsym XF86AudioRaiseVolume exec pamixer -i 5
+bindsym XF86AudioLowerVolume exec pamixer -d 5
+bindsym XF86AudioMute exec pamixer -t
+bindsym XF86AudioPlay exec playerctl play-pause
+bindsym XF86AudioNext exec playerctl next
+bindsym XF86AudioPrev exec playerctl previous
+bindsym XF86MonBrightnessUp exec xbacklight -inc 5
+bindsym XF86MonBrightnessDown exec xbacklight -dec 5
+
+# Move your focus around
+bindsym $mod+$left focus left
+bindsym $mod+$down focus down
+bindsym $mod+$up focus up
+bindsym $mod+$right focus right
+# Or use $mod+[up|down|left|right]
+bindsym $mod+Left focus left
+bindsym $mod+Down focus down
+bindsym $mod+Up focus up
+bindsym $mod+Right focus right
+
+# Move the focused window with the same, but add Shift
+bindsym $mod+Shift+$left move left
+bindsym $mod+Shift+$down move down
+bindsym $mod+Shift+$up move up
+bindsym $mod+Shift+$right move right
+# Ditto, with arrow keys
+bindsym $mod+Shift+Left move left
+bindsym $mod+Shift+Down move down
+bindsym $mod+Shift+Up move up
+bindsym $mod+Shift+Right move right
+#
+# Workspaces:
+#
+# Switch to workspace
+bindsym $mod+1 workspace number 1
+bindsym $mod+2 workspace number 2
+bindsym $mod+3 workspace number 3
+bindsym $mod+4 workspace number 4
+bindsym $mod+5 workspace number 5
+bindsym $mod+6 workspace number 6
+bindsym $mod+7 workspace number 7
+bindsym $mod+8 workspace number 8
+bindsym $mod+9 workspace number 9
+bindsym $mod+0 workspace number 10
+# Move focused container to workspace
+bindsym $mod+Shift+1 move container to workspace number 1
+bindsym $mod+Shift+2 move container to workspace number 2
+bindsym $mod+Shift+3 move container to workspace number 3
+bindsym $mod+Shift+4 move container to workspace number 4
+bindsym $mod+Shift+5 move container to workspace number 5
+bindsym $mod+Shift+6 move container to workspace number 6
+bindsym $mod+Shift+7 move container to workspace number 7
+bindsym $mod+Shift+8 move container to workspace number 8
+bindsym $mod+Shift+9 move container to workspace number 9
+bindsym $mod+Shift+0 move container to workspace number 10
+# Note: workspaces can have any name you want, not just numbers.
+# We just use 1-10 as the default.
+#
+# Layout stuff:
+#
+# You can "split" the current object of your focus with
+# $mod+b or $mod+v, for horizontal and vertical splits
+# respectively.
+bindsym $mod+g splith
+bindsym $mod+v splitv
+
+# Switch the current container between different layout styles
+bindsym $mod+s layout stacking
+bindsym $mod+w layout tabbed
+bindsym $mod+e layout toggle split
+
+# Make the current focus fullscreen
+bindsym $mod+f fullscreen
+
+# Toggle the current focus between tiling and floating mode
+bindsym $mod+Shift+space floating toggle
+
+# Swap focus between the tiling area and the floating area
+bindsym $mod+tab focus mode_toggle
+
+# Move focus to the parent container
+bindsym $mod+a focus parent
+#
+# Scratchpad:
+#
+# Sway has a "scratchpad", which is a bag of holding for windows.
+# You can send windows there and get them back later.
+
+# Move the currently focused window to the scratchpad
+bindsym $mod+Shift+minus move scratchpad
+
+# Show the next scratchpad window or hide the focused scratchpad window.
+# If there are multiple scratchpad windows, this command cycles through them.
+bindsym $mod+minus scratchpad show
+
+mode "resize" {
+    bindsym $left resize shrink width 15px
+    bindsym $down resize grow height 15px
+    bindsym $up resize shrink height 15px
+    bindsym $right resize grow width 15px
+
+    bindsym Left resize shrink width 15px
+    bindsym Down resize grow height 15px
+    bindsym Up resize shrink height 15px
+    bindsym Right resize grow width 15px
+
+    bindsym Return mode "default"
+    bindsym Escape mode "default"
+}
+bindsym $mod+r mode "resize"
+
+default_border pixel
+default_floating_border pixel
+hide_edge_borders smart
+smart_gaps on
+
+for_window [class="floating_window"] floating enable
+for_window [window_role="pop-up"] floating enable
+for_window [window_role="About"] floating enable
+for_window [class="Nextcloud"] floating enable
+
+seat seat0 xcursor_theme phinger-cursors-light 32
+set $gnome-schema org.gnome.desktop.interface
+exec_always {
+    gsettings set $gnome-schema cursor-theme 'phinger-cursors-light'
+}
+exec_always xrdb -load /home/adam/.config/X11/Xresources
+
+exec wl-paste -t text --watch clipman store --no-persist
+exec nm-applet --indicator
+
+bar {
+    position top
+    status_command i3status
+}
+
+exec swayidle -w \
+         timeout 300 'swaylock -f -c 000000' \
+         timeout 360 'systemctl suspend' \
+         before-sleep 'swaylock -f -c 000000'
+
+font pango:DejaVu Sans Mono 10
diff --git a/.config/waybar/config b/.config/waybar/config
new file mode 100644
index 0000000..94fe484
--- /dev/null
+++ b/.config/waybar/config
@@ -0,0 +1,16 @@
+{
+    "layer": "bottom",
+    "modules-left": ["sway/workspaces", "sway/mode"],
+    "modules-center": ["sway/window"],
+    "modules-right": ["battery", "pulseaudio", "network", "clock", "tray"],
+    "sway/window": {
+        "max-length": 50
+    },
+    "battery": {
+        "format": "{capacity}% {icon}",
+        "format-icons": ["", "", "", "", ""]
+    },
+    "clock": {
+        "format-alt": "{:%a, %d. %b  %H:%M}"
+    }
+}