diff --git a/flake.nix b/flake.nix index a827d7b..ed2922d 100644 --- a/flake.nix +++ b/flake.nix @@ -3,28 +3,25 @@ outputs = { self, nixpkgs, home-manager, nix-doom-emacs, stylix, eaf, eaf-browser, org-nursery, blocklist-hosts, rust-overlay, ... }@inputs: let - # --- SYSTEM SETTINGS --- # + # ---- SYSTEM SETTINGS ---- # system = "x86_64-linux"; # system arch hostname = "snowfire"; # hostname profile = "personal"; # select a profile defined from my profiles directory timezone = "America/Chicago"; # select timezone locale = "en_US.UTF-8"; # select locale - # ---- USER SETTINGS ---- # + # ----- USER SETTINGS ----- # name = "emmet"; # username 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"; - + # --- PATH CALCULATIONS -- # + homeNixPath = ./. + "/profiles"+("/"+profile)+"/home.nix"; + configurationNixPath = ./. + "/profiles"+("/"+profile)+"/configuration.nix"; + systemWMNixPath = ./. + "/system/wm"+("/"+wm)+".nix"; + userWMNixPath = ./. + "/user/wm"+("/"+wm+"/"+wm)+".nix"; themePolarityPath = "/themes/"+theme+"/polarity.txt"; themePolarity = lib.removeSuffix "\n" (builtins.readFile (./. + themePolarityPath)); backgroundUrlPath = "/themes/"+theme+"/backgroundurl.txt"; @@ -53,11 +50,11 @@ myHomeDir = "/home/"+name; myEmail = email; myDotfilesDir = dotfilesDir; - inherit userWMNixPath; myTheme = theme; myThemePolarity = themePolarity; myBackgroundUrl = backgroundUrl; myBackgroundSha256 = backgroundSha256; + inherit userWMNixPath; inherit (inputs) nix-doom-emacs; inherit (inputs) stylix; inherit (inputs) eaf; @@ -75,11 +72,11 @@ myHostname = hostname; myTimezone = timezone; myLocale = locale; - inherit systemWMNixPath; myTheme = theme; myThemePolarity = themePolarity; myBackgroundUrl = backgroundUrl; myBackgroundSha256 = backgroundSha256; + inherit systemWMNixPath; inherit (inputs) stylix; inherit (inputs) blocklist-hosts; };