From 151c3178459ff51e252f063d01f54bccec7c6c26 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Wed, 28 Jun 2023 13:33:12 +0100
Subject: [PATCH] Add build target to Makefile, reorganise some definitions

---
 Makefile                   | 8 +++++---
 flake.nix                  | 1 -
 home/desktop/hyprland.nix  | 1 +
 users/elitherl/Ronin.nix   | 9 +--------
 users/elitherl/default.nix | 7 +++++++
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index b9d9a3e8..1b2c84be 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,15 @@
-.PHONY: default test lock
+.PHONY: default test build lock
 
 default:
 	sudo nixos-rebuild switch --flake .
 
 test:
-	git -C . add .
 	sudo nixos-rebuild test --flake .
 
+build:
+	sudo nixos-rebuild build --flake .
+
 lock:
 	nix flake lock --update-input nixpkgs --update-input home-manager
-	git -C . add flake.lock
+	git add flake.lock
 	nix flake archive
diff --git a/flake.nix b/flake.nix
index b1d8f8eb..ed70525b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -74,7 +74,6 @@
         ./home/desktop/hyprland.nix
         ./home/gui
       ];
-      programs.firefox.package = pkgs.firefox-wayland;
       xdg.configFile."hypr/hyprpaper.conf".text = ''
         preload = ${wallpapers.outputs.default}
         wallpaper = ,${wallpapers.outputs.default}
diff --git a/home/desktop/hyprland.nix b/home/desktop/hyprland.nix
index 7222219a..4ca84732 100644
--- a/home/desktop/hyprland.nix
+++ b/home/desktop/hyprland.nix
@@ -10,6 +10,7 @@
     ./dunst.nix
     ./rofi.nix
   ];
+  programs.firefox.package = pkgs.firefox-wayland;
   programs.rofi.package = pkgs.rofi-wayland;
   wayland.windowManager.hyprland = {
     enable = true;
diff --git a/users/elitherl/Ronin.nix b/users/elitherl/Ronin.nix
index 12d56f85..e4e1cf52 100644
--- a/users/elitherl/Ronin.nix
+++ b/users/elitherl/Ronin.nix
@@ -7,14 +7,7 @@
 in {
   imports = [./default.nix];
   home-manager.users.elitherl = {
-    home.packages = with pkgs; [
-      zotero
-      openfortivpn
-      nomachine-client
-      teams-for-linux
-      zoom-us
-      laptop-state
-    ];
+    home.packages = [laptop-state];
     wayland.windowManager.hyprland.extraConfig = ''
       source=./common.conf
       monitor = eDP-1,1920x1080,0x0,1.0
diff --git a/users/elitherl/default.nix b/users/elitherl/default.nix
index 5f6053c6..7814bafa 100644
--- a/users/elitherl/default.nix
+++ b/users/elitherl/default.nix
@@ -11,6 +11,13 @@
       username = "elitherl";
       homeDirectory = "/home/elitherl";
       stateVersion = "22.11";
+      packages = with pkgs; [
+        zotero
+        openfortivpn
+        nomachine-client
+        teams-for-linux
+        zoom-us
+      ];
     };
   };
 }