wip - fixes to import and config location

flake.nix

@@ -55,6 +55,9 @@
               inputs.nix-flatpak.homeManagerModules.nix-flatpak
               inputs.walker.homeManagerModules.default
             ];
+
+            nixpkgs.overlays = [ inputs.hyprpanel.overlay ];
+            # _module.args = { inherit inputs; };
           }
       ];
     };

hosts/spectre-x360-2018/default.nix

@@ -4,7 +4,6 @@
     imports = [
         ./configuration.nix
         ./hardware-configuration.nix
-        ../../modules/nixos/flatpak.nix
         ../../modules/nixos/hyprland.nix
         ../../modules/nixos/monitoring.nix
         ../../modules/nixos/nvidia.nix

modules/home-manager/flatpaks.nix

@@ -1,19 +1,24 @@
-{ lib, ... }: {
+{ lib, pkgs, ... }: {
 
-  services.flatpak.enable = true;
-
-  services.flatpak.update.auto.enable = false;
-  services.flatpak.uninstallUnmanaged = false;
+  # services.flatpak.enable = true;
+  # xdg.portal.enable = true;
+  # # install the xdg-desktop-portal-gtk package
+  # # to enable the portal service
+  # xdg.portal.extraPortals = with pkgs; [
+  #   xdg-desktop-portal-gtk
+  # ];
+  # services.flatpak.update.auto.enable = false;
+  # services.flatpak.uninstallUnmanaged = false;
   
-  services.flatpak.packages = [
-    "com.calibre_ebook.calibre"
-    "com.github.flxzt.rnote"
-    "com.github.tchx84.Flatseal"
-    "com.spotify.Client"
-    "io.podman_desktop.PodmanDesktop"
-    "org.pipewire.Helvum"
-    "io.github.zen_browser.zen"
-    "im.riot.Riot"
-  ];
+  # services.flatpak.packages = [
+  #   "com.calibre_ebook.calibre"
+  #   "com.github.flxzt.rnote"
+  #   "com.github.tchx84.Flatseal"
+  #   "com.spotify.Client"
+  #   "io.podman_desktop.PodmanDesktop"
+  #   "org.pipewire.Helvum"
+  #   "io.github.zen_browser.zen"
+  #   "im.riot.Riot"
+  # ];
 
 }

modules/home-manager/hyprland-customization.nix

@@ -1,8 +1,10 @@
 {inputs, pkgs, ...}: 
 {
   programs.kitty.enable = true;
+
   wayland.windowManager.hyprland = {
     enable = true;
+    systemd.enable = true;
     settings = {
       "$mod" = "SUPER";
       bind =
@@ -14,12 +16,7 @@
           "$mod, s, exec, code"
         ];
     
-      # plugin.virtual-desktops = {
-
-      # }
-      exec-once = [
-        "${pkgs.hyprpanel}/bin/hyprpanel"
-      ];
+      # plugin.virtual-desktops = {}
     };
 
     plugins = [
@@ -30,6 +27,18 @@
     ];
   };
 
+  imports = [ inputs.hyprpanel.homeManagerModules.hyprpanel ];
+
+  programs.hyprpanel = {
+    enable = true;
+    hyprland.enable = true;
+    overwrite.enable = true;
+    overlay.enable = true;
+
+    # Add custom widgets + styling
+  };
+
+
   programs.walker = {
     enable = true;
     runAsService = true;
@@ -53,8 +62,18 @@
     # '';
   };
 
-  # # Set waybar config
-  # ".config/waybar/config".text = ''
-  # ''
-  
+
+  programs.hyprlock = {
+    enable = true;
+    settings = {
+      general = {
+        grace = 5;
+        no_fade_in = false;
+        disable_loading_bar = false;
+      };
+    };
+  # Style the lock screen
+  };
+
+
 }

modules/nixos/flatpak.nix

@@ -1,9 +0,0 @@
-{
-    config,
-    lib,
-    pkgs,
-    ...
-}:
-{
-    services.flatpak.enable = true;
-}

modules/nixos/hyprland.nix

@@ -5,12 +5,9 @@
   ...
 }:
 {
-  programs.uwsm.enable = true;
-
   programs.hyprland = {
     enable = true;
     xwayland.enable = false;
-    withUWSM = true;
   };
 
   # launch hyprland on login
@@ -27,9 +24,6 @@
   #   };
   # };
 
-  environment.systemPackages = with pkgs; [
-    waybar  
-  ];
-
+  # systemd.user.targets.hyprland-session.Unit.Wants = [ "xdg-desktop-autostart.target" ];
 
 }