hyprland stuff

hosts/desktop/configuration.nix

@@ -11,7 +11,7 @@
 }:
 let
   user = "matt";
-  password = "$y$j9T$EkPXmsmIMFFZ.WRrBYCxS1$P0kwo6e4.WM5DsqUcEqWC3MrZp5KfCjxffraMFZWu06";
+  passwordFile = config.sops.secrets."desktop/matt_password".path;
   hostname = "matt-nixos";
 
   resetNetworkScript = pkgs.writeScriptBin "reset-network" ''
@@ -33,47 +33,15 @@ in
     ./hardware-configuration.nix
     ./boot.nix
     ./filesystems.nix
-    # ../../cachix/cachix.nix
-    ../default.nix    
+    ./sops.nix
+    ../default.nix
+    
+    ./hyprland
+    ./gnome
   ];
 
   specialisation = {
 
-    gnome.configuration = {
-      services = {
-        xserver = {
-          desktopManager.gnome.enable = true;
-
-          # Enable Desktop Environment.
-          displayManager = {
-            gdm.enable = true;
-            gdm.wayland = true;
-          };
-        };
-
-        displayManager.defaultSession = "gnome";
-
-        # Enable Flatpak
-        flatpak.enable = true;
-
-        # disable plasma
-        displayManager.sddm.enable = false;
-        desktopManager.plasma6.enable = false;
-      };
-
-      environment = {
-        systemPackages = with pkgs; [
-          gnome-tweaks
-          gnomeExtensions.appindicator
-          gnomeExtensions.arcmenu
-          gnomeExtensions.dash-to-panel
-          gnomeExtensions.tiling-assistant
-        ];
-      };
-
-      # xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
-    };
-
     cosmic.configuration = {
       services = {
         desktopManager.cosmic.enable = true;
@@ -84,67 +52,6 @@ in
         desktopManager.plasma6.enable = false;
       };
     };
-
-    hyprland.configuration = {
-      services = {
-        displayManager.sddm.enable = true;
-        displayManager.defaultSession = "hyprland";
-        # disable plasma
-        desktopManager.plasma6.enable = false;
-      };
-
-      programs.hyprland = {
-        enable = true;
-        xwayland.enable = true;
-      };
-
-      # Hint Electon apps to use wayland
-      environment.sessionVariables = {
-        NIXOS_OZONE_WL = "1";
-      };
-
-      environment.systemPackages = with pkgs; [
-        hyprland
-        swww # for wallpapers
-        xdg-desktop-portal-gtk
-        xdg-desktop-portal-hyprland
-        xwayland
-        meson
-        wayland-protocols
-        wayland-utils
-        wl-clipboard
-        wlroots
-        networkmanagerapplet
-        kitty
-        rofi-wayland
-        wofi
-        dunst
-        libnotify
-        waybar
-      ];
-
-      services.dbus.enable = true;
-      xdg.portal = {
-        enable = true;
-        wlr.enable = true;
-        extraPortals = [
-          pkgs.xdg-desktop-portal-gtk
-        ];
-      };
-
-      fonts.fonts = with pkgs; [
-        nerdfonts
-        meslo-lgs-nf
-      ];
-
-      nixpkgs.overlays = [
-        (self: super: {
-          waybar = super.waybar.overrideAttrs (oldAttrs: {
-            mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ];
-          });
-        })
-      ];
-    };
   };
 
   apps.discover-wrapped.enable = false;
@@ -295,6 +202,8 @@ in
       nil
       papirus-icon-theme
       pciutils
+      # python3
+      # python3Packages.requests
       rclone
       rclone-browser
       rsync
@@ -311,6 +220,7 @@ in
     sessionVariables = {
       STEAM_FORCE_DESKTOPUI_SCALING = "1";
     };
+
   };
 
   # Configure nixpkgs
@@ -327,6 +237,7 @@ in
       "ratbagd"
       "input"
     ]; # Enable ‘sudo’ for the user.
+    hashedPasswordFile = passwordFile;
     shell = pkgs.zsh;
   };