Compare commits
76 Commits
v3
...
7205ea32a3
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
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 | ||
|
|
ddf5bcaeee | ||
|
|
f4e8b4083f | ||
|
|
3091004882 | ||
|
|
0d07e078aa | ||
|
|
d5a3520471 | ||
|
|
f586aba5b0 | ||
|
|
2120d3ba00 | ||
|
|
f2f1721e4c | ||
|
|
e000d5c7e8 | ||
|
|
82dfb95bde | ||
|
|
c94094a83d | ||
|
|
7fef2c9db2 | ||
|
|
dba3d0b44f | ||
|
|
e6a29ee61f | ||
|
|
5c1530ae46 | ||
|
|
7f5aea6a86 | ||
|
|
39a8b1455b | ||
|
|
0260f44582 | ||
|
|
e471c311c2 | ||
|
|
2b686288de | ||
|
|
26c3bef98f | ||
|
|
4f8af521a7 | ||
|
|
34affcba67 | ||
|
|
f53d460071 | ||
|
|
5b5548393b | ||
|
|
1701f5136e | ||
|
|
ed0e3658f9 | ||
|
|
773190f6c8 | ||
|
|
4f98e6a0e8 | ||
|
|
36e3d42ab7 | ||
|
|
874993c18c | ||
|
|
7c249ce8d7 | ||
|
|
95c3b2081d | ||
|
|
849b7bf3f7 | ||
|
|
ecfe33d30f | ||
|
|
87a27c824c | ||
|
|
1786f61e9a | ||
|
|
6dbbced319 | ||
|
|
62ac0320bf | ||
|
|
c8b8e04962 | ||
|
|
53005c1ba2 | ||
|
|
36a77a1d54 | ||
|
|
37ffa652f0 | ||
|
|
804b1e5723 | ||
|
|
7b315f9a39 | ||
|
|
9f873a95c0 | ||
|
|
db54cd95d9 | ||
|
|
f634eea3a7 | ||
|
|
ae071e4794 |
9
.sops.yaml
Normal file
9
.sops.yaml
Normal file
@@ -0,0 +1,9 @@
|
||||
keys:
|
||||
- &john-p14s age1f6drjusg866yscj8029tk4yfpgecklrvezldm02ankm6h8nnwu5s2u6ahy
|
||||
- &john-pc age1ykcs39e62pz3xu6cedg8ea685kv5d5qsrhgkndygzm8rx30xd5ys5t3qxt
|
||||
creation_rules:
|
||||
- path_regex: secrets.yaml$
|
||||
key_groups:
|
||||
- age:
|
||||
- *john-p14s
|
||||
- *john-pc
|
||||
70
README.md
70
README.md
@@ -40,42 +40,54 @@ nhmu
|
||||
|
||||
```nix
|
||||
{
|
||||
description = "Home Manager configuration of john";
|
||||
description = "John's system flake";
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager";
|
||||
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
|
||||
jsl-home = {
|
||||
url = "git+https://gitea.john-stream.com/john/jsl-home?ref=dev";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
john-home-config = {
|
||||
url = "path:/home/john/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs.home-manager.follows = "home-manager";
|
||||
};
|
||||
};
|
||||
|
||||
outputs =
|
||||
{ nixpkgs, ... }@inputs:
|
||||
let
|
||||
system = "x86_64-linux";
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
homeManagerConfiguration = inputs.home-manager.lib.homeManagerConfiguration;
|
||||
jslDefault = inputs.john-home-config.homeManagerModules.default;
|
||||
userName = "john";
|
||||
in
|
||||
{
|
||||
homeConfigurations."${userName}" = homeManagerConfiguration {
|
||||
inherit pkgs;
|
||||
modules = [
|
||||
jslDefault {
|
||||
user = "${userName}";
|
||||
# Add any additional configuration here
|
||||
}
|
||||
./home.nix
|
||||
# Add other home manager modules here
|
||||
];
|
||||
outputs = { self, nixpkgs, ... }@inputs:
|
||||
let
|
||||
system = "x86_64-linux";
|
||||
nixosSystem = nixpkgs.lib.nixosSystem;
|
||||
hostName = "john-p14s";
|
||||
in
|
||||
{
|
||||
nixosConfigurations.${hostName} = nixosSystem {
|
||||
specialArgs =
|
||||
{
|
||||
inherit inputs;
|
||||
inherit system;
|
||||
};
|
||||
modules = [
|
||||
./hardware-configuration.nix
|
||||
./configuration.nix
|
||||
inputs.jsl-home.nixosModules.default
|
||||
{
|
||||
stateVersion = "24.05";
|
||||
user = "john";
|
||||
root = true;
|
||||
ssh = true;
|
||||
profile = "personal";
|
||||
enableShell = true;
|
||||
_1password = true;
|
||||
docker = true;
|
||||
graphical = {
|
||||
steam = true;
|
||||
vscode = true;
|
||||
};
|
||||
extraImports = [
|
||||
./home-manager/john.nix
|
||||
./home-manager/gnome.nix
|
||||
./home-manager/ssh.nix
|
||||
];
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
```
|
||||
|
||||
79
flake.nix
79
flake.nix
@@ -8,6 +8,14 @@
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
_1password-shell-plugins.url = "github:1Password/shell-plugins";
|
||||
nixgl = {
|
||||
url = "github:nix-community/nixGL";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
sops-nix = {
|
||||
url = "github:Mic92/sops-nix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
|
||||
outputs = { self, nixpkgs, ... }@inputs:
|
||||
@@ -16,53 +24,55 @@
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
lib = pkgs.lib;
|
||||
|
||||
# These will get applied to both the configured user and the root user (if enabled)
|
||||
userOptions = config: {
|
||||
openssh.authorizedKeys.keyFiles = lib.optionals config.ssh [ ./personal_keys ];
|
||||
extraGroups = lib.optionals config.root [ "wheel" ];
|
||||
shell = lib.mkIf config.shell pkgs.zsh;
|
||||
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;
|
||||
};
|
||||
|
||||
homeManagerModules = config: [
|
||||
self.homeManagerModules.default {
|
||||
mkhomeManagerModules = config: [
|
||||
(self.homeManagerModules.default inputs)
|
||||
# { inherit (config) extraImports; }
|
||||
{
|
||||
user = config.user;
|
||||
stateVersion = config.stateVersion;
|
||||
profile = config.profile;
|
||||
shell = config.shell;
|
||||
enableShell = config.enableShell;
|
||||
ssh = config.ssh;
|
||||
_1password = config._1password;
|
||||
docker = config.docker;
|
||||
graphical = config.graphical;
|
||||
}
|
||||
] ++ config.extraImports;
|
||||
|
||||
in
|
||||
{
|
||||
homeManagerModules.default = { ... }: {
|
||||
imports = [
|
||||
./nixosModules/options.nix
|
||||
./home.nix
|
||||
inputs._1password-shell-plugins.hmModules.default
|
||||
];
|
||||
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
|
||||
"1password-cli"
|
||||
];
|
||||
|
||||
home.packages = with pkgs; [
|
||||
(writeShellScriptBin "nhmu" ''
|
||||
nix flake update --flake ~/.config/home-manager
|
||||
nix run home-manager -- switch --flake ~/.config/home-manager
|
||||
'')
|
||||
];
|
||||
lib = { inherit mkhomeManagerModules; };
|
||||
|
||||
homeManagerModules.default = inputs: {
|
||||
imports = [ ./homeManagerModules ];
|
||||
};
|
||||
|
||||
nixosModules.default = { config, ... }: {
|
||||
imports = [
|
||||
./nixosModules/options.nix
|
||||
./nixosModules/scripts.nix
|
||||
./nixosModules
|
||||
inputs.home-manager.nixosModules.default
|
||||
];
|
||||
nix.settings.trusted-users = [ "root" "@wheel" ];
|
||||
users.users.${config.user} = {
|
||||
isNormalUser = true;
|
||||
} // userOptions config;
|
||||
users.users.${config.user} = lib.mkMerge [
|
||||
{
|
||||
isNormalUser = true;
|
||||
description = "John Lancaster";
|
||||
extraGroups = []
|
||||
++ lib.optional config.root "wheel"
|
||||
++ lib.optional config.docker "docker"
|
||||
++ lib.optional config.networking.networkmanager.enable "networkmanager";
|
||||
}
|
||||
(userOptions config)
|
||||
];
|
||||
|
||||
users.users.root = lib.mkIf config.root (userOptions config);
|
||||
security.sudo-rs = lib.mkIf config.root {
|
||||
@@ -72,19 +82,24 @@
|
||||
extraConfig = "Defaults timestamp_timeout=1440";
|
||||
};
|
||||
|
||||
programs.zsh.enable = lib.mkIf config.shell true;
|
||||
programs.zsh.enable = lib.mkIf config.enableShell true;
|
||||
|
||||
virtualisation.docker = lib.mkIf config.docker {
|
||||
enable = true;
|
||||
enableOnBoot = true;
|
||||
package = pkgs.docker;
|
||||
};
|
||||
|
||||
home-manager = {
|
||||
useUserPackages = true;
|
||||
extraSpecialArgs = { inherit inputs; };
|
||||
extraSpecialArgs = { inherit inputs; nixgl = inputs.nixgl; };
|
||||
users = {
|
||||
${config.user} = {
|
||||
imports = homeManagerModules config;
|
||||
imports = mkhomeManagerModules config;
|
||||
};
|
||||
} // lib.optionalAttrs config.root {
|
||||
root = {
|
||||
# home.stateVersion = config.stateVersion;
|
||||
imports = homeManagerModules (config // { user = "root"; });
|
||||
imports = mkhomeManagerModules (config // { user = "root"; });
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1,12 +1,39 @@
|
||||
{ config, pkgs, lib, inputs, ... }:
|
||||
|
||||
{ inputs, config, pkgs, lib, ... }:
|
||||
{
|
||||
# These modules are each responsible for responding appropriately to the options
|
||||
imports = [
|
||||
./homeManagerModules/git.nix
|
||||
./homeManagerModules/shell.nix
|
||||
./homeManagerModules/ssh.nix
|
||||
# inputs._1password-shell-plugins.hmModules.default
|
||||
./docker.nix
|
||||
./ghostty.nix
|
||||
./git.nix
|
||||
./shell.nix
|
||||
./sops.nix
|
||||
./ssh.nix
|
||||
./vscode.nix
|
||||
|
||||
../nixosModules/options.nix
|
||||
inputs._1password-shell-plugins.hmModules.default
|
||||
];
|
||||
|
||||
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
|
||||
"1password-cli"
|
||||
"discord"
|
||||
"spotify"
|
||||
"steam"
|
||||
"steam-original"
|
||||
"steam-unwrapped"
|
||||
"steam-run"
|
||||
"sublimetext4"
|
||||
"vscode"
|
||||
"vscode-extension-mhutchie-git-graph"
|
||||
"vscode-extension-ms-vscode-remote-vscode-remote-extensionpack"
|
||||
"vscode-extension-MS-python-vscode-pylance"
|
||||
"vscode-extension-github-copilot"
|
||||
];
|
||||
|
||||
nixpkgs.config.permittedInsecurePackages = [
|
||||
"openssl-1.1.1w"
|
||||
];
|
||||
|
||||
# Home Manager needs a bit of information about you and the paths it should
|
||||
# manage.
|
||||
home.username = config.user;
|
||||
@@ -26,12 +53,20 @@
|
||||
lazygit
|
||||
btop
|
||||
yazi
|
||||
uv
|
||||
(writeShellScriptBin "nhmu" ''
|
||||
nix flake update --flake ~/.config/home-manager
|
||||
nix run home-manager -- switch --flake ~/.config/home-manager --impure
|
||||
'')
|
||||
# # It is sometimes useful to fine-tune packages, for example, by applying
|
||||
# # overrides. You can do that directly here, just don't forget the
|
||||
# # parentheses. Maybe you want to install Nerd Fonts with a limited number of
|
||||
# # fonts?
|
||||
# (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; })
|
||||
];
|
||||
]
|
||||
++ lib.optional config.graphical.discord discord
|
||||
++ lib.optional config.graphical.joplin joplin-desktop
|
||||
++ lib.optional config.graphical.sublime sublime4;
|
||||
|
||||
# Home Manager can also manage your environment variables through
|
||||
# 'home.sessionVariables'. These will be explicitly sourced when using a
|
||||
@@ -72,4 +107,4 @@
|
||||
vault = "Private"
|
||||
'';
|
||||
};
|
||||
}
|
||||
}
|
||||
11
homeManagerModules/docker.nix
Normal file
11
homeManagerModules/docker.nix
Normal file
@@ -0,0 +1,11 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{
|
||||
home.packages = lib.mkIf config.docker (with pkgs; [
|
||||
docker
|
||||
docker-compose
|
||||
lazydocker
|
||||
(pkgs.writeShellScriptBin "test-docker" ''
|
||||
echo "Hello from docker.nix!"
|
||||
'')
|
||||
]);
|
||||
}
|
||||
115
homeManagerModules/ghostty.nix
Normal file
115
homeManagerModules/ghostty.nix
Normal file
@@ -0,0 +1,115 @@
|
||||
{ config, pkgs, lib, nixgl, ... }:
|
||||
{
|
||||
home.sessionVariables = lib.mkIf (config.enableShell && config.graphical.ghostty) {
|
||||
TERMINAL = "ghostty";
|
||||
};
|
||||
|
||||
# nixGL is now provided as a flake input
|
||||
nixGL.packages = nixgl.packages.${pkgs.system};
|
||||
nixGL.defaultWrapper = "mesa";
|
||||
nixGL.installScripts = [ "mesa" ];
|
||||
|
||||
programs.ghostty = lib.mkIf (config.enableShell && config.graphical.ghostty) {
|
||||
enable = true;
|
||||
enableZshIntegration = true;
|
||||
package = config.lib.nixGL.wrap pkgs.ghostty;
|
||||
settings = {
|
||||
# command = "TERM=xterm-256color /usr/bin/bash";
|
||||
font-size = 12;
|
||||
font-family = "Source Code Pro";
|
||||
# theme = "idleToes";
|
||||
# theme = "CGA";
|
||||
theme = "catppuccin-mocha";
|
||||
# theme = "CobaltNext";
|
||||
# clipboard-read = "allow";
|
||||
copy-on-select = true;
|
||||
shell-integration = "zsh";
|
||||
shell-integration-features = [ "no-title" "sudo" ];
|
||||
gtk-single-instance = true;
|
||||
|
||||
window-padding-balance = true ;
|
||||
window-padding-x = 5;
|
||||
window-padding-y = 5;
|
||||
initial-window = true;
|
||||
resize-overlay = "never";
|
||||
|
||||
# Example: https://gist.github.com/adibhanna/c552c452fb244b3b721e3c2432e85cde
|
||||
keybind = [
|
||||
"ctrl+s>n=new_split:down"
|
||||
"ctrl+t>n=new_tab"
|
||||
"ctrl+t>1=goto_tab:1"
|
||||
"ctrl+t>2=goto_tab:2"
|
||||
"ctrl+t>3=goto_tab:3"
|
||||
"ctrl+s>i=goto_split:up"
|
||||
"ctrl+s>k=goto_split:down"
|
||||
];
|
||||
|
||||
# window-position-x = 500;
|
||||
# window-position-y = 500;
|
||||
window-height = 40;
|
||||
window-width = 200;
|
||||
};
|
||||
};
|
||||
|
||||
# https://github.com/ghostty-org/ghostty/discussions/3763#discussioncomment-11699970
|
||||
xdg.desktopEntries."com.mitchellh.ghostty" = lib.mkIf (config.enableShell && config.graphical.ghostty) {
|
||||
name = "Ghostty";
|
||||
type = "Application";
|
||||
comment = "A terminal emulator";
|
||||
exec = "ghostty";
|
||||
icon = "com.mitchellh.ghostty";
|
||||
terminal = false;
|
||||
startupNotify = true;
|
||||
categories = [ "System" "TerminalEmulator" ];
|
||||
settings = {
|
||||
Keywords = "terminal;tty;pty;";
|
||||
X-GNOME-UsesNotifications = "true";
|
||||
X-TerminalArgExec = "-e";
|
||||
X-TerminalArgTitle = "--title=";
|
||||
X-TerminalArgAppId = "--class=";
|
||||
X-TerminalArgDir = "--working-directory=";
|
||||
X-TerminalArgHold = "--wait-after-command";
|
||||
};
|
||||
actions = {
|
||||
new-window = {
|
||||
name = "New Window";
|
||||
exec = "ghostty";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
# https://discourse.nixos.org/t/apps-installed-via-home-manager-are-not-visible-within-gnome/48252/2
|
||||
# home.activation.copyDesktopFiles = lib.hm.dag.entryAfter ["installPackages"] ''
|
||||
# if [ "$XDG_CURRENT_DESKTOP" = "GNOME" ]; then
|
||||
|
||||
# mkdir -p "${config.home.homeDirectory}/.local/share/applications"
|
||||
|
||||
# if [ -d "${config.home.homeDirectory}/.local/share/applications/nix" ]; then
|
||||
# rm -rf "${config.home.homeDirectory}/.local/share/applications/nix"
|
||||
# fi
|
||||
|
||||
# ln -sf "${config.home.homeDirectory}/.nix-profile/share/applications" \
|
||||
# ${config.home.homeDirectory}/.local/share/applications/nix
|
||||
|
||||
# mkdir -p "${config.home.homeDirectory}/.local/share/icons"
|
||||
|
||||
# if [ -d "${config.home.homeDirectory}/.local/share/icons/nix" ]; then
|
||||
# rm -rf "${config.home.homeDirectory}/.local/share/icons/nix"
|
||||
# fi
|
||||
|
||||
# ln -sf "${config.home.homeDirectory}/.nix-profile/share/icons" \
|
||||
# ${config.home.homeDirectory}/.local/share/icons/nix
|
||||
|
||||
# fi
|
||||
# '';
|
||||
|
||||
# https://wiki.nixos.org/wiki/GNOME
|
||||
# https://hoverbear.org/blog/declarative-gnome-configuration-in-nixos/#setting-gnome-options
|
||||
# dconf.settings = {
|
||||
# "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = {
|
||||
# "binding" = "<Super>Return";
|
||||
# "command" = "ghostty";
|
||||
# "name" = "Terminal";
|
||||
# };
|
||||
# };
|
||||
}
|
||||
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;
|
||||
};
|
||||
}
|
||||
);
|
||||
}
|
||||
@@ -6,7 +6,7 @@
|
||||
echo "Hello from ~/.config/home-manager/home.nix!"
|
||||
'')
|
||||
];
|
||||
programs.zsh = lib.mkIf config.shell {
|
||||
programs.zsh = lib.mkIf config.enableShell {
|
||||
enable = true;
|
||||
enableCompletion = true;
|
||||
autosuggestion.enable = true;
|
||||
@@ -38,7 +38,9 @@
|
||||
};
|
||||
shellAliases.ls = "${pkgs.eza}/bin/eza -lgos type --no-time";
|
||||
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
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
||||
24
homeManagerModules/sops.nix
Normal file
24
homeManagerModules/sops.nix
Normal file
@@ -0,0 +1,24 @@
|
||||
{ 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";
|
||||
};
|
||||
home.packages = with pkgs; [
|
||||
(writeShellScriptBin "edit-secrets" ''
|
||||
sops --config ${sopsConfigPath} ${sopsSecretsPath}
|
||||
'')
|
||||
sops
|
||||
age
|
||||
];
|
||||
programs.zsh.shellAliases.sops = lib.mkIf config.enableShell "sops --config ${sopsConfigPath}";
|
||||
}
|
||||
@@ -8,6 +8,14 @@
|
||||
'';
|
||||
matchBlocks = lib.mkMerge [
|
||||
(lib.mkIf (config.profile == "personal") {
|
||||
"ad-nix" = {
|
||||
hostname = "192.168.1.201";
|
||||
user = "appdaemon";
|
||||
};
|
||||
"docs" = {
|
||||
hostname = "192.168.1.110";
|
||||
user = "root";
|
||||
};
|
||||
"panoptes" = {
|
||||
hostname = "192.168.1.107";
|
||||
user = "panoptes";
|
||||
|
||||
19
homeManagerModules/vscode.nix
Normal file
19
homeManagerModules/vscode.nix
Normal file
@@ -0,0 +1,19 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{
|
||||
programs.vscode = lib.mkIf config.graphical.vscode {
|
||||
enable = true;
|
||||
package = pkgs.vscode;
|
||||
profiles.default.extensions = with pkgs.vscode-extensions; [
|
||||
mhutchie.git-graph
|
||||
ms-vscode-remote.vscode-remote-extensionpack
|
||||
ms-python.python
|
||||
ms-python.vscode-pylance
|
||||
ms-toolsai.jupyter
|
||||
charliermarsh.ruff
|
||||
github.vscode-pull-request-github
|
||||
github.vscode-github-actions
|
||||
github.copilot
|
||||
catppuccin.catppuccin-vsc
|
||||
];
|
||||
};
|
||||
}
|
||||
36
keys/secrets.yaml
Normal file
36
keys/secrets.yaml
Normal file
@@ -0,0 +1,36 @@
|
||||
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]
|
||||
hello: ENC[AES256_GCM,data:g/YDwjNQLs4pFRzFO3nwcbmeJd6tMLNNhhnSsAFyOQ8U8yjjUoCReDvrqpqBXIP1T9B80qyBVzxBY2bAYg==,iv:YdiJdG1ZjA95DGArtfaF1E8LomqW6oHCLmoSLQvwP+k=,tag:/ipWczAvhcjw5Jv7nvMF8A==,type:str]
|
||||
example_key: ENC[AES256_GCM,data:cLLYEiJbKg60ANK/h+kG,iv:1yrJt5JhbDP/9/Wb2l93fjwQF1hxERnxjPZ6qF4S/Bw=,tag:wbboaGylFJRSj4/TB+RCZg==,type:str]
|
||||
#ENC[AES256_GCM,data:c0Ay18GCW/gowNHmF67TMg==,iv:T+FN8xaVilVSETMQztl6lmpLqnGiyrXhJvWsO+dBdd0=,tag:1D6TkngB116dOeCAX85djg==,type:comment]
|
||||
example_array:
|
||||
- ENC[AES256_GCM,data:yUJ7p5VfyQUANjbuz48=,iv:XTGb97tMV3mkPwNyKetSflLLlE31g9UgMPcelMPpNZ0=,tag:j5muB72Ogc/gtenvsWvpbQ==,type:str]
|
||||
- ENC[AES256_GCM,data:8eQ2clCNBxPfdycPMOo=,iv:C9iT+wJH9ENJShNYo3IGceRwHyrlU6LUE7jpc+72KOw=,tag:YTbZqYJVMUoTRqD2ujTOvg==,type:str]
|
||||
example_number: ENC[AES256_GCM,data:LhABh/RtBsdKAg==,iv:JGYFnixDNZUIRKJcuaenvO8D60T+Jvx/R7SWxbIPXsM=,tag:+1b/aj3x1yfQZ2j4OM5dcg==,type:float]
|
||||
example_booleans:
|
||||
- ENC[AES256_GCM,data:pGnelw==,iv:KAayJZ8px4Qupv0NfapSQ6valrVKndEtCb3U4MTmK/U=,tag:lkl+zBgkEMbFQjNssxYQjg==,type:bool]
|
||||
- ENC[AES256_GCM,data:Vqqfp2w=,iv:SC1DS7G9/lHYtA6PPRbVsi/ZhyNUYvRjXxHIqCxqEPA=,tag:9hv6F1rP7xSd08KCKkuiLQ==,type:bool]
|
||||
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-07-29T00:12:59Z"
|
||||
mac: ENC[AES256_GCM,data:5dQiEDyfeIYJt/l1wWH8y5cQm7+PqnUDwezCmyP7nvXs0z1lupYOHV62L5hqeQb7AELi4TriOokra4XdhHfr/QnI9capnYV6qTQrfvBE0EKsUQlxTmE6EnnTQuOWQy1iL8XgM3toEIH2mW2QNwme9k3fF/gGA8bL9t0+OEYGasU=,iv:kVDSFTHQG95rDfkp8sWJnxRQ5Wd9BjfPEzmuMm+alY0=,tag:3KFmBgW6pEEBFkOa14brDw==,type:str]
|
||||
unencrypted_suffix: _unencrypted
|
||||
version: 3.10.2
|
||||
8
nixosModules/default.nix
Normal file
8
nixosModules/default.nix
Normal file
@@ -0,0 +1,8 @@
|
||||
{ inputs, config, pkgs, lib, ... }:
|
||||
{
|
||||
imports = [
|
||||
./options.nix
|
||||
./scripts.nix
|
||||
./steam.nix
|
||||
];
|
||||
}
|
||||
@@ -30,7 +30,7 @@
|
||||
description = "Whether enable all the root user stuff";
|
||||
};
|
||||
|
||||
options.shell = lib.mkOption {
|
||||
options.enableShell = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = true;
|
||||
description = "Whether to enable all the zsh stuff";
|
||||
@@ -53,4 +53,26 @@
|
||||
default = [];
|
||||
description = "Additional Home Manager modules to import";
|
||||
};
|
||||
|
||||
options.docker = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = "Whether to enable docker stuff";
|
||||
};
|
||||
|
||||
options.graphical =
|
||||
let
|
||||
boolOption = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
};
|
||||
in
|
||||
{
|
||||
discord = boolOption;
|
||||
ghostty = boolOption;
|
||||
joplin = boolOption;
|
||||
steam = boolOption;
|
||||
sublime = boolOption;
|
||||
vscode = boolOption;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -5,12 +5,12 @@ in
|
||||
{
|
||||
environment.systemPackages = with pkgs; [
|
||||
(pkgs.writeShellScriptBin "nfs" ''
|
||||
sudo nixos-rebuild switch --flake $(readlink -f /etc/nixos)#${hostName} --impure
|
||||
sudo nixos-rebuild switch --flake $(readlink -f /etc/nixos)#${hostName} --impure
|
||||
'')
|
||||
(pkgs.writeShellScriptBin "nfsu" ''
|
||||
FLAKE=$(readlink -f /etc/nixos)
|
||||
nix flake update --flake $FLAKE --impure
|
||||
sudo nixos-rebuild switch --flake $FLAKE#${hostName} --impure
|
||||
FLAKE=$(readlink -f /etc/nixos)
|
||||
nix flake update --flake $FLAKE --impure
|
||||
sudo nixos-rebuild switch --flake $FLAKE#${hostName} --impure
|
||||
'')
|
||||
];
|
||||
}
|
||||
10
nixosModules/steam.nix
Normal file
10
nixosModules/steam.nix
Normal file
@@ -0,0 +1,10 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
{
|
||||
programs.steam = lib.mkIf config.graphical.steam {
|
||||
enable = true;
|
||||
gamescopeSession.enable = true;
|
||||
remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
|
||||
dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
|
||||
localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers
|
||||
};
|
||||
}
|
||||
Reference in New Issue
Block a user