work

roles/base.nix

@@ -49,6 +49,7 @@ in {
       EDITOR = "nvim";
       STARSHIP_CONFIG = "/etc/starship.toml";
       HISTCONTROL = "ignoreboth";
+      NIXOS_OZONE_WL = "y";
     };
   };
 
@@ -174,8 +175,4 @@ in {
       LC_IDENTIFICATION = "de_DE.UTF-8";
     };
   };
-
-  # yubikey support
-  services.udev.packages = [ pkgs.yubikey-personalization ];
-  services.pcscd.enable = true;
 }

roles/desktop.nix

@@ -90,7 +90,7 @@ in
     };
   };
 
-  qt5.platformTheme = "qt5ct";
+  qt.platformTheme = "qt5ct";
 
   hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
@@ -99,10 +99,6 @@ in
     alsa.enable = true;
     pulse.enable = true;
     jack.enable = true;
-
-    config.pipewire = {
-      "context.properties" = { "default.clock.rate" = 48000; };
-    };
   };
   services.udev.packages = [
     (pkgs.writeTextFile {
@@ -114,9 +110,9 @@ in
     })
   ];
 
-  fonts.enableDefaultFonts = true;
+  fonts.enableDefaultPackages = true;
   fonts.fontconfig.antialias = true;
-  fonts.fonts = with pkgs; [
+  fonts.packages = with pkgs; [
     corefonts
     emacs-all-the-icons-fonts
     fira-code
@@ -161,6 +157,7 @@ in
     numix-cursor-theme
 
     alacritty
+    gimp
     imv
     inkscape
     keepassxc
@@ -175,7 +172,9 @@ in
     pulseeffects-pw
     qrencode
     uxplay
-    wezterm
+    unstable.wezterm
+    unstable.prusa-slicer
+    unstable.super-slicer-latest
 
     solaar
     gdk-pixbuf

roles/dev.nix

@@ -1,14 +1,10 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, buildPythonPackage, pkgs, fetchPypi,... }:
 
-let unstable = import <nixos-unstable> { };
+let
+  unstable = import <nixos-unstable> { };
 in {
 
-  services.emacs.package = pkgs.emacsPgtk;
-  nixpkgs.overlays = [
-    (import (builtins.fetchTarball {
-      url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz;
-    }))
-  ];
+  services.emacs.package = pkgs.emacs29-pgtk;
 
   environment.systemPackages = with pkgs; [
     gnumake
@@ -18,23 +14,23 @@ in {
     unstable.golangci-lint
     unstable.gopls
     unstable.rust-analyzer
-    #unstable.esphome
 
-    unstable.nodePackages.pyright
-    (python39.withPackages
+    (python310.withPackages
       (python-packages: with python-packages; [
         black
         diagrams
         pymemcache
         pyyaml
         requests
-      ]))
+        python-lsp-server
+      ])
+    )
 
     mariadb-client
     musl
 
     dbeaver
-    emacs-gtk
+    emacs29-pgtk
     gitAndTools.delta
     lazygit
     ltrace

roles/work.nix

@@ -7,6 +7,15 @@ let
     pkgs.libsForQt5.callPackage (import ../packages/nagstamon.nix) { };
 in {
 
+  environment.variables = {
+    USE_GKE_GCLOUD_AUTH_PLUGIN = "True";
+  };
+
+  services.tailscale = {
+    enable = true;
+    package = unstable.tailscale;
+  };
+
   security.pki.certificateFiles = [
     ../dotfiles/certs/NetzmarktCA.crt
     ../dotfiles/certs/vcenter.netzmarkt.lan.crt
@@ -21,8 +30,12 @@ in {
     172.20.0.2 grafana.kind
     172.20.0.2 alert.kind
 
+    #192.168.2.111 hass.home.f2o.io
+
     #127.0.0.1 auth-dev.thobits.com
     127.0.0.1 database
+    127.0.0.1 youtube.com
+    127.0.0.1 www.youtube.com
   '';
 
   environment.systemPackages = with pkgs; [
@@ -32,6 +45,10 @@ in {
     # (import ../packages/vaultsink.nix) needs opensource verson
     cloudstation
     nagstamon
+    yubikey-manager
+    anydesk
+    chromium
+    nodejs
 
     drone-cli
     govc
@@ -41,10 +58,18 @@ in {
     (unstable.google-cloud-sdk.withExtraComponents [
       unstable.google-cloud-sdk.components.gke-gcloud-auth-plugin
     ])
-    unstable.slack
+    slack
     unstable.velero
 
     unstable.obs-studio
     unstable.obs-studio-plugins.wlrobs
+
+    unstable.mindustry-wayland
+    prusa-slicer
   ];
+
+  # yubikey support
+  services.udev.packages = [ pkgs.yubikey-personalization ];
+  services.pcscd.enable = true;
+
 }