flake: introduce new variables

Signed-off-by: Patrizio Bekerle <[email protected]>
pbek · Nov 6, 2024 · 5c712c1 · 5c712c1
1 parent 07d124a
commit 5c712c1
Show file tree

Hide file tree

Showing 43 changed files with 133 additions and 126 deletions.
diff --git a/.github/workflows/build-publish-nix-cache-nginx.yml b/.github/workflows/build-publish-nix-cache-nginx.yml
@@ -30,7 +30,7 @@ jobs:
         uses: docker/login-action@v2
         with:
           registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
+          userLogin: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push Docker image

diff --git a/.github/workflows/build-publish-nix-store.yml b/.github/workflows/build-publish-nix-store.yml
@@ -32,7 +32,7 @@ jobs:
         uses: docker/login-action@v2
         with:
           registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
+          userLogin: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push Docker image

diff --git a/.github/workflows/build-publish-node-vscode.yml b/.github/workflows/build-publish-node-vscode.yml
@@ -32,7 +32,7 @@ jobs:
         uses: docker/login-action@v2
         with:
           registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
+          userLogin: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push Docker image

diff --git a/flake.nix b/flake.nix
@@ -80,7 +80,10 @@ outputs =
 #     hostname = config.networking.hostName;
 #    nixosModules = import ./modules { inherit (nixpkgs) lib; };
     commonArgs = {
-      username = "omega";
+      userLogin = "omega";
+      userNameLong = "Patrizio Bekerle";
+      userNameShort = "Patrizio";
+      userEmail = "[email protected]";
       termFontSize = 12.0;
       # By default we will use Wayland with Plasma 6
       x11Support = false;
@@ -234,7 +237,9 @@ outputs =
         ];
         specialArgs = self.commonArgs // {
           inherit inputs;
-          username = "cow";
+          userLogin = "cow";
+          userNameLong = "cow";
+          userEmail = "cow@cow";
         };
       };
       # Asus Laptop
@@ -306,7 +311,9 @@ outputs =
         ];
         specialArgs = self.commonArgs // {
           inherit inputs;
-          username = "dp";
+          userLogin = "dp";
+          userNameLong = "dp";
+          userEmail = "dp@dp";
         };
       };
 #      # Home Server miniserver24 for Markus
@@ -319,7 +326,7 @@ outputs =
 #        ];
 #        specialArgs = self.commonArgs // {
 #          inherit inputs;
-#          username = "mba";
+#          userLogin = "mba";
 #        };
 #      };
 #      vm-netcup02 = nixpkgs.lib.nixosSystem {
@@ -340,7 +347,7 @@ outputs =
 #        ];
 #        specialArgs = self.commonArgs // {
 #          inherit inputs;
-#          username = "mba";
+#          userLogin = "mba";
 #        };
 #      };
 #      # VM Desktop

diff --git a/hosts/astra/configuration.nix b/hosts/astra/configuration.nix
@@ -4,7 +4,7 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ config, pkgs, username, ... }:
+{ config, pkgs, userLogin, ... }:
 
 {
   imports =

diff --git a/hosts/caliban/configuration.nix b/hosts/caliban/configuration.nix
@@ -4,7 +4,7 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ config, pkgs, username, ... }:
+{ config, pkgs, userLogin, ... }:
 
 {
   imports =
@@ -61,7 +61,7 @@
       dragAndDrop = true;
     };
   };
-  users.extraGroups.vboxusers.members = [ username ];
+  users.extraGroups.vboxusers.members = [ userLogin ];
 
   # virtualisation.virtualbox.host.enableExtensionPack = true;
 

diff --git a/hosts/dp01/configuration.nix b/hosts/dp01/configuration.nix
@@ -4,7 +4,7 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ config, pkgs, username, ... }:
+{ config, pkgs, userLogin, ... }:
 
 {
   imports =

diff --git a/hosts/eris/configuration.nix b/hosts/eris/configuration.nix
@@ -4,7 +4,7 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ config, pkgs, username, ... }:
+{ config, pkgs, userLogin, ... }:
 
 {
   imports =

diff --git a/hosts/gaia/configuration.nix b/hosts/gaia/configuration.nix
@@ -4,7 +4,7 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ config, pkgs, username, ... }:
+{ config, pkgs, userLogin, ... }:
 
 {
   imports =
@@ -70,7 +70,7 @@
   # Extract
 
   # https://github.com/NixOS/nixpkgs/issues/215450
-  # users.users.${username} = {
+  # users.users.${userLogin} = {
   #   packages = with pkgs; [
   #     playwright
   #     (runCommand "wrapped-playwright" { buildInputs = [ makeWrapper ]; } ''
@@ -83,12 +83,12 @@
 
   # https://nixos.wiki/wiki/VirtualBox
   virtualisation.virtualbox.host.enable = true;
-  users.extraGroups.vboxusers.members = [ username ];
+  users.extraGroups.vboxusers.members = [ userLogin ];
   # virtualisation.virtualbox.host.enableExtensionPack = true;
 
   # Try to get get around: /nix/store/lx50avim6rzf20b69q4zwak07c479qwp-udev-rules/60-openocd.rules:188 Unknown group 'plugdev', ignoring.
   # https://github.com/NixOS/nixpkgs/issues/81326#issuecomment-592790668
-  users.users.${username} = {
+  users.users.${userLogin} = {
     extraGroups = [ "plugdev" ];
   };
 

diff --git a/hosts/home01/configuration.nix b/hosts/home01/configuration.nix
@@ -1,5 +1,5 @@
 # home01 server
-{ modulesPath, config, pkgs, username, ... }:
+{ modulesPath, config, pkgs, userLogin, ... }:
 
 {
   imports =

diff --git a/hosts/home01/vm.nix b/hosts/home01/vm.nix
@@ -8,13 +8,13 @@
 # build in vm
 # > nixos-rebuild --flake .#vm-home01 build-vm
 #
-{ lib, config, username, ... }:
+{ lib, config, userLogin, ... }:
 {
   imports =
   [
     ./configuration.nix
   ];
 
   users.users.root.initialPassword = "root";
-  users.users.${username}.initialPassword = username;
+  users.users.${userLogin}.initialPassword = userLogin;
 }
diff --git a/hosts/hyperion/configuration.nix b/hosts/hyperion/configuration.nix
@@ -4,7 +4,7 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ config, pkgs, username, ... }:
+{ config, pkgs, userLogin, ... }:
 
 {
   imports =

diff --git a/hosts/jupiter/configuration.nix b/hosts/jupiter/configuration.nix
@@ -4,7 +4,7 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ config, pkgs, username, ... }:
+{ config, pkgs, userLogin, ... }:
 
 {
   imports =

diff --git a/hosts/miniserver24/configuration.nix b/hosts/miniserver24/configuration.nix
@@ -1,5 +1,5 @@
   # miniserver24 server for Markus
-{ modulesPath, config, pkgs, username, ... }:
+{ modulesPath, config, pkgs, userLogin, ... }:
 
 {
   imports =
@@ -35,7 +35,7 @@
   # No password needed for sudo for wheel group
   security.sudo.wheelNeedsPassword = false;
 
-  users.users.${username} = {
+  users.users.${userLogin} = {
     description = "Markus";
     openssh.authorizedKeys.keys = [
       # Markus public key
@@ -44,7 +44,7 @@
     ];
   };
 
-  home-manager.users.${username} = {
+  home-manager.users.${userLogin} = {
     programs.git = {
       userName  = "Markus Barta";
       userEmail = "[email protected]";

diff --git a/hosts/miniserver24/vm.nix b/hosts/miniserver24/vm.nix
@@ -8,13 +8,13 @@
 # build in vm
 # > nixos-rebuild --flake .#vm-miniserver24 build-vm
 #
-{ lib, config, username, ... }:
+{ lib, config, userLogin, ... }:
 {
   imports =
   [
     ./configuration.nix
   ];
 
   users.users.root.initialPassword = "root";
-  users.users.${username}.initialPassword = username;
+  users.users.${userLogin}.initialPassword = userLogin;
 }
diff --git a/hosts/moobox01/vm.nix b/hosts/moobox01/vm.nix
@@ -16,5 +16,5 @@
   ];
 
   users.users.root.initialPassword = "root";
-  users.users.${username}.initialPassword = username;
+  users.users.${userLogin}.initialPassword = userLogin;
 }
diff --git a/hosts/netcup01/vm.nix b/hosts/netcup01/vm.nix
@@ -16,5 +16,5 @@
   ];
 
   users.users.root.initialPassword = "root";
-  users.users.${username}.initialPassword = username;
+  users.users.${userLogin}.initialPassword = userLogin;
 }
diff --git a/hosts/netcup02/vm.nix b/hosts/netcup02/vm.nix
@@ -8,13 +8,13 @@
 # build in vm
 # > nixos-rebuild --flake .#vm-netcup02 build-vm
 #
-{ lib, config, username, ... }:
+{ lib, config, userLogin, ... }:
 {
   imports =
   [
     ./configuration.nix
   ];
 
   users.users.root.initialPassword = "root";
-  users.users.${username}.initialPassword = username;
+  users.users.${userLogin}.initialPassword = userLogin;
 }
diff --git a/hosts/pluto/configuration.nix b/hosts/pluto/configuration.nix
@@ -4,7 +4,7 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ config, pkgs, username, ... }:
+{ config, pkgs, userLogin, ... }:
 
 {
   imports =
@@ -36,7 +36,7 @@
 
   # https://nixos.wiki/wiki/VirtualBox
   virtualisation.virtualbox.host.enable = true;
-  users.extraGroups.vboxusers.members = [ username ];
+  users.extraGroups.vboxusers.members = [ userLogin ];
   # virtualisation.virtualbox.host.enableExtensionPack = true;
 
   # https://nixos.wiki/wiki/steam

diff --git a/hosts/rhea/configuration.nix b/hosts/rhea/configuration.nix
@@ -4,7 +4,7 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ config, pkgs, username, ... }:
+{ config, pkgs, userLogin, ... }:
 
 {
   imports =

diff --git a/hosts/sinope/configuration.nix b/hosts/sinope/configuration.nix
@@ -4,7 +4,7 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ config, pkgs, username, ... }:
+{ config, pkgs, userLogin, ... }:
 
 {
   imports =

diff --git a/hosts/venus/configuration.nix b/hosts/venus/configuration.nix
@@ -4,7 +4,7 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ config, pkgs, username, ... }:
+{ config, pkgs, userLogin, ... }:
 
 {
   imports =
@@ -127,7 +127,7 @@
 
   # https://nixos.wiki/wiki/VirtualBox
   virtualisation.virtualbox.host.enable = true;
-  users.extraGroups.vboxusers.members = [ username ];
+  users.extraGroups.vboxusers.members = [ userLogin ];
 
   programs.alvr.enable = true;
   programs.alvr.openFirewall = true;

diff --git a/hosts/vm-desktop/vm.nix b/hosts/vm-desktop/vm.nix
@@ -12,7 +12,7 @@
 # > nixos-rebuild -I nixos-config=./vm.nix -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/pull/223593/head.tar.gz build-vm
 # > QEMU_OPTS="-m 4096 -smp 4 -enable-kvm" ./result/bin/run-*-vm
 #
-{ lib, config, username, ... }:
+{ lib, config, userLogin, ... }:
 {
     imports =
     [
@@ -24,5 +24,5 @@
     ];
 
   users.users.root.initialPassword = "root";
-  users.users.${username}.initialPassword = username;
+  users.users.${userLogin}.initialPassword = userLogin;
 }
diff --git a/hosts/vm-server/vm.nix b/hosts/vm-server/vm.nix
@@ -12,13 +12,13 @@
 # > nixos-rebuild -I nixos-config=./vm.nix -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/pull/223593/head.tar.gz build-vm
 # > QEMU_OPTS="-m 4096 -smp 4 -enable-kvm" ./result/bin/run-*-vm
 #
-{ lib, config, username, ... }:
+{ lib, config, userLogin, ... }:
 {
     imports =
     [
       ../../modules/mixins/server-remote.nix
     ];
 
   users.users.root.initialPassword = "root";
-  users.users.${username}.initialPassword = username;
+  users.users.${userLogin}.initialPassword = userLogin;
 }
diff --git a/iso.nix b/iso.nix
@@ -1,6 +1,6 @@
 # This module defines a small NixOS installation CD.
 # https://nixos.wiki/wiki/Creating_a_NixOS_live_CD
-{ config, pkgs, username, ... }:
+{ config, pkgs, userLogin, ... }:
 {
   imports = [
     # <nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix>

diff --git a/modules/mixins/audio.nix b/modules/mixins/audio.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, username, ... }:
+{ config, pkgs, userLogin, ... }:
 
 {
   # Enable sound with pipewire.