From e65675da027ceb2dd7d4319ec194643e6715ee88 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Tue, 18 Jul 2023 14:51:53 +0100
Subject: [PATCH] Move some package definitions from system to home

Remove thunar, effectively replaced by rofi + terminal
Add some alias to quickly update nixos and home-manager
---
 home/shell/fish.nix |  1 +
 hosts/common.nix    | 10 ++++------
 hosts/desktop.nix   | 11 +----------
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/home/shell/fish.nix b/home/shell/fish.nix
index 57bb4be5..539ad034 100644
--- a/home/shell/fish.nix
+++ b/home/shell/fish.nix
@@ -1,5 +1,6 @@
 {pkgs, ...}: {
   imports = [./default.nix];
+  home.packages = with pkgs; [dig silver-searcher gnumake];
   programs = {
     fish = {
       enable = true;
diff --git a/hosts/common.nix b/hosts/common.nix
index 74672896..af319b49 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -23,13 +23,11 @@ in {
       ll = "ls -laF";
       gg = "gitui";
       lg = "lazygit";
-      nixos-upgrade = "sudo nixos-rebuild switch --flake ${flakeURL}";
-      home-manager-switch = "${pkgs.home-manager}/bin/home-manager switch --flake ${flakeURL}";
+      nv = "WAYLAND_DISPLAY= neovide --multigrid --maximized";
+      nosu = "sudo nixos-rebuild switch --flake ${flakeURL}";
+      hms = "${pkgs.home-manager}/bin/home-manager switch --flake ${flakeURL}";
     };
-    systemPackages = with pkgs; [
-      gnumake
-      distrobox
-    ];
+    systemPackages = with pkgs; [distrobox];
   };
   networking.networkmanager.enable = true;
   services.power-profiles-daemon.enable = true;
diff --git a/hosts/desktop.nix b/hosts/desktop.nix
index cc32a707..6b34f38d 100644
--- a/hosts/desktop.nix
+++ b/hosts/desktop.nix
@@ -46,14 +46,5 @@
     enable = true;
     extraPortals = with pkgs; [xdg-desktop-portal-gtk];
   };
-  programs = {
-    hyprland.enable = true;
-    thunar = {
-      enable = true;
-      plugins = with pkgs.xfce; [
-        thunar-archive-plugin
-        thunar-volman
-      ];
-    };
-  };
+  programs.hyprland.enable = true;
 }