fix nixos config

hosts/desktop/configuration.nix

@@ -1,6 +1,7 @@
 {
   pkgs,
   userSettings,
+  systemSettings,
   ...
 }: {
   imports = [
@@ -30,9 +31,9 @@
 
     nh = {
       enable = true;
-      clean.enable = true;
-      clean.extraArgs = "--keep-since 4d --keep 3";
-      flake = "/home/nmarks/.dotfiles";
+      # clean.enable = true;
+      # clean.extraArgs = "--keep-since 4d --keep 3";
+      flake = "/home/nmarks/.dotfiles#nixosConfigurations.nixos";
     };
 
     neovim = {
@@ -156,7 +157,7 @@
   };
 
   networking = {
-    hostName = userSettings.hostname; # Define your hostname.
+    hostName = systemSettings.host; # Define your hostname.
     # wireless.enable = true; # Enables wireless support via wpa_supplicant.
     networkmanager.enable = true;
     firewall = {

hosts/desktop/home.nix

@@ -3,16 +3,22 @@
   config,
   pkgs,
   lib,
-  zls,
+  userSettings,
+  systemSettings,
   ...
 }: let
-  shared-programs = import ../../modules/shared/homeManagerPrograms.nix {inherit inputs config pkgs lib;};
+  shared-programs = import ../../modules/shared/homeManagerPrograms.nix {inherit inputs config pkgs lib userSettings systemSettings;};
 in {
+  imports = [
+    inputs.nixvim.homeManagerModules.nixvim
+    #set up nixvim
+    ../../modules/nixvim
+  ];
   home = {
     stateVersion = "23.05"; # Please read the comment before changing.
 
     packages = with pkgs; let
-      shared-packages = import ../../modules/shared/packages.nix {inherit pkgs;};
+      shared-packages = import ../../modules/shared/packages.nix {inherit pkgs systemSettings;};
     in
       shared-packages
       ++ [
@@ -51,9 +57,10 @@ in {
         calibre
         mpv
         wireguard-tools
+        signal-desktop
       ]
       ++ [
-        zls.packages.x86_64-linux.zls
+        inputs.zls.packages.x86_64-linux.zls
         rust-bin.stable.latest.default
       ];
     # programs.mangohud.enable = true;

hosts/laptop/configuration.nix

@@ -6,6 +6,7 @@
   environment.systemPackages = with pkgs; [
     neovim
     pinentry_mac
+    signal-desktop-bin
   ];
 
   # Create /etc/zshrc that loads the nix-darwin environment.

modules/nixos/boot.nix

@@ -10,7 +10,7 @@
       grub = {
         enable = true;
         device = "nodev";
-        theme = pkgs.catppuccin-grub;
+        # theme = pkgs.catppuccin-grub;
         useOSProber = true;
         efiSupport = true;
       };

modules/nixos/nvidia.nix

@@ -19,24 +19,6 @@ in {
 
   # Blacklist nouveau to avoid conflicts
   boot.blacklistedKernelModules = ["nouveau"];
-
-  hardware = {
-    nvidia = {
-      forceFullCompositionPipeline = true; # Prevents screen tearing
-      # Modesetting is required.
-      modesetting.enable = true;
-
-      powerManagement = {
-        enable = true; # Power management
-        finegrained = true; # More precise power consumption control
-      };
-
-      # Use the NVidia open source kernel module (not to be confused with the
-      # independent third-party "nouveau" open source driver).
-      # Currently alpha-quality/buggy, so false is currently the recommended setting.
-      open = false;
-
-      # Environment variables for better compatibility
   environment.variables = {
     LIBVA_DRIVER_NAME = "nvidia"; # Hardware video acceleration
     XDG_SESSION_TYPE = "wayland"; # Force Wayland
@@ -51,6 +33,24 @@ in {
     MOZ_ENABLE_WAYLAND = "1"; # Wayland support for Firefox
   };
 
+  hardware = {
+    nvidia = {
+      forceFullCompositionPipeline = true; # Prevents screen tearing
+      # Modesetting is required.
+      modesetting.enable = true;
+
+      powerManagement = {
+        enable = true; # Power management
+        # finegrained = true; # More precise power consumption control
+      };
+
+      # Use the NVidia open source kernel module (not to be confused with the
+      # independent third-party "nouveau" open source driver).
+      # Currently alpha-quality/buggy, so false is currently the recommended setting.
+      open = false;
+
+      # Environment variables for better compatibility
+
       # Enable the Nvidia settings menu,
       # accessible via `nvidia-settings`.
       nvidiaSettings = true;

modules/nixos/services.nix

@@ -25,10 +25,9 @@
     displayManager.cosmic-greeter.enable = true;
 
     # Auto mount devices
-    udiskie = {
+    udisks2 = {
       enable = true;
     };
-
     # Configure keymap in X11
     xserver = {
       xkb.layout = "us";

modules/nixvim/plugins/lz-n.nix

@@ -0,0 +1,7 @@
+{pkgs, ...}: {
+  programs.nixvim.programs = {
+    lz-n = {
+      enable = true;
+    };
+  };
+}

modules/shared/packages.nix

@@ -1,4 +1,8 @@
-{pkgs, ...}:
+{
+  pkgs,
+  systemSettings,
+  ...
+}:
 with pkgs; [
   #general development
   just
@@ -59,7 +63,6 @@ with pkgs; [
     withMoonlight = true;
   })
   vesktop
-  signal-desktop-bin
 
   #media
   spotify