refactor(flake): hand roll flake

flake.lock

@@ -980,8 +980,7 @@
         "nvim-treesitter-textsubjects": "nvim-treesitter-textsubjects",
         "pre-commit-hooks": "pre-commit-hooks",
         "smartcolumn-nvim": "smartcolumn-nvim",
-        "stable": "stable",
+        "stable": "stable"
-        "utils": "utils"
       }
     },
     "rust-overlay": {
@@ -1083,26 +1082,6 @@
         "type": "github"
       }
     },
-    "utils": {
-      "inputs": {
-        "flake-utils": [
-          "flake-utils"
-        ]
-      },
-      "locked": {
-        "lastModified": 1657226504,
-        "narHash": "sha256-GIYNjuq4mJlFgqKsZ+YrgzWm0IpA4axA3MCrdKYj7gs=",
-        "owner": "gytis-ivaskevicius",
-        "repo": "flake-utils-plus",
-        "rev": "2bf0f91643c2e5ae38c1b26893ac2927ac9bd82a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "gytis-ivaskevicius",
-        "repo": "flake-utils-plus",
-        "type": "github"
-      }
-    },
     "wlroots": {
       "flake": false,
       "locked": {

flake.nix

@@ -13,8 +13,6 @@
     stable.url = "github:nixos/nixpkgs/nixos-22.11";
 
     flake-utils.url = "github:numtide/flake-utils";
-    utils.url = "github:gytis-ivaskevicius/flake-utils-plus";
-    utils.inputs.flake-utils.follows = "flake-utils";
 
     agenix.inputs.nixpkgs.follows = "nixpkgs";
     agenix.url = "github:ryantm/agenix";
@@ -79,58 +77,51 @@
      ║                         Outputs                          ║
      ╚══════════════════════════════════════════════════════════╝
   */
-  outputs =
+  outputs = inputs@{ self, nixpkgs, ... }:
-    inputs@{ self, nixpkgs, utils, ... }:
+    let
-    utils.lib.mkFlake {
+      systems = [ "x86_64-linux" "aarch64-linux" ];
-      inherit self inputs;
 
-      supportedSystems = [ "x86_64-linux" ];
+      forEachSystem = lib.genAttrs systems;
-
-      channelsConfig.allowUnfree = true;
 
       lib = nixpkgs.lib.extend
         (self: _: { my = import ./lib { lib = self; }; });
 
-      /*
-         ╔══════════════════════════════════════════════════════════╗
-         ║                         Overlays                         ║
-         ╚══════════════════════════════════════════════════════════╝
-      */
       overlay = import ./overlays {
         inherit inputs;
         inherit (self) lib;
       };
 
-      channels.nixpkgs.overlaysBuilder = _: [
+      config.allowUnfree = true;
+
+      overlays = [
         inputs.hypr-contrib.overlays.default
         inputs.hyprland.overlays.default
         inputs.neovim-nightly-overlay.overlay
-        inputs.utils.overlay
+        overlay
-        self.overlay
       ];
 
-      overlays = utils.lib.exportOverlays
+      pkgsFor = system: import nixpkgs {
-        {
+        inherit system config;
-          inherit (self) pkgs inputs;
+        overlays = overlays ++ [
-        } // {
+          (
-        default = self.overlay;
+            _: prev: {
+              master = import inputs.master {
+                inherit (prev) system;
+                inherit overlays config;
+              };
+              stable = import inputs.stable {
+                inherit (prev) system;
+                inherit overlays config;
+              };
+            }
+          )
+          overlay
+        ];
       };
 
-      /*
+      defaultModules = [
-         ╔══════════════════════════════════════════════════════════╗
+        { nixpkgs = { inherit config; }; }
-         ║                         Modules                          ║
+        ./modules
-         ╚══════════════════════════════════════════════════════════╝
-      */
-      nixosModules = utils.lib.exportModules [
-        ./modules/profiles/base.nix
-        ./modules/profiles/gaming.nix
-        ./modules/profiles/desktop.nix
-        ./modules/profiles/personal.nix
-      ];
-
-      hostDefaults.modules = [
-        ./modules/default.nix
-        self.nixosModules.base
         inputs.home-manager.nixosModule
         {
           home-manager = {
@@ -142,50 +133,66 @@
         inputs.agenix.nixosModules.age
       ];
 
-
+      hosts = self.lib.my.mapModules
-      hosts.nixos-laptop.modules = [
+        (path:
-        ./hosts/nixos-laptop
+          let
-        self.nixosModules.desktop
+            system = import "${path}/system.nix";
-        self.nixosModules.personal
+            pkgs = pkgsFor system;
-      ];
+          in
-
+          lib.nixosSystem {
-
+            inherit pkgs system lib;
-      hosts.nixos-desktop.modules = [
+            specialArgs = {
-        ./hosts/nixos-desktop
+              inherit inputs;
-        self.nixosModules.desktop
-        self.nixosModules.gaming
-        self.nixosModules.personal
-      ];
-
-      /*
-         ╔══════════════════════════════════════════════════════════╗
-         ║                      Other Outputs                       ║
-         ╚══════════════════════════════════════════════════════════╝
-      */
-      outputsBuilder = channels:
-        with channels.nixpkgs; {
-          devShells.default = mkShell {
-            inherit (self.checks.${system}.pre-commit-check) shellHook;
-            name = "dotfiles";
-            packages = [
-              # Secrets
-              pkgs.agenix
-              # cachix
-              cachix
-            ];
-          };
-
-          checks.pre-commit-check = inputs.pre-commit-hooks.lib."${system}".run {
-            src = ./.;
-            hooks = {
-              nixpkgs-fmt.enable = true;
-              statix.enable = true;
-              shellcheck.enable = true;
-              stylua.enable = true;
             };
-          };
+            modules = defaultModules ++ [ path ];
+          })
+        ./hosts;
 
-          packages = utils.lib.exportPackages self.overlays channels;
+      pre-commit-check = system: inputs.pre-commit-hooks.lib."${system}".run {
+        src = ./.;
+        hooks = {
+          nixpkgs-fmt.enable = true;
+          statix.enable = true;
+          shellcheck.enable = true;
+          stylua.enable = true;
         };
+      };
+    in
+    with lib; {
+      inherit lib;
+
+      pkgs = genAttrs systems pkgsFor;
+
+      # ╔══════════════════════════════════════════════════════════╗
+      # ║                   NixOS Configurations                   ║
+      # ╚══════════════════════════════════════════════════════════╝
+
+      nixosConfigurations = hosts;
+
+      # ╔══════════════════════════════════════════════════════════╗
+      # ║                      Other Outputs                       ║
+      # ╚══════════════════════════════════════════════════════════╝
+
+      devShells = forEachSystem (system:
+        let
+          pkgs = pkgsFor system;
+        in
+        {
+          default = pkgs.mkShell
+            {
+              inherit (pre-commit-check system) shellHook;
+              name = "dotfiles";
+              packages = with pkgs; [
+                # Secrets
+                agenix
+                # cachix
+                cachix
+              ];
+            };
+        });
+
+      checks = forEachSystem (system: {
+        pre-commit-check = pre-commit-check system;
+      });
     };
 }

hosts/nixos-desktop/default.nix

@@ -10,7 +10,13 @@
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
   ];
+
   my = {
+    profiles = {
+      desktop.enable = true;
+      gaming.enable = true;
+      personal.enable = true;
+    };
     programs.hyprland.nvidiaSupport = true;
     services.mullvad.enable = true;
     programs.ledger.enable = true;

hosts/nixos-desktop/system.nix

@@ -0,0 +1 @@
+"x86_64-linux"

hosts/nixos-laptop/default.nix

@@ -10,6 +10,11 @@
     ./hardware-configuration.nix
   ];
 
+  my.profiles = {
+    desktop.enable = true;
+    personal.enable = true;
+  };
+
   # BOOT
   boot = {
     supportedFilesystems = [ "btrfs" ];

hosts/nixos-laptop/system.nix

@@ -0,0 +1 @@
+"x86_64-linux"

lib/default.nix

@@ -47,4 +47,34 @@ lib.makeExtensible (_: rec {
   mapModules' = f: dir: lib.attrValues (mapModules f dir);
 
   listModules = mapModules' (path: path);
+
+  mapModulesRec = f: dir:
+    let
+      filterDirs = name: type:
+        let
+          isPublic = !(lib.hasPrefix "_" name);
+          isSomething = type != null;
+          isDir = type == "directory";
+          isDefault = isDir && builtins.pathExists "${toString dir}/${name}/default.nix";
+        in
+        isPublic && isSomething && isDir && !isDefault;
+
+      subDirs = lib.filterAttrs filterDirs (builtins.readDir dir);
+
+      mkSubModule = name: _:
+        let
+          path = "${toString dir}/${name}";
+        in
+        lib.nameValuePair name (mapModulesRec f path);
+    in
+    mapModules f dir //
+    (lib.mapAttrs' mkSubModule subDirs);
+
+  mapModulesRec' = f: dir:
+    let
+      attrValuesRec = attrs: map (values: if lib.isAttrs values then attrValuesRec values else values) (lib.attrValues attrs);
+    in
+    lib.flatten (attrValuesRec (mapModulesRec f dir));
+
+  listModulesRec = mapModulesRec' (path: path);
 })

modules/config/bin/default.nix

@@ -7,10 +7,10 @@
 with lib;
 let
   cfg = config.my.bin;
-  cycleSinks = import ./cycleSinks.nix { inherit pkgs; };
+  cycleSinks = import ./_cycleSinks.nix { inherit pkgs; };
-  protonge = import ./protonge.nix { inherit pkgs; };
+  protonge = import ./_protonge.nix { inherit pkgs; };
-  share = import ./share.nix { inherit pkgs; };
+  share = import ./_share.nix { inherit pkgs; };
-  sxhkdHelp = import ./sxhkdHelp.nix { inherit pkgs; };
+  sxhkdHelp = import ./_sxhkdHelp.nix { inherit pkgs; };
 in
 {
   options.my.bin.enable = mkEnableOption "bin";

modules/config/default.nix

@@ -1,5 +0,0 @@
-{ lib, ... }:
-
-{
-  imports = lib.my.listModules ./.;
-}

modules/config/theming/catppuccin-frappe.nix

@@ -6,7 +6,7 @@ let
 in
 {
   config = mkIf (cfg.enable && cfg.scheme == "catppuccin-frappe")
-    (import ./catppuccin.nix
+    (import ./_catppuccin.nix
       {
         inherit config lib pkgs;
         flavor = "mocha";

modules/config/theming/catppuccin-latte.nix

@@ -6,7 +6,7 @@ let
 in
 {
   config = mkIf (cfg.enable && cfg.scheme == "catppuccin-latte")
-    (import ./catppuccin.nix
+    (import ./_catppuccin.nix
       {
         inherit config lib pkgs;
         flavor = "mocha";

modules/config/theming/catppuccin-macchiato.nix

@@ -6,7 +6,7 @@ let
 in
 {
   config = mkIf (cfg.enable && cfg.scheme == "catppuccin-macchiato")
-    (import ./catppuccin.nix
+    (import ./_catppuccin.nix
       {
         inherit config lib pkgs;
         flavor = "mocha";

modules/config/theming/catppuccin-mocha.nix

@@ -6,7 +6,7 @@ let
 in
 {
   config = mkIf (cfg.enable && cfg.scheme == "catppuccin-mocha")
-    (import ./catppuccin.nix
+    (import ./_catppuccin.nix
       {
         inherit config lib pkgs;
         flavor = "mocha";

modules/default.nix

@@ -1,9 +1,4 @@
+{ lib, ... }:
 {
-  imports = [
+  imports = lib.my.listModulesRec ./.;
-    ./config
-    ./programs
-    ./security
-    ./services
-    ./virtualisation
-  ];
 }

modules/profiles/desktop.nix

@@ -1,73 +1,83 @@
 { lib
+, config
 , pkgs
 , ...
 }:
-with lib; {
+
-  my = {
+with lib;
-    yubikey = {
+let
-      enable = mkDefault true;
+  cfg = config.my.profiles.desktop;
-      luksSupport = {
+in
+{
+  options.my.profiles.desktop.enable = mkEnableOption "desktop profile";
+
+  config = mkIf cfg.enable {
+    my = {
+      yubikey = {
         enable = mkDefault true;
-        devices = mkDefault [ "enc" ];
+        luksSupport = {
+          enable = mkDefault true;
+          devices = mkDefault [ "enc" ];
+        };
+      };
+      wallpapers.enable = mkDefault true;
+      theming = {
+        enable = mkDefault true;
+        scheme = mkDefault "catppuccin-macchiato";
+      };
+      virtualisation.podman.enable = mkDefault true;
+
+      programs = {
+        chromium.enable = mkDefault true;
+        firefox.enable = mkDefault true;
+        gpg.enable = mkDefault true;
+        hyprland.enable = mkDefault true;
+        logseq.enable = mkDefault true;
+        nvim.enable = mkDefault true;
+        python.versions."311".enable = mkDefault true;
+        spotify.enable = mkDefault true;
+        ssh.enable = mkDefault true;
+        thunar.enable = mkDefault true;
+        wallpaper.enable = mkDefault true;
+        zathura.enable = mkDefault true;
+      };
+      services = {
+        dunst.enable = mkDefault true;
+        gammastep.enable = true;
+        kdeconnect.enable = mkDefault true;
+        printing.enable = true;
+        wireguard.enable = true;
       };
     };
-    wallpapers.enable = mkDefault true;
-    theming = {
-      enable = mkDefault true;
-      scheme = mkDefault "catppuccin-macchiato";
-    };
-    virtualisation.podman.enable = mkDefault true;
 
-    programs = {
+    environment.systemPackages = with pkgs; [
-      chromium.enable = mkDefault true;
+      anki
-      firefox.enable = mkDefault true;
+      calibre
-      gpg.enable = mkDefault true;
+      keepassxc
-      hyprland.enable = mkDefault true;
+      nixpkgs-review
-      logseq.enable = mkDefault true;
+      pavucontrol
-      nvim.enable = mkDefault true;
+      stable.libreoffice # HACK to fix build error
-      python.versions."311".enable = mkDefault true;
+      stable.signal-desktop
-      spotify.enable = mkDefault true;
+      texlive.combined.scheme-full
-      ssh.enable = mkDefault true;
+      thunderbird
-      thunar.enable = mkDefault true;
+      vlc
-      wallpaper.enable = mkDefault true;
+    ];
-      zathura.enable = mkDefault true;
+
+    programs.nix-ld.enable = true;
+
+    home-manager.users.moritz = {
+      services.nextcloud-client = {
+        enable = true;
+        startInBackground = true;
+      };
     };
     services = {
-      dunst.enable = mkDefault true;
+      gnome.gnome-keyring.enable = true;
-      gammastep.enable = true;
+      pipewire = {
-      kdeconnect.enable = mkDefault true;
+        enable = true;
-      printing.enable = true;
+        alsa.enable = true;
-      wireguard.enable = true;
+        pulse.enable = true;
-    };
+      };
-  };
-
-  environment.systemPackages = with pkgs; [
-    anki
-    calibre
-    keepassxc
-    nixpkgs-review
-    pavucontrol
-    stable.libreoffice # HACK to fix build error
-    stable.signal-desktop
-    texlive.combined.scheme-full
-    thunderbird
-    vlc
-  ];
-
-  programs.nix-ld.enable = true;
-
-  home-manager.users.moritz = {
-    services.nextcloud-client = {
-      enable = true;
-      startInBackground = true;
-    };
-  };
-  services = {
-    gnome.gnome-keyring.enable = true;
-    pipewire = {
-      enable = true;
-      alsa.enable = true;
-      pulse.enable = true;
     };
   };
 }

modules/profiles/gaming.nix

@@ -1,11 +1,23 @@
-{ pkgs
+{ lib
+, config
+, pkgs
 , ...
-}: {
+}:
-  programs.steam.enable = true;
+
-  environment.systemPackages = with pkgs; [
+with lib;
-    lutris
+let
-    legendary-gl
+  cfg = config.my.profiles.gaming;
-    heroic
+in
-    mangohud
+{
-  ];
+  options.my.profiles.gaming.enable = mkEnableOption "Enable gaming profile";
+
+  config = mkIf cfg.enable {
+    programs.steam.enable = true;
+    environment.systemPackages = with pkgs; [
+      lutris
+      legendary-gl
+      heroic
+      mangohud
+    ];
+  };
 }

modules/profiles/personal.nix

@@ -1,63 +1,74 @@
-{ lib, ... }:
+{ lib
+, config
+, ...
+}:
 
 with lib;
+let
+  cfg = config.my.profiles.personal;
+in
 {
-  my = {
+  options.my.profiles.personal.enable = mkEnableOption "personal profile";
-    services = {
-      openconnect.enable = true;
-      synology-drive.enable = true;
-    };
-    programs = {
-      ssh.includeSecrets = mkDefault [ ../../secrets/ssh-home.age ];
-      git.signing = mkDefault true;
-      hub.enable = mkDefault true;
-      firefox.arkenfox = {
-        enable = mkDefault true;
-        overrides = mkDefault {
-          ## arkenfox overrides
-          # automatic search
-          "keyword.enabled" = true;
-          "browser.search.suggest.enabled" = true;
-          "browser.urlbar.suggest.searches" = true;
 
-          # startup page
+  config = mkIf cfg.enable
-          "browser.startup.homepage" = "https://searxng.moritzboeh.me/";
+    {
-          "browser.startup.page" = 1;
+      my = {
+        services = {
+          openconnect.enable = true;
+          synology-drive.enable = true;
+        };
+        programs = {
+          ssh.includeSecrets = mkDefault [ ../../secrets/ssh-home.age ];
+          git.signing = mkDefault true;
+          hub.enable = mkDefault true;
+          firefox.arkenfox = {
+            enable = mkDefault true;
+            overrides = mkDefault {
+              ## arkenfox overrides
+              # automatic search
+              "keyword.enabled" = true;
+              "browser.search.suggest.enabled" = true;
+              "browser.urlbar.suggest.searches" = true;
 
-          # drm
+              # startup page
-          "media.eme.enabled" = true;
+              "browser.startup.homepage" = "https://searxng.moritzboeh.me/";
+              "browser.startup.page" = 1;
 
-          # sanitisation
+              # drm
-          "privacy.clearOnShutdown.history" = false;
+              "media.eme.enabled" = true;
 
-          # disable letterboxing
+              # sanitisation
-          "privacy.resistFingerprinting.letterboxing" = false;
+              "privacy.clearOnShutdown.history" = false;
 
-          ## OTHER
+              # disable letterboxing
-          # Dont show warning when accessing about:config
+              "privacy.resistFingerprinting.letterboxing" = false;
-          "browser.aboutConfig.showWarning" = false;
 
-          # Hide bookmarks
+              ## OTHER
-          "browser.toolbars.bookmarks.visibility" = "never";
+              # Dont show warning when accessing about:config
+              "browser.aboutConfig.showWarning" = false;
 
-          # Smooth scrolling
+              # Hide bookmarks
-          "general.smoothScroll.lines.durationMaxMS" = 125;
+              "browser.toolbars.bookmarks.visibility" = "never";
-          "general.smoothScroll.lines.durationMinMS" = 125;
+
-          "general.smoothScroll.mouseWheel.durationMaxMS" = 200;
+              # Smooth scrolling
-          "general.smoothScroll.mouseWheel.durationMinMS" = 100;
+              "general.smoothScroll.lines.durationMaxMS" = 125;
-          "general.smoothScroll.msdPhysics.enabled" = true;
+              "general.smoothScroll.lines.durationMinMS" = 125;
-          "general.smoothScroll.other.durationMaxMS" = 125;
+              "general.smoothScroll.mouseWheel.durationMaxMS" = 200;
-          "general.smoothScroll.other.durationMinMS" = 125;
+              "general.smoothScroll.mouseWheel.durationMinMS" = 100;
-          "general.smoothScroll.pages.durationMaxMS" = 125;
+              "general.smoothScroll.msdPhysics.enabled" = true;
-          "general.smoothScroll.pages.durationMinMS" = 125;
+              "general.smoothScroll.other.durationMaxMS" = 125;
-          "mousewheel.min_line_scroll_amount" = 40;
+              "general.smoothScroll.other.durationMinMS" = 125;
-          "mousewheel.system_scroll_override_on_root_content.enabled" = true;
+              "general.smoothScroll.pages.durationMaxMS" = 125;
-          "mousewheel.system_scroll_override_on_root_content.horizontal.factor" = 175;
+              "general.smoothScroll.pages.durationMinMS" = 125;
-          "mousewheel.system_scroll_override_on_root_content.vertical.factor" = 175;
+              "mousewheel.min_line_scroll_amount" = 40;
-          "toolkit.scrollbox.horizontalScrollDistance" = 6;
+              "mousewheel.system_scroll_override_on_root_content.enabled" = true;
-          "toolkit.scrollbox.verticalScrollDistance" = 2;
+              "mousewheel.system_scroll_override_on_root_content.horizontal.factor" = 175;
+              "mousewheel.system_scroll_override_on_root_content.vertical.factor" = 175;
+              "toolkit.scrollbox.horizontalScrollDistance" = 6;
+              "toolkit.scrollbox.verticalScrollDistance" = 2;
+            };
+          };
         };
       };
     };
-  };
 }

modules/profiles/ripping.nix

@@ -1,10 +1,23 @@
-{ pkgs }:
+{ lib
+, config
+, pkgs
+, ...
+}:
+
+with lib;
+let
+  cfg = config.my.profiles.ripping;
+in
 
 {
-  environment.systemPackages = with pkgs; [
+  options.my.profiles.ripping.enable = mkEnableOption "ripping profile";
-    # ripping
+
-    abcde
+  config = mkIf cfg.enable {
-    handbrake
+    environment.systemPackages = with pkgs; [
-    picard
+      # ripping
-  ];
+      abcde
+      handbrake
+      picard
+    ];
+  };
 }

modules/programs/default.nix

@@ -1,5 +0,0 @@
-{ lib, ... }:
-
-{
-  imports = lib.my.listModules ./.;
-}

modules/programs/hyprland/default.nix

@@ -48,7 +48,7 @@ in
         enable = true;
         package = hyprland;
         recommendedEnvironment = true;
-        extraConfig = import ./config.nix args;
+        extraConfig = import ./_config.nix args;
       };
     };
 

modules/programs/wallpaper/wallpaper.sh

@@ -5,7 +5,7 @@ WALLPAPERS=$(find "$WALLPAPERS_PATH" -type f,l)
 
 function help() {
 	echo "Usage:"
-  echo -e "  wallpaper [OPTIONS] [PATH]"
+	echo -e "  wallpaper [OPTIONS] [PATH]"
 	echo ""
 	echo "Options:"
 	echo -e "  -h, --help \n\t Show this help message and exit"
@@ -60,12 +60,12 @@ done
 set -- "${POSITIONAL[@]}" # restore positional arguments
 
 if [[ $# -gt 1 ]]; then
-  help
+	help
-  exit 1
+	exit 1
 fi
 
 if [[ $# -eq 1 ]]; then
-  WALLPAPER="$1"
+	WALLPAPER="$1"
 fi
 
 if [[ -z ${WALLPAPER+x} ]]; then

modules/services/default.nix

@@ -1,5 +0,0 @@
-{ lib, ... }:
-
-{
-  imports = lib.my.listModules ./.;
-}

modules/virtualisation/default.nix

@@ -1,5 +0,0 @@
-{ lib, ... }:
-
-{
-  imports = lib.my.listModules ./.;
-}

overlays/channels.nix

@@ -1,12 +0,0 @@
-{ inputs, ... }:
-
-_: prev: {
-  master = import inputs.master {
-    inherit (prev) system;
-    config.allowUnfree = true;
-  };
-  stable = import inputs.stable {
-    inherit (prev) system;
-    config.allowUnfree = true;
-  };
-}