diff --git a/flake.lock b/flake.lock
index 97c4a34..4354c7b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1769054619,
-        "narHash": "sha256-LCc0gbSgjehdy41Gi1H5WNxEuW9PtRHFVaPXoFzslQU=",
+        "lastModified": 1772596991,
+        "narHash": "sha256-awJJ4ATy9t8Svrx2z0zAftgXnUaGCFb2Ty0u036CnCQ=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "6509620630f68dc02ac3e99f15a67760778444ff",
+        "rev": "cd2d0893966c0a5c27345a9a72d0418b42b7e36d",
         "type": "gitlab"
       },
       "original": {
@@ -29,11 +29,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1767910483,
-        "narHash": "sha256-MOU5YdVu4DVwuT5ztXgQpPuRRBjSjUGIdUzOQr9iQOY=",
+        "lastModified": 1772633058,
+        "narHash": "sha256-SO7JapRy2HPhgmqiLbfnW1kMx5rakPMKZ9z3wtRLQjI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "82fb7dedaad83e5e279127a38ef410bcfac6d77c",
+        "rev": "080657a04188aca25f8a6c70a0fb2ea7e37f1865",
         "type": "github"
       },
       "original": {
@@ -45,11 +45,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1768028080,
-        "narHash": "sha256-50aDK+8eLvsLK39TzQhKNq50/HcXyP4hyxOYoPoVxjo=",
+        "lastModified": 1772598333,
+        "narHash": "sha256-YaHht/C35INEX3DeJQNWjNaTcPjYmBwwjFJ2jdtr+5U=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d03088749a110d52a4739348f39a63f84bb0be14",
+        "rev": "fabb8c9deee281e50b1065002c9828f2cf7b2239",
         "type": "github"
       },
       "original": {
diff --git a/home/desktop-slim.nix b/home/desktop-slim.nix
index dca19a8..66f0da4 100644
--- a/home/desktop-slim.nix
+++ b/home/desktop-slim.nix
@@ -8,8 +8,8 @@
     ./firefox.nix
     ./fonts.nix
     ./foot.nix
-    ./gnome.nix
     ./media.nix
+    # ./plasma.nix
     ./user-dirs.nix
   ];
 
diff --git a/home/firefox.nix b/home/firefox.nix
index 9d79fe2..43418ef 100644
--- a/home/firefox.nix
+++ b/home/firefox.nix
@@ -1,7 +1,6 @@
 { config, pkgs, inputs, osConfig, ... }:
 
 {
-
   programs.firefox = {
     enable = true;
     policies = {
@@ -149,6 +148,7 @@
           user_pref("signon.rememberSignons", false);
           user_pref("toolkit.telemetry.enabled", false);
           user_pref("toolkit.telemetry.server", "");
+          user_pref("widget.gtk.libadwaita-colors.enabled", false);
         '';
       };
     };
diff --git a/home/foot.nix b/home/foot.nix
index a0fadb4..10dc8aa 100644
--- a/home/foot.nix
+++ b/home/foot.nix
@@ -8,13 +8,13 @@
       main = {
         shell = "${pkgs.fish}/bin/fish -c 'tmux attach'";
         pad = "34x34";
-        # font = "JetBrains Mono:size=16";
-        font = "Adwaita Mono:size=17";
-        font-bold = "Adwaita Mono:size=17:weight=bold";
-        font-italic = "Adwaita Mono:size=17:slant=italic";
-        font-bold-italic = "Adwaita Mono:size=17:weight=boldslant=italic";
-        initial-window-mode = "maximized";
-        initial-color-theme = "dark";
+        font = "JetBrains Mono:size=14";
+        # font = "Adwaita Mono:size=17";
+        # font-bold = "Adwaita Mono:size=17:weight=bold";
+        # font-italic = "Adwaita Mono:size=17:slant=italic";
+        # font-bold-italic = "Adwaita Mono:size=17:weight=boldslant=italic";
+        # initial-window-mode = "maximized";
+        # initial-color-theme = "dark";
       };
 
       mouse.hide-when-typing = "yes";
diff --git a/home/gpg.nix b/home/gpg.nix
index 8a54d51..43886ae 100644
--- a/home/gpg.nix
+++ b/home/gpg.nix
@@ -6,12 +6,14 @@
     pinentry-all
   ];
 
-  services.gpg-agent = {
-    enable = true;
-    pinentry.package = pkgs.pinentry-gnome3;
-    pinentry.program = "pinentry-gnome3";
-    enableSshSupport = true;
-  };
+# moved to system
+
+#   services.gpg-agent = {
+#     enable = true;
+#     pinentry.package = pkgs.pinentry-all;
+#     pinentry.program = "pinentry";
+#     #  enableSshSupport = true;
+#   };
 
   programs.gpg = {
     enable = true;
diff --git a/home/hyprland.nix b/home/hyprland.nix
new file mode 100644
index 0000000..005d6a6
--- /dev/null
+++ b/home/hyprland.nix
@@ -0,0 +1,7 @@
+{ ... }:
+
+{
+  wayland.windowManager.hyprland = {
+    systemd.enable = false;
+  };
+}
diff --git a/home/mail/default.nix b/home/mail/default.nix
index b9a709a..f6dba07 100644
--- a/home/mail/default.nix
+++ b/home/mail/default.nix
@@ -51,6 +51,7 @@ let
     multipart; xdg-open %s
     text/html; firefox %s; description=HTML Text; nametemplate=%s.html; needsterminal
     text/html; w3m -v -F -T text/html -dump %s; copiousoutput
+    text/calendar; khal import %s
     text; neomutt %s
     application; xdg-open %s
     image; xdg-open %s
@@ -216,13 +217,13 @@ in
 
     binds = [ 
       { key = "m"; map = [ "index" "pager" ]; action = "noop"; }
-      { key = "k"; map = "pager"; action = "previous-entry"; }
-      { key = "j"; map = "pager"; action = "next-entry"; }
-      { key = "<return>"; map = "index"; action = "display-message"; }
+      { key = "k"; map = [ "pager" ]; action = "previous-entry"; }
+      { key = "j"; map = [ "pager" ]; action = "next-entry"; }
+      { key = "<return>"; map = [ "index" ]; action = "display-message"; }
       { key = "<space>"; map = "index"; action = "entire-thread"; }
       { key = "gf"; map = [ "index" "pager" ]; action = "change-folder"; }
-      { key = "<Tab>"; map = "editor"; action = "complete-query"; }
-      { key = "P"; map = "compose"; action = "pgp-menu"; }
+      { key = "<Tab>"; map = [ "editor" ]; action = "complete-query"; }
+      { key = "P"; map = [ "compose" ]; action = "pgp-menu"; }
       { key = "p"; map = [ "compose" ]; action = "postpone-message"; }
     ];
 
diff --git a/home/nvim/config.vim b/home/nvim/config.vim
index b4cda0b..166132d 100644
--- a/home/nvim/config.vim
+++ b/home/nvim/config.vim
@@ -50,6 +50,8 @@ onoremap <silent> al :normal val<return>
 xnoremap i% GoggV
 onoremap <silent> i% :normal vi%<return>
 
+" highlight Normal guibg=NONE
+
 function CreateNote(title)
   execute "VimwikiIndex"
   execute "VimwikiGoto " . a:title
diff --git a/home/nvim/default.nix b/home/nvim/default.nix
index 7d3e0ff..f7e9cfc 100644
--- a/home/nvim/default.nix
+++ b/home/nvim/default.nix
@@ -136,7 +136,7 @@
       {
         plugin = papercolor-theme;
         config = ''
-          set background=light
+          " set background=light
           colorscheme PaperColor
         '';
       }
@@ -203,7 +203,7 @@
       vim-snippets
       vim-speeddating
       vim-surround
- 
+
       {
         plugin = vim-unimpaired;
         config = ''
diff --git a/home/password-store.nix b/home/password-store.nix
index 8839f20..af8f9e3 100644
--- a/home/password-store.nix
+++ b/home/password-store.nix
@@ -1,8 +1,6 @@
 { config, pkgs, ... }:
 
 {
-  services.gnome-keyring.enable = false;
-
   programs.password-store = {
     enable = true;
     settings = {
@@ -14,14 +12,12 @@
     pkgs.passff-host
   ];
 
+  services.gnome-keyring.enable = false;
+
   services.pass-secret-service = {
     enable = true;
   };
 
-  home.packages = with pkgs; [
-    pinentry-all
-  ];
-
   xdg.configFile."scdaemon" = {
     text = ''
       disable-ccid
@@ -29,4 +25,5 @@
     '';
     target = "../.gnupg/scdaemon.conf";
   };
+
 }
diff --git a/home/plasma.nix b/home/plasma.nix
new file mode 100644
index 0000000..426fa8e
--- /dev/null
+++ b/home/plasma.nix
@@ -0,0 +1,5 @@
+{ ... }:
+
+{
+  services.kdeconnect.enable = true;
+}
diff --git a/hosts/nova/default.nix b/hosts/nova/default.nix
index 969a3e5..1ffb75e 100644
--- a/hosts/nova/default.nix
+++ b/hosts/nova/default.nix
@@ -9,9 +9,12 @@
     ../../users/guest/system.nix
     ../../system
     ../../system/desktop
-    ../../system/desktop/gnome.nix
-    # ../../system/desktop/cast.nix
     ../../system/desktop/ergodox-udev.nix
+    # ../../system/desktop/gnome.nix
+    # ../../system/desktop/hyprland.nix
+    # ../../system/desktop/cast.nix
+    # ../../system/desktop/plasma.nix
+    ../../system/desktop/cosmic.nix
     ../../system/desktop/steam.nix
     ../../system/desktop/yubikey-pam.nix
   ];
diff --git a/system/desktop/cosmic.nix b/system/desktop/cosmic.nix
new file mode 100644
index 0000000..a90680b
--- /dev/null
+++ b/system/desktop/cosmic.nix
@@ -0,0 +1,14 @@
+{ lib, ... }:
+
+{
+  services.desktopManager.cosmic.enable = true;
+  services.displayManager.cosmic-greeter.enable = true;
+
+  services.system76-scheduler.enable = true;
+
+  services.gnome.gnome-keyring.enable = lib.mkForce false;
+
+  programs.firefox.preferences = {
+    "widget.gtk.libadwaita-colors.enabled" = false;
+  };
+}
diff --git a/system/desktop/default.nix b/system/desktop/default.nix
index 26f54a5..b4c988b 100644
--- a/system/desktop/default.nix
+++ b/system/desktop/default.nix
@@ -51,4 +51,9 @@
   programs.virt-manager.enable = true;
   programs.dconf.enable = true;
 
+  programs.gnupg.agent = {
+    enable = true;
+    pinentryPackage = pkgs.pinentry-all;
+    # pinentry.program = "pinentry";
+  };
 }
diff --git a/system/desktop/gnome.nix b/system/desktop/gnome.nix
index e1e463a..b31365b 100644
--- a/system/desktop/gnome.nix
+++ b/system/desktop/gnome.nix
@@ -4,10 +4,10 @@
 {
   services.desktopManager.gnome.enable = true;
 
-  services.displayManager = {
-    gdm.enable = true;
-    defaultSession = "gnome";
-  };
+  # services.displayManager = {
+  #   gdm.enable = true;
+  #   defaultSession = "gnome";
+  # };
 
   environment.gnome.excludePackages = with pkgs; [ 
     gnome-tour
diff --git a/system/desktop/hyprland.nix b/system/desktop/hyprland.nix
new file mode 100644
index 0000000..ab3624d
--- /dev/null
+++ b/system/desktop/hyprland.nix
@@ -0,0 +1,29 @@
+{ pkgs, ... }:
+
+{
+
+  programs.hyprland = {
+    enable = true;
+    withUWSM = true;
+    # xwayland.enable = true;
+  };
+
+  # programs.regreet = {
+  # enable = true;
+  #   # For this example you'd need to have a version of Adwaita and the font Cantarell installed
+  #   theme.name = "Adwaita"; 
+  #   font = {
+  #     name = "Cantarell";
+  #     size = 16;
+  #   };
+  #   cursorTheme.name = "Adwaita";
+  # };
+
+  environment.systemPackages = with pkgs; [
+    ashell
+    kitty
+    mako
+    tofi
+  ];
+
+}
diff --git a/system/desktop/plasma.nix b/system/desktop/plasma.nix
new file mode 100644
index 0000000..d3f86a6
--- /dev/null
+++ b/system/desktop/plasma.nix
@@ -0,0 +1,18 @@
+{ ... }:
+
+{
+  services.desktopManager.plasma6.enable = true;
+
+  programs.kdeconnect.enable = true;
+
+  networking.firewall = rec {
+    allowedTCPPortRanges = [ { from = 1714; to = 1764; } ];
+    allowedUDPPortRanges = allowedTCPPortRanges;
+  };
+
+  services.displayManager.sddm = {
+    enable = true;
+    wayland.enable = true;
+    settings.General.DisplayServer = "wayland";
+  };
+}