From fdc5db376f27a12832c7837364a4bf36edd8a8c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Av=C3=A9?= Date: Sat, 11 Apr 2026 23:08:03 +0700 Subject: [PATCH] Fix all errors reported by nix --- flake.nix | 8 +++----- home/Arendia.nix | 9 --------- home/Kell.nix | 9 --------- home/Riva.nix | 7 ------- hosts/Kell/default.nix | 2 -- 5 files changed, 3 insertions(+), 32 deletions(-) diff --git a/flake.nix b/flake.nix index 24bcc98..dd7fad9 100644 --- a/flake.nix +++ b/flake.nix @@ -38,8 +38,6 @@ } @ inputs: let supportedSystems = ["x86_64-linux" "aarch64-linux"]; forAllSystems = nixpkgs.lib.genAttrs supportedSystems; - system = builtins.currentSystem; - pkgs = nixpkgs.legacyPackages.${system}; commonModules = host: user: [ ./hosts/${host}/hardware-configuration.nix { @@ -48,7 +46,7 @@ (self: super: {utillinux = super.util-linux;}) ]; } - { + ({pkgs, ...}: { networking.hostName = host; time.timeZone = "Asia/Bangkok"; nix.settings = { @@ -70,7 +68,7 @@ }; users.users.${user} = { isNormalUser = true; - extraGroups = ["wheel" "video"]; # Enable ‘sudo’ for the user. + extraGroups = ["wheel" "video"]; # Enable 'sudo' for the user. openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKAa3tMzSCRuprEACrBsKI0F/o73o6J9L1qR3TaZn/N8 user@Kell" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIByLwLAdJbmoDV5sx4hg5NbzKbOh1GmWEhDOUJ1GQBhK user@Riva" @@ -85,7 +83,7 @@ shell = pkgs.zsh; }; system.stateVersion = "23.11"; - } + }) home-manager.nixosModules.home-manager { home-manager = { diff --git a/home/Arendia.nix b/home/Arendia.nix index 877b09a..e34afa7 100644 --- a/home/Arendia.nix +++ b/home/Arendia.nix @@ -32,15 +32,6 @@ in { smile ]; - services.hyprpaper = { - settings = { - wallpaper = [ - "HDMI-A-1,${./hyprland/files/wallpaper.png}" - "eDP-1,${./hyprland/files/wallpaper.png}" - ]; - }; - }; - wayland.windowManager.hyprland.settings = { monitor = [ "eDP-1,2560x1440@60.01,0x0,1" diff --git a/home/Kell.nix b/home/Kell.nix index 3b12eca..d4ee881 100644 --- a/home/Kell.nix +++ b/home/Kell.nix @@ -38,15 +38,6 @@ in { jetbrains.rider ]; - services.hyprpaper = { - settings = { - wallpaper = [ - "DP-1,${./hyprland/files/wallpaper.png}" - "DP-2,${./hyprland/files/wallpaper.png}" - "HDMI-A-1,${./hyprland/files/wallpaper.png}" - ]; - }; - }; wayland.windowManager.hyprland.settings = { monitor = [ "DP-2,preferred,0x550,1" diff --git a/home/Riva.nix b/home/Riva.nix index 5968b69..97c879b 100644 --- a/home/Riva.nix +++ b/home/Riva.nix @@ -30,13 +30,6 @@ in { jq rclone ]; - services.hyprpaper = { - settings = { - wallpaper = [ - "Virtual-1,${./hyprland/files/wallpaper.png}" - ]; - }; - }; wayland.windowManager.hyprland.settings = { monitor = [ "Virtual-1,2560x1440,0x0,1" diff --git a/hosts/Kell/default.nix b/hosts/Kell/default.nix index d4d27b1..345ee1f 100644 --- a/hosts/Kell/default.nix +++ b/hosts/Kell/default.nix @@ -12,7 +12,6 @@ in { # (import ../Common/nvidia.nix { inherit inputs pkgs config; }) (import ../Common/desktop.nix {inherit inputs pkgs config;}) (import ../Common/nfs.nix {inherit pkgs serverIP;}) - (import ../Common/android.nix {inherit pkgs;}) ]; # Kernel @@ -40,7 +39,6 @@ in { nixpkgs.config.rocmSupport = true; services.ollama = { enable = true; - acceleration = "rocm"; }; # nixpkgs.config.cudaSupport = true; services.logind.settings.Login = {