diff --git a/.bash_aliases b/.bash_aliases
index d2ff1d9..2e79fb0 100644
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -4,3 +4,8 @@ alias mountns="sudo mount -t nfs manjarodesktop:/mnt/TerraBeef/NetShare /mnt/man
 alias sshcloud="ssh -p 1919 emge@95.217.8.112"
 alias config="/usr/bin/git --git-dir=$HOME/.cfg/ --work-tree=$HOME"
 alias syncheavy="rsync -azP --no-perms --no-owner --no-group --no-times --delete /home/emge/Development/11ty-projects/heavy-rocks/_site/ emge@95.217.8.112:/var/www/heavy.rocks/"
+alias s!="sudo systemctl"
+alias portcheck="sudo lsof -i -P -n | grep LISTEN"
+alias pubip="dig +short myip.opendns.com @resolver1.opendns.com"
+alias piastart="sudo VPN_PROTOCOL=wireguard DISABLE_IPV6=yes DIP_TOKEN=no AUTOCONNECT=true PIA_PF=flase PIA_DNS=true PIA_USER=p7769426 PIA_PASS=2ZZtyE4Ujz ./run_setup.sh"
+alias piastop="wg-quick down pia"
diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index 88f1009..e54576f 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -3,10 +3,10 @@ if status is-interactive
 end
 
 # set greeting to text
-set -g fish_greeting 'Hey, sup?'
-# function fish_greeting
-#   cowfortune
-# end
+set -g fish_greeting ''
+#function fish_greeting
+#  cowfortune
+#end
 
 # start starship prompt
 starship init fish | source
@@ -15,3 +15,5 @@ starship init fish | source
 source ~/.bash_aliases
 
 set -gx EDITOR nvim
+
+set -gx DATABASE_URL user=miniflux password=Z5l3KVoEXY dbname=miniflux sslmode=disable
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 3a71d1b..c893d88 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -1,4 +1,5 @@
 require("user.options")
 require("user.keymaps")
 require("user.plugins")
-vim.cmd[[colorscheme Spacedust]]
+--vim.cmd[[colorscheme Spacedust]]
+vim.cmd([[colorscheme gruvbox]])
diff --git a/.config/nvim/lua/user/keymaps.lua b/.config/nvim/lua/user/keymaps.lua
index b4d12c6..5b4035d 100644
--- a/.config/nvim/lua/user/keymaps.lua
+++ b/.config/nvim/lua/user/keymaps.lua
@@ -8,3 +8,10 @@ vim.keymap.set('n', '<C-j>', '<C-w>j')
 vim.keymap.set('n', '<C-k>', '<C-w>k')
 vim.keymap.set('n', '<C-h>', '<C-w>h')
 vim.keymap.set('n', '<C-l>', '<C-w>l')
+
+-- telescope keymaps
+local builtin = require('telescope.builtin')
+vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
+vim.keymap.set('n', '<leader>fg', builtin.live_grep, {})
+vim.keymap.set('n', '<leader>fb', builtin.buffers, {})
+vim.keymap.set('n', '<leader>fh', builtin.help_tags, {})
diff --git a/.config/nvim/lua/user/options.lua b/.config/nvim/lua/user/options.lua
index 4f303f8..dcfe10e 100644
--- a/.config/nvim/lua/user/options.lua
+++ b/.config/nvim/lua/user/options.lua
@@ -13,3 +13,4 @@ vim.opt.cursorlineopt       = "screenline"      -- hightlight line only
 vim.opt.termguicolors       = true              -- enables 24-bit color
 vim.opt.splitbelow          = true              -- new horizontal splits go below
 vim.opt.splitright          = true              -- new vertical splits go right
+vim.opt.background          = "dark"
diff --git a/.config/nvim/lua/user/plugins.lua b/.config/nvim/lua/user/plugins.lua
index aa52e3c..f2838ef 100644
--- a/.config/nvim/lua/user/plugins.lua
+++ b/.config/nvim/lua/user/plugins.lua
@@ -17,16 +17,39 @@ return require('packer').startup(function(use)
     'williamboman/mason.nvim',
     run = ':MasonUpdate' -- :MasonUpdate updates registry contents
   }
-  use 'NvChad/nvim-colorizer.lua'
+  -- use 'NvChad/nvim-colorizer.lua'
+  use 'uga-rosa/ccc.nvim'
   use 'windwp/nvim-autopairs'
   use 'nvim-tree/nvim-tree.lua'
   use 'nvim-tree/nvim-web-devicons'
+  use 'williamboman/mason-lspconfig.nvim'
+  use 'neovim/nvim-lspconfig'
   use {'akinsho/bufferline.nvim', tag = "*", requires = 'nvim-tree/nvim-web-devicons'}
 --  use {'neoclide/coc.nvim', branch = 'release'}
 
   -- Themes
   use 'folke/tokyonight.nvim'
 
+  use { "ellisonleao/gruvbox.nvim" }
+
+  use 'numToStr/Comment.nvim'
+
+  use 'mfussenegger/nvim-dap'
+  use { "rcarriga/nvim-dap-ui", requires = {"mfussenegger/nvim-dap"}}
+  use 'mfussenegger/nvim-lint'
+  use 'mhartington/formatter.nvim'
+  
+  use 'nvim-lua/plenary.nvim'
+  use { 'nvim-telescope/telescope-fzf-native.nvim', run = 'cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build' }
+  use {
+    'nvim-telescope/telescope.nvim', tag = '0.1.5',
+    requires = { {'nvim-lua/plenary.nvim'} }
+  }
+  use {
+    'nvim-treesitter/nvim-treesitter',
+    run = ':TSUpdate'
+  }
+
   -- Automatically set up your configuration after cloning packer.nvim
   -- Put this at the end after all plugins
   if packer_bootstrap then
@@ -37,7 +60,18 @@ return require('packer').startup(function(use)
   require 'mason'.setup()
 
   -- colorizer setup
-  require 'colorizer'.setup()
+  -- require 'colorizer'.setup()
+
+  -- comment.nvim for toggling line comments
+  require 'Comment'.setup()
+
+  -- ccc.nvim setup
+  require 'ccc'.setup({
+    highlighter = {
+      auto_enable = true,
+      lsp = false,
+    },
+  })
 
   -- autopairs setup
   require 'nvim-autopairs'.setup()
@@ -45,6 +79,11 @@ return require('packer').startup(function(use)
   -- nvim-tree setup
   require 'nvim-tree'.setup()
 
+  -- lspconfig
+  require 'mason-lspconfig'.setup()
+  require 'lspconfig'.cssls.setup{}
+  require 'lspconfig'.jsonls.setup{}
+
   -- bufferline setup
   require 'bufferline'.setup()
   
diff --git a/.config/sway/config b/.config/sway/config
index ecb903c..fd7e852 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -24,6 +24,12 @@ set $menu rofi -show drun
 # start notification deamon
 exec swaync
 
+# start protonmail-bridge
+exec sleep 5 && protonmail-bridge --no-window
+
+# start nextcloud-desktop
+exec sleep 10 && nextcloud --background
+
 # add keybinding to toggle swaync notification center
 bindsym $mod+Shift+n exec swaync-client -t -sw
 
@@ -33,7 +39,7 @@ bindsym $mod+Shift+n exec swaync-client -t -sw
 # output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill
 # output * bg ~/Wallpapers/orangeMountains.png fill
 # output * bg #c0caf5 solid_color
-output * bg ~/Wallpapers/chillGruvboxStreet.png fill
+output * bg ~/Wallpapers/orangeMountains.png fill
 #
 # Example configuration:
 #
@@ -56,7 +62,7 @@ output eDP-1 resolution 1920x1080 position 0,0
 # your displays after another 300 seconds, and turn your screens back on when
 # resumed. It will also lock your screen before your computer goes to sleep.
 
-set $lock 'swaylock -e -F -i ~/Wallpapers/chillGruvboxStreet.png'
+set $lock 'swaylock -e -F -i ~/Wallpapers/orangeMountains.png'
 exec swayidle -w \
   timeout 300 $lock \
   timeout 310 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \
diff --git a/.config/sway/lockman.sh b/.config/sway/lockman.sh
index deaf090..bb24d83 100644
--- a/.config/sway/lockman.sh
+++ b/.config/sway/lockman.sh
@@ -2,5 +2,5 @@
 swayidle \
   timeout 10 'swaymsg "output * power off"' \
   resume 'swaymsg "output * power on"' &
-swaylock -e -F -i ~/Wallpapers/chillGruvboxStreet.png
+swaylock -e -F -i ~/Wallpapers/orangeMountains.png
 kill %%
diff --git a/.config/waybar/config b/.config/waybar/config
index cde59a3..efe4140 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -12,6 +12,8 @@
     ],
 	"modules-right":
     [
+      "tray",
+      "custom/temp2",
       "custom/notification",
       "custom/pacman",
       "backlight",
@@ -169,6 +171,25 @@
     },
     "exec-if": "which waybar-updates",
     "exec": "waybar-updates"
+  },
+
+  "temperature": {
+    "thermal-zone": 0,
+    "critical-threshold": 80,
+    "formate-critical": "{temperatureC}°C",
+    "format": "{temperatureC}°C"
+  },
+
+  "custom/temp2": {
+    "hwmon-path": ["/sys/class/hwmon/hwmon2/temp1_input", "/sys/class/thermal/thermal_zone0/temp"],
+    "critical-threshold": 80,
+    "formate-critical": "{temperatureC}°C",
+    "format": "{temperatureC}°C"
+  },
+
+  "tray": {
+    "icon-size": 18,
+    "spacing": 10
   }
 
 }
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index 4ff99fe..48b5025 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -150,3 +150,10 @@ tooltip label
   animation-name: blink-update;
   animation-duration: 3s;
 }
+
+#tray
+{
+  padding: 0 10px;
+  background-color: @primary_fg_color;
+  margin: 0 5px;
+}