169 files changed, 205 insertions, 744 deletions

diff --git a/home-config/alacritty/alacritty.yml b/home-config/alacritty/alacritty.yml
deleted file mode 100644
index 37c52d4..0000000
--- a/home-config/alacritty/alacritty.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-# Colorscheme
-import:
-- ~/.config/alacritty/catppuccin-mocha.yml
-
-# Window settings
-window:
-  opacity: .85
-  padding:
-    x: 5
-    y: 5
-
-# Set font
-font:
-    normal:
-        family: FiraCode Nerd Font Mono
-        style: Regular
-    bold:
-        style: Bold
-    italic:
-        style: Italic
-    bold_italic:
-        style: Bold Italic
-    size: 11
-    offset:
-        x: 0
-        y: 0
-
-colors:
-  primary:
-    background: '0x14171d'
-    foreground: '0xc7c6c3'
diff --git a/home-config/alacritty/catppuccin-mocha.yml b/home-config/alacritty/catppuccin-mocha.yml
deleted file mode 100644
index 74ea60c..0000000
--- a/home-config/alacritty/catppuccin-mocha.yml
+++ /dev/null
@@ -1,78 +0,0 @@
-colors:
-    primary:
-        background: "#1d1d2d" # base
-        foreground: "#CDD6F4" # text
-        # Bright and dim foreground colors
-        dim_foreground: "#CDD6F4" # text
-        bright_foreground: "#CDD6F4" # text
-
-    # Cursor colors
-    cursor:
-        text: "#1E1E2E" # base
-        cursor: "#F5E0DC" # rosewater
-    vi_mode_cursor:
-        text: "#1E1E2E" # base
-        cursor: "#B4BEFE" # lavender
-
-    # Search colors
-    search:
-        matches:
-            foreground: "#1E1E2E" # base
-            background: "#A6ADC8" # subtext0
-        focused_match:
-            foreground: "#1E1E2E" # base
-            background: "#A6E3A1" # green
-        footer_bar:
-            foreground: "#1E1E2E" # base
-            background: "#A6ADC8" # subtext0
-
-    # Keyboard regex hints
-    hints:
-        start:
-            foreground: "#1E1E2E" # base
-            background: "#F9E2AF" # yellow
-        end:
-            foreground: "#1E1E2E" # base
-            background: "#A6ADC8" # subtext0
-
-    # Selection colors
-    selection:
-        text: "#1E1E2E" # base
-        background: "#F5E0DC" # rosewater
-
-    # Normal colors
-    normal:
-        black: "#45475A" # surface1
-        red: "#F38BA8" # red
-        green: "#A6E3A1" # green
-        yellow: "#F9E2AF" # yellow
-        blue: "#89B4FA" # blue
-        magenta: "#F5C2E7" # pink
-        cyan: "#94E2D5" # teal
-        white: "#BAC2DE" # subtext1
-
-    # Bright colors
-    bright:
-        black: "#585B70" # surface2
-        red: "#F38BA8" # red
-        green: "#A6E3A1" # green
-        yellow: "#F9E2AF" # yellow
-        blue: "#89B4FA" # blue
-        magenta: "#F5C2E7" # pink
-        cyan: "#94E2D5" # teal
-        white: "#A6ADC8" # subtext0
-
-    # Dim colors
-    dim:
-        black: "#45475A" # surface1
-        red: "#F38BA8" # red
-        green: "#A6E3A1" # green
-        yellow: "#F9E2AF" # yellow
-        blue: "#89B4FA" # blue
-        magenta: "#F5C2E7" # pink
-        cyan: "#94E2D5" # teal
-        white: "#BAC2DE" # subtext1
-
-    indexed_colors:
-        - { index: 16, color: "#FAB387" }
-        - { index: 17, color: "#F5E0DC" }
diff --git a/home-config/gtk/gtk-3.0/bookmarks b/home-config/gtk/gtk-3.0/bookmarks
deleted file mode 100644
index 3412d1a..0000000
--- a/home-config/gtk/gtk-3.0/bookmarks
+++ /dev/null
@@ -1,2 +0,0 @@
-file:///home/freya/code
-file:///home/freya/sync
diff --git a/home-config/gtk/gtk-3.0/settings.ini b/home-config/gtk/gtk-3.0/settings.ini
deleted file mode 100644
index ed5349d..0000000
--- a/home-config/gtk/gtk-3.0/settings.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-[Settings]
-gtk-application-prefer-dark-theme=0
-#gtk-theme-name=Catppuccin-Mocha-Standard-Blue-dark
-gtk-theme-name=Lavanda-Sea-Dark
-gtk-font-name=Cantarell 11
-gtk-cursor-theme-name=Adwaita
-gtk-cursor-theme-size=14
-gtk-toolbar-style=GTK_TOOLBAR_BOTH
-gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
-gtk-button-images=1
-gtk-menu-images=1
-gtk-enable-event-sounds=1
-gtk-enable-input-feedback-sounds=1
-gtk-xft-antialias=1
-gtk-xft-hinting=1
-gtk-xft-hintstyle=hintfull
-gtk-xft-rgba=rgb
-gtk-icon-theme-name=Adwaita
diff --git a/home-config/gtk/gtk-4.0/settings.ini b/home-config/gtk/gtk-4.0/settings.ini
deleted file mode 100644
index 7c6461a..0000000
--- a/home-config/gtk/gtk-4.0/settings.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[Settings]
-gtk-application-prefer-dark-theme=0
diff --git a/home-config/gtk/gtkrc-2.0 b/home-config/gtk/gtkrc-2.0
deleted file mode 100644
index 25fd8e8..0000000
--- a/home-config/gtk/gtkrc-2.0
+++ /dev/null
@@ -1,18 +0,0 @@
-# DO NOT EDIT! This file will be overwritten by LXAppearance.
-# Any customization should be done in ~/.gtkrc-2.0.mine instead.
-
-include "/home/freya/.gtkrc-2.0.mine"
-gtk-theme-name="Lavanda-Sea-Dark"
-gtk-icon-theme-name="Adwaita"
-gtk-font-name="Cantarell 11"
-gtk-cursor-theme-name="Adwaita"
-gtk-cursor-theme-size=14
-gtk-toolbar-style=GTK_TOOLBAR_BOTH
-gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
-gtk-button-images=1
-gtk-menu-images=1
-gtk-enable-event-sounds=1
-gtk-enable-input-feedback-sounds=1
-gtk-xft-antialias=1
-gtk-xft-hinting=1
-gtk-xft-hintstyle="hintfull"
diff --git a/home-config/hypr/config.d/autostart.sh b/home-config/hypr/config.d/autostart.sh
deleted file mode 100755
index 9b18715..0000000
--- a/home-config/hypr/config.d/autostart.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-pipewire & &> ~/.log/pipewire
-pipewire-pulse & &> ~/.log/pipewire-pulse
-wireplumber & &> ~/.log/wireplumber
-
-/usr/lib/xdg-desktop-portal -r &
-/usr/lib/xdg-desktop-portal-hyprland -r &
-
-waybar &
-
-mako &
-
-hyprpaper &
-
-nm-applet --indicator &
-
-/usr/bin/gnome-keyring-daemon --foreground &
-
-discord --enable-features=UseOzonePlatform --ozone-platform=wayland &
-element-desktop --enable-features=UseOzonePlatform --ozone-platform=wayland &
diff --git a/home-config/hypr/config.d/theme.conf b/home-config/hypr/config.d/theme.conf
deleted file mode 100644
index 90e23e8..0000000
--- a/home-config/hypr/config.d/theme.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-general {
-    gaps_in = $radius
-    gaps_out = $gaps
-    border_size = $border
-    col.active_border = rgba(aaaaaa90)
-    col.inactive_border = rgba(77777790)
-    col.group_border_active = rgba(aaaaaa90)
-    col.group_border = rgba(77777790)
-
-    layout = dwindle
-}
-
-decoration {
-
-    rounding = 5
-    drop_shadow = yes
-    shadow_range = 4
-    shadow_render_power = 3
-    col.shadow = rgba(1a1a1aee)
-}
-
-animations {
-    enabled = yes
-
-    bezier = myBezier, 0.05, 0.9, 0.1, 1.05
-
-    #animation = windows, 1, 7, myBezier
-    #animation = windowsOut, 1, 7, default, popin 80%
-    animation = border, 1, 10, default
-    animation = borderangle, 1, 8, default
-    animation = fade, 1, 7, default
-    animation = workspaces, 1, 6, default
-}
-
-windowrule = float, ^(wlogout)$
-windowrule = move 12.5% 12.5%, ^(wlogout)$
-windowrule = size 75% 75%, ^(wlogout)$
-windowrule = noborder, ^(wlogout)$
-windowrule = noshadow, ^(wlogout)$
-windowrule = nofullscreenrequest, ^(wlogout)$
diff --git a/home-config/hypr/hyprpaper.conf b/home-config/hypr/hyprpaper.conf
deleted file mode 100644
index 1bfca3c..0000000
--- a/home-config/hypr/hyprpaper.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-preload = ~/sync/wallpapers/nya0.png
-wallpaper = ,~/sync/wallpapers/nya0.png
diff --git a/home-config/mako/config b/home-config/mako/config
deleted file mode 100644
index 862f2e5..0000000
--- a/home-config/mako/config
+++ /dev/null
@@ -1,24 +0,0 @@
-font=Fira Mono 10
-background-color=#1d1b2b
-border-size=2
-border-radius=5
-margin=6
-padding=5,8
-progress-color=#373c47
-layer=overlay
-icons=1
-
-[urgency=low]
-text-color=#98c379
-border-color=#98c379
-default-timeout=10000
-
-[urgency=normal]
-text-color=#61afef
-border-color=#61afef
-default-timeout=10000
-
-[urgency=critical]
-text-color=#e06c75
-border-color=#e06c75
-default-timeout=0
diff --git a/home-config/mako/config.bak b/home-config/mako/config.bak
deleted file mode 100644
index 88da911..0000000
--- a/home-config/mako/config.bak
+++ /dev/null
@@ -1,23 +0,0 @@
-font=Source Code Pro Medium 10
-background-color=#272b33
-border-size=2
-margin=6
-padding=5,8
-progress-color=#373c47
-layer=overlay
-icons=1
-
-[urgency=low]
-text-color=#98c379
-border-color=#98c379
-default-timeout=10000
-
-[urgency=normal]
-text-color=#61afef
-border-color=#61afef
-default-timeout=10000
-
-[urgency=critical]
-text-color=#e06c75
-border-color=#e06c75
-default-timeout=0
diff --git a/home-config/nvim/init.vim b/home-config/nvim/init.vim
deleted file mode 100644
index 45b705b..0000000
--- a/home-config/nvim/init.vim
+++ /dev/null
@@ -1,36 +0,0 @@
-call plug#begin()
-
-Plug 'itchyny/lightline.vim'
-
-Plug 'folke/tokyonight.nvim', { 'branch': 'main' }
-
-call plug#end()
-
-syntax on
-filetype plugin indent on
-
-colorscheme tokyonight-moon
-let g:lightline = {'colorscheme': 'tokyonight'}
-
-set mouse=v
-set mouse=a
-set clipboard=unnamedplus
-set autoindent
-set hlsearch
-set tabstop=4
-set shiftwidth=0
-set expandtab
-set number
-set cc=80
-set encoding=utf-8
-set nofoldenable
-set laststatus=2
-set noshowmode
-set modeline
-set mouse=a
-set ttyfast
-set colorcolumn=0
-
-hi Normal guibg=NONE ctermbg=NONE
-hi LineNr term=bold cterm=bold ctermfg=2 guifg=White guibg=NONE
-
diff --git a/home-config/sway/config.d/idle b/home-config/sway/config.d/idle
deleted file mode 100644
index fb13083..0000000
--- a/home-config/sway/config.d/idle
+++ /dev/null
@@ -1,5 +0,0 @@
-# Turn off display after tiemout
-exec swayidle -w \
-    timeout 300 'swaylock -f -c 14171d' \
-    timeout 300 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \
-    before-sleep 'swaylock -f -c 14171d'
diff --git a/home-config/sway/logout.d/power/img/lock-hover.png b/home-config/sway/logout.d/power/img/lock-hover.png
deleted file mode 100644
index 46c51b0..0000000
--- a/home-config/sway/logout.d/power/img/lock-hover.png
+++ /dev/null
diff --git a/home-config/sway/logout.d/power/img/lock.png b/home-config/sway/logout.d/power/img/lock.png
deleted file mode 100644
index f1ec4a2..0000000
--- a/home-config/sway/logout.d/power/img/lock.png
+++ /dev/null
diff --git a/home-config/sway/logout.d/power/img/logout-hover.png b/home-config/sway/logout.d/power/img/logout-hover.png
deleted file mode 100644
index b34a150..0000000
--- a/home-config/sway/logout.d/power/img/logout-hover.png
+++ /dev/null
diff --git a/home-config/sway/logout.d/power/img/logout.png b/home-config/sway/logout.d/power/img/logout.png
deleted file mode 100644
index 59a5aeb..0000000
--- a/home-config/sway/logout.d/power/img/logout.png
+++ /dev/null
diff --git a/home-config/sway/logout.d/power/img/power-hover.png b/home-config/sway/logout.d/power/img/power-hover.png
deleted file mode 100644
index a65e429..0000000
--- a/home-config/sway/logout.d/power/img/power-hover.png
+++ /dev/null
diff --git a/home-config/sway/logout.d/power/img/power.png b/home-config/sway/logout.d/power/img/power.png
deleted file mode 100644
index 6aac455..0000000
--- a/home-config/sway/logout.d/power/img/power.png
+++ /dev/null
diff --git a/home-config/sway/logout.d/power/img/restart-hover.png b/home-config/sway/logout.d/power/img/restart-hover.png
deleted file mode 100644
index 7921398..0000000
--- a/home-config/sway/logout.d/power/img/restart-hover.png
+++ /dev/null
diff --git a/home-config/sway/logout.d/power/img/restart.png b/home-config/sway/logout.d/power/img/restart.png
deleted file mode 100644
index 5851243..0000000
--- a/home-config/sway/logout.d/power/img/restart.png
+++ /dev/null
diff --git a/home-config/sway/logout.d/power/img/sleep-hover.png b/home-config/sway/logout.d/power/img/sleep-hover.png
deleted file mode 100644
index 7c9b6b3..0000000
--- a/home-config/sway/logout.d/power/img/sleep-hover.png
+++ /dev/null
diff --git a/home-config/sway/logout.d/power/img/sleep.png b/home-config/sway/logout.d/power/img/sleep.png
deleted file mode 100644
index 164f5fb..0000000
--- a/home-config/sway/logout.d/power/img/sleep.png
+++ /dev/null
diff --git a/home-config/sway/logout.d/power/layout b/home-config/sway/logout.d/power/layout
deleted file mode 100644
index ecd4759..0000000
--- a/home-config/sway/logout.d/power/layout
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "label" : "lock",
-    "action" : "swaylock -f -c 14171d",
-    "text" : "Lock",
-    "keybind" : "l"
-}
-{
-    "label" : "logout",
-    "action" : "loginctl terminate-user $USER",
-    "text" : "Logout",
-    "keybind" : "e"
-}
-{
-    "label" : "shutdown",
-    "action" : "loginctl poweroff",
-    "text" : "Shutdown",
-    "keybind" : "s"
-}
-{
-    "label" : "suspend",
-    "action" : "loginctl suspend",
-    "text" : "Suspend",
-    "keybind" : "u"
-}
-{
-    "label" : "reboot",
-    "action" : "loginctl reboot",
-    "text" : "Reboot",
-    "keybind" : "r"
-}
diff --git a/home-config/sway/logout.d/power/style.css b/home-config/sway/logout.d/power/style.css
deleted file mode 100644
index e80dd33..0000000
--- a/home-config/sway/logout.d/power/style.css
+++ /dev/null
@@ -1,76 +0,0 @@
-nk* {
-    font-family: "Fira Mono", "Font Awesome 6 Pro", monospace;
-    font-size: 16px;
-    font-weight: bold;
-}
-
-window {
-	background-color: rgba(0, 0, 0, 0);
-}
-
-button {
-	background-color: #242434;
-    background-image: none;
-    color: #89ADF8;
-	border: 1px solid rgba(0, 0, 0, 0);
-    margin: 5px;
-	border-radius: 10px;
-	background-repeat: no-repeat;
-	background-position: center;
-	background-size: 35%;
-}
-
-button:focus, button:active {
-	background-color: #89B4FA;
-    color: #242434;
-    font-weight: 500;
-	outline-style: none;
-}
-
-#lock {
-    background-image: image(url("img/lock.png"));
-}
-
-#logout {
-    background-image: image(url("img/logout.png"));
-}
-
-#suspend {
-    background-image: image(url("img/sleep.png"));
-}
-
-#hibernate {
-    background-image: image(url("img/hibernate.png"));
-}
-
-#shutdown {
-    background-image: image(url("img/power.png"));
-}
-
-#reboot {
-    background-image: image(url("img/restart.png"));
-}
-
-#lock:focus {
-    background-image: image(url("img/lock-hover.png"));
-}
-
-#logout:focus {
-    background-image: image(url("img/logout-hover.png"));
-}
-
-#suspend:focus {
-    background-image: image(url("img/sleep-hover.png"));
-}
-
-#hibernate:focus {
-    background-image: image(url("img/hibernate-hover.png"));
-}
-
-#shutdown:focus {
-    background-image: image(url("img/power-hover.png"));
-}
-
-#reboot:focus {
-    background-image: image(url("img/restart-hover.png"));
-}
diff --git a/home-config/sway/scripts.d/auto.sh b/home-config/sway/scripts.d/auto.sh
deleted file mode 100755
index 68a28e2..0000000
--- a/home-config/sway/scripts.d/auto.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-/usr/lib/xdg-desktop-portal -r &
-/usr/lib/xdg-desktop-portal-wlr -r &
-
-mako &
-
-nm-applet --indicator &
-
-GTK_THEME= waybar &
-
-autotiling &
-
-/usr/bin/gnome-keyring-daemon --foreground &
-
-discord --enable-features=UseOzonePlatform --ozone-platform=wayland &
-element-desktop --enable-features=UseOzonePlatform --ozone-platform=wayland &
-#thunderbird &
-
diff --git a/home-config/xdg/user-dirs.dirs b/home-config/xdg/user-dirs.dirs
deleted file mode 100644
index adf6780..0000000
--- a/home-config/xdg/user-dirs.dirs
+++ /dev/null
@@ -1,8 +0,0 @@
-XDG_DESKTOP_DIR="$HOME/desktop"
-XDG_DOCUMENTS_DIR="$HOME/documents"
-XDG_DOWNLOAD_DIR="$HOME/downloads"
-XDG_MUSIC_DIR="$HOME/music"
-XDG_PICTURES_DIR="$HOME/pictures"
-XDG_PUBLICSHARE_DIR="$HOME/public"
-XDG_TEMPLATES_DIR="$HOME/templates"
-XDG_VIDEOS_DIR="$HOME/videos"
diff --git a/home-config/zsh/zprofile b/home-config/zsh/zprofile
deleted file mode 100644
index 2fc8f23..0000000
--- a/home-config/zsh/zprofile
+++ /dev/null
@@ -1,59 +0,0 @@
-# Setup locale
-export LANG=en_US.UTF-8
-export LC_COLLATE=C
-
-# Make sure programs know to use wayland
-export QT_QPA_PLATFORM=xcb # fuck qt
-export ELM_DISPLAY=wl
-export SDL_VIDEODRIVER=wayland
-export MOZ_ENABLE_WAYLAND=1
-
-# Setup the desktop XDG session
-export XDG_RUNTIME_DIR=/run/user/$(id -u)
-export XDG_SESSION_TYPE=wayland
-export XDG_CURRENT_DESKTOP=sway
-export LIBSEAT_BACKEND=logind
-
-# Neovim go brrrr
-export EDITOR=nvim
-
-# Fix java applications going fucking crazy on wayland
-export _JAVA_AWT_WM_NONREPARENTING=1
-
-# ricing
-#export GTK_THEME=Catppuccin-Macchiato-Standard-Sapphire-dark
-export GTK_THEME=Lavanda-Sea-Dark
-#export GTK_THEME=Adwaita-dark
-
-# Set terminal
-export TERMINAL=alacritty
-
-# Setup Guix Environment
-export GUIX_PROFILE=$HOME/.guix-profile
-$HOME/.guix-home/on-first-login
-. $HOME/.guix-home/setup-environment
-
-# Setup Nix Environment
-export NIX_PROFILE=$HOME/.nix-profile
-export XDG_DATA_DIRS=$XDG_DATA_DIRS:$NIX_PROFILE/share
-export PATH=$PATH:$NIX_PROFILE/bin
-export LIBRARY_PATH=$LIBRARY_PATH:$NIX_PROFILE/lib
-
-# Setup User Environment
-export LOCAL_PROFILE=$HOME/.local
-export XDG_DATA_DIRS=$XDG_DATA_DIRS:$LOCAL_PROFILE/share
-export PATH=$PATH:$LOCAL_PROFILE/bin
-
-# Setup Compilers
-export CC=$(which gcc)
-export LD=$(which gcc)
-
-# Setup certs
-export SSL_CERT_FILE=/run/current-system/profile/etc/ssl/certs/ca-certificates.crt
-export SSL_CERT_DIR=/run/current-system/profile/etc/ssl/certs
-
-# start sway only once and on the primary tty
-if [ -z "${DISPLAY}" ] && [ "${XDG_VTNR}" -eq 1 ]; then
-#    dbus-run-session Hyprland &> .log/hyprland
-    exec dbus-run-session sway &> .log/sway
-fi
diff --git a/home-config/zsh/zshrc b/home-config/zsh/zshrc
deleted file mode 100644
index 4782ca4..0000000
--- a/home-config/zsh/zshrc
+++ /dev/null
@@ -1,70 +0,0 @@
-# Zsh shell initalization file
-
-# Export 'SHELL' to child processes
-export SHELL
-
-if [[ $- != *i* ]]
-then
-    # We are being invoked from a non-interactive shell.  If this
-    # is an SSH session (as in "ssh host command"), source
-    # /etc/profile so we get PATH and other essential variables.
-    [[ -n "$SSH_CLIENT" ]] && source /etc/profile
-
-    # Don't do anything else.
-    return
-fi
-
-PATH=$PATH:$HOME/.cargo/bin
-
-# vim mode >:)
-# no ryan i am not copying you
-set -o vi
-set show-mode-in-prompt on
-
-# Set shell prompt using starship
-eval "$(starship init zsh)"
-
-# Set guix reconfigure aliases
-alias reconfigure-system="sudo -E guix system -L $HOME/.config/guix/modules reconfigure $HOME/.config/guix/$(hostname).scm"
-alias reconfigure-user="guix home -L $HOME/.config/guix/modules reconfigure $HOME/.config/guix/home-config/home-configuration.scm && home-manager switch"
-
-# Set other usefull aliases
-alias neo="pfetch"
-alias rf="rm -fr" # remove le french hon hon hon
-alias config="/usr/bin/git --git-dir=$HOME/.cfg/ --work-tree=$HOME"
-alias ls="ls --color=auto"
-alias su="doas -s"
-
-# Have manpages use colors
-man() {
-	env \
-	LESS_TERMCAP_md=$'\e[1;36m' \
-	LESS_TERMCAP_me=$'\e[0m' \
-	LESS_TERMCAP_se=$'\e[0m' \
-	LESS_TERMCAP_so=$'\e[1;92m' \
-	LESS_TERMCAP_ue=$'\e[0m' \
-	LESS_TERMCAP_us=$'\e[1;35m' \
-	man "$@"
-}
-
-# Enable zsh auto suggestions
-autoload compinit && compinit
-source $GUIX_PROFILE/share/zsh/zsh-autosuggestions/zsh-autosuggestions.zsh
-ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=#696e8a"
-ZSH_AUTOSUGGEST_STRATEGY=(completion history)
-
-# Enable zsh keybinds for home, end, and other movement keybinds
-bindkey "\e[1;5D" backward-word
-bindkey "\e[1;5C" forward-word
-bindkey "\e[3;5~" kill-word
-bindkey "\C-_"    backward-kill-word
-bindkey "\e[3~" delete-char
-bindkey "\e[H"  beginning-of-line
-bindkey "\e[F"  end-of-line
-bindkey "\e\d"  undo
-
-# GPG SETUP FOR SSH
-export GPG_TTY=$(tty)
-
-# ricing
-pfetch
diff --git a/home-config/sway/wallpapers/blue.jpg b/home/config/desktop-common/wallpapers/blue.jpg
index acd376b..acd376b 100755..100644
--- a/home-config/sway/wallpapers/blue.jpg
+++ b/home/config/desktop-common/wallpapers/blue.jpg
diff --git a/home-config/sway/wallpapers/nya0.png b/home/config/desktop-common/wallpapers/nya0.png
index e9da5d5..e9da5d5 100644
--- a/home-config/sway/wallpapers/nya0.png
+++ b/home/config/desktop-common/wallpapers/nya0.png
diff --git a/home-config/git/gitconfig b/home/config/git/gitconfig
index 0260067..c7aa4a0 100644
--- a/home-config/git/gitconfig
+++ b/home/config/git/gitconfig
@@ -3,6 +3,6 @@
 	email = freya@freyacat.org
 	name = Freya Murphy
 [commit]
-	gpgsign = true
+	gpgsign = false
 [init]
 	defaultBranch = main
diff --git a/home-config/gnupg/gpg-agent.conf b/home/config/gnupg/gpg-agent.conf
index 230b310..230b310 100644
--- a/home-config/gnupg/gpg-agent.conf
+++ b/home/config/gnupg/gpg-agent.conf
diff --git a/home-config/gnupg/sshcontrol b/home/config/gnupg/sshcontrol
index c61ee5c..c61ee5c 100644
--- a/home-config/gnupg/sshcontrol
+++ b/home/config/gnupg/sshcontrol
diff --git a/home-config/hypr/config.d/input.conf b/home/config/hypr/config.d/input.conf
index 947ae3d..363c473 100644
--- a/home-config/hypr/config.d/input.conf
+++ b/home/config/hypr/config.d/input.conf
@@ -1,13 +1,12 @@
+monitor= eDP-1, highres, auto, $scale
 
-monitor= eDP-1, 3072x1920, 0x0, $scale
-
-env = XCURSOR_SIZE, 24
+env = GDK_SCALE,1.25
 
 input {
     kb_layout = us
     kb_variant =
     kb_model =
-    kb_options = gtp:alt_shit_toggle, compose:rctrl
+    kb_options = gtp:alt_shit_toggle, compose:ralt
     kb_rules =
 
     follow_mouse = 1
@@ -18,7 +17,3 @@ input {
 
     sensitivity = 0
 }
-
-device:epic-mouse-v1 {
-    sensitivity = -0.5
-}
diff --git a/home-config/hypr/config.d/keybinds.conf b/home/config/hypr/config.d/keybinds.conf
index 3351e85..4c24083 100644
--- a/home-config/hypr/config.d/keybinds.conf
+++ b/home/config/hypr/config.d/keybinds.conf
@@ -1,34 +1,30 @@
 
+bind = $mod SHIFT, SPACE, togglefloating
 bind = $mod, Return, exec, $term
 bind = $mod, W, exec, $browser
-bind = $mod SHIFT, SPACE, togglefloating
-bind = $mod, D, exec, $menu 
+bind = $mod, D, exec, $menu
 bind = $mod, J, togglesplit
 bind = $mod, F, fullscreen
-bind = $mod, L, exec, killall wlogout || wlogout --css ~/scripts/power/style.css -l ~/scripts/power/layout
-bind = $mod, P, exec, killall wlogout || wlogout --css ~/scripts/monitor/style.css -l ~/scripts/monitor/layout -b 2 -L 400 -R 400
-bind = $mod SHIFT, B, exec, killall waybar && waybar
-bind = $mod SHIFT, Q, killactive
-bind = $mod SHIFT, W, exec, hyprpaper
 
-$monitor_sh = ~/scripts/monitor
-bind = $mod ALT, right, exec, $monitor_sh right
-bind = $mod ALT, left, exec, $monitor_sh left
-bind = $mod ALT, up, exec, $monitor_sh mirror
-bind = $mod ALT, down, exec, $monitor_sh disable
+bind = $mod, L, exec, hyprlock
+bind = $mod SHIFT, L, exec, killall Hyprland
+
+bind = $mod SHIFT, Q, killactive
+bind = $mod, F5, exec, sh -c 'killall waybar; waybar --config ~/.config/waybar/config.hypr'
 
 binde =, XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+
 binde =, XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
 binde =, XF86AudioMute, exec, pactl set-sink-mute @DEFAULT_SINK@ toggle
 binde =, XF86AudioMicMute, exec, pactl set-source-mute @DEFAULT_SOURCE@ toggle
 
-binde =, XF86MonBrightnessDown, exec, brightnessctl set 5%-
-binde =, XF86MonBrightnessUp, exec, brightnessctl set 5%+
-
 binde =, XF86AudioPlay, exec, playerctl play-pause
 binde =, XF86AudioNext, exec, playerctl next
 binde =, XF86AudioPrev, exec, playerctl previous
 
-bind = ,Print, exec, grim -g "$(slurp)" - | wl-copy   
+binde =, XF86MonBrightnessDown, exec, brightnessctl set 5%-
+binde =, XF86MonBrightnessUp, exec, brightnessctl set 5%+
+
+bind = $mod SHIFT, s, exec, grim -g "$(slurp)" - | wl-copy -t image/png && notify-send -t 3000 "Hyprland" "Screenshot copied to clipboard"
+bind = , Print, exec, grim - | wl-copy -t iamge/png && notify-send -t 3000 "Hyprland" "Full screen copied to clipboard"
 bind = SHIFT, Print, exec, slurp -p | grim -g - - | convert - txt:- | tail -n 1 | awk '{print $3}' | wl-copy
-bind = CONTROL, Print, exec, 
+
diff --git a/home-config/hypr/config.d/workspaces.conf b/home/config/hypr/config.d/workspaces.conf
index 2f3e81c..408b05f 100644
--- a/home-config/hypr/config.d/workspaces.conf
+++ b/home/config/hypr/config.d/workspaces.conf
@@ -1,6 +1,6 @@
 
 dwindle {
-    pseudotile = yes 
+    pseudotile = yes
     preserve_split = yes
 }
 
@@ -17,10 +17,10 @@ bind = $mod, down, movefocus, d
 
 # Move window across workspace with mod + arrow keys
 
-bind = $mod SHIFT, left, movewindow, l
-bind = $mod SHIFT, right, movewindow, r
-bind = $mod SHIFT, up, movewindow, u
-bind = $mod SHIFT, down, movewindow, d
+bind = $mod SHIFT, left, hy3:movewindow, l
+bind = $mod SHIFT, right, hy3:movewindow, r
+bind = $mod SHIFT, up, hy3:movewindow, u
+bind = $mod SHIFT, down, hy3:movewindow, d
 
 # Switch workspaces with mod + [0-9]
 
@@ -47,6 +47,27 @@ bind = $mod SHIFT, 8, movetoworkspacesilent, 8
 bind = $mod SHIFT, 9, movetoworkspacesilent, 9
 bind = $mod SHIFT, 0, movetoworkspacesilent, 10
 
+# Move to tab
+
+bind = $mod CONTROL, 1, hy3:focustab, index, 01
+bind = $mod CONTROL, 2, hy3:focustab, index, 02
+bind = $mod CONTROL, 3, hy3:focustab, index, 03
+bind = $mod CONTROL, 4, hy3:focustab, index, 04
+bind = $mod CONTROL, 5, hy3:focustab, index, 05
+bind = $mod CONTROL, 6, hy3:focustab, index, 06
+bind = $mod CONTROL, 7, hy3:focustab, index, 07
+bind = $mod CONTROL, 8, hy3:focustab, index, 08
+bind = $mod CONTROL, 9, hy3:focustab, index, 09
+bind = $mod CONTROL, 0, hy3:focustab, index, 10
+
+bindn = , mouse:272, hy3:focustab, mouse
+bindn = , mouse_down, hy3:focustab, l, require_hovered
+bindn = , mouse_up, hy3:focustab, r, require_hovered
+
+bind = $mod SHIFT, B, hy3:makegroup, h
+bind = $mod SHIFT, V, hy3:makegroup, v
+bind = $mod SHIFT, C, hy3:changegroup, toggletab
+
 # Scroll through existing workspaces with mod + scroll
 
 bind = $mod, mouse_down, workspace, e+1
diff --git a/home-config/hypr/hyprland.conf b/home/config/hypr/hyprland.conf
index 743fa37..ccea461 100644
--- a/home-config/hypr/hyprland.conf
+++ b/home/config/hypr/hyprland.conf
@@ -1,22 +1,22 @@
-exec-once = dbus-update-activation-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP=Hyprland
-
 $mod = SUPER
 
-$term = alacritty
+$term = kitty
 
 $menu = wofi --allow-images --show drun --prompt "Search Program"
 
-$scale = 1.5
+$scale = 1.25
 
 $radius = 5
-$gaps = 10
-$border = 3
+$border = 2
 
-$browser = firefox
+$browser = librewolf
 
-source = ~/.config/hypr/config.d/theme.conf
+source = ~/.config/hypr/config.d/plugins.conf
+source = ~/.config/hypr/config.d/colors.conf
 source = ~/.config/hypr/config.d/keybinds.conf
+source = ~/.config/hypr/config.d/theme.conf
 source = ~/.config/hypr/config.d/input.conf
 source = ~/.config/hypr/config.d/workspaces.conf
+source = ~/.config/hypr/monitors.conf
 
-exec-once = ~/.config/hypr/config.d/autostart.sh
+exec-once = ~/.config/hypr/scripts.d/autostart.sh
diff --git a/home-config/lvim/config.lua b/home/config/lvim/config.lua
index 09776ff..09776ff 100644
--- a/home-config/lvim/config.lua
+++ b/home/config/lvim/config.lua
diff --git a/home-config/lvim/lazy-lock.json b/home/config/lvim/lazy-lock.json
index c604568..c604568 100644
--- a/home-config/lvim/lazy-lock.json
+++ b/home/config/lvim/lazy-lock.json
diff --git a/home-config/ssh/config b/home/config/ssh/config
index 88b89c3..3377b18 100644
--- a/home-config/ssh/config
+++ b/home/config/ssh/config
@@ -26,6 +26,6 @@ Host github.com
     User tam2214
     IdentityFile /home/freya/.ssh/id_rit
 
-#Host *
-#    KexAlgorithms -sntrup761x25519-sha512@openssh.com
+Host *
+    KexAlgorithms -sntrup761x25519-sha512@openssh.com
 
diff --git a/home-config/starship/starship.toml b/home/config/starship/starship.toml
index b3e3af7..ad76d5f 100644
--- a/home-config/starship/starship.toml
+++ b/home/config/starship/starship.toml
@@ -9,15 +9,15 @@ $line_break\
 """
 
 [username]
-style_user = 'bold blue'
-style_root = 'bold red'
+style_user = 'bold purple'
+style_root = 'bold purple'
 format = '[$user]($style) '
 disabled = false
 show_always = true
 
 [hostname]
 ssh_only = false
-format = 'on [$hostname](bold red) '
+format = 'on [$hostname](bold blue) '
 disabled = false
 
 [directory]
diff --git a/home-config/sway/config b/home/config/sway/config
index 497b549..d8526ad 100755..100644
--- a/home-config/sway/config
+++ b/home/config/sway/config
@@ -1,20 +1,20 @@
-# xdg desktop portal fix
-exec dbus-update-activation-environment DISPLAY I3SOCK SWAYSOCK WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
-
 # Set super key
 set $mod Mod4
 
 # Set terminal
-set $term alacritty
+set $term kitty
 
 # Set app launcher
 set $menu wofi --allow-images --show=drun --prompt "Search Program"
 
 # Set scale
-set $scale 1.5
+set $scale 1.25
 
 # Set background
-set $bg ~/.config/sway/wallpapers/blue.jpg
+set $bg ~/.config/desktop-common/wallpapers/davekat.png
+
+# Set lockscreen
+set $lock hyprlock
 
 # Set Efects
 set $gaps 10
@@ -22,14 +22,20 @@ set $radius 0
 set $shadows on
 set $shadow_blur 15
 set $blur enable
-set $blur_radius 4
-set $blur_passes 2
+set $blur_radius 10
+set $blur_passes 3
 
 # Set browser
-set $browser firefox
+set $browser librewolf
 
-# Autostart apps
-exec $HOME/.config/sway/scripts.d/auto.sh
+# System configs
+include /etc/sway/config.d/*
 
 # Local configs
 include $HOME/.config/sway/config.d/*
+
+# Nwg
+include $HOME/.config/sway/outputs
+
+# Autostart apps
+exec $HOME/.config/sway/scripts.d/auto.sh
diff --git a/home-config/sway/config.d/gestures b/home/config/sway/config.d/gestures
index 4bdb136..4bdb136 100644
--- a/home-config/sway/config.d/gestures
+++ b/home/config/sway/config.d/gestures
diff --git a/home-config/sway/config.d/input b/home/config/sway/config.d/input
index a02f6d6..9cb7156 100644
--- a/home-config/sway/config.d/input
+++ b/home/config/sway/config.d/input
@@ -6,6 +6,7 @@ input * xkb_numlock enable
 # Keyboard layout, change as you wish
 input * {
     xkb_layout "us"
+    xkb_options compose:ralt
 }
 
 # Touchpad input settings
@@ -16,5 +17,4 @@ input type:touchpad {
 }
 
 # Screen settings
-#exec swaymsg output $screen resolution $resolution scale $scale
-output eDP-1 resolution 3072x1920 scale $scale
+# output eDP-1 resolution 3072x1920 scale $scale
diff --git a/home-config/sway/config.d/keybinds b/home/config/sway/config.d/keybinds
index bfc6f56..214be98 100644
--- a/home-config/sway/config.d/keybinds
+++ b/home/config/sway/config.d/keybinds
@@ -13,13 +13,10 @@ bindsym $mod+d exec $menu
 bindsym $mod+w exec $browser
 
 # Lock screen
-bindsym $mod+Shift+l exec $lock
+bindsym $mod+l exec $lock
 
 # Exit sway
-bindsym Ctrl+Alt+Delete exec killall sway
-
-# Power menu
-bindsym $mod+L exec killall wlogout || wlogout --css ~/.config/sway/logout.d/power/style.css -l ~/.config/sway/logout.d/power/layout
+bindsym $mod+Shift+l exit
 
 # Drag floating windows by holding down $mod and left mouse button.
 # Resize them with right mouse button + $mod.
@@ -34,12 +31,10 @@ bindsym $mod+F5 reload
 # Audio keybinds
 bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5%
 bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5%
+bindsym Shift+XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ 10000%
+bindsym Shift+XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ 0%
 bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle
 bindsym XF86AudioMicMute exec pactl set-source-mute @DEFAULT_SOURCE@ toggle
-bindsym F3 exec pactl set-sink-volume @DEFAULT_SINK@ +5%
-bindsym F2 exec pactl set-sink-volume @DEFAULT_SINK@ -5%
-bindsym F1 exec pactl set-sink-mute @DEFAULT_SINK@ toggle
-bindsym F4 exec pactl set-source-mute @DEFAULT_SOURCE@ toggle
 
 # Brightness keybinds
 bindsym XF86MonBrightnessDown exec brightnessctl set 5%-
@@ -51,6 +46,12 @@ bindsym XF86AudioNext exec playerctl next
 bindsym XF86AudioPrev exec playerctl previous
 
 # Screenshot
-bindsym Print exec grim -g "$(slurp)" - | wl-copy   
-bindsym Alt+Print exec grim - | wl-copy
+bindsym $mod+Shift+s exec grim -g "$(slurp)" - | wl-copy -t image/png && notify-send -t 3000 "Sway" "Screenshot copied to clipboard"
+bindsym Print exec grim - | wl-copy -t iamge/png && notify-send -t 3000 "Sway" "Full screen copied to clipboard"
 bindsym Shift+Print exec slurp -p | grim -g - - | convert - txt:- | tail -n 1 | awk '{print $3}' | wl-copy
+
+# Michelsoft Binbows
+bindsym Ctrl+$mod+Shift+L exec $browser "https://linkedin.com"
+bindsym Ctrl+$mod+Shift+S exec $term -e sl
+bindsym Ctrl+$mod+Shift+T exec electron28 "https://twitter.com"
+bindsym Ctrl+$mod+Shift+M exec electron28 "https://www.tumblr.com"
diff --git a/home-config/sway/config.d/project b/home/config/sway/config.d/project
index 3cb1049..5f74a43 100644
--- a/home-config/sway/config.d/project
+++ b/home/config/sway/config.d/project
@@ -1,6 +1,6 @@
 ### Project
 
-bindsym $mod+Alt+Left exec ~/.config/sway/scripts.d/project.sh LEFT
-bindsym $mod+Alt+Right exec ~/.config/sway/scripts.d/project.sh RIGHT
-bindsym $mod+Alt+Up exec ~/.config/sway/scripts.d/project.sh EXTERNAL_ONLY
-bindsym $mod+Alt+Down exec ~/.config/sway/scripts.d/project.sh PRIMARY_ONLY
+bindsym $mod+Alt+Left exec ~/.config/sway/scripts.d/project.sh LEFT $scale
+bindsym $mod+Alt+Right exec ~/.config/sway/scripts.d/project.sh RIGHT $scale
+bindsym $mod+Alt+Up exec ~/.config/sway/scripts.d/project.sh EXTERNAL_ONLY $scale
+bindsym $mod+Alt+Down exec ~/.config/sway/scripts.d/project.sh PRIMARY_ONLY $scale
diff --git a/home-config/sway/config.d/scratch b/home/config/sway/config.d/scratch
index 0337319..bdafcf6 100644
--- a/home-config/sway/config.d/scratch
+++ b/home/config/sway/config.d/scratch
@@ -7,8 +7,12 @@ bindsym $mod+Shift+minus move scratchpad
 # If there are multiple scratchpad windows, this command cycles through them.
 bindsym $mod+minus scratchpad show
 
+exec ~/.config/sway/scripts.d/scratchpads.sh
+
 for_window [app_id="scratch_term"] move scratchpad, resize set 960 640
 for_window [app_id="scratch_htop"] move scratchpad, resize set 960 640
+for_window [app_id="scratch_calc"] move scratchpad, resize set 960 640
 
 bindsym $mod+y exec ~/.config/sway/scripts.d/scratchpads.sh scratch_term zsh
 bindsym $mod+h exec ~/.config/sway/scripts.d/scratchpads.sh scratch_htop htop
+bindsym $mod+c exec ~/.config/sway/scripts.d/scratchpads.sh scratch_calc matrix
diff --git a/home-config/sway/config.d/theme b/home/config/sway/config.d/theme
index e8d2822..3d93752 100644
--- a/home-config/sway/config.d/theme
+++ b/home/config/sway/config.d/theme
@@ -1,8 +1,8 @@
 ### Set borders
 gaps inner $gaps
-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
 
 ### Colors
 
@@ -25,8 +25,11 @@ shadow_color #14171dff
 blur $blur
 blur_radius $blur_radius
 blur_passes $blur_passes
-layer_effects "waybar" blur enable; shadows enable
+layer_effects "waybar" blur disable; shadows disable
 layer_effects "wofi" blur enable; shadows enable
 
 ### Output configuration
 output * bg $bg fill
+
+### Bar
+bar swaybar_command waybar
diff --git a/home-config/sway/config.d/workspaces b/home/config/sway/config.d/workspaces
index fe87bc1..5fac86b 100644
--- a/home-config/sway/config.d/workspaces
+++ b/home/config/sway/config.d/workspaces
@@ -21,7 +21,6 @@ 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
@@ -33,11 +32,11 @@ 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
 
 # Layout stuff:
 
 # Set the new window positioning mode
+bindsym $mod+Shift+d layout default
 bindsym $mod+Shift+b layout splith
 bindsym $mod+Shift+v layout splitv
 bindsym $mod+Shift+c layout tabbed
diff --git a/home-config/sway/scripts.d/project.sh b/home/config/sway/scripts.d/project.sh
index afb8507..84e1a8d 100755
--- a/home-config/sway/scripts.d/project.sh
+++ b/home/config/sway/scripts.d/project.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+PID=$$
+
 get_mode() {
     swaymsg -t get_outputs -r | jq ".[$1].modes[0]"
 }
@@ -56,24 +58,25 @@ get_id() {
     i=0
     while true; do
         NAME="$(get_name $i)"
-        if [ "$NAME" == "$1" ]; then
+        if [ $(echo "$NAME" | grep "^$1") ]; then
             echo "$i"
-            exit 0
+            return 0
         elif [ "$NAME" == "null" ]; then
-            exit 1
+            return 1
         fi
         ((i=i+1))
     done
 }
 
 die() {
-    notify-send -u critical -t 3000 "Sway" "Failed to get display"
+    notify-send -u critical -t 3000 "Sway" "$1"
+    kill $PID
 }
 
-PRIMARY=$(get_id "eDP-1")
-EXTERNAL=$(get_id "DP-1" || get_id "HDMI-1")
+PRIMARY=$(get_id "eDP-1" || die "Failed to get primary display")
+EXTERNAL=$(get_id "DP" || get_id "HDMI" || die "Failed to get external display")
 
-PRIMARY_SCALE=1.5
+PRIMARY_SCALE=$2
 EXTERNAL_SCALE=1
 
 set_monitors() {
diff --git a/home-config/sway/scripts.d/scratchpads.sh b/home/config/sway/scripts.d/scratchpads.sh
index bb8e361..bb8e361 100755
--- a/home-config/sway/scripts.d/scratchpads.sh
+++ b/home/config/sway/scripts.d/scratchpads.sh
diff --git a/home-config/waybar/config b/home/config/waybar/config
index 68b2adc..34cf25e 100644
--- a/home-config/waybar/config
+++ b/home/config/waybar/config
@@ -1,5 +1,7 @@
 {
     "height": 24,
+    "position": "top",
+    "layer": "bottom",
     "spacing": 4,
     "modules-left": [
         "sway/workspaces",
@@ -12,7 +14,7 @@
         "temperature",
         "battery",
         "backlight",
-        "pulseaudio",
+        "wireplumber",
         "network",
         "clock",
         "tray"
@@ -41,7 +43,7 @@
     },
     "temperature": {
         "interval": 1,
-        "thermal-zone": 1,
+        "thermal-zone": 0,
         "critical-threshold": 80,
         "format": " {temperatureC}°"
     },
@@ -61,7 +63,7 @@
     "backlight": {
         "format": " {percent}%"
     },
-    "pulseaudio": {
+    "wireplumber": {
         "format": " {volume}%",
         "format-bluetooth": " {volume}%",
         "format-muted": " muted",
diff --git a/home-config/waybar/style.css b/home/config/waybar/style.css
index 2452a0b..0d159fd 100644
--- a/home-config/waybar/style.css
+++ b/home/config/waybar/style.css
@@ -1,57 +1,61 @@
 * {
-    font-family: "Fira Mono", "Font Awesome 6 Pro", monospace;
+    font-family: "JetBrains Mono", "Font Awesome 6 Pro", monospace;
     font-size: 13.5px;
     transition: none;
     margin: 0;
     padding: 0;
 }
 
-/*
-#waybar {
-    background-color: rgba(20, 23, 29, 0.85);
-    color: #c7c6c3;
-}
-*/
-
 window#waybar {
-    background-color: rgba(20, 23, 29, 0.85);
-    color: #c7c6c3;
+    background-color: transparent;
 }
 
-/*
 window#waybar > box {
-    margin-bottom: 8px;
+    margin: 10px;
+    margin-bottom: 0px;
+    padding: 0;
     color: #c7c6c3;
-    box-shadow: 0px 0px 3px 2px rgba(20, 23, 29, 0.70);
 }
-*/
 
 button {
     border: none;
     border-radius: 0;
 }
 
+.modules-left,
+.modules-right {
+    margin: 0;
+    padding: 2px 0px;
+    background-color: #14171d;
+    border-radius: 4px;
+}
+
+#workspaces {
+    padding: 0px 0px;
+}
+
 #workspaces button {
+    all: initial;
+    box-shadow: inherit;
+    text-shadow: inherit;
     color: #c7c6c3;
-    background-color: rgba(0, 0, 0, 0);
+    background-color: transparent;
+    border-radius: 4px;
+    padding: 2px 8px;
 }
 
 #workspaces button:hover {
-    box-shadow: inherit;
-    text-shadow: inherit;
+    background-color: #1a2a3a;
 }
 
-#workspaces button.focused {
+#workspaces button.focused,
+#workspaces button.active {
     background-color: #789ebf;
     color: #14171d;
-    box-shadow: inherit;
-    text-shadow: inherit;
 }
 
 #workspaces button.urgent {
     background-color: #cc5c5c;
-    box-shadow: inherit;
-    text-shadow: inherit;
 }
 
 #clock,
@@ -62,7 +66,7 @@ button {
 #temperature,
 #backlight,
 #network,
-#pulseaudio,
+#wireplumber,
 #custom-media,
 #tray,
 #mode,
@@ -91,7 +95,6 @@ button {
     margin: 0 4px;
 }
 
-
 #battery {
     color: #97bd5e;
 }
@@ -104,15 +107,17 @@ button {
     color: #cc5c5c;
 }
 
-#network.disconnected, #pulseaudio.muted {
+#network.disconnected,
+#wireplumber.muted {
     color: #cc5c5c;
 }
 
-#network.wifi, #network.ethernet {
+#network.wifi,
+#network.ethernet {
     color: #789ebf;
 }
 
-#pulseaudio {
+#wireplumber {
     color: #E0DB5F;
 }
 
@@ -136,10 +141,6 @@ button {
     color: #cc5c5c;
 }
 
-#custom-newsboat {
-    color: #de7e54;
-}
-
 #tray > .passive {
     -gtk-icon-effect: dim;
 }
diff --git a/home-config/wofi/config b/home/config/wofi/config
index 6b28876..51ad2ed 100644
--- a/home-config/wofi/config
+++ b/home/config/wofi/config
@@ -1,5 +1,5 @@
 key_expand=Tab
-term=alacritty
+term=kitty
 matching=multi-contains
 insensitive=true
 gtk_dark=true
diff --git a/home-config/wofi/style.css b/home/config/wofi/style.css
index 2ef5f5a..2ef5f5a 100644
--- a/home-config/wofi/style.css
+++ b/home/config/wofi/style.css
diff --git a/home-config/xdg/mimeapps.list b/home/config/xdg/mimeapps.list
index f91778a..6096d4c 100644
--- a/home-config/xdg/mimeapps.list
+++ b/home/config/xdg/mimeapps.list
@@ -1,9 +1,9 @@
 [Default Applications]
-text/html=firefox.desktop
-x-scheme-handler/http=firefox.desktop
-x-scheme-handler/https=firefox.desktop
-x-scheme-handler/about=firefox.desktop
-x-scheme-handler/unknown=firefox.desktop
+text/html=librewolf.desktop
+x-scheme-handler/http=librewolf.desktop
+x-scheme-handler/https=librewolf.desktop
+x-scheme-handler/about=librewolf.desktop
+x-scheme-handler/unknown=librewolf.desktop
 image/png=imv.desktop
 image/jpeg=imv.desktop
 image/webp=imv.desktop
@@ -29,25 +29,13 @@ text/x-moc=nvim.desktop
 text/x-pascal=nvim.desktop
 text/x-tcl=nvim.desktop
 text/x-tex=nvim.desktop
-application/x-shellscript=nvim.desktop
 text/x-c=nvim.desktop
 text/x-c++=nvim.desktop
-application/gzip=org.gnome.Nautilus.desktop
-application/zip=org.gnome.Nautilus.desktop
-application/x-bzip2=org.gnome.Nautilus.desktop
-application/vnd.ms-opentype=org.gnome.Nautilus.desktop
-font/sfnt=org.gnome.Nautilus.desktop
-application/java-archive=org.gnome.Nautilus.desktop
-application/x-iso9660-image=org.gnome.Nautilus.desktop
-application/x-xz=org.gnome.Nautilus.desktop
 application/x-zerosize=nvim.desktop
-x-scheme-handler/mailto=userapp-Thunderbird-4IZTA2.desktop
-message/rfc822=userapp-Thunderbird-4IZTA2.desktop
-x-scheme-handler/mid=userapp-Thunderbird-4IZTA2.desktop
-x-scheme-handler/webcal=userapp-Thunderbird-9WQSA2.desktop
-text/calendar=userapp-Thunderbird-9WQSA2.desktop
-application/x-extension-ics=userapp-Thunderbird-9WQSA2.desktop
-x-scheme-handler/webcals=userapp-Thunderbird-9WQSA2.desktop
+application/x-shellscript=nvim.desktop
+x-scheme-handler/msteams=teams.desktop
+x-scheme-handler/mspa=unofficial-homestuck-collection.desktop
+hoppscotch=hoppscotch-handler.desktop
 
 [Added Associations]
 application/x-zerosize=nvim.desktop;
@@ -55,9 +43,8 @@ x-scheme-handler/mailto=userapp-Thunderbird-E9G491.desktop;userapp-Thunderbird-4
 x-scheme-handler/mid=userapp-Thunderbird-E9G491.desktop;userapp-Thunderbird-4IZTA2.desktop;
 x-scheme-handler/webcal=userapp-Thunderbird-9WQSA2.desktop;
 x-scheme-handler/webcals=userapp-Thunderbird-9WQSA2.desktop;
-x-scheme-handler/mailto=userapp-Thunderbird-E9G491.desktop
-message/rfc822=userapp-Thunderbird-E9G491.desktop
-x-scheme-handler/mid=userapp-Thunderbird-E9G491.desktop
+x-scheme-handler/mailto=userapp-Thunderbird-E9G491.desktop;userapp-Thunderbird-Y667E2.desktop;userapp-Thunderbird-2QYKF2.desktop;
+message/rfc822=userapp-Thunderbird-E9G491.desktop;
+x-scheme-handler/mid=userapp-Thunderbird-E9G491.desktop;userapp-Thunderbird-Y667E2.desktop;userapp-Thunderbird-2QYKF2.desktop;
 x-scheme-handler/discord=discord.desktop;
 x-scheme-handler/slack=slack.desktop;
-
diff --git a/home-config/nix-home-manager/home.nix b/home/home.nix
index e425b7b..e425b7b 100644
--- a/home-config/nix-home-manager/home.nix
+++ b/home/home.nix
diff --git a/home-config/home-configuration.scm b/home/home.scm
index 3b9edaa..77a927a 100644
--- a/home-config/home-configuration.scm
+++ b/home/home.scm
@@ -15,14 +15,14 @@
              (gnu home services desktop)
              (gnu home services gnupg)
              (gnu home services)
-             (home-services pipewire)
-             (home-packages shells)
-             (home-packages mozillia)
-             (home-packages vim)
-             (home-packages gnome-xyz)
-             (home-packages shells)
-             (home-packages certs)
-             (home-packages audio))
+             (freya services pipewire)
+             (freya packages shells)
+             (freya packages mozillia)
+             (freya packages vim)
+             (freya packages gnome-xyz)
+             (freya packages shells)
+             (freya packages certs)
+             (freya packages audio))
 
 
 (home-environment
@@ -83,12 +83,13 @@
                                                     "openssl"
                                                     "pkg-config"
                                                     "tree-sitter-cli"
+                                                    "zsh-syntax-highlighting"
                                                     "python-pynvim"))
 
-            (list neovim-new 
-                  easyeffects 
-                  firefox-wayland-new 
-                  lavanda-gtk-theme 
+            (list neovim-new
+                  easyeffects
+                  firefox-wayland-new
+                  lavanda-gtk-theme
                   zsh-autosuggestions
                   freya-ca-certs
                   vim-plug)))
@@ -98,35 +99,39 @@
   (services
    (list (service home-zsh-service-type
                   (home-zsh-configuration
-                   (zshrc (list (local-file "zsh/zshrc")))
-                   (zprofile (list (local-file "zsh/zprofile")))))
+                   (zshrc (list (local-file "config/zsh/zshrc")))
+                   (zprofile (list (local-file "config/zsh/zprofile")))))
 
          (service home-xdg-configuration-files-service-type
-                  `(("nvim/init.vim" ,(local-file "nvim/init.vim"))
-                    ("sway" ,(local-file "sway" #:recursive? #t))
-                    ("waybar" ,(local-file "waybar" #:recursive? #t))
-                    ("alacritty" ,(local-file "alacritty" #:recursive? #t))
-                    ("lvim" ,(local-file "lvim" #:recursive? #t))
-                    ("mako" ,(local-file "mako" #:recursive? #t))
-                    ("gtk-3.0" ,(local-file "gtk/gtk-3.0" #:recursive? #t))
-                    ("gtk-4.0" ,(local-file "gtk/gtk-4.0" #:recursive? #t))
-                    ("wofi" ,(local-file "wofi" #:recursive? #t))
-                    ("hypr" ,(local-file "hypr" #:recursive? #t))
-                    ("mimeapps.list" ,(local-file "xdg/mimeapps.list" #:recursive? #t))
-                    ("user-dirs.dirs" ,(local-file "xdg/user-dirs.dirs" #:recursive? #t))
-                    ("starship.toml" ,(local-file "starship/starship.toml" #:recursive? #t))
-                    ("home-manager/home.nix" ,(local-file "nix-home-manager/home.nix")) ))
-         
+                  `(("nvim" ,(local-file "config/nvim" #:recursive? #t))
+                    ("sway" ,(local-file "config/sway" #:recursive? #t))
+                    ("swaylock" ,(local-file "config/swaylock" #:recursive? #t))
+                    ("waybar" ,(local-file "config/waybar" #:recursive? #t))
+                    ("alacritty" ,(local-file "config/alacritty" #:recursive? #t))
+                    ("kitty" ,(local-file "config/kitty" #:recursive? #t))
+                    ("ranger" ,(local-file "config/ranger" #:recursive? #t))
+                    ("mako" ,(local-file "config/mako" #:recursive? #t))
+                    ("gtk-2.0" ,(local-file "config/gtk/gtk-2.0" #:recursive? #t))
+                    ("gtk-3.0" ,(local-file "config/gtk/gtk-3.0" #:recursive? #t))
+                    ("gtk-4.0" ,(local-file "config/gtk/gtk-4.0" #:recursive? #t))
+                    ("Trolltech.conf" ,(local-file "config/gtk/Trolltech.conf"))
+                    ("wofi" ,(local-file "config/wofi" #:recursive? #t))
+                    ("hypr" ,(local-file "config/hypr" #:recursive? #t))
+                    ("desktop-common" ,(local-file "config/desktop-common" #:recursive? #t))
+                    ("mimeapps.list" ,(local-file "config/xdg/mimeapps.list" #:recursive? #t))
+                    ("user-dirs.dirs" ,(local-file "config/xdg/user-dirs.dirs" #:recursive? #t))
+                    ("starship.toml" ,(local-file "config/starship/starship.toml" #:recursive? #t))
+                    ("home-manager/home.nix" ,(local-file "home.nix" #:recursive? #t)) ))
+
          (service home-files-service-type
                   `((".local/share/nvim/site/autoload/plug.vim" ,(file-append vim-plug "/share/vim/plug.vim"))
-                    (".ssh/config" ,(local-file "ssh/config"))
-                    (".gnupg/sshcontrol" ,(local-file "gnupg/sshcontrol"))
-                    (".local/share/fonts" ,(local-file "fonts" #:recursive? #t))
-                    (".local/share/applications" ,(local-file "applications" #:recursive? #t))
-                    (".local/share/icons" ,(local-file "icons" #:recursive? #t))
-                    (".gtkrc-2.0" ,(local-file "gtk/gtkrc-2.0"))
+                    (".ssh/config" ,(local-file "config/ssh/config"))
+                    (".gnupg/sshcontrol" ,(local-file "config/gnupg/sshcontrol"))
+                    (".local/share/fonts" ,(local-file "local/fonts" #:recursive? #t))
+                    (".local/share/applications" ,(local-file "local/applications" #:recursive? #t))
+                    (".local/share/icons" ,(local-file "local/icons" #:recursive? #t))
                     (".nix-channels" ,(local-file "nix-channels"))
-                    (".gitconfig" ,(local-file "git/gitconfig"))))
+                    (".gitconfig" ,(local-file "config/git/gitconfig"))))
 
          (service home-pipewire-service-type)
          (service home-dbus-service-type)
diff --git a/home-config/applications/thunderbird.desktop b/home/local/applications/thunderbird.desktop
index d8059c3..d8059c3 100644
--- a/home-config/applications/thunderbird.desktop
+++ b/home/local/applications/thunderbird.desktop
diff --git a/home-config/fonts/BrailleCc0-DOeDd.ttf b/home/local/fonts/BrailleCc0-DOeDd.ttf
index 68b3c68..68b3c68 100755
--- a/home-config/fonts/BrailleCc0-DOeDd.ttf
+++ b/home/local/fonts/BrailleCc0-DOeDd.ttf
diff --git a/home-config/fonts/FiraCodeNerdFontMono-Regular.ttf b/home/local/fonts/FiraCodeNerdFontMono-Regular.ttf
index e6b6f75..e6b6f75 100755
--- a/home-config/fonts/FiraCodeNerdFontMono-Regular.ttf
+++ b/home/local/fonts/FiraCodeNerdFontMono-Regular.ttf
diff --git a/home-config/fonts/FiraMono-Bold.ttf b/home/local/fonts/FiraMono-Bold.ttf
index 23bc30f..23bc30f 100644
--- a/home-config/fonts/FiraMono-Bold.ttf
+++ b/home/local/fonts/FiraMono-Bold.ttf
diff --git a/home-config/fonts/FiraMono-Medium.ttf b/home/local/fonts/FiraMono-Medium.ttf
index 793c60d..793c60d 100644
--- a/home-config/fonts/FiraMono-Medium.ttf
+++ b/home/local/fonts/FiraMono-Medium.ttf
diff --git a/home-config/fonts/FiraMono-Regular.ttf b/home/local/fonts/FiraMono-Regular.ttf
index 67bbd42..67bbd42 100644
--- a/home-config/fonts/FiraMono-Regular.ttf
+++ b/home/local/fonts/FiraMono-Regular.ttf
diff --git a/home-config/fonts/fa-regular-400.ttf b/home/local/fonts/fa-regular-400.ttf
index 1bd5782..1bd5782 100755
--- a/home-config/fonts/fa-regular-400.ttf
+++ b/home/local/fonts/fa-regular-400.ttf
diff --git a/home-config/fonts/windows/.uuid b/home/local/fonts/windows/.uuid
index c942ca9..c942ca9 100644
--- a/home-config/fonts/windows/.uuid
+++ b/home/local/fonts/windows/.uuid
diff --git a/home-config/fonts/windows/Candara.ttf b/home/local/fonts/windows/Candara.ttf
index b9817e2..b9817e2 100755
--- a/home-config/fonts/windows/Candara.ttf
+++ b/home/local/fonts/windows/Candara.ttf
diff --git a/home-config/fonts/windows/Candarab.ttf b/home/local/fonts/windows/Candarab.ttf
index d9ab172..d9ab172 100755
--- a/home-config/fonts/windows/Candarab.ttf
+++ b/home/local/fonts/windows/Candarab.ttf
diff --git a/home-config/fonts/windows/Candarai.ttf b/home/local/fonts/windows/Candarai.ttf
index 4f4e239..4f4e239 100755
--- a/home-config/fonts/windows/Candarai.ttf
+++ b/home/local/fonts/windows/Candarai.ttf
diff --git a/home-config/fonts/windows/Candaral.ttf b/home/local/fonts/windows/Candaral.ttf
index a7b9c80..a7b9c80 100755
--- a/home-config/fonts/windows/Candaral.ttf
+++ b/home/local/fonts/windows/Candaral.ttf
diff --git a/home-config/fonts/windows/Candarali.ttf b/home/local/fonts/windows/Candarali.ttf
index 190cc89..190cc89 100755
--- a/home-config/fonts/windows/Candarali.ttf
+++ b/home/local/fonts/windows/Candarali.ttf
diff --git a/home-config/fonts/windows/Candaraz.ttf b/home/local/fonts/windows/Candaraz.ttf
index 124b59f..124b59f 100755
--- a/home-config/fonts/windows/Candaraz.ttf
+++ b/home/local/fonts/windows/Candaraz.ttf
diff --git a/home-config/fonts/windows/CharisSIL-B.ttf b/home/local/fonts/windows/CharisSIL-B.ttf
index 5801dea..5801dea 100755
--- a/home-config/fonts/windows/CharisSIL-B.ttf
+++ b/home/local/fonts/windows/CharisSIL-B.ttf
diff --git a/home-config/fonts/windows/CharisSIL-BI.ttf b/home/local/fonts/windows/CharisSIL-BI.ttf
index 6c57383..6c57383 100755
--- a/home-config/fonts/windows/CharisSIL-BI.ttf
+++ b/home/local/fonts/windows/CharisSIL-BI.ttf
diff --git a/home-config/fonts/windows/CharisSIL-I.ttf b/home/local/fonts/windows/CharisSIL-I.ttf
index 146b4ac..146b4ac 100755
--- a/home-config/fonts/windows/CharisSIL-I.ttf
+++ b/home/local/fonts/windows/CharisSIL-I.ttf
diff --git a/home-config/fonts/windows/CharisSIL-R.ttf b/home/local/fonts/windows/CharisSIL-R.ttf
index b8e686a..b8e686a 100755
--- a/home-config/fonts/windows/CharisSIL-R.ttf
+++ b/home/local/fonts/windows/CharisSIL-R.ttf
diff --git a/home-config/fonts/windows/FSEX300.ttf b/home/local/fonts/windows/FSEX300.ttf
index a4f177c..a4f177c 100755
--- a/home-config/fonts/windows/FSEX300.ttf
+++ b/home/local/fonts/windows/FSEX300.ttf
diff --git a/home-config/fonts/windows/arial.ttf b/home/local/fonts/windows/arial.ttf
index 8682d94..8682d94 100755
--- a/home-config/fonts/windows/arial.ttf
+++ b/home/local/fonts/windows/arial.ttf
diff --git a/home-config/fonts/windows/arialbd.ttf b/home/local/fonts/windows/arialbd.ttf
index a6037e6..a6037e6 100755
--- a/home-config/fonts/windows/arialbd.ttf
+++ b/home/local/fonts/windows/arialbd.ttf
diff --git a/home-config/fonts/windows/arialbi.ttf b/home/local/fonts/windows/arialbi.ttf
index 6a1fa0f..6a1fa0f 100755
--- a/home-config/fonts/windows/arialbi.ttf
+++ b/home/local/fonts/windows/arialbi.ttf
diff --git a/home-config/fonts/windows/ariali.ttf b/home/local/fonts/windows/ariali.ttf
index 3801997..3801997 100755
--- a/home-config/fonts/windows/ariali.ttf
+++ b/home/local/fonts/windows/ariali.ttf
diff --git a/home-config/fonts/windows/ariblk.ttf b/home/local/fonts/windows/ariblk.ttf
index e7ae345..e7ae345 100755
--- a/home-config/fonts/windows/ariblk.ttf
+++ b/home/local/fonts/windows/ariblk.ttf
diff --git a/home-config/fonts/windows/calibri.ttf b/home/local/fonts/windows/calibri.ttf
index aac4726..aac4726 100755
--- a/home-config/fonts/windows/calibri.ttf
+++ b/home/local/fonts/windows/calibri.ttf
diff --git a/home-config/fonts/windows/calibrib.ttf b/home/local/fonts/windows/calibrib.ttf
index 326893d..326893d 100755
--- a/home-config/fonts/windows/calibrib.ttf
+++ b/home/local/fonts/windows/calibrib.ttf
diff --git a/home-config/fonts/windows/calibrii.ttf b/home/local/fonts/windows/calibrii.ttf
index 3543c4c..3543c4c 100755
--- a/home-config/fonts/windows/calibrii.ttf
+++ b/home/local/fonts/windows/calibrii.ttf
diff --git a/home-config/fonts/windows/calibril.ttf b/home/local/fonts/windows/calibril.ttf
index 1ac6669..1ac6669 100755
--- a/home-config/fonts/windows/calibril.ttf
+++ b/home/local/fonts/windows/calibril.ttf
diff --git a/home-config/fonts/windows/calibrili.ttf b/home/local/fonts/windows/calibrili.ttf
index fac9ae2..fac9ae2 100755
--- a/home-config/fonts/windows/calibrili.ttf
+++ b/home/local/fonts/windows/calibrili.ttf
diff --git a/home-config/fonts/windows/calibriz.ttf b/home/local/fonts/windows/calibriz.ttf
index 58afcd1..58afcd1 100755
--- a/home-config/fonts/windows/calibriz.ttf
+++ b/home/local/fonts/windows/calibriz.ttf
diff --git a/home-config/fonts/windows/cambria.ttc b/home/local/fonts/windows/cambria.ttc
index b971a3f..b971a3f 100755
--- a/home-config/fonts/windows/cambria.ttc
+++ b/home/local/fonts/windows/cambria.ttc
diff --git a/home-config/fonts/windows/cambriab.ttf b/home/local/fonts/windows/cambriab.ttf
index c70283c..c70283c 100755
--- a/home-config/fonts/windows/cambriab.ttf
+++ b/home/local/fonts/windows/cambriab.ttf
diff --git a/home-config/fonts/windows/cambriai.ttf b/home/local/fonts/windows/cambriai.ttf
index 299dccd..299dccd 100755
--- a/home-config/fonts/windows/cambriai.ttf
+++ b/home/local/fonts/windows/cambriai.ttf
diff --git a/home-config/fonts/windows/cambriaz.ttf b/home/local/fonts/windows/cambriaz.ttf
index 4912bcb..4912bcb 100755
--- a/home-config/fonts/windows/cambriaz.ttf
+++ b/home/local/fonts/windows/cambriaz.ttf
diff --git a/home-config/fonts/windows/comic.ttf b/home/local/fonts/windows/comic.ttf
index 2d8e9ca..2d8e9ca 100755
--- a/home-config/fonts/windows/comic.ttf
+++ b/home/local/fonts/windows/comic.ttf
diff --git a/home-config/fonts/windows/comicbd.ttf b/home/local/fonts/windows/comicbd.ttf
index 59f77d5..59f77d5 100755
--- a/home-config/fonts/windows/comicbd.ttf
+++ b/home/local/fonts/windows/comicbd.ttf
diff --git a/home-config/fonts/windows/comici.ttf b/home/local/fonts/windows/comici.ttf
index 49a4069..49a4069 100755
--- a/home-config/fonts/windows/comici.ttf
+++ b/home/local/fonts/windows/comici.ttf
diff --git a/home-config/fonts/windows/comicz.ttf b/home/local/fonts/windows/comicz.ttf
index f451961..f451961 100755
--- a/home-config/fonts/windows/comicz.ttf
+++ b/home/local/fonts/windows/comicz.ttf
diff --git a/home-config/fonts/windows/consola.ttf b/home/local/fonts/windows/consola.ttf
index e881ca4..e881ca4 100755
--- a/home-config/fonts/windows/consola.ttf
+++ b/home/local/fonts/windows/consola.ttf
diff --git a/home-config/fonts/windows/consolab.ttf b/home/local/fonts/windows/consolab.ttf
index 77f5d60..77f5d60 100755
--- a/home-config/fonts/windows/consolab.ttf
+++ b/home/local/fonts/windows/consolab.ttf
diff --git a/home-config/fonts/windows/consolai.ttf b/home/local/fonts/windows/consolai.ttf
index 2de4de8..2de4de8 100755
--- a/home-config/fonts/windows/consolai.ttf
+++ b/home/local/fonts/windows/consolai.ttf
diff --git a/home-config/fonts/windows/consolaz.ttf b/home/local/fonts/windows/consolaz.ttf
index d9df211..d9df211 100755
--- a/home-config/fonts/windows/consolaz.ttf
+++ b/home/local/fonts/windows/consolaz.ttf
diff --git a/home-config/fonts/windows/constan.ttf b/home/local/fonts/windows/constan.ttf
index 0ef9d17..0ef9d17 100755
--- a/home-config/fonts/windows/constan.ttf
+++ b/home/local/fonts/windows/constan.ttf
diff --git a/home-config/fonts/windows/constanb.ttf b/home/local/fonts/windows/constanb.ttf
index 540b1d7..540b1d7 100755
--- a/home-config/fonts/windows/constanb.ttf
+++ b/home/local/fonts/windows/constanb.ttf
diff --git a/home-config/fonts/windows/constani.ttf b/home/local/fonts/windows/constani.ttf
index a5aa7ac..a5aa7ac 100755
--- a/home-config/fonts/windows/constani.ttf
+++ b/home/local/fonts/windows/constani.ttf
diff --git a/home-config/fonts/windows/constanz.ttf b/home/local/fonts/windows/constanz.ttf
index 0b7ea48..0b7ea48 100755
--- a/home-config/fonts/windows/constanz.ttf
+++ b/home/local/fonts/windows/constanz.ttf
diff --git a/home-config/fonts/windows/corbel.ttf b/home/local/fonts/windows/corbel.ttf
index 34fd5aa..34fd5aa 100755
--- a/home-config/fonts/windows/corbel.ttf
+++ b/home/local/fonts/windows/corbel.ttf
diff --git a/home-config/fonts/windows/corbelb.ttf b/home/local/fonts/windows/corbelb.ttf
index 551afa3..551afa3 100755
--- a/home-config/fonts/windows/corbelb.ttf
+++ b/home/local/fonts/windows/corbelb.ttf
diff --git a/home-config/fonts/windows/corbeli.ttf b/home/local/fonts/windows/corbeli.ttf
index 91b076b..91b076b 100755
--- a/home-config/fonts/windows/corbeli.ttf
+++ b/home/local/fonts/windows/corbeli.ttf
diff --git a/home-config/fonts/windows/corbell.ttf b/home/local/fonts/windows/corbell.ttf
index 501eeef..501eeef 100755
--- a/home-config/fonts/windows/corbell.ttf
+++ b/home/local/fonts/windows/corbell.ttf
diff --git a/home-config/fonts/windows/corbelli.ttf b/home/local/fonts/windows/corbelli.ttf
index 6173fd7..6173fd7 100755
--- a/home-config/fonts/windows/corbelli.ttf
+++ b/home/local/fonts/windows/corbelli.ttf
diff --git a/home-config/fonts/windows/corbelz.ttf b/home/local/fonts/windows/corbelz.ttf
index 1afab65..1afab65 100755
--- a/home-config/fonts/windows/corbelz.ttf
+++ b/home/local/fonts/windows/corbelz.ttf
diff --git a/home-config/fonts/windows/cour.ttf b/home/local/fonts/windows/cour.ttf
index 46a0712..46a0712 100755
--- a/home-config/fonts/windows/cour.ttf
+++ b/home/local/fonts/windows/cour.ttf
diff --git a/home-config/fonts/windows/courbd.ttf b/home/local/fonts/windows/courbd.ttf
index 145b736..145b736 100755
--- a/home-config/fonts/windows/courbd.ttf
+++ b/home/local/fonts/windows/courbd.ttf
diff --git a/home-config/fonts/windows/courbi.ttf b/home/local/fonts/windows/courbi.ttf
index 430fced..430fced 100755
--- a/home-config/fonts/windows/courbi.ttf
+++ b/home/local/fonts/windows/courbi.ttf
diff --git a/home-config/fonts/windows/couri.ttf b/home/local/fonts/windows/couri.ttf
index 22b73d4..22b73d4 100755
--- a/home-config/fonts/windows/couri.ttf
+++ b/home/local/fonts/windows/couri.ttf
diff --git a/home-config/fonts/windows/fonts.dir b/home/local/fonts/windows/fonts.dir
index 7450f2e..7450f2e 100755
--- a/home-config/fonts/windows/fonts.dir
+++ b/home/local/fonts/windows/fonts.dir
diff --git a/home-config/fonts/windows/fonts.scale b/home/local/fonts/windows/fonts.scale
index 7450f2e..7450f2e 100755
--- a/home-config/fonts/windows/fonts.scale
+++ b/home/local/fonts/windows/fonts.scale
diff --git a/home-config/fonts/windows/framd.ttf b/home/local/fonts/windows/framd.ttf
index ca7e2ae..ca7e2ae 100755
--- a/home-config/fonts/windows/framd.ttf
+++ b/home/local/fonts/windows/framd.ttf
diff --git a/home-config/fonts/windows/framdit.ttf b/home/local/fonts/windows/framdit.ttf
index 44993d7..44993d7 100755
--- a/home-config/fonts/windows/framdit.ttf
+++ b/home/local/fonts/windows/framdit.ttf
diff --git a/home-config/fonts/windows/georgia.ttf b/home/local/fonts/windows/georgia.ttf
index 43672d8..43672d8 100755
--- a/home-config/fonts/windows/georgia.ttf
+++ b/home/local/fonts/windows/georgia.ttf
diff --git a/home-config/fonts/windows/georgiab.ttf b/home/local/fonts/windows/georgiab.ttf
index f460970..f460970 100755
--- a/home-config/fonts/windows/georgiab.ttf
+++ b/home/local/fonts/windows/georgiab.ttf
diff --git a/home-config/fonts/windows/georgiai.ttf b/home/local/fonts/windows/georgiai.ttf
index c9f60e7..c9f60e7 100755
--- a/home-config/fonts/windows/georgiai.ttf
+++ b/home/local/fonts/windows/georgiai.ttf
diff --git a/home-config/fonts/windows/georgiaz.ttf b/home/local/fonts/windows/georgiaz.ttf
index 124d291..124d291 100755
--- a/home-config/fonts/windows/georgiaz.ttf
+++ b/home/local/fonts/windows/georgiaz.ttf
diff --git a/home-config/fonts/windows/impact.ttf b/home/local/fonts/windows/impact.ttf
index 2675688..2675688 100755
--- a/home-config/fonts/windows/impact.ttf
+++ b/home/local/fonts/windows/impact.ttf
diff --git a/home-config/fonts/windows/l_10646.ttf b/home/local/fonts/windows/l_10646.ttf
index afb1c60..afb1c60 100755
--- a/home-config/fonts/windows/l_10646.ttf
+++ b/home/local/fonts/windows/l_10646.ttf
diff --git a/home-config/fonts/windows/lucon.ttf b/home/local/fonts/windows/lucon.ttf
index db9fb00..db9fb00 100755
--- a/home-config/fonts/windows/lucon.ttf
+++ b/home/local/fonts/windows/lucon.ttf
diff --git a/home-config/fonts/windows/segoepr.ttf b/home/local/fonts/windows/segoepr.ttf
index f72ba5c..f72ba5c 100755
--- a/home-config/fonts/windows/segoepr.ttf
+++ b/home/local/fonts/windows/segoepr.ttf
diff --git a/home-config/fonts/windows/segoeprb.ttf b/home/local/fonts/windows/segoeprb.ttf
index 8111e18..8111e18 100755
--- a/home-config/fonts/windows/segoeprb.ttf
+++ b/home/local/fonts/windows/segoeprb.ttf
diff --git a/home-config/fonts/windows/segoesc.ttf b/home/local/fonts/windows/segoesc.ttf
index 6511a43..6511a43 100755
--- a/home-config/fonts/windows/segoesc.ttf
+++ b/home/local/fonts/windows/segoesc.ttf
diff --git a/home-config/fonts/windows/segoescb.ttf b/home/local/fonts/windows/segoescb.ttf
index 8240a7e..8240a7e 100755
--- a/home-config/fonts/windows/segoescb.ttf
+++ b/home/local/fonts/windows/segoescb.ttf
diff --git a/home-config/fonts/windows/segoeui.ttf b/home/local/fonts/windows/segoeui.ttf
index 0f52cbd..0f52cbd 100755
--- a/home-config/fonts/windows/segoeui.ttf
+++ b/home/local/fonts/windows/segoeui.ttf
diff --git a/home-config/fonts/windows/segoeuib.ttf b/home/local/fonts/windows/segoeuib.ttf
index ff196d6..ff196d6 100755
--- a/home-config/fonts/windows/segoeuib.ttf
+++ b/home/local/fonts/windows/segoeuib.ttf
diff --git a/home-config/fonts/windows/segoeuii.ttf b/home/local/fonts/windows/segoeuii.ttf
index 5dd3c32..5dd3c32 100755
--- a/home-config/fonts/windows/segoeuii.ttf
+++ b/home/local/fonts/windows/segoeuii.ttf
diff --git a/home-config/fonts/windows/segoeuil.ttf b/home/local/fonts/windows/segoeuil.ttf
index 23fb04d..23fb04d 100755
--- a/home-config/fonts/windows/segoeuil.ttf
+++ b/home/local/fonts/windows/segoeuil.ttf
diff --git a/home-config/fonts/windows/segoeuisl.ttf b/home/local/fonts/windows/segoeuisl.ttf
index a276476..a276476 100755
--- a/home-config/fonts/windows/segoeuisl.ttf
+++ b/home/local/fonts/windows/segoeuisl.ttf
diff --git a/home-config/fonts/windows/segoeuiz.ttf b/home/local/fonts/windows/segoeuiz.ttf
index c393040..c393040 100755
--- a/home-config/fonts/windows/segoeuiz.ttf
+++ b/home/local/fonts/windows/segoeuiz.ttf
diff --git a/home-config/fonts/windows/seguibl.ttf b/home/local/fonts/windows/seguibl.ttf
index b296657..b296657 100755
--- a/home-config/fonts/windows/seguibl.ttf
+++ b/home/local/fonts/windows/seguibl.ttf
diff --git a/home-config/fonts/windows/seguibli.ttf b/home/local/fonts/windows/seguibli.ttf
index d38c82c..d38c82c 100755
--- a/home-config/fonts/windows/seguibli.ttf
+++ b/home/local/fonts/windows/seguibli.ttf
diff --git a/home-config/fonts/windows/seguiemj.ttf b/home/local/fonts/windows/seguiemj.ttf
index 77497bf..77497bf 100755
--- a/home-config/fonts/windows/seguiemj.ttf
+++ b/home/local/fonts/windows/seguiemj.ttf
diff --git a/home-config/fonts/windows/seguihis.ttf b/home/local/fonts/windows/seguihis.ttf
index a10c573..a10c573 100755
--- a/home-config/fonts/windows/seguihis.ttf
+++ b/home/local/fonts/windows/seguihis.ttf
diff --git a/home-config/fonts/windows/seguili.ttf b/home/local/fonts/windows/seguili.ttf
index 73bfedd..73bfedd 100755
--- a/home-config/fonts/windows/seguili.ttf
+++ b/home/local/fonts/windows/seguili.ttf
diff --git a/home-config/fonts/windows/seguisb.ttf b/home/local/fonts/windows/seguisb.ttf
index 90b39f7..90b39f7 100755
--- a/home-config/fonts/windows/seguisb.ttf
+++ b/home/local/fonts/windows/seguisb.ttf
diff --git a/home-config/fonts/windows/seguisbi.ttf b/home/local/fonts/windows/seguisbi.ttf
index 4d57335..4d57335 100755
--- a/home-config/fonts/windows/seguisbi.ttf
+++ b/home/local/fonts/windows/seguisbi.ttf
diff --git a/home-config/fonts/windows/seguisli.ttf b/home/local/fonts/windows/seguisli.ttf
index dbd8664..dbd8664 100755
--- a/home-config/fonts/windows/seguisli.ttf
+++ b/home/local/fonts/windows/seguisli.ttf
diff --git a/home-config/fonts/windows/seguisym.ttf b/home/local/fonts/windows/seguisym.ttf
index d987ce5..d987ce5 100755
--- a/home-config/fonts/windows/seguisym.ttf
+++ b/home/local/fonts/windows/seguisym.ttf
diff --git a/home-config/fonts/windows/symbol.ttf b/home/local/fonts/windows/symbol.ttf
index 897384a..897384a 100755
--- a/home-config/fonts/windows/symbol.ttf
+++ b/home/local/fonts/windows/symbol.ttf
diff --git a/home-config/fonts/windows/tahoma.ttf b/home/local/fonts/windows/tahoma.ttf
index b7b7086..b7b7086 100755
--- a/home-config/fonts/windows/tahoma.ttf
+++ b/home/local/fonts/windows/tahoma.ttf
diff --git a/home-config/fonts/windows/tahomabd.ttf b/home/local/fonts/windows/tahomabd.ttf
index 2b694bf..2b694bf 100755
--- a/home-config/fonts/windows/tahomabd.ttf
+++ b/home/local/fonts/windows/tahomabd.ttf
diff --git a/home-config/fonts/windows/times.ttf b/home/local/fonts/windows/times.ttf
index f71d84a..f71d84a 100755
--- a/home-config/fonts/windows/times.ttf
+++ b/home/local/fonts/windows/times.ttf
diff --git a/home-config/fonts/windows/timesbd.ttf b/home/local/fonts/windows/timesbd.ttf
index 43259eb..43259eb 100755
--- a/home-config/fonts/windows/timesbd.ttf
+++ b/home/local/fonts/windows/timesbd.ttf
diff --git a/home-config/fonts/windows/timesbi.ttf b/home/local/fonts/windows/timesbi.ttf
index c0b27d2..c0b27d2 100755
--- a/home-config/fonts/windows/timesbi.ttf
+++ b/home/local/fonts/windows/timesbi.ttf
diff --git a/home-config/fonts/windows/timesi.ttf b/home/local/fonts/windows/timesi.ttf
index 4bcad69..4bcad69 100755
--- a/home-config/fonts/windows/timesi.ttf
+++ b/home/local/fonts/windows/timesi.ttf
diff --git a/home-config/fonts/windows/trebuc.ttf b/home/local/fonts/windows/trebuc.ttf
index 549a507..549a507 100755
--- a/home-config/fonts/windows/trebuc.ttf
+++ b/home/local/fonts/windows/trebuc.ttf
diff --git a/home-config/fonts/windows/trebucbd.ttf b/home/local/fonts/windows/trebucbd.ttf
index 45891de..45891de 100755
--- a/home-config/fonts/windows/trebucbd.ttf
+++ b/home/local/fonts/windows/trebucbd.ttf
diff --git a/home-config/fonts/windows/trebucbi.ttf b/home/local/fonts/windows/trebucbi.ttf
index 23e4b8b..23e4b8b 100755
--- a/home-config/fonts/windows/trebucbi.ttf
+++ b/home/local/fonts/windows/trebucbi.ttf
diff --git a/home-config/fonts/windows/trebucit.ttf b/home/local/fonts/windows/trebucit.ttf
index 41edbfa..41edbfa 100755
--- a/home-config/fonts/windows/trebucit.ttf
+++ b/home/local/fonts/windows/trebucit.ttf
diff --git a/home-config/fonts/windows/verdana.ttf b/home/local/fonts/windows/verdana.ttf
index 9a34997..9a34997 100755
--- a/home-config/fonts/windows/verdana.ttf
+++ b/home/local/fonts/windows/verdana.ttf
diff --git a/home-config/fonts/windows/verdanab.ttf b/home/local/fonts/windows/verdanab.ttf
index fe8e687..fe8e687 100755
--- a/home-config/fonts/windows/verdanab.ttf
+++ b/home/local/fonts/windows/verdanab.ttf
diff --git a/home-config/fonts/windows/verdanai.ttf b/home/local/fonts/windows/verdanai.ttf
index 23a6a03..23a6a03 100755
--- a/home-config/fonts/windows/verdanai.ttf
+++ b/home/local/fonts/windows/verdanai.ttf
diff --git a/home-config/fonts/windows/verdanaz.ttf b/home/local/fonts/windows/verdanaz.ttf
index ff3b385..ff3b385 100755
--- a/home-config/fonts/windows/verdanaz.ttf
+++ b/home/local/fonts/windows/verdanaz.ttf
diff --git a/home-config/fonts/windows/webdings.ttf b/home/local/fonts/windows/webdings.ttf
index 73ae1a5..73ae1a5 100755
--- a/home-config/fonts/windows/webdings.ttf
+++ b/home/local/fonts/windows/webdings.ttf
diff --git a/home-config/fonts/windows/wingding.ttf b/home/local/fonts/windows/wingding.ttf
index 6e38f7f..6e38f7f 100755
--- a/home-config/fonts/windows/wingding.ttf
+++ b/home/local/fonts/windows/wingding.ttf
diff --git a/home-config/icons/hicolor/16x16/apps/thunderbird.png b/home/local/icons/hicolor/16x16/apps/thunderbird.png
index f48e411..f48e411 100644
--- a/home-config/icons/hicolor/16x16/apps/thunderbird.png
+++ b/home/local/icons/hicolor/16x16/apps/thunderbird.png
diff --git a/home-config/icons/hicolor/22x22/apps/thunderbird.png b/home/local/icons/hicolor/22x22/apps/thunderbird.png
index 37136a7..37136a7 100644
--- a/home-config/icons/hicolor/22x22/apps/thunderbird.png
+++ b/home/local/icons/hicolor/22x22/apps/thunderbird.png
diff --git a/home-config/icons/hicolor/24x24/apps/thunderbird.png b/home/local/icons/hicolor/24x24/apps/thunderbird.png
index 6c9888b..6c9888b 100644
--- a/home-config/icons/hicolor/24x24/apps/thunderbird.png
+++ b/home/local/icons/hicolor/24x24/apps/thunderbird.png
diff --git a/home-config/icons/hicolor/256x256/apps/thunderbird.png b/home/local/icons/hicolor/256x256/apps/thunderbird.png
index db25f98..db25f98 100644
--- a/home-config/icons/hicolor/256x256/apps/thunderbird.png
+++ b/home/local/icons/hicolor/256x256/apps/thunderbird.png
diff --git a/home-config/icons/hicolor/32x32/apps/thunderbird.png b/home/local/icons/hicolor/32x32/apps/thunderbird.png
index 6bbf73e..6bbf73e 100644
--- a/home-config/icons/hicolor/32x32/apps/thunderbird.png
+++ b/home/local/icons/hicolor/32x32/apps/thunderbird.png
diff --git a/home-config/icons/hicolor/48x48/apps/thunderbird.png b/home/local/icons/hicolor/48x48/apps/thunderbird.png
index e20ccd2..e20ccd2 100644
--- a/home-config/icons/hicolor/48x48/apps/thunderbird.png
+++ b/home/local/icons/hicolor/48x48/apps/thunderbird.png
diff --git a/home-config/nix-channels b/home/nix-channels
index c040488..c040488 100644
--- a/home-config/nix-channels
+++ b/home/nix-channels