From 034b693380921d122cce2be0dafb2ab1f01e89a2 Mon Sep 17 00:00:00 2001 From: chase Date: Sun, 8 Jun 2025 13:39:47 -0400 Subject: [PATCH] 197 current 2025-06-08 13:39:35 25.11.20250605.d3d2d80 6.15.1 * --- flake.lock | 23 ++++++++++++++++++++++- flake.nix | 40 ++++++++++++++++++++-------------------- 2 files changed, 42 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index b1f8af8..aab7581 100644 --- a/flake.lock +++ b/flake.lock @@ -552,7 +552,28 @@ "nixpkgs": "nixpkgs_3", "nixpkgs-stable": "nixpkgs-stable", "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": { diff --git a/flake.nix b/flake.nix index e09d374..91b7bb8 100644 --- a/flake.nix +++ b/flake.nix @@ -8,16 +8,13 @@ url = "github:nix-community/NUR"; inputs.nixpkgs.follows = "nixpkgs"; }; - catppuccin.url = "github:catppuccin/nix"; home-manager = { url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; }; - hyprland.url = "github:hyprwm/Hyprland"; - plasma-manager = { - url = "github:nix-community/plasma-manager"; + sops-nix = { + url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; - inputs.home-manager.follows = "home-manager"; }; nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.05"; @@ -25,6 +22,14 @@ url = "github:nix-community/home-manager/release-25.05"; 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 = { @@ -32,6 +37,7 @@ catppuccin, nur, plasma-manager, + sops-nix, ... } @ inputs: let hosts = import ./hosts/hosts.nix; @@ -57,6 +63,7 @@ [ ./hosts/${host.dir}/home.nix catppuccin.homeModules.catppuccin + sops-nix.homeManagerModules.sops ] ++ modules; }; @@ -76,10 +83,15 @@ ./hosts/${host.dir}/configuration.nix nur.modules.nixos.default catppuccin.nixosModules.catppuccin + sops-nix.nixosModules.sops home-manager.nixosModules.home-manager { home-manager.backupFileExtension = "backup"; home-manager.useGlobalPkgs = true; + home-manager.sharedModules = [ + plasma-manager.homeManagerModules.plasma-manager + sops-nix.homeManagerModules.sops + ]; home-manager.users."${host.user}".imports = [ ./hosts/${host.dir}/home.nix catppuccin.homeModules.catppuccin @@ -95,31 +107,19 @@ host = hosts.anzu; nixpkgs = inputs.nixpkgs; home-manager = inputs.home-manager; - modules = [ - { - home-manager.sharedModules = [plasma-manager.homeManagerModules.plasma-manager]; - } - ]; + modules = []; }; ichigo = mkNixOSConfigurations { host = hosts.ichigo; nixpkgs = inputs.nixpkgs; home-manager = inputs.home-manager; - modules = [ - { - home-manager.sharedModules = [plasma-manager.homeManagerModules.plasma-manager]; - } - ]; + modules = []; }; kuromi = mkNixOSConfigurations { host = hosts.kuromi; nixpkgs = inputs.nixpkgs; home-manager = inputs.home-manager; - modules = [ - { - home-manager.sharedModules = [plasma-manager.homeManagerModules.plasma-manager]; - } - ]; + modules = []; }; }; };