From 97fdade25e998015ce7a8e6a07fa63c4682ca351 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Av=C3=A9?= <email@thomasave.be>
Date: Wed, 17 Dec 2025 11:59:01 +0100
Subject: [PATCH] Fix warnings

---
 flake.nix                 | 12 ++++++++----
 home/ags/default.nix      |  2 +-
 home/ags/flake.nix        |  2 +-
 home/git/default.nix      |  8 ++++----
 home/hyprland/default.nix |  2 +-
 home/utils/common.nix     |  2 +-
 home/waybar/default.nix   |  2 +-
 home/zsh/default.nix      |  2 +-
 8 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/flake.nix b/flake.nix
index baa8c1b..ef8a701 100644
--- a/flake.nix
+++ b/flake.nix
@@ -31,8 +31,8 @@
 
     outputs = { nixpkgs, home-manager, nur, nixos-06cb-009a-fingerprint-sensor, ... }@inputs:
         let
-            stdenv.hostPlatform.system = "x86_64-linux";
-            pkgs = nixpkgs.legacyPackages.${stdenv.hostPlatform.system};
+            system = "x86_64-linux";
+            pkgs = nixpkgs.legacyPackages.${system};
             commonModules = host: user: [
                 ./hosts/${host}/hardware-configuration.nix
                 { nixpkgs.overlays = [
@@ -88,9 +88,13 @@
                 ./hosts/${host}
             ];
             mkSystem = host: cfg:
-                nixpkgs.lib.nixosSystem {
+                let
                     system = cfg.system or "x86_64-linux";
-                    modules = (commonModules host cfg.user) ++ (cfg.modules or [ ]);
+                in
+                nixpkgs.lib.nixosSystem {
+                    modules = (commonModules host cfg.user) ++ (cfg.modules or [ ]) ++ [
+                        { nixpkgs.hostPlatform = system; }
+                    ];
                     specialArgs = inputs;
                 };
             systems = {
diff --git a/home/ags/default.nix b/home/ags/default.nix
index ee04d10..7f60ac0 100644
--- a/home/ags/default.nix
+++ b/home/ags/default.nix
@@ -7,7 +7,7 @@
 
         configDir = ./files;
 
-        extraPackages = with inputs.ags.packages.${pkgs.system}; [
+        extraPackages = with inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}; [
             pkgs.gtksourceview
             pkgs.accountsservice
             pkgs.libadwaita
diff --git a/home/ags/flake.nix b/home/ags/flake.nix
index 94bb91c..859019d 100644
--- a/home/ags/flake.nix
+++ b/home/ags/flake.nix
@@ -16,7 +16,7 @@
         }: let
             system = "x86_64-linux";
             pkgs = nixpkgs.legacyPackages.${system};
-            extraPackages = with ags.packages.${pkgs.system}; [
+            extraPackages = with ags.packages.${pkgs.stdenv.hostPlatform.system}; [
                 pkgs.gtksourceview
                 pkgs.accountsservice
 
diff --git a/home/git/default.nix b/home/git/default.nix
index 65da18b..74a2fb4 100644
--- a/home/git/default.nix
+++ b/home/git/default.nix
@@ -4,11 +4,11 @@
     programs.git = {
         enable = true;
         lfs.enable = true;
-        aliases = {
-            s = "status";
-            a = "add";
-        };
         settings = {
+            alias = {
+                s = "status";
+                a = "add";
+            };
             user = {
                 name = "Thomas Avé";
                 email = "email@thomasave.be";
diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index 221114b..a8a9184 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -9,7 +9,7 @@ let
     terminal = "${pkgs.foot}/bin/footclient";
     jq = "${pkgs.jq}/bin/jq";
     # workspace_command_prefix = "split-";
-    # hyprland_plugins = [ inputs.split-monitor-workspaces.packages.${pkgs.system}.split-monitor-workspaces ];
+    # hyprland_plugins = [ inputs.split-monitor-workspaces.packages.${pkgs.stdenv.hostPlatform.system}.split-monitor-workspaces ];
 
     # workspace_command_prefix = "split:";
     # hyprland_plugins = [ pkgs.hyprlandPlugins.hyprsplit ];
diff --git a/home/utils/common.nix b/home/utils/common.nix
index 3e26796..a7e3609 100644
--- a/home/utils/common.nix
+++ b/home/utils/common.nix
@@ -20,7 +20,7 @@
         htop
         ghostscript
         waypipe
-        inputs.worktimer.packages.${pkgs.system}.default
+        inputs.worktimer.packages.${pkgs.stdenv.hostPlatform.system}.default
         usbutils
         gocryptfs
         sshfs
diff --git a/home/waybar/default.nix b/home/waybar/default.nix
index 60cf6c3..d942e4e 100644
--- a/home/waybar/default.nix
+++ b/home/waybar/default.nix
@@ -3,7 +3,7 @@
 {
     programs.waybar = {
         enable = true;
-        package = inputs.waybar.packages.${pkgs.system}.waybar;
+        package = inputs.waybar.packages.${pkgs.stdenv.hostPlatform.system}.waybar;
         settings = {
             mainBar = {
                 layer = "top";
diff --git a/home/zsh/default.nix b/home/zsh/default.nix
index 19e87a4..c58a570 100644
--- a/home/zsh/default.nix
+++ b/home/zsh/default.nix
@@ -12,7 +12,7 @@
         pkgs.ripgrep
         pkgs.rsync
         pkgs.moreutils
-        inputs.fzgo.packages.${pkgs.system}.default
+        inputs.fzgo.packages.${pkgs.stdenv.hostPlatform.system}.default
     ];
     home.sessionVariables = {
         BROWSER = "Helium";