diff --git a/.github/actions/install-lix/action.yml b/.github/actions/install-lix/action.yml deleted file mode 100644 index c41afc1..0000000 --- a/.github/actions/install-lix/action.yml +++ /dev/null @@ -1,17 +0,0 @@ -# Taken from: https://github.com/isabelroses/dotfiles/blob/9335e5728eaaa9bdcb0d5c3130a5d7c8dddbb6e3/.github/actions/install-lix/action.yml :3 -name: Install Lix -description: "Install Lix for the specified system" - -runs: - using: composite - - steps: - - uses: DeterminateSystems/nix-installer-action@main - with: - source-url: 'https://install.lix.systems/lix/lix-installer-${{ fromJSON(''{"X64":"x86_64","X86":"i686","ARM64":"aarch64","ARM":"armv7l"}'')[runner.arch] }}-${{ fromJSON(''{"Linux":"linux","macOS":"darwin","Windows":"windows"}'')[runner.os] }}' - logger: pretty - diagnostic-endpoint: "" - extra-conf: | - experimental-features = flakes nix-command - substituters = https://nix-community.cachix.org https://catppuccin.cachix.org https://cache.nixos.org/ - trusted-public-keys = nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs= catppuccin.cachix.org-1:noG/4HkbhJb+lUAdKrph6LaozJvAeEEZj4N732IysmU= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100644 index 6ee53fd..0000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -1,34 +0,0 @@ -name: "Nix: build and cache outputs" - -on: - workflow_dispatch: - push: - paths: - - "**.nix" - - "**.lock" - - ".github/workflows/build.yml" - -jobs: - build-flake: - name: Build (x86_64-linux) - runs-on: ubuntu-latest - - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - ref: ${{ github.ref_name }} - persist-credentials: false - - - name: Install Lix - uses: ./.github/actions/install-lix - - - name: Setup Attic cache - uses: ryanccn/attic-action@v0.3.2 - with: - endpoint: https://cache.thevoid.cafe - cache: puzzlevision - token: ${{ secrets.ATTIC_TOKEN }} - - - name: Build flake - run: nix build .#nixosConfigurations.puzzlevision.config.system.build.toplevel --accept-flake-config diff --git a/flake.lock b/flake.lock index 87de884..21c0b0a 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1748080874, - "narHash": "sha256-sUebEzAkrY8Aq5G0GHFyRddmRNGP/a2iTtV7ISNvi/c=", + "lastModified": 1747519437, + "narHash": "sha256-uv9Wv59d+mckS2CkorOF484wp2G5TNGijdoBZ5RkAk0=", "owner": "catppuccin", "repo": "nix", - "rev": "0ba11b12be81f0849a89ed17ab635164ea8f0112", + "rev": "3ba714046ee32373e88166e6e9474d6ae6a5b734", "type": "github" }, "original": { @@ -76,11 +76,11 @@ ] }, "locked": { - "lastModified": 1748182899, - "narHash": "sha256-r6MHSalDFydlUmjorVTSsyhLjIt8VWNtGc5+mffXvFQ=", + "lastModified": 1747955385, + "narHash": "sha256-AKoBFaEGN02tGvBlkwVIDOGXouHvrTTfOUcvBDGxkxQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "901f8fef7f349cf8a8e97b3230b22fd592df9160", + "rev": "a868570581f0dbdef7e33c8c9bb34b735dfcbacf", "type": "github" }, "original": { @@ -118,11 +118,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1748137719, - "narHash": "sha256-yBiIy+eb0QxYoIOzOY7QyjqXY5PiLgIoNbFtg4SbUH8=", + "lastModified": 1747878048, + "narHash": "sha256-kAR4Ox+vShPzsUar/1rHarRgUBPpm7hxwi7sIffNYa4=", "owner": "kaylorben", "repo": "nixcord", - "rev": "c4d7ccc9ae9fc1c46820bdc5b800b4f66e972ccc", + "rev": "5f737debf65b8409392604098a7489d997746450", "type": "github" }, "original": { @@ -149,11 +149,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1748026106, - "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", + "lastModified": 1747744144, + "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", + "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index dc8e0f4..9a17351 100644 --- a/flake.nix +++ b/flake.nix @@ -48,14 +48,13 @@ }; }; - outputs = - { flake-parts, ... }@inputs: - flake-parts.lib.mkFlake { inherit inputs; } { + outputs = {flake-parts, ...} @ inputs: + flake-parts.lib.mkFlake {inherit inputs;} { imports = [ ./modules/flake ]; - systems = [ "x86_64-linux" ]; + systems = ["x86_64-linux"]; flake = { # Exposing the flake namespace namespace = "puzzlevision"; diff --git a/homes/x86_64-linux/cyn/default.nix b/homes/x86_64-linux/cyn/default.nix index 7caf5cd..f2b8274 100644 --- a/homes/x86_64-linux/cyn/default.nix +++ b/homes/x86_64-linux/cyn/default.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -{ +{pkgs, ...}: { home.packages = with pkgs; [ ### Tools git diff --git a/homes/x86_64-linux/jo/apps/discord/default.nix b/homes/x86_64-linux/jo/apps/discord/default.nix index a872828..dfa7e9a 100644 --- a/homes/x86_64-linux/jo/apps/discord/default.nix +++ b/homes/x86_64-linux/jo/apps/discord/default.nix @@ -2,11 +2,9 @@ lib, config, ... -}: -let +}: let inherit (lib) mkIf; -in -{ +in { # Enable arRPC for discord Rich Presence stuffs services.arrpc.enable = true; diff --git a/homes/x86_64-linux/jo/apps/youtube-music/default.nix b/homes/x86_64-linux/jo/apps/youtube-music/default.nix index 19b7b11..0778d00 100644 --- a/homes/x86_64-linux/jo/apps/youtube-music/default.nix +++ b/homes/x86_64-linux/jo/apps/youtube-music/default.nix @@ -4,11 +4,9 @@ osConfig, namespace, ... -}: -let +}: let inherit (lib) mkIf; -in -{ +in { programs.youtube-music = { enable = true; options = { diff --git a/homes/x86_64-linux/jo/default.nix b/homes/x86_64-linux/jo/default.nix index 3d7ccf8..6fee357 100644 --- a/homes/x86_64-linux/jo/default.nix +++ b/homes/x86_64-linux/jo/default.nix @@ -2,8 +2,7 @@ pkgs, config, ... -}: -{ +}: { imports = [ ./apps/discord ./apps/youtube-music diff --git a/lib/module/default.nix b/lib/module/default.nix index f0cf18c..61c73ae 100644 --- a/lib/module/default.nix +++ b/lib/module/default.nix @@ -2,35 +2,30 @@ lib, self, ... -}: -{ +}: { # Create a NixOS module option on a single line. - mkOpt = - type: default: description: - lib.mkOption { inherit type default description; }; + mkOpt = type: default: description: + lib.mkOption {inherit type default description;}; # Create a simple bool options - mkBool = - default: description: + mkBool = default: description: lib.mkOption { inherit default description; type = lib.types.bool; }; # Create a module compliant with the NixOS module system. - mkModule = - { - name ? "puzzlevision", - class, - modules, - }: - { - _class = class; - # Template: "[path-to-flake]/flake.nix#[class-name]Modules.[module-name]" - # Example: "[path-to-flake]/flake.nix#nixosModules.system.audio" - _file = "${self.outPath}/flake.nix#${class}Modules.${name}"; - imports = modules; - }; + mkModule = { + name ? "puzzlevision", + class, + modules, + }: { + _class = class; + # Template: "[path-to-flake]/flake.nix#[class-name]Modules.[module-name]" + # Example: "[path-to-flake]/flake.nix#nixosModules.system.audio" + _file = "${self.outPath}/flake.nix#${class}Modules.${name}"; + imports = modules; + }; # TODO: add mkIfElse function } diff --git a/modules/flake/lib.nix b/modules/flake/lib.nix index 93bcb54..88c442a 100644 --- a/modules/flake/lib.nix +++ b/modules/flake/lib.nix @@ -2,64 +2,48 @@ lib, self, ... -}: -let +}: let # Utility function to read a directory and return its contents. readDirectory = directory: builtins.readDir directory; # Utility function to handle each filesystem entity (file or directory). - filesystemEntityToAttrSet = - directory: importArgs: name: type: - if type == "directory" then - dirToAttrSet "${directory}/${name}" importArgs - else if name == "default.nix" then - import "${directory}/${name}" importArgs - else - { }; + filesystemEntityToAttrSet = directory: importArgs: name: type: + if type == "directory" + then dirToAttrSet "${directory}/${name}" importArgs + else if name == "default.nix" + then import "${directory}/${name}" importArgs + else {}; - filesystemEntityToList = - directory: name: type: - if type == "directory" then - dirToModuleList "${directory}/${name}" - else if name == "default.nix" then - [ "${directory}/${name}" ] - else - [ ]; + filesystemEntityToList = directory: name: type: + if type == "directory" + then dirToModuleList "${directory}/${name}" + else if name == "default.nix" + then ["${directory}/${name}"] + else []; - dirToModuleList = - directory: - let - readDir = readDirectory directory; - in + dirToModuleList = directory: let + readDir = readDirectory directory; + in builtins.foldl' ( - acc: name: acc ++ (filesystemEntityToList directory name (builtins.getAttr name readDir)) - ) [ ] (builtins.attrNames readDir); + acc: name: + acc ++ (filesystemEntityToList directory name (builtins.getAttr name readDir)) + ) [] (builtins.attrNames readDir); # Utility function to recursively load modules from a directory. - dirToAttrSet = - directory: importArgs: - let - # Read provided directory only once at the very start and save the result. - readDir = readDirectory directory; - in + dirToAttrSet = directory: importArgs: let + # Read provided directory only once at the very start and save the result. + readDir = readDirectory directory; + in # Iterate over the attr names of a readDir operation. builtins.foldl' ( acc: name: # Merge outputs of handling a filesystem entity (file or directory) into accumulator. # Files return attribute sets with their resulting expressions, directories return the result of multiple file handling operations. - acc // (filesystemEntityToAttrSet directory importArgs name (builtins.getAttr name readDir)) - ) { } (builtins.attrNames readDir); + acc // (filesystemEntityToAttrSet directory importArgs name (builtins.getAttr name readDir)) + ) {} (builtins.attrNames readDir); - puzzlelib = dirToAttrSet ../../lib { inherit lib self; } // { - inherit - dirToAttrSet - dirToModuleList - filesystemEntityToList - filesystemEntityToAttrSet - ; - }; -in -{ + puzzlelib = dirToAttrSet ../../lib {inherit lib self;} // {inherit dirToAttrSet dirToModuleList filesystemEntityToList filesystemEntityToAttrSet;}; +in { # Expose custom library on flake "lib" output flake.lib = puzzlelib; } diff --git a/modules/flake/modules.nix b/modules/flake/modules.nix index a9448b8..1952945 100644 --- a/modules/flake/modules.nix +++ b/modules/flake/modules.nix @@ -1,5 +1,4 @@ -{ self, ... }: -{ +{self, ...}: { flake = { # TODO: figure out why this isn't working correctly nixosModules.puzzlevision = self.lib.mkModule { diff --git a/modules/flake/systems.nix b/modules/flake/systems.nix index fd0220e..97be68f 100644 --- a/modules/flake/systems.nix +++ b/modules/flake/systems.nix @@ -3,8 +3,7 @@ self, inputs, ... -}: -{ +}: { imports = [ inputs.easy-hosts.flakeModule ]; diff --git a/modules/home/apps/zed/default.nix b/modules/home/apps/zed/default.nix index 2673203..1c948ad 100644 --- a/modules/home/apps/zed/default.nix +++ b/modules/home/apps/zed/default.nix @@ -4,14 +4,12 @@ self, config, ... -}: -let +}: let inherit (lib) mkEnableOption mkIf mkForce; inherit (self) namespace; cfg = config.${namespace}.apps.zed; -in -{ +in { options.${namespace}.apps.zed = { enable = mkEnableOption "zed, the graphical editor from the future"; }; @@ -69,14 +67,11 @@ in ### Language specific configurations languages = { Nix = { - language_servers = [ - "nixd" - "!nil" - ]; + language_servers = ["nixd" "!nil"]; formatter = { external = { - command = "nixfmt"; - arguments = [ "--quiet" ]; + command = "alejandra"; + arguments = ["--quiet"]; }; }; }; @@ -128,7 +123,6 @@ in ### Nix nixd alejandra - nixfmt-rfc-style ### Python python3Packages.python-lsp-server diff --git a/modules/home/desktop/gnome/default.nix b/modules/home/desktop/gnome/default.nix index 5c51b55..aa5eeae 100644 --- a/modules/home/desktop/gnome/default.nix +++ b/modules/home/desktop/gnome/default.nix @@ -5,44 +5,24 @@ config, osConfig, ... -}: -let +}: let inherit (lib) mkIf mkOption; inherit (self) namespace; inherit (self.lib) mkOpt; cfg = config.${namespace}.desktop.gnome; -in -{ +in { options.${namespace}.desktop.gnome = with lib.types; { enabled-extensions = mkOption { type = listOf package; - default = with pkgs.gnomeExtensions; [ - user-themes - blur-my-shell - appindicator - unite - color-picker - clipboard-history - ]; - example = [ - dash-to-dock - blur-my-shell - ]; + default = with pkgs.gnomeExtensions; [user-themes blur-my-shell appindicator unite color-picker clipboard-history]; + example = [dash-to-dock blur-my-shell]; description = "Specify gnome extensions to install."; }; favorite-apps = mkOption { type = listOf str; - default = [ - "org.gnome.Nautilus.desktop" - "obsidian.desktop" - "firefox.desktop" - "dev.zed.Zed.desktop" - ]; - example = [ - "org.gnome.Nautilus.desktop" - "obsidian.desktop" - ]; + default = ["org.gnome.Nautilus.desktop" "obsidian.desktop" "firefox.desktop" "dev.zed.Zed.desktop"]; + example = ["org.gnome.Nautilus.desktop" "obsidian.desktop"]; description = "Specify your favorite apps (sorted left to right)."; }; extensions = { @@ -64,9 +44,7 @@ in enable-blur = mkOpt bool false "Whether to enable blur-my-shell application blur."; }; }; - wallpaper = - mkOpt str (builtins.toString ../wallpapers/catppuccin/howard-chen-mao-mao-forest-campsite.jpg) - "Specify the path of your prefered Gnome wallpaper."; + wallpaper = mkOpt str (builtins.toString ../wallpapers/catppuccin/howard-chen-mao-mao-forest-campsite.jpg) "Specify the path of your prefered Gnome wallpaper."; }; config = mkIf osConfig.${namespace}.desktop.gnome.enable { @@ -76,35 +54,31 @@ in "org/gnome/shell" = { favorite-apps = cfg.favorite-apps; enabled-extensions = lib.forEach cfg.enabled-extensions (x: x.extensionUuid); - disabled-extensions = [ ]; # Make sure none of our extensions are disabled on system rebuild + disabled-extensions = []; # Make sure none of our extensions are disabled on system rebuild }; - "org/gnome/shell/extensions/unite" = - mkIf (builtins.elem pkgs.gnomeExtensions.unite cfg.enabled-extensions) - { - show-window-buttons = cfg.extensions.unite.show-window-buttons; - hide-window-titlebars = cfg.extensions.unite.hide-window-titlebars; + "org/gnome/shell/extensions/unite" = mkIf (builtins.elem pkgs.gnomeExtensions.unite cfg.enabled-extensions) { + show-window-buttons = cfg.extensions.unite.show-window-buttons; + hide-window-titlebars = cfg.extensions.unite.hide-window-titlebars; - use-activities-text = false; - extend-left-box = false; - reduce-panel-spacing = false; - show-legacy-tray = false; - show-appmenu-button = false; - show-desktop-name = false; - enable-titlebar-actions = false; - restrict-to-primary-screen = false; - hide-activities-button = "never"; - autofocus-windows = true; - notifications-position = "right"; - }; - "org/gnome/shell/extensions/blur-my-shell/applications" = - mkIf cfg.extensions.blur-my-shell.enable-blur - { - blur = true; - sigma = 30; - opacity = 230; - enable-all = true; - dynamic-opacity = false; - }; + use-activities-text = false; + extend-left-box = false; + reduce-panel-spacing = false; + show-legacy-tray = false; + show-appmenu-button = false; + show-desktop-name = false; + enable-titlebar-actions = false; + restrict-to-primary-screen = false; + hide-activities-button = "never"; + autofocus-windows = true; + notifications-position = "right"; + }; + "org/gnome/shell/extensions/blur-my-shell/applications" = mkIf cfg.extensions.blur-my-shell.enable-blur { + blur = true; + sigma = 30; + opacity = 230; + enable-all = true; + dynamic-opacity = false; + }; "org/gnome/desktop/background" = { picture-uri = cfg.wallpaper; picture-uri-dark = cfg.wallpaper; diff --git a/modules/home/security/sops/default.nix b/modules/home/security/sops/default.nix index 0ce8af4..e5a1245 100644 --- a/modules/home/security/sops/default.nix +++ b/modules/home/security/sops/default.nix @@ -1,5 +1,4 @@ -{ config, ... }: -{ +{config, ...}: { sops = { age.keyFile = "/home/${config.home.username}/sops-nix/key.txt"; }; diff --git a/modules/home/themes/catppuccin/default.nix b/modules/home/themes/catppuccin/default.nix index 5701390..11b0ccf 100644 --- a/modules/home/themes/catppuccin/default.nix +++ b/modules/home/themes/catppuccin/default.nix @@ -6,25 +6,19 @@ osConfig, namespace, ... -}: -let +}: let inherit (lib) mkEnableOption types mkIf; inherit (self.lib) mkOpt; - palette = - (pkgs.lib.importJSON (config.catppuccin.sources.palette + "/palette.json")) - .${config.catppuccin.flavor}.colors; + palette = (pkgs.lib.importJSON (config.catppuccin.sources.palette + "/palette.json")).${config.catppuccin.flavor}.colors; cfg = config.${namespace}.themes.catppuccin; -in -{ +in { options.${namespace}.themes.catppuccin = { enable = mkEnableOption "the Catppuccin theme, globally."; accent = mkOpt types.str "blue" "The accent colour to use."; flavor = mkOpt types.str "macchiato" "The flavor to use."; - palette = - mkOpt (lib.types.attrsOf lib.types.raw) palette - "a reference to the current active Catppuccin palette."; + palette = mkOpt (lib.types.attrsOf lib.types.raw) palette "a reference to the current active Catppuccin palette."; }; config = mkIf cfg.enable { diff --git a/modules/home/themes/catppuccin/gtk/default.nix b/modules/home/themes/catppuccin/gtk/default.nix index 7790892..e172ca4 100644 --- a/modules/home/themes/catppuccin/gtk/default.nix +++ b/modules/home/themes/catppuccin/gtk/default.nix @@ -4,8 +4,7 @@ config, namespace, ... -}: -let +}: let inherit (lib) mkEnableOption mkIf; catppuccinCfg = config.${namespace}.themes.catppuccin; @@ -105,19 +104,16 @@ let }; cfg = config.${namespace}.themes.catppuccin.gtk; -in -{ - options.${namespace}.themes.catppuccin.gtk = { - enable = mkEnableOption "Enable the Catppuccin theme for GTK"; - }; +in { + options.${namespace}.themes.catppuccin.gtk = {enable = mkEnableOption "Enable the Catppuccin theme for GTK";}; config = mkIf cfg.enable { home.packages = with pkgs; [ (colloid-gtk-theme.override { - themeVariants = [ "default" ]; - colorVariants = [ "dark" ]; - sizeVariants = [ "standard" ]; - tweaks = [ "catppuccin" ]; + themeVariants = ["default"]; + colorVariants = ["dark"]; + sizeVariants = ["standard"]; + tweaks = ["catppuccin"]; }) ]; diff --git a/modules/nixos/archetypes/laptop/default.nix b/modules/nixos/archetypes/laptop/default.nix index 4ffa836..7610b69 100644 --- a/modules/nixos/archetypes/laptop/default.nix +++ b/modules/nixos/archetypes/laptop/default.nix @@ -3,14 +3,12 @@ self, config, ... -}: -let +}: let inherit (lib) mkEnableOption mkIf; inherit (self) namespace; cfg = config.${namespace}.archetypes.laptop; -in -{ +in { options.${namespace}.archetypes.laptop = { enable = mkEnableOption "the laptop archetype."; }; diff --git a/modules/nixos/archetypes/server/default.nix b/modules/nixos/archetypes/server/default.nix index a4b35d8..4ee1041 100644 --- a/modules/nixos/archetypes/server/default.nix +++ b/modules/nixos/archetypes/server/default.nix @@ -3,14 +3,12 @@ self, config, ... -}: -let +}: let inherit (lib) mkEnableOption mkIf; inherit (self) namespace; cfg = config.${namespace}.archetypes.server; -in -{ +in { options.${namespace}.archetypes.server = { enable = mkEnableOption "the server archetype for your current system"; }; diff --git a/modules/nixos/archetypes/workstation/default.nix b/modules/nixos/archetypes/workstation/default.nix index e5db636..c8985ed 100644 --- a/modules/nixos/archetypes/workstation/default.nix +++ b/modules/nixos/archetypes/workstation/default.nix @@ -4,14 +4,12 @@ pkgs, config, ... -}: -let +}: let inherit (lib) mkEnableOption mkIf mkDefault; inherit (self) namespace; cfg = config.${namespace}.archetypes.workstation; -in -{ +in { options.${namespace}.archetypes.workstation = { enable = mkEnableOption "the workstation archetype."; }; diff --git a/modules/nixos/desktop/gnome/default.nix b/modules/nixos/desktop/gnome/default.nix index c0c3ec2..0cac5cf 100644 --- a/modules/nixos/desktop/gnome/default.nix +++ b/modules/nixos/desktop/gnome/default.nix @@ -4,14 +4,12 @@ self, config, ... -}: -let +}: let inherit (lib) mkEnableOption mkIf; inherit (self) namespace; cfg = config.${namespace}.desktop.gnome; -in -{ +in { options.${namespace}.desktop.gnome = { enable = mkEnableOption "the gnome desktop environment"; }; diff --git a/modules/nixos/services/atticd/default.nix b/modules/nixos/services/atticd/default.nix index de11700..f4acb99 100644 --- a/modules/nixos/services/atticd/default.nix +++ b/modules/nixos/services/atticd/default.nix @@ -3,22 +3,18 @@ self, config, ... -}: -let +}: let inherit (lib) mkEnableOption mkIf types; inherit (self) namespace; inherit (self.lib) mkOpt; cfg = config.${namespace}.services.atticd; -in -{ +in { options.${namespace}.services.atticd = { enable = mkEnableOption "the attic service, a multi-tenant nix binary cache."; sopsFile = mkOpt types.path null "The location of the sops secret file for the Atticd service."; sopsFormat = mkOpt types.str null "The format of the sops secret file for the Atticd service."; - subdomain = - mkOpt types.str "cache" - "The subdomain, of the system domain, the service should be exposed on."; + subdomain = mkOpt types.str "cache" "The subdomain, of the system domain, the service should be exposed on."; }; config = mkIf cfg.enable { @@ -34,7 +30,7 @@ in settings = { listen = "[::]:3900"; - jwt = { }; + jwt = {}; chunking = { nar-size-threshold = 64 * 1024; # 64 KiB @@ -54,9 +50,9 @@ in services.traefik.dynamicConfigOptions = { http = { - services.atticd.loadBalancer.servers = [ { url = "http://localhost:3900"; } ]; + services.atticd.loadBalancer.servers = [{url = "http://localhost:3900";}]; routers.atticd = { - entryPoints = [ "websecure" ]; + entryPoints = ["websecure"]; service = "atticd"; rule = "Host(`${cfg.subdomain}.${config.${namespace}.services.domain}`)"; }; diff --git a/modules/nixos/services/default.nix b/modules/nixos/services/default.nix index 4c62bff..9aa339a 100644 --- a/modules/nixos/services/default.nix +++ b/modules/nixos/services/default.nix @@ -2,17 +2,13 @@ lib, self, ... -}: -let +}: let inherit (lib) types; inherit (self) namespace; inherit (self.lib) mkOpt; -in -{ +in { options.${namespace}.services = { domain = mkOpt types.str "thevoid.cafe" "The main system domain, used for exposing services."; - mail = - mkOpt types.str "system@thevoid.cafe" - "The main system administration E-Mail, used for logs and services."; + mail = mkOpt types.str "system@thevoid.cafe" "The main system administration E-Mail, used for logs and services."; }; } diff --git a/modules/nixos/services/docker/default.nix b/modules/nixos/services/docker/default.nix index 2d115f1..346bc08 100644 --- a/modules/nixos/services/docker/default.nix +++ b/modules/nixos/services/docker/default.nix @@ -3,14 +3,12 @@ self, config, ... -}: -let +}: let inherit (lib) mkIf mkEnableOption; inherit (self) namespace; cfg = config.${namespace}.services.docker; -in -{ +in { options.${namespace}.services.docker = { enable = mkEnableOption "the docker service."; }; diff --git a/modules/nixos/services/duckdns/default.nix b/modules/nixos/services/duckdns/default.nix index fe48ee4..c419804 100644 --- a/modules/nixos/services/duckdns/default.nix +++ b/modules/nixos/services/duckdns/default.nix @@ -3,15 +3,13 @@ self, config, ... -}: -let +}: let inherit (lib) mkEnableOption mkIf types; inherit (self) namespace; inherit (self.lib) mkOpt; cfg = config.${namespace}.services.duckdns; -in -{ +in { options.${namespace}.services.duckdns = { enable = mkEnableOption "DuckDNS, the dynamic dns service. Will periodically refresh your IP."; sopsFile = mkOpt types.path null "The location of the sops secret file for the DuckDNS service."; diff --git a/modules/nixos/services/home-manager/default.nix b/modules/nixos/services/home-manager/default.nix index 81aa8cc..017f26a 100644 --- a/modules/nixos/services/home-manager/default.nix +++ b/modules/nixos/services/home-manager/default.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +{...}: { # Todo: rewrite as recursive operation, based on ${namespace}.users system.userActivationScripts = { removeConflictingHomeManagerBackups = { diff --git a/modules/nixos/services/homepage/default.nix b/modules/nixos/services/homepage/default.nix index 9c98141..b51a220 100644 --- a/modules/nixos/services/homepage/default.nix +++ b/modules/nixos/services/homepage/default.nix @@ -3,23 +3,17 @@ self, config, ... -}: -let +}: let inherit (lib) mkEnableOption mkIf types; inherit (self) namespace; inherit (self.lib) mkOpt; cfg = config.${namespace}.services.homepage; -in -{ +in { options.${namespace}.services.homepage = { enable = mkEnableOption "Homepage, an intuitive dashboard for your services."; - subdomain = - mkOpt types.str "home" - "The subdomain, of the system domain, the service should be exposed on."; - configDir = - mkOpt types.path null - "The config directory, which will be copied to the Homepage directory during compilation."; + subdomain = mkOpt types.str "home" "The subdomain, of the system domain, the service should be exposed on."; + configDir = mkOpt types.path null "The config directory, which will be copied to the Homepage directory during compilation."; }; config = mkIf cfg.enable { @@ -41,9 +35,7 @@ in labels = { "traefik.enable" = "true"; "traefik.http.routers.homepage.entrypoints" = "websecure"; - "traefik.http.routers.homepage.rule" = "Host(`${cfg.subdomain}.${ - config.${namespace}.services.domain - }`)"; + "traefik.http.routers.homepage.rule" = "Host(`${cfg.subdomain}.${config.${namespace}.services.domain}`)"; "traefik.http.services.homepage.loadbalancer.server.port" = "3000"; }; volumes = [ @@ -56,7 +48,7 @@ in environment = { "HOMEPAGE_ALLOWED_HOSTS" = "${cfg.subdomain}.${config.${namespace}.services.domain}"; }; - extraOptions = [ "--network=proxy" ]; + extraOptions = ["--network=proxy"]; }; }; } diff --git a/modules/nixos/services/traefik/default.nix b/modules/nixos/services/traefik/default.nix index 84a9dbe..454751e 100644 --- a/modules/nixos/services/traefik/default.nix +++ b/modules/nixos/services/traefik/default.nix @@ -3,15 +3,13 @@ self, config, ... -}: -let +}: let inherit (lib) mkEnableOption mkIf types; inherit (self) namespace; inherit (self.lib) mkOpt; cfg = config.${namespace}.services.traefik; -in -{ +in { options.${namespace}.services.traefik = { enable = mkEnableOption "the Traefik service."; sopsFile = mkOpt types.path null "The location of the sops secret file for the Traefik service."; @@ -19,11 +17,7 @@ in }; config = mkIf cfg.enable { - networking.firewall.allowedTCPPorts = [ - 80 - 8080 - 443 - ]; # http, dashboard, https + networking.firewall.allowedTCPPorts = [80 8080 443]; # http, dashboard, https sops.secrets."services/traefik" = { sopsFile = cfg.sopsFile; @@ -32,7 +26,7 @@ in systemd.services.traefik = { serviceConfig = { - EnvironmentFile = [ config.sops.secrets."services/traefik".path ]; + EnvironmentFile = [config.sops.secrets."services/traefik".path]; }; }; @@ -90,11 +84,11 @@ in domains = [ { main = "thevoid.cafe"; - sans = [ "*.thevoid.cafe" ]; + sans = ["*.thevoid.cafe"]; } { main = "rhysbot.co.uk"; - sans = [ "*.rhysbot.co.uk" ]; + sans = ["*.rhysbot.co.uk"]; } ]; }; diff --git a/modules/nixos/services/vaultwarden/default.nix b/modules/nixos/services/vaultwarden/default.nix index 858c770..1725ade 100644 --- a/modules/nixos/services/vaultwarden/default.nix +++ b/modules/nixos/services/vaultwarden/default.nix @@ -3,24 +3,18 @@ self, config, ... -}: -let +}: let inherit (lib) mkEnableOption mkIf types; inherit (self) namespace; inherit (self.lib) mkOpt; cfg = config.${namespace}.services.vaultwarden; -in -{ +in { options.${namespace}.services.vaultwarden = { enable = mkEnableOption "Vaultwarden, a self-hostable password manager."; - sopsFile = - mkOpt types.path null - "The location of the sops secret file for the Vaultwarden service."; + sopsFile = mkOpt types.path null "The location of the sops secret file for the Vaultwarden service."; sopsFormat = mkOpt types.str null "The format of the sops secret file for the Vaultwarden service."; - subdomain = - mkOpt types.str "vault" - "The subdomain, of the system domain, the service should be exposed on."; + subdomain = mkOpt types.str "vault" "The subdomain, of the system domain, the service should be exposed on."; }; config = mkIf cfg.enable { @@ -41,9 +35,7 @@ in labels = { "traefik.enable" = "true"; "traefik.http.routers.vaultwarden.entrypoints" = "websecure"; - "traefik.http.routers.vaultwarden.rule" = "Host(`${cfg.subdomain}.${ - config.${namespace}.services.domain - }`)"; + "traefik.http.routers.vaultwarden.rule" = "Host(`${cfg.subdomain}.${config.${namespace}.services.domain}`)"; }; volumes = [ "/var/lib/containers/vaultwarden/data:/data:rw" @@ -51,7 +43,7 @@ in environmentFiles = [ config.sops.secrets."services/vaultwarden".path ]; - extraOptions = [ "--network=proxy" ]; + extraOptions = ["--network=proxy"]; }; }; } diff --git a/modules/nixos/system/audio/default.nix b/modules/nixos/system/audio/default.nix index 55859ea..f022058 100644 --- a/modules/nixos/system/audio/default.nix +++ b/modules/nixos/system/audio/default.nix @@ -3,14 +3,12 @@ self, config, ... -}: -let +}: let inherit (lib) mkEnableOption mkIf; inherit (self) namespace; cfg = config.${namespace}.system.audio; -in -{ +in { options.${namespace}.system.audio = { enable = mkEnableOption "system audio support."; }; diff --git a/modules/nixos/system/bluetooth/default.nix b/modules/nixos/system/bluetooth/default.nix index 1fc967c..c5f55df 100644 --- a/modules/nixos/system/bluetooth/default.nix +++ b/modules/nixos/system/bluetooth/default.nix @@ -4,20 +4,18 @@ self, config, ... -}: -let +}: let inherit (lib) mkEnableOption mkIf; inherit (self) namespace; cfg = config.${namespace}.system.bluetooth; -in -{ +in { options.${namespace}.system.bluetooth = { enable = mkEnableOption "bluetooth support."; }; config = mkIf cfg.enable { - environment.systemPackages = with pkgs; [ bluez ]; + environment.systemPackages = with pkgs; [bluez]; hardware.bluetooth = { enable = true; diff --git a/modules/nixos/system/fonts/default.nix b/modules/nixos/system/fonts/default.nix index 2b62601..256cfa5 100644 --- a/modules/nixos/system/fonts/default.nix +++ b/modules/nixos/system/fonts/default.nix @@ -4,14 +4,12 @@ self, config, ... -}: -let +}: let inherit (lib) mkEnableOption mkIf mkOption; inherit (self) namespace; cfg = config.${namespace}.system.fonts; -in -{ +in { options.${namespace}.system.fonts = with lib.types; { enable = mkEnableOption "system font management"; fonts = mkOption { @@ -32,16 +30,13 @@ in material-icons material-design-icons ]; - example = [ - noto-fonts - noto-fonts-emoji - ]; + example = [noto-fonts noto-fonts-emoji]; description = "Install additional font packages"; }; }; config = mkIf cfg.enable { - environment.systemPackages = with pkgs; [ font-manager ]; + environment.systemPackages = with pkgs; [font-manager]; fonts.packages = cfg.fonts; }; diff --git a/modules/nixos/system/grub/default.nix b/modules/nixos/system/grub/default.nix index f7fea39..ef2ab0e 100644 --- a/modules/nixos/system/grub/default.nix +++ b/modules/nixos/system/grub/default.nix @@ -3,14 +3,12 @@ self, config, ... -}: -let +}: let inherit (lib) mkEnableOption mkIf; inherit (self) namespace; cfg = config.${namespace}.system.grub; -in -{ +in { options.${namespace}.system.grub = { enable = mkEnableOption "the grub bootloader."; }; @@ -20,7 +18,7 @@ in boot.loader.grub = { enable = true; - devices = [ "nodev" ]; + devices = ["nodev"]; efiInstallAsRemovable = true; efiSupport = true; diff --git a/modules/nixos/system/kernel/default.nix b/modules/nixos/system/kernel/default.nix index fdb866e..521846d 100644 --- a/modules/nixos/system/kernel/default.nix +++ b/modules/nixos/system/kernel/default.nix @@ -4,20 +4,16 @@ self, config, ... -}: -let +}: let inherit (lib) mkEnableOption mkIf; inherit (self) namespace; inherit (self.lib) mkOpt; cfg = config.${namespace}.system.kernel; -in -{ +in { options.${namespace}.system.kernel = { enable = mkEnableOption "Modify the standard kernel settings"; - version = - mkOpt lib.types.str "linuxPackages_latest" - "Set the kernel version to be used by your system"; + version = mkOpt lib.types.str "linuxPackages_latest" "Set the kernel version to be used by your system"; }; config = mkIf cfg.enable { diff --git a/modules/nixos/system/locale/default.nix b/modules/nixos/system/locale/default.nix index 8aa9168..bccefd9 100644 --- a/modules/nixos/system/locale/default.nix +++ b/modules/nixos/system/locale/default.nix @@ -3,14 +3,12 @@ self, config, ... -}: -let +}: let inherit (lib) mkEnableOption mkIf mkOption; inherit (self) namespace; cfg = config.${namespace}.system.locale; -in -{ +in { options.${namespace}.system.locale = { enable = mkEnableOption "system locale tweaks."; diff --git a/modules/nixos/system/networking/default.nix b/modules/nixos/system/networking/default.nix index 6bdba06..2130053 100644 --- a/modules/nixos/system/networking/default.nix +++ b/modules/nixos/system/networking/default.nix @@ -3,14 +3,12 @@ self, config, ... -}: -let +}: let inherit (lib) mkEnableOption mkIf; inherit (self) namespace; cfg = config.${namespace}.system.networking; -in -{ +in { options.${namespace}.system.networking = { enable = mkEnableOption "networking."; }; diff --git a/modules/nixos/system/nix/default.nix b/modules/nixos/system/nix/default.nix index e11132d..d1205b5 100644 --- a/modules/nixos/system/nix/default.nix +++ b/modules/nixos/system/nix/default.nix @@ -4,22 +4,18 @@ self, config, ... -}: -let +}: let inherit (lib) mkEnableOption mkIf types; inherit (self) namespace; inherit (self.lib) mkOpt; cfg = config.${namespace}.system.nix; -in -{ +in { options.${namespace}.system.nix = { enable = mkEnableOption "Nix configuration overrides."; use-lix = mkEnableOption "Lix as an alternative to CppNix."; use-nixld = mkEnableOption "the use of dynamically linked executables on nix based systems."; - trusted-users = mkOpt (types.listOf types.str) [ - "@wheel" - ] "List of trusted users for this NixOS system."; + trusted-users = mkOpt (types.listOf types.str) ["@wheel"] "List of trusted users for this NixOS system."; }; config = mkIf cfg.enable { @@ -27,10 +23,7 @@ in settings = { auto-optimise-store = true; builders-use-substitutes = true; - experimental-features = [ - "nix-command" - "flakes" - ]; + experimental-features = ["nix-command" "flakes"]; keep-derivations = true; keep-outputs = true; max-jobs = "auto"; diff --git a/modules/nixos/system/shell/default.nix b/modules/nixos/system/shell/default.nix index fc72cd2..0ae1ef6 100644 --- a/modules/nixos/system/shell/default.nix +++ b/modules/nixos/system/shell/default.nix @@ -4,18 +4,16 @@ self, config, ... -}: -let +}: let inherit (lib) mkEnableOption mkIf types; inherit (self) namespace; inherit (self.lib) mkOpt; cfg = config.${namespace}.system.shell; -in -{ +in { options.${namespace}.system.shell = { enable = mkEnableOption "custom user shells."; - installed = mkOpt (types.listOf types.package) [ pkgs.fish ] "List of shell packages to install"; + installed = mkOpt (types.listOf types.package) [pkgs.fish] "List of shell packages to install"; default = mkOpt types.str "fish" "Set a custom shell as the default for all users."; }; diff --git a/modules/nixos/users/default.nix b/modules/nixos/users/default.nix index b5efd31..64829f8 100644 --- a/modules/nixos/users/default.nix +++ b/modules/nixos/users/default.nix @@ -5,14 +5,8 @@ config, inputs, ... -}: -let - inherit (lib) - types - mkEnableOption - mkOption - mkIf - ; +}: let + inherit (lib) types mkEnableOption mkOption mkIf; inherit (self) namespace; inherit (self.lib) dirToModuleList; @@ -25,38 +19,25 @@ let enable = mkEnableOption "this user."; isNormalUser = self.lib.mkBool true "Whether this user is considered a normal user."; isSystemUser = self.lib.mkBool false "Whether this user is considered a system user."; - initialPassword = - self.lib.mkOpt (types.nullOr types.str) null - "Plaintext insecure initial user password, only recommended for testing."; - password = - self.lib.mkOpt (types.nullOr types.str) null - "Plaintext insecure user password, only recommended for testing."; - hashedPasswordFile = - self.lib.mkOpt (types.nullOr types.str) null - "Secure, hashed user password stored in a separate file, recommended for production."; - hashedPassword = - self.lib.mkOpt (types.nullOr types.str) null - "Secure, hashed password, stored in plaintext, fine to use."; - extraGroups = - self.lib.mkOpt (types.listOf types.str) [ ] - "List of additional groups this user belongs to."; + initialPassword = self.lib.mkOpt (types.nullOr types.str) null "Plaintext insecure initial user password, only recommended for testing."; + password = self.lib.mkOpt (types.nullOr types.str) null "Plaintext insecure user password, only recommended for testing."; + hashedPasswordFile = self.lib.mkOpt (types.nullOr types.str) null "Secure, hashed user password stored in a separate file, recommended for production."; + hashedPassword = self.lib.mkOpt (types.nullOr types.str) null "Secure, hashed password, stored in plaintext, fine to use."; + extraGroups = self.lib.mkOpt (types.listOf types.str) [] "List of additional groups this user belongs to."; }; }; getHomeConfigPath = username: "${self.outPath}/homes/${system}/${username}"; - homeConfigExists = - username: - let - path = getHomeConfigPath username; - in + homeConfigExists = username: let + path = getHomeConfigPath username; + in builtins.pathExists "${path}/default.nix"; homeModules = dirToModuleList "${self.outPath}/modules/home"; -in -{ +in { options.${namespace}.users = mkOption { type = types.attrsOf userSubmodule; - default = { }; + default = {}; description = "List of users to create. Also handles home configurations, placed in self.outPath/homes/[x86_64-linux, aarch64-linux, etc...], through home-manager."; }; @@ -66,21 +47,12 @@ in # Manage users declaratively and map userConfig to users.users by name; users.mutableUsers = false; - users.users = lib.mapAttrs ( - username: userConfig: + users.users = lib.mapAttrs (username: userConfig: mkIf userConfig.enable { name = username; - inherit (userConfig) - isNormalUser - isSystemUser - initialPassword - hashedPasswordFile - hashedPassword - password - extraGroups - ; - } - ) cfg; + inherit (userConfig) isNormalUser isSystemUser initialPassword hashedPasswordFile hashedPassword password extraGroups; + }) + cfg; home-manager = { useGlobalPkgs = true; @@ -91,24 +63,25 @@ in namespace = self.namespace; }; - users = lib.mapAttrs ( - username: userConfig: - mkIf (userConfig.enable && homeConfigExists username) ( - { osConfig, ... }: - { - # Import user home configuration and general home modules - imports = [ - (getHomeConfigPath username) - inputs.sops-nix.homeManagerModules.sops - inputs.catppuccin.homeModules.default - inputs.nixcord.homeModules.nixcord - inputs.youtube-music.homeManagerModules.default - ] ++ homeModules; + users = + lib.mapAttrs ( + username: userConfig: + mkIf (userConfig.enable && homeConfigExists username) ( + {osConfig, ...}: { + # Import user home configuration and general home modules + imports = [ + (getHomeConfigPath username) + inputs.sops-nix.homeManagerModules.sops + inputs.catppuccin.homeModules.default + inputs.nixcord.homeModules.nixcord + inputs.youtube-music.homeManagerModules.default + ] ++ homeModules; - home.stateVersion = lib.mkDefault osConfig.system.stateVersion; - } + home.stateVersion = lib.mkDefault osConfig.system.stateVersion; + } + ) ) - ) cfg; + cfg; }; }; } diff --git a/systems/x86_64-nixos/absolutesolver/default.nix b/systems/x86_64-nixos/absolutesolver/default.nix index 4dbbb31..77dcc0d 100644 --- a/systems/x86_64-nixos/absolutesolver/default.nix +++ b/systems/x86_64-nixos/absolutesolver/default.nix @@ -1,11 +1,10 @@ -{ pkgs, ... }: -{ +{pkgs, ...}: { imports = [ ./hardware.nix ]; # Setup Sops - sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; + sops.age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"]; sops.age.keyFile = "/var/lib/sops-nix/key.txt"; sops.age.generateKey = true; @@ -13,10 +12,7 @@ users.cyn = { enable = true; hashedPassword = "$6$mvK9bT756Aok54Vt$vBRnT66Vb3HL0Y5rEMJlHvKkvzVQ.KUciInTmW3FCBFT00IuFMpz3q9RhXPLTLMRPho65bTg9hMnFPb84I774."; - extraGroups = [ - "wheel" - "docker" - ]; + extraGroups = ["wheel" "docker"]; }; archetypes.server.enable = true; diff --git a/systems/x86_64-nixos/absolutesolver/hardware.nix b/systems/x86_64-nixos/absolutesolver/hardware.nix index 699f2a4..82651b8 100644 --- a/systems/x86_64-nixos/absolutesolver/hardware.nix +++ b/systems/x86_64-nixos/absolutesolver/hardware.nix @@ -6,36 +6,26 @@ lib, modulesPath, ... -}: -{ +}: { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ - "xhci_pci" - "ahci" - "usbhid" - "uas" - "sd_mod" - ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usbhid" "uas" "sd_mod"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-intel"]; + boot.extraModulePackages = []; fileSystems."/" = { device = "/dev/disk/by-uuid/5d4f9f57-085f-44a0-b987-bad24ff58769"; fsType = "btrfs"; - options = [ "subvol=@" ]; + options = ["subvol=@"]; }; fileSystems."/boot" = { device = "/dev/disk/by-uuid/8D0F-2821"; fsType = "vfat"; - options = [ - "fmask=0077" - "dmask=0077" - ]; + options = ["fmask=0077" "dmask=0077"]; }; fileSystems."/mnt/storage" = { @@ -44,7 +34,7 @@ }; swapDevices = [ - { device = "/dev/disk/by-uuid/42fc926f-f066-48e8-8c07-3627b2ba3cd4"; } + {device = "/dev/disk/by-uuid/42fc926f-f066-48e8-8c07-3627b2ba3cd4";} ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking diff --git a/systems/x86_64-nixos/puzzlevision/default.nix b/systems/x86_64-nixos/puzzlevision/default.nix index 818ba2e..1203d1d 100644 --- a/systems/x86_64-nixos/puzzlevision/default.nix +++ b/systems/x86_64-nixos/puzzlevision/default.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -{ +{pkgs, ...}: { imports = [ ./hardware.nix ]; @@ -13,7 +12,7 @@ users.jo = { enable = true; hashedPassword = "$6$mvK9bT756Aok54Vt$vBRnT66Vb3HL0Y5rEMJlHvKkvzVQ.KUciInTmW3FCBFT00IuFMpz3q9RhXPLTLMRPho65bTg9hMnFPb84I774."; - extraGroups = [ "wheel" ]; + extraGroups = ["wheel"]; }; archetypes.laptop.enable = true; diff --git a/systems/x86_64-nixos/puzzlevision/hardware.nix b/systems/x86_64-nixos/puzzlevision/hardware.nix index 581f52d..62a959f 100644 --- a/systems/x86_64-nixos/puzzlevision/hardware.nix +++ b/systems/x86_64-nixos/puzzlevision/hardware.nix @@ -1,46 +1,31 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ - config, - lib, - modulesPath, - ... -}: +{ config, lib, modulesPath, ... }: { - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ - "xhci_pci" - "vmd" - "nvme" - "usbhid" - "rtsx_pci_sdmmc" - ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "vmd" "nvme" "usbhid" "rtsx_pci_sdmmc" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = { - device = "/dev/disk/by-uuid/864b1287-89fd-4cc0-98a5-40a3caf804c6"; - fsType = "btrfs"; - options = [ "subvol=@" ]; - }; + fileSystems."/" = + { device = "/dev/disk/by-uuid/864b1287-89fd-4cc0-98a5-40a3caf804c6"; + fsType = "btrfs"; + options = [ "subvol=@" ]; + }; - boot.initrd.luks.devices."luks-5fd4fc76-d5c5-46c3-b952-1a7a7ff3a1fc".device = - "/dev/disk/by-uuid/5fd4fc76-d5c5-46c3-b952-1a7a7ff3a1fc"; + boot.initrd.luks.devices."luks-5fd4fc76-d5c5-46c3-b952-1a7a7ff3a1fc".device = "/dev/disk/by-uuid/5fd4fc76-d5c5-46c3-b952-1a7a7ff3a1fc"; - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/2429-4141"; - fsType = "vfat"; - options = [ - "fmask=0022" - "dmask=0022" - ]; - }; + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/2429-4141"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; swapDevices = [ ];