From 85791beff8dc8548040e555bf92130a863382357 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Av=C3=A9?= <email@thomasave.be>
Date: Mon, 10 Jun 2024 16:01:29 +0200
Subject: [PATCH] Aloria update

---
 home/Aloria.nix           |  7 +----
 home/Kell.nix             | 12 ---------
 home/hyprland/default.nix | 19 +++++++++++++
 hosts/Aloria/default.nix  | 57 +++++++++------------------------------
 hosts/Common/default.nix  |  1 +
 5 files changed, 33 insertions(+), 63 deletions(-)

diff --git a/home/Aloria.nix b/home/Aloria.nix
index cc4780e..12c9458 100644
--- a/home/Aloria.nix
+++ b/home/Aloria.nix
@@ -12,7 +12,7 @@
     ./ssh
     ./mpv
   ];
-  home.packages = with pkgs; [ telegram-desktop webcord devenv iwgtk ];
+  home.packages = with pkgs; [ telegram-desktop webcord devenv iwgtk element-desktop ];
   programs.ssh.matchBlocks."*".identityFile = "/home/user/.secrets/SSH/Aloria/id_ed25519";
 
   services.hyprpaper = {
@@ -26,11 +26,6 @@
     };
   };
 
-  gtk.iconTheme = {
-    name = "Papirus";
-    gtk.iconTheme.package = pkgs.papirus-icon-theme;
-  };
-
   # wayland.windowManager.hyprland.settings.env = ["WLR_DRM_DEVICES,/dev/dri/by-path/pci-0000:01:00.0-card"]; # Nvidia
   # wayland.windowManager.hyprland.settings.env = ["WLR_DRM_DEVICES,/dev/dri/by-path/pci-0000:00:02.0-card"]; # Intel
   wayland.windowManager.hyprland.settings = {
diff --git a/home/Kell.nix b/home/Kell.nix
index 3f9f17c..4a8292d 100644
--- a/home/Kell.nix
+++ b/home/Kell.nix
@@ -24,18 +24,6 @@
       ];
     };
   };
-
-  gtk = {
-      enable = true;
-      theme = {
-          package = pkgs.gnome.gnome-themes-extra;
-          name = "Adwaita-dark";
-      };
-      iconTheme = {
-          name = "Papirus";
-          package = pkgs.papirus-icon-theme;
-      };
-  };
   programs.waybar.settings.mainBar = {
       output = "DP-2";
       "custom/temperature".exec = "${pkgs.lm_sensors}/bin/sensors | ${pkgs.gnugrep}/bin/grep Tctl | cut -c16-22";
diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index 0485671..b057f3f 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -67,6 +67,25 @@ in {
       pkgs.jq
   ];
 
+  gtk = {
+      enable = true;
+      theme = {
+          package = pkgs.gnome.gnome-themes-extra;
+          name = "Adwaita-dark";
+      };
+      iconTheme = {
+          name = "Papirus";
+          package = pkgs.papirus-icon-theme;
+      };
+  };
+
+  home.pointerCursor = {
+      gtk.enable = true;
+      name = "Adwaita";
+      size = 28;
+      package = pkgs.gnome.adwaita-icon-theme;
+  };
+
   services.cliphist = { enable = true; };
 
   services.hyprpaper = {
diff --git a/hosts/Aloria/default.nix b/hosts/Aloria/default.nix
index 7fc8b55..ac209c2 100644
--- a/hosts/Aloria/default.nix
+++ b/hosts/Aloria/default.nix
@@ -1,38 +1,4 @@
 { pkgs, inputs, config, ... }:
-let
-mkConnection = name: cfg: {
-    connection = {
-        id = name;
-        type = "wifi";
-    };
-    ipv4 = {
-        method = "auto";
-    };
-    ipv6 = {
-        method = "auto";
-    };
-    wifi = {
-        ssid = name;
-        mode = "infrastructure";
-    };
-    wifi-security = {
-        auth-alg = "open";
-        key-mgmt = "wpa-psk";
-        psk = cfg.id;
-    };
-};
-connections = {
-    "The Buttshark" = {
-        id = "$THE_BUTTSHARK";
-    };
-    "5G Research Tower (5000 Watt)" = {
-        id = "$RESEARCH_TOWER";
-    };
-    "5G Research Tower (2400 Watt)" = {
-        id = "$RESEARCH_TOWER";
-    };
-};
-in
 {
   imports = [
       (import ../Common { inherit inputs pkgs; })
@@ -105,17 +71,18 @@ in
       }];
     };
   };
-  networking.networkmanager = {
-      enable = true;
-      ensureProfiles = {
-        environmentFiles = [
-            "/home/user/.secrets/Wireless/Aloria.env"
-        ];
-        profiles = pkgs.lib.mapAttrs mkConnection connections;
-      };
-      dns = "systemd-resolved";
-  };
-  networking.networkmanager.wifi.backend = "iwd";
+  # networking.networkmanager = {
+  #     enable = true;
+  #     ensureProfiles = {
+  #       environmentFiles = [
+  #           "/home/user/.secrets/Wireless/Aloria.env"
+  #       ];
+  #       profiles = pkgs.lib.mapAttrs mkConnection connections;
+  #     };
+  #     dns = "systemd-resolved";
+  # };
+  # networking.networkmanager.wifi.backend = "iwd";
+
   networking.wireless.iwd.enable = true;
   networking.wireless.iwd.settings = {
     IPv6 = {
diff --git a/hosts/Common/default.nix b/hosts/Common/default.nix
index 1a6154c..fa3103e 100644
--- a/hosts/Common/default.nix
+++ b/hosts/Common/default.nix
@@ -10,6 +10,7 @@
     services.thermald.enable = true;
     services.pcscd.enable = true;
     services.fwupd.enable = true;
+    services.gvfs.enable = true;
     services.fstrim.enable = true;
     hardware.opengl = {
         enable = true;