Simplify tos/hashmap

packages/krdp.nix

@@ -1,11 +1,4 @@
-{ }:
-let
-  nixpkgs = fetchTarball "https://github.com/nixos/nixpkgs/tarball/nixos-unstable";
-  pkgs = import nixpkgs {
-    config = { };
-    overlays = [ ];
-  };
-in
+{ pkgs }:
 pkgs.stdenv.mkDerivation rec {
   name = "krdp";
   version = "6.5.3";

tos/hashmap/default.nix

@@ -69,15 +69,6 @@
     '';
   };
 
-  environment.systemPackages = with pkgs; [
-    bun
-    surf
-    zathura
-    cmake
-    doxygen
-    graphviz
-  ];
-
   console = {
     font = "Lat2-Terminus16";
     keyMap = "us";
@@ -101,20 +92,7 @@
 
   features = {
     desktop.enable = true;
-    laptop.enable = false;
-    desktop.wayland.enable = false;
     desktop.plasma.enable = true;
-    desktop.hyprland.enable = false;
-
-    pki = {
-      enable = false;
-      certmgr.enable = true;
-      certs = {
-        foo = {
-          hosts = [ "localhost" ];
-        };
-      };
-    };
 
     os = {
       networkmanager.enable = true;
@@ -131,52 +109,19 @@
         "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDIQUQsPdS3Wvl46cPl6rBrAPDLX9r8tx1V7yVkr1GhP07hVYVcLV0wojMaB8Zi5kvr/sgBpiuU6oKNqx4+5gN70uQC+JbM5Orna8SoN4L2jfO2WgTMFZEqmDoyzCCglUl2EiqFDvKEC/dvFSjn/qJG6eUdEGpTuB/VQljidZMJrloq0kf4iYy0uaXdrkoKLlBEjXo1forlr2KAYq48PsTovyQxrDqG25UcRhjmoq0Ag7ZGquQXB8Ouwe+H/lVWQFJU+Vy4nqqvv1Fq/bQHW92dZDnlwrMyY6lVsp6Cgc3jzcB5dTfN9Zt+iaVFSE+Tojl04n1oKU4Z5kMbTPRTLLDgjlVRY9JGHOXNO8bqEPG0E7sNXBGSncie9nXnfDoVhXAd8KoVkvXCXYvS+pk82ig0ET+8HC7KRZysB5sqD++GbexbPZFYrOhEZYfvY00sOAVvFCh8h6sC1tXAvXZqUgvTClOINDh42NBs/vTmg6RoG57z1moTa5RsGlVAguKqaiE= Simen Kirkvik (gitlab.com)"
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII77Aa2MFZMTha8PdkNg32UR8y6Hwb4R0aR9Ad9qifNq"
       ];
-
-      nfs.enable = false;
-      #   /exports 10.1.1.0/24(insecure,ro,async,crossmnt,no_subtree_check,fsid=0,no_root_squash)
-      # nfs.exports = ''
-      # '';
+    };
   };
 
-    lan = {
+  services.tailscale = {
     enable = true;
-
-      krb5 = {
-        enable = false;
-        default_realm = "ACME";
-
-        domain_realm = {
-          "acme.com" = "ACME";
+    useRoutingFeatures = "client";
+    extraUpFlags = [
+      "--login-server=https://headscale.svc.oceanbox.io"
+      "--accept-dns=true"
+      "--accept-routes"
+    ];
   };
 
-        realms = {
-          "ACME" = {
-            admin_server = "dc.acme.com";
-            kdc = "dc.acme.com";
-          };
-        };
-      };
-    };
-  };
-
-  services.pcscd.enable = false; # For Yubikey ykman
-
-  security.pam.yubico = {
-    enable = false;
-    mode = "client"; # "challenge-response";
-    id = "92753";
-    control = "sufficient";
-  };
-
-  services.udev.extraRules = ''
-    ACTION=="remove",\
-    ENV{ID_BUS}=="usb",\
-    ENV{ID_MODEL_ID}=="0407",\
-    ENV{ID_VENDOR_ID}=="1050",\
-    ENV{ID_VENDOR}=="Yubico",\
-    RUN+="${pkgs.systemd}/bin/loginctl lock-sessions"
-  '';
-
   nixpkgs.config.allowUnfreee = true;
 
   nix = {
@@ -210,19 +155,8 @@
     '';
   };
 
-  services.tailscale = {
-    enable = true;
-    useRoutingFeatures = "client";
-    extraUpFlags = [
-      "--login-server=https://headscale.svc.oceanbox.io"
-      "--accept-dns=true"
-      "--accept-routes"
-    ];
-  };
-
   imports = [
     ./users.nix
     ./hardware-configuration.nix
   ];
-
 }

tos/hashmap/users.nix

@@ -151,5 +151,4 @@
       kdePackages.kconfig
     ];
   };
-
 }

tos/hive.nix

@@ -1,12 +1,13 @@
 let
   sources = import ../nix;
-  pkgs = import sources.nixos-2505 { };
+  nixpkgs = sources.nixos-2511;
+  pkgs = import nixpkgs { };
   dashboard = "https://grafana.adm.oceanbox.io/d/ba1383fb-b53d-4a90-bd0c-bc76c75450bc/umami?orgId=1&kiosk&refresh=5m&from=now-7d&to=now&timezone=browser&var-groups=$__all";
   krdp = pkgs.callPackage ../packages/krdp.nix { };
 in
 {
   meta = {
-    nixpkgs = sources.nixos-2505;
+    nixpkgs = nixpkgs;
   };
 
   hashmap =
@@ -29,21 +30,22 @@ in
         ];
       };
 
+      # Why would you ever use this :(((((
+      system = {
+        copySystemConfiguration = true;
+        autoUpgrade.enable = pkgs.lib.mkForce false;
+      };
+
       environment.systemPackages = with pkgs; [
         htop
         btop
+        intel-gpu-tools
       ];
 
       features = {
-        lan.enable = pkgs.lib.mkForce false;
-
         gitlab-runner.enable = true;
       };
 
-      networking = {
-        firewall.enable = false;
-      };
-
       services = {
         displayManager = {
           defaultSession = "plasma";