Base my home-manager config on nixpkgs-unstable
Flake Check / flake-check (pull_request) Successful in 1m30s Details
Flake Check / flake-check (push) Successful in 45s Details

pull/70/head
Tudor Roman 2024-03-05 11:40:28 +01:00
parent 1ae1820a4f
commit 968b772fe0
Signed by: tudor
SSH Key Fingerprint: SHA256:3CwS9plgXBecpXImPGxDIaSktUXBejbV/zerZMqzzBk
6 changed files with 57 additions and 8 deletions

View File

@ -319,6 +319,26 @@
"type": "github"
}
},
"home-manager-unstable": {
"inputs": {
"nixpkgs": [
"unstable"
]
},
"locked": {
"lastModified": 1709578243,
"narHash": "sha256-hF96D+c2PBmAFhymMw3z8hou++lqKtZ7IzpFbYeL1/Y=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "23ff9821bcaec12981e32049e8687f25f11e5ef3",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"hypr-contrib": {
"inputs": {
"nixpkgs": [
@ -495,6 +515,7 @@
"flake-parts": "flake-parts",
"haumea": "haumea",
"home-manager": "home-manager",
"home-manager-unstable": "home-manager-unstable",
"hypr-contrib": "hypr-contrib",
"nixgl": "nixgl",
"nixos-hardware": "nixos-hardware",

View File

@ -33,6 +33,11 @@
inputs.nixpkgs.follows = "nixpkgs";
};
home-manager-unstable = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "unstable";
};
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
flake-compat = {
@ -68,9 +73,11 @@
haumea,
pre-commit-hooks,
nixpkgs,
unstable,
deploy-rs,
flake-parts,
home-manager,
home-manager-unstable,
...
}: let
systems = ["x86_64-linux" "aarch64-linux"];
@ -132,9 +139,22 @@
homeConfigurations = let
mkHomeConfiguration = name: user: system: let
pkgs = self.lib.nixpkgs.mkPkgs {inherit system;};
stablePkgs = self.lib.nixpkgs.mkPkgs {inherit system;};
hm = inputs.home-manager;
in
inputs.home-manager.lib.homeManagerConfiguration {
mkHomeConfiguration' hm stablePkgs name user;
mkHomeConfigurationUnstable = name: user: system: let
unstablePkgs = self.lib.nixpkgs.mkPkgs {
inherit system;
nixpkgsVersion = unstable;
};
hm = inputs.home-manager-unstable;
in
mkHomeConfiguration' hm unstablePkgs name user;
mkHomeConfiguration' = hm: pkgs: name: user:
hm.lib.homeManagerConfiguration {
inherit pkgs;
extraSpecialArgs = specialArgs;
@ -159,7 +179,7 @@
};
in {
"tudor" = mkHomeConfiguration "tudor" "tudor" "x86_64-linux";
"tudor@pepper-penguin" = mkHomeConfiguration "tudor@pepper-penguin" "tudor" "x86_64-linux";
"tudor@pepper-penguin" = mkHomeConfigurationUnstable "tudor@pepper-penguin" "tudor" "x86_64-linux";
};
deploy.nodes."ceres" = let
@ -185,6 +205,7 @@
packages.nixos-rebuild = pkgs.nixos-rebuild;
packages.home-manager = inputs.home-manager.packages.${system}.default;
packages.home-manager-unstable = inputs.home-manager-unstable.packages.${system}.default;
packages.agenix = inputs.agenix.packages.${system}.default;
packages.deploy-rs = deployPkgs.${system}.deploy-rs.deploy-rs;
@ -198,6 +219,7 @@
'';
buildInputs = with pkgs; [
self'.packages.home-manager
self'.packages.home-manager-unstable
self'.packages.nixos-rebuild
self'.packages.agenix
self'.packages.deploy-rs

View File

@ -1,6 +1,7 @@
{
self,
inputs,
nixpkgs,
...
}: {
defaultConfig = {
@ -16,8 +17,11 @@
})
];
mkPkgs = {system}:
import inputs.nixpkgs {
mkPkgs = {
nixpkgsVersion ? nixpkgs,
system,
}:
import nixpkgsVersion {
inherit system;
config = self.defaultConfig;
overlays = self.mkDefaultOverlays {inherit system;};

View File

@ -49,7 +49,8 @@ in
else
-- for some reason the version of wezterm in nixpkgs
-- doesn't have 'GruvboxLight'
return 'Gruvbox (Gogh)'
-- return 'Gruvbox (Gogh)'
return 'GruvboxLight'
end
end

View File

@ -17,6 +17,7 @@ in
config = mkIf cfg.enable {
nix.registry.stable.flake = flake.inputs.nixpkgs;
nix.registry.unstable.flake = flake.inputs.unstable;
nixpkgs.overlays = mkIf cfg.installAttic [
flake.inputs.attic.overlays.default
];

View File

@ -9,12 +9,12 @@
scale = 1.25;
};
monitor1 = {
criteria = "LG Electronics LG HDR 4K 0x00003A3A";
criteria = "LG Electronics LG HDR 4K 0x00083A3A";
scale = 2.0;
transform = "90";
};
monitor2 = {
criteria = "LG Electronics LG HDR 4K 0x0000D901";
criteria = "LG Electronics LG HDR 4K 0x0008D101";
scale = 2.0;
};
in {