From 5300a22a135bd929e88db371c41878c523f9b8f3 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 13 Mar 2023 01:15:27 +0100
Subject: [PATCH] intel gpus drivers nord, cleanup

---
 flake.nix                          |  3 ++-
 profiles/desktop/gnome/default.nix | 10 ++++++++++
 users/pbsds/home/default.nix       |  2 ++
 users/pbsds/home/profiles/ssh.nix  | 20 ++++++++++++--------
 4 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/flake.nix b/flake.nix
index 56aeb66..7d7aa6a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -88,7 +88,8 @@
 
     nixosConfigurations.noximilien = mkConfig "noximilien" "x86_64-linux" (with nixos-hardware.nixosModules; [ common-pc common-pc-ssd common-cpu-intel ]);
     nixosConfigurations.bolle      = mkConfig "bolle"      "x86_64-linux" (with nixos-hardware.nixosModules; [ common-pc common-pc-ssd common-cpu-intel ]);
-    nixosConfigurations.nord       = mkConfig "nord"       "x86_64-linux" (with nixos-hardware.nixosModules; [ common-pc common-pc-ssd common-cpu-intel-cpu-only common-gpu-amd ]);
+    #nixosConfigurations.nord       = mkConfig "nord"       "x86_64-linux" (with nixos-hardware.nixosModules; [ common-pc common-pc-ssd common-cpu-intel-cpu-only common-gpu-amd ]);
+    nixosConfigurations.nord       = mkConfig "nord"       "x86_64-linux" (with nixos-hardware.nixosModules; [ common-pc common-pc-ssd common-cpu-intel common-gpu-amd ]);
 
     homeConfigurations = forAllSystems (system: {
       pbsds = home-manager.lib.homeManagerConfiguration {
diff --git a/profiles/desktop/gnome/default.nix b/profiles/desktop/gnome/default.nix
index ac111b0..7387967 100644
--- a/profiles/desktop/gnome/default.nix
+++ b/profiles/desktop/gnome/default.nix
@@ -21,6 +21,16 @@
     gnomeExtensions.appindicator
   ];
 
+  # an attempt to make nautilus discover new files, but it proved to be a freebsd-linux incompatiblity
+  # inotify is a linux thing, and freebsd instead features kqueue.
+  # nfs likely doesn't support such events anyway, predating inotify.
+  #kernel.sysctl = {
+  #  "fs.inotify.max_user_watches" = "100000";
+  #};
+  # possible future fix:
+  # https://en.wikipedia.org/wiki/File_Alteration_Monitor
+  # or https://github.com/fsnotify/fsnotify
+
   environment.gnome.excludePackages = (with pkgs; [
     gnome-photos
     gnome-tour
diff --git a/users/pbsds/home/default.nix b/users/pbsds/home/default.nix
index b5a3d09..3be85d3 100644
--- a/users/pbsds/home/default.nix
+++ b/users/pbsds/home/default.nix
@@ -104,6 +104,8 @@
     hman = "man -H "; # HTML opened in a browser
     tmux = "systemd-run --scope --user tmux"; # detach from ssh scope, surviving logout
 
+    #TODO: vpn
+
     # TODO: wayland
     clip = "xclip -sel clip -t text/plain -rmlastnl -i";
 
diff --git a/users/pbsds/home/profiles/ssh.nix b/users/pbsds/home/profiles/ssh.nix
index 34356dd..357e059 100644
--- a/users/pbsds/home/profiles/ssh.nix
+++ b/users/pbsds/home/profiles/ssh.nix
@@ -3,13 +3,14 @@
   programs.bash.initExtra = ''
     # ssh autocomplete
     if test -f ~/.ssh/config; then
-      complete -W "$(cat ~/.ssh/config | grep '^Host ' | cut  -b 6- | grep -v "\*")" ssh
-      complete -W "$(cat ~/.ssh/config | grep '^Host ' | cut  -b 6- | grep -v "\*")" rssh
-      complete -W "$(cat ~/.ssh/config | grep '^Host ' | cut  -b 6- | grep -v "\*")" vpn
-      complete -W "$(cat ~/.ssh/config | grep '^Host ' | cut  -b 6- | grep -v "\*")" lvpn
-      complete -W "$(cat ~/.ssh/config | grep '^Host ' | cut  -b 6- | grep -v "\*")" dvpn
-      complete -W "$(cat ~/.ssh/config | grep '^Host ' | cut  -b 6- | grep -v "\*")" scp
-      complete -W "$(cat ~/.ssh/config | grep '^Host ' | cut  -b 6- | grep -v "\*")" remote-init
+      complete -W "$(cat ~/.ssh/config | grep "^Host " | cut -d" " -f2- | grep -v "\*")" ssh
+      complete -W "$(cat ~/.ssh/config | grep "^Host " | cut -d" " -f2- | grep -v "\*")" rssh
+      complete -W "$(cat ~/.ssh/config | grep "^Host " | cut -d" " -f2- | grep -v "\*")" vpn
+      complete -W "$(cat ~/.ssh/config | grep "^Host " | cut -d" " -f2- | grep -v "\*")" lvpn
+      complete -W "$(cat ~/.ssh/config | grep "^Host " | cut -d" " -f2- | grep -v "\*")" dvpn
+      complete -W "$(cat ~/.ssh/config | grep "^Host " | cut -d" " -f2- | grep -v "\*")" scp
+      complete -W "$(cat ~/.ssh/config | grep "^Host " | cut -d" " -f2- | grep -v "\*")" remote-init
+      complete -W "$(cat ~/.ssh/config | grep "^Host " | cut -d" " -f2- | grep -v "\*")" remote-add
     fi
   '';
 
@@ -19,8 +20,11 @@
   programs.ssh.matchBlocks = {
     "*".serverAliveInterval = 10;
     "*".serverAliveCountMax = 3;
-    "*.pbsds.net".forwardX11 = true;
     "github.com".forwardX11 = false;
+    "gitea.*".forwardX11 = false;
+    "gogs.*".forwardX11 = false;
+    "git.*".forwardX11 = false;
+    "*.pbsds.net".forwardX11 = true;
     "*.ntnu.no".user = "pederbs";
     "*.pvv.org".user = "pederbs";
     "*.hpc.ntnu.no".proxyJump = "isvegg.pvv.ntnu.no";