diff --git a/system/README.org b/system/README.org index 6a6690a..f304994 100644 --- a/system/README.org +++ b/system/README.org @@ -20,14 +20,10 @@ My system-level Nix modules are organized into this directory: - [[./wm][wm]] - Necessary system-level configuration to get various window managers, wayland compositors, and/or desktop environments working ** Variables imported from flake.nix -# TODO update this Variables can be imported from [[../flake.nix][flake.nix]] by setting the =specialArgs= block inside the flake (see [[../flake.nix][my flake]] for more details). This allows variables to merely be managed in one place ([[../flake.nix][flake.nix]]) rather than having to manage them in multiple locations. -I currently import the following variables to the system config: -- =username= - Username -- =hostname= - Hostname for machine -- =timezone= - Timezone for machine -- =locale= - Locale for machine -- =theme= - base16 theme stored in ../themes to be used -- =backgroundUrl= - Direct link to background wallpaper (used for login screen) -- =backgroundSha256= - Checksum for background image used when downloading +I use this to pass a few attribute sets: +- =userSettings= - Settings for the normal user (see [[../flake.nix][flake.nix]] for more details) +- =systemSettings= - Settings for the system (see [[../flake.nix][flake.nix]] for more details) +- =inputs= - Flake inputs (see [[../flake.nix][flake.nix]] for more details) +- =pkgs-stable= - Allows me to include stable versions of packages along with (my default) unstable versions of packages diff --git a/user/README.org b/user/README.org index a449dca..d6e1a6e 100644 --- a/user/README.org +++ b/user/README.org @@ -31,20 +31,17 @@ My user-level Nix modules are organized into this directory: - [[./shell/cli-collection.nix][cli-collection]] - Curated useful CLI utilities - [[./style][style]] - Stylix setup (system-wide base16 theme generation) - [[./wm][wm]] - Window manager, compositor, wayland compositor, and/or desktop environment setups + - [[./wm/hyprland][hyprland]] - [[./wm/xmonad][xmonad]] - [[./wm/picom][picom]] ** Variables imported from flake.nix -# TODO update this Variables can be imported from [[../flake.nix][flake.nix]] by setting the =extraSpecialArgs= block inside the flake (see [[../flake.nix][my flake]] for more details). This allows variables to merely be managed in one place ([[../flake.nix][flake.nix]]) rather than having to manage them in multiple locations. -I currently import the following variables to the system config: -- =username= - Username -- =hostname= - Hostname for machine -- =myHomeDir= - Absolute path to home directory derived from =username= -- =email= - Email -- =dotfilesDir= - Path to my dotfiles directory on the system -- =theme= - base16 theme stored in ../themes to be used -- =themePolarity= - whether theme is =light= or =dark= -- =backgroundUrl= - Direct link to background wallpaper (used for login screen) -- =backgroundSha256= - Checksum for background image used when downloading +I use this to pass a few attribute sets: +- =userSettings= - Settings for the normal user (see [[../flake.nix][flake.nix]] for more details) +- =systemSettings= - Settings for the system (see [[../flake.nix][flake.nix]] for more details) +- =inputs= - Flake inputs (see [[../flake.nix][flake.nix]] for more details) +- =pkgs-stable= - Allows me to include stable versions of packages along with (my default) unstable versions of packages +- =pkgs-emacs= - Pinned version of nixpkgs I use for Emacs and its dependencies +- =pkgs-kdenlive= - Pinned version of nixpkgs I use for kdenlive