fix eval errors
This commit is contained in:
parent
8e2614f8b3
commit
975220415f
7 changed files with 11 additions and 12 deletions
|
@ -1,4 +1,4 @@
|
||||||
{ pkgs, ... }:
|
{ config, pkgs, ... } @ args:
|
||||||
let
|
let
|
||||||
lockscreen-all = pkgs.writeScript "lockscreen-all" ''
|
lockscreen-all = pkgs.writeScript "lockscreen-all" ''
|
||||||
#!${pkgs.bash}/bin/bash
|
#!${pkgs.bash}/bin/bash
|
||||||
|
@ -60,4 +60,5 @@ in
|
||||||
programs.java.enable = true;
|
programs.java.enable = true;
|
||||||
hardware.opengl.driSupport = true;
|
hardware.opengl.driSupport = true;
|
||||||
hardware.opengl.driSupport32Bit = true;
|
hardware.opengl.driSupport32Bit = true;
|
||||||
|
home-manager.users.darkkirb = import ./home-manager/darkkirb.nix { desktop = true; inherit args; };
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
{ pkgs, ... }:
|
{ system, nix-gaming, ... } @ args: { pkgs, ... }:
|
||||||
let
|
let
|
||||||
wine-tkg = pkgs.nix-gaming.wine-tkg;
|
wine-tkg = nix-gaming.outputs.packages.${system}.wine-tkg;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./grapejuice.nix
|
(import ./grapejuice.nix args)
|
||||||
];
|
];
|
||||||
home.packages = [
|
home.packages = [
|
||||||
wine-tkg
|
wine-tkg
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ config, pkgs, system, nix-gaming, ... }:
|
{ system, nix-gaming, ... } @ args: { config, pkgs, ... }:
|
||||||
let
|
let
|
||||||
wine-tkg = nix-gaming.outputs.packages.${system}.wine-tkg;
|
wine-tkg = nix-gaming.outputs.packages.${system}.wine-tkg;
|
||||||
hardware-profiles = {
|
hardware-profiles = {
|
||||||
|
@ -19,7 +19,7 @@ let
|
||||||
};
|
};
|
||||||
grapejuice_config = {
|
grapejuice_config = {
|
||||||
__version__ = 2;
|
__version__ = 2;
|
||||||
__hardware_profiles__ = hardware-profiles.${config.networking.hostName};
|
__hardware_profiles__ = hardware-profiles.${args.config.networking.hostName};
|
||||||
show_fast_flag_warning = true;
|
show_fast_flag_warning = true;
|
||||||
no_daemon_mode = true;
|
no_daemon_mode = true;
|
||||||
release_channel = "master";
|
release_channel = "master";
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
desktop: { pkgs, ... }: {
|
{ desktop, args }: { pkgs, ... }: {
|
||||||
imports = [
|
imports = [
|
||||||
(import ./base.nix desktop)
|
(import ./base.nix desktop)
|
||||||
../programs/gpg.nix
|
../programs/gpg.nix
|
||||||
|
@ -14,7 +14,7 @@ desktop: { pkgs, ... }: {
|
||||||
../programs/zoom.nix
|
../programs/zoom.nix
|
||||||
../programs/plover.nix
|
../programs/plover.nix
|
||||||
../programs/texlive.nix
|
../programs/texlive.nix
|
||||||
../games/default.nix
|
(import ../games/default.nix args)
|
||||||
../programs/yubikey.nix
|
../programs/yubikey.nix
|
||||||
../programs/keybase.nix
|
../programs/keybase.nix
|
||||||
../programs/keepass.nix
|
../programs/keepass.nix
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ config, pkgs, lib, modulesPath, ... }: {
|
{ config, pkgs, lib, modulesPath, ... } @ args: {
|
||||||
networking.hostName = "nixos-8gb-fsn1-1";
|
networking.hostName = "nixos-8gb-fsn1-1";
|
||||||
networking.hostId = "73561e1f";
|
networking.hostId = "73561e1f";
|
||||||
|
|
||||||
|
@ -165,7 +165,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
networking.wireguard.interfaces."wg0".ips = [ "fd0d:a262:1fa6:e621:b4e1:08ff:e658:6f49/64" ];
|
networking.wireguard.interfaces."wg0".ips = [ "fd0d:a262:1fa6:e621:b4e1:08ff:e658:6f49/64" ];
|
||||||
home-manager.users.darkkirb = import ./home-manager/darkkirb.nix false;
|
home-manager.users.darkkirb = import ./home-manager/darkkirb.nix { desktop = false; inherit args; };
|
||||||
nix.settings.cores = 2;
|
nix.settings.cores = 2;
|
||||||
nix.settings.max-jobs = 0;
|
nix.settings.max-jobs = 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -137,7 +137,6 @@
|
||||||
system.stateVersion = "21.11";
|
system.stateVersion = "21.11";
|
||||||
|
|
||||||
networking.wireguard.interfaces."wg0".ips = [ "fd0d:a262:1fa6:e621:47e6:24d4:2acb:9437/64" ];
|
networking.wireguard.interfaces."wg0".ips = [ "fd0d:a262:1fa6:e621:47e6:24d4:2acb:9437/64" ];
|
||||||
home-manager.users.darkkirb = import ./home-manager/darkkirb.nix true;
|
|
||||||
networking.nameservers = [ "192.168.2.1" ];
|
networking.nameservers = [ "192.168.2.1" ];
|
||||||
|
|
||||||
services.xserver.videoDrivers = [ "amdgpu" ];
|
services.xserver.videoDrivers = [ "amdgpu" ];
|
||||||
|
|
|
@ -110,7 +110,6 @@
|
||||||
networking.wireguard.interfaces."wg0".ips = [
|
networking.wireguard.interfaces."wg0".ips = [
|
||||||
"fd0d:a262:1fa6:e621:f45a:db9f:eb7c:1a3f/64"
|
"fd0d:a262:1fa6:e621:f45a:db9f:eb7c:1a3f/64"
|
||||||
];
|
];
|
||||||
home-manager.users.darkkirb = import ./home-manager/darkkirb.nix true;
|
|
||||||
networking.nameservers = [ "fd00:e621:e621:2::2" ];
|
networking.nameservers = [ "fd00:e621:e621:2::2" ];
|
||||||
services.xserver.videoDrivers = [ "intel" ];
|
services.xserver.videoDrivers = [ "intel" ];
|
||||||
nix.settings.cores = 4;
|
nix.settings.cores = 4;
|
||||||
|
|
Loading…
Reference in a new issue