Start another restructure

Move home config back into nixos, too annoying to
maintain as separate when not needed

Regoup nix expressions logically, make use of defaults and
create GUI collections to minimise code needed for common
machine definitions

home/H0615-elitherl.nix

@@ -1,4 +0,0 @@
-{ ... }: {
-  imports = [ ./ukaea-elitherl.nix ];
-  home.stateVersion = "22.11";
-}

home/desktop/pkgs/rot8/backup.nix

@@ -1,31 +0,0 @@
-{ lib, fetchFromGitHub, rustPlatform }:
-
-rustPlatform.buildRustPackage rec {
-  pname = "rot8";
-  version = "v0.1.5";
-
-  src = fetchFromGitHub {
-    owner = "efernau";
-    repo = pname;
-    rev = version;
-    sha256 = lib.fakeSha256;
-  };
-
-  cargoSha256 = lib.fakeSha256;
-
-  buildPhase = ''
-    cargo build --release
-  '';
-
-  installPhase = ''
-    mkdir $out/bin
-    mv target/release/rot8 $out/bin
-  '';
-
-  meta = with lib; {
-    description = "Automatic display rotation using built-in accelerometer";
-    homepage = "https://github.com/BurntSushi/ripgrep";
-    license = licenses.unlicense;
-    maintainers = [ "evie" ];
-  };
-}

home/desktop/pkgs/rot8/default.nix

@@ -1,24 +0,0 @@
-{ pkgs ? <nixpkgs>, ... }:
-
-pkgs.stdenv.mkDerivation rec {
-  pname = "rot8";
-  version = "v0.1.5";
-
-  src = pkgs.fetchFromGitHub {
-    owner = "efernau";
-    repo = pname;
-    rev = version;
-    sha256 = "0000000000000000000000000000000000000000000000000000";
-  };
-
-  buildInputs = [ pkgs.cargo ];
-
-  buildPhase = ''
-    cargo build --release
-  '';
-
-  installPhase = ''
-    mkdir $out/bin
-    mv target/release/rot8 $out/bin
-  '';
-}

home/env/git/personal.nix

@@ -1,7 +0,0 @@
-{ ... }:
-{
-  imports = [ ./default.nix ];
-  programs.git = {
-    userEmail = "evie@xenia.me.uk";
-  };
-}

home/env/git/work.nix

@@ -1,7 +0,0 @@
-{ ... }:
-{
-  imports = [ ./default.nix ];
-  programs.git = {
-    userEmail = "evie.litherland-smith@ukaea.uk";
-  };
-}

home/gui/messaging.nix

@@ -1,8 +0,0 @@
-{ pkgs, ... }:
-
-{
-  home.packages = with pkgs; [
-    signal-desktop
-    element-desktop
-  ];
-}

nixos/H0615-elitherl.nix

@@ -1,8 +1,12 @@
 { pkgs, ... }:
-
+let
+  home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/master.tar.gz";
+in
 {
   imports = [
+    (import "${home-manager}/nixos")
     ./common.nix
+    ./home/common.nix
     ./locales/en_GB.nix
     ./desktop/plasma.nix
   ];
@@ -16,4 +20,18 @@
     extraGroups = [ "networkmanager" "wheel" ];
     shell = pkgs.fish;
   };
+  home-manager.users.elitherl = { ... }: {
+    imports = [
+      ./home/desktop
+      ./home/env
+      ./home/git/work
+      ./home/gui/collections/work
+      ./home/tui
+    ];
+    # Home Manager needs a bit of information about you and the
+    # paths it should manage.
+    home.username = "elitherl";
+    home.homeDirectory = "/home/elitherl";
+    home.stateVersion = "22.11";
+  };
 }

nixos/home/common.nix

@@ -0,0 +1,5 @@
+{ ... }:
+{
+  home-manager.useUserPackages = true;
+  home-manager.useGlobalPkgs = true;
+}

nixos/home/desktop/common/default.nix

@@ -0,0 +1,2 @@
+{ ... }:
+{ imports = [ ./gtk.nix ]; }

nixos/home/desktop/default.nix

@@ -0,0 +1,8 @@
+{ ... }:
+{
+  imports = [
+    ./common
+    ./wayland
+    ./xorg
+  ];
+}

nixos/home/desktop/xorg/default.nix

@@ -0,0 +1,5 @@
+{ ... }:
+{
+  imports = [ ./xresources.nix ];
+  xsession.enable = true;
+}

nixos/home/env/default.nix

@@ -2,7 +2,6 @@
 {
   imports = [
     ./fonts
-    ./git
     ./shell
     ./direnv.nix
     ./keychain.nix

nixos/home/git/default.nix

@@ -1,8 +1,8 @@
 { ... }:
 {
   imports = [
-    ../ssh.nix
-    ../shell
+    ../env/ssh.nix
+    ../env/shell
   ];
   programs.git = {
     enable = true;

nixos/home/git/personal/default.nix

@@ -0,0 +1,5 @@
+{ ... }:
+{
+  imports = [ ../default.nix ];
+  programs.git.userEmail = "evie@xenia.me.uk";
+}

nixos/home/git/work/default.nix

@@ -0,0 +1,5 @@
+{ ... }:
+{
+  imports = [ ../default.nix ];
+  programs.git.userEmail = "evie.litherland-smith@ukaea.uk";
+}

nixos/home/gui/collections/personal/default.nix

@@ -0,0 +1,15 @@
+{ ... }:
+{
+  imports = [
+    ../../browser/chromium-wayland.nix
+    ../../dev/neovide.nix
+    ../../documents/zotero.nix
+    ../../gaming/steam.nix
+    ../../messaging/discord.nix
+    ../../messaging/element.nix
+    ../../messaging/signal.nix
+    ../../security
+    ../../terminal/foot.nix
+    ../../terminal/wezterm.nix
+  ];
+}

nixos/home/gui/collections/work/default.nix

@@ -0,0 +1,14 @@
+{ ... }:
+{
+  imports = [
+    ../../browser/chromium-wayland.nix
+    ../../dev/neovide.nix
+    ../../documents/libreoffice.nix
+    ../../documents/zotero.nix
+    ../../messaging/signal.nix
+    ../../messaging/zoom.nix
+    ../../remote/nomachine.nix
+    ../../security
+    ../../terminal/wezterm.nix
+  ];
+}

nixos/home/gui/gaming/steam.nix

@@ -5,6 +5,5 @@
     mesa
     steam
     steam-run
-    discord
   ];
 }

nixos/home/gui/messaging/discord.nix

@@ -0,0 +1,4 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [ discord ];
+}

nixos/home/gui/messaging/element.nix

@@ -0,0 +1,4 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [ element-desktop ];
+}

nixos/home/gui/messaging/signal.nix

@@ -0,0 +1,4 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [ signal-desktop ];
+}