mirror of
https://github.com/davegallant/nix-config
synced 2025-08-06 07:13:40 +00:00
Fix impurity
This commit is contained in:
5
Makefile
5
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 .
|
||||
|
@@ -7,6 +7,8 @@
|
||||
}: {
|
||||
imports = [(modulesPath + "/installer/scan/not-detected.nix")];
|
||||
|
||||
nixpkgs.hostPlatform = "x86_64-linux";
|
||||
|
||||
boot.initrd.availableKernelModules = [
|
||||
"ahci"
|
||||
"nvme"
|
||||
|
@@ -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
|
||||
|
@@ -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 =
|
||||
[
|
||||
|
Reference in New Issue
Block a user