Fix impurity

This commit is contained in:
Dave Gallant
2024-02-19 21:36:21 -05:00
parent 9eb18c9f4b
commit ff55e655da
4 changed files with 13 additions and 11 deletions

View File

@@ -7,11 +7,8 @@ MAKEFLAGS += --no-builtin-rules
HOSTNAME ?= $(shell hostname) HOSTNAME ?= $(shell hostname)
UNAME_S := $(shell uname -s) UNAME_S := $(shell uname -s)
export NIXPKGS_ALLOW_UNFREE := 1
ifeq ($(UNAME_S),Linux) ifeq ($(UNAME_S),Linux)
SWITCH_CMD := nixos-rebuild --use-remote-sudo -I nixos-config="modules/machines/$(HOSTNAME)/configuration.nix" switch --flake '.\#' \ SWITCH_CMD := nixos-rebuild --use-remote-sudo -I nixos-config="modules/machines/$(HOSTNAME)/configuration.nix" switch --flake '.\#'
--impure
endif endif
ifeq ($(UNAME_S),Darwin) ifeq ($(UNAME_S),Darwin)
SWITCH_CMD := exec darwin-rebuild switch --flake . SWITCH_CMD := exec darwin-rebuild switch --flake .

View File

@@ -7,6 +7,8 @@
}: { }: {
imports = [(modulesPath + "/installer/scan/not-detected.nix")]; imports = [(modulesPath + "/installer/scan/not-detected.nix")];
nixpkgs.hostPlatform = "x86_64-linux";
boot.initrd.availableKernelModules = [ boot.initrd.availableKernelModules = [
"ahci" "ahci"
"nvme" "nvme"

View File

@@ -9,6 +9,7 @@
in { in {
environment.systemPackages = with pkgs; let environment.systemPackages = with pkgs; let
linux = [ linux = [
android-tools
bitwarden bitwarden
chromium chromium
cryptsetup cryptsetup
@@ -36,7 +37,6 @@ in {
kazam kazam
legendary-gl legendary-gl
lm_sensors lm_sensors
logseq
mullvad-vpn mullvad-vpn
netdata netdata
nfs-utils nfs-utils
@@ -49,14 +49,12 @@ in {
qemu qemu
rustup rustup
ryujinx ryujinx
signal-desktop
strace strace
tailscale tailscale
traceroute traceroute
unstable.android-studio
unstable.android-tools
unstable.obsidian unstable.obsidian
unstable.signal-desktop unstable.logseq
unstable.unityhub
unstable.yuzu unstable.yuzu
unstable.zoom-us unstable.zoom-us
usbutils usbutils

View File

@@ -10,7 +10,13 @@
} @ inputs: { } @ inputs: {
nixosConfigurations = let nixosConfigurations = let
modulesDir = ./modules; 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 = [ defaultModules = [
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
./modules/common/fonts.nix ./modules/common/fonts.nix
@@ -71,7 +77,6 @@
]; ];
in { in {
hephaestus = nixpkgs.lib.nixosSystem { hephaestus = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {inherit unstable;}; specialArgs = {inherit unstable;};
modules = modules =
[ [