Fixes for 24.05

flake.nix

@@ -64,7 +64,7 @@
       framework-server = libx.mkHost { hostname = "framework-server"; };
       nuc-server       = libx.mkHost { hostname = "nuc-server"; };
       nixos-desktop    = libx.mkHost { hostname = "nixos-desktop";   unfree = true; desktop = "hyprland"; theme = "green"; };
-      nixos-framework  = libx.mkHost { hostname = "nixos-framework"; unfree = true; desktop = "plasma6"; theme = "stylix-day"; };
+      nixos-framework  = libx.mkHost { hostname = "nixos-framework"; unfree = true; desktop = "plasma6"; theme = "tokyo-day"; };
       backups-rpi4     = libx.mkHost { hostname = "backups-rpi4";     system = "aarch64-linux"; type = "small"; };
       piaware-rpi4     = libx.mkHost { hostname = "piaware-rpi4";     system = "aarch64-linux"; type = "small"; };
       quitman-rpi4     = libx.mkHost { hostname = "quitman-rpi4";     system = "aarch64-linux"; type = "small"; };
@@ -77,7 +77,7 @@
       "albert@framework-server" = libx.mkHome { hostname = "framework-server"; };
       "albert@nuc-server"       = libx.mkHome { hostname = "nuc-server";  };
       "albert@nixos-desktop"    = libx.mkHome { hostname = "nixos-desktop";   desktop = "hyprland"; theme = "green"; };
-      "albert@nixos-framework"  = libx.mkHome { hostname = "nixos-framework"; desktop = "plasma6"; theme = "stylix-day";};
+      "albert@nixos-framework"  = libx.mkHome { hostname = "nixos-framework"; desktop = "plasma6"; theme = "tokyo-day";};
       "albert@backups-rpi4"     = libx.mkHome { hostname = "backups-rpi4";     system = "aarch64-linux"; type = "small"; };
       "albert@piaware-rpi4"     = libx.mkHome { hostname = "piaware-rpi4";     system = "aarch64-linux"; type = "small"; };
       "albert@quitman-rpi4"     = libx.mkHome { hostname = "quitman-rpi4";     system = "aarch64-linux"; type = "small"; };

home-manager/common/software/cli/nixvim.nix

@@ -66,7 +66,7 @@
             };
           };
           rnix-lsp.enable = lib.mkForce false;
-          nil_ls.enable = false;
+          nil-ls.enable = false;
           html.enable = true;
           cssls.enable = true;
           bashls.enable = true;

home-manager/common/software/cli/nixvim/base.nix

@@ -18,7 +18,7 @@
     globals.mapleader = " ";
     globals.maplocalleader = " ";
 
-    options = {
+    opts = {
       number = true;
       wrap = false;
       cursorline = true;

home-manager/common/software/cli/nixvim/cmp.nix

@@ -10,22 +10,10 @@
     cmp-nvim-lsp-document-symbol.enable = true;
     cmp-nvim-lsp-signature-help.enable = true;
 
-    cmp.settings = {
+    cmp = {
-      sources = [
-        { name = "nvim_lua"; }
-        { name = "nvim_lsp"; }
-        { name = "calc"; }
-        { name = "path"; }
-        { name = "buffer"; }
-        { name = "luasnip"; }
-      ];
-      snippet.expand = "luasnip";
- 
-    };
-
-    nvim-cmp = {
       enable = true;
       autoEnableSources = true;
+      settings = { 
         mapping = {
           "<C-Space>" = "cmp.mapping.complete()";
           "<C-d>" = "cmp.mapping.scroll_docs(-4)";
@@ -39,6 +27,15 @@
           completion.border = "rounded"; 
           documentation.border = "rounded";
         };
+        sources = [
+          { name = "nvim_lua"; }
+          { name = "nvim_lsp"; }
+          { name = "calc"; }
+          { name = "path"; }
+          { name = "buffer"; }
+          { name = "luasnip"; }
+        ];
+        snippet.expand = "luasnip";
         formatting = {
           fields = [ "menu" "abbr" "kind" ];
           # https://rsdlt.github.io/posts/rust-nvim-ide-guide-walkthrough-development-debug/
@@ -57,4 +54,5 @@
         };
       };
     };
+  };
 }

nixos/common/packages/default.nix

@@ -4,7 +4,6 @@
   # List packages installed in system profile
   environment.systemPackages = with pkgs; [
     nfs-utils    # nfs network share tools
-    nixfmt       # Formatting nix output
     sbctl        # Secureboot Control
     wget         # WebGet
     killall      # Killall

nixos/common/services/openssh.nix

@@ -1,7 +1,7 @@
 { hostname, ... }: {
   # enable passwordless elevation
   # Useful for deploy-rs
-  security.pam.enableSSHAgentAuth = true;
+  security.pam.sshAgentAuth.enable = true;
   programs.ssh.startAgent = true;
 
   # By default no ports are open.

nixos/hosts/nixos-framework/default.nix

@@ -76,7 +76,7 @@
     wineWowPackages.stable
     winetricks
     wineWowPackages.waylandFull
-    nvtop-amd
+    nvtopPackages.amd
     distrobox
     # RGB stuff
     openrgb-with-all-plugins