diff --git a/flake.lock b/flake.lock index 2c328be..fdab03b 100644 --- a/flake.lock +++ b/flake.lock @@ -1148,11 +1148,11 @@ }, "nixos-unified_3": { "locked": { - "lastModified": 1759258942, - "narHash": "sha256-2DAU2nkJTw54BCSOSinX1C43IWPyTKCkXOyq1wQ+9Ko=", + "lastModified": 1764076447, + "narHash": "sha256-dpkdOPPCWaFtDoxVAtVaprtPX6jGl8o30EBc1gWBOnQ=", "owner": "srid", "repo": "nixos-unified", - "rev": "aa19b27d29e74a510774ba3f7f6f633bcb053416", + "rev": "90171c6936a8332ede17e09e337a0e71f4e659b1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c42eb92..c6ad3fe 100644 --- a/flake.nix +++ b/flake.nix @@ -8,10 +8,7 @@ flake-parts.url = "github:hercules-ci/flake-parts"; # Principle inputs - - # RETARDED POLITICAL UPSTREAM BREAKS CACHE OFTEN nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - nix-darwin.url = "github:LnL7/nix-darwin"; nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; home-manager.url = "github:nix-community/home-manager"; diff --git a/modules/home/claude-code/default.nix b/modules/home/claude-code/default.nix index 3df591d..d27226d 100644 --- a/modules/home/claude-code/default.nix +++ b/modules/home/claude-code/default.nix @@ -19,7 +19,7 @@ in # Use sandboxed version on Linux, plain version on macOS package = if pkgs.stdenv.isLinux - then flake.inputs.self.packages.${pkgs.system}.claude # see claude-sandboxed.nix + then flake.inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.claude # see claude-sandboxed.nix else pkgs.claude-code; # Set the claude-code directory for auto-wiring diff --git a/modules/home/cli/zellij.nix b/modules/home/cli/zellij.nix index 3dc384f..e73fdce 100644 --- a/modules/home/cli/zellij.nix +++ b/modules/home/cli/zellij.nix @@ -12,7 +12,7 @@ enableBashIntegration = false; settings = { - theme = if pkgs.system == "aarch64-darwin" then "dracula" else "gruvbox-light"; + theme = if pkgs.stdenv.hostPlatform.system == "aarch64-darwin" then "dracula" else "gruvbox-light"; # NOTE: There's no way to set theme by name. # See https://github.com/nix-community/home-manager/issues/3854 # But we can manually convert this syntax using LLM, diff --git a/modules/home/services/obsidian.nix b/modules/home/services/obsidian.nix index 5a69931..e0a3b95 100644 --- a/modules/home/services/obsidian.nix +++ b/modules/home/services/obsidian.nix @@ -14,12 +14,12 @@ in enable = false; notes = [ myVault ]; port = 7001; - package = inputs.emanote.packages.${pkgs.system}.default; + package = inputs.emanote.packages.${pkgs.stdenv.hostPlatform.system}.default; }; services.imako = { enable = true; - package = inputs.imako.packages.${pkgs.system}.default; + package = inputs.imako.packages.${pkgs.stdenv.hostPlatform.system}.default; vaultDir = myVault; port = 7002; host = "0.0.0.0"; diff --git a/modules/home/services/vira.nix b/modules/home/services/vira.nix index 655e3eb..798e77a 100644 --- a/modules/home/services/vira.nix +++ b/modules/home/services/vira.nix @@ -21,7 +21,7 @@ in # https = false; # Using tailscale services autoResetState = true; autoBuildNewBranches = true; - package = inputs.vira.packages.${pkgs.system}.default; + package = inputs.vira.packages.${pkgs.stdenv.hostPlatform.system}.default; initialState = { repositories = { diff --git a/webapps/host.nix b/webapps/host.nix index 1a8f2fc..d771868 100644 --- a/webapps/host.nix +++ b/webapps/host.nix @@ -2,7 +2,7 @@ { flake, pkgs, lib, ... }: let - webapps = import ./. { inherit flake; system = pkgs.system; }; + webapps = import ./. { inherit flake; system = pkgs.stdenv.hostPlatform.system; }; in { # Run each web app as a systemd service decided inside a container. diff --git a/webapps/proxy.nix b/webapps/proxy.nix index 0d17a9b..e51f1e8 100644 --- a/webapps/proxy.nix +++ b/webapps/proxy.nix @@ -3,7 +3,7 @@ let host = "pureintent"; # See host.nix - webapps = import ./. { inherit flake; system = pkgs.system; }; + webapps = import ./. { inherit flake; system = pkgs.stdenv.hostPlatform.system; }; in { services.tailscale.enable = true;