From 6044d3d95b6a2cb1270715985380d5c03bb55b9b Mon Sep 17 00:00:00 2001
From: Daniel Kempkens <daniel+git@kempkens.io>
Date: Sat, 19 Mar 2022 22:54:55 +0100
Subject: [PATCH] Fix upp alias

---
 config/nvim/lua/nifoc/config/lualine.lua | 3 +--
 config/ssh.nix                           | 3 +--
 home.nix                                 | 1 +
 programs/fish.nix                        | 5 ++++-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/config/nvim/lua/nifoc/config/lualine.lua b/config/nvim/lua/nifoc/config/lualine.lua
index 3a37f90..6270b4a 100644
--- a/config/nvim/lua/nifoc/config/lualine.lua
+++ b/config/nvim/lua/nifoc/config/lualine.lua
@@ -2,10 +2,9 @@ local ns = require('nifoc.utils.statusline')
 
 require('lualine').setup {
   options = {
+    globalstatus = true,
     theme = 'dracula-nvim',
-    -- section_separators = {'', ''},
     section_separators = '',
-    -- component_separators = {'', ''},
     component_separators = '|',
     icons_enabled = true,
   },
diff --git a/config/ssh.nix b/config/ssh.nix
index 8ff4c70..0c575e3 100644
--- a/config/ssh.nix
+++ b/config/ssh.nix
@@ -12,7 +12,6 @@ in
     hashKnownHosts = true;
     serverAliveInterval = 60;
     extraConfig = ''
-      IdentityAgent ~/.ssh/1password.sock
       UpdateHostKeys ask
       VerifyHostKeyDNS yes
     '';
@@ -49,8 +48,8 @@ in
       "gitlab.com" = {
         port = 22;
         user = "git";
+        identityFile = "~/.ssh/GitLab.pub";
         identitiesOnly = true;
-        identityFile = "~/.ssh/GitLab";
         compression = true;
       };
 
diff --git a/home.nix b/home.nix
index 5ed497c..e45ed07 100644
--- a/home.nix
+++ b/home.nix
@@ -26,6 +26,7 @@
     stateVersion = "22.05";
 
     packages = with pkgs; [
+      agilebits-op
       aria2
       arp-scan
       atomicparsley
diff --git a/programs/fish.nix b/programs/fish.nix
index a9871db..2b86114 100644
--- a/programs/fish.nix
+++ b/programs/fish.nix
@@ -87,7 +87,7 @@
 
     functions = {
       upp = ''
-        if rg --quiet '^use flake$' ./.envrc
+        if not test -f ./.envrc; or rg --quiet '^use flake$' ./.envrc
           nix flake update ./ -v
         else
           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
       set fish_greeting
 
+      # 1PW SSH Agent
+      set -gx SSH_AUTH_SOCK "$HOME/.ssh/1password.sock"
+
       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)
         fenv source "$__nifoc_nix_darwin_set_env"