From 590a195c13d5010c8aaf10a2d0d8d4efc2072d1f Mon Sep 17 00:00:00 2001
From: Tristan <tristan@tristans.cloud>
Date: Mon, 17 Apr 2023 11:21:33 +0100
Subject: [PATCH] update, move applications

---
 flake.lock               | 18 ++++++++--------
 system/global/home.nix   | 45 +++++++++++++++++++++++-----------------
 system/global/system.nix |  8 -------
 system/work/home.nix     |  9 ++++++++
 system/zenix/home.nix    | 10 +++++++++
 5 files changed, 54 insertions(+), 36 deletions(-)

diff --git a/flake.lock b/flake.lock
index 6b6eb06..1389b3b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1681468923,
-        "narHash": "sha256-+X2oO4juRVhQRs002mn8km6PODccIRiz09c2K1xtSpY=",
+        "lastModified": 1681690464,
+        "narHash": "sha256-x8pw8KAb9TJsszbCHUBK2bWvgYPlCjwHMV1dF95eZPs=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "17198cf5ae27af5b647c7dac58d935a7d0dbd189",
+        "rev": "53bd74f786934997e7f6a5ed9741b226e511e508",
         "type": "github"
       },
       "original": {
@@ -29,11 +29,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1681652918,
-        "narHash": "sha256-ybXmD3OhyMG1Yz31lxT8de7aBi2mQmXmzAZ7q49Uvi4=",
+        "lastModified": 1681677208,
+        "narHash": "sha256-R9b2/SZfkxuv54YDo4FUp65wgLREQ4gfYxfJ9mSMTno=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "b05ff89c76b2c9454c76daf2120f4ccb076a018d",
+        "rev": "c62ab1bee72cc4bda16a0574a8c9de7d71da314a",
         "type": "github"
       },
       "original": {
@@ -81,11 +81,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1681303793,
-        "narHash": "sha256-JEdQHsYuCfRL2PICHlOiH/2ue3DwoxUX7DJ6zZxZXFk=",
+        "lastModified": 1681648924,
+        "narHash": "sha256-pzi3HISK8+7mpEtv08Yr80wswyHKsz+RP1CROG1Qf6s=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "fe2ecaf706a5907b5e54d979fbde4924d84b65fc",
+        "rev": "f294325aed382b66c7a188482101b0f336d1d7db",
         "type": "github"
       },
       "original": {
diff --git a/system/global/home.nix b/system/global/home.nix
index 03c47a3..48b9b14 100644
--- a/system/global/home.nix
+++ b/system/global/home.nix
@@ -29,42 +29,38 @@
     slurp
     chafa
     wofi
-
-    # utils
     exa
     du-dust
     htop
     imv
     libsixel
+    swaybg
 
-    # apps
-    gimp
+    brave
     logseq
     quickemu
-    ansible
     bitwarden
-    nextcloud-client
-    godot_4
-    ardour
-    blender
-    musescore
   ];
 
   programs.fish = {
     enable = true;
   };
 
-  programs.swaylock.settings = {
-    clock = true;
-    screenshots = true;
-    effect-scale = 0.5;
-    effect-blur = "10x10";
+  programs.swaylock = {
+    enable = true;
+    package = pkgs.swaylock-effects;
+    settings = {
+      clock = true;
+      screenshots = true;
+      effect-scale = 0.5;
+      effect-blur = "10x10";
+    };
   };
 
   services.swayidle.enable = true;
   services.swayidle.events = [
-    { event = "before-sleep"; command = "${pkgs.swaylock}/bin/swaylock"; }
-    { event = "lock"; command = "${pkgs.swaylock}/bin/swaylock"; }
+    { event = "before-sleep"; command = "${pkgs.swaylock-effects}/bin/swaylock"; }
+    { event = "lock"; command = "${pkgs.swaylock-effects}/bin/swaylock"; }
   ];
 
   wayland.windowManager.hyprland = {
@@ -226,6 +222,15 @@
       name = "Materia-dark";
       package = pkgs.materia-theme;
     };
+    iconTheme = {
+      name = "Adwaita";
+      package = pkgs.gnome.adwaita-icon-theme;
+    };
+    cursorTheme = {
+      name = "Vanilla-DMZ";
+      package = pkgs.vanilla-dmz;
+      size = 24;
+    };
     gtk3.bookmarks = [
       "file:///home/tristan/Documents"
     ];
@@ -318,8 +323,6 @@
     };
   };
 
-  # services.nextcloud-client.enable = true;
-  # services.nextcloud-client.startInBackground = true;
 
   programs.rbw = {
     enable = true;
@@ -355,5 +358,9 @@
   home.file.".config/wofi/config".text = ''
     term=foot
   '';
+  home.file.".icons/default".source = "${pkgs.vanilla-dmz}/share/icons/Vanilla-DMZ";
+
+  programs.librewolf.enable = true;
+  programs.firefox.enable = true;
 
 }
diff --git a/system/global/system.nix b/system/global/system.nix
index 3844a95..414e948 100644
--- a/system/global/system.nix
+++ b/system/global/system.nix
@@ -82,21 +82,13 @@
 
   environment.systemPackages = with pkgs; [
     foot
-    brave
     tealdeer
     alsa-utils
-    wofi
-    waybar
-    swaylock-effects
-    swayidle
-    swaybg
     pcmanfm
     pavucontrol
     trash-cli
     wget
     unzip
-    gnomeExtensions.appindicator
-    libappindicator
     networkmanager-openvpn
     (neovim.override {
       vimAlias = true;
diff --git a/system/work/home.nix b/system/work/home.nix
index 86eeba5..846afc1 100644
--- a/system/work/home.nix
+++ b/system/work/home.nix
@@ -9,6 +9,9 @@
     onedrive
     kubectl
     docker-compose
+    gimp
+    libreoffice
+    ansible
   ];
 
   programs.git = {
@@ -39,4 +42,10 @@
     '';
   };
 
+  gtk = {
+    gtk3.bookmarks = [
+      "file:///home/tristan/OneDrive/Documents/ OneDrive"
+    ];
+  };
+
 }
diff --git a/system/zenix/home.nix b/system/zenix/home.nix
index ca9c26a..c30edfb 100644
--- a/system/zenix/home.nix
+++ b/system/zenix/home.nix
@@ -5,8 +5,18 @@
   home.stateVersion = "22.05";
 
   home.packages = with pkgs; [
+    gimp
+    nextcloud-client
+    godot_4
+    ardour
+    blender
+    musescore
+    ansible
   ];
 
+  services.nextcloud-client.enable = true;
+  services.nextcloud-client.startInBackground = true;
+
   programs.git = {
     enable = true;
     userName = "tristan";