Created window manager variable (even tho I only have one wm atm)

This commit is contained in:
Emmet 2023-06-21 10:02:59 -05:00
parent 6c2f6add12
commit 75968e28eb
3 changed files with 11 additions and 5 deletions

View file

@ -15,11 +15,15 @@
email = "librephoenix3@pm.me"; # email (used for certain configurations)
dotfilesDir = "~/.dotfiles"; # absolute path of the repo
theme = "ayu-dark"; # selcted theme from my themes directory
wm = "xmonad"; # Selected window manager or desktop environment
# ---- CALCULATIONS ----- #
profileWithSlash = "/" + profile; # I honestly don't know why this is necessary
wmWithSlash = "/" + wm; # Don't understand this either
homeNixPath = ./. + "/profiles" + profileWithSlash + "/home.nix";
configurationNixPath = ./. + "/profiles" + profileWithSlash + "/configuration.nix";
systemWMNixPath = ./. + "/system/wm" + wmWithSlash + ".nix";
userWMNixPath = ./. + "/user/wm" + wmWithSlash + wmWithSlash + ".nix";
themePolarityPath = "/themes/"+theme+"/polarity.txt";
themePolarity = lib.removeSuffix "\n" (builtins.readFile (./. + themePolarityPath));
@ -49,6 +53,7 @@
myHomeDir = "/home/"+name;
myEmail = email;
myDotfilesDir = dotfilesDir;
inherit userWMNixPath;
myTheme = theme;
myThemePolarity = themePolarity;
myBackgroundUrl = backgroundUrl;
@ -67,10 +72,11 @@
modules = [ configurationNixPath ];
specialArgs = {
myName = name;
myTheme = theme;
myHostname = hostname;
myTimezone = timezone;
myLocale = locale;
inherit systemWMNixPath;
myTheme = theme;
myThemePolarity = themePolarity;
myBackgroundUrl = backgroundUrl;
myBackgroundSha256 = backgroundSha256;

View file

@ -2,7 +2,7 @@
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help).
{ config, lib, pkgs, blocklist-hosts, myName, myHostname, myTimezone, myLocale, myTheme, myBackgroundUrl, myBackgroundSha256, ... }:
{ config, lib, pkgs, blocklist-hosts, myName, myHostname, myTimezone, myLocale, systemWMNixPath, myTheme, myBackgroundUrl, myBackgroundSha256, ... }:
{
imports =
[ ../../system/hardware-configuration.nix
@ -10,7 +10,7 @@
../../system/hardware/opengl.nix
../../system/hardware/printing.nix
../../system/hardware/bluetooth.nix
../../system/wm/xmonad.nix
systemWMNixPath # My window manager selected from flake
../../system/app/flatpak.nix
../../system/security/doas.nix
../../system/security/gpg.nix

View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, python3Packages, nix-doom-emacs, stylix, myName, myEmail, myHomeDir, myDotfilesDir, myTheme, ... }:
{ config, lib, pkgs, python3Packages, nix-doom-emacs, stylix, myName, myEmail, myHomeDir, myDotfilesDir, myTheme, userWMNixPath, ... }:
{
# Home Manager needs a bit of information about you and the paths it should
@ -11,7 +11,7 @@
imports = [
nix-doom-emacs.hmModule
stylix.homeManagerModules.stylix
../../user/wm/xmonad/xmonad.nix # My xmonad config
userWMNixPath # My window manager selected from flake
../../user/shell/sh.nix # My zsh and bash config
../../user/shell/cli-collection.nix # Useful CLI apps
../../user/bin/phoenix.nix # My nix command wrapper