diff --git a/.config/cosmic/com.system76.CosmicComp/v1/focus_follows_cursor b/.config/cosmic/com.system76.CosmicComp/v1/focus_follows_cursor
index 02e4a84..f32a580 100644
--- a/.config/cosmic/com.system76.CosmicComp/v1/focus_follows_cursor
+++ b/.config/cosmic/com.system76.CosmicComp/v1/focus_follows_cursor
@@ -1 +1 @@
-false
\ No newline at end of file
+true
\ No newline at end of file
diff --git a/.config/cosmic/com.system76.CosmicComp/v1/xkb_config b/.config/cosmic/com.system76.CosmicComp/v1/xkb_config
index 22481a9..94dd7a9 100644
--- a/.config/cosmic/com.system76.CosmicComp/v1/xkb_config
+++ b/.config/cosmic/com.system76.CosmicComp/v1/xkb_config
@@ -3,7 +3,7 @@
     model: "",
     layout: "us",
     variant: "",
-    options: None,
+    options: Some("compose:ralt"),
     repeat_delay: 600,
     repeat_rate: 25,
-)
\ No newline at end of file
+)
diff --git a/.config/cosmic/com.system76.CosmicPanel.Dock/v1/anchor_gap b/.config/cosmic/com.system76.CosmicPanel.Dock/v1/anchor_gap
index f32a580..02e4a84 100644
--- a/.config/cosmic/com.system76.CosmicPanel.Dock/v1/anchor_gap
+++ b/.config/cosmic/com.system76.CosmicPanel.Dock/v1/anchor_gap
@@ -1 +1 @@
-true
\ No newline at end of file
+false
\ No newline at end of file
diff --git a/.config/cosmic/com.system76.CosmicPanel.Dock/v1/autohide b/.config/cosmic/com.system76.CosmicPanel.Dock/v1/autohide
index cd1a18b..4af1832 100644
--- a/.config/cosmic/com.system76.CosmicPanel.Dock/v1/autohide
+++ b/.config/cosmic/com.system76.CosmicPanel.Dock/v1/autohide
@@ -1,5 +1 @@
-Some((
-    wait_time: 1000,
-    transition_time: 200,
-    handle_size: 4,
-))
\ No newline at end of file
+None
\ No newline at end of file
diff --git a/.config/cosmic/com.system76.CosmicPanel.Dock/v1/exclusive_zone b/.config/cosmic/com.system76.CosmicPanel.Dock/v1/exclusive_zone
index 02e4a84..f32a580 100644
--- a/.config/cosmic/com.system76.CosmicPanel.Dock/v1/exclusive_zone
+++ b/.config/cosmic/com.system76.CosmicPanel.Dock/v1/exclusive_zone
@@ -1 +1 @@
-false
\ No newline at end of file
+true
\ No newline at end of file
diff --git a/.config/cosmic/com.system76.CosmicPanel.Dock/v1/margin b/.config/cosmic/com.system76.CosmicPanel.Dock/v1/margin
index bf0d87a..c227083 100644
--- a/.config/cosmic/com.system76.CosmicPanel.Dock/v1/margin
+++ b/.config/cosmic/com.system76.CosmicPanel.Dock/v1/margin
@@ -1 +1 @@
-4
\ No newline at end of file
+0
\ No newline at end of file
diff --git a/.config/cosmic/com.system76.CosmicPanel.Dock/v1/opacity b/.config/cosmic/com.system76.CosmicPanel.Dock/v1/opacity
index d6e1fa0..9f8e9b6 100644
--- a/.config/cosmic/com.system76.CosmicPanel.Dock/v1/opacity
+++ b/.config/cosmic/com.system76.CosmicPanel.Dock/v1/opacity
@@ -1 +1 @@
-0.75
\ No newline at end of file
+1.0
\ No newline at end of file
diff --git a/.config/cosmic/com.system76.CosmicPanel.Dock/v1/plugins_center b/.config/cosmic/com.system76.CosmicPanel.Dock/v1/plugins_center
index f76a3f1..ac09cc5 100644
--- a/.config/cosmic/com.system76.CosmicPanel.Dock/v1/plugins_center
+++ b/.config/cosmic/com.system76.CosmicPanel.Dock/v1/plugins_center
@@ -1,4 +1,6 @@
 Some([
+    "com.system76.CosmicPanelLauncherButton",
+    "com.system76.CosmicPanelWorkspacesButton",
     "com.system76.CosmicPanelAppButton",
     "com.system76.CosmicAppList",
     "com.system76.CosmicAppletMinimize",
diff --git a/.config/cosmic/com.system76.CosmicPanel.Dock/v1/plugins_wings b/.config/cosmic/com.system76.CosmicPanel.Dock/v1/plugins_wings
index 4af1832..e434e88 100644
--- a/.config/cosmic/com.system76.CosmicPanel.Dock/v1/plugins_wings
+++ b/.config/cosmic/com.system76.CosmicPanel.Dock/v1/plugins_wings
@@ -1 +1 @@
-None
\ No newline at end of file
+Some(([], []))
\ No newline at end of file
diff --git a/.config/cosmic/com.system76.CosmicPanel.Dock/v1/size b/.config/cosmic/com.system76.CosmicPanel.Dock/v1/size
index ef6bce1..083b700 100644
--- a/.config/cosmic/com.system76.CosmicPanel.Dock/v1/size
+++ b/.config/cosmic/com.system76.CosmicPanel.Dock/v1/size
@@ -1 +1 @@
-M
\ No newline at end of file
+L
\ No newline at end of file
diff --git a/.config/cosmic/com.system76.CosmicPanel.Dock/v1/spacing b/.config/cosmic/com.system76.CosmicPanel.Dock/v1/spacing
index c227083..bf0d87a 100644
--- a/.config/cosmic/com.system76.CosmicPanel.Dock/v1/spacing
+++ b/.config/cosmic/com.system76.CosmicPanel.Dock/v1/spacing
@@ -1 +1 @@
-0
\ No newline at end of file
+4
\ No newline at end of file
diff --git a/.config/cosmic/com.system76.CosmicPanel.Panel/v1/background b/.config/cosmic/com.system76.CosmicPanel.Panel/v1/background
index c706507..8debd78 100644
--- a/.config/cosmic/com.system76.CosmicPanel.Panel/v1/background
+++ b/.config/cosmic/com.system76.CosmicPanel.Panel/v1/background
@@ -1 +1 @@
-Dark
\ No newline at end of file
+ThemeDefault
\ No newline at end of file
diff --git a/.config/cosmic/com.system76.CosmicPanel.Panel/v1/plugins_wings b/.config/cosmic/com.system76.CosmicPanel.Panel/v1/plugins_wings
index 64e2be2..c5a8b34 100644
--- a/.config/cosmic/com.system76.CosmicPanel.Panel/v1/plugins_wings
+++ b/.config/cosmic/com.system76.CosmicPanel.Panel/v1/plugins_wings
@@ -1,13 +1,12 @@
 Some(([
     "com.system76.CosmicAppletWorkspaces",
-    "com.system76.CosmicAppletMinimize",
 ], [
     "com.system76.CosmicAppletStatusArea",
     "com.system76.CosmicAppletTiling",
     "com.system76.CosmicAppletAudio",
+    "com.system76.CosmicAppletBluetooth",
     "com.system76.CosmicAppletNetwork",
     "com.system76.CosmicAppletBattery",
     "com.system76.CosmicAppletNotifications",
-    "com.system76.CosmicAppletBluetooth",
     "com.system76.CosmicAppletPower",
 ]))
\ No newline at end of file
diff --git a/.config/cosmic/com.system76.CosmicPanel.Panel/v1/spacing b/.config/cosmic/com.system76.CosmicPanel.Panel/v1/spacing
index c227083..d8263ee 100644
--- a/.config/cosmic/com.system76.CosmicPanel.Panel/v1/spacing
+++ b/.config/cosmic/com.system76.CosmicPanel.Panel/v1/spacing
@@ -1 +1 @@
-0
\ No newline at end of file
+2
\ No newline at end of file
diff --git a/.config/cosmic/com.system76.CosmicTheme.Dark.Builder/v1/gaps b/.config/cosmic/com.system76.CosmicTheme.Dark.Builder/v1/gaps
index 63ec9c1..e017faa 100644
--- a/.config/cosmic/com.system76.CosmicTheme.Dark.Builder/v1/gaps
+++ b/.config/cosmic/com.system76.CosmicTheme.Dark.Builder/v1/gaps
@@ -1 +1 @@
-(0, 2)
\ No newline at end of file
+(0, 5)
\ No newline at end of file
diff --git a/.config/cosmic/com.system76.CosmicTheme.Dark/v1/gaps b/.config/cosmic/com.system76.CosmicTheme.Dark/v1/gaps
index 63ec9c1..e017faa 100644
--- a/.config/cosmic/com.system76.CosmicTheme.Dark/v1/gaps
+++ b/.config/cosmic/com.system76.CosmicTheme.Dark/v1/gaps
@@ -1 +1 @@
-(0, 2)
\ No newline at end of file
+(0, 5)
\ No newline at end of file
diff --git a/.config/cosmic/com.system76.CosmicTheme.Light.Builder/v1/gaps b/.config/cosmic/com.system76.CosmicTheme.Light.Builder/v1/gaps
index 63ec9c1..e017faa 100644
--- a/.config/cosmic/com.system76.CosmicTheme.Light.Builder/v1/gaps
+++ b/.config/cosmic/com.system76.CosmicTheme.Light.Builder/v1/gaps
@@ -1 +1 @@
-(0, 2)
\ No newline at end of file
+(0, 5)
\ No newline at end of file
diff --git a/.config/cosmic/com.system76.CosmicTheme.Light/v1/gaps b/.config/cosmic/com.system76.CosmicTheme.Light/v1/gaps
index 63ec9c1..e017faa 100644
--- a/.config/cosmic/com.system76.CosmicTheme.Light/v1/gaps
+++ b/.config/cosmic/com.system76.CosmicTheme.Light/v1/gaps
@@ -1 +1 @@
-(0, 2)
\ No newline at end of file
+(0, 5)
\ No newline at end of file
diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index 4dfbdaa..c370f85 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -1,36 +1,44 @@
 {
   "LazyVim": { "branch": "main", "commit": "28db03f958d58dfff3c647ce28fdc1cb88ac158d" },
+  "SchemaStore.nvim": { "branch": "main", "commit": "21645280ad06fce01ef109e82d76302dcbe62756" },
+  "blink.cmp": { "branch": "main", "commit": "b19413d214068f316c78978b08264ed1c41830ec" },
   "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
   "catppuccin": { "branch": "main", "commit": "ce4a8e0d5267e67056f9f4dcf6cb1d0933c8ca00" },
   "codecompanion.nvim": { "branch": "main", "commit": "8ad65eef735b31bb47d76f59d878ee1bac4bdc85" },
-  "conform.nvim": { "branch": "master", "commit": "4993e07fac6679d0a5005aa7499e0bad2bd39f19" },
+  "conform.nvim": { "branch": "master", "commit": "ffe26e8df8115c9665d24231f8a49fadb2d611ce" },
   "flash.nvim": { "branch": "main", "commit": "fcea7ff883235d9024dc41e638f164a450c14ca2" },
+  "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
+  "fzf-lua": { "branch": "main", "commit": "0284d640fd88c56f100a43f41103c5b564699e15" },
   "gitsigns.nvim": { "branch": "main", "commit": "5813e4878748805f1518cee7abb50fd7205a3a48" },
   "grug-far.nvim": { "branch": "main", "commit": "b58b2d65863f4ebad88b10a1ddd519e5380466e0" },
   "kulala.nvim": { "branch": "main", "commit": "5d3916195a97928b8f9b79d96029f37d19ba866d" },
   "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
   "lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" },
   "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
+  "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
   "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
   "mini.ai": { "branch": "main", "commit": "bfb26d9072670c3aaefab0f53024b2f3729c8083" },
   "mini.icons": { "branch": "main", "commit": "ff2e4f1d29f659cc2bad0f9256f2f6195c6b2428" },
   "mini.pairs": { "branch": "main", "commit": "472ec50092a3314ec285d2db2baa48602d71fe93" },
+  "mini.surround": { "branch": "main", "commit": "88c52297ed3e69ecf9f8652837888ecc727a28ee" },
   "neo-tree.nvim": { "branch": "main", "commit": "a981ef287503c668434bffa78071d5b9ff92c12f" },
   "noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" },
   "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
   "nvim-dap": { "branch": "master", "commit": "5860c7c501eb428d3137ee22c522828d20cca0b3" },
   "nvim-dap-go": { "branch": "main", "commit": "605911fa0899882b05a8e4369ab12739620494af" },
   "nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" },
-  "nvim-lint": { "branch": "master", "commit": "d1118791070d090777398792a73032a0ca5c79ff" },
-  "nvim-lspconfig": { "branch": "master", "commit": "effe4bf2e1afb881ea67291c648b68dd3dfc927a" },
+  "nvim-lint": { "branch": "master", "commit": "ebe535956106c60405b02220246e135910f6853d" },
+  "nvim-lspconfig": { "branch": "master", "commit": "9c923997123ff9071198ea3b594d4c1931fab169" },
   "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
   "nvim-treesitter": { "branch": "main", "commit": "17885756e63df73ed90db62e4630f744ceda6514" },
-  "nvim-treesitter-textobjects": { "branch": "main", "commit": "63c4dce4a56312ef1bdeafd16bdefa008fcc950a" },
+  "nvim-treesitter-textobjects": { "branch": "main", "commit": "76deedf0f1cec4496ef8d49b6d1f020f6d0c6ec9" },
   "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" },
+  "omnisharp-extended-lsp.nvim": { "branch": "main", "commit": "a47388e5417e7f1cfa6962cc441a23c4c5fb2151" },
   "persistence.nvim": { "branch": "main", "commit": "b20b2a7887bd39c1a356980b45e03250f3dce49c" },
   "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
   "powershell.nvim": { "branch": "main", "commit": "f7a45f9c0b16e22e938b85a6729dc41165d87c95" },
+  "render-markdown.nvim": { "branch": "main", "commit": "b2b135347e299ffbf7f4123fb7811899b0c9f4b8" },
   "snacks.nvim": { "branch": "main", "commit": "fe7cfe9800a182274d0f868a74b7263b8c0c020b" },
   "telescope.nvim": { "branch": "master", "commit": "e69b434b968a33815e2f02a5c7bd7b8dd4c7d4b2" },
   "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" },
diff --git a/.config/shell/functions.zsh b/.config/shell/functions.zsh
index 2a40348..9c5042f 100644
--- a/.config/shell/functions.zsh
+++ b/.config/shell/functions.zsh
@@ -3,7 +3,7 @@ isNotSet() { [ -z "${1}" ]; }
 
 set-cred ()
 {
-  export BW_SESSION="$(bw unlock $(secret-tool lookup drive bitwarden) --raw)"
+  export BW_SESSION="$(bw unlock $(secret-tool lookup token bitwarden) --raw)"
   bw sync
   printf "$(bw get password cli-gitlab)" | secret-tool store --label='Gitlab Token for CLI' 'token' 'GITLAB_TOKEN' 
   printf "$(bw get password cli-ollama-token)" | secret-tool store --label='Ollama Token for CLI' 'token' 'OLLAMA_TOKEN' 
diff --git a/.gitignore b/.gitignore
index ad1fa8b..9d4cf81 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 .config/tmux/plugins
 .idea
 .sentry-native
+.ssh
diff --git a/.nixpkgs/config.nix b/.nixpkgs/config.nix
index 13b76dc..341b992 100644
--- a/.nixpkgs/config.nix
+++ b/.nixpkgs/config.nix
@@ -8,7 +8,6 @@
         lazygit
         glab
         oh-my-posh
-        zsh
         fzf
         ripgrep
         rclone
@@ -20,6 +19,23 @@
         helm
         vivid
         stow
+        bitwarden-cli
+        wofi
+        nmap
+        kubectl
+        podman
+        podman-compose
+        podman-desktop
+        helm
+        htop
+        yubikey-manager
+        gimp
+        yazi
+        powershell
+        devpod
+        devpod-desktop
+        nerd-fonts.go-mono
+        libsecret
       ];
     };
   };
diff --git a/ansible/roles/packages/vars/Pop!_OS-24.04.yml b/ansible/roles/packages/vars/Pop!_OS-24.04.yml
index 758fee7..e76b43c 100644
--- a/ansible/roles/packages/vars/Pop!_OS-24.04.yml
+++ b/ansible/roles/packages/vars/Pop!_OS-24.04.yml
@@ -1,64 +1,65 @@
 install_homebrew_if_missing: true
 
 required_packages_brew:
-  - lazygit
-  - glab
-  - oh-my-posh
-  - tpm
-  - kubernetes-cli
+  #- lazygit
+  #- glab
+  #- oh-my-posh
+  #- tpm
+  #- kubernetes-cli
   - zsh-autosuggestions
-  - bitwarden-cli
-  - ttyd
-  - fastfetch
-  - vivid
-  - yazi
+  #- bitwarden-cli
+  #- ttyd
+  #- fastfetch
+  #- vivid
+  #- yazi
   - zsh-history-substring-search
-  - opentofu
-  - helm
-  - bat
-  - neovim
-  - eza
-  - zoxide
-  - ansible
-  - ffmpeg
-  - k9s
+  #- opentofu
+  #- helm
+  #- bat
+  #- neovim
+  #- eza
+  #- zoxide
+  #- ansible
+  #- ffmpeg
+  #- k9s
 
 required_packages_apt:
-  - htop
   - stow
   - zsh
-  - curl
-  - xsel
-  - wl-clipboard  
-  - podman
-  - wget
-  - apt-transport-https
-  - software-properties-common
+  - kitty
   - qemu-kvm
   - qemu-system 
   - qemu-utils 
-  - python3 
-  - python3-pip 
-  - libvirt-clients 
-  - libvirt-daemon-system 
-  - bridge-utils 
-  - virtinst 
   - libvirt-daemon 
   - virt-manager
-  - vlc
-  - vault
-  - fzf
-  - ripgrep
-  - libsecret-tools
-  - rclone
+  #- htop
+  #- curl
+  #- xsel
+  #- wl-clipboard  
+  #- podman
+  #- wget
+  #- apt-transport-https
+  #- software-properties-common
+  #- python3 
+  #- python3-pip 
+  #- libvirt-clients 
+  #- libvirt-daemon-system 
+  #- bridge-utils 
+  #- virtinst 
+  #- vlc
+  #- vault
+  #- fzf
+  #- ripgrep
+  #- libsecret-tools
+  #- rclone
 
-apt_keys:
-  - https://packages.microsoft.com/keys/microsoft.asc
-apt_repo:
-  - deb [arch=amd64] https://packages.microsoft.com/ubuntu/22.04/prod jammy main
-  - deb [arch=amd64 signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com noble main
-apt_repo_gpg:
-  - {name: "hashicorp-archive-keyring", url: "https://apt.releases.hashicorp.com/gpg"}
+#apt_keys:
+#  - https://packages.microsoft.com/keys/microsoft.asc
+#apt_repo:
+#  - deb [arch=amd64] https://packages.microsoft.com/ubuntu/22.04/prod jammy main
+#  - deb [arch=amd64 signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com noble main
+#apt_repo_gpg:
+#  - {name: "hashicorp-archive-keyring", url: "https://apt.releases.hashicorp.com/gpg"}
 
 flatpak_remote:
   - {name: 'flathub', url: "https://dl.flathub.org/repo/flathub.flatpakrepo"}
@@ -69,10 +70,19 @@ required_packages_flatpak:
   - me.proton.Mail
   - com.protonvpn.www
   - org.remmina.Remmina
+  - com.github.tchx84.Flatseal
+  - com.vscodium.codium
+  - org.chromium.Chromium
+  - org.libreoffice.LibreOffice
+  - com.parsecgaming.parsec
+  - org.videolan.VLC
+  - fr.handbrake.ghb
+  - com.spotify.Client
+  - org.signal.Signal
 
-go_version_target: "go version go1.23.4 linux/amd64"
-go_tarball: "go1.23.5.linux-amd64.tar.gz"
-go_checksum: "sha256:cbcad4a6482107c7c7926df1608106c189417163428200ce357695cc7e01d091"
+#go_version_target: "go version go1.23.4 linux/amd64"
+#go_tarball: "go1.23.5.linux-amd64.tar.gz"
+#go_checksum: "sha256:cbcad4a6482107c7c7926df1608106c189417163428200ce357695cc7e01d091"
 
 go_apps:
   - github.com/charmbracelet/vhs@latest
diff --git a/ansible/scripts/configure_systemd.yml b/ansible/scripts/configure_systemd.yml
index ec73bb3..02d6fe8 100644
--- a/ansible/scripts/configure_systemd.yml
+++ b/ansible/scripts/configure_systemd.yml
@@ -16,10 +16,16 @@
   with_items: "{{ service_files.files }}"
   when: service_files is defined   
 
+
 - name: Combine predefined list and filesystem paths
   set_fact:
-    systemd_service: "{{ systemd_service | union(service_files.files | map(attribute='path') | map('basename')) | unique }}"
-  when: service_files is defined   
+    systemd_service: "{{ systemd_service | default([]) | union(service_files.files | map(attribute='path') | map('basename')) | unique }}"
+  when: service_files is defined
+
+#- name: Combine predefined list and filesystem paths
+#  set_fact:
+#    systemd_service: "{{ systemd_service | union(service_files.files | map(attribute='path') | map('basename')) | unique }}"
+#  when: service_files is defined   
 
 - name: Enable Systemd Services
   ansible.builtin.systemd_service:
diff --git a/ansible/scripts/install_local_ca.yml b/ansible/scripts/install_local_ca.yml
index 9999e92..b4ce3f1 100644
--- a/ansible/scripts/install_local_ca.yml
+++ b/ansible/scripts/install_local_ca.yml
@@ -1,7 +1,15 @@
+- name: Ensure ca-certificates directory exists
+  file:
+    path: /etc/ca-certificates/trust-source/anchors
+    state: directory
+    owner: root
+    group: root
+    mode: '0755'
+
 - name: Copy Public certs
   copy:
     src: durp.crt
     dest: /etc/ca-certificates/trust-source/anchors/durp.crt
 
 - name: Trust certs
-  command: trust extract-compat
+  command: update-ca-certificates