matt1432/nixos-configs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: rename vars.user to vars.mainUser

Browse source
This commit is contained in:
matt1432 2024-01-09 13:13:04 -05:00
parent b0542f4f2d
commit 77643378cc
27 changed files with 141 additions and 102 deletions

2
devices/android/default.nix
View file

@ -1,6 +1,6 @@
{pkgs, ...}: {
vars = {
user = "nix-on-droid";
mainUser = "nix-on-droid";
hostName = "localhost";
neovimIde = false;
};

12
devices/binto/default.nix
View file

@ -1,4 +1,6 @@
{config, ...}: {
{config, ...}: let
inherit (config.vars) mainUser hostName;
in {
imports = [
./hardware-configuration.nix
@ -17,14 +19,14 @@
];
vars = {
user = "matt";
mainUser = "matt";
hostName = "binto";
mainMonitor = "desc:GIGA-BYTE TECHNOLOGY CO. LTD. G27QC 0x00000B1D";
greetdDupe = false;
fontSize = 12.5;
};
users.users.${config.vars.user} = {
users.users.${mainUser} = {
isNormalUser = true;
extraGroups = [
"wheel"
@ -40,7 +42,7 @@
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJGbLu+Gb7PiyNgNXMHemaQLnKixebx1/4cdJGna9OQp matt@wim"
];
};
home-manager.users.${config.vars.user} = {
home-manager.users.${mainUser} = {
imports = [
../../home/firefox
@ -52,7 +54,7 @@
};
networking = {
inherit (config.vars) hostName;
inherit hostName;
networkmanager.enable = true;
firewall.enable = false;
};

4
devices/binto/modules/gpu-replay.nix
View file

@ -5,6 +5,8 @@
gpu-screen-recorder-src,
...
}: let
inherit (config.vars) mainUser;
gsr = pkgs.stdenv.mkDerivation {
name = "gpu-screen-recorder";
version = gpu-screen-recorder-src.rev;
@ -74,7 +76,7 @@ in {
};
};
home-manager.users.${config.vars.user} = {
home-manager.users.${mainUser} = {
# TODO: add mic sound
xdg.configFile."gsr.sh" = {
executable = true;

12
devices/oksys/default.nix
View file

@ -1,4 +1,6 @@
{config, ...}: {
{config, ...}: let
inherit (config.vars) mainUser hostName;
in {
imports = [
./hardware-configuration.nix
@ -13,12 +15,12 @@
];
vars = {
user = "matt";
mainUser = "matt";
hostName = "oksys";
neovimIde = false;
};
users.users.${config.vars.user} = {
users.users.${mainUser} = {
isNormalUser = true;
extraGroups = [
"wheel"
@ -31,7 +33,7 @@
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJGbLu+Gb7PiyNgNXMHemaQLnKixebx1/4cdJGna9OQp matt@wim"
];
};
home-manager.users.${config.vars.user} = {
home-manager.users.${mainUser} = {
imports = [];
# No touchy
@ -39,7 +41,7 @@
};
networking = {
inherit (config.vars) hostName;
inherit hostName;
resolvconf = {
enable = true;
extraConfig = ''

6
devices/oksys/modules/caddy.nix
View file

@ -4,12 +4,14 @@
config,
...
}: let
inherit (config.vars) mainUser;
inherit (config.sops) secrets;
caddy = caddy-plugins.packages.${pkgs.system}.default;
secrets = config.sops.secrets;
in {
imports = [caddy-plugins.nixosModules.default];
environment.systemPackages = [caddy];
users.users.${config.vars.user}.extraGroups = ["caddy"];
users.users.${mainUser}.extraGroups = ["caddy"];
systemd.services.caddy.serviceConfig = {
EnvironmentFile = secrets.caddy-cloudflare.path;

3
devices/oksys/modules/headscale.nix
View file

@ -4,10 +4,11 @@
config,
...
}: let
inherit (config.vars) mainUser;
headscale-flake = headscale.packages.${pkgs.system}.headscale;
in {
environment.systemPackages = [headscale-flake];
users.users.${config.vars.user}.extraGroups = ["headscale"];
users.users.${mainUser}.extraGroups = ["headscale"];
services.headscale = {
enable = true;

6
devices/oksys/modules/unbound.nix
View file

@ -1,8 +1,10 @@
{config, ...}: {
{config, ...}: let
inherit (config.vars) mainUser;
in {
# https://github.com/MatthewVance/unbound-docker-rpi/issues/4#issuecomment-1001879602
boot.kernel.sysctl."net.core.rmem_max" = 1048576;
users.users.${config.vars.user}.extraGroups = ["unbound"];
users.users.${mainUser}.extraGroups = ["unbound"];
services.unbound = {
enable = true;

12
devices/servivi/default.nix
View file

@ -1,4 +1,6 @@
{config, ...}: {
{config, ...}: let
inherit (config.vars) mainUser hostName;
in {
imports = [
./hardware-configuration.nix
@ -13,12 +15,12 @@
];
vars = {
user = "matt";
mainUser = "matt";
hostName = "servivi";
};
users.users = {
${config.vars.user} = {
${mainUser} = {
isNormalUser = true;
extraGroups = [
"wheel"
@ -45,7 +47,7 @@
};
};
home-manager.users.${config.vars.user} = {
home-manager.users.${mainUser} = {
imports = [];
# No touchy
@ -53,7 +55,7 @@
};
networking = {
inherit (config.vars) hostName;
inherit hostName;
resolvconf.enable = true;
firewall.enable = false;
};

5
devices/servivi/modules/arion/default.nix
View file

@ -7,12 +7,13 @@
} @ inputs:
with lib;
with builtins; let
user = config.vars.user;
inherit (config.vars) mainUser;
configPath = "/var/lib/arion";
in {
imports = [arion.nixosModules.arion];
users.extraUsers.${user}.extraGroups = ["docker"];
users.extraUsers.${mainUser}.extraGroups = ["docker"];
services.borgbackup.configs.arion = {
paths = [configPath];

8
devices/servivi/modules/binary-cache.nix
View file

@ -3,8 +3,8 @@
pkgs,
...
}: let
secrets = config.sops.secrets;
vars = config.vars;
inherit (config.vars) mainUser;
inherit (config.sops) secrets;
in {
services.nix-serve = {
enable = true;
@ -16,8 +16,8 @@ in {
services.buildAll = {
serviceConfig = {
Type = "oneshot";
User = vars.user;
Group = config.users.users.${vars.user}.group;
User = mainUser;
Group = config.users.users.${mainUser}.group;
};
path = with pkgs; [

6
devices/servivi/modules/minecraft.nix
View file

@ -3,7 +3,9 @@
nms,
pkgs,
...
}: {
}: let
inherit (config.vars) mainUser;
in {
imports = [nms.nixosModules.default];
services = {
@ -13,7 +15,7 @@
modded-minecraft-servers = {
eula = true;
user = config.vars.user;
user = mainUser;
instances = let
jre8 = pkgs.temurin-bin-8;

12
devices/wim/default.nix
View file

@ -1,4 +1,6 @@
{config, ...}: {
{config, ...}: let
inherit (config.vars) mainUser hostName;
in {
imports = [
./hardware-configuration.nix
@ -15,13 +17,13 @@
];
vars = {
user = "matt";
mainUser = "matt";
hostName = "wim";
fontSize = 12.5;
mainMonitor = "eDP-1";
};
users.users.${config.vars.user} = {
users.users.${mainUser} = {
isNormalUser = true;
extraGroups = [
"wheel"
@ -32,7 +34,7 @@
"libvirtd"
];
};
home-manager.users .${config.vars.user} = {
home-manager.users.${mainUser} = {
imports = [
../../home/firefox
@ -45,7 +47,7 @@
};
networking = {
inherit (config.vars) hostName;
inherit hostName;
networkmanager = {
enable = true;
wifi.backend = "wpa_supplicant";

2
devices/wim/home/dotfiles.nix
View file

@ -1,5 +1,5 @@
{config, ...}: let
configDir = config.vars.configDir;
inherit (config.vars) configDir;
symlink = config.lib.file.mkOutOfStoreSymlink;
in {
xdg.configFile = {