envs/home
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated

Browse Source
This commit is contained in:
Morten Olsen
2025-12-27 00:02:02 +01:00
parent e384cc4829
commit 7f087bc39e
16 changed files with 257 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
flake.lock generated
View File

@@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1765682243, "lastModified": 1766682973,
"narHash": "sha256-yeCxFV/905Wr91yKt5zrVvK6O2CVXWRMSrxqlAZnLp0=", "narHash": "sha256-GKO35onS711ThCxwWcfuvbIBKXwriahGqs+WZuJ3v9E=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "58bf3ecb2d0bba7bdf363fc8a6c4d49b4d509d03", "rev": "91cdb0e2d574c64fae80d221f4bf09d5592e9ec2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -27,11 +27,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1765684049, "lastModified": 1766784396,
"narHash": "sha256-svCS2r984qEowMT0y3kCrsD/m0J6zaF5I/UusS7QaH0=", "narHash": "sha256-rIlgatT0JtwxsEpzq+UrrIJCRfVAXgbYPzose1DmAcM=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "9b628e171bfaea1a3d1edf31eee46251e0fe4a33", "rev": "f0c8e1f6feb562b5db09cee9fb566a2f989e6b55",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -42,11 +42,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1765644376, "lastModified": 1766747458,
"narHash": "sha256-yqHBL2wYGwjGL2GUF2w3tofWl8qO9tZEuI4wSqbCrtE=", "narHash": "sha256-m63jjuo/ygo8ztkCziYh5OOIbTSXUDkKbqw3Vuqu4a4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "23735a82a828372c4ef92c660864e82fbe2f5fbe", "rev": "c633f572eded8c4f3c75b8010129854ed404a6ce",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -74,11 +74,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1765895443, "lastModified": 1766697593,
"narHash": "sha256-yftYGV0skUwV5neT1BJrs7RRbXPKozQTzC7d9c7kEFs=", "narHash": "sha256-mGZBEN67mxeOsBhplBRLm6L+y++8jU46EEUYgemG1aQ=",
"owner": "0xc000022070", "owner": "0xc000022070",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "bc7dfff92cb7919dfb213ea78c11ea0a4d265a56", "rev": "98d8f48ba80a4b6e3b56addad850d57132301075",
"type": "github" "type": "github"
}, },
"original": { "original": {

175
flake.nix
View File

@@ -28,88 +28,103 @@
}; };
}; };
outputs = { outputs =
self, {
nixpkgs, self,
home-manager, nixpkgs,
nix-darwin, home-manager,
... nix-darwin,
} @ inputs: let ...
# Default username - can be overridden per-host if needed }@inputs:
username = "alice"; let
# Default username - can be overridden per-host if needed
username = "alice";
# Common special args passed to all modules # Common special args passed to all modules
specialArgs = {inherit inputs username;}; specialArgs = { inherit inputs username; };
in {
# Darwin (macOS) system configurations
darwinConfigurations = {
# Personal machine configuration
"personal" = nix-darwin.lib.darwinSystem {
system = "aarch64-darwin";
inherit specialArgs;
modules = [
# Host-specific darwin configuration
./hosts/personal
# Home Manager as a darwin module
home-manager.darwinModules.home-manager
{
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
extraSpecialArgs = specialArgs;
users.${username} = {...}: {
imports = [
./home
./home/personal.nix
];
};
};
}
];
};
# Work machine configuration
"work" = nix-darwin.lib.darwinSystem {
system = "aarch64-darwin";
inherit specialArgs;
modules = [
# Host-specific darwin configuration
./hosts/work
# Home Manager as a darwin module
home-manager.darwinModules.home-manager
{
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
extraSpecialArgs = specialArgs;
users.${username} = {...}: {
imports = [
./home
./home/work.nix
];
};
};
}
];
};
};
# Development shell for working on this repository
devShells = let
systems = ["aarch64-darwin" "x86_64-darwin"];
forAllSystems = nixpkgs.lib.genAttrs systems;
in in
forAllSystems (system: let {
pkgs = nixpkgs.legacyPackages.${system}; # Darwin (macOS) system configurations
in { darwinConfigurations = {
default = pkgs.mkShell { # Personal machine configuration
packages = with pkgs; [ "personal" = nix-darwin.lib.darwinSystem {
nixfmt-rfc-style system = "aarch64-darwin";
nil # Nix LSP inherit specialArgs;
modules = [
# Host-specific darwin configuration
./hosts/personal
# Home Manager as a darwin module
home-manager.darwinModules.home-manager
{
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
extraSpecialArgs = specialArgs;
users.${username} =
{ ... }:
{
imports = [
./home
./home/personal.nix
];
};
};
}
]; ];
}; };
});
}; # Work machine configuration
"work" = nix-darwin.lib.darwinSystem {
system = "aarch64-darwin";
inherit specialArgs;
modules = [
# Host-specific darwin configuration
./hosts/work
# Home Manager as a darwin module
home-manager.darwinModules.home-manager
{
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
extraSpecialArgs = specialArgs;
users.${username} =
{ ... }:
{
imports = [
./home
./home/work.nix
];
};
};
}
];
};
};
# Development shell for working on this repository
devShells =
let
systems = [
"aarch64-darwin"
"x86_64-darwin"
];
forAllSystems = nixpkgs.lib.genAttrs systems;
in
forAllSystems (
system:
let
pkgs = nixpkgs.legacyPackages.${system};
in
{
default = pkgs.mkShell {
packages = with pkgs; [
nixfmt-rfc-style
nil # Nix LSP
];
};
}
);
};
} }

5
home/default.nix
View File

@@ -9,7 +9,8 @@
username, username,
inputs, inputs,
... ...
}: { }:
{
# Import shared modules # Import shared modules
imports = [ imports = [
inputs.zen-browser.homeModules.beta inputs.zen-browser.homeModules.beta
@@ -32,7 +33,7 @@
home = { home = {
# Home Manager needs a bit of information about you and the paths it should manage # Home Manager needs a bit of information about you and the paths it should manage
username = username; inherit username;
homeDirectory = "/Users/${username}"; homeDirectory = "/Users/${username}";
# This value determines the Home Manager release that your configuration is # This value determines the Home Manager release that your configuration is

3
home/personal.nix
View File

@@ -7,7 +7,8 @@
pkgs, pkgs,
lib, lib,
... ...
}: { }:
{
# Import personal-specific modules # Import personal-specific modules
imports = [ imports = [
../modules/home/git.nix ../modules/home/git.nix

3
home/work.nix
View File

@@ -7,7 +7,8 @@
pkgs, pkgs,
lib, lib,
... ...
}: { }:
{
# Import work-specific modules # Import work-specific modules
imports = [ imports = [
../modules/home/git.nix ../modules/home/git.nix

4
hosts/personal/default.nix
View File

@@ -8,14 +8,14 @@
lib, lib,
username, username,
... ...
}: { }:
{
# Import darwin modules # Import darwin modules
imports = [ imports = [
../../modules/darwin/system.nix ../../modules/darwin/system.nix
../../modules/darwin/homebrew.nix ../../modules/darwin/homebrew.nix
]; ];
# System-level programs # System-level programs
programs = { programs = {
# Enable zsh as it's the default macOS shell # Enable zsh as it's the default macOS shell

3
hosts/work/default.nix
View File

@@ -8,7 +8,8 @@
lib, lib,
username, username,
... ...
}: { }:
{
# Import darwin modules # Import darwin modules
imports = [ imports = [
../../modules/darwin/system.nix ../../modules/darwin/system.nix

30
modules/darwin/homebrew.nix
View File

@@ -9,9 +9,11 @@
pkgs, pkgs,
... ...
}: }:
with lib; let with lib;
let
cfg = config.modules.homebrew; cfg = config.modules.homebrew;
in { in
{
options.modules.homebrew = { options.modules.homebrew = {
enable = mkEnableOption "Homebrew management via nix-darwin"; enable = mkEnableOption "Homebrew management via nix-darwin";
@@ -127,7 +129,11 @@ in {
# Cleanup behavior # Cleanup behavior
cleanup = mkOption { cleanup = mkOption {
type = types.enum ["none" "uninstall" "zap"]; type = types.enum [
"none"
"uninstall"
"zap"
];
default = "zap"; default = "zap";
description = '' description = ''
Cleanup behavior for Homebrew packages: Cleanup behavior for Homebrew packages:
@@ -150,7 +156,7 @@ in {
# Upgrade outdated packages # Upgrade outdated packages
upgrade = true; upgrade = true;
# Cleanup behavior for unmanaged packages # Cleanup behavior for unmanaged packages
cleanup = cfg.cleanup; inherit (cfg) cleanup;
}; };
# Global settings # Global settings
@@ -162,26 +168,18 @@ in {
}; };
# Taps (third-party repositories) # Taps (third-party repositories)
taps = cfg.taps; inherit (cfg) taps;
# Formulae (CLI tools from Homebrew) # Formulae (CLI tools from Homebrew)
brews = cfg.brews; inherit (cfg) brews;
caskArgs.no_quarantine = true; caskArgs.no_quarantine = true;
# Casks (GUI applications) # Casks (GUI applications)
casks = casks =
cfg.casks.shared cfg.casks.shared
++ ( ++ (if cfg.casks.enablePersonal then cfg.casks.personal else [ ])
if cfg.casks.enablePersonal ++ (if cfg.casks.enableWork then cfg.casks.work else [ ]);
then cfg.casks.personal
else []
)
++ (
if cfg.casks.enableWork
then cfg.casks.work
else []
);
}; };
}; };
} }

9
modules/darwin/system.nix
View File

@@ -5,12 +5,16 @@
lib, lib,
username, username,
... ...
}: { }:
{
# Nix configuration # Nix configuration
nix = { nix = {
settings = { settings = {
# Enable flakes and new nix command # Enable flakes and new nix command
experimental-features = ["nix-command" "flakes"]; experimental-features = [
"nix-command"
"flakes"
];
# Avoid unwanted garbage collection when using nix-direnv # Avoid unwanted garbage collection when using nix-direnv
keep-outputs = true; keep-outputs = true;
keep-derivations = true; keep-derivations = true;
@@ -35,7 +39,6 @@
DisableConsoleAccess = true; DisableConsoleAccess = true;
}; };
dock = { dock = {
autohide = true; autohide = true;
autohide-delay = 0.0; autohide-delay = 0.0;

71
modules/home/apps.nix
View File

@@ -7,9 +7,11 @@
pkgs, pkgs,
lib, lib,
... ...
}: let }:
let
cfg = config.modules.apps; cfg = config.modules.apps;
in { in
{
options.modules.apps = { options.modules.apps = {
enable = lib.mkEnableOption "application configurations"; enable = lib.mkEnableOption "application configurations";
@@ -29,7 +31,6 @@ in {
}; };
}; };
jellyfin-tui = { jellyfin-tui = {
enable = lib.mkOption { enable = lib.mkOption {
type = lib.types.bool; type = lib.types.bool;
@@ -66,38 +67,42 @@ in {
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
programs.zen-browser = lib.mkIf cfg.zen-browser.enable { programs.zen-browser = lib.mkIf cfg.zen-browser.enable {
enable = true; enable = true;
policies = let policies =
mkExtensionSettings = builtins.mapAttrs (_: pluginId: { let
install_url = "https://addons.mozilla.org/firefox/downloads/latest/${pluginId}/latest.xpi"; mkExtensionSettings = builtins.mapAttrs (
installation_mode = "force_installed"; _: pluginId: {
}); install_url = "https://addons.mozilla.org/firefox/downloads/latest/${pluginId}/latest.xpi";
in { installation_mode = "force_installed";
AutofillAddressEnabled = true; }
AutofillCreditCardEnabled = false; );
DisableAppUpdate = true; in
DisableFeedbackCommands = true; {
DisableFirefoxStudies = true; AutofillAddressEnabled = true;
DisablePocket = true; AutofillCreditCardEnabled = false;
DisableTelemetry = true; DisableAppUpdate = true;
DontCheckDefaultBrowser = true; DisableFeedbackCommands = true;
NoDefaultBookmarks = true; DisableFirefoxStudies = true;
OfferToSaveLogins = false; DisablePocket = true;
EnableTrackingProtection = { DisableTelemetry = true;
Value = true; DontCheckDefaultBrowser = true;
Locked = true; NoDefaultBookmarks = true;
Cryptomining = true; OfferToSaveLogins = false;
Fingerprinting = true; EnableTrackingProtection = {
}; Value = true;
Locked = true;
Cryptomining = true;
Fingerprinting = true;
};
ExtensionSettings = mkExtensionSettings { ExtensionSettings = mkExtensionSettings {
#"78272b6fa58f4a1abaac99321d503a20@proton.me" = "proton-pass"; #"78272b6fa58f4a1abaac99321d503a20@proton.me" = "proton-pass";
"{446900e4-71c2-419f-a6a7-df9c091e268b}" = "bitwarden-password-manager"; "{446900e4-71c2-419f-a6a7-df9c091e268b}" = "bitwarden-password-manager";
"{d7742d87-e61d-4b78-b8a1-b469842139fa}" = "vimium-ff"; "{d7742d87-e61d-4b78-b8a1-b469842139fa}" = "vimium-ff";
"readeck@readeck.com" = "readeck"; "readeck@readeck.com" = "readeck";
"@testpilot-containers" = "multi-account-containers"; "@testpilot-containers" = "multi-account-containers";
"uBlock0@raymondhill.net" = "ublock-origin"; "uBlock0@raymondhill.net" = "ublock-origin";
};
}; };
};
}; };
# Aerospace window manager configuration (macOS) # Aerospace window manager configuration (macOS)

62
modules/home/git-files.nix
View File

@@ -13,34 +13,42 @@
lib, lib,
... ...
}: }:
with lib; let with lib;
let
cfg = config.modules.gitFiles; cfg = config.modules.gitFiles;
# Helper function to generate gitconfig content # Helper function to generate gitconfig content
mkGitConfig = { mkGitConfig =
email, {
signingKey, email,
urlRewrites ? {}, signingKey,
}: '' urlRewrites ? { },
[user] }:
email = ${email} ''
name = Morten Olsen [user]
signingkey = ${signingKey} email = ${email}
name = Morten Olsen
signingkey = ${signingKey}
[commit] [commit]
gpgsign = true gpgsign = true
[gpg] [gpg]
format = ssh format = ssh
[gpg "ssh"] [gpg "ssh"]
program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign" program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign"
${optionalString (urlRewrites != {}) (concatStringsSep "\n" (mapAttrsToList (name: value: '' ${optionalString (urlRewrites != { }) (
concatStringsSep "\n" (
mapAttrsToList (name: value: ''
[url "${name}"] [url "${name}"]
insteadOf = ${value}'') urlRewrites))} insteadOf = ${value}'') urlRewrites
''; )
in { )}
'';
in
{
options.modules.gitFiles = { options.modules.gitFiles = {
enable = mkEnableOption "Project-specific git configuration files"; enable = mkEnableOption "Project-specific git configuration files";
@@ -102,8 +110,8 @@ in {
# Used on personal machine for all projects under ~/Projects/ # Used on personal machine for all projects under ~/Projects/
(mkIf cfg.personal.enable { (mkIf cfg.personal.enable {
"Projects/.gitconfig".text = mkGitConfig { "Projects/.gitconfig".text = mkGitConfig {
email = cfg.personal.email; inherit (cfg.personal) email;
signingKey = cfg.personal.signingKey; inherit (cfg.personal) signingKey;
urlRewrites = { urlRewrites = {
"ssh://git@ssh-gitea.olsen.cloud:2205/" = "https://gitea.olsen.cloud/"; "ssh://git@ssh-gitea.olsen.cloud:2205/" = "https://gitea.olsen.cloud/";
"git@github-private:" = "https://github.com/"; "git@github-private:" = "https://github.com/";
@@ -115,8 +123,8 @@ in {
# Used on work machine for personal projects under ~/Projects/private/ # Used on work machine for personal projects under ~/Projects/private/
(mkIf cfg.private.enable { (mkIf cfg.private.enable {
"Projects/private/.gitconfig".text = mkGitConfig { "Projects/private/.gitconfig".text = mkGitConfig {
email = cfg.private.email; inherit (cfg.private) email;
signingKey = cfg.private.signingKey; inherit (cfg.private) signingKey;
urlRewrites = { urlRewrites = {
"ssh://git@ssh-gitea.olsen.cloud:2205/" = "https://gitea.olsen.cloud/"; "ssh://git@ssh-gitea.olsen.cloud:2205/" = "https://gitea.olsen.cloud/";
"git@github-private:" = "https://github.com/"; "git@github-private:" = "https://github.com/";
@@ -128,8 +136,8 @@ in {
# Used on work machine for work projects under ~/Projects/zeronorth/ # Used on work machine for work projects under ~/Projects/zeronorth/
(mkIf cfg.zeronorth.enable { (mkIf cfg.zeronorth.enable {
"Projects/zeronorth/.gitconfig".text = mkGitConfig { "Projects/zeronorth/.gitconfig".text = mkGitConfig {
email = cfg.zeronorth.email; inherit (cfg.zeronorth) email;
signingKey = cfg.zeronorth.signingKey; inherit (cfg.zeronorth) signingKey;
urlRewrites = { urlRewrites = {
"git@github-zeronorth:" = "https://github.com/"; "git@github-zeronorth:" = "https://github.com/";
}; };

42
modules/home/git.nix
View File

@@ -11,9 +11,11 @@
lib, lib,
... ...
}: }:
with lib; let with lib;
let
cfg = config.modules.git; cfg = config.modules.git;
in { in
{
options.modules.git = { options.modules.git = {
enable = mkEnableOption "Git configuration"; enable = mkEnableOption "Git configuration";
@@ -36,21 +38,23 @@ in {
}; };
includes = mkOption { includes = mkOption {
type = types.listOf (types.submodule { type = types.listOf (
options = { types.submodule {
condition = mkOption { options = {
type = types.str; condition = mkOption {
description = "The includeIf condition (e.g., gitdir:~/Projects/)"; type = types.str;
example = "gitdir:~/Projects/"; description = "The includeIf condition (e.g., gitdir:~/Projects/)";
example = "gitdir:~/Projects/";
};
path = mkOption {
type = types.str;
description = "Path to the included gitconfig file";
example = "~/Projects/.gitconfig";
};
}; };
path = mkOption { }
type = types.str; );
description = "Path to the included gitconfig file"; default = [ ];
example = "~/Projects/.gitconfig";
};
};
});
default = [];
description = "List of conditional includes for project-specific git configurations"; description = "List of conditional includes for project-specific git configurations";
}; };
}; };
@@ -88,8 +92,8 @@ in {
# Conditional includes for project-specific configurations # Conditional includes for project-specific configurations
includes = map (inc: { includes = map (inc: {
condition = inc.condition; inherit (inc) condition;
path = inc.path; inherit (inc) path;
}) cfg.includes; }) cfg.includes;
# All git settings using the new unified settings option # All git settings using the new unified settings option
@@ -171,4 +175,4 @@ in {
}; };
}; };
}; };
} }

7
modules/home/packages.nix
View File

@@ -9,7 +9,8 @@
pkgs, pkgs,
lib, lib,
... ...
}: { }:
{
home.packages = with pkgs; [ home.packages = with pkgs; [
# ======================================================================== # ========================================================================
# Shell Tools # Shell Tools
@@ -27,7 +28,7 @@
ripgrep # Modern grep (aliased as grep) ripgrep # Modern grep (aliased as grep)
delta # Modern diff with syntax highlighting (aliased as diff) delta # Modern diff with syntax highlighting (aliased as diff)
dust # A more intuitive version of du written in rust dust # A more intuitive version of du written in rust
duf # A better df alternative duf # A better df alternative
hyperfine # A command-line benchmarking tool. hyperfine # A command-line benchmarking tool.
choose # A human-friendly and fast alternative to cut and (sometimes) awk choose # A human-friendly and fast alternative to cut and (sometimes) awk
coreutils coreutils
@@ -88,7 +89,7 @@
k9s # Kubernetes TUI k9s # Kubernetes TUI
istioctl # Istio service mesh CLI istioctl # Istio service mesh CLI
fluxcd # GitOps toolkit fluxcd # GitOps toolkit
popeye # popeye
argocd argocd
kubeseal kubeseal
kubebuilder kubebuilder

9
modules/home/shell.nix
View File

@@ -13,7 +13,8 @@
pkgs, pkgs,
lib, lib,
... ...
}: { }:
{
# ========================================================================== # ==========================================================================
# Zsh Configuration # Zsh Configuration
# ========================================================================== # ==========================================================================
@@ -279,7 +280,7 @@
enable = true; enable = true;
# The config.nu can be anywhere you want if you like to edit your Nushell with Nu # The config.nu can be anywhere you want if you like to edit your Nushell with Nu
# configFile.source = ./.../config.nu; # configFile.source = ./.../config.nu;
# for editing directly to config.nu # for editing directly to config.nu
extraConfig = '' extraConfig = ''
let carapace_completer = {|spans| let carapace_completer = {|spans|
carapace $spans.0 nushell ...$spans | from json carapace $spans.0 nushell ...$spans | from json
@@ -304,13 +305,13 @@
split row (char esep) | split row (char esep) |
append /usr/bin/env append /usr/bin/env
) )
''; '';
shellAliases = { shellAliases = {
vi = "hx"; vi = "hx";
vim = "hx"; vim = "hx";
nano = "hx"; nano = "hx";
}; };
}; };
programs.carapace = { programs.carapace = {
enable = true; enable = true;
enableNushellIntegration = true; enableNushellIntegration = true;

16
modules/home/ssh.nix
View File

@@ -8,9 +8,11 @@
lib, lib,
... ...
}: }:
with lib; let with lib;
let
cfg = config.modules.ssh; cfg = config.modules.ssh;
in { in
{
options.modules.ssh = { options.modules.ssh = {
enable = mkEnableOption "SSH configuration"; enable = mkEnableOption "SSH configuration";
@@ -65,7 +67,7 @@ in {
enableDefaultConfig = false; enableDefaultConfig = false;
# Include colima SSH config for container access # Include colima SSH config for container access
includes = ["~/.colima/ssh_config"]; includes = [ "~/.colima/ssh_config" ];
# 1Password SSH agent integration (macOS) # 1Password SSH agent integration (macOS)
extraConfig = '' extraConfig = ''
@@ -119,7 +121,7 @@ in {
identityFile = cfg.githubZeronorthKeyPath; identityFile = cfg.githubZeronorthKeyPath;
identitiesOnly = true; identitiesOnly = true;
}; };
# Docker server # Docker server
"docker.host" = { "docker.host" = {
hostname = "docker.olsen.cloud"; hostname = "docker.olsen.cloud";
@@ -128,7 +130,7 @@ in {
identityFile = cfg.githubPrivateKeyPath; identityFile = cfg.githubPrivateKeyPath;
identitiesOnly = true; identitiesOnly = true;
}; };
# NAS server # NAS server
"nas.host" = { "nas.host" = {
hostname = "192.168.20.106"; hostname = "192.168.20.106";
@@ -137,7 +139,7 @@ in {
identityFile = cfg.githubPrivateKeyPath; identityFile = cfg.githubPrivateKeyPath;
identitiesOnly = true; identitiesOnly = true;
}; };
# Private MacBook # Private MacBook
"macbook.host" = { "macbook.host" = {
hostname = "192.168.3.9"; hostname = "192.168.3.9";
@@ -146,7 +148,7 @@ in {
identityFile = cfg.githubPrivateKeyPath; identityFile = cfg.githubPrivateKeyPath;
identitiesOnly = true; identitiesOnly = true;
}; };
# ZN MacBook # ZN MacBook
"zn.host" = { "zn.host" = {
hostname = "192.168.3.3"; hostname = "192.168.3.3";

7
modules/home/tmux.nix
View File

@@ -7,7 +7,8 @@
pkgs, pkgs,
lib, lib,
... ...
}: { }:
{
programs.tmux = { programs.tmux = {
enable = true; enable = true;
@@ -116,6 +117,8 @@
# Utils - lazygit popup # Utils - lazygit popup
bind -r g display-popup -d '#{pane_current_path}' -w80% -h80% -E lazygit bind -r g display-popup -d '#{pane_current_path}' -w80% -h80% -E lazygit
bind -r o display-popup -d '#{pane_current_path}' -w80% -h80% -E yazi
bind -r p display-popup -d '#{pane_current_path}' -w80% -h80% -E $SHELL
''; '';
}; };
} }