system: remove nix import from core to system/default.nix

treewide: add mkSystem function for hosts and inject custom lib through _module.args
hosts/solaire: avoid repeating paths
2024-11-06 16:33:11 +01:00 · 2024-11-06 16:27:40 +01:00 · 2024-11-06 16:25:57 +01:00
10 changed files with 116 additions and 119 deletions
--- a/flake.lock
+++ b/flake.lock
@ -134,11 +134,11 @@
      },
      "locked": {
        "dir": "pkgs/firefox-addons",
-        "lastModified": 1730865784,
-        "narHash": "sha256-6kJYNjVCyf1tYgpqm7QOYcMkkD/RsaSfrsC2+ojmFAI=",
+        "lastModified": 1730013417,
+        "narHash": "sha256-nZ6ylS3/FAjsi9wwdZJpzIV0+bgJDAurZAi0w9q1Nxw=",
        "owner": "rycee",
        "repo": "nur-expressions",
-        "rev": "b8d22442e09a02eb8b830d41726ac371be21b7cd",
+        "rev": "e9ec8d2766bbe4d242c9255247197372ac64f885",
        "type": "gitlab"
      },
      "original": {
@ -240,11 +240,11 @@
        "nixpkgs-lib": "nixpkgs-lib_2"
      },
      "locked": {
-        "lastModified": 1730504689,
-        "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
+        "lastModified": 1727826117,
+        "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "506278e768c2a08bec68eb62932193e341f55c90",
+        "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
        "type": "github"
      },
      "original": {
@ -327,11 +327,11 @@
        "systems": "systems_8"
      },
      "locked": {
-        "lastModified": 1726560853,
-        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
        "type": "github"
      },
      "original": {
@ -424,11 +424,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1730837930,
-        "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=",
+        "lastModified": 1730016908,
+        "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "2f607e07f3ac7e53541120536708e824acccfaa8",
+        "rev": "e83414058edd339148dc142a8437edb9450574c8",
        "type": "github"
      },
      "original": {
@ -555,11 +555,11 @@
        "xwayland-satellite-unstable": "xwayland-satellite-unstable"
      },
      "locked": {
-        "lastModified": 1730875971,
-        "narHash": "sha256-VpTY0Urm0tebIndEP3qCsfAEjh8IB0d9j7XRZkNLRrw=",
+        "lastModified": 1730021052,
+        "narHash": "sha256-AnCitOqPs+gCGEUKl2lBX2cfd59aUKOz592Bs2pAw1A=",
        "owner": "sodiboo",
        "repo": "niri-flake",
-        "rev": "563b10c27839d0b08353d4cd3563e0f9beb3468d",
+        "rev": "ac40d2eb544d4e3a4d601a265533ecdf0e946305",
        "type": "github"
      },
      "original": {
@ -588,11 +588,11 @@
    "niri-unstable": {
      "flake": false,
      "locked": {
-        "lastModified": 1730871742,
-        "narHash": "sha256-wK7UD90LxLr8oELIYPhUS6+IPU32JGESaHd/tny5/ig=",
+        "lastModified": 1729744939,
+        "narHash": "sha256-QbfaNQa93yt4KKg5XNi1tUIfGoDIohxFp/PmHi8sruU=",
        "owner": "YaLTeR",
        "repo": "niri",
-        "rev": "8867a4f84c4bd07235abd37828b0d724321facbe",
+        "rev": "c8044a9b5dbdb3e0648c86a00bfb63acfc06a559",
        "type": "github"
      },
      "original": {
@ -608,11 +608,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1730604744,
-        "narHash": "sha256-/MK6QU4iOozJ4oHTfZipGtOgaT/uy/Jm4foCqHQeYR4=",
+        "lastModified": 1729999765,
+        "narHash": "sha256-LYsavZXitFjjyETZoij8usXjTa7fa9AIF3Sk3MJSX+Y=",
        "owner": "nix-community",
        "repo": "nix-index-database",
-        "rev": "cc2ddbf2df8ef7cc933543b1b42b845ee4772318",
+        "rev": "0e3a8778c2ee218eff8de6aacf3d2fa6c33b2d4f",
        "type": "github"
      },
      "original": {
@ -623,11 +623,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1730886862,
-        "narHash": "sha256-wCZtRGM1NGxq6VG4+TMzfsa4cuG2VJVtowtYuWW5W3g=",
+        "lastModified": 1729742320,
+        "narHash": "sha256-u3Of8xRkN//me8PU+RucKA59/6RNy4B2jcGAF36P4jI=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "90642a0deae927fa911d49d4f7c5616257105141",
+        "rev": "e8a2f6d5513fe7b7d15701b2d05404ffdc3b6dda",
        "type": "github"
      },
      "original": {
@ -666,14 +666,14 @@
    },
    "nixpkgs-lib_2": {
      "locked": {
-        "lastModified": 1730504152,
-        "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=",
+        "lastModified": 1727825735,
+        "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=",
        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
+        "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
      },
      "original": {
        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
+        "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
      }
    },
    "nixpkgs-lib_3": {
@ -706,11 +706,11 @@
    },
    "nixpkgs-stable_2": {
      "locked": {
-        "lastModified": 1730741070,
-        "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
+        "lastModified": 1729973466,
+        "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
+        "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950",
        "type": "github"
      },
      "original": {
@ -754,11 +754,11 @@
    },
    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1730785428,
-        "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
+        "lastModified": 1729880355,
+        "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
+        "rev": "18536bf04cd71abd345f9579158841376fdd0c5a",
        "type": "github"
      },
      "original": {
@ -770,11 +770,11 @@
    },
    "nixpkgs_5": {
      "locked": {
-        "lastModified": 1730785428,
-        "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
+        "lastModified": 1729880355,
+        "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
+        "rev": "18536bf04cd71abd345f9579158841376fdd0c5a",
        "type": "github"
      },
      "original": {
@ -977,11 +977,11 @@
        "systems": "systems_6"
      },
      "locked": {
-        "lastModified": 1730289819,
-        "narHash": "sha256-GYEgdCLzNODbMNEeYbMa5EWgEwTEMxdSSPTz8uEwZdQ=",
+        "lastModified": 1728378979,
+        "narHash": "sha256-CW/5Cs9m8HupL+6iRMpdHE88OmK9MXH2h3BcXCQw440=",
        "owner": "notashelf",
        "repo": "nvf",
-        "rev": "8ff50562d7203a2b87bc6409e806f13b115d6b48",
+        "rev": "0947ab38c0bc79780eec599161306157b8de74a3",
        "type": "github"
      },
      "original": {
@ -1000,11 +1000,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1730635861,
-        "narHash": "sha256-Npp3pl9aeAiq+wZPDbw2ZxybNuZWyuN7AY6fik56DCo=",
+        "lastModified": 1729710171,
+        "narHash": "sha256-2sVt2hbL+G0FzEESm/EZBewPOmNtZ6MTnYhsvHJW6Rs=",
        "owner": "nix-community",
        "repo": "plasma-manager",
-        "rev": "293668587937daae1df085ee36d2b2d0792b7a0f",
+        "rev": "247a8e677b51f053ca89dcf67059e24f85e47391",
        "type": "github"
      },
      "original": {
@ -2776,11 +2776,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1729477859,
-        "narHash": "sha256-r0VyeJxy4O4CgTB/PNtfQft9fPfN1VuGvnZiCxDArvg=",
+        "lastModified": 1726280639,
+        "narHash": "sha256-YfLRPlFZWrT2oRLNAoqf7G3+NnUTDdlIJk6tmBU7kXM=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "ada8266712449c4c0e6ee6fcbc442b3c217c79e1",
+        "rev": "e9f8641c92f26fd1e076e705edb12147c384171d",
        "type": "github"
      },
      "original": {
@ -2914,11 +2914,11 @@
        "nixpkgs": "nixpkgs_9"
      },
      "locked": {
-        "lastModified": 1730321837,
-        "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=",
+        "lastModified": 1730025913,
+        "narHash": "sha256-Y9NtFmP8ciLyRsopcCx1tyoaaStKeq+EndwtGCgww7I=",
        "owner": "numtide",
        "repo": "treefmt-nix",
-        "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc",
+        "rev": "bae131e525cc8718da22fbeb8d8c7c43c4ea502a",
        "type": "github"
      },
      "original": {
@ -2974,11 +2974,11 @@
      },
      "locked": {
        "dir": "nix",
-        "lastModified": 1730734444,
-        "narHash": "sha256-lNgCAphrq3/bYGjgDxEl2rVcer6GnmfWXDhxc+kdYOk=",
+        "lastModified": 1729006311,
+        "narHash": "sha256-1xtKJHu6CFnOhp4snof+WSTwcdPgwIaD6mBODP/cv3w=",
        "owner": "wez",
        "repo": "wezterm",
-        "rev": "51c794ac500a2033b9dc570c71810518bfa667a9",
+        "rev": "9ddca7bde92090792dbcdc65c1e9897c362196d7",
        "type": "github"
      },
      "original": {
@ -2992,16 +2992,16 @@
    "xwayland-satellite-stable": {
      "flake": false,
      "locked": {
-        "lastModified": 1730166465,
-        "narHash": "sha256-nq7bouXQXaaPPo/E+Jbq+wNHnatD4dY8OxSrRqzvy6s=",
+        "lastModified": 1718165778,
+        "narHash": "sha256-dwF9nI54a6Fo9XU5s4qmvMXSgCid3YQVGxch00qEMvI=",
        "owner": "Supreeeme",
        "repo": "xwayland-satellite",
-        "rev": "a713cf46cb7db84a0d1b57c3a397c610cad3cf98",
+        "rev": "b6d281967cb0b7bf1dfdb8d0f597b517dc4aa5c5",
        "type": "github"
      },
      "original": {
        "owner": "Supreeeme",
-        "ref": "v0.5",
+        "ref": "v0.4",
        "repo": "xwayland-satellite",
        "type": "github"
      }
@ -3009,11 +3009,11 @@
    "xwayland-satellite-unstable": {
      "flake": false,
      "locked": {
-        "lastModified": 1730258684,
-        "narHash": "sha256-E+69sdxUhPSNI8+JlTL6KKbNv5qVD3L1y8hdVO37A44=",
+        "lastModified": 1729838433,
+        "narHash": "sha256-o9D859STqawTSe6mkXpm3xR/gitYgOHy32xOhOfT3vw=",
        "owner": "Supreeeme",
        "repo": "xwayland-satellite",
-        "rev": "b0ee6db9fa9901c675b3c7e952c2a8ce987a0f58",
+        "rev": "67efa2c559b53d3ca90c131c06c247278783880d",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -25,8 +25,11 @@
    });
    formatter = eachSystem (pkgs: treefmtEval.${pkgs.system}.config.build.wrapper);
    nixosModules = import ./modules;
-    nixosConfigurations = import ./hosts {inherit self inputs;};
-    packages = eachSystem (pkgs: import ./pkgs {inherit inputs pkgs;});
+    nixosConfigurations = let
+      lib' = import ./lib {inherit inputs lib';};
+    in
+      import ./hosts {inherit inputs lib';};
+    packages = eachSystem (pkgs: import ./pkgs pkgs);
    deploy.nodes = import ./nodes {inherit self inputs;};
  };
  inputs = {
--- a/home/programs/games/default.nix
+++ b/home/programs/games/default.nix
@ -11,8 +11,10 @@
    pkgs.protonplus
    pkgs.r2modman

-    # steamtinkerlaunch dependencies
-    pkgs.xdotool
+    pkgs
+    . # steamtinkerlaunch dependencies
+    pkgs
+    .xdotool
    pkgs.xorg.xwininfo
    pkgs.yad

--- a/hosts/default.nix
+++ b/hosts/default.nix
@ -1,37 +1,31 @@
 {
-  self,
  inputs,
+  lib',
  ...
 }: let
-  inherit (inputs.nixpkgs.lib) nixosSystem;
-  specialArgs = {
-    inherit inputs self;
-  };
+  inherit (lib') mkSystem;
 in {
-  vamos = nixosSystem {
+  vamos = mkSystem {
    system = "x86_64-linux";
-    inherit specialArgs;
    modules = [
      ./vamos

-      self.nixosModules.theme
+      inputs.self.nixosModules.theme

      inputs.nixos-hardware.nixosModules.framework-13-7040-amd
    ];
  };

-  solaire = nixosSystem {
+  solaire = mkSystem {
    system = "x86_64-linux";
-    inherit specialArgs;
    modules = [
      ./solaire
-      self.nixosModules.theme
+      inputs.self.nixosModules.theme
    ];
  };

-  anastacia = nixosSystem {
+  anastacia = mkSystem {
    system = "x86_64-linux";
-    inherit specialArgs;
    modules = [
      ./anastacia
    ];
--- a/hosts/solaire/default.nix
+++ b/hosts/solaire/default.nix
@ -1,28 +1,25 @@
-{
-  self,
-  specialArgs,
-  ...
-}: let
-  mod = "${self}/system";
+{specialArgs, ...}: let
+  system = ../../system;
+  home = ../../home;
 in {
  imports = [
    ./hardware-configuration.nix
    ./modules

-    "${mod}"
-    "${mod}/hardware/uni-sync.nix"
+    system
+    "${system}/hardware/uni-sync.nix"

-    "${mod}/programs/gnome.nix"
-    "${mod}/programs/games.nix"
-    "${mod}/hardware/nvidia.nix"
+    "${system}/programs/gnome.nix"
+    "${system}/programs/games.nix"
+    "${system}/hardware/nvidia.nix"
  ];

  home-manager = {
    users.nezia.imports = [
-      "${self}/home"
-      "${self}/home/programs/games"
+      home
+      "${home}/programs/games"

-      "${self}/home/terminal/emulators/foot.nix"
+      "${home}/terminal/emulators/foot.nix"
    ];
    extraSpecialArgs = specialArgs;
  };
--- a/lib/default.nix
+++ b/lib/default.nix
@ -1,8 +1,9 @@
 {
-  pkgs,
-  lib,
+  inputs,
+  lib',
  ...
 }: let
+  inherit (inputs.nixpkgs) lib;
  # convert rrggbb hex to rgba(r, g, b, a)
  rgba = c: let
    r = toString (hexToDec (builtins.substring 0 2 c));
@ -86,8 +87,25 @@
    ];

  # Create a KDE konsole color scheme from base16 colors
-  mkKonsoleColorScheme = scheme:
+  mkKonsoleColorScheme = pkgs: scheme:
    pkgs.writeText "${scheme.name}.colorscheme" (schemeToKonsole scheme);
-in {
-  inherit mkKonsoleColorScheme rgba;
+
+  # https://github.com/diniamo/niqs/blob/caf396bb470619fa06936a379eec6e283c3c3d95/lib/default.nix#L13-L35C7
+  mkSystem = {system, ...} @ args:
+    lib.nixosSystem {
+      system = null;
+      specialArgs = {inherit inputs;};
+      modules =
+        [
+          {
+            _module.args = {
+              inherit system lib';
+            };
+            nixpkgs = {inherit system;};
+          }
+        ]
+        ++ args.modules or [];
+    };
+in {
+  inherit mkKonsoleColorScheme rgba mkSystem;
 }
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@ -1,15 +1,4 @@
-{
-  inputs,
-  pkgs,
-  ...
-}: {
+pkgs: {
  mcuxpresso = import ./mcuxpresso pkgs;
-  # unfortunately needed since bolt-launcher uses openssl-1.1.1w (as this is a flake output, it cannot use the host's nixpkgs instance so we have to override it here)
-  bolt-launcher =
-    (import inputs.nixpkgs {
-      config.permittedInsecurePackages = ["openssl-1.1.1w"];
-      inherit (pkgs) system;
-    })
-    .callPackage
-    ./bolt-launcher.nix {};
+  bolt-launcher = pkgs.callPackage ./bolt-launcher.nix {};
 }
--- a/system/core/default.nix
+++ b/system/core/default.nix
@ -4,7 +4,6 @@
    ./users.nix
    ./security.nix
    ./networking.nix
-    ../nix
  ];
  i18n = {
    defaultLocale = "en_US.UTF-8";
--- a/system/default.nix
+++ b/system/default.nix
@ -1,6 +1,7 @@
 {
  imports = [
    ./core
+    ./nix

    ./hardware/printing.nix
    ./hardware/fwupd.nix
--- a/system/nix/nixpkgs.nix
+++ b/system/nix/nixpkgs.nix
@ -1,18 +1,12 @@
 _: {
  nixpkgs = {
-    overlays = [
-      (_: prev: {
-        lib =
-          prev.lib
-          // import ../../lib {
-            inherit (prev) lib pkgs;
-          };
-      })
-    ];
-
    config = {
      allowUnfree = true;
-      permittedInsecurePackages = ["cinny-4.2.2" "cinny-unwrapped-4.2.2" "segger-jlink-qt4-796s" "openssl-1.1.1w"];
+      permittedInsecurePackages = [
+        "cinny-4.2.2"
+        "cinny-unwrapped-4.2.2"
+        "segger-jlink-qt4-796s"
+      ];
      segger-jlink.acceptLicense = true;
    };
  };
Author	SHA1	Message	Date
Anthony Rodriguez	645c8cfbf0	system: remove nix import from core to system/default.nix	2024-11-06 16:33:11 +01:00
Anthony Rodriguez	4c06bbd772	treewide: add mkSystem function for hosts and inject custom lib through _module.args	2024-11-06 16:27:40 +01:00
Anthony Rodriguez	a9b8cc60e0	hosts/solaire: avoid repeating paths	2024-11-06 16:25:57 +01:00