Formatting + misc changes

2026-03-31 17:50:23 +02:00 · 2026-03-12 00:15:38 +01:00
parent 6ff3ca400b
commit d30200f081
14 changed files with 60 additions and 43 deletions
--- a/common/default.nix
+++ b/common/default.nix
@@ -20,6 +20,7 @@
        enable = true;
      };
    };
+
    consoleLogLevel = 3;
    plymouth.enable = true;
  };
@@ -62,6 +63,7 @@
    sudo.extraConfig = ''
      Defaults insults
    '';
+
    polkit.extraConfig = ''
      polkit.addRule(function(action, subject) {
          if (action.id == "org.libvirt.unix.manage" &&
@@ -79,6 +81,7 @@
      storageDriver = "btrfs";
      enableOnBoot = true;
    };
+
    libvirtd = {
      enable = true;
      extraConfig = ''
@@ -87,6 +90,7 @@

      onBoot = "ignore";
    };
+
    spiceUSBRedirection.enable = true;
  };

@@ -104,6 +108,7 @@
      "input"
      "dialout"
    ];
+
    shell = pkgs.zsh;
    #packages = with pkgs; [ ];
  };
@@ -113,10 +118,12 @@
      NIXOS_OZONE_WL = "1";
      LIBVIRT_DEFAULT_URI = "qemu:///system";
    };
+
    systemPackages = [
      pkgs.libheif
      pkgs.libheif.out
    ];
+
    pathsToLink = [ "share/thumbnailers" ];
  };

@@ -163,6 +170,7 @@
      "flakes"
      "nix-command"
    ];
+
    warn-dirty = false;
  };

--- a/common/flakes/czkawka-master/flake.nix
+++ b/common/flakes/czkawka-master/flake.nix
@@ -7,6 +7,7 @@
      url = "github:qarmin/czkawka";
      flake = false;
    };
+
    naersk = {
      url = "github:nix-community/naersk";
      inputs.nixpkgs.follows = "nixpkgs";
--- a/common/modules/default.nix
+++ b/common/modules/default.nix
@@ -10,6 +10,5 @@
    ./packages.nix
    ./programs.nix
    ./services.nix
-    ./vm.nix
  ];
 }
--- a/common/modules/home/starship.nix
+++ b/common/modules/home/starship.nix
@@ -49,7 +49,7 @@

      python = {
        symbol = "󰌠";
-        format = "[](fg:#4B8BBE)[$symbol( $virtualenv )$version](bg:#4B8BBE fg:#FFFFFF)[](fg:#4B8BBE) ";
+        format = "[](fg:#4B8BBE)[$symbol $virtualenv $version](bg:#4B8BBE fg:#FFFFFF)[](fg:#4B8BBE) ";
      };

      nodejs = {
--- a/common/modules/home/zsh.nix
+++ b/common/modules/home/zsh.nix
@@ -50,8 +50,6 @@
      zstyle ':completion:*:(ssh|scp|rsync):*:hosts-ipaddr' ignored-patterns '^(<->.<->.<->.<->|(|::)([[:xdigit:].]##:(#c,2))##(|%*))' '127.0.0.<->' '255.255.255.255' '::1' 'fe80::*'
      zstyle ':completion:*' matcher-list "" 'm:{[:lower:][:upper:]}={[:upper:][:lower:]}' '+l:|?=** r:|?=**'

-      eval "$(direnv hook zsh)"
-
      # Path Management
      export PATH="$HOME/.local/bin:/usr/local/LinkServer/:$PATH"

--- a/common/modules/packages.nix
+++ b/common/modules/packages.nix
@@ -53,7 +53,6 @@
    curl
    fet.packages.${pkgs.stdenv.hostPlatform.system}.default
    ddcutil
-    direnv
    discord
    distrobox
    docker-buildx
--- a/common/modules/programs.nix
+++ b/common/modules/programs.nix
@@ -56,6 +56,11 @@
      ];
    };

+    direnv = {
+      enable = true;
+      enableZshIntegration = true;
+    };
+
    weylus.enable = true;
    gamescope.enable = true;
    virt-manager.enable = true;
--- a/common/modules/vm.nix
+++ b/common/modules/vm.nix
@@ -1,23 +0,0 @@
-{
-  lib,
-  ...
-}:
-
-{
-  virtualisation.vmVariant = {
-    virtualisation.memorySize = 8192;
-
-    virtualisation.cores = 4;
-    virtualisation.qemu.options = [
-      "-device virtio-vga-gl"
-      "-display gtk,gl=on"
-      "-cpu host"
-    ];
-
-    users.users.jax.password = "nixos";
-    services.displayManager.autoLogin = {
-      enable = true;
-      user = "jax";
-    };
-  };
-}
--- a/desktop/hardware-configuration.nix
+++ b/desktop/hardware-configuration.nix
@@ -38,6 +38,7 @@
    ];

    blacklistedKernelModules = [ "k10temp" ];
+
    kernelParams = [
      "amdgpu.seamless=1"
      "rd.udev.log_priority=3"
--- a/desktop/modules/default.nix
+++ b/desktop/modules/default.nix
@@ -10,5 +10,6 @@
    ./packages.nix
    ./programs.nix
    ./services.nix
+    ./vm.nix
  ];
 }
--- a/desktop/modules/vm.nix
+++ b/desktop/modules/vm.nix
@@ -0,0 +1,26 @@
+{
+  lib,
+  ...
+}:
+
+{
+  virtualisation.vmVariant = {
+    virtualisation = {
+      memorySize = 8192;
+      cores = 4;
+      graphics = true;
+      diskSize = 20 * 1024;
+      qemu.options = [
+        "-device virtio-vga-gl"
+        "-display gtk,gl=on"
+        "-cpu host"
+      ];
+    };
+
+    users.users.jax.password = "nixos";
+    services.displayManager.autoLogin = {
+      enable = true;
+      user = "jax";
+    };
+  };
+}
--- a/flake.lock
+++ b/flake.lock
@@ -19,11 +19,11 @@
    "czkawka-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1772905248,
-        "narHash": "sha256-A7irrMml7YJ/jN3LwH9hB/bgykOzMTz8ffD+VBJSLHU=",
+        "lastModified": 1773163024,
+        "narHash": "sha256-Ij2hC969kG6InramJsF49xy6X2GmGP0qDkFgmZ7UlWM=",
        "owner": "qarmin",
        "repo": "czkawka",
-        "rev": "f82bd5ddf4e1958651249a2b8e9db38df58eadb7",
+        "rev": "433fc5c5e09feafad165a25aa56134c622a4337d",
        "type": "github"
      },
      "original": {
@@ -95,11 +95,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1772985285,
-        "narHash": "sha256-wEEmvfqJcl9J0wyMgMrj1TixOgInBW/6tLPhWGoZE3s=",
+        "lastModified": 1773264496,
+        "narHash": "sha256-uwFY0+UfaGEo6205ixeBjplZxHWr56UQef+MtmJ0PW0=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "5be5d8245cbc7bc0c09fbb5f38f23f223c543f85",
+        "rev": "32f78141a98098efed490842923b25ecb93b9b9f",
        "type": "github"
      },
      "original": {
@@ -147,11 +147,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1772773019,
-        "narHash": "sha256-E1bxHxNKfDoQUuvriG71+f+s/NT0qWkImXsYZNFFfCs=",
+        "lastModified": 1772963539,
+        "narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "aca4d95fce4914b3892661bcb80b8087293536c6",
+        "rev": "9dcb002ca1690658be4a04645215baea8b95f31d",
        "type": "github"
      },
      "original": {
@@ -163,11 +163,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1772773019,
-        "narHash": "sha256-E1bxHxNKfDoQUuvriG71+f+s/NT0qWkImXsYZNFFfCs=",
+        "lastModified": 1772963539,
+        "narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "aca4d95fce4914b3892661bcb80b8087293536c6",
+        "rev": "9dcb002ca1690658be4a04645215baea8b95f31d",
        "type": "github"
      },
      "original": {
@@ -179,11 +179,11 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1773046814,
-        "narHash": "sha256-3CEw64UyzEk5QjfbcXNIl4TfmIpa2oY+duuo6aiawcU=",
+        "lastModified": 1773233959,
+        "narHash": "sha256-Rwvc4HuCfnaDk5ExDwwm0ryaC1olJu1Up+fBtwIDqz8=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "0c6c0dd2469abaa216599bb19bbf77a328af6564",
+        "rev": "a0f2821b48406ae8e34aed85dfc02bf3799e1f79",
        "type": "github"
      },
      "original": {
--- a/laptop/default.nix
+++ b/laptop/default.nix
@@ -30,6 +30,7 @@
    graphics = {
      enable = true;
      extraPackages = with pkgs; [
+
        vaapi-intel-hybrid
        vpl-gpu-rt
      ];
--- a/laptop/modules/services.nix
+++ b/laptop/modules/services.nix
@@ -47,6 +47,7 @@
  systemd.services.disable-problematic-wakeup = {
    description = "Disable only specific noisy wakeup sources";
    wantedBy = [ "multi-user.target" ];
+
    serviceConfig = {
      Type = "oneshot";
      ExecStart = "${pkgs.bash}/bin/bash -c 'for device in XHC RP09 RP10 RP13; do if grep -q \"$device.*enabled\" /proc/acpi/wakeup; then echo $device > /proc/acpi/wakeup; fi; done'";