diff --git a/home/isabel/cli/default.nix b/home/isabel/cli/default.nix index 7217e85c..38d52609 100644 --- a/home/isabel/cli/default.nix +++ b/home/isabel/cli/default.nix @@ -1,6 +1,6 @@ { imports = [ - ./shell # shell configurations + # keep-sorted start ./atuin.nix ./eza.nix ./fd.nix @@ -10,7 +10,9 @@ ./jj.nix ./nix-your-shell.nix ./ripgrep.nix + ./shell # shell configurations ./starship.nix ./zoxide.nix + # keep-sorted end ]; } diff --git a/home/isabel/default.nix b/home/isabel/default.nix index 1980ed6c..0ee32091 100644 --- a/home/isabel/default.nix +++ b/home/isabel/default.nix @@ -1,11 +1,13 @@ { imports = [ + # keep-sorted start ./cli # command line interface app confurations ./gui # graphical interface app confurations - ./system # important system environment config + ./packages.nix # a top-level list of packages ./services # system services, organized by display protocol + ./system # important system environment config ./themes # Application themeing ./tui # terminal interface app confurations - ./packages.nix # a top-level list of packages + # keep-sorted end ]; } diff --git a/home/isabel/gui/default.nix b/home/isabel/gui/default.nix index 0eabf6d2..5b4883c8 100644 --- a/home/isabel/gui/default.nix +++ b/home/isabel/gui/default.nix @@ -1,5 +1,6 @@ { imports = [ + # keep-sorted start ./chromium.nix ./discord.nix ./fht-compositor.nix @@ -7,5 +8,6 @@ ./notes.nix ./quickshell.nix ./wezterm.nix + # keep-sorted end ]; } diff --git a/home/isabel/packages.nix b/home/isabel/packages.nix index 886a6b5d..7c74e663 100644 --- a/home/isabel/packages.nix +++ b/home/isabel/packages.nix @@ -15,17 +15,19 @@ in garden.packages = mergeAttrsList [ (optionalAttrs cfg.workstation.enable { inherit (pkgs) - unzip - rsync - just # cool build tool - wakatime-cli - nix-output-monitor # much nicer nix build output + # keep-sorted start # wishlist # fancy ssh glow # fancy markdown # fx # fancy jq # gum # a nicer scripting jq # json parser + just # cool build tool + nix-output-monitor # much nicer nix build output + rsync + unzip + wakatime-cli yq # yaml parser + # keep-sorted end ; inherit (inputs'.tgirlpkgs.packages) zzz; # code snippets in the cli @@ -33,30 +35,34 @@ in (optionalAttrs cfg.graphical.enable { inherit (pkgs) + # keep-sorted start manga-tui # tui manga finder + reader # bitwarden-cli # bitwarden, my chosen password manager # vhs # programmatically make gifs + # keep-sorted end ; }) (optionalAttrs (cfg.graphical.enable && isLinux) { inherit (pkgs) + # keep-sorted start + brightnessctl # brightness managed via cli + cliphist + grim + libnotify # needed for some notifications + playerctl + pwvucontrol + slurp # bitwarden-desktop # password manager # jellyfin-media-player # insomnia # rest client # inkscape # vector graphics editor # gimp # image editor swappy # used for screenshot area selection - wl-gammactl - brightnessctl # brightness managed via cli - libnotify # needed for some notifications - grim - slurp wl-clipboard - cliphist - pwvucontrol + wl-gammactl youtube-music - playerctl + # keep-sorted end ; }) ]; diff --git a/home/isabel/services/default.nix b/home/isabel/services/default.nix index 2fc2678d..f80bfbe0 100644 --- a/home/isabel/services/default.nix +++ b/home/isabel/services/default.nix @@ -1,8 +1,10 @@ { imports = [ + # keep-sorted start ./clipboard.nix ./rnnoise.nix ./syncthing.nix ./tray.nix + # keep-sorted end ]; } diff --git a/home/isabel/system/default.nix b/home/isabel/system/default.nix index dd0b513c..704c083a 100644 --- a/home/isabel/system/default.nix +++ b/home/isabel/system/default.nix @@ -1,7 +1,9 @@ { imports = [ + # keep-sorted start ./docs.nix # documentation ./secrets.nix # very hush hush ./ssh.nix # ssh agent settings + # keep-sorted end ]; } diff --git a/home/isabel/themes/default.nix b/home/isabel/themes/default.nix index 4a2b9255..635e4d82 100644 --- a/home/isabel/themes/default.nix +++ b/home/isabel/themes/default.nix @@ -1,8 +1,10 @@ { imports = [ + # keep-sorted start ./catppuccin.nix ./global.nix ./gtk.nix ./qt.nix + # keep-sorted end ]; } diff --git a/home/isabel/tui/default.nix b/home/isabel/tui/default.nix index 949d25c9..5053baa7 100644 --- a/home/isabel/tui/default.nix +++ b/home/isabel/tui/default.nix @@ -1,7 +1,9 @@ { imports = [ + # keep-sorted start ./izrss.nix - ./neovim.nix ./lazygit.nix + ./neovim.nix + # keep-sorted end ]; } diff --git a/modules/base/default.nix b/modules/base/default.nix index 5029fa54..823d38a4 100644 --- a/modules/base/default.nix +++ b/modules/base/default.nix @@ -1,12 +1,14 @@ { imports = [ + # keep-sorted start prefix_order=../,../../,./ ../generic ../../home ./nix ./nixpkgs - ./system - ./users ./programs.nix ./secrets.nix + ./system + ./users + # keep-sorted end ]; } diff --git a/modules/base/nix/default.nix b/modules/base/nix/default.nix index 5e68c7e8..3e8021c9 100644 --- a/modules/base/nix/default.nix +++ b/modules/base/nix/default.nix @@ -1,8 +1,10 @@ { imports = [ + # keep-sorted start ./environment.nix # environment settings that nix requires ./nix.nix # nix the package manager's settings ./plugins.nix # nix plugins ./substituters.nix # nixpkgs substituters + # keep-sorted end ]; } diff --git a/modules/base/nixpkgs/default.nix b/modules/base/nixpkgs/default.nix index 169bdaab..ed05573e 100644 --- a/modules/base/nixpkgs/default.nix +++ b/modules/base/nixpkgs/default.nix @@ -1,6 +1,8 @@ { imports = [ - ./overlays + # keep-sorted start ./config.nix + ./overlays + # keep-sorted end ]; } diff --git a/modules/base/nixpkgs/overlays/default.nix b/modules/base/nixpkgs/overlays/default.nix index 595b0e67..0d548707 100644 --- a/modules/base/nixpkgs/overlays/default.nix +++ b/modules/base/nixpkgs/overlays/default.nix @@ -3,9 +3,11 @@ let inherit (lib) map; overlays = map import [ + # keep-sorted start ./fixes.nix ./funni.nix ./no-desktop.nix + # keep-sorted end ]; in { diff --git a/modules/base/system/default.nix b/modules/base/system/default.nix index 1f524478..51366b18 100644 --- a/modules/base/system/default.nix +++ b/modules/base/system/default.nix @@ -1,9 +1,11 @@ { imports = [ + # keep-sorted start ./diff.nix ./fonts.nix # font configuration ./revision.nix ./tools.nix ./vars.nix # environment variables + # keep-sorted end ]; } diff --git a/modules/base/users/default.nix b/modules/base/users/default.nix index ca3654c3..2ca1a9c2 100644 --- a/modules/base/users/default.nix +++ b/modules/base/users/default.nix @@ -1,8 +1,10 @@ { imports = [ + # keep-sorted start ./isabel.nix ./mkuser.nix ./options.nix ./root.nix + # keep-sorted end ]; } diff --git a/modules/darwin/default.nix b/modules/darwin/default.nix index f01dff76..1f554c5c 100644 --- a/modules/darwin/default.nix +++ b/modules/darwin/default.nix @@ -2,18 +2,18 @@ _class = "darwin"; imports = [ + # keep-sorted start ../base - ./brew # homebrew the package manager - ./hardware # hardware config - i.e. keyboard - ./preferences # system preferences - ./security # security settings to keep the system secure - ./config-path.nix # set the path to the darwin configuration ./documentation.nix # turn off docs + ./extras.nix # modules that are not in this repo, and don't have a nice place to be imported in + ./hardware # hardware config - i.e. keyboard ./legacy.nix # some shims to keep compatibility with some options that need refactoring upstream - ./extra.nix # modules that are not in this repo, and don't have a nice place to be imported in - ./system-packages.nix # system packages will be needed for all users ./nix.nix # nix settings + ./preferences # system preferences + ./security # security settings to keep the system secure + ./system-packages.nix # system packages will be needed for all users + # keep-sorted end ]; } diff --git a/modules/darwin/extra.nix b/modules/darwin/extras.nix similarity index 74% rename from modules/darwin/extra.nix rename to modules/darwin/extras.nix index a577725b..6ed5cbbf 100644 --- a/modules/darwin/extra.nix +++ b/modules/darwin/extras.nix @@ -1,7 +1,9 @@ { inputs, ... }: { imports = [ - inputs.tgirlpkgs.darwinModules.default + # keep-sorted start inputs.home-manager.darwinModules.home-manager + inputs.tgirlpkgs.darwinModules.default + # keep-sorted end ]; } diff --git a/modules/darwin/hardware/default.nix b/modules/darwin/hardware/default.nix index df4d2ab3..47f25ece 100644 --- a/modules/darwin/hardware/default.nix +++ b/modules/darwin/hardware/default.nix @@ -1,6 +1,8 @@ { imports = [ + # keep-sorted start ./keyboard.nix ./trackpad.nix + # keep-sorted end ]; } diff --git a/modules/darwin/preferences/default.nix b/modules/darwin/preferences/default.nix index 31110da8..86f26e61 100644 --- a/modules/darwin/preferences/default.nix +++ b/modules/darwin/preferences/default.nix @@ -10,6 +10,7 @@ # or `defaults read xxx` to read a specific domain. { imports = [ + # keep-sorted start ./clock.nix # Settings for the clock in the menu bar ./dock.nix # Settings for the dock ./finder.nix # Settings for Finder (file manager) @@ -20,5 +21,6 @@ ./sound.nix # Sound settings ./theme.nix # Theme settings ./wm.nix # Window manager settings + # keep-sorted end ]; } diff --git a/modules/darwin/security/default.nix b/modules/darwin/security/default.nix index 3904ca8c..5a6e78cb 100644 --- a/modules/darwin/security/default.nix +++ b/modules/darwin/security/default.nix @@ -1,7 +1,9 @@ { imports = [ + # keep-sorted start ./ads.nix # remove ads ./firewall.nix # firewall ./pam.nix # pam security settings + # keep-sorted end ]; } diff --git a/modules/flake/checks/default.nix b/modules/flake/checks/default.nix index 24475034..f196776e 100644 --- a/modules/flake/checks/default.nix +++ b/modules/flake/checks/default.nix @@ -1,6 +1,8 @@ { imports = [ - ./lib.nix + # keep-sorted start ./formatting.nix + ./lib.nix + # keep-sorted end ]; } diff --git a/modules/flake/default.nix b/modules/flake/default.nix index 04297ec8..2d18578f 100644 --- a/modules/flake/default.nix +++ b/modules/flake/default.nix @@ -1,12 +1,12 @@ { imports = [ + # keep-sorted start prefix_order=../../,./ ../../systems - + ./args.nix # the base args that is passed to the flake ./checks # custom checks that are devised to test if the system is working as expected ./lib # the lib that is used in the system ./packages # our custom packages provided by the flake ./programs # programs that run in the dev shell - - ./args.nix # the base args that is passed to the flake + # keep-sorted end ]; } diff --git a/modules/flake/lib/default.nix b/modules/flake/lib/default.nix index f5f0367a..70bceeee 100644 --- a/modules/flake/lib/default.nix +++ b/modules/flake/lib/default.nix @@ -4,12 +4,14 @@ { lib, inputs, ... }: let gardenLib = lib.fixedPoints.makeExtensible (final: { - template = import ./template; # templates, selections of code that are repeated + # keep-sorted start block=yes hardware = import ./hardware.nix; helpers = import ./helpers.nix { inherit lib; }; secrets = import ./secrets.nix { inherit inputs; }; services = import ./services.nix { inherit lib; }; + template = import ./template; # templates, selections of code that are repeated validators = import ./validators.nix { inherit lib; }; + # keep-sorted end # we have to rexport the functions we want to use, but don't want to refer to the whole lib # "path". e.g. gardenLib.hardware.isx86Linux can be shortened to gardenLib.isx86Linux diff --git a/modules/flake/packages/default.nix b/modules/flake/packages/default.nix index 68a00b25..d7b1b615 100644 --- a/modules/flake/packages/default.nix +++ b/modules/flake/packages/default.nix @@ -18,6 +18,7 @@ in { packages = { + # keep-sorted start block=yes newline_separated=yes iztaller = callPackage ./iztaller/package.nix { inherit (inputs'.izlix.packages) nix; }; libdoc = callPackage ./docs/lib.nix { inherit (inputs) self; }; @@ -29,6 +30,7 @@ inherit (inputs) self; inherit (self'.packages) libdoc optionsdoc; }; + # keep-sorted end }; }; } diff --git a/modules/flake/programs/default.nix b/modules/flake/programs/default.nix index f89f9791..db0d9381 100644 --- a/modules/flake/programs/default.nix +++ b/modules/flake/programs/default.nix @@ -1,6 +1,8 @@ { imports = [ + # keep-sorted start prefix_order=../../,./ ./formatter.nix # formatter for nix fmt, via treefmt is a formatter for every language ./shell.nix # a dev shell that provieds all that you will need to work + # keep-sorted end ]; } diff --git a/modules/generic/default.nix b/modules/generic/default.nix index 0a087ca1..a538ac03 100644 --- a/modules/generic/default.nix +++ b/modules/generic/default.nix @@ -1,6 +1,8 @@ { imports = [ + # keep-sorted start ./packages.nix ./profiles.nix + # keep-sorted end ]; } diff --git a/modules/home/default.nix b/modules/home/default.nix index 7475a1c5..30c56127 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -1,14 +1,15 @@ { imports = [ + # keep-sorted start ../generic - - ./environment # environment variables & path - ./programs # ways to configure packages - ./themes # themes for applications ./docs.nix # no more docs + ./environment # environment variables & path ./extras.nix # modules that are not in this repo, and don't have a nice place to be imported in ./home.nix # home settings ./profiles.nix # profiles for different machines + ./programs # ways to configure packages ./secrets.nix # secrets for the home directory + ./themes # themes for applications + # keep-sorted end ]; } diff --git a/modules/home/environment/default.nix b/modules/home/environment/default.nix index 006fcdf1..7ac1845f 100644 --- a/modules/home/environment/default.nix +++ b/modules/home/environment/default.nix @@ -1,9 +1,11 @@ { imports = [ + # keep-sorted start ./gpg.nix # gpg-agent ./path.nix # set our path ./shell.nix # enable our shell intergrations ./variables.nix # set our environment variables ./xdg.nix # set xdg expectations + # keep-sorted end ]; } diff --git a/modules/home/extras.nix b/modules/home/extras.nix index 46d01bd9..59c6d137 100644 --- a/modules/home/extras.nix +++ b/modules/home/extras.nix @@ -1,6 +1,8 @@ { inputs, ... }: { imports = [ + # # keep-sorted start inputs.tgirlpkgs.homeModules.default + # keep-sorted end ]; } diff --git a/modules/home/programs/default.nix b/modules/home/programs/default.nix index 8448404c..f961005e 100644 --- a/modules/home/programs/default.nix +++ b/modules/home/programs/default.nix @@ -1,9 +1,11 @@ { imports = [ + # keep-sorted start ./chromium.nix - ./direnv.nix ./defaults.nix + ./direnv.nix ./discord.nix ./pentesting.nix + # keep-sorted end ]; } diff --git a/modules/home/themes/default.nix b/modules/home/themes/default.nix index 2b547d68..d7a5d36a 100644 --- a/modules/home/themes/default.nix +++ b/modules/home/themes/default.nix @@ -1,5 +1,7 @@ { imports = [ + # keep-sorted start ./fonts.nix + # keep-sorted end ]; } diff --git a/modules/iso/default.nix b/modules/iso/default.nix index 2a813273..c7b0e297 100644 --- a/modules/iso/default.nix +++ b/modules/iso/default.nix @@ -3,6 +3,7 @@ # https://github.com/NixOS/nixpkgs/blob/90a153e81e7deb0b2ea1466c8a2f515df1974717/nixos/modules/profiles/installation-device.nix#L32 { imports = [ + # keep-sorted start ./boot.nix # boot settings ./console.nix # tty configurations ./fixes.nix # fixes issues @@ -12,5 +13,6 @@ ./nixpkgs.nix # nixpkgs configurations like unfree packages ./programs.nix # programs that we will need to make our NixOS install ./space.nix # ways that we save valuable space on the iso + # keep-sorted end ]; } diff --git a/modules/nixos/boot/default.nix b/modules/nixos/boot/default.nix index 09cd3674..648eee8a 100644 --- a/modules/nixos/boot/default.nix +++ b/modules/nixos/boot/default.nix @@ -1,7 +1,9 @@ { imports = [ - ./loader.nix # which system loader are we using + # keep-sorted start ./generic.nix # generic boot configuration + ./loader.nix # which system loader are we using ./secure-boot.nix # pretty much what it looks like + # keep-sorted end ]; } diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index d665727a..9a317190 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -2,20 +2,21 @@ _class = "nixos"; imports = [ + # keep-sorted start ../base - ./boot + ./catppuccin.nix + ./emulation.nix ./environment + ./extras.nix ./hardware + ./headless.nix ./networking + ./nix.nix ./programs ./security ./services ./system - ./catppuccin.nix - ./emulation.nix - ./extras.nix - ./headless.nix - ./nix.nix + # keep-sorted end ]; } diff --git a/modules/nixos/environment/default.nix b/modules/nixos/environment/default.nix index 3cfcd9a2..efb5bb20 100644 --- a/modules/nixos/environment/default.nix +++ b/modules/nixos/environment/default.nix @@ -1,5 +1,6 @@ { imports = [ + # keep-sorted start ./console.nix # changes to the console ./documentation.nix # nixos' provided documentation ./fonts.nix # fonts @@ -8,5 +9,6 @@ ./wayland.nix # wayland settings ./xdg.nix # move everything to nice placee ./zram.nix # zram optimisation and enabling + # keep-sorted end ]; } diff --git a/modules/nixos/extras.nix b/modules/nixos/extras.nix index 16da2d1c..b3eda650 100644 --- a/modules/nixos/extras.nix +++ b/modules/nixos/extras.nix @@ -1,7 +1,9 @@ { inputs, ... }: { imports = [ - inputs.tgirlpkgs.nixosModules.default + # keep-sorted start inputs.home-manager.nixosModules.home-manager + inputs.tgirlpkgs.nixosModules.default + # keep-sorted end ]; } diff --git a/modules/nixos/hardware/cloud/default.nix b/modules/nixos/hardware/cloud/default.nix index 14f6b1b7..0731136b 100644 --- a/modules/nixos/hardware/cloud/default.nix +++ b/modules/nixos/hardware/cloud/default.nix @@ -1,5 +1,7 @@ { imports = [ + # keep-sorted start ./hetzner + # keep-sorted end ]; } diff --git a/modules/nixos/hardware/cloud/hetzner/default.nix b/modules/nixos/hardware/cloud/hetzner/default.nix index 42bf8fe7..2935d949 100644 --- a/modules/nixos/hardware/cloud/hetzner/default.nix +++ b/modules/nixos/hardware/cloud/hetzner/default.nix @@ -1,7 +1,9 @@ { imports = [ - ./networking.nix + # keep-sorted start ./garden.nix + ./networking.nix ./overrides.nix + # keep-sorted end ]; } diff --git a/modules/nixos/hardware/cpu/default.nix b/modules/nixos/hardware/cpu/default.nix index d530089b..9381e376 100644 --- a/modules/nixos/hardware/cpu/default.nix +++ b/modules/nixos/hardware/cpu/default.nix @@ -4,8 +4,10 @@ let in { imports = [ + # keep-sorted start ./amd.nix ./intel.nix + # keep-sorted end ]; options.garden.device.cpu = mkOption { diff --git a/modules/nixos/hardware/default.nix b/modules/nixos/hardware/default.nix index 85b7e022..05a2a716 100644 --- a/modules/nixos/hardware/default.nix +++ b/modules/nixos/hardware/default.nix @@ -1,16 +1,17 @@ { imports = [ + # keep-sorted start + ./bluetooth.nix # bluetooth ./cloud # abstractions for specific cloud providers ./cpu # cpu specific options - ./gpu # gpu specific options - ./media # sound and video - ./power # power management - - ./bluetooth.nix # bluetooth ./firmwares.nix # firmwares ./fs.nix # filesystem tools + ./gpu # gpu specific options + ./media # sound and video ./options.nix # options to set the cpu and gpu + ./power # power management ./tpm.nix # Trusted Platform Module ./yubikey.nix # yubikey device support and management tools + # keep-sorted end ]; } diff --git a/modules/nixos/hardware/gpu/default.nix b/modules/nixos/hardware/gpu/default.nix index 8b45ff1a..1f5089bd 100644 --- a/modules/nixos/hardware/gpu/default.nix +++ b/modules/nixos/hardware/gpu/default.nix @@ -4,9 +4,11 @@ let in { imports = [ + # keep-sorted start ./amd.nix ./intel.nix ./nvidia.nix + # keep-sorted end ]; options.garden.device.gpu = mkOption { diff --git a/modules/nixos/hardware/media/default.nix b/modules/nixos/hardware/media/default.nix index 187ab111..cc07a3ae 100644 --- a/modules/nixos/hardware/media/default.nix +++ b/modules/nixos/hardware/media/default.nix @@ -1,6 +1,8 @@ { imports = [ + # keep-sorted start ./sound ./video.nix + # keep-sorted end ]; } diff --git a/modules/nixos/hardware/media/sound/default.nix b/modules/nixos/hardware/media/sound/default.nix index 93588a16..4a5ff701 100644 --- a/modules/nixos/hardware/media/sound/default.nix +++ b/modules/nixos/hardware/media/sound/default.nix @@ -1,9 +1,11 @@ { imports = [ + # keep-sorted start + ./noisetorch.nix ./pipewire.nix - ./wireplum.nix ./pulseaudio.nix ./rtkit.nix - ./noisetorch.nix + ./wireplum.nix + # keep-sorted end ]; } diff --git a/modules/nixos/hardware/power/default.nix b/modules/nixos/hardware/power/default.nix index 3cbd4bfb..ea83ac13 100644 --- a/modules/nixos/hardware/power/default.nix +++ b/modules/nixos/hardware/power/default.nix @@ -1,8 +1,10 @@ { imports = [ + # keep-sorted start ./acpid.nix ./auto-cpufreq.nix ./undervolt.nix ./upower.nix + # keep-sorted end ]; } diff --git a/modules/nixos/networking/default.nix b/modules/nixos/networking/default.nix index ec13a618..76e36341 100644 --- a/modules/nixos/networking/default.nix +++ b/modules/nixos/networking/default.nix @@ -8,6 +8,7 @@ let in { imports = [ + # keep-sorted start ./blocker.nix ./fail2ban.nix ./firewall.nix @@ -18,6 +19,7 @@ in ./tailscale.nix ./tcpcrypt.nix ./wireless.nix + # keep-sorted end ]; networking = { diff --git a/modules/nixos/programs/default.nix b/modules/nixos/programs/default.nix index 3bb1cd4d..f113a365 100644 --- a/modules/nixos/programs/default.nix +++ b/modules/nixos/programs/default.nix @@ -1,8 +1,10 @@ { imports = [ + # keep-sorted start ./cosmic.nix ./fht-comp.nix ./graphical.nix ./hyprland.nix + # keep-sorted end ]; } diff --git a/modules/nixos/security/default.nix b/modules/nixos/security/default.nix index 8b0c3c74..c6743e71 100644 --- a/modules/nixos/security/default.nix +++ b/modules/nixos/security/default.nix @@ -2,11 +2,13 @@ # https://github.com/fort-nix/nix-bitcoin/blob/master/modules/presets/hardened-extended.nix { imports = [ + # keep-sorted start ./apparmor.nix # apparmor ./auditd.nix # auditd ./kernel.nix # kernel hardening ./pam.nix # pam configuration ./polkit.nix # polkit configuration ./sudo.nix # sudo rules and configuration + # keep-sorted end ]; } diff --git a/modules/nixos/services/default.nix b/modules/nixos/services/default.nix index 2d85b865..faa7f698 100644 --- a/modules/nixos/services/default.nix +++ b/modules/nixos/services/default.nix @@ -1,45 +1,34 @@ { imports = [ - # databases - ./postgresql.nix - ./redis.nix - - # dev - ./atuin.nix - ./forgejo.nix - ./wakapi.nix - - # media + # keep-sorted start ./akkoma - ./nixpkgs-prs-bot.nix - ./matrix.nix - ./syncthing.nix - - # monitoring - ./grafana - ./loki.nix - ./prometheus.nix - ./uptime-kuma.nix - - # networking - ./headscale.nix - ./nginx.nix - ./cloudflared.nix - - # nix builds - ./attic.nix # ./buildbot.nix - - # misc ./anubis.nix + ./attic.nix + ./atuin.nix ./blahaj.nix + ./cloudflared.nix + ./forgejo.nix + ./grafana + ./headscale.nix ./kanidm.nix + ./loki.nix ./mailserver.nix + ./matrix.nix ./mediawiki.nix + ./nginx.nix + ./nixpkgs-prs-bot.nix + ./ntfy.nix + ./photoprism.nix + ./postgresql.nix + ./prometheus.nix + ./redis.nix + ./syncthing.nix + ./uptime-kuma.nix ./vaultwarden.nix ./vikunja.nix + ./wakapi.nix ./website.nix - ./ntfy.nix - ./photoprism.nix + # keep-sorted end ]; } diff --git a/modules/nixos/system/default.nix b/modules/nixos/system/default.nix index 1b38d28d..e1bfc3d8 100644 --- a/modules/nixos/system/default.nix +++ b/modules/nixos/system/default.nix @@ -1,13 +1,14 @@ { imports = [ + # keep-sorted start ./command-not-found.nix ./earlyoom.nix ./firmware.nix ./flatpak.nix ./gnome.nix ./location.nix - ./logind.nix ./loginManager.nix + ./logind.nix ./logs.nix ./misc.nix ./monitoring.nix @@ -22,5 +23,6 @@ ./terminfo.nix ./xdg-portals.nix ./xserver.nix + # keep-sorted end ]; } diff --git a/modules/wsl/default.nix b/modules/wsl/default.nix index b0010fe6..c16b73b6 100644 --- a/modules/wsl/default.nix +++ b/modules/wsl/default.nix @@ -10,9 +10,10 @@ let in { imports = [ - ../nixos - + # keep-sorted start prefix_order=inputs,./ inputs.nixos-wsl.nixosModules.wsl + ../nixos + # keep-sorted end ]; config = { diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 046afa11..dfdbf1b2 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -5,14 +5,17 @@ let }; hosts = { + # keep-sorted start block=yes newline_separated=yes amaterasu = { key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIASfhQoMiEvoVa6mat4SvozopTTpLjCwRaJvze7IFE1S"; owner = "isabel"; }; + athena = { key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKMJroewVs8Iyf+/Ofk6q36D1OzVW0b04yyS3IVwNmCb"; owner = "isabel"; }; + # bmo = { # key = ""; # owner = "robin"; @@ -25,26 +28,32 @@ let key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFNJv2ng+BJV2YDWAmaWFu7arLrsT2jpshUPTvdHBlxN"; owner = "isabel"; }; + minerva = { key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFluIN96lPhNvf2JsA2E+HjuQbDseD2sQJOgQbspJWW0"; owner = "isabel"; }; + + skadi = { + key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIweAtbmV58yEMT1oioHt6PBezpUa42Ma2PZoZvWvc4Z"; + owner = "isabel"; + }; + tatsumaki = { key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEFK5AFIUzlIoFmyz5/Ni1F3Xj1tppj/pMXD9GfMP4DV"; owner = "isabel"; }; + valkyrie = { key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAn1inws4uXxbv72IHphlLAVlmsaln2szDRsdlM0g7Hu"; owner = "isabel"; }; - skadi = { - key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIweAtbmV58yEMT1oioHt6PBezpUa42Ma2PZoZvWvc4Z"; - owner = "isabel"; - }; + wisp = { key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC7cduddxQbnFeBWjt9L6Uml5mjnfEOxZqd4LoyRDTmg"; owner = "robin"; }; + # keep-sorted end }; types = with hosts; { diff --git a/systems/default.nix b/systems/default.nix index 69d23c0f..44fee574 100644 --- a/systems/default.nix +++ b/systems/default.nix @@ -23,38 +23,43 @@ # specialArgs = { }; hosts = { # isabel's hosts + # keep-sorted start block=yes newline_separated=yes amaterasu = { }; + athena = { }; - tatsumaki = { - arch = "aarch64"; - class = "darwin"; - }; + hestia = { }; - valkyrie = { - class = "wsl"; + lilith = { + class = "iso"; }; minerva = { }; - hestia = { }; - skadi = { arch = "aarch64"; }; - lilith = { - class = "iso"; + tatsumaki = { + arch = "aarch64"; + class = "darwin"; }; - # robin's hosts - cottage = { }; + valkyrie = { + class = "wsl"; + }; + # keep-sorted end + # robin's hosts + # keep-sorted start block=yes newline_separated=yes bmo = { }; + cottage = { }; + wisp = { class = "wsl"; }; + # keep-sorted end }; }; }