From dbe14a7d9a213f0e5e2223ecf7b69446e521117c Mon Sep 17 00:00:00 2001
From: Alexander Kobjolke <me@failco.de>
Date: Tue, 30 Jan 2024 22:58:16 +0100
Subject: [PATCH 1/4] home: Move neovim config to subdir

---
 home/alex/programs/neovim/default.nix | 20 ++++++++++++++++++++
 home/cli.nix                          |  7 +------
 2 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 home/alex/programs/neovim/default.nix

diff --git a/home/alex/programs/neovim/default.nix b/home/alex/programs/neovim/default.nix
new file mode 100644
index 0000000..e455b33
--- /dev/null
+++ b/home/alex/programs/neovim/default.nix
@@ -0,0 +1,20 @@
+{ config, lib, pkgs, ... }:
+
+{
+  programs.neovim = {
+    enable = true;
+    vimAlias = true;
+
+    extraConfig = ''
+      set nowrap
+    '';
+
+    plugins = with pkgs.vimPlugins; [
+      vim-nix
+
+      indentLine
+      indent-blankline-nvim
+      neoformat
+    ];
+  };
+}
diff --git a/home/cli.nix b/home/cli.nix
index 5e9fef0..2b02d49 100644
--- a/home/cli.nix
+++ b/home/cli.nix
@@ -10,10 +10,7 @@ let
 
   myEza = if builtins.hasAttr "eza" pkgs then "eza" else "exa";
 in {
-  imports = [
-    # shell config
-    #./modules/shell
-  ];
+  imports = [ ./alex/programs/neovim/default.nix ];
 
   programs.home-manager.enable = true;
   home = {
@@ -182,8 +179,6 @@ in {
 
     ssh.enable = true;
 
-    neovim = import ./modules/nvim.nix pkgs;
-
     texlive.enable = true;
   };
 

From eccc0f0afd484bfc353ed384652730a892b45775 Mon Sep 17 00:00:00 2001
From: Alexander Kobjolke <me@failco.de>
Date: Wed, 31 Jan 2024 08:35:42 +0100
Subject: [PATCH 2/4] modules: Update url of haskell.nix binary cache

---
 modules/iohk.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/iohk.nix b/modules/iohk.nix
index b4215c9..69d1cb3 100644
--- a/modules/iohk.nix
+++ b/modules/iohk.nix
@@ -3,7 +3,7 @@
 {
   # Binary Cache for Haskell.nix
   nix.settings.trusted-public-keys =
-    [ "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" ];
+    [ "cache.iog.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" ];
 
-  nix.settings.substituters = lib.mkAfter [ "https://hydra.iohk.io" ];
+  nix.settings.substituters = lib.mkAfter [ "https://cache.iog.io" ];
 }

From d769f177b2e10f7090cac8f38bb15d1cb2d30073 Mon Sep 17 00:00:00 2001
From: Alexander Kobjolke <me@failco.de>
Date: Wed, 31 Jan 2024 16:13:37 +0100
Subject: [PATCH 3/4] thrall: Add user description

---
 hosts/thrall/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hosts/thrall/default.nix b/hosts/thrall/default.nix
index ebc6176..551b066 100644
--- a/hosts/thrall/default.nix
+++ b/hosts/thrall/default.nix
@@ -131,6 +131,7 @@ in {
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.alex = {
+    description = "Alexander Kobjolke";
     isNormalUser = true;
     extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
     shell = pkgs.zsh;

From 6f396e82d4a11915ba8ca66fa30f9053feaa9e56 Mon Sep 17 00:00:00 2001
From: Alexander Kobjolke <me@failco.de>
Date: Wed, 31 Jan 2024 16:14:11 +0100
Subject: [PATCH 4/4] cli: Avoid setting user name and homedir

---
 home/cli.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/home/cli.nix b/home/cli.nix
index 2b02d49..4ab3dd3 100644
--- a/home/cli.nix
+++ b/home/cli.nix
@@ -3,7 +3,7 @@
 # minimal config, suitable for servers
 let
   user = {
-    name = "alex";
+    name = config.home.username;
     fullName = "Alexander Kobjolke";
     mail = "me@failco.de";
   };
@@ -14,8 +14,6 @@ in {
 
   programs.home-manager.enable = true;
   home = {
-    username = user.name;
-    homeDirectory = "/home/${config.home.username}";
     stateVersion = "21.05";
     sessionPath = [ "$HOME/.local/bin" "$HOME/.emacs.d/bin" ];
     shellAliases = { e = "emacsclient -c $@"; };