dave/nix-config
1
0
Fork 0
mirror of https://github.com/davegallant/nix-config synced 2025-08-07 13:22:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup flake.nix

Browse Source
This commit is contained in:
Dave Gallant
2025-04-06 00:58:53 -04:00
parent e7c50bac19
commit 33125cf4c6
3 changed files with 23 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
flake.lock generated
View File

@@ -532,7 +532,7 @@
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://flakehub.com/f/nix-community/home-manager/%2A" "url": "https://flakehub.com/f/nix-community/home-manager/0.2411.3887.tar.gz"
} }
}, },
"home-manager_2": { "home-manager_2": {
@@ -565,11 +565,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739757849, "lastModified": 1743808813,
"narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=", "narHash": "sha256-2lDQBOmlz9ggPxcS7/GvcVdzXMIiT+PpMao6FbLJSr0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe", "rev": "a9f8b3db211b4609ddd83683f9db89796c7f6ac6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -703,22 +703,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-master": {
"locked": {
"lastModified": 1743802893,
"narHash": "sha256-w9rClYqQ61XsK34OflvsxxuxCHS82TYrbuyz/w4FQgE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "017583d659ea1dee77b5f37b57ec311d5d522c25",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-regression": { "nixpkgs-regression": {
"locked": { "locked": {
"lastModified": 1643052045, "lastModified": 1643052045,
@@ -737,18 +721,16 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1743689281, "lastModified": 1743827369,
"narHash": "sha256-y7Hg5lwWhEOgflEHRfzSH96BOt26LaYfrYWzZ+VoVdg=", "narHash": "sha256-rpqepOZ8Eo1zg+KJeWoq1HAOgoMCDloqv5r2EAa9TSA=",
"owner": "NixOS", "rev": "42a1c966be226125b48c384171c44c651c236c22",
"repo": "nixpkgs", "revCount": 779115,
"rev": "2bfc080955153be0be56724be6fa5477b4eefabb", "type": "tarball",
"type": "github" "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.779115%2Brev-42a1c966be226125b48c384171c44c651c236c22/01960881-4b41-7d70-9302-91f764149479/source.tar.gz"
}, },
"original": { "original": {
"owner": "NixOS", "type": "tarball",
"ref": "nixpkgs-unstable", "url": "https://flakehub.com/f/NixOS/nixpkgs/0.1"
"repo": "nixpkgs",
"type": "github"
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
@@ -806,16 +788,16 @@
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://flakehub.com/f/NixOS/nixpkgs/%2A" "url": "https://flakehub.com/f/NixOS/nixpkgs/0.2411.716687.tar.gz"
} }
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1741600792, "lastModified": 1743703532,
"narHash": "sha256-yfDy6chHcM7pXpMF4wycuuV+ILSTG486Z/vLx/Bdi6Y=", "narHash": "sha256-s1KLDALEeqy+ttrvqV3jx9mBZEvmthQErTVOAzbjHZs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ebe2788eafd539477f83775ef93c3c7e244421d3", "rev": "bdb91860de2f719b57eef819b5617762f7120c70",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -884,7 +866,6 @@
"fh": "fh", "fh": "fh",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_5",
"nixpkgs-master": "nixpkgs-master",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"nixvim": "nixvim", "nixvim": "nixvim",
"stylix": "stylix" "stylix": "stylix"
@@ -926,11 +907,11 @@
"tinted-tmux": "tinted-tmux" "tinted-tmux": "tinted-tmux"
}, },
"locked": { "locked": {
"lastModified": 1741961698, "lastModified": 1743892916,
"narHash": "sha256-utsgC6H3ja6sLAXMd8//I2D7yjyScFqVDRX0wpbqPZo=", "narHash": "sha256-RWvfosAHobUiGMhWIS915WF4TsrQYDXv1gJk59TLAdU=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "9bfc74f330ead111e8ea354b2220a431b0cfaa26", "rev": "aebfec1998ebbc087de0104e4a4cec99ec1e3f7a",
"type": "github" "type": "github"
}, },
"original": { "original": {

21
flake.nix
View File

@@ -4,18 +4,18 @@
inputs = { inputs = {
determinate.url = "https://flakehub.com/f/DeterminateSystems/determinate/3.2.1.tar.gz"; determinate.url = "https://flakehub.com/f/DeterminateSystems/determinate/3.2.1.tar.gz";
fh.url = "https://flakehub.com/f/DeterminateSystems/fh/*"; fh.url = "https://flakehub.com/f/DeterminateSystems/fh/*";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nixpkgs-unstable.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1";
nixpkgs-master.url = "github:NixOS/nixpkgs/master"; nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.2411.716687.tar.gz";
nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/*";
darwin = { darwin = {
url = "github:lnl7/nix-darwin/nix-darwin-24.11"; url = "github:lnl7/nix-darwin/nix-darwin-24.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
home-manager.url = "https://flakehub.com/f/nix-community/home-manager/*"; home-manager.url = "https://flakehub.com/f/nix-community/home-manager/0.2411.3887.tar.gz";
nixvim = { nixvim = {
url = "github:nix-community/nixvim/nixos-24.11"; url = "github:nix-community/nixvim/nixos-24.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
# stylix.url = "https://flakehub.com/f/danth/stylix/0.1.717.tar.gz";
stylix.url = "github:danth/stylix/release-24.11"; stylix.url = "github:danth/stylix/release-24.11";
}; };
@@ -26,7 +26,6 @@
determinate, determinate,
home-manager, home-manager,
nixpkgs, nixpkgs,
nixpkgs-master,
nixpkgs-unstable, nixpkgs-unstable,
stylix, stylix,
... ...
@@ -38,16 +37,11 @@
system = "x86_64-linux"; system = "x86_64-linux";
config.allowUnfree = true; config.allowUnfree = true;
}; };
master = import nixpkgs-master {
system = "x86_64-linux";
config.allowUnfree = true;
};
in in
{ {
hephaestus = nixpkgs.lib.nixosSystem { hephaestus = nixpkgs.lib.nixosSystem {
specialArgs = { specialArgs = {
inherit fh; inherit fh;
inherit master;
inherit unstable; inherit unstable;
}; };
modules = [ modules = [
@@ -95,7 +89,6 @@
]; ];
extraSpecialArgs = { extraSpecialArgs = {
inherit unstable; inherit unstable;
inherit master;
}; };
}; };
}; };
@@ -112,17 +105,12 @@
config.allowUnfree = true; config.allowUnfree = true;
inherit system; inherit system;
}; };
master = import nixpkgs-master {
config.allowUnfree = true;
inherit system;
};
in in
{ {
zelus = darwin.lib.darwinSystem { zelus = darwin.lib.darwinSystem {
inherit system; inherit system;
specialArgs = { specialArgs = {
inherit unstable; inherit unstable;
inherit master;
}; };
modules = [ modules = [
@@ -146,7 +134,6 @@
]; ];
extraSpecialArgs = { extraSpecialArgs = {
inherit unstable; inherit unstable;
inherit master;
}; };
}; };
}; };

1
home/default.nix
View File

@@ -2,7 +2,6 @@
lib, lib,
pkgs, pkgs,
unstable, unstable,
master,
... ...
}: }:
let let