diff --git a/Makefile b/Makefile index c3c726c..e418c21 100644 --- a/Makefile +++ b/Makefile @@ -7,11 +7,8 @@ MAKEFLAGS += --no-builtin-rules HOSTNAME ?= $(shell hostname) UNAME_S := $(shell uname -s) -export NIXPKGS_ALLOW_UNFREE := 1 - ifeq ($(UNAME_S),Linux) - SWITCH_CMD := nixos-rebuild --use-remote-sudo -I nixos-config="modules/machines/$(HOSTNAME)/configuration.nix" switch --flake '.\#' \ - --impure + SWITCH_CMD := nixos-rebuild --use-remote-sudo -I nixos-config="modules/machines/$(HOSTNAME)/configuration.nix" switch --flake '.\#' endif ifeq ($(UNAME_S),Darwin) SWITCH_CMD := exec darwin-rebuild switch --flake . diff --git a/modules/machines/hephaestus/hardware.nix b/modules/machines/hephaestus/hardware.nix index 83d7eaf..124f1ea 100644 --- a/modules/machines/hephaestus/hardware.nix +++ b/modules/machines/hephaestus/hardware.nix @@ -7,6 +7,8 @@ }: { imports = [(modulesPath + "/installer/scan/not-detected.nix")]; + nixpkgs.hostPlatform = "x86_64-linux"; + boot.initrd.availableKernelModules = [ "ahci" "nvme" diff --git a/modules/packages/linux.nix b/modules/packages/linux.nix index 30207ba..40767ad 100644 --- a/modules/packages/linux.nix +++ b/modules/packages/linux.nix @@ -9,6 +9,7 @@ in { environment.systemPackages = with pkgs; let linux = [ + android-tools bitwarden chromium cryptsetup @@ -36,7 +37,6 @@ in { kazam legendary-gl lm_sensors - logseq mullvad-vpn netdata nfs-utils @@ -49,14 +49,12 @@ in { qemu rustup ryujinx + signal-desktop strace tailscale traceroute - unstable.android-studio - unstable.android-tools unstable.obsidian - unstable.signal-desktop - unstable.unityhub + unstable.logseq unstable.yuzu unstable.zoom-us usbutils diff --git a/outputs.nix b/outputs.nix index a945681..ec386a1 100644 --- a/outputs.nix +++ b/outputs.nix @@ -10,7 +10,13 @@ } @ inputs: { nixosConfigurations = let modulesDir = ./modules; - unstable = import nixpkgs-unstable {}; + unstable = import nixpkgs-unstable { + system = "x86_64-linux"; + config.allowUnfree = true; + config.permittedInsecurePackages = [ + "electron-25.9.0" # caused by obsidian + ]; + }; defaultModules = [ home-manager.nixosModules.home-manager ./modules/common/fonts.nix @@ -71,7 +77,6 @@ ]; in { hephaestus = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; specialArgs = {inherit unstable;}; modules = [