Merge remote-tracking branch 'origin/nixos' into nixos

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,40 +133,22 @@
         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;
-        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
-            ];
             };
+            modules = defaultModules ++ [ path ];
+          })
+        ./hosts;
 
-          checks.pre-commit-check = inputs.pre-commit-hooks.lib."${system}".run {
+      pre-commit-check = system: inputs.pre-commit-hooks.lib."${system}".run {
         src = ./.;
         hooks = {
           nixpkgs-fmt.enable = true;
@@ -184,8 +157,59 @@
           stylua.enable = true;
         };
       };
+    in
+    with lib; {
+      inherit lib;
 
-          packages = utils.lib.exportPackages self.overlays channels;
+      # ╔══════════════════════════════════════════════════════════╗
+      # ║                   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;
+      });
+
+      legacyPackages = forEachSystem pkgsFor;
+
+      packages = forEachSystem (system:
+        let
+          pkgs = pkgsFor system;
+        in
+        filterAttrs (_: isDerivation)
+          (overlay pkgs pkgs)
+      );
+
+      overlays =
+        let
+          overlayNames = attrNames (overlay null null);
+          mkOverlay = name: final: prev: (overlay final prev).${name};
+        in
+        (genAttrs overlayNames mkOverlay) // {
+          default = overlay;
         };
     };
 }

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,7 +10,13 @@
     ./hardware-configuration.nix
   ];
 
-  my.virtualisation.libvirtd.enable = true;
+  my = {
+    virtualisation.libvirtd.enable = true;
+    profiles = {
+      desktop.enable = true;
+      personal.enable = true;
+    };
+  };
 
   # BOOT
   boot = {
@@ -31,7 +37,7 @@
     xserver.libinput.enable = true;
     xserver.libinput.touchpad.disableWhileTyping = true;
     printing.enable = true;
-    logind.lidSwitch = "suspend-and-hibernate";
+    logind.lidSwitch = "hybrid-sleep";
   };
   hardware.bluetooth.enable = true;
 

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,8 +1,17 @@
 { lib
+, config
 , pkgs
 , ...
 }:
-with lib; {
+
+with lib;
+let
+  cfg = config.my.profiles.desktop;
+in
+{
+  options.my.profiles.desktop.enable = mkEnableOption "desktop profile";
+
+  config = mkIf cfg.enable {
     my = {
       yubikey = {
         enable = mkDefault true;
@@ -71,4 +80,5 @@ with lib; {
         pulse.enable = true;
       };
     };
+  };
 }

modules/profiles/gaming.nix

@@ -1,6 +1,17 @@
-{ pkgs
+{ lib
+, config
+, pkgs
 , ...
-}: {
+}:
+
+with lib;
+let
+  cfg = config.my.profiles.gaming;
+in
+{
+  options.my.profiles.gaming.enable = mkEnableOption "Enable gaming profile";
+
+  config = mkIf cfg.enable {
     programs.steam.enable = true;
     environment.systemPackages = with pkgs; [
       lutris
@@ -8,4 +19,5 @@
       heroic
       mangohud
     ];
+  };
 }

modules/profiles/personal.nix

@@ -1,7 +1,17 @@
-{ lib, ... }:
+{ lib
+, config
+, ...
+}:
 
 with lib;
+let
+  cfg = config.my.profiles.personal;
+in
 {
+  options.my.profiles.personal.enable = mkEnableOption "personal profile";
+
+  config = mkIf cfg.enable
+    {
       my = {
         services = {
           openconnect.enable = true;
@@ -60,4 +70,5 @@ with lib;
           };
         };
       };
+    };
 }

modules/profiles/ripping.nix

@@ -1,10 +1,23 @@
-{ pkgs }:
+{ lib
+, config
+, pkgs
+, ...
+}:
+
+with lib;
+let
+  cfg = config.my.profiles.ripping;
+in
 
 {
+  options.my.profiles.ripping.enable = mkEnableOption "ripping profile";
+
+  config = mkIf cfg.enable {
     environment.systemPackages = with pkgs; [
       # 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/nix.nix

@@ -1,6 +1,7 @@
 { config
 , lib
 , inputs
+, self
 , ...
 }:
 
@@ -22,6 +23,8 @@ in
   };
 
   config.nix = {
+    extraOptions = "experimental-features = nix-command flakes";
+
     gc = {
       automatic = cfg.gc.enable;
       options = "--max-freed ${cfg.gc.minimumFreedGB} --delete-older-than 14d";
@@ -42,6 +45,7 @@ in
       master.flake = inputs.master;
       nixpkgs.flake = inputs.nixpkgs;
       stable.flake = inputs.stable;
+      dotfiles.flake = self;
     };
 
     settings = {

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;
-  };
-}