From cc2c2cfc3428d653deb7531d8ddc251b23ff2a33 Mon Sep 17 00:00:00 2001
From: mat ess <mat@mat.services>
Date: Sun, 17 Jul 2022 13:24:28 -0400
Subject: [PATCH] Cleanup

---
 darwin/bootstrap.nix |  1 -
 darwin/default.nix   |  1 +
 home/default.nix     | 33 ++++++++-------------------------
 3 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/darwin/bootstrap.nix b/darwin/bootstrap.nix
index 6394cd6..540cb50 100644
--- a/darwin/bootstrap.nix
+++ b/darwin/bootstrap.nix
@@ -22,7 +22,6 @@
   nix.maxJobs = 4;
 
   # Enable experimental nix command and flakes
-  # nix.package = pkgs.nixUnstable;
   nix.extraOptions = ''
     auto-optimise-store = true
     experimental-features = nix-command flakes
diff --git a/darwin/default.nix b/darwin/default.nix
index 956e58e..c02e978 100644
--- a/darwin/default.nix
+++ b/darwin/default.nix
@@ -10,6 +10,7 @@
   # Apps
   # `home-manager` currently has issues adding them to `~/Applications`
   # Issue: https://github.com/nix-community/home-manager/issues/1341
+  # See workaround at ../home/copyApplications.nix
   environment.systemPackages = with pkgs; [
     discord-ptb
     element-desktop
diff --git a/home/default.nix b/home/default.nix
index 2e4bb28..39dbb90 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -56,7 +56,7 @@
   # Other packages ----------------------------------------------------------------------------- {{{
 
   home.packages = with pkgs; [
-    # Some basics
+    # System
     abduco # lightweight session management
     bottom # fancy version of `top` with ASCII graphs
     coreutils
@@ -64,26 +64,27 @@
     du-dust # fancy version of `du`
     exa # fancy version of `ls`
     fd # fancy version of `find`
-    # httpie # fancy version of `curl`
-    hyperfine # benchmarking tool
     mosh # wrapper for `ssh` that better at not dropping connections
     procs # fancy version of `ps`
     pv # pipe progress viewer
-    ripgrep # better version of `grep`
-    tealdeer # rust implementation of `tldr`
     thefuck
     unrar # extract RAR archives
     wget
-    xh # reimplementation of `httpie` in rust
     xz # extract XZ archives
 
     # Dev stuff
     cloc # source code line counter
     doctl # command line tools for digitalocean
     flyctl # command line tools for fly.io
+    hyperfine # benchmarking tool
     jq # json processor
     pijul # alternative to `git`
-    # rustup # rust toolchain
+    ripgrep # better version of `grep`
+    tealdeer # rust implementation of `tldr`
+    xh # reimplementation of `httpie` in rust
+
+    # TUI apps
+    gurk-rs
 
     # Useful nix related tools
     cachix # adding/managing alternative binary caches hosted by Cachix
@@ -91,8 +92,6 @@
     nixpkgs-fmt
     nix-prefetch-git
     nix-tree
-    # nodePackages.node2nix
-
   ] ++ lib.optionals stdenv.isDarwin [
     m-cli # useful macOS CLI commands
   ];
@@ -110,21 +109,5 @@
     full_name = "${config.programs.git.userName}"
     email = "${config.programs.git.userEmail}"
   '';
-
-  # https://docs.haskellstack.org/en/stable/yaml_configuration/#non-project-specific-config
-  # home.file.".stack/config.yaml".text = lib.generators.toYAML {} {
-  #   templates = {
-  #     scm-init = "git";
-  #     params = {
-  #       author-name = config.programs.git.userName;
-  #       author-email = config.programs.git.userEmail;
-  #       github-username = "malob";
-  #     };
-  #   };
-  #   nix.enable = true;
-  # };
-
-  # Stop `parallel` from displaying citation warning
-  # home.file.".parallel/will-cite".text = "";
   # }}}
 }