From 7524ce06466e76315c814e384ed8cb8b11672e32 Mon Sep 17 00:00:00 2001 From: Jonas Hahn Date: Tue, 23 Sep 2025 21:22:14 +0200 Subject: [PATCH] Minors --- hosts/thinix-thinkpad/configuration.nix | 56 ++++++++++++------------- modules/graphics/workstation.nix | 7 +--- modules/services/scanning.nix | 2 +- user/packages.nix | 8 +++- 4 files changed, 38 insertions(+), 35 deletions(-) diff --git a/hosts/thinix-thinkpad/configuration.nix b/hosts/thinix-thinkpad/configuration.nix index c20dd2d..16f36da 100644 --- a/hosts/thinix-thinkpad/configuration.nix +++ b/hosts/thinix-thinkpad/configuration.nix @@ -1,41 +1,41 @@ -{ pkgs, ... }: +{ pkgs, ... }: { - imports = [ - ./hardware-configuration.nix + imports = [ + ./hardware-configuration.nix - ./../../user/users.nix + ./../../user/users.nix - ./../../modules/essential.nix - ./../../modules/common/sops.nix + ./../../modules/essential.nix + ./../../modules/common/sops.nix - ./../../modules/hardware/xremap.nix - ./../../modules/hardware/boot.nix + ./../../modules/hardware/xremap.nix + ./../../modules/hardware/boot.nix - ./../../modules/graphics/workstation.nix + ./../../modules/graphics/workstation.nix - ./../../modules/laptop/powersave.nix - ./../../modules/laptop/battery.nix + ./../../modules/laptop/powersave.nix + ./../../modules/laptop/battery.nix - ./../../modules/services/webdav.nix - ./../../modules/services/scanning.nix - ]; + ./../../modules/services/webdav.nix + ./../../modules/services/scanning.nix + ]; - networking.hostName = "thinix"; - batMode = "double"; + networking.hostName = "thinix"; + batMode = "double"; + # Cannot have this and tlp + #services.power-profiles-daemon.enable = true; - programs.gnupg.agent = { - enable = true; - pinentryPackage = with pkgs; pinentry-all; - enableSSHSupport = true; - }; + programs.gnupg.agent = { + enable = true; + pinentryPackage = with pkgs; pinentry-all; + enableSSHSupport = true; + }; - swapDevices = [ - { - device = "/swapfile"; - size = 4096; - } - ]; + swapDevices = [{ + device = "/swapfile"; + size = 4096; + }]; - system.stateVersion = "24.11"; + system.stateVersion = "24.11"; } diff --git a/modules/graphics/workstation.nix b/modules/graphics/workstation.nix index abd486a..96bfdf1 100644 --- a/modules/graphics/workstation.nix +++ b/modules/graphics/workstation.nix @@ -6,14 +6,11 @@ NIXOS_OZONE_WL = "1"; QT_QPA_PLATFORMTHEME = "qt6ct"; QT_STYLE_OVERRIDE = "kvantum"; - QT_QPA_PLATFORM="xcb"; + QT_QPA_PLATFORM = "xcb"; }; }; - - fonts.packages = with pkgs; [ - nerd-fonts.fira-code - ]; + fonts.packages = with pkgs; [ nerd-fonts.fira-code ]; services.xserver.displayManager.gdm.enable = true; # We are pre 25.11 diff --git a/modules/services/scanning.nix b/modules/services/scanning.nix index 2497cf7..985ecab 100644 --- a/modules/services/scanning.nix +++ b/modules/services/scanning.nix @@ -7,5 +7,5 @@ hardware.sane.disabledDefaultBackends = [ "escl" ]; services.udev.packages = [ pkgs.sane-airscan ]; services.avahi.enable = true; - services.avahi.nssmdns = true; + services.avahi.nssmdns4 = true; } diff --git a/user/packages.nix b/user/packages.nix index f87a759..4f0978d 100644 --- a/user/packages.nix +++ b/user/packages.nix @@ -11,9 +11,15 @@ ffmpeg pavucontrol - android-tools iamb + sdkmanager + air + nmap + wakeonlan wiki-tui + ansible + terraform + android-tools vscode