From 3950978337b494e6c7dc7da73388566d10fad245 Mon Sep 17 00:00:00 2001
From: Trevor Vallender <trevor@tsvallender.co.uk>
Date: Thu, 23 Feb 2023 12:26:53 +0000
Subject: [PATCH] Fixes

---
 system/configuration.nix          | 11 +++++------
 system/hardware-configuration.nix |  2 +-
 users/tsv/git/config              |  2 --
 users/tsv/home.nix                | 16 ++++++++++------
 users/tsv/ssh/config              | 10 ++++++++--
 5 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/system/configuration.nix b/system/configuration.nix
index c9105e4..6172135 100644
--- a/system/configuration.nix
+++ b/system/configuration.nix
@@ -1,6 +1,6 @@
 { config, pkgs, ... }:
 
-let 
+let
     nvidia-offload = pkgs.writeShellScriptBin "nvidia-offload" ''
     export __NV_PRIME_RENDER_OFFLOAD=1
     export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0
@@ -19,7 +19,7 @@ in
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
-  networking.hostName = "thompson";
+  networking.hostName = "ritchie";
   networking.networkmanager.enable = true;
 
   time.timeZone = "Europe/London";
@@ -35,10 +35,10 @@ in
 
    users.users.tsv = {
      isNormalUser = true;
-     extraGroups = [ 
+     extraGroups = [
        "wheel"
        "docker"
-     ]; 
+     ];
      initialPassword = "password";
    };
 
@@ -61,11 +61,10 @@ in
   hardware.bluetooth.enable = true;
 
   environment.systemPackages = with pkgs; [
-    neovim
     wget
     tmux
     git
-    pciutils 
+    pciutils
     nvidia-offload
   ];
 
diff --git a/system/hardware-configuration.nix b/system/hardware-configuration.nix
index 36b1bc3..897e942 100644
--- a/system/hardware-configuration.nix
+++ b/system/hardware-configuration.nix
@@ -8,7 +8,7 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "thunderbolt" "vmd" "rtsx_pci_sdmmc" ];
   boot.initrd.kernelModules = [ "dm-snapshot" ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
diff --git a/users/tsv/git/config b/users/tsv/git/config
index 43e88fc..cc68d1a 100644
--- a/users/tsv/git/config
+++ b/users/tsv/git/config
@@ -6,8 +6,6 @@
         email = trevor@tsvallender.co.uk
 [includeIf "gitdir:~/foxsoft/"]
         path = ~/.config/git/config_foxsoft
-[includeIf "gitdir:~/rightspend/"]
-        path = ~/.config/git/config_rightspend
 [core]
         autocrlf = input
         safecrlf = true
diff --git a/users/tsv/home.nix b/users/tsv/home.nix
index bc7f277..6875f25 100644
--- a/users/tsv/home.nix
+++ b/users/tsv/home.nix
@@ -29,20 +29,20 @@
     _1password-gui
     anki
     awsebcli
+    bitwarden
     cachix
     calibre
     delta                                  # Nice diffing pager for Git
     docker-compose
     firefox
     fzf
+    gcc
     git-crypt
     gitflow
     gnupg
     gimp
     heroku
     htop
-    kmail
-    korganizer
     libreoffice
     nerdfonts
     ripgrep
@@ -52,19 +52,23 @@
     slack
     spotify
     thunderbird
-    vimPlugins.vim-plug
+    vimPlugins.packer-nvim
     wine
     winetricks
     zoom-us
   ];
 
-  
+  programs.neovim = {
+    enable = true;
+    plugins = [
+      pkgs.vimPlugins.packer-nvim
+    ];
+  };
 
   home.file.".bash_profile".source = ./bash_profile;
   home.file.".tmux.conf".source = ./tmux.conf;
   xdg.configFile."git/config".source = ./git/config;
-  xdg.configFile."git/foxsoft_config".source = ./git/config_foxsoft;
-  xdg.configFile."nvim/init.vim".source = ./nvim/init.vim;
+  xdg.configFile."git/config_foxsoft".source = ./git/config_foxsoft;
   home.file.".ssh/config".source = ./ssh/config;
   home.file.".LESS_TERMCAP".source = ./LESS_TERMCAP;
   services.syncthing.enable = true;
diff --git a/users/tsv/ssh/config b/users/tsv/ssh/config
index 3bcbb74..31338b5 100644
--- a/users/tsv/ssh/config
+++ b/users/tsv/ssh/config
@@ -4,8 +4,8 @@ Host kernighan
   User tsv
   IdentitiesOnly yes
 
-Host git.tsvallender.co.uk 
-  HostName git.tsvallender.co.uk 
+Host git.tsvallender.co.uk
+  HostName git.tsvallender.co.uk
   IdentityFile /home/tsv/.ssh/personal
   Port 222
   User tsv
@@ -20,3 +20,9 @@ Host git.foxsoft.co.uk
   HostName git.foxsoft.co.uk
   IdentityFile /home/tsv/.ssh/foxsoft
   IdentitiesOnly yes
+
+Host obs
+  HostName obs.foxsoft.net
+  IdentityFile /home/tsv/.ssh/foxsoft
+  IdentitiesOnly yes
+