mirror of
https://github.com/willemml/dotfiles.nix.git
synced 2025-04-12 19:27:17 +00:00
Simplifies flake overlays, re-adds emacs-overlay
This commit is contained in:
parent
ef0d9f0bf7
commit
2498a0670d
GPG key ID:
C3DE5DF6198DACBD
5 changed files with 113 additions and 75 deletions
82
flake.lock
generated
82
flake.lock
generated
|
|
@ -21,6 +21,28 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"emacs-overlay": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1700156459,
|
||||
"narHash": "sha256-NkEcyi6qqaYBqeBbV6Y8aOSuhnX23mM/XJ413Nw8cDM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"rev": "94a0f967876bbb4b42292026d2c776cade605589",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"fenix": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs",
|
||||
|
|
@ -91,7 +113,25 @@
|
|||
},
|
||||
"flake-utils": {
|
||||
"inputs": {
|
||||
"systems": "systems_2"
|
||||
"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"
|
||||
}
|
||||
},
|
||||
"flake-utils_2": {
|
||||
"inputs": {
|
||||
"systems": "systems_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1685518550,
|
||||
|
|
@ -153,7 +193,7 @@
|
|||
"inputs": {
|
||||
"hyprland-protocols": "hyprland-protocols",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"systems": "systems",
|
||||
"systems": "systems_2",
|
||||
"wlroots": "wlroots",
|
||||
"xdph": "xdph"
|
||||
},
|
||||
|
|
@ -293,6 +333,22 @@
|
|||
}
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1699994397,
|
||||
"narHash": "sha256-xxNeIcMNMXH2EA9IAX6Cny+50mvY22LhIBiGZV363gc=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d4b5a67bbe9ef750bd2fdffd4cad400dd5553af8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-23.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-stable_2": {
|
||||
"locked": {
|
||||
"lastModified": 1685801374,
|
||||
"narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=",
|
||||
|
|
@ -343,12 +399,12 @@
|
|||
"pre-commit-hooks": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_2",
|
||||
"flake-utils": "flake-utils",
|
||||
"flake-utils": "flake-utils_2",
|
||||
"gitignore": "gitignore",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
"nixpkgs-stable": "nixpkgs-stable_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1699271226,
|
||||
|
|
@ -367,6 +423,7 @@
|
|||
"root": {
|
||||
"inputs": {
|
||||
"darwin": "darwin",
|
||||
"emacs-overlay": "emacs-overlay",
|
||||
"fenix": "fenix",
|
||||
"flake-parts": "flake-parts",
|
||||
"home-manager": "home-manager",
|
||||
|
|
@ -412,6 +469,21 @@
|
|||
}
|
||||
},
|
||||
"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": 1689347949,
|
||||
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
|
||||
|
|
@ -426,7 +498,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_2": {
|
||||
"systems_3": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
|
|
|
|||
64
flake.nix
64
flake.nix
|
|
@ -7,6 +7,9 @@
|
|||
darwin.url = "github:willemml/nix-darwin?ref=feat/networking.hosts";
|
||||
darwin.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
emacs-overlay.url = "github:nix-community/emacs-overlay";
|
||||
emacs-overlay.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
fenix.url = "github:nix-community/fenix";
|
||||
|
||||
flake-parts.url = "github:hercules-ci/flake-parts";
|
||||
|
|
@ -16,17 +19,17 @@
|
|||
|
||||
hyprland.url = "github:hyprwm/Hyprland";
|
||||
|
||||
nixos-apple-silicon.url = "github:tpwrules/nixos-apple-silicon";
|
||||
nixos-apple-silicon.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
|
||||
pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
nix-index-database.url = "github:nix-community/nix-index-database";
|
||||
nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
nix-github-actions.url = "github:nix-community/nix-github-actions";
|
||||
nix-github-actions.inputs.nixpkgs.follows = "nixpkgs";
|
||||
nix-github-actions.url = "github:nix-community/nix-github-actions";
|
||||
|
||||
nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
|
||||
nix-index-database.url = "github:nix-community/nix-index-database";
|
||||
|
||||
nixos-apple-silicon.inputs.nixpkgs.follows = "nixpkgs";
|
||||
nixos-apple-silicon.url = "github:tpwrules/nixos-apple-silicon";
|
||||
|
||||
pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs";
|
||||
pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
|
||||
};
|
||||
|
||||
outputs = {
|
||||
|
|
@ -42,11 +45,6 @@
|
|||
globals = import ./common/globals.nix;
|
||||
in
|
||||
inputs.flake-parts.lib.mkFlake {inherit inputs;} rec {
|
||||
imports = [
|
||||
./flake/home-manager.nix
|
||||
./flake/overlays.nix
|
||||
];
|
||||
|
||||
systems = [
|
||||
"x86_64-linux"
|
||||
"x86_64-darwin"
|
||||
|
|
@ -69,22 +67,34 @@
|
|||
|
||||
forAllSystems = nixpkgs.lib.genAttrs systems;
|
||||
in {
|
||||
nixosConfigurations.x86_64-live = mkNixos "x86_64" [./nixos/hosts/x86_64-live.nix];
|
||||
nixosConfigurations.aarch64-live = mkNixos "aarch64" [./nixos/hosts/aarch64-live.nix];
|
||||
overlays = {
|
||||
default = import ./packages;
|
||||
fenix = inputs.fenix.overlays.default;
|
||||
emacs = inputs.emacs-overlay.overlays.default;
|
||||
};
|
||||
|
||||
nixosConfigurations.nixbox = mkNixos "x86_64" [./nixos/hosts/nixbox.nix];
|
||||
nixosConfigurations.thinkpad = mkNixos "x86_64" [./nixos/hosts/thinkpad.nix];
|
||||
nixosConfigurations = {
|
||||
x86_64-live = mkNixos "x86_64" [./nixos/hosts/x86_64-live.nix];
|
||||
aarch64-live = mkNixos "aarch64" [./nixos/hosts/aarch64-live.nix];
|
||||
|
||||
nixosConfigurations.darwin-arm-minimal-vm = mkNixos "aarch64" [./nixos/hosts/vms/aarch64-darwin-host/minimal.nix];
|
||||
nixosConfigurations.darwin-arm-homeconsole-vm = mkNixos "aarch64" [./nixos/hosts/vms/aarch64-darwin-host/home-console.nix];
|
||||
nixbox = mkNixos "x86_64" [./nixos/hosts/nixbox.nix];
|
||||
thinkpad = mkNixos "x86_64" [./nixos/hosts/thinkpad.nix];
|
||||
|
||||
darwin-arm-minimal-vm = mkNixos "aarch64" [./nixos/hosts/vms/aarch64-darwin-host/minimal.nix];
|
||||
darwin-arm-homeconsole-vm = mkNixos "aarch64" [./nixos/hosts/vms/aarch64-darwin-host/home-console.nix];
|
||||
};
|
||||
|
||||
darwinConfigurations.zeus = mkDarwin "aarch64" [./nixos/hosts/zeus.nix];
|
||||
|
||||
packages.aarch64-darwin.minimal-vm = self.nixosConfigurations.darwin-arm-minimal-vm.config.system.build.vm;
|
||||
packages.aarch64-darwin.homeconsole-vm = self.nixosConfigurations.darwin-arm-homeconsole-vm.config.system.build.vm;
|
||||
packages = {
|
||||
aarch64-darwin = {
|
||||
minimal-vm = self.nixosConfigurations.darwin-arm-minimal-vm.config.system.build.vm;
|
||||
homeconsole-vm = self.nixosConfigurations.darwin-arm-homeconsole-vm.config.system.build.vm;
|
||||
};
|
||||
|
||||
packages.x86_64-linux.live-image = self.nixosConfigurations.x86_64-live.config.system.build.isoImage;
|
||||
packages.aarch64-linux.live-image = self.nixosConfigurations.x86_64-live.config.system.build.isoImage;
|
||||
x86_64-linux.live-image = self.nixosConfigurations.x86_64-live.config.system.build.isoImage;
|
||||
aarch64-linux.live-image = self.nixosConfigurations.x86_64-live.config.system.build.isoImage;
|
||||
};
|
||||
|
||||
githubActions = nix-github-actions.lib.mkGithubMatrix {
|
||||
checks.x86_64-linux = {
|
||||
|
|
@ -109,10 +119,6 @@
|
|||
};
|
||||
};
|
||||
|
||||
checks.home = self'.packages.home;
|
||||
|
||||
packages.home = self.homeConfigurations.${system}.willem.activationPackage;
|
||||
|
||||
devShells.default = pkgs.mkShell {
|
||||
inherit (self'.checks.pre-commit-check) shellHook;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,29 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
flake-parts-lib,
|
||||
self,
|
||||
...
|
||||
}: let
|
||||
inherit
|
||||
(lib)
|
||||
mkOption
|
||||
types
|
||||
;
|
||||
inherit (flake-parts-lib) mkSubmoduleOptions;
|
||||
in {
|
||||
options = {
|
||||
flake = mkSubmoduleOptions {
|
||||
homeManagerModules = mkOption {
|
||||
type = types.attrsOf types.unspecified;
|
||||
default = {};
|
||||
apply = lib.mapAttrs (k: v: {
|
||||
_file = "${toString self.outPath}/flake.nix#homeManagerModules.${k}";
|
||||
imports = [v];
|
||||
});
|
||||
description = ''
|
||||
Home Manager modules.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
{
|
||||
self,
|
||||
inputs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
flake.overlays = {
|
||||
default = import ../packages;
|
||||
fenix = inputs.fenix.overlays.default;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
{...}: {
|
||||
imports = [
|
||||
../../../users/willem/home.nix
|
||||
../../../users/willem/home/linux.nix
|
||||
./minimal.nix
|
||||
];
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue