Rename and redescript some options, continue reducing my flake to dust

This commit is contained in:
Bun 2025-04-30 05:08:18 -04:00
parent 7976a8c9ec
commit 912fe5d454
10 changed files with 23 additions and 22 deletions

View file

@ -68,8 +68,9 @@
inherit modules; inherit modules;
specialArgs = inputs; specialArgs = inputs;
}; };
mkHome = modules: pkgs: hm.lib.homeManagerConfiguration { mkHome = modules: channel: arch: hm.lib.homeManagerConfiguration {
inherit modules pkgs; inherit modules;
pkgs = builtins.getAttr arch channel.legacyPackages;
extraSpecialArgs = inputs; extraSpecialArgs = inputs;
}; };
in { in {
@ -89,8 +90,8 @@
# nh home switch /path -c arch # nh home switch /path -c arch
homeConfigurations = { homeConfigurations = {
x86 = mkHome [ ./modules/home ] stable.legacyPackages.x86_64-linux; x86 = mkHome [ ./modules/home ] stable "x86_64-linux";
aarch = mkHome [ ./modules/home ] stable.legacyPackages.aarch64-linux; aarch = mkHome [ ./modules/home ] stable "aarch64-linux";
}; };
}; };
} }

View file

@ -2,7 +2,7 @@
{ {
imports = [ jovian.nixosModules.jovian ]; imports = [ jovian.nixosModules.jovian ];
options.system.steamdeck.enable = lib.mkEnableOption "Enable Jovian NixOS environment"; options.system.steamdeck.enable = lib.mkEnableOption "Jovian NixOS environment";
config = lib.mkIf config.system.steamdeck.enable { config = lib.mkIf config.system.steamdeck.enable {
jovian = { jovian = {

View file

@ -11,11 +11,11 @@
]; ];
options.home = with lib; { options.home = with lib; {
desktop.enable = mkEnableOption "Enable desktop programs and services."; desktop.enable = mkEnableOption "Desktop programs and services";
gaming.enable = mkEnableOption "Enable gaming apps and programs"; gaming.enable = mkEnableOption "Gaming apps and programs";
production.enable = mkEnableOption "Enable apps for visual productivity"; production.enable = mkEnableOption "Apps for visual productivity";
remote-desktop.enable = mkEnableOption "Enable apps for visual productivity"; remote-desktop.enable = mkEnableOption "Apps for remote desktop";
school.enable = mkEnableOption "Enable apps for visual productivity"; school.enable = mkEnableOption "Apps for school and college";
}; };
config.home.stateVersion = "24.11"; config.home.stateVersion = "24.11";

View file

@ -4,7 +4,7 @@
# NixOS # NixOS
nhs = "nh os switch"; nhs = "nh os switch";
nixclean = "nix store gc; nix store optimise"; nixclean = "nix store gc; nix store optimise";
nixpurge = "doas nix-collect-garbage --delete-old"; nixpurge = "sudo nix-collect-garbage --delete-old";
# Shortcuts # Shortcuts
ff = "clear && fastfetch"; ff = "clear && fastfetch";

View file

@ -1,11 +1,11 @@
{ config, ... }: { config, ... }:
{ {
gtk.gtk3.bookmarks = [ gtk.gtk3.bookmarks = [
"file:///home/${config.home.username}/Keepers" "file://${config.home.homeDirectory}/Keepers"
"file:///home/${config.home.username}/Downloads" "file://${config.home.homeDirectory}/Downloads"
"file:///home/${config.home.username}/Documents" "file://${config.home.homeDirectory}/Documents"
"file:///home/${config.home.username}/Videos" "file://${config.home.homeDirectory}/Videos"
"file:///home/${config.home.username}/Pictures/Screenshots" "file://${config.home.homeDirectory}/Pictures/Screenshots"
"file:///etc/nixos" "file:///etc/nixos"
]; ];
} }

View file

@ -10,7 +10,7 @@
]; ];
options.system = with lib; { options.system = with lib; {
desktop.enable = mkEnableOption "Enable desktop apps and services"; desktop.enable = mkEnableOption "Desktop apps and services";
server.enable = mkEnableOption "Enable server apps and services"; server.enable = mkEnableOption "Server apps and services";
}; };
} }

View file

@ -1,6 +1,6 @@
{ config, lib, ... }: { config, lib, ... }:
{ {
options.system.nvidia.enable = lib.mkEnableOption "Enable Nvidia graphic drivers"; options.system.nvidia.enable = lib.mkEnableOption "Nvidia graphic drivers";
config = lib.mkIf config.system.nvidia.enable { config = lib.mkIf config.system.nvidia.enable {
hardware.nvidia = { hardware.nvidia = {

View file

@ -7,5 +7,5 @@
./simplenix ./simplenix
]; ];
options.services.mailserver.enable = lib.mkEnableOption "Enable Simple NixOS Mailserver"; options.services.mailserver.enable = lib.mkEnableOption "Simple NixOS Mailserver";
} }

View file

@ -7,7 +7,7 @@
./user ./user
]; ];
options.services.webserver.enable = lib.mkEnableOption "Enable nginx webpages"; options.services.webserver.enable = lib.mkEnableOption "Nginx webpages";
config = lib.mkIf config.services.nginx.enable { config = lib.mkIf config.services.nginx.enable {
services.nginx = { services.nginx = {