1
0
Fork 0

Fix upp alias

This commit is contained in:
Daniel Kempkens 2022-03-19 22:54:55 +01:00
parent 399f878bb6
commit 6044d3d95b
4 changed files with 7 additions and 5 deletions

View file

@ -2,10 +2,9 @@ local ns = require('nifoc.utils.statusline')
require('lualine').setup { require('lualine').setup {
options = { options = {
globalstatus = true,
theme = 'dracula-nvim', theme = 'dracula-nvim',
-- section_separators = {'', ''},
section_separators = '', section_separators = '',
-- component_separators = {'', ''},
component_separators = '|', component_separators = '|',
icons_enabled = true, icons_enabled = true,
}, },

View file

@ -12,7 +12,6 @@ in
hashKnownHosts = true; hashKnownHosts = true;
serverAliveInterval = 60; serverAliveInterval = 60;
extraConfig = '' extraConfig = ''
IdentityAgent ~/.ssh/1password.sock
UpdateHostKeys ask UpdateHostKeys ask
VerifyHostKeyDNS yes VerifyHostKeyDNS yes
''; '';
@ -49,8 +48,8 @@ in
"gitlab.com" = { "gitlab.com" = {
port = 22; port = 22;
user = "git"; user = "git";
identityFile = "~/.ssh/GitLab.pub";
identitiesOnly = true; identitiesOnly = true;
identityFile = "~/.ssh/GitLab";
compression = true; compression = true;
}; };

View file

@ -26,6 +26,7 @@
stateVersion = "22.05"; stateVersion = "22.05";
packages = with pkgs; [ packages = with pkgs; [
agilebits-op
aria2 aria2
arp-scan arp-scan
atomicparsley atomicparsley

View file

@ -87,7 +87,7 @@
functions = { functions = {
upp = '' upp = ''
if rg --quiet '^use flake$' ./.envrc if not test -f ./.envrc; or rg --quiet '^use flake$' ./.envrc
nix flake update ./ -v nix flake update ./ -v
else else
nix flake update (rg --no-line-number --color never '^use flake' ./.envrc | cut -d ' ' -f 3 | xargs -I {} sh -c 'echo {}') -v nix flake update (rg --no-line-number --color never '^use flake' ./.envrc | cut -d ' ' -f 3 | xargs -I {} sh -c 'echo {}') -v
@ -113,6 +113,9 @@
# Disable greeting # Disable greeting
set fish_greeting set fish_greeting
# 1PW SSH Agent
set -gx SSH_AUTH_SOCK "$HOME/.ssh/1password.sock"
if [ -z "$__NIX_DARWIN_SET_ENVIRONMENT_DONE" ] if [ -z "$__NIX_DARWIN_SET_ENVIRONMENT_DONE" ]
set __nifoc_nix_darwin_set_env (cat /run/current-system/etc/bashrc | grep '-set-environment' | cut -d '.' -f 2) set __nifoc_nix_darwin_set_env (cat /run/current-system/etc/bashrc | grep '-set-environment' | cut -d '.' -f 2)
fenv source "$__nifoc_nix_darwin_set_env" fenv source "$__nifoc_nix_darwin_set_env"