diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index f658e00..4a88d3f 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -8,7 +8,7 @@ args@{ { imports = [ ./hardware-configuration.nix - ../../modules/nixos/adb.nix + (import ../../modules/nixos/adb.nix (args // { user = "pomp"; })) ../../modules/nixos/anytype.nix ../../modules/nixos/audio.nix ../../modules/nixos/authenticator.nix diff --git a/modules/nixos/adb.nix b/modules/nixos/adb.nix index d1a13eb..35eb234 100644 --- a/modules/nixos/adb.nix +++ b/modules/nixos/adb.nix @@ -1,9 +1,9 @@ # https://nixos.wiki/wiki/Android -{ pkgs, ... }: +{ pkgs, user, ... }: { programs.adb.enable = true; - users.users.pomp.extraGroups = [ + users.users.${user}.extraGroups = [ "adbusers" "kvm" ]; diff --git a/modules/nixos/docker.nix b/modules/nixos/docker.nix index 9cd3538..56447c0 100644 --- a/modules/nixos/docker.nix +++ b/modules/nixos/docker.nix @@ -1,8 +1,4 @@ -{ - pkgs, - user ? "pomp", - ... -}: +{ pkgs, user, ... }: { users.users.${user}.extraGroups = [ "docker" ]; diff --git a/modules/nixos/gamemode.nix b/modules/nixos/gamemode.nix index 7278f43..256515b 100644 --- a/modules/nixos/gamemode.nix +++ b/modules/nixos/gamemode.nix @@ -1,8 +1,4 @@ -{ - user ? "pomp", - pkgs, - ... -}: +{ pkgs, user, ... }: { users.users.${user}.extraGroups = [ "gamemode" ]; diff --git a/modules/nixos/nix.nix b/modules/nixos/nix.nix index 0f63b17..a054674 100644 --- a/modules/nixos/nix.nix +++ b/modules/nixos/nix.nix @@ -1,7 +1,4 @@ -{ - user ? "pomp", - ... -}: +{ user, ... }: { nix = { diff --git a/modules/nixos/printer-scanner.nix b/modules/nixos/printer-scanner.nix index 357fd3e..568617c 100644 --- a/modules/nixos/printer-scanner.nix +++ b/modules/nixos/printer-scanner.nix @@ -1,10 +1,6 @@ # enable only when needed -{ - pkgs, - user ? "pomp", - ... -}: +{ pkgs, user, ... }: { hardware.sane.enable = true; diff --git a/modules/nixos/shell.nix b/modules/nixos/shell.nix index ce6bb9f..3ebd749 100644 --- a/modules/nixos/shell.nix +++ b/modules/nixos/shell.nix @@ -1,8 +1,4 @@ -{ - pkgs, - user ? "pomp", - ... -}: +{ pkgs, user, ... }: { users.users.${user}.shell = pkgs.zsh;