deepak/nixconf
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

Merge pull request 'maxos-not-unique' (#3) from maxos-not-unique into master
All checks were successful
gitea-deepak/nixconf/pipeline/head This commit looks good
Details
Test templates, puts into cache / nix (nix-runner) (push) Successful in 3m8s
Details

Browse Source 
Reviewed-on: #3
This commit is contained in:
Deepak Mallubhotla 2025-03-23 01:27:45 +00:00
commit 2050de0cc0
3 changed files with 8 additions and 287 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

208
flake.lock generated
View File

@ -1,52 +1,8 @@
{
"nodes": {
"NixOS-WSL": {
"inputs": {
"flake-compat": "flake-compat",
"flake-utils": "flake-utils",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1725882169,
"narHash": "sha256-v5L+Dh6KdyycIgcdIc6SQ1fRNNvFJmYz02+fyeptA2o=",
"owner": "nix-community",
"repo": "NixOS-WSL",
"rev": "34b95b3962f5b3436d4bae5091d1b2ff7c1eb180",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "NixOS-WSL",
"type": "github"
}
},
"NixOS-WSL-2405": {
"inputs": {
"flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_2",
"nixpkgs": [
"nixpkgs-24-05"
]
},
"locked": {
"lastModified": 1733854371,
"narHash": "sha256-K9qGHniYBbjqVcEiwXyiofj/IFf78L5F0/FCf+CKyr0=",
"owner": "nix-community",
"repo": "NixOS-WSL",
"rev": "dee4425dcee3149475ead0cb6a616b8a028c5888",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "NixOS-WSL",
"type": "github"
}
},
"NixOS-WSL-2411": {
"inputs": {
"flake-compat": "flake-compat_3",
"flake-compat": "flake-compat",
"nixpkgs": [
"nixpkgs-24-11"
]
@ -107,38 +63,6 @@
}
},
"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-compat_2": {
"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-compat_3": {
"flake": false,
"locked": {
"lastModified": 1733328505,
@ -154,83 +78,6 @@
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"homeManager": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1726036828,
"narHash": "sha256-ZQHbpyti0jcAKnwQY1lwmooecLmSG6wX1JakQ/eZNeM=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "8a1671642826633586d12ac3158e463c7a50a112",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"homeManager-24-05": {
"inputs": {
"nixpkgs": [
"nixpkgs-24-05"
]
},
"locked": {
"lastModified": 1726989464,
"narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-24.05",
"repo": "home-manager",
"type": "github"
}
},
"homeManager-24-11": {
"inputs": {
"nixpkgs": [
@ -268,22 +115,6 @@
"type": "github"
}
},
"nixpkgs-24-05": {
"locked": {
"lastModified": 1735286948,
"narHash": "sha256-JMRV2RI58nV1UqLXqm+lcea1/dr92fYjWU5S+Rz3fmE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "31ac92f9628682b294026f0860e14587a09ffb4b",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-24-11": {
"locked": {
"lastModified": 1741196730,
@ -451,23 +282,18 @@
},
"root": {
"inputs": {
"NixOS-WSL": "NixOS-WSL",
"NixOS-WSL-2405": "NixOS-WSL-2405",
"NixOS-WSL-2411": "NixOS-WSL-2411",
"claude-mcp-bundle": "claude-mcp-bundle",
"cmp-vimtex": "cmp-vimtex",
"homeManager": "homeManager",
"homeManager-24-05": "homeManager-24-05",
"homeManager-24-11": "homeManager-24-11",
"nixpkgs": "nixpkgs_2",
"nixpkgs-24-05": "nixpkgs-24-05",
"nixpkgs-24-11": "nixpkgs-24-11",
"nomodoro": "nomodoro",
"nvim-web-devicons": "nvim-web-devicons",
"parrot-nvim": "parrot-nvim",
"sops-nix": "sops-nix",
"spaceport-nvim": "spaceport-nvim",
"systems": "systems_3",
"systems": "systems",
"treefmt-nix": "treefmt-nix_2",
"zsh-completions": "zsh-completions"
}
@ -508,36 +334,6 @@
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_3": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",

41
flake.nix
View File

@ -4,24 +4,10 @@
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
treefmt-nix.url = "github:numtide/treefmt-nix";
sops-nix.url = "github:Mic92/sops-nix";
nixpkgs-24-05.url = "github:NixOS/nixpkgs/nixos-24.05";
nixpkgs-24-11.url = "github:NixOS/nixpkgs/nixos-24.11";
# only use this for Maxos, prefer specifying version explicitly
homeManager = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
homeManager-24-05 = {
url = "github:nix-community/home-manager/release-24.05";
inputs.nixpkgs.follows = "nixpkgs-24-05";
};
treefmt-nix.url = "github:numtide/treefmt-nix";
sops-nix.url = "github:Mic92/sops-nix";
NixOS-WSL-2411 = {
url = "github:nix-community/NixOS-WSL";
@ -33,16 +19,6 @@
inputs.nixpkgs.follows = "nixpkgs-24-11";
};
NixOS-WSL-2405 = {
url = "github:nix-community/NixOS-WSL";
inputs.nixpkgs.follows = "nixpkgs-24-05";
};
NixOS-WSL = {
url = "github:nix-community/NixOS-WSL";
inputs.nixpkgs.follows = "nixpkgs";
};
# Custom Vim Plugins
cmp-vimtex = {
url = "github:micangl/cmp-vimtex/master";
@ -85,11 +61,6 @@
self,
systems,
nixpkgs,
homeManager,
NixOS-WSL,
NixOS-WSL-2405,
nixpkgs-24-05,
homeManager-24-05,
cmp-vimtex,
spaceport-nvim,
nomodoro,
@ -113,15 +84,7 @@
{
nixosConfigurations = (
import ./hosts/hosts.nix {
inherit nixpkgs;
inherit homeManager;
inherit inputs;
inherit (nixpkgs) lib;
inherit NixOS-WSL;
inherit NixOS-WSL-2405;
inherit nixpkgs-24-05;
inherit homeManager-24-05;
inherit cmp-vimtex;
inherit customPackageOverlay;
}
);

46
hosts/hosts.nix
View File

@ -1,15 +1,11 @@
{
lib,
inputs,
nixpkgs-24-05,
homeManager,
homeManager-24-05,
NixOS-WSL-2405,
customPackageOverlay,
...
# ...
}:
let
linuxSystem = "x86_64-linux";
lib = inputs.nixpkgs.lib;
nixpkgs-unstable = import inputs.nixpkgs {
system = linuxSystem;
config.allowUnfreePredicate =
@ -20,7 +16,7 @@ let
};
in
{
"maxos" = lib.nixosSystem {
"maxos" = inputs.nixpkgs-24-11.lib.nixosSystem {
system = linuxSystem;
specialArgs = {
inherit customPackageOverlay;
@ -30,7 +26,7 @@ in
modules = [
./maxos/configuration.nix
inputs.sops-nix.nixosModules.sops
homeManager.nixosModules.home-manager
inputs.homeManager-24-11.nixosModules.home-manager
{
home-manager.extraSpecialArgs = {
withGUI = true;
@ -82,40 +78,6 @@ in
inputs.NixOS-WSL-2411.nixosModules.wsl
];
};
"nixosWSL" = nixpkgs-24-05.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {
inherit customPackageOverlay;
inherit nixpkgs-unstable;
hostname = "nixosWSL";
stateVersion = "22.05";
withDocker = false;
};
modules = [
./commonWSL-configuration.nix
inputs.sops-nix.nixosModules.sops
homeManager-24-05.nixosModules.home-manager
{
home-manager.extraSpecialArgs = {
withGUI = false;
gitSigningKey = "8F904A3FC7021497";
inherit nixpkgs-unstable;
};
home-manager.useGlobalPkgs = true;
home-manager.users.deepak = {
imports = [
../home/deepak/home.nix
];
};
home-manager.sharedModules = [
inputs.sops-nix.homeManagerModules.sops
];
}
NixOS-WSL-2405.nixosModules.wsl
];
};
"nixosEggYoke" = inputs.nixpkgs-24-11.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {