Misc updates

modules/home/programs/k9s/default.nix

@@ -13,12 +13,10 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    programs.k9s = {
+    programs.k9s.enable = true;
+    catppuccin.k9s = {
       enable = true;
-      catppuccin = {
-        enable = true;
-        transparent = true;
-      };
+      transparent = true;
     };
   };
 }

modules/home/programs/neovim/default.nix

@@ -27,10 +27,6 @@ in
     lib.mkMerge [
       { home.packages = [ pkgs.neovim ]; }
       (lib.mkIf cfg.lazygit.enable {
-        programs.zsh.shellAliases = {
-          nvim = "${pkgs.neovim}/bin/nvim --listen /tmp/nvim-server.pipe";
-        };
-
         programs.lazygit.settings.os = {
           editCommand = "nvim";
           editCommandTemplate = ''

modules/home/windowManagers/sway/default.nix

@@ -121,16 +121,26 @@ in
       apply = true;
     };
 
+    # TODO: configure xdg portal with home-manager (it's broken rn)
+    # see here: https://github.com/nix-community/home-manager/issues/6770
+    #
     # For screen sharing to work
-    xdg.portal = {
-      enable = true;
-      extraPortals = with pkgs; [
-        xdg-desktop-portal-wlr
-        xdg-desktop-portal-gtk
-      ];
-      config.common.default = "*";
-    };
-
+    # home.sessionVariables.NIX_XDG_DESKTOP_PORTAL_DIR = "";
+    # systemd.user.sessionVariables.NIX_XDG_DESKTOP_PORTAL_DIR = "";
+    # xdg.portal = {
+    #   enable = true;
+    #   extraPortals = with pkgs; [
+    #     xdg-desktop-portal-wlr
+    #     xdg-desktop-portal-gtk
+    #   ];
+    #   config = {
+    #     common = {
+    #       default = "gtk";
+    #       "org.freekdesktop.impl.portal.ScreenCast" = "wlr";
+    #       "org.freekdesktop.impl.portal.ScreenShot" = "wlr";
+    #     };
+    #   };
+    # };
     xdg.dataFile.${cfg.wallpaperPath}.source = ./wallpaper.jpg;
 
     catppuccin.sway.enable = true;
@@ -159,11 +169,18 @@ in
           ;
         workspaceAutoBackAndForth = true;
 
-        startup = mkIf cfg.clamshell.enable [
-          {
+        startup = lib.mkMerge [
+          (mkIf cfg.clamshell.enable {
             command = "${clamshell_script}/bin/clamshell";
             always = true;
-          }
+          })
+          # Trying to copy what arch linux does
+          [
+            # { command = "systemctl --user set-environment WAYLAND_DISPLAY=wayland-1 XDG_CURRENT_DESKTOP=sway"; }
+            {
+              command = "systemctl --user import-environment DISPLAY SWAYSOCK WAYLAND_DISPLAY XDG_CURRENT_DESKTOP";
+            }
+          ]
         ];
 
         # Use catppuccin colors

modules/nixos/nix/default.nix

@@ -20,7 +20,7 @@ in
     enable = mkEnableOption "manage nix configuration.";
     package = mkOption {
       type = types.package;
-      default = pkgs.nixVersions.git;
+      default = pkgs.nixVersions.latest;
       description = "Which nix package to use.";
     };
 

modules/nixos/services/homeassistant/default.nix

@@ -54,6 +54,7 @@ in
         "met"
         "mqtt"
         "octoprint"
+        "roborock"
         "shelly"
         "zeroconf"
       ];