197 current 2025-06-08 13:39:35 25.11.20250605.d3d2d80 6.15.1 *

This commit is contained in:
2025-06-08 13:39:47 -04:00
parent 40b59c2cf6
commit 034b693380
2 changed files with 42 additions and 21 deletions

23
flake.lock generated
View File

@@ -552,7 +552,28 @@
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",
"nixpkgs-stable": "nixpkgs-stable", "nixpkgs-stable": "nixpkgs-stable",
"nur": "nur", "nur": "nur",
"plasma-manager": "plasma-manager" "plasma-manager": "plasma-manager",
"sops-nix": "sops-nix"
}
},
"sops-nix": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1747603214,
"narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd",
"type": "github"
},
"original": {
"owner": "Mic92",
"repo": "sops-nix",
"type": "github"
} }
}, },
"systems": { "systems": {

View File

@@ -8,16 +8,13 @@
url = "github:nix-community/NUR"; url = "github:nix-community/NUR";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
catppuccin.url = "github:catppuccin/nix";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/master"; url = "github:nix-community/home-manager/master";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
hyprland.url = "github:hyprwm/Hyprland"; sops-nix = {
plasma-manager = { url = "github:Mic92/sops-nix";
url = "github:nix-community/plasma-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.home-manager.follows = "home-manager";
}; };
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.05"; nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.05";
@@ -25,6 +22,14 @@
url = "github:nix-community/home-manager/release-25.05"; url = "github:nix-community/home-manager/release-25.05";
inputs.nixpkgs.follows = "nixpkgs-stable"; inputs.nixpkgs.follows = "nixpkgs-stable";
}; };
catppuccin.url = "github:catppuccin/nix";
hyprland.url = "github:hyprwm/Hyprland";
plasma-manager = {
url = "github:nix-community/plasma-manager";
inputs.nixpkgs.follows = "nixpkgs";
inputs.home-manager.follows = "home-manager";
};
}; };
outputs = { outputs = {
@@ -32,6 +37,7 @@
catppuccin, catppuccin,
nur, nur,
plasma-manager, plasma-manager,
sops-nix,
... ...
} @ inputs: let } @ inputs: let
hosts = import ./hosts/hosts.nix; hosts = import ./hosts/hosts.nix;
@@ -57,6 +63,7 @@
[ [
./hosts/${host.dir}/home.nix ./hosts/${host.dir}/home.nix
catppuccin.homeModules.catppuccin catppuccin.homeModules.catppuccin
sops-nix.homeManagerModules.sops
] ]
++ modules; ++ modules;
}; };
@@ -76,10 +83,15 @@
./hosts/${host.dir}/configuration.nix ./hosts/${host.dir}/configuration.nix
nur.modules.nixos.default nur.modules.nixos.default
catppuccin.nixosModules.catppuccin catppuccin.nixosModules.catppuccin
sops-nix.nixosModules.sops
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {
home-manager.backupFileExtension = "backup"; home-manager.backupFileExtension = "backup";
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.sharedModules = [
plasma-manager.homeManagerModules.plasma-manager
sops-nix.homeManagerModules.sops
];
home-manager.users."${host.user}".imports = [ home-manager.users."${host.user}".imports = [
./hosts/${host.dir}/home.nix ./hosts/${host.dir}/home.nix
catppuccin.homeModules.catppuccin catppuccin.homeModules.catppuccin
@@ -95,31 +107,19 @@
host = hosts.anzu; host = hosts.anzu;
nixpkgs = inputs.nixpkgs; nixpkgs = inputs.nixpkgs;
home-manager = inputs.home-manager; home-manager = inputs.home-manager;
modules = [ modules = [];
{
home-manager.sharedModules = [plasma-manager.homeManagerModules.plasma-manager];
}
];
}; };
ichigo = mkNixOSConfigurations { ichigo = mkNixOSConfigurations {
host = hosts.ichigo; host = hosts.ichigo;
nixpkgs = inputs.nixpkgs; nixpkgs = inputs.nixpkgs;
home-manager = inputs.home-manager; home-manager = inputs.home-manager;
modules = [ modules = [];
{
home-manager.sharedModules = [plasma-manager.homeManagerModules.plasma-manager];
}
];
}; };
kuromi = mkNixOSConfigurations { kuromi = mkNixOSConfigurations {
host = hosts.kuromi; host = hosts.kuromi;
nixpkgs = inputs.nixpkgs; nixpkgs = inputs.nixpkgs;
home-manager = inputs.home-manager; home-manager = inputs.home-manager;
modules = [ modules = [];
{
home-manager.sharedModules = [plasma-manager.homeManagerModules.plasma-manager];
}
];
}; };
}; };
}; };