From 532d1a898d05f6fcced4d659d79ebfae667f5167 Mon Sep 17 00:00:00 2001
From: Miran Bastaja <miran.bastaja04@gmail.com>
Date: Thu, 29 Feb 2024 15:32:34 +0100
Subject: Slim down minimal home module

Move a bunch of stuff from the minimal module to the hyprdesktop module.
Most of these programs aren't used on the server anyways, so moving them
to just client machines is better for installation size.
---
 share/home/hyprdesktop.nix | 19 +++++++++++++++++++
 share/home/minimal.nix     | 21 +--------------------
 2 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'share/home')

diff --git a/share/home/hyprdesktop.nix b/share/home/hyprdesktop.nix
index 5f0ea5d..3606852 100644
--- a/share/home/hyprdesktop.nix
+++ b/share/home/hyprdesktop.nix
@@ -19,6 +19,7 @@
     ./offpunk.nix
     ./firefox
     ./emacs
+    ./helix.nix
   ];
 
   wayland.windowManager.hyprland =
@@ -137,6 +138,20 @@
     slurp # region selection UI for wayland
     wl-clipboard # clipboard utility
     nushell # next-generation shell
+    ffmpeg
+    imagemagick
+    exiftool
+    sl
+    jaq # json query tool
+    git-annex
+    git-remote-gcrypt
+    # tools for dealing with all sorts archives
+    atool
+    unzip
+    gnutar
+    unrar-wrapper
+    # Useful nix tooling
+    nix-tree
 
     # TUI/GUI programs
     cmus # music player
@@ -159,6 +174,10 @@
     superTuxKart
   ];
 
+  home.shellAliases = {
+    sl = "sl -awFc5";
+  };
+
   services.dunst.enable = true;
 
   programs.direnv = {
diff --git a/share/home/minimal.nix b/share/home/minimal.nix
index d22083e..c4f878a 100644
--- a/share/home/minimal.nix
+++ b/share/home/minimal.nix
@@ -1,36 +1,18 @@
 # This module contains a bunch of things that make up a minimal environment that
 # I want on ALL of my machines.
 { pkgs, config, ... }: {
-  imports = [ ./helix.nix ];
-
   home.packages = with pkgs; [
     curl
     git
     age
     gnupg
-    ffmpeg
-    imagemagick
-    exiftool
-    sl
+    neovim
 
     # Modern unix
     ripgrep # grep
     fd # find
     sd # sed
     dua # du
-    jaq # json query tool
-
-    git-annex
-    git-remote-gcrypt
-
-    # tools for dealing with all sorts archives
-    atool
-    unzip
-    gnutar
-    unrar-wrapper
-
-    # Useful nix tooling
-    nix-tree
   ];
 
   xdg.enable = true;
@@ -38,7 +20,6 @@
   home.shellAliases = {
     ip = ''ip --color=auto'';
     tempdir = "cd $(mktemp -d)";
-    sl = "sl -awFc5";
   };
 
   # Lots of these are courtesy of xdg-ninja
-- 
cgit v1.3.1