refactored system
This commit is contained in:
parent
6a62e2f23f
commit
386d889455
55 changed files with 336 additions and 580 deletions
|
|
@ -72,8 +72,7 @@
|
|||
definedAliases = [ "@no" ];
|
||||
};
|
||||
"Home manager options" = {
|
||||
# urls = [{ template = "https://home-manager-options.extranix.com/?query={searchTerms}&release=release-${osConfig.system.nixos.release}"; }];
|
||||
urls = [{ template = "https://home-manager-options.extranix.com/?query={searchTerms}&release=release-25.05"; }];
|
||||
urls = [{ template = "https://home-manager-options.extranix.com/?query={searchTerms}&release=release-${osConfig.system.nixos.release}"; }];
|
||||
icon = "https://mipmip.github.io/home-manager-option-search/images/favicon.png";
|
||||
updateInterval = 24 * 60 * 60 * 1000;
|
||||
definedAliases = [ "@hm" ];
|
||||
|
|
|
|||
|
|
@ -1,7 +1,10 @@
|
|||
{ config, pkgs, ... }:
|
||||
{ config, ... }:
|
||||
|
||||
{
|
||||
|
||||
home.shellAliases = {
|
||||
top = "btm --battery";
|
||||
top = "btm --battery";
|
||||
du = "dust";
|
||||
ymd = "date +'%Y-%m-%d'";
|
||||
dmy = "date +'%-d.-%-m.%Y'";
|
||||
v = "nvim";
|
||||
|
|
@ -9,12 +12,13 @@
|
|||
R = "R --no-save --no-restore";
|
||||
cdg = "cd \$(git rev-parse --show-toplevel)";
|
||||
};
|
||||
|
||||
programs.fish = {
|
||||
|
||||
enable = true;
|
||||
|
||||
interactiveShellInit = "fish_add_path ${config.xdg.dataHome}/npm/packages/bin";
|
||||
shellAbbrs = {
|
||||
openconnect = "openconnect --config=/home/till/.config/openconnect/config";
|
||||
};
|
||||
|
||||
shellInit = ''
|
||||
set -gx EDITOR "nvim"
|
||||
set -gx VISUAL "nvim"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,11 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
programs.gnupg.agent = {
|
||||
enable = true;
|
||||
pinentryPackage = pkgs.pinentry-gnome3;
|
||||
enableSSHSupport = true;
|
||||
};
|
||||
|
||||
programs.gpg.settings = {
|
||||
no-emit-version = true;
|
||||
|
|
@ -23,5 +28,4 @@
|
|||
'';
|
||||
target = "../.gnupg/scdaemon.conf";
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -225,7 +225,7 @@
|
|||
enable = true;
|
||||
extraConfig.from = "kein_schlussstrich_hessen@systemli.org";
|
||||
};
|
||||
passwordCommand = "secret-tool lookup server mail.systemli.org account kein_schlussstrich_hessen@systemli.org";
|
||||
passwordCommand = "pass other/ksh_systemli";
|
||||
};
|
||||
|
||||
};
|
||||
|
|
|
|||
|
|
@ -9,9 +9,3 @@ augroup netrw
|
|||
autocmd!
|
||||
autocmd FileType netrw setl bufhidden=wipe
|
||||
augroup end
|
||||
|
||||
augroup repl
|
||||
autocmd!
|
||||
autocmd TermOpen * setlocal nonumber norelativenumber
|
||||
autocmd TermOpen * nmap <buffer> Q :bdelete!<enter>
|
||||
augroup end
|
||||
|
|
|
|||
53
home/ssh.nix
53
home/ssh.nix
|
|
@ -1,4 +1,13 @@
|
|||
{ config, ... }:
|
||||
{ config, osConfig, ... }:
|
||||
|
||||
let
|
||||
|
||||
certs = {
|
||||
uni = "${config.home.homeDirectory}/.ssh/tstraube@${osConfig.networking.hostname}";
|
||||
personal = "${config.home.homeDirectory}/.ssh/till@${osConfig.networking.hostname}";
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
{
|
||||
programs.ssh = {
|
||||
|
|
@ -8,18 +17,48 @@
|
|||
|
||||
matchBlocks = {
|
||||
|
||||
gu = {
|
||||
"hrz login.server.uni-frankfurt.de" = {
|
||||
hostname = "login.server.uni-frankfurt.de";
|
||||
user = "tstraube";
|
||||
identityFile = "${config.home.homeDirectory}/.ssh/tstraube";
|
||||
identityFile = certs.uni;
|
||||
};
|
||||
|
||||
geocom = {
|
||||
hostname = "geocom.uni-frankfurt.de";
|
||||
user = "till";
|
||||
identityFile = "${config.home.homeDirectory}/.ssh/tstraube";
|
||||
geocom3 = {
|
||||
hostname = "141.2.194.220";
|
||||
user = "tstraube";
|
||||
identityFile = certs.uni;
|
||||
};
|
||||
|
||||
geocom2 = {
|
||||
hostname = "141.2.194.235";
|
||||
user = "till";
|
||||
identityFile = certs.uni;
|
||||
};
|
||||
|
||||
"gitlab gitlab.rz.uni-frankfurt.de" = {
|
||||
hostname = "gitlab.rz.uni-frankfurt.de";
|
||||
user = "tstraube";
|
||||
identityFile = certs.uni;
|
||||
};
|
||||
|
||||
"arielle arielle.ktiu.net" = {
|
||||
hostname = "arielle.ktiu.net";
|
||||
user = "till";
|
||||
identityFile = certs.personal;
|
||||
};
|
||||
|
||||
"homer fernseher" = {
|
||||
hostname = "homer";
|
||||
user = "till";
|
||||
identityFile = certs.personal;
|
||||
};
|
||||
|
||||
# "mila" = {
|
||||
# hostname = "mila";
|
||||
# user = "till";
|
||||
# identityFile = certs.personal;
|
||||
# };
|
||||
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue