dennis/nix-config
1
1
Fork 0
Code Issues 2 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Updates ssh and work config

Browse source
This commit is contained in:
Dennis Schoepf 2025-05-08 21:52:46 +02:00
parent 48ea1e8876
commit c98b5706ca
4 changed files with 38 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
home/darwin-work.nix
View file

@ -8,6 +8,8 @@
home.sessionVariables = { home.sessionVariables = {
EDITOR = "nvim"; EDITOR = "nvim";
GOPATH = "$HOME/go"; GOPATH = "$HOME/go";
JAVA_HOME = "/Library/Java/JavaVirtualMachines/zulu-17.jdk/Contents/Home";
ANDROID_HOME = "$HOME/Library/Android/sdk";
}; };
xdg.enable = true; xdg.enable = true;

1
home/darwin.nix
View file

@ -13,6 +13,7 @@
xdg.enable = true; xdg.enable = true;
imports = [ imports = [
./modules/ssh
./modules/git ./modules/git
./modules/fish ./modules/fish
./modules/atuin ./modules/atuin

12
home/modules/fish/work.nix
View file

@ -3,6 +3,9 @@
enable = true; enable = true;
functions = { functions = {
# TODO: Add these two functions from work config
cdr = '''';
rr = '''';
ff = '' ff = ''
set RG_PREFIX "rg --column --line-number --no-heading --color=always --smart-case " set RG_PREFIX "rg --column --line-number --no-heading --color=always --smart-case "
set INITIAL_QUERY "$argv" set INITIAL_QUERY "$argv"
@ -49,9 +52,6 @@
interactiveShellInit = '' interactiveShellInit = ''
fish_config theme choose "Rosé Pine" fish_config theme choose "Rosé Pine"
set -gx JAVA_HOME /Library/Java/JavaVirtualMachines/zulu-17.jdk/Contents/Home
set -gx ANDROID_HOME /Users/dennis/Library/Android/sdk
set hn (prompt_hostname) set hn (prompt_hostname)
set fish_cursor_default block blink set fish_cursor_default block blink
set fish_cursor_insert line blink set fish_cursor_insert line blink
@ -74,8 +74,14 @@
shellAbbrs = { shellAbbrs = {
lg = "lazygit"; lg = "lazygit";
g = "git"; g = "git";
gco = "git checkout";
frc = "source ~/.config/fish/**/*.fish"; frc = "source ~/.config/fish/**/*.fish";
t = "todo.sh"; t = "todo.sh";
p = "pnpm";
pa = "pnpm add";
pad = "pnpm add -D";
pi = "pnpm install";
px = "pnpm dlx";
}; };
}; };

26
home/modules/ssh/default.nix Normal file
View file

@ -0,0 +1,26 @@
{
programs.ssh = {
enable = true;
addKeysToAgent = "yes";
matchBlocks = {
"dnsc-server" = {
hostname = "100.103.199.4";
user = "dennis";
identityFile = "/Users/dennis/.ssh/id_ed25519";
identitiesOnly = true;
};
"dnsc-server-i" = {
hostname = "192.168.178.69";
user = "dennis";
identityFile = "/Users/dennis/.ssh/id_ed25519";
identitiesOnly = true;
};
"dnsc-vps-sm" = {
hostname = "100.65.82.77";
user = "dennis";
identityFile = "/Users/dennis/.ssh/id_ed25519";
identitiesOnly = true;
};
};
};
}