Simplify tos/hashmap

This commit is contained in:
2025-12-02 09:57:46 +01:00
parent dfe73d6d71
commit ec1c516d1b
4 changed files with 19 additions and 91 deletions

View File

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

View File

@@ -69,15 +69,6 @@
''; '';
}; };
environment.systemPackages = with pkgs; [
bun
surf
zathura
cmake
doxygen
graphviz
];
console = { console = {
font = "Lat2-Terminus16"; font = "Lat2-Terminus16";
keyMap = "us"; keyMap = "us";
@@ -101,20 +92,7 @@
features = { features = {
desktop.enable = true; desktop.enable = true;
laptop.enable = false;
desktop.wayland.enable = false;
desktop.plasma.enable = true; desktop.plasma.enable = true;
desktop.hyprland.enable = false;
pki = {
enable = false;
certmgr.enable = true;
certs = {
foo = {
hosts = [ "localhost" ];
};
};
};
os = { os = {
networkmanager.enable = true; 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-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" "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 = {
enable = true;
krb5 = {
enable = false;
default_realm = "ACME";
domain_realm = {
"acme.com" = "ACME";
};
realms = {
"ACME" = {
admin_server = "dc.acme.com";
kdc = "dc.acme.com";
};
};
};
}; };
}; };
services.pcscd.enable = false; # For Yubikey ykman services.tailscale = {
enable = true;
security.pam.yubico = { useRoutingFeatures = "client";
enable = false; extraUpFlags = [
mode = "client"; # "challenge-response"; "--login-server=https://headscale.svc.oceanbox.io"
id = "92753"; "--accept-dns=true"
control = "sufficient"; "--accept-routes"
];
}; };
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; nixpkgs.config.allowUnfreee = true;
nix = { 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 = [ imports = [
./users.nix ./users.nix
./hardware-configuration.nix ./hardware-configuration.nix
]; ];
} }

View File

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

View File

@@ -1,12 +1,13 @@
let let
sources = import ../nix; 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"; 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 { }; krdp = pkgs.callPackage ../packages/krdp.nix { };
in in
{ {
meta = { meta = {
nixpkgs = sources.nixos-2505; nixpkgs = nixpkgs;
}; };
hashmap = 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; [ environment.systemPackages = with pkgs; [
htop htop
btop btop
intel-gpu-tools
]; ];
features = { features = {
lan.enable = pkgs.lib.mkForce false;
gitlab-runner.enable = true; gitlab-runner.enable = true;
}; };
networking = {
firewall.enable = false;
};
services = { services = {
displayManager = { displayManager = {
defaultSession = "plasma"; defaultSession = "plasma";