summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Vink <mike1994vink@gmail.com>2023-10-09 16:10:56 +0000
committerMike Vink <mike1994vink@gmail.com>2023-10-09 16:10:56 +0000
commit9f587b692460a14e5a3f3f1a289110dd2a1795b7 (patch)
tree0762d8be74cb07f9e2e21e3a794aa9e435ef449a
parentbf59bf60a2361c08488c0540628524265b4dd3ae (diff)
fixup
-rw-r--r--flake.lock102
-rw-r--r--flake.nix1
-rw-r--r--profiles/core/meta.nix (renamed from profiles/station/meta.nix)0
-rw-r--r--profiles/core/neovim.nix (renamed from profiles/station/neovim.nix)0
4 files changed, 94 insertions, 9 deletions
diff --git a/flake.lock b/flake.lock
index 6346544..4f4b540 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,39 @@
{
"nodes": {
+ "flake-compat": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1696426674,
+ "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+ "owner": "edolstra",
+ "repo": "flake-compat",
+ "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+ "type": "github"
+ },
+ "original": {
+ "owner": "edolstra",
+ "repo": "flake-compat",
+ "type": "github"
+ }
+ },
+ "flake-utils": {
+ "inputs": {
+ "systems": "systems"
+ },
+ "locked": {
+ "lastModified": 1694529238,
+ "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+ "type": "github"
+ },
+ "original": {
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "type": "github"
+ }
+ },
"home-manager": {
"inputs": {
"nixpkgs": [
@@ -20,18 +54,38 @@
"type": "github"
}
},
+ "nixos-wsl": {
+ "inputs": {
+ "flake-compat": "flake-compat",
+ "flake-utils": "flake-utils",
+ "nixpkgs": "nixpkgs"
+ },
+ "locked": {
+ "lastModified": 1696867472,
+ "narHash": "sha256-L/PRTyWz5rZ1V6v1MPh3xWndlna9qNHLmNu8x3Y5+xg=",
+ "owner": "ivi-vink",
+ "repo": "NixOS-WSL",
+ "rev": "5939bc5ae845f629d74985668aede2055a9bc08b",
+ "type": "github"
+ },
+ "original": {
+ "owner": "ivi-vink",
+ "repo": "NixOS-WSL",
+ "type": "github"
+ }
+ },
"nixpkgs": {
"locked": {
- "lastModified": 1695644571,
- "narHash": "sha256-asS9dCCdlt1lPq0DLwkVBbVoEKuEuz+Zi3DG7pR/RxA=",
- "owner": "nixos",
+ "lastModified": 1696697597,
+ "narHash": "sha256-q26Qv4DQ+h6IeozF2o1secyQG0jt2VUT3V0K58jr3pg=",
+ "owner": "NixOS",
"repo": "nixpkgs",
- "rev": "6500b4580c2a1f3d0f980d32d285739d8e156d92",
+ "rev": "5a237aecb57296f67276ac9ab296a41c23981f56",
"type": "github"
},
"original": {
- "owner": "nixos",
- "ref": "nixos-unstable",
+ "owner": "NixOS",
+ "ref": "nixos-23.05",
"repo": "nixpkgs",
"type": "github"
}
@@ -54,6 +108,22 @@
},
"nixpkgs_2": {
"locked": {
+ "lastModified": 1695644571,
+ "narHash": "sha256-asS9dCCdlt1lPq0DLwkVBbVoEKuEuz+Zi3DG7pR/RxA=",
+ "owner": "nixos",
+ "repo": "nixpkgs",
+ "rev": "6500b4580c2a1f3d0f980d32d285739d8e156d92",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nixos",
+ "ref": "nixos-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_3": {
+ "locked": {
"lastModified": 1694760568,
"narHash": "sha256-3G07BiXrp2YQKxdcdms22MUx6spc6A++MSePtatCYuI=",
"owner": "NixOS",
@@ -71,13 +141,14 @@
"root": {
"inputs": {
"home-manager": "home-manager",
- "nixpkgs": "nixpkgs",
+ "nixos-wsl": "nixos-wsl",
+ "nixpkgs": "nixpkgs_2",
"sops-nix": "sops-nix"
}
},
"sops-nix": {
"inputs": {
- "nixpkgs": "nixpkgs_2",
+ "nixpkgs": "nixpkgs_3",
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
@@ -93,6 +164,21 @@
"repo": "sops-nix",
"type": "github"
}
+ },
+ "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",
diff --git a/flake.nix b/flake.nix
index c5611fa..dead2a0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -59,7 +59,6 @@
] ++ (attrValues
(attrsets.mergeAttrsList (map modulesIn [
./profiles/core
- ./profiles/station
])));
};
diff --git a/profiles/station/meta.nix b/profiles/core/meta.nix
index 3f1d334..3f1d334 100644
--- a/profiles/station/meta.nix
+++ b/profiles/core/meta.nix
diff --git a/profiles/station/neovim.nix b/profiles/core/neovim.nix
index 5cca7f0..5cca7f0 100644
--- a/profiles/station/neovim.nix
+++ b/profiles/core/neovim.nix