From 2845d415cf0c657b3fc8fd66a7cb687195bcfce8 Mon Sep 17 00:00:00 2001 From: JakeGinesin Date: Wed, 30 Apr 2025 02:21:42 -0400 Subject: [PATCH] 38 current 2025-04-30 02:21:35 25.05.20250424.f771eb4 6.12.24 * --- flake.nix | 2 ++ home/home.nix | 5 +++++ home/programs/zsh/default.nix | 2 +- hosts/thonkpad/configuration.nix | 16 +++++++++++++--- 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 0ae98b1..f2b9c0e 100644 --- a/flake.nix +++ b/flake.nix @@ -43,7 +43,9 @@ { environment.systemPackages = [agenix.packages.x86_64-linux.default]; } + agenix.nixosModules.default + # agenix.homeManagerModules.age ./hosts/thonkpad/configuration.nix ]; }; diff --git a/home/home.nix b/home/home.nix index fa3af2d..0fbd262 100644 --- a/home/home.nix +++ b/home/home.nix @@ -24,6 +24,11 @@ in { home.stateVersion = "24.11"; # Please read the comment before changing. + # age.secrets.zsh_remote.file = ../secrets/zsh_remote.age; + # age.secretsDir = "/home/synchronous/.agenix/agenix"; + # age.secretsMountPoint = "/home/synchronous/.agenix/agenix.d"; + # age.identityPaths = ["/home/synchronous/.ssh/id_ed25519"]; + # home.packages = with pkgs; [xrandr procps polybar bspwm sxhkd polybar-pulseaudio-control bluez]; home.sessionVariables = { diff --git a/home/programs/zsh/default.nix b/home/programs/zsh/default.nix index 806b605..413bb15 100644 --- a/home/programs/zsh/default.nix +++ b/home/programs/zsh/default.nix @@ -41,7 +41,7 @@ [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh ''; - # initExtra = builtins.readFile ./zshrc + builtins.readFile osConfig.age.secrets.zsh_remote.path; initExtra = builtins.readFile ./zshrc; + # initExtra = builtins.readFile ./zshrc; }; } diff --git a/hosts/thonkpad/configuration.nix b/hosts/thonkpad/configuration.nix index a7f96c0..603d6b4 100644 --- a/hosts/thonkpad/configuration.nix +++ b/hosts/thonkpad/configuration.nix @@ -22,12 +22,19 @@ in { description = "screen resolution"; }; + options.zsh_remote = lib.mkOption { + type = lib.types.str; + default = "1920x1080"; + description = "zsh remote secret"; + }; + config = { home-manager = { useGlobalPkgs = true; useUserPackages = true; backupFileExtension = "hm-backup"; - extraSpecialArgs = {inherit (config) res;}; + # sharedModules = [agenix.homeManagerModules.default]; + extraSpecialArgs = {inherit (config);}; users.synchronous.imports = [ ({ config, @@ -41,8 +48,11 @@ in { }; res = "1366x768"; - age.secrets.zsh_remote.file = ../../secrets/zsh_remote.age; - age.identityPaths = ["/home/synchronous/.ssh/id_ed25519"]; + # age.secrets.zsh_remote.file = ../../secrets/zsh_remote.age; + # zsh_remote = builtins.readFile ../../secrets/zsh_remote.age; + # age.secretsDir = "/home/synchronous/.agenix/agenix"; + # age.secretsMountPoint = "/home/synchronous/.agenix/agenix.d"; + # age.identityPaths = ["/home/synchronous/.ssh/id_ed25519"]; # config = { # res = "1366x768";