diff --git a/flake.nix b/flake.nix index 31b8085b..26c4ab01 100644 --- a/flake.nix +++ b/flake.nix @@ -144,7 +144,8 @@ # Some defaults for evaluating modules. _module.check = true; - # Initialize some of the XDG base directories ourselves since it is used by NIX_PROFILES to properly link some of them. + # Initialize some of the XDG base directories ourselves since it is + # used by NIX_PROFILES to properly link some of them. environment.sessionVariables = { XDG_CACHE_HOME = "$HOME/.cache"; XDG_CONFIG_HOME = "$HOME/.config"; diff --git a/hosts/ni/modules/setups/gaming.nix b/hosts/ni/modules/setups/gaming.nix index 17e18516..9664a7ca 100644 --- a/hosts/ni/modules/setups/gaming.nix +++ b/hosts/ni/modules/setups/gaming.nix @@ -16,11 +16,12 @@ in retro-computing.enable = true; }; + # Bring more of them games. environment.systemPackages = with pkgs; [ - dwarf-fortress - mindustry - minetest - the-powder-toy + dwarf-fortress # Losing only means more possibilities to play. + mindustry # Not a Minecraft industry simulator. + minetest # Free Minecraft. + the-powder-toy # Free micro-Minecraft. ]; # This is somewhat used for streaming games from it. diff --git a/lib/images.nix b/lib/images.nix index 80fa90d6..73202ce1 100644 --- a/lib/images.nix +++ b/lib/images.nix @@ -8,10 +8,12 @@ let // import ./private.nix { lib = self; }; in { - # A wrapper around the NixOS configuration function. + # A thin wrapper around the NixOS configuration function. mkHost = { extraModules ? [ ], nixpkgs-channel ? "nixpkgs" }: let nixpkgs = inputs.${nixpkgs-channel}; + + # Just to be sure, we'll use everything with the given nixpkgs' stdlib. lib' = nixpkgs.lib.extend extendLib; # A modified version of `nixosSystem` from nixpkgs flake. There is a @@ -25,7 +27,7 @@ in modules = extraModules; }; - # A wrapper around the home-manager configuration function. + # A thin wrapper around the home-manager configuration function. mkHome = { pkgs, extraModules ? [ ], home-manager-channel ? "home-manager" }: inputs.${home-manager-channel}.lib.homeManagerConfiguration { inherit pkgs; @@ -33,7 +35,7 @@ in modules = extraModules; }; - # A wrapper around the nixos-generators `nixosGenerate` function. + # A thin wrapper around the nixos-generators `nixosGenerate` function. mkImage = { pkgs ? null, extraModules ? [ ], format ? "iso" }: inputs.nixos-generators.nixosGenerate { inherit pkgs format; @@ -41,6 +43,12 @@ in modules = extraModules; }; + # A function to modify the given table of declarative setups (i.e., hosts, + # users) to have its own system attribute and its name. + # + # If the given setup only has one system, its name will stay the same. + # Otherwise, it will be appended with the system as part of the name (e.g., + # `$NAME-$SYSTEM`). listImagesWithSystems = data: lib.foldlAttrs (acc: name: metadata: diff --git a/modules/home-manager/profiles/desktop.nix b/modules/home-manager/profiles/desktop.nix index bb53fef2..b77f3561 100644 --- a/modules/home-manager/profiles/desktop.nix +++ b/modules/home-manager/profiles/desktop.nix @@ -179,7 +179,7 @@ in { foliate # The prettier PDF viewer (if you're OK with a mixed bag of GTK3+GTK4 apps). thunderbird # Email and web feed checks. languagetool # You're personal assistant for proper grammar, - vale # Elevate your fanfics to an arguably higher caliber! + vale # Elevate your fanfics to a frivolously higher caliber! ]; xdg.mimeApps.defaultApplications = { diff --git a/modules/home-manager/profiles/dev.nix b/modules/home-manager/profiles/dev.nix index 9a20c445..8128d44a 100644 --- a/modules/home-manager/profiles/dev.nix +++ b/modules/home-manager/profiles/dev.nix @@ -138,6 +138,7 @@ in { }; }) + # Modern problems require modern tools. (lib.mkIf cfg.coreutils-replacement.enable { home.packages = with pkgs; [ fd # Welp, a reliable find. @@ -172,6 +173,7 @@ in { }; }) + # Extra extras. (lib.mkIf cfg.extras.enable { home.packages = with pkgs; [ gum # The fancy shell script toolkit. @@ -179,12 +181,13 @@ in { license-cli # A nice generator template for license files. quilt # Patching right up yer' alley. tokei # Stroking your programming ego by how many lines of C you've written. - treefmt # I like the tagline of this tool: "One CLI for formatting your code tree." (It rhymes somewhat.) + treefmt # I like the rhyming tagline of this tool which is why it's here. vhs # Declarative terminal tool demo. zenith # Very fanciful system dashboard. ]; }) + # Abuncha' shady tools. (lib.mkIf cfg.shaders.enable { home.packages = with pkgs; [ bonzomatic # Shadertoys for desktop bozos. @@ -198,7 +201,7 @@ in { kanidm # What is you? ipcalc # Calculate how many stars are there in space. geoip # Know where the spam came from. - sshfs # Intrude others' home, why don't 'ya? + sshfs # Intrude others' home and steal their shit, why don't 'ya? whois # Doctor, are you not? ]; }) diff --git a/modules/nixos/profiles/gaming.nix b/modules/nixos/profiles/gaming.nix index ccb714c7..5a1ca398 100644 --- a/modules/nixos/profiles/gaming.nix +++ b/modules/nixos/profiles/gaming.nix @@ -63,7 +63,7 @@ in environment.systemPackages = with pkgs; [ cataclysm-dda # Dwarf Fortress but in the future. dwarf-fortress # Dwarf Fortress. - endless-sky # Dwarf Fortress but in space and in the far future. + endless-sky # My other cocaine replacement. mindustry # Dwarf Fortress but with machineries. minetest # Dwarf Fortress but with voxels. openra # Dwarf Fortress but with futuristic armed civilizations. diff --git a/modules/nixos/workflows/a-happy-gnome/default.nix b/modules/nixos/workflows/a-happy-gnome/default.nix index 6ffa0005..c8a8b516 100644 --- a/modules/nixos/workflows/a-happy-gnome/default.nix +++ b/modules/nixos/workflows/a-happy-gnome/default.nix @@ -25,7 +25,7 @@ in type = with lib.types; listOf package; description = '' A list of GNOME Shell extensions to be included. Take note the package - contain `passthru.extensionUuid` to be used for enabling the + should contain `passthru.extensionUuid` to be used for enabling the extensions. ''; default = with pkgs.gnomeExtensions; [