Merge dlaptop and huanan local configs

hosts/huanan/services.nix

@@ -0,0 +1,16 @@
+{ pkgs, lib, inputs, ... }:
+{
+  services.tailscale.enable = true;
+  services.syncthing.enable = true;
+  services.blueman.enable = true;
+  services.tumbler.enable = true;
+  services.gvfs.enable = true;
+  services.flatpak.enable = true;
+  services.printing.enable = true;
+  services.pcscd.enable = true;
+  services.udev.packages = [ 
+    pkgs.gnome.gnome-settings-daemon
+    pkgs.android-udev-rules
+    pkgs.yubikey-personalization
+  ];
+}

hosts/huanan/system.nix

@@ -3,9 +3,13 @@
 {
   imports = [ 
     ./hardware.nix
-    "${self}/pkgs/gnome.nix"
+    ./services.nix
+    ../dlaptop/xorg.nix
     "${self}/pkgs/apps.nix"
+    "${self}/pkgs/socks.nix"
+    "${self}/pkgs/scripts.nix"
     "${self}/pkgs/work.nix"
+    inputs.secrets.nixosModules.dlaptop
     inputs.home-manager.nixosModules.home-manager homeSettings
   ];
 
@@ -27,6 +31,29 @@
     excludePackages = [ pkgs.xterm ];
   };
 
+  networking = {
+    hostName = "huanan";
+    nameservers = [ "192.168.3.53" ];
+    networkmanager.dns = "none"; 
+    networkmanager.enable = true;
+    useDHCP = lib.mkDefault true;
+    iproute2.enable = true;
+    firewall = {
+      enable = false;
+    };
+  };
+
+  security = {
+    sudo.wheelNeedsPassword = false;
+    pam.loginLimits = [{ #needed for swaylock
+      domain = "@users";
+      item = "rtprio";
+      type = "-";
+      value = 1;
+    }];
+    pam.services.swaylock = { };
+  };
+
   hardware.nvidia = {
     modesetting.enable = true;
     powerManagement.enable = false;
@@ -34,12 +61,6 @@
     nvidiaSettings = true;
   };
 
-  networking = {
-    hostName = "huanan";
-    networkmanager.enable = true;
-    firewall.enable = false;
-  };
-
   sound.enable = true;
   hardware.pulseaudio.enable = false;
   services.pipewire = {
@@ -49,6 +70,53 @@
     pulse.enable = true;
   };
 
+  virtualisation = {
+    podman = {
+      enable = true;
+      dockerCompat = true;
+    };
+    spiceUSBRedirection.enable = true;
+    libvirtd.enable = true;
+  };
+
+  environment.systemPackages = with pkgs; [
+    multipath-tools #ZFS in LUKS mount
+
+    openvpn
+    any-nix-shell
+    comma
+    
+    #work scripts
+    openconnect
+    oath-toolkit
+    expect
+
+    # Thunar stuff
+    ffmpegthumbnailer
+    webp-pixbuf-loader
+    freetype
+    poppler
+    f3d
+    nufraw-thumbnailer
+
+    android-tools
+    tor-browser
+    #inputs.anyrun.packages.${pkgs.system}.anyrun
+    sops
+    yubikey-manager-qt
+    yubico-piv-tool
+    yubioath-flutter
+    yubikey-personalization
+    yubikey-personalization-gui
+    age-plugin-yubikey
+    age
+    rage
+    lua5_4
+    nodePackages_latest.nodejs
+
+    rocmPackages.rocm-smi #gpu support in btop
+  ];
+
   services.openssh.enable = true;
-  system.stateVersion = "23.11"; # Did you read the comment?
+  system.stateVersion = "23.11";
 }

pkgs/apps.nix

@@ -67,7 +67,7 @@ in {
     wlogout
     nom
     localsend
-    trayscale
+    ktailctl
     fishPlugins.done
     monero-gui
     translate-shell
@@ -116,7 +116,6 @@ in {
     element-desktop
     qrtool
     appimage-run
-    trayscale
     lf
     (pkgs.writeScriptBin "reboot" ''read -p "Do you REALLY want to reboot? (y/N) " answer; [[ $answer == [Yy]* ]] && ${pkgs.systemd}/bin/reboot'')
   ]);

pkgs/hyprland/hypr/hyprland.conf

@@ -50,7 +50,7 @@ exec-once = foot -s
 exec-once = thunar --daemon
 exec-once = hypridle
 exec-once = hyprctl setcursor Bibata-Modern-Classic 16
-exec-once = trayscale --hide-window
+# exec-once = trayscale --hide-window # change tp ktailctl later
 # exec-once = hyprctl dispatch -- exec [workspace special:hdrop silent] "QT_QPA_PLATFORM=xcb telegram-desktop"
 exec-once = /home/delta/.config/hypr/hdrop -b -g '30' -h '60' -f 'keepassxc_lite' --class org.keepassxc.KeePassXC
 exec-once = dropbox