Skip to content

Commit 67210d5

Browse files
committed
refactor(sops): remove sops-nix integration and related configurations
- Removed `sops-nix` input from `flake.lock` and commented out its usage in `flake.nix`. - Disabled `sops` configurations across various modules and programs, including `home-manager` and host-specific configurations. - Commented out `sops`-related secrets and settings in `sops/default.nix`. - Added a new `download-buffer-size` setting in `nix-darwin/config/nix.nix`.
1 parent 862e0d9 commit 67210d5

File tree

12 files changed

+63
-81
lines changed

12 files changed

+63
-81
lines changed

flake.lock

Lines changed: 0 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
inputs.nixpkgs.follows = "nixpkgs";
3030
inputs.home-manager.follows = "home-manager";
3131
};
32-
sops-nix = {
33-
url = "github:Mic92/sops-nix";
34-
inputs.nixpkgs.follows = "nixpkgs";
35-
};
32+
# sops-nix = {
33+
# url = "github:Mic92/sops-nix";
34+
# inputs.nixpkgs.follows = "nixpkgs";
35+
# };
3636
flake-parts.url = "github:hercules-ci/flake-parts";
3737
treefmt-nix = {
3838
url = "github:numtide/treefmt-nix";

home-manager/advanced.nix

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@ let
5252
inherit pkgs emacsPkg;
5353
};
5454

55-
# sops
56-
sops = [
57-
(import ../sops {
58-
homeDirectory = config.home.homeDirectory;
59-
})
60-
];
55+
# # sops
56+
# sops = [
57+
# (import ../sops {
58+
# homeDirectory = config.home.homeDirectory;
59+
# })
60+
# ];
6161

6262
# mcp servers
6363
mcpServers = import ./mcp-servers {
@@ -73,7 +73,7 @@ in
7373
++ advancedPrograms
7474
++ basicServices
7575
++ advancedServices
76-
++ sops
76+
# ++ sops
7777
++ mcpServers;
7878

7979
home.stateVersion = "24.11";

home-manager/mcp-servers/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ let
1010
playwright.enable = true;
1111
brave-search = {
1212
enable = false;
13-
envFile = config.sops.secrets.brave-api-token.path;
13+
# envFile = config.sops.secrets.brave-api-token.path;
1414
};
1515
};
1616
settings = {

home-manager/modules/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
./dust
44
./lnav
55
./peco
6-
./sops
6+
# ./sops
77
./tig
88
./wget
99
./zellij

home-manager/modules/sops/default.nix

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
{
2-
pkgs,
3-
lib,
4-
config,
5-
...
6-
}:
7-
let
8-
cfg = config.programs.sops;
9-
in
10-
with lib;
11-
{
12-
options.programs.sops = {
13-
enable = mkEnableOption "Simple and flexible tool for managing secrets";
14-
package = mkPackageOption pkgs "sops" { };
15-
};
16-
17-
config = mkIf cfg.enable { home.packages = [ cfg.package ]; };
18-
}
1+
# {
2+
# pkgs,
3+
# lib,
4+
# config,
5+
# ...
6+
# }:
7+
# let
8+
# cfg = config.programs.sops;
9+
# in
10+
# with lib;
11+
# {
12+
# options.programs.sops = {
13+
# enable = mkEnableOption "Simple and flexible tool for managing secrets";
14+
# package = mkPackageOption pkgs "sops" { };
15+
# };
16+
#
17+
# config = mkIf cfg.enable { home.packages = [ cfg.package ]; };
18+
# }

home-manager/programs/basic.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ let
2121
readline = import ./readline;
2222
ripgrep = import ./ripgrep;
2323
jq = import ./jq;
24-
sops = import ./sops;
24+
# sops = import ./sops;
2525
tig = import ./tig { inherit pkgs sources; };
2626
tmux = import ./tmux { inherit pkgs; };
2727
vim = import ./vim { inherit pkgs; };
@@ -47,7 +47,7 @@ in
4747
readline
4848
ripgrep
4949
jq
50-
sops
50+
# sops
5151
tig
5252
tmux
5353
vim
Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
{
2-
programs.sops.enable = true;
3-
4-
programs.fish = {
5-
shellInit = ''
6-
set -x SOPS_PGP_FP 0F79C0AB03FD7A1C
7-
'';
8-
};
9-
}
1+
# {
2+
# programs.sops.enable = true;
3+
#
4+
# programs.fish = {
5+
# shellInit = ''
6+
# set -x SOPS_PGP_FP 0F79C0AB03FD7A1C
7+
# '';
8+
# };
9+
# }

hosts/OPL2212-2/default.nix

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{ inputs }:
22
let
33
inherit (inputs) nix-darwin home-manager;
4-
inherit (inputs) nixpkgs sops-nix;
4+
# inherit (inputs) nixpkgs sops-nix;
5+
inherit (inputs) nixpkgs;
56

67
system = "aarch64-darwin";
78
pkgs = import nixpkgs { inherit system; };
@@ -26,7 +27,7 @@ nix-darwin.lib.darwinSystem {
2627
{
2728
home-manager = {
2829
useUserPackages = true;
29-
sharedModules = [ sops-nix.homeManagerModules.sops ];
30+
# sharedModules = [ sops-nix.homeManagerModules.sops ];
3031
users."${username}" = import ../../home-manager/advanced.nix;
3132
extraSpecialArgs = {
3233
inherit system username;

hosts/X13Gen2/default.nix

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{ inputs }:
22
let
33
inherit (inputs) nixpkgs xremap;
4-
inherit (inputs) sops-nix home-manager disko;
4+
# inherit (inputs) sops-nix home-manager disko;
5+
inherit (inputs) home-manager disko;
56

67
username = "take";
78
system = "x86_64-linux";
@@ -17,11 +18,11 @@ nixpkgs.lib.nixosSystem {
1718
./hardware-configuration.nix
1819
./disko-config.nix
1920
disko.nixosModules.disko
20-
sops-nix.nixosModules.sops
21+
# sops-nix.nixosModules.sops
2122
home-manager.nixosModules.home-manager
2223
{
2324
home-manager.useUserPackages = true;
24-
home-manager.sharedModules = [ sops-nix.homeManagerModules.sops ];
25+
# home-manager.sharedModules = [ sops-nix.homeManagerModules.sops ];
2526
home-manager.users."${username}" = import ../../home-manager/advanced.nix;
2627
home-manager.extraSpecialArgs = {
2728
inherit system;

0 commit comments

Comments
 (0)