Johan Rong 2 月之前
父節點
當前提交
198b8ef63d
共有 3 個文件被更改,包括 70 次插入3 次删除
  1. 55 0
      flake.lock
  2. 8 1
      flake.nix
  3. 7 2
      nixos/features/system/basic.nix

+ 55 - 0
flake.lock

@@ -1,5 +1,23 @@
 {
   "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -21,6 +39,27 @@
         "type": "github"
       }
     },
+    "moose": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1780510800,
+        "narHash": "sha256-IPWhm+vgkbIL0hPFnpzZWee/1LyaWO9PBvepaydf6w8=",
+        "owner": "johron",
+        "repo": "moose",
+        "rev": "6f909720169554d994516d7ee8a6d8ec365392bb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "johron",
+        "repo": "moose",
+        "type": "github"
+      }
+    },
     "nix-flatpak": {
       "locked": {
         "lastModified": 1767983141,
@@ -56,9 +95,25 @@
     "root": {
       "inputs": {
         "home-manager": "home-manager",
+        "moose": "moose",
         "nix-flatpak": "nix-flatpak",
         "nixpkgs": "nixpkgs"
       }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
     }
   },
   "root": "root",

+ 8 - 1
flake.nix

@@ -8,6 +8,10 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.7.0";
+    moose = {
+      url = "github:johron/moose";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs =
@@ -45,10 +49,13 @@
           nixpkgs,
           home-manager,
           modules ? [ ],
-          overlays ? [ ],
+          overlays ? [],
         }:
         nixpkgs.lib.nixosSystem {
           system = host.arch;
+          specialArgs = {
+            inherit inputs;
+          };
           modules = [
             nix-flatpak.nixosModules.nix-flatpak
             ./hosts/${host.dir}/configuration.nix

+ 7 - 2
nixos/features/system/basic.nix

@@ -1,7 +1,10 @@
-{ config, pkgs, ... }:
+{ config, pkgs, inputs, ... }:
 
 {
-  environment.systemPackages = with pkgs; [
+  environment.systemPackages = let
+    moose = inputs.moose.packages.${pkgs.system}.default;
+  in 
+  with pkgs; [
     lf
     jq
     gh
@@ -32,6 +35,8 @@
     discord
     proton-vpn
     wireguard-tools
+
+    moose
   ];
 
   services.flatpak = {