Merge remote-tracking branch 'origin/nixos' into nixos-work

modules/profiles/base.nix

@@ -5,6 +5,16 @@
 }:
 
 with lib;
+let
+  nom-system = pkgs.writeShellApplication {
+    name = "nom-system";
+    runtimeInputs = with pkgs; [ nix-output-monitor ];
+    text = ''
+      nom build --no-link "/home/moritz/.dotfiles#nixosConfigurations.$(hostname).config.system.build.toplevel"
+    '';
+  };
+  nom-system-command = command: "${nom-system}/bin/nom-system && ${command}";
+in
 {
   users.users.moritz = {
     isNormalUser = true;
@@ -39,8 +49,8 @@ with lib;
         rm = "rm -i";
         mv = "mv -i";
 
-        nixos-switch = "sudo nixos-rebuild switch --flake ~/.dotfiles";
-        nixos-boot = "sudo nixos-rebuild boot --flake ~/.dotfiles";
+        nixos-switch = nom-system-command "sudo nixos-rebuild switch --flake ~/.dotfiles";
+        nixos-boot = nom-system-command "sudo nixos-rebuild boot --flake ~/.dotfiles";
         nixos-update = "pushd ~/.dotfiles && nix flake update && popd";
 
         latexwatch = ''find -type f -name "*.tex" | entr -c latexmk -pdf -silent'';
@@ -52,8 +62,6 @@ with lib;
       fish.enable = true;
       git.enable = true;
       gpg.enable = true;
-      helix.enable = true;
-      kakoune.enable = true;
       vim.enable = true;
     };
   };
@@ -67,7 +75,6 @@ with lib;
     zip
 
     # file management
-    ranger
     trash-cli
 
     # monitoring
@@ -80,9 +87,10 @@ with lib;
     nixpkgs-fmt
     statix
     manix
+    nix-output-monitor
+    attic
 
     # other
-    arduino
     bat
     cht-sh
     du-dust
@@ -90,12 +98,9 @@ with lib;
     entr
     exa
     gparted
-    hut
-    lazygit
     neofetch
     ripgrep
     tmux
-    ttyper
     up
     viu
     wget
@@ -122,7 +127,7 @@ with lib;
   };
 
   i18n.extraLocaleSettings = {
-    LC_NUMERIC = "de_DE.UTF-8";
+    # LC_NUMERIC = "de_DE.UTF-8";
     LC_PAPER = "de_DE.UTF-8";
     LC_TIME = "de_DE.UTF-8";
   };
@@ -140,4 +145,10 @@ with lib;
     };
     xdg.userDirs.enable = true;
   };
+
+  system.activationScripts.diff = ''
+    if [ -e /run/current-system ]; then
+      ${pkgs.nvd}/bin/nvd --nix-bin-dir ${pkgs.nix}/bin diff /run/current-system/ "$systemConfig"
+    fi
+  '';
 }

modules/profiles/desktop.nix

@@ -8,11 +8,10 @@ with lib; {
     # config
     yubikey.enable = true;
     wallpapers.enable = true;
-    theming.enable = true;
-    shell.aliases = {
-      feh = "feh --auto-zoom --scale-down";
+    theming = {
+      enable = true;
+      scheme = "catppuccin-macchiato";
     };
-
     virtualisation = {
       podman.enable = true;
       libvirtd.enable = true;
@@ -76,11 +75,9 @@ with lib; {
       git.signing = true;
       gpg.enable = true;
       hub.enable = true;
-      kitty.enable = true;
       ledger.enable = true;
       logseq.enable = true;
-      python.enable = true;
-      rofi.enable = true;
+      python.versions."311".enable = true;
       ssh = {
         enable = true;
         includeSecrets = [ ../../secrets/ssh-home.age ];
@@ -94,9 +91,9 @@ with lib; {
       kdeconnect.enable = true;
       mullvad.enable = true;
       openconnect.enable = true;
-      openvpn.enable = true;
       printing.enable = true;
       redshift.enable = true;
+      wireguard.enable = true;
     };
   };
 
@@ -106,7 +103,7 @@ with lib; {
 
     # ripping
     abcde
-    handbrake
+    stable.handbrake # HACK to fix broken ffmpeg on unstable
     picard
 
     # other
@@ -125,9 +122,14 @@ with lib; {
     jetbrains.pycharm-professional
 
     synology-drive-client
+
+    texlive.combined.scheme-full
   ];
 
-  programs.chromium.enable = true;
+  programs = {
+    chromium.enable = true;
+    nix-ld.enable = true;
+  };
 
   home-manager.users.moritz = {
     services.nextcloud-client = {

modules/profiles/work.nix

@@ -18,15 +18,15 @@ with lib; {
       firefox.enable = true;
       git.identity.email = "moritz.boehme@l.de";
       gnome.enable = true;
-      python = {
-        enable = true;
-        versions = [ "python310" "python38" ];
-        packages = [ ];
+      python.versions = {
+        "38".enable = true;
+        "310".enable = true;
+        "311".enable = true;
       };
       spotify.enable = true;
       thunar.enable = true;
+      vim.enable = true;
       zathura.enable = true;
-      emacs.enable = true;
     };
 
     services = {