Compare commits
32 Commits
dev
...
e218eb25f3
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e218eb25f3 | ||
|
|
01d8e9c758 | ||
|
|
682bc9d826 | ||
|
|
baecc7bb69 | ||
|
|
5e9cd352d7 | ||
|
|
7205ea32a3 | ||
|
|
553e691a8b | ||
|
|
324d3e3847 | ||
|
|
c648e45a23 | ||
|
|
b31f045d45 | ||
|
|
b477744d9b | ||
|
|
e31c9b911d | ||
|
|
29a1ee26cf | ||
|
|
2b2e4ca76a | ||
|
|
9542980896 | ||
|
|
706e9ee95f | ||
|
|
2ebdda4ab4 | ||
|
|
be5a15f3d4 | ||
|
|
cc396c2daf | ||
|
|
1fe7f9b901 | ||
|
|
5f3d3a224a | ||
|
|
7eb20ee07d | ||
|
|
460f0d132d | ||
|
|
5d5b15fb63 | ||
|
|
92067f8b69 | ||
|
|
cc21dcdc92 | ||
|
|
ac9e58ede6 | ||
|
|
be57ba16dd | ||
|
|
2fd6a2c04a | ||
|
|
09e941abbd | ||
|
|
e21c901e94 | ||
|
|
ce738ae612 |
14
.sops.yaml
Normal file
14
.sops.yaml
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
keys:
|
||||||
|
- &john-p14s age1f6drjusg866yscj8029tk4yfpgecklrvezldm02ankm6h8nnwu5s2u6ahy
|
||||||
|
- &john-pc age1ykcs39e62pz3xu6cedg8ea685kv5d5qsrhgkndygzm8rx30xd5ys5t3qxt
|
||||||
|
creation_rules:
|
||||||
|
- path_regex: \.yaml$
|
||||||
|
key_groups:
|
||||||
|
- age:
|
||||||
|
- *john-p14s
|
||||||
|
- *john-pc
|
||||||
|
- path_regex: \.json$
|
||||||
|
key_groups:
|
||||||
|
- age:
|
||||||
|
- *john-p14s
|
||||||
|
- *john-pc
|
||||||
@@ -76,8 +76,10 @@ nhmu
|
|||||||
enableShell = true;
|
enableShell = true;
|
||||||
_1password = true;
|
_1password = true;
|
||||||
docker = true;
|
docker = true;
|
||||||
graphical = true;
|
graphical = {
|
||||||
steam = true;
|
steam = true;
|
||||||
|
vscode = true;
|
||||||
|
};
|
||||||
extraImports = [
|
extraImports = [
|
||||||
./home-manager/john.nix
|
./home-manager/john.nix
|
||||||
./home-manager/gnome.nix
|
./home-manager/gnome.nix
|
||||||
|
|||||||
29
flake.nix
29
flake.nix
@@ -12,6 +12,10 @@
|
|||||||
url = "github:nix-community/nixGL";
|
url = "github:nix-community/nixGL";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
sops-nix = {
|
||||||
|
url = "github:Mic92/sops-nix";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, nixpkgs, ... }@inputs:
|
outputs = { self, nixpkgs, ... }@inputs:
|
||||||
@@ -22,12 +26,15 @@
|
|||||||
|
|
||||||
# These will get applied to both the configured user and the root user (if enabled)
|
# These will get applied to both the configured user and the root user (if enabled)
|
||||||
userOptions = config: {
|
userOptions = config: {
|
||||||
openssh.authorizedKeys.keyFiles = lib.optionals config.ssh [ ./personal_keys ];
|
openssh.authorizedKeys = lib.mkIf config.ssh (lib.mkMerge [
|
||||||
|
(lib.mkIf (config.profile == "personal") { keyFiles = [ ./keys/personal ]; })
|
||||||
|
(lib.mkIf (config.profile == "work") { keyFiles = [ ./keys/work ]; })
|
||||||
|
]);
|
||||||
shell = lib.mkIf config.enableShell pkgs.zsh;
|
shell = lib.mkIf config.enableShell pkgs.zsh;
|
||||||
};
|
};
|
||||||
|
|
||||||
mkhomeManagerModules = config: [
|
mkhomeManagerModules = config: [
|
||||||
self.homeManagerModules.default
|
(self.homeManagerModules.default inputs)
|
||||||
# { inherit (config) extraImports; }
|
# { inherit (config) extraImports; }
|
||||||
{
|
{
|
||||||
user = config.user;
|
user = config.user;
|
||||||
@@ -38,7 +45,6 @@
|
|||||||
_1password = config._1password;
|
_1password = config._1password;
|
||||||
docker = config.docker;
|
docker = config.docker;
|
||||||
graphical = config.graphical;
|
graphical = config.graphical;
|
||||||
steam = config.steam;
|
|
||||||
}
|
}
|
||||||
] ++ config.extraImports;
|
] ++ config.extraImports;
|
||||||
|
|
||||||
@@ -46,7 +52,9 @@
|
|||||||
{
|
{
|
||||||
lib = { inherit mkhomeManagerModules; };
|
lib = { inherit mkhomeManagerModules; };
|
||||||
|
|
||||||
homeManagerModules.default = { ... }: { imports = [ ./homeManagerModules ]; };
|
homeManagerModules.default = inputs: {
|
||||||
|
imports = [ ./homeManagerModules ];
|
||||||
|
};
|
||||||
|
|
||||||
nixosModules.default = { config, ... }: {
|
nixosModules.default = { config, ... }: {
|
||||||
imports = [
|
imports = [
|
||||||
@@ -54,14 +62,17 @@
|
|||||||
inputs.home-manager.nixosModules.default
|
inputs.home-manager.nixosModules.default
|
||||||
];
|
];
|
||||||
nix.settings.trusted-users = [ "root" "@wheel" ];
|
nix.settings.trusted-users = [ "root" "@wheel" ];
|
||||||
users.users.${config.user} = {
|
users.users.${config.user} = lib.mkMerge [
|
||||||
|
{
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
description = "John Lancaster";
|
description = "John Lancaster";
|
||||||
extraGroups = []
|
extraGroups = []
|
||||||
++ lib.optionals config.root [ "wheel" ]
|
++ lib.optional config.root "wheel"
|
||||||
++ lib.optionals config.docker [ "docker" ]
|
++ lib.optional config.docker "docker"
|
||||||
++ lib.optionals config.networking.networkmanager.enable [ "networkmanager" ];
|
++ lib.optional config.networking.networkmanager.enable "networkmanager";
|
||||||
} // userOptions config;
|
}
|
||||||
|
(userOptions config)
|
||||||
|
];
|
||||||
|
|
||||||
users.users.root = lib.mkIf config.root (userOptions config);
|
users.users.root = lib.mkIf config.root (userOptions config);
|
||||||
security.sudo-rs = lib.mkIf config.root {
|
security.sudo-rs = lib.mkIf config.root {
|
||||||
|
|||||||
@@ -6,11 +6,13 @@
|
|||||||
./ghostty.nix
|
./ghostty.nix
|
||||||
./git.nix
|
./git.nix
|
||||||
./shell.nix
|
./shell.nix
|
||||||
|
./sops.nix
|
||||||
./ssh.nix
|
./ssh.nix
|
||||||
./vscode.nix
|
./vscode.nix
|
||||||
|
|
||||||
../nixosModules/options.nix
|
../nixosModules/options.nix
|
||||||
inputs._1password-shell-plugins.hmModules.default
|
# inputs._1password-shell-plugins.hmModules.default
|
||||||
|
# Commented out because it tries to configure fish shell which we don't use
|
||||||
];
|
];
|
||||||
|
|
||||||
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
|
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
|
||||||
@@ -52,7 +54,7 @@
|
|||||||
lazygit
|
lazygit
|
||||||
btop
|
btop
|
||||||
yazi
|
yazi
|
||||||
sops
|
uv
|
||||||
(writeShellScriptBin "nhmu" ''
|
(writeShellScriptBin "nhmu" ''
|
||||||
nix flake update --flake ~/.config/home-manager
|
nix flake update --flake ~/.config/home-manager
|
||||||
nix run home-manager -- switch --flake ~/.config/home-manager --impure
|
nix run home-manager -- switch --flake ~/.config/home-manager --impure
|
||||||
@@ -62,15 +64,10 @@
|
|||||||
# # parentheses. Maybe you want to install Nerd Fonts with a limited number of
|
# # parentheses. Maybe you want to install Nerd Fonts with a limited number of
|
||||||
# # fonts?
|
# # fonts?
|
||||||
# (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; })
|
# (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; })
|
||||||
] ++ lib.optionals config.graphical [
|
]
|
||||||
discord
|
++ lib.optional config.graphical.discord discord
|
||||||
spotify
|
++ lib.optional config.graphical.joplin joplin-desktop
|
||||||
sublime4
|
++ lib.optional config.graphical.sublime sublime4;
|
||||||
joplin-desktop
|
|
||||||
] ++ lib.optionals config._1password [
|
|
||||||
_1password-cli
|
|
||||||
gh # GitHub CLI with 1Password integration
|
|
||||||
];
|
|
||||||
|
|
||||||
# Home Manager can also manage your environment variables through
|
# Home Manager can also manage your environment variables through
|
||||||
# 'home.sessionVariables'. These will be explicitly sourced when using a
|
# 'home.sessionVariables'. These will be explicitly sourced when using a
|
||||||
@@ -95,15 +92,15 @@
|
|||||||
# Let Home Manager install and manage itself.
|
# Let Home Manager install and manage itself.
|
||||||
programs.home-manager.enable = true;
|
programs.home-manager.enable = true;
|
||||||
|
|
||||||
# https://developer.1password.com/docs/cli/shell-plugins/nix/
|
# # https://developer.1password.com/docs/cli/shell-plugins/nix/
|
||||||
programs._1password-shell-plugins = lib.mkIf config._1password {
|
# programs._1password-shell-plugins = lib.mkIf config._1password {
|
||||||
# enable 1Password shell plugins for bash, zsh, and fish shell
|
# # enable 1Password shell plugins for bash, zsh, and fish shell
|
||||||
enable = true;
|
# enable = true;
|
||||||
# the specified packages as well as 1Password CLI will be
|
# # the specified packages as well as 1Password CLI will be
|
||||||
# automatically installed and configured to use shell plugins
|
# # automatically installed and configured to use shell plugins
|
||||||
# https://developer.1password.com/docs/cli/shell-plugins
|
# # https://developer.1password.com/docs/cli/shell-plugins
|
||||||
plugins = with pkgs; [ gh ];
|
# plugins = with pkgs; [ gh ];
|
||||||
};
|
# };
|
||||||
home.file.".config/1Password/ssh/agent.toml" = lib.mkIf config._1password {
|
home.file.".config/1Password/ssh/agent.toml" = lib.mkIf config._1password {
|
||||||
# https://developer.1password.com/docs/ssh/agent/config
|
# https://developer.1password.com/docs/ssh/agent/config
|
||||||
text = ''
|
text = ''
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{ config, pkgs, lib, nixgl, ... }:
|
{ config, pkgs, lib, nixgl, ... }:
|
||||||
{
|
{
|
||||||
home.sessionVariables = lib.mkIf (config.enableShell && config.graphical) {
|
home.sessionVariables = lib.mkIf (config.enableShell && config.graphical.ghostty) {
|
||||||
TERMINAL = "ghostty";
|
TERMINAL = "ghostty";
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
nixGL.defaultWrapper = "mesa";
|
nixGL.defaultWrapper = "mesa";
|
||||||
nixGL.installScripts = [ "mesa" ];
|
nixGL.installScripts = [ "mesa" ];
|
||||||
|
|
||||||
programs.ghostty = lib.mkIf (config.enableShell && config.graphical) {
|
programs.ghostty = lib.mkIf (config.enableShell && config.graphical.ghostty) {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableZshIntegration = true;
|
enableZshIntegration = true;
|
||||||
package = config.lib.nixGL.wrap pkgs.ghostty;
|
package = config.lib.nixGL.wrap pkgs.ghostty;
|
||||||
@@ -52,7 +52,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
# https://github.com/ghostty-org/ghostty/discussions/3763#discussioncomment-11699970
|
# https://github.com/ghostty-org/ghostty/discussions/3763#discussioncomment-11699970
|
||||||
xdg.desktopEntries."com.mitchellh.ghostty" = lib.mkIf (config.enableShell && config.graphical) {
|
xdg.desktopEntries."com.mitchellh.ghostty" = lib.mkIf (config.enableShell && config.graphical.ghostty) {
|
||||||
name = "Ghostty";
|
name = "Ghostty";
|
||||||
type = "Application";
|
type = "Application";
|
||||||
comment = "A terminal emulator";
|
comment = "A terminal emulator";
|
||||||
|
|||||||
46
homeManagerModules/restic/flake.nix
Normal file
46
homeManagerModules/restic/flake.nix
Normal file
@@ -0,0 +1,46 @@
|
|||||||
|
{
|
||||||
|
description = "Flake packaging resticprofile with a Home Manager module for programs.resticprofile";
|
||||||
|
|
||||||
|
inputs = {
|
||||||
|
nixpkgs.url = "nixpkgs/nixos-unstable"; # Use latest Nixpkgs for Go package build
|
||||||
|
home-manager.url = "github:nix-community/home-manager";
|
||||||
|
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
|
|
||||||
|
outputs = { self, nixpkgs, home-manager }:
|
||||||
|
let
|
||||||
|
systems = [ "x86_64-linux" "aarch64-linux" ];
|
||||||
|
# Define a function to build the resticprofile package for a given system:
|
||||||
|
resticprofilePkg = { pkgs, lib, ... }:
|
||||||
|
pkgs.buildGoModule rec {
|
||||||
|
pname = "resticprofile";
|
||||||
|
version = "0.31.0";
|
||||||
|
src = pkgs.fetchFromGitHub {
|
||||||
|
owner = "creativeprojects";
|
||||||
|
repo = "resticprofile";
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "sha256-ezelvyroQG1EW3SU63OVHJ/T4qjN5DRllvPIXnei1Z4="; # source tarball hash
|
||||||
|
};
|
||||||
|
vendorHash = "sha256-M9S6F/Csz7HnOq8PSWjpENKm1704kVx9zDts1ieraTE="; # Correct vendor hash
|
||||||
|
goPackagePath = "github.com/creativeprojects/resticprofile";
|
||||||
|
doCheck = false; # Disable tests due to sandboxed build environment
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Configuration profiles manager and scheduler for restic backup";
|
||||||
|
homepage = "https://creativeprojects.github.io/resticprofile/";
|
||||||
|
license = licenses.gpl3Only;
|
||||||
|
maintainers = [ ]; # (Add yourself or skip)
|
||||||
|
};
|
||||||
|
};
|
||||||
|
in {
|
||||||
|
# Provide the package for all supported systems:
|
||||||
|
packages = nixpkgs.lib.genAttrs systems (system:
|
||||||
|
let pkgs = import nixpkgs { inherit system; };
|
||||||
|
in { resticprofile = resticprofilePkg { inherit pkgs; lib = pkgs.lib; }; }
|
||||||
|
);
|
||||||
|
|
||||||
|
# Provide the Home Manager module
|
||||||
|
homeManagerModules = {
|
||||||
|
resticprofile = ./resticprofile.nix;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
46
homeManagerModules/restic/profiles/base.nix
Normal file
46
homeManagerModules/restic/profiles/base.nix
Normal file
@@ -0,0 +1,46 @@
|
|||||||
|
{ lib, config, ... }:
|
||||||
|
{
|
||||||
|
base = {
|
||||||
|
repository = "local:/mnt/backup";
|
||||||
|
password-file = "${config.xdg.configHome}/resticprofile/password.txt";
|
||||||
|
status-file = "{{ .ConfigDir }}/backup-status.json";
|
||||||
|
retention = {
|
||||||
|
after-backup = true;
|
||||||
|
keep-last = "10";
|
||||||
|
keep-hourly = "8";
|
||||||
|
keep-daily = "14";
|
||||||
|
keep-weekly = "8";
|
||||||
|
};
|
||||||
|
backup = {
|
||||||
|
verbose = true;
|
||||||
|
exclude = [
|
||||||
|
".vscode*"
|
||||||
|
".cache"
|
||||||
|
".venv"
|
||||||
|
".pyenv"
|
||||||
|
".devenv"
|
||||||
|
"data/postgres"
|
||||||
|
"build"
|
||||||
|
"__pycache__"
|
||||||
|
"*.log"
|
||||||
|
"*.egg-info"
|
||||||
|
"*.csv"
|
||||||
|
"*.m4a"
|
||||||
|
|
||||||
|
".local/share/Steam"
|
||||||
|
".local/share/Trash"
|
||||||
|
"build"
|
||||||
|
"dist"
|
||||||
|
"/home/*/Pictures"
|
||||||
|
"/home/*/Videos"
|
||||||
|
];
|
||||||
|
schedule-permission = "user";
|
||||||
|
schedule-priority = "background";
|
||||||
|
check-after = true;
|
||||||
|
};
|
||||||
|
prune = {
|
||||||
|
schedule-permission = "user";
|
||||||
|
schedule-lock-wait = "1h";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
69
homeManagerModules/restic/resticprofile.nix
Normal file
69
homeManagerModules/restic/resticprofile.nix
Normal file
@@ -0,0 +1,69 @@
|
|||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
|
let
|
||||||
|
inherit (lib) mkEnableOption mkOption mkPackageOption mkIf types;
|
||||||
|
cfg = config.programs.resticprofile;
|
||||||
|
yamlFormat = pkgs.formats.yaml { };
|
||||||
|
baseProfile = import ./profiles/base.nix { inherit lib config; };
|
||||||
|
profiles = lib.recursiveUpdate baseProfile cfg.profiles;
|
||||||
|
in {
|
||||||
|
options.programs.resticprofile = {
|
||||||
|
enable = mkEnableOption "Enable resticprofile (Restic backup profile manager)";
|
||||||
|
|
||||||
|
package = mkPackageOption pkgs "resticprofile" { };
|
||||||
|
|
||||||
|
# Multiple configuration files support
|
||||||
|
profiles = mkOption {
|
||||||
|
type = types.attrsOf yamlFormat.type;
|
||||||
|
default = { };
|
||||||
|
description = ''
|
||||||
|
Multiple configuration files for resticprofile. Each attribute name
|
||||||
|
becomes a YAML file under `$XDG_CONFIG_HOME/resticprofile/`.
|
||||||
|
'';
|
||||||
|
example = {
|
||||||
|
common = {
|
||||||
|
repository = "local:/backup";
|
||||||
|
passwordFile = "password.txt";
|
||||||
|
includes = [ "common.yaml" ];
|
||||||
|
backup = {
|
||||||
|
source = [ "/home/user/Documents" ];
|
||||||
|
schedule = "12:30";
|
||||||
|
};
|
||||||
|
forget = {
|
||||||
|
keep-daily = 7;
|
||||||
|
keep-weekly = 4;
|
||||||
|
keep-monthly = 6;
|
||||||
|
keep-yearly = 2;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
config = mkIf cfg.enable (
|
||||||
|
let
|
||||||
|
resticprofileCmd = ''
|
||||||
|
${cfg.package}/bin/resticprofile --config "${config.xdg.configHome}/resticprofile/profiles.yaml"
|
||||||
|
'';
|
||||||
|
in {
|
||||||
|
# Add a script to manually unschedule and reschedule all resticprofiles
|
||||||
|
home.packages = [
|
||||||
|
cfg.package
|
||||||
|
(pkgs.writeShellScriptBin "rp" ''
|
||||||
|
set -e
|
||||||
|
sudo ${cfg.package}/bin/resticprofile --config "${config.xdg.configHome}/resticprofile/profiles.yaml" $@
|
||||||
|
'')
|
||||||
|
(pkgs.writeShellScriptBin "rps" ''
|
||||||
|
set -e
|
||||||
|
rp unschedule --all
|
||||||
|
rp schedule --all
|
||||||
|
'')
|
||||||
|
(pkgs.writeShellScriptBin "rp-test" "rp run-schedule backup@default --dry-run")
|
||||||
|
];
|
||||||
|
xdg.configFile."resticprofile/profiles.yaml".source = yamlFormat.generate "profiles" {
|
||||||
|
version = "2";
|
||||||
|
profiles = profiles;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -37,8 +37,10 @@
|
|||||||
] ++ lib.optional config._1password "1password";
|
] ++ lib.optional config._1password "1password";
|
||||||
};
|
};
|
||||||
shellAliases.ls = "${pkgs.eza}/bin/eza -lgos type --no-time";
|
shellAliases.ls = "${pkgs.eza}/bin/eza -lgos type --no-time";
|
||||||
initContent = lib.mkIf config._1password ''
|
# initContent = lib.mkIf config._1password ''
|
||||||
source ${config.home.homeDirectory}/.config/op/plugins.sh
|
# if [ -f "${config.home.homeDirectory}/.config/op/plugins.sh" ]; then
|
||||||
'';
|
# source ${config.home.homeDirectory}/.config/op/plugins.sh
|
||||||
|
# fi
|
||||||
|
# '';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
50
homeManagerModules/sops.nix
Normal file
50
homeManagerModules/sops.nix
Normal file
@@ -0,0 +1,50 @@
|
|||||||
|
{ inputs, config, pkgs, lib, ... }:
|
||||||
|
let
|
||||||
|
sopsConfigPath = "${config.xdg.configHome}/home-manager/jsl-home/.sops.yaml";
|
||||||
|
sopsSecretsPath = "${config.xdg.configHome}/home-manager/jsl-home/keys/secrets.yaml";
|
||||||
|
in
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
inputs.sops-nix.homeManagerModules.sops
|
||||||
|
];
|
||||||
|
sops = {
|
||||||
|
# It's also possible to use a ssh key, but only when it has no password:
|
||||||
|
age.sshKeyPaths = [ "${config.home.homeDirectory}/.ssh/id_ed25519" ];
|
||||||
|
defaultSopsFile = ../keys/secrets.yaml;
|
||||||
|
defaultSopsFormat = "yaml";
|
||||||
|
|
||||||
|
secrets."api/gmail_client_secret" = { };
|
||||||
|
|
||||||
|
templates."gmail_creds" = {
|
||||||
|
content = ''
|
||||||
|
{
|
||||||
|
"installed": {
|
||||||
|
"client_id": "499012320469-vtml6emu6bmujpsj9lud2b44jqu7h26j.apps.googleusercontent.com",
|
||||||
|
"project_id": "python-apis-423500",
|
||||||
|
"auth_uri": "https://accounts.google.com/o/oauth2/auth",
|
||||||
|
"token_uri": "https://oauth2.googleapis.com/token",
|
||||||
|
"auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
|
||||||
|
"client_secret": "${config.sops.placeholder."api/gmail_client_secret"}",
|
||||||
|
"redirect_uris": [
|
||||||
|
"http://localhost"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
'';
|
||||||
|
path = "${config.xdg.configHome}/sops-nix/gmail_api_credentials.json";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
home.sessionVariables = {
|
||||||
|
GMAIL_CREDS_PATH = "${config.xdg.configHome}/sops-nix/gmail_api_credentials.json";
|
||||||
|
};
|
||||||
|
|
||||||
|
home.packages = with pkgs; [
|
||||||
|
(writeShellScriptBin "edit-secrets" ''
|
||||||
|
${sops}/bin/sops --config ${sopsConfigPath} ${sopsSecretsPath}
|
||||||
|
'')
|
||||||
|
sops
|
||||||
|
age
|
||||||
|
];
|
||||||
|
programs.zsh.shellAliases.sops = lib.mkIf config.enableShell "sops --config ${sopsConfigPath}";
|
||||||
|
}
|
||||||
@@ -8,6 +8,14 @@
|
|||||||
'';
|
'';
|
||||||
matchBlocks = lib.mkMerge [
|
matchBlocks = lib.mkMerge [
|
||||||
(lib.mkIf (config.profile == "personal") {
|
(lib.mkIf (config.profile == "personal") {
|
||||||
|
"ad-nix" = {
|
||||||
|
hostname = "192.168.1.201";
|
||||||
|
user = "appdaemon";
|
||||||
|
};
|
||||||
|
"docs" = {
|
||||||
|
hostname = "192.168.1.110";
|
||||||
|
user = "root";
|
||||||
|
};
|
||||||
"panoptes" = {
|
"panoptes" = {
|
||||||
hostname = "192.168.1.107";
|
hostname = "192.168.1.107";
|
||||||
user = "panoptes";
|
user = "panoptes";
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
{
|
{
|
||||||
programs.vscode = lib.mkIf config.graphical {
|
programs.vscode = lib.mkIf config.graphical.vscode {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.vscode;
|
package = pkgs.vscode;
|
||||||
profiles.default.extensions = with pkgs.vscode-extensions; [
|
profiles.default.extensions = with pkgs.vscode-extensions; [
|
||||||
|
|||||||
28
keys/secrets.yaml
Normal file
28
keys/secrets.yaml
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
restic_password:
|
||||||
|
john_ubuntu: ENC[AES256_GCM,data:Q4lUaFFDgoK9k4kQj7hSVKaFDGW0T+6V+OpFU5R528R3EKM7YJMgcFX+sK3mWl9XA4/6E1GeINpIqOpx+FP5Cf/8qt9sXBXCmXXSYdA4IH3RS6a1NkcIVjsTMvpn4q/fslCeYN4LB+r4pBGmdca105miqVun8J69cZGwjZ+wuxrMAP+mdnHdSUPycjNWJJzmEa3waQsygAi4A5cAN5sigOPBxe2pCTh/FEKoTgWmzHGJvcjrzuL6wNOpQrkMWwTsHCtbe9dyMP/fQpoBgYDT4W9Rd4XHhbrooje+g3x48EL1rkRIVVNRavpRUih/mjcdJGzzJ6jZmLLcc1f7SZIKZht7f+ZcdZl3rKQB+WanZgK/KAgKBRCrbIk2eeBZwkcRSw5kmGFU7x0azdIipJYj+3KHHQS5S2VW4j2tQG74xK3qaNJcSMjpKmdI1dHcPf0x2ILaDDV9Ts0H4GTOB2zO9iGy7x2tdPd4tugxxk5rr5rphTZL3lgUf0Ri/qMkJh9I8CsjUdvRycHeIEUZPmEVaIqJC2jrd2pBslis5VWD/6PHQBCob07d1fcpIYox4YXM3GcLg3OxiD8nZ7DTzGRMhciZtTKKWbBT8qzPud4ZQvDkT5l+XOpeM13wXFIMa13CwOzYeyWjycED0VQ/i3XRw9+9lg3cosfxaPdaFtv4MjV7Od62G/UJw3OxaQOHM2y24N+Q0pSBoTdDAFwDCH/kcqZji6ZrVTu4Rad8opcILJJcqC+pjegDvBtUdDz+G3/dFiS6m8RYIRb7qB5yEX/lCgzlECmRS2XP8uraNJ5NN8rtk0gdBtaI9/78YyAjLLGkjIcIR4uJA5buCZBR9jIdqf4f52fowbx18VPrwFXN2mYX6mPsKbDmaz0ILHq/I9n8bS/KM7gIQmTw/RAUwnmL4IRu8zHn6nmIqj6d8AkjYx7s6pG8OF8LgfhqZT7tdPKCd+n/HnYn1fZGSw26zHzPd4nKnVV1e3NYvX6CVwVycerGs9elOKtOI8GsrWYyXzJbfC+nWxbHKI/t6sxyzTBrHPR4r6l/CchQF+SfBs5aELKExe7h325qBB2y6EFdkbxTj1tPGqxttp9xJB1LUyNtwsEAkpD44JNqPxZCYHQbeVE3Oo3TYtRUSVWREc1WNIsfSG/anScYUhDEah9YyIdiG+O71QqegunusLoxmpF2rQtx7shtAvJV3skDBB0tFDoQyIV+yPo7kPV0D7Ig+Ba+mk5ASJrT9DXZ53Q2CCTLAuslU4MP7g22RX8rU3s2hFJq8m7wvMwpqa9Tr6O38i1wX4PhG1VRMM8EIlMQnLWWKmni6NbOYiRxFYJMioxH5SyE4ODQYXy5YIuLoRsX8VR6UqJ1GZb7sJf3M1aPOFOHzTN9hnziTRRe1KCMoBrAghrqhvL1VRr9X5PYMxnjBh6o0d5YTN0WOGD2iEVbCzqxFXcxQZBBp4KyNAAhFhGNw8WUp/rVoyCYn7+OEYFspY4FmGMTYhvxbq5LEptXeQgOP2ggBkqsw8sYP9oj1cb4kzBNv8M7nR9kM1EqvZpFV47phoTbBeMY4DZOJodkASFVM5/7ijWy/M9rtWMFMCXKURKkAQJRFADs0KqMJ5osnFFnubX7vKgK736XXF4+wIQuuHqEsYDZ90ftInxq8sYRnb2FZ0EV4yc8qqnz++fjwrAA5EV+zhL6l6hum1zL8JkUJ1ICKZ905If6nIeoul8MY3B1Cz4W+osN2Wtl8OeJ2t3iZx3wk/unVa8uDZH1owu47He68e2V8vpYxOaW4/hLyy/XuL5DukETrhRjC+7GbEaKaCwoA2UwAdqU,iv:N8ek+tp16WiZgjTDxXb0CRXH+MbLsl/oZ/OwcOoVRO0=,tag:uIzCSX0R/EObF/RdWxj64w==,type:str]
|
||||||
|
api:
|
||||||
|
gmail_client_secret: ENC[AES256_GCM,data:du2gEY5TQIwpUEvJKDWKY3noLRGeiKek4IMwPUusVx8NMys=,iv:hIYi1xQYf6+hDhK0pNprBYu6wXwRH2yOTwQg6pzQa0A=,tag:sqmQ5GCkKbHpIy2R+Y5G/A==,type:str]
|
||||||
|
sops:
|
||||||
|
age:
|
||||||
|
- recipient: age1f6drjusg866yscj8029tk4yfpgecklrvezldm02ankm6h8nnwu5s2u6ahy
|
||||||
|
enc: |
|
||||||
|
-----BEGIN AGE ENCRYPTED FILE-----
|
||||||
|
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBoWkxDSnlNT2Vua1ZXWC8r
|
||||||
|
SU9UMnhaVXVEVlZGL3dtYTBJSzNGbHVaSTJNCm9ZTFM3RndpRktUcWhwZk1Fc2dk
|
||||||
|
ZGtoWXdoOWVyK1F0YStSS3dsMkg2R28KLS0tIFkrdVFZNlVxRjhPaWdMZXl2elV3
|
||||||
|
TVpyTzFsNFNmd3FNU0tlMnlTOHNTQWsKfKdN4epZokF74bCNr9+jxulZJFBQM83P
|
||||||
|
quMhl+H85My8jAsEeC9CW7y2jdNPJkfk9gHun4ozoW8U7o6y5RLfJg==
|
||||||
|
-----END AGE ENCRYPTED FILE-----
|
||||||
|
- recipient: age1ykcs39e62pz3xu6cedg8ea685kv5d5qsrhgkndygzm8rx30xd5ys5t3qxt
|
||||||
|
enc: |
|
||||||
|
-----BEGIN AGE ENCRYPTED FILE-----
|
||||||
|
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBSakZRUnkraWtId2h3eUhB
|
||||||
|
REpkUHhYMm1MSmtFU2pvd1BpQ0xRTTlCWkZJCkxrTm1sdDBqclJ3RHR6VkllOFpo
|
||||||
|
ZXRtS2lsazRDS2lyRnZmT3FTTjJ6WUUKLS0tIExxNlFoeDhHQ3l5a1VvUHNRWUdw
|
||||||
|
Mms2UEhFSU82UWR5Z1VvU25qenJUQm8KtQeZDIfJIczm1l8ql/WmVEf8KI9dg0vw
|
||||||
|
9rNSjtBkEttVd21zUSOziG4513abllE8NFTkAc1z3HacuXpHTBnd5A==
|
||||||
|
-----END AGE ENCRYPTED FILE-----
|
||||||
|
lastmodified: "2025-08-03T17:03:22Z"
|
||||||
|
mac: ENC[AES256_GCM,data:c3rcMHTRxbnpQoW5eLn0X1aCL1v2ft05UTcHaCuGiCaF3b/loVjEQr30pepBgR07PSleTIi375Y0Rj8ik8Ot3j+Zl5BR32bEtqf6gcWwz6oSmeORDrJS15698d7/avJl82/EC0ZN77j+fcdkWZrCJHb47HGfRxKl9L5HbyWasA4=,iv:g3d3C571uYpTTFixYZg+ztg8jTdof1g6Hb5gtRvpRkk=,tag:8kAxrUwUVeWvpYjWMDE+AA==,type:str]
|
||||||
|
unencrypted_suffix: _unencrypted
|
||||||
|
version: 3.10.2
|
||||||
@@ -60,15 +60,19 @@
|
|||||||
description = "Whether to enable docker stuff";
|
description = "Whether to enable docker stuff";
|
||||||
};
|
};
|
||||||
|
|
||||||
options.graphical = lib.mkOption {
|
options.graphical =
|
||||||
|
let
|
||||||
|
boolOption = lib.mkOption {
|
||||||
type = lib.types.bool;
|
type = lib.types.bool;
|
||||||
default = false;
|
default = false;
|
||||||
description = "Whether this system has a graphical environment";
|
|
||||||
};
|
};
|
||||||
|
in
|
||||||
options.steam = lib.mkOption {
|
{
|
||||||
type = lib.types.bool;
|
discord = boolOption;
|
||||||
default = false;
|
ghostty = boolOption;
|
||||||
description = "Whether this system has Steam installed";
|
joplin = boolOption;
|
||||||
|
steam = boolOption;
|
||||||
|
sublime = boolOption;
|
||||||
|
vscode = boolOption;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{ config, pkgs, lib, ... }:
|
{ config, pkgs, lib, ... }:
|
||||||
{
|
{
|
||||||
programs.steam = lib.mkIf config.steam {
|
programs.steam = lib.mkIf config.graphical.steam {
|
||||||
enable = true;
|
enable = true;
|
||||||
gamescopeSession.enable = true;
|
gamescopeSession.enable = true;
|
||||||
remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
|
remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
|
||||||
|
|||||||
Reference in New Issue
Block a user