From ba6307113b2455375dc8852dbe0d26acdfb06a3f Mon Sep 17 00:00:00 2001
From: Gabriel Simmer <g@gmem.ca>
Date: Tue, 5 Sep 2023 22:42:18 +0100
Subject: [PATCH] Tidy up home-manager config

---
 nix/london/gsimmer.nix | 150 ++++++++++++++++++-----------------------
 1 file changed, 66 insertions(+), 84 deletions(-)

diff --git a/nix/london/gsimmer.nix b/nix/london/gsimmer.nix
index 80a445d..bbb41f9 100644
--- a/nix/london/gsimmer.nix
+++ b/nix/london/gsimmer.nix
@@ -1,55 +1,39 @@
 { config, pkgs, callPackage, ... }:
 
 {
-  nixpkgs.overlays =
-    let
-      discordOverlay = self: super: {
-        discord = super.discord.override { withOpenASAR = true; withVencord = true; };
-      };
-    in
-      [
-        (import (builtins.fetchTarball {
-          url = "https://github.com/nix-community/emacs-overlay/archive/master.tar.gz";
-          sha256 = "0xyhs0xj72nk0acd54ngryazsqllwgfjh0964fa2176ji73a6c1d";
-        })) discordOverlay];
+  nixpkgs = {
+    config.allowUnfree = true;
+    overlays =
+      let
+        discordOverlay = self: super: {
+          discord = super.discord.override { withOpenASAR = true; withVencord = true; };
+        };
+      in
+        [
+          (import (builtins.fetchTarball {
+            url = "https://github.com/nix-community/emacs-overlay/archive/master.tar.gz";
+            sha256 = "0xyhs0xj72nk0acd54ngryazsqllwgfjh0964fa2176ji73a6c1d";
+          })) discordOverlay];
+  };
+  home = {
+    username = "gsimmer";
+    homeDirectory = "/home/gsimmer";
+  };
 
-  home.username = "gsimmer";
-  home.homeDirectory = "/home/gsimmer";
-
-  nixpkgs.config.allowUnfree = true;
-  
-  programs.bash.enable = false;
-  programs.fish = {
-    enable = false;
-    interactiveShellInit = ''
+  programs = {
+    bash.enable = false;
+    fish = {
+      enable = false;
+      interactiveShellInit = ''
       set fish_greeting
       atuin init fish | source
     '';
-    plugins = [
-      {
-        name = "z";
-        src = pkgs.fetchFromGitHub {
-          owner = "jethrokuan";
-          repo = "z";
-          rev = "e0e1b9dfdba362f8ab1ae8c1afc7ccf62b89f7eb";
-          sha256 = "0dbnir6jbwjpjalz14snzd3cgdysgcs3raznsijd6savad3qhijc";
-        };
-      }
-    ];
-  };
+    };
 
-  programs.tmux = {
-    enable = true;
-    plugins = with pkgs; [
-      tmuxPlugins.sensible
-      tmuxPlugins.cpu
-    ];
-  };
-
-  programs.nushell = {
-    enable = true;
-    extraConfig =
-      ''
+    nushell = {
+      enable = true;
+      extraConfig =
+        ''
 $env.config = {
     shell_integration: true
     keybindings: [
@@ -509,53 +493,52 @@ $env.config = {
             event: {edit: capitalizechar}
         }
     ]
-                   }
+                 }
       source ~/.local/share/atuin/init.nu
       '';
-  };
-  
-  programs.direnv = {
-    enable = true;
-    nix-direnv.enable = true;
-  };
+    };
+    
+    direnv = {
+      enable = true;
+      nix-direnv.enable = true;
+    };
 
-  services.lorri.enable = true;
-
-  programs.git = {
-    enable = true;
-    userName = "Gabriel Simmer";
-    userEmail = "g@gmem.ca";
-    extraConfig = {
-      gpg = {
-        format = "ssh";
-      };
-      user = {
-        signingkey = "/home/gsimmer/.ssh/yubikey-second.pub";
-      };
-      tag = {
-        gpgSign = true;
-      };
-      commit = {
-        gpgSign = true;
+    git = {
+      enable = true;
+      userName = "Gabriel Simmer";
+      userEmail = "g@gmem.ca";
+      extraConfig = {
+        gpg = {
+          format = "ssh";
+        };
+        user = {
+          signingkey = "/home/gsimmer/.ssh/yubikey-second.pub";
+        };
+        tag = {
+          gpgSign = true;
+        };
+        commit = {
+          gpgSign = true;
+        };
       };
     };
-  };
 
-  programs.emacs = {
-    enable = true;
-    package = pkgs.emacs-unstable-pgtk;
-    extraPackages = epkgs: [
-      epkgs.vterm
-    ];
-  };
+    emacs = {
+      enable = true;
+      package = pkgs.emacs-unstable-pgtk;
+      extraPackages = epkgs: [
+        epkgs.vterm
+      ];
+    };
 
-  programs.exa = {
-    enable = true;
-    enableAliases = true;
-  };
+    exa = {
+      enable = true;
+      enableAliases = true;
+    };
 
-  programs.bat = {
-    enable = true;
+    bat = {
+      enable = true;
+    };
   };
   
   home.packages = with pkgs; [
@@ -576,7 +559,6 @@ $env.config = {
     age-plugin-yubikey
     rage
     discord
-    podman-desktop
     mangohud
   ];