diff --git a/.config/autostart/jetbrains-toolbox.desktop b/.config/autostart/jetbrains-toolbox.desktop
new file mode 100755
index 0000000..bc5a3b0
--- /dev/null
+++ b/.config/autostart/jetbrains-toolbox.desktop
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Icon=/opt/jetbrains-toolbox/bin/toolbox.svg
+Exec=/opt/jetbrains-toolbox/bin/jetbrains-toolbox --minimize
+Version=1.0
+Type=Application
+Categories=Development
+Name=JetBrains Toolbox
+StartupWMClass=jetbrains-toolbox
+Terminal=false
+MimeType=x-scheme-handler/jetbrains;
+X-GNOME-Autostart-enabled=true
+StartupNotify=false
+X-GNOME-Autostart-Delay=10
+X-MATE-Autostart-Delay=10
+X-KDE-autostart-after=panel
diff --git a/.config/autostart/mimeinfo.cache b/.config/autostart/mimeinfo.cache
new file mode 100644
index 0000000..ca43bee
--- /dev/null
+++ b/.config/autostart/mimeinfo.cache
@@ -0,0 +1,2 @@
+[MIME Cache]
+x-scheme-handler/jetbrains=jetbrains-toolbox.desktop;
diff --git a/.config/cosmic/com.system76.CosmicComp/v1/xkb_config b/.config/cosmic/com.system76.CosmicComp/v1/xkb_config
index 94dd7a9..b44cf69 100644
--- a/.config/cosmic/com.system76.CosmicComp/v1/xkb_config
+++ b/.config/cosmic/com.system76.CosmicComp/v1/xkb_config
@@ -6,4 +6,4 @@
     options: Some("compose:ralt"),
     repeat_delay: 600,
     repeat_rate: 25,
-)
+)
\ No newline at end of file
diff --git a/.config/ghostty/config b/.config/ghostty/config
index e65ead6..071ff96 100644
--- a/.config/ghostty/config
+++ b/.config/ghostty/config
@@ -6,3 +6,4 @@ window-theme = ghostty
 window-decoration = true
 gtk-tabs-location = hidden
 font-family = "GoMono Nerd Font"
+adw-toast = "false"
diff --git a/.config/ghostty/themes/catppuccin-mocha b/.config/ghostty/themes/catppuccin-mocha
new file mode 100644
index 0000000..e03e26d
--- /dev/null
+++ b/.config/ghostty/themes/catppuccin-mocha
@@ -0,0 +1,23 @@
+palette = 0=#45475a
+palette = 1=#f38ba8
+palette = 2=#a6e3a1
+palette = 3=#f9e2af
+palette = 4=#89b4fa
+palette = 5=#f5c2e7
+palette = 6=#94e2d5
+palette = 7=#a6adc8
+palette = 8=#585b70
+palette = 9=#f38ba8
+palette = 10=#a6e3a1
+palette = 11=#f9e2af
+palette = 12=#89b4fa
+palette = 13=#f5c2e7
+palette = 14=#94e2d5
+palette = 15=#bac2de
+background = 1e1e2e
+foreground = cdd6f4
+cursor-color = f5e0dc
+cursor-text = 11111b
+selection-background = 353749
+selection-foreground = cdd6f4
+split-divider-color = 313244
diff --git a/.config/gtk-3.0/bookmarks b/.config/gtk-3.0/bookmarks
deleted file mode 100644
index 171b060..0000000
--- a/.config/gtk-3.0/bookmarks
+++ /dev/null
@@ -1,5 +0,0 @@
-file:///home/user/Documents
-file:///home/user/Music
-file:///home/user/Pictures
-file:///home/user/Videos
-file:///home/user/Downloads
diff --git a/.config/gtk-3.0/settings.ini b/.config/gtk-3.0/settings.ini
deleted file mode 100644
index 2cf2eea..0000000
--- a/.config/gtk-3.0/settings.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-[Settings]
-gtk-theme-name=catppuccin-mocha-mauve-standard+default
-gtk-icon-theme-name=Cosmic
-gtk-font-name=Cantarell 11
-gtk-cursor-theme-name=Adwaita
-gtk-cursor-theme-size=24
-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=0
-gtk-xft-antialias=1
-gtk-xft-hinting=1
-gtk-xft-hintstyle=hintslight
-gtk-xft-rgba=rgb
-gtk-application-prefer-dark-theme=0
diff --git a/.config/gtk-4.0/assets b/.config/gtk-4.0/assets
deleted file mode 120000
index 234c8c6..0000000
--- a/.config/gtk-4.0/assets
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/themes/catppuccin-mocha-mauve-standard+default/gtk-4.0/assets
\ No newline at end of file
diff --git a/.config/gtk-4.0/cosmic/dark.css b/.config/gtk-4.0/cosmic/dark.css
deleted file mode 100644
index 52c4261..0000000
--- a/.config/gtk-4.0/cosmic/dark.css
+++ /dev/null
@@ -1,106 +0,0 @@
-/* GENERATED BY COSMIC */
-@define-color window_bg_color rgba(30, 30, 46, 1.00);
-@define-color window_fg_color rgba(232, 238, 255, 1.00);
-
-@define-color view_bg_color rgba(49, 50, 68, 1.00);
-@define-color view_fg_color rgba(189, 198, 227, 1.00);
-
-@define-color headerbar_bg_color rgba(30, 30, 46, 1.00);
-@define-color headerbar_fg_color rgba(232, 238, 255, 1.00);
-@define-color headerbar_border_color_color rgba(70, 72, 88, 1.00);
-@define-color headerbar_backdrop_color rgba(30, 30, 46, 1.00);
-
-@define-color sidebar_bg_color rgba(49, 50, 68, 1.00);
-@define-color sidebar_fg_color rgba(189, 198, 227, 1.00);
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.08);
-@define-color sidebar_backdrop_color rgba(65, 66, 83, 1.00);
-
-@define-color secondary_sidebar_bg_color rgba(69, 71, 90, 1.00);
-@define-color secondary_sidebar_fg_color rgba(215, 224, 254, 1.00);
-@define-color secondary_sidebar_shade_color rgba(0, 0, 0, 0.08);
-@define-color secondary_sidebar_backdrop_color rgba(84, 86, 103, 1.00);
-
-@define-color card_bg_color rgba(49, 50, 67, 1.00);
-@define-color card_fg_color rgba(189, 198, 227, 1.00);
-
-@define-color thumbnail_bg_color rgba(49, 50, 67, 1.00);
-@define-color thumbnail_fg_color rgba(189, 198, 227, 1.00);
-
-@define-color dialog_bg_color rgba(49, 50, 68, 1.00);
-@define-color dialog_fg_color rgba(189, 198, 227, 1.00);
-
-@define-color popover_bg_color rgba(49, 50, 67, 1.00);
-@define-color popover_fg_color rgba(189, 198, 227, 1.00);
-
-@define-color shade_color rgba(0, 0, 0, 0.32);
-@define-color scrollbar_outline_color rgba(30, 30, 46, 0.50);
-
-@define-color accent_color rgba(203, 166, 247, 1.00);
-@define-color accent_bg_color rgba(203, 166, 247, 1.00);
-@define-color accent_fg_color rgba(0, 0, 0, 1.00);
-
-@define-color destructive_color rgba(243, 139, 168, 1.00);
-@define-color destructive_bg_color rgba(243, 139, 168, 1.00);
-@define-color destructive_fg_color rgba(0, 0, 0, 1.00);
-
-@define-color warning_color rgba(249, 226, 175, 1.00);
-@define-color warning_bg_color rgba(249, 226, 175, 1.00);
-@define-color warning_fg_color rgba(0, 0, 0, 1.00);
-
-@define-color success_color rgba(166, 227, 161, 1.00);
-@define-color success_bg_color rgba(166, 227, 161, 1.00);
-@define-color success_fg_color rgba(0, 0, 0, 1.00);
-
-@define-color accent_color rgba(203, 166, 247, 1.00);
-@define-color accent_bg_color rgba(203, 166, 247, 1.00);
-@define-color accent_fg_color rgba(0, 0, 0, 1.00);
-
-@define-color error_color rgba(243, 139, 168, 1.00);
-@define-color error_bg_color rgba(243, 139, 168, 1.00);
-@define-color error_fg_color rgba(0, 0, 0, 1.00);
-
-@define-color blue_1 rgba(151, 195, 255, 1.00);
-@define-color blue_2 rgba(144, 187, 255, 1.00);
-@define-color blue_3 rgba(137, 180, 250, 1.00);
-@define-color blue_4 rgba(114, 156, 224, 1.00);
-@define-color blue_5 rgba(91, 132, 199, 1.00);
-
-@define-color green_1 rgba(175, 236, 170, 1.00);
-@define-color green_2 rgba(171, 232, 165, 1.00);
-@define-color green_3 rgba(166, 227, 161, 1.00);
-@define-color green_4 rgba(139, 199, 134, 1.00);
-@define-color green_5 rgba(113, 171, 108, 1.00);
-
-@define-color yellow_1 rgba(254, 231, 180, 1.00);
-@define-color yellow_2 rgba(252, 229, 178, 1.00);
-@define-color yellow_3 rgba(249, 226, 175, 1.00);
-@define-color yellow_4 rgba(219, 196, 146, 1.00);
-@define-color yellow_5 rgba(189, 167, 118, 1.00);
-
-@define-color red_1 rgba(255, 154, 183, 1.00);
-@define-color red_2 rgba(252, 147, 176, 1.00);
-@define-color red_3 rgba(243, 139, 168, 1.00);
-@define-color red_4 rgba(217, 116, 145, 1.00);
-@define-color red_5 rgba(191, 93, 122, 1.00);
-
-@define-color orange_1 rgba(255, 190, 146, 1.00);
-@define-color orange_2 rgba(255, 185, 140, 1.00);
-@define-color orange_3 rgba(250, 179, 135, 1.00);
-@define-color orange_4 rgba(222, 153, 110, 1.00);
-@define-color orange_5 rgba(195, 128, 85, 1.00);
-
-@define-color purple_1 rgba(192, 202, 255, 1.00);
-@define-color purple_2 rgba(186, 196, 255, 1.00);
-@define-color purple_3 rgba(180, 190, 254, 1.00);
-@define-color purple_4 rgba(155, 164, 226, 1.00);
-@define-color purple_5 rgba(130, 139, 200, 1.00);
-@define-color light_0 rgba(0, 0, 0, 1.00);
-@define-color light_1 rgba(3, 3, 17, 1.00);
-@define-color light_2 rgba(22, 25, 44, 1.00);
-@define-color light_3 rgba(49, 53, 73, 1.00);
-@define-color light_4 rgba(78, 82, 104, 1.00);
-@define-color dark_0 rgba(109, 114, 137, 1.00);
-@define-color dark_1 rgba(142, 147, 171, 1.00);
-@define-color dark_2 rgba(176, 181, 207, 1.00);
-@define-color dark_3 rgba(211, 217, 243, 1.00);
-@define-color dark_4 rgba(255, 255, 255, 1.00);
diff --git a/.config/gtk-4.0/cosmic/light.css b/.config/gtk-4.0/cosmic/light.css
deleted file mode 100644
index b200498..0000000
--- a/.config/gtk-4.0/cosmic/light.css
+++ /dev/null
@@ -1,106 +0,0 @@
-/* GENERATED BY COSMIC */
-@define-color window_bg_color rgba(221, 221, 221, 1.00);
-@define-color window_fg_color rgba(22, 22, 22, 1.00);
-
-@define-color view_bg_color rgba(241, 241, 241, 1.00);
-@define-color view_fg_color rgba(37, 37, 37, 1.00);
-
-@define-color headerbar_bg_color rgba(221, 221, 221, 1.00);
-@define-color headerbar_fg_color rgba(22, 22, 22, 1.00);
-@define-color headerbar_border_color_color rgba(181, 181, 181, 1.00);
-@define-color headerbar_backdrop_color rgba(221, 221, 221, 1.00);
-
-@define-color sidebar_bg_color rgba(241, 241, 241, 1.00);
-@define-color sidebar_fg_color rgba(37, 37, 37, 1.00);
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.32);
-@define-color sidebar_backdrop_color rgba(246, 246, 246, 1.00);
-
-@define-color secondary_sidebar_bg_color rgba(198, 198, 198, 1.00);
-@define-color secondary_sidebar_fg_color rgba(7, 7, 7, 1.00);
-@define-color secondary_sidebar_shade_color rgba(0, 0, 0, 0.32);
-@define-color secondary_sidebar_backdrop_color rgba(216, 216, 216, 1.00);
-
-@define-color card_bg_color rgba(252, 252, 252, 1.00);
-@define-color card_fg_color rgba(44, 44, 44, 1.00);
-
-@define-color thumbnail_bg_color rgba(252, 252, 252, 1.00);
-@define-color thumbnail_fg_color rgba(44, 44, 44, 1.00);
-
-@define-color dialog_bg_color rgba(241, 241, 241, 1.00);
-@define-color dialog_fg_color rgba(37, 37, 37, 1.00);
-
-@define-color popover_bg_color rgba(252, 252, 252, 1.00);
-@define-color popover_fg_color rgba(44, 44, 44, 1.00);
-
-@define-color shade_color rgba(0, 0, 0, 0.08);
-@define-color scrollbar_outline_color rgba(221, 221, 221, 0.50);
-
-@define-color accent_color rgba(0, 73, 109, 1.00);
-@define-color accent_bg_color rgba(0, 73, 109, 1.00);
-@define-color accent_fg_color rgba(255, 255, 255, 1.00);
-
-@define-color destructive_color rgba(160, 37, 43, 1.00);
-@define-color destructive_bg_color rgba(160, 37, 43, 1.00);
-@define-color destructive_fg_color rgba(255, 255, 255, 1.00);
-
-@define-color warning_color rgba(150, 104, 0, 1.00);
-@define-color warning_bg_color rgba(150, 104, 0, 1.00);
-@define-color warning_fg_color rgba(255, 255, 255, 1.00);
-
-@define-color success_color rgba(59, 110, 67, 1.00);
-@define-color success_bg_color rgba(59, 110, 67, 1.00);
-@define-color success_fg_color rgba(255, 255, 255, 1.00);
-
-@define-color accent_color rgba(0, 73, 109, 1.00);
-@define-color accent_bg_color rgba(0, 73, 109, 1.00);
-@define-color accent_fg_color rgba(255, 255, 255, 1.00);
-
-@define-color error_color rgba(160, 37, 43, 1.00);
-@define-color error_bg_color rgba(160, 37, 43, 1.00);
-@define-color error_fg_color rgba(255, 255, 255, 1.00);
-
-@define-color blue_1 rgba(49, 116, 125, 1.00);
-@define-color blue_2 rgba(28, 99, 107, 1.00);
-@define-color blue_3 rgba(0, 82, 90, 1.00);
-@define-color blue_4 rgba(0, 71, 79, 1.00);
-@define-color blue_5 rgba(0, 60, 68, 1.00);
-
-@define-color green_1 rgba(61, 120, 74, 1.00);
-@define-color green_2 rgba(43, 102, 57, 1.00);
-@define-color green_3 rgba(24, 85, 41, 1.00);
-@define-color green_4 rgba(8, 74, 30, 1.00);
-@define-color green_5 rgba(0, 63, 20, 1.00);
-
-@define-color yellow_1 rgba(117, 106, 44, 1.00);
-@define-color yellow_2 rgba(100, 89, 25, 1.00);
-@define-color yellow_3 rgba(83, 72, 0, 1.00);
-@define-color yellow_4 rgba(72, 61, 0, 1.00);
-@define-color yellow_5 rgba(62, 51, 0, 1.00);
-
-@define-color red_1 rgba(159, 76, 78, 1.00);
-@define-color red_2 rgba(139, 58, 62, 1.00);
-@define-color red_3 rgba(120, 41, 46, 1.00);
-@define-color red_4 rgba(107, 29, 36, 1.00);
-@define-color red_5 rgba(95, 16, 26, 1.00);
-
-@define-color orange_1 rgba(255, 195, 119, 1.00);
-@define-color orange_2 rgba(255, 189, 113, 1.00);
-@define-color orange_3 rgba(251, 184, 108, 1.00);
-@define-color orange_4 rgba(223, 158, 81, 1.00);
-@define-color orange_5 rgba(196, 132, 53, 1.00);
-
-@define-color purple_1 rgba(229, 155, 255, 1.00);
-@define-color purple_2 rgba(221, 148, 255, 1.00);
-@define-color purple_3 rgba(213, 140, 255, 1.00);
-@define-color purple_4 rgba(188, 116, 229, 1.00);
-@define-color purple_5 rgba(164, 93, 204, 1.00);
-@define-color light_0 rgba(0, 0, 0, 1.00);
-@define-color light_1 rgba(5, 5, 5, 1.00);
-@define-color light_2 rgba(27, 27, 27, 1.00);
-@define-color light_3 rgba(54, 54, 54, 1.00);
-@define-color light_4 rgba(84, 84, 84, 1.00);
-@define-color dark_0 rgba(115, 115, 115, 1.00);
-@define-color dark_1 rgba(148, 148, 148, 1.00);
-@define-color dark_2 rgba(182, 182, 182, 1.00);
-@define-color dark_3 rgba(218, 218, 218, 1.00);
-@define-color dark_4 rgba(255, 255, 255, 1.00);
diff --git a/.config/gtk-4.0/gtk-dark.css b/.config/gtk-4.0/gtk-dark.css
deleted file mode 120000
index 1cf1391..0000000
--- a/.config/gtk-4.0/gtk-dark.css
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/themes/catppuccin-mocha-mauve-standard+default/gtk-4.0/gtk-dark.css
\ No newline at end of file
diff --git a/.config/gtk-4.0/gtk.css b/.config/gtk-4.0/gtk.css
deleted file mode 120000
index ba34b8c..0000000
--- a/.config/gtk-4.0/gtk.css
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/themes/catppuccin-mocha-mauve-standard+default/gtk-4.0/gtk.css
\ No newline at end of file
diff --git a/.config/gtk-4.0/gtk.css.bak b/.config/gtk-4.0/gtk.css.bak
deleted file mode 120000
index 4b5bb7f..0000000
--- a/.config/gtk-4.0/gtk.css.bak
+++ /dev/null
@@ -1 +0,0 @@
-/home/user/.config/gtk-4.0/cosmic/dark.css
\ No newline at end of file
diff --git a/.config/gtk-4.0/settings.ini b/.config/gtk-4.0/settings.ini
deleted file mode 100644
index ec398a0..0000000
--- a/.config/gtk-4.0/settings.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[Settings]
-gtk-application-prefer-dark-theme=0
-gtk-cursor-theme-size=24
diff --git a/.config/gtk-4.0/thumbnail.png b/.config/gtk-4.0/thumbnail.png
deleted file mode 100644
index 60d32ee..0000000
Binary files a/.config/gtk-4.0/thumbnail.png and /dev/null differ
diff --git a/.config/scripts/sessions.sh b/.config/scripts/sessions.sh
index a5a6af8..050007a 100755
--- a/.config/scripts/sessions.sh
+++ b/.config/scripts/sessions.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/zsh
-source ~/.config/shell/functions.zsh
+source $HOME/.config/shell/functions.zsh
 
 new() {
 
diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf
index de5d1e7..dafd6cc 100644
--- a/.config/tmux/tmux.conf
+++ b/.config/tmux/tmux.conf
@@ -96,9 +96,9 @@ unbind %
 bind c new-window -c "#{pane_current_path}"
 
 bind n run 'zsh -c ". $HOME/.config/scripts/sessions.sh new"'
-bind s display-popup -E -w 50% -h 50% ". $HOME/.config/scripts/sessions.sh switch"
-bind d display-popup -E -w 50% -h 50% ". $HOME/.config/scripts/sessions.sh delete"
-bind w display-popup -E -w 50% -h 50% ". $HOME/.config/scripts/sessions.sh window"
+bind s display-popup -E -w 50% -h 50% "zsh -c '. $HOME/.config/scripts/sessions.sh switch'"
+bind d display-popup -E -w 50% -h 50% "zsh -c '. $HOME/.config/scripts/sessions.sh delete'"
+bind w display-popup -E -w 50% -h 50% "zsh -c '. $HOME/.config/scripts/sessions.sh window'"
 
 bind g display-popup -E -w 80% -h 75% "lazygit"
 bind k display-popup -E -w 80% -h 75% "k9s"
diff --git a/.nixpkgs/config.nix b/.nixpkgs/config.nix
index 341b992..a5ba2dc 100644
--- a/.nixpkgs/config.nix
+++ b/.nixpkgs/config.nix
@@ -28,7 +28,6 @@
         podman-desktop
         helm
         htop
-        yubikey-manager
         gimp
         yazi
         powershell
@@ -36,6 +35,10 @@
         devpod-desktop
         nerd-fonts.go-mono
         libsecret
+        zenity
+        librewolf
+        libnotify
+        wl-clipboard
       ];
     };
   };
diff --git a/ansible/files/polkit/ykman-user.rules b/ansible/files/polkit/ykman-user.rules
new file mode 100644
index 0000000..e7f92b6
--- /dev/null
+++ b/ansible/files/polkit/ykman-user.rules
@@ -0,0 +1,6 @@
+polkit.addRule(function(action, subject) {
+  var actions = ["org.debian.pcsc-lite.access_pcsc", "org.debian.pcsc-lite.access_card"];
+  if (actions.indexOf(action.id) !== -1 && subject.active && subject.isInGroup("ykusers")) {
+    return polkit.Result.YES;
+  }
+});
diff --git a/ansible/roles/packages/tasks/defaults.yml b/ansible/roles/packages/tasks/defaults.yml
index c6ab4c3..1ff6be2 100644
--- a/ansible/roles/packages/tasks/defaults.yml
+++ b/ansible/roles/packages/tasks/defaults.yml
@@ -1,15 +1,15 @@
 - name: install apt
   include_tasks: "./scripts/install_apt.yml"
 
+- name: install nix
+  include_tasks: "./scripts/install_nix.yml"
+
 - name: install brew
   include_tasks: "./scripts/install_brew.yml"
 
 - name: install pacman
   include_tasks: "./scripts/install_pacman.yml"
 
-  #- name: install go
-  #  include_tasks: "./scripts/install_go.yml"
-
 - name: install go apps
   include_tasks: "./scripts/install_goapps.yml"
 
diff --git a/ansible/roles/packages/vars/Pop!_OS-24.04.yml b/ansible/roles/packages/vars/Pop!_OS-24.04.yml
index e76b43c..dabdfdb 100644
--- a/ansible/roles/packages/vars/Pop!_OS-24.04.yml
+++ b/ansible/roles/packages/vars/Pop!_OS-24.04.yml
@@ -32,6 +32,16 @@ required_packages_apt:
   - qemu-utils 
   - libvirt-daemon 
   - virt-manager
+  - pcscd
+  - libpcsclite-dev
+  - libfido2-1 
+  - libfido2-dev 
+  - libfido2-doc 
+  - fido2-tools
+  - pcsc-tools
+  - libpam-yubico 
+  - yubikey-personalization 
+  - yubikey-manager
   #- htop
   #- curl
   #- xsel
@@ -65,8 +75,6 @@ flatpak_remote:
   - {name: 'flathub', url: "https://dl.flathub.org/repo/flathub.flatpakrepo"}
 
 required_packages_flatpak:
-  - io.gitlab.librewolf-community
-  - me.proton.Pass
   - me.proton.Mail
   - com.protonvpn.www
   - org.remmina.Remmina
@@ -79,6 +87,7 @@ required_packages_flatpak:
   - fr.handbrake.ghb
   - com.spotify.Client
   - org.signal.Signal
+  - com.yubico.yubioath
 
 #go_version_target: "go version go1.23.4 linux/amd64"
 #go_tarball: "go1.23.5.linux-amd64.tar.gz"
@@ -93,7 +102,9 @@ go_apps:
 
 systemd_service:
   - libvirtd.service
+  - pcscd.service
    
 user_groups:
   - video
   - sudo
+  - ykusers
diff --git a/ansible/roles/update/tasks/main.yml b/ansible/roles/update/tasks/main.yml
index cf2ee7e..c30c3c2 100644
--- a/ansible/roles/update/tasks/main.yml
+++ b/ansible/roles/update/tasks/main.yml
@@ -1,7 +1,18 @@
-- name: Update Pacman
-  community.general.pacman:
-    update_cache: true
-    upgrade: true
+#- name: Update Pacman
+#  community.general.pacman:
+#    update_cache: true
+#    upgrade: true
+
+- name: Upgrade Packages
+  package:
+    update_cache: yes
+    upgrade: safe 
+  become: yes
+
+- name: Update Nix Packages
+  become_user: user
+  shell:
+    cmd: nix-env -iA nixpkgs.myPackages
 
 - name: Update Homebrew and Apps
   become_user: user
@@ -9,16 +20,8 @@
     update_homebrew: true
     upgrade_all: true
 
-- name: Get list of installed Flatpak packages
-  ansible.builtin.command: flatpak list --app --columns=application
-  register: flatpak_list
-  changed_when: false
-
-- name: Remove header line from flatpak_list
-  set_fact:
-    flatpak_list: "{{ flatpak_list.stdout_lines[1:] }}"
-
-- name: Update Flatpak packages
-  community.general.flatpak:
-    name: "{{ flatpak_list }}"
-    state: latest
+- name: Update all Flatpak packages
+  become_user: user
+  ansible.builtin.command: flatpak update -y
+  register: flatpak_update
+  changed_when: "'Nothing to do' not in flatpak_update.stdout"
diff --git a/ansible/scripts/configure_groups.yml b/ansible/scripts/configure_groups.yml
index 6fb6969..7251eb5 100644
--- a/ansible/scripts/configure_groups.yml
+++ b/ansible/scripts/configure_groups.yml
@@ -1,4 +1,11 @@
-- name: adding existing user '{{ user }}' to group sudo
+- name: Ensure groups exists
+  group:
+    name: '{{ item }}'
+    state: present
+  with_items: "{{ user_groups }}"
+  when: user_groups is defined   
+
+- name: adding existing user '{{ user }}' to groups
   user:
     groups: '{{ item }}'
     name: user
diff --git a/ansible/scripts/install-udev-rules.yml b/ansible/scripts/install-udev-rules.yml
index 49a03fd..b6b33e6 100644
--- a/ansible/scripts/install-udev-rules.yml
+++ b/ansible/scripts/install-udev-rules.yml
@@ -8,7 +8,7 @@
 - name: Copy each .service file to systemd directory
   copy:
     src: "{{ item.path }}"
-    dest: "/etc/udev/rules.d" 
+    dest: "/usr/lib/udev/rules.d/" 
     owner: root
     group: root
     mode: '0644'
diff --git a/ansible/scripts/install_flatpak.yml b/ansible/scripts/install_flatpak.yml
index b2f40f2..3690dec 100644
--- a/ansible/scripts/install_flatpak.yml
+++ b/ansible/scripts/install_flatpak.yml
@@ -3,7 +3,7 @@
     name: "{{ item.name }}"
     state: present
     flatpakrepo_url: "{{ item.url }}"
-    method: system
+    method: user
   with_items:  "{{ flatpak_remote }}"      
   when: flatpak_remote is defined   
 
diff --git a/ansible/scripts/install_nix.yml b/ansible/scripts/install_nix.yml
new file mode 100644
index 0000000..40a5e65
--- /dev/null
+++ b/ansible/scripts/install_nix.yml
@@ -0,0 +1,4 @@
+- name: Install Nix Packages
+  become_user: user
+  shell:
+    cmd: nix-env -iA nixpkgs.myPackages