From d17afc3fb34de2273f6f9c386c0218691ecda575 Mon Sep 17 00:00:00 2001 From: Frost-Phoenix <67cyril6767@gmail.com> Date: Fri, 15 Dec 2023 19:00:46 +0100 Subject: [PATCH] change username to a global var --- flake.nix | 1 + modules/core/user.nix | 6 ++---- modules/core/virtualization.nix | 4 ++-- modules/core/xserver.nix | 4 ++-- modules/home/audacious/config | 1 - modules/home/firefox/default.nix | 4 ++-- 6 files changed, 9 insertions(+), 11 deletions(-) diff --git a/flake.nix b/flake.nix index 5d762de..17e4f91 100644 --- a/flake.nix +++ b/flake.nix @@ -40,6 +40,7 @@ { nixpkgs, self, ...} @ inputs: let selfPkgs = import ./pkgs; + username = "frostphoenix"; in { overlays.default = selfPkgs.overlay; diff --git a/modules/core/user.nix b/modules/core/user.nix index cba653b..26cddb4 100644 --- a/modules/core/user.nix +++ b/modules/core/user.nix @@ -1,7 +1,5 @@ -{ pkgs, inputs, ...}: +{ pkgs, inputs, username, ...}: let - name = "FrostPhoenix"; - username = "frostphoenix"; packages = with pkgs; [ fish ]; @@ -23,7 +21,7 @@ in users.users.${username} = { isNormalUser = true; - description = name; + description = ${username}; extraGroups = [ "networkmanager" "wheel" ]; shell = pkgs.zsh; }; diff --git a/modules/core/virtualization.nix b/modules/core/virtualization.nix index e1ee07d..efe6c38 100644 --- a/modules/core/virtualization.nix +++ b/modules/core/virtualization.nix @@ -1,7 +1,7 @@ -{ config, pkgs, ... }: +{ config, pkgs, username, ... }: { # Add user to libvirtd group - users.users.frostphoenix.extraGroups = [ "libvirtd" ]; + users.users.${username}.extraGroups = [ "libvirtd" ]; # Install necessary packages environment.systemPackages = with pkgs; [ diff --git a/modules/core/xserver.nix b/modules/core/xserver.nix index c1d60b3..cfcee0d 100644 --- a/modules/core/xserver.nix +++ b/modules/core/xserver.nix @@ -1,11 +1,11 @@ -{ pkgs, ... }: +{ pkgs, username, ... }: { services.xserver = { enable = true; layout = "us"; displayManager.autoLogin = { enable = true; - user = "frostphoenix"; + user = ${username}; }; libinput = { enable = true; diff --git a/modules/home/audacious/config b/modules/home/audacious/config index bf5db82..b938977 100644 --- a/modules/home/audacious/config +++ b/modules/home/audacious/config @@ -1,4 +1,3 @@ - [audacious] equalizer_active=TRUE equalizer_bands=-1,1,2,2,1,0,0,-1,-1,-1 diff --git a/modules/home/firefox/default.nix b/modules/home/firefox/default.nix index 74cd77f..e023ad4 100755 --- a/modules/home/firefox/default.nix +++ b/modules/home/firefox/default.nix @@ -1,9 +1,9 @@ -{ pkgs, lib, config,... }: +{ pkgs, lib, config, username, ... }: { programs.firefox = { enable = true; - profiles.frostphoenix = { + profiles.${username} = { settings = {}; isDefault = true; extensions = with pkgs.nur.repos.rycee.firefox-addons; [