dave/nix-config
1
0
Fork 0
mirror of https://github.com/davegallant/nix-config synced 2025-10-08 14:16:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: dave:4555aeb8bc54854d13e75cccfb89f73a36535a3b
Branches Tags
dave:main
..
compare: dave:4cdfcd7df7cba8b94a062199a2a0111994ede3e8
Branches Tags
dave:main

4 Commits
4555aeb8bc ... 4cdfcd7df7

Author SHA1 Message Date
Dave Gallant
4cdfcd7df7 Remove oh-my-zsh plugins 2024-03-10 16:34:15 -04:00
Dave Gallant
a489027744 Cleanup duplicate packages 2024-03-10 13:11:40 -04:00
Dave Gallant
b21ecbdb3b Remove defaultModules 2024-03-10 13:01:45 -04:00
Dave Gallant
80119dd363 Remove nix-ld repo 2024-03-10 12:57:47 -04:00
4 changed files with 51 additions and 98 deletions
Expand all files Collapse all files

44
flake.lock generated
View File

@@ -138,24 +138,6 @@
"type": "github"
}
},
"nix-ld": {
"inputs": {
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1701153607,
"narHash": "sha256-h+odOVyiGmEERMECoFOj5P7FPiMR8IPRzroFA4sKivg=",
"owner": "Mic92",
"repo": "nix-ld",
"rev": "bf5aa84a713c31d95b4307e442e966d6c7fd7ae7",
"type": "github"
},
"original": {
"owner": "Mic92",
"repo": "nix-ld",
"type": "github"
}
},
"nixos-hardware": {
"locked": {
"lastModified": 1709410583,
@@ -173,15 +155,16 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1686752049,
"narHash": "sha256-GtSbXZ6ia/o+f/I5O/5ee8HGmKuwQWZhtyd2u5y5TOk=",
"lastModified": 1710021367,
"narHash": "sha256-FuMVdWqXMT38u1lcySYyv93A7B8wU0EGzUr4t4jQu8g=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "eafbb465a91939b9a47bc05fcef0f948903755c1",
"rev": "b94a96839afcc56de3551aa7472b8d9a3e77e05d",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-23.11",
"repo": "nixpkgs",
"type": "github"
}
@@ -218,22 +201,6 @@
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1710021367,
"narHash": "sha256-FuMVdWqXMT38u1lcySYyv93A7B8wU0EGzUr4t4jQu8g=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b94a96839afcc56de3551aa7472b8d9a3e77e05d",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-23.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixvim": {
"inputs": {
"beautysh": "beautysh",
@@ -314,9 +281,8 @@
"inputs": {
"darwin": "darwin",
"home-manager": "home-manager",
"nix-ld": "nix-ld",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_2",
"nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable",
"nixvim": "nixvim"
}

99
flake.nix
View File

@@ -8,8 +8,6 @@
home-manager.url = "github:nix-community/home-manager/release-23.11";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
nix-ld.url = "github:Mic92/nix-ld";
nixos-hardware.url = "github:NixOS/nixos-hardware";
darwin = {
@@ -30,74 +28,69 @@
, nixpkgs
, nixpkgs-unstable
, nixos-hardware
, nix-ld
, ...
} @ inputs: {
nixosConfigurations =
let
modulesDir = ./modules;
unstable = import nixpkgs-unstable {
system = "x86_64-linux";
config.allowUnfree = true;
config.permittedInsecurePackages = [ ];
};
defaultModules = [
home-manager.nixosModules.home-manager
./fonts.nix
./packages.nix
./upgrade-diff.nix
({ config
, lib
, ...
}: {
config = {
nix = {
settings = {
auto-optimise-store = true;
sandbox = false;
substituters = [ "https://davegallant.cachix.org" ];
trusted-users = [ "root" "dave" ];
trusted-public-keys = [
"davegallant.cachix.org-1:SsUMqL4+tF2R3/G6X903E9laLlY1rES2QKFfePegF08="
];
};
registry = { nixpkgs.flake = nixpkgs; };
gc = {
automatic = true;
dates = "daily";
options = "--delete-older-than 14d";
};
};
nixpkgs.overlays = [
(import ./overlays)
];
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
users.dave.imports = [
./home/default.nix
inputs.nixvim.homeManagerModules.nixvim
];
extraSpecialArgs = {
inherit unstable;
};
};
};
})
];
in
{
hephaestus = nixpkgs.lib.nixosSystem {
specialArgs = { inherit unstable; };
modules =
[
./fonts.nix
./machines/hephaestus/configuration.nix
./packages.nix
./services/netdata/default.nix
]
++ defaultModules;
./upgrade-diff.nix
home-manager.nixosModules.home-manager
({ config
, lib
, ...
}: {
config = {
nix = {
settings = {
auto-optimise-store = true;
sandbox = false;
substituters = [ "https://davegallant.cachix.org" ];
trusted-users = [ "root" "dave" ];
trusted-public-keys = [
"davegallant.cachix.org-1:SsUMqL4+tF2R3/G6X903E9laLlY1rES2QKFfePegF08="
];
};
registry = { nixpkgs.flake = nixpkgs; };
gc = {
automatic = true;
dates = "daily";
options = "--delete-older-than 14d";
};
};
nixpkgs.overlays = [
(import ./overlays)
];
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
users.dave.imports = [
./home/default.nix
inputs.nixvim.homeManagerModules.nixvim
];
extraSpecialArgs = {
inherit unstable;
};
};
};
})
];
};
};

5
home/default.nix
View File

@@ -183,11 +183,6 @@ in
"oh-my-zsh" = {
enable = true;
plugins = [
"gitfast"
"last-working-dir"
"tmux"
];
};
};

1
machines/hephaestus/configuration.nix
View File

@@ -238,7 +238,6 @@ in
podman
psst
qemu
rustup
strace
tailscale
traceroute