wip

elythh · Aug 30, 2024 · ed89c6e · ed89c6e
1 parent 7f536a9
commit ed89c6e
Show file tree

Hide file tree

Showing 9 changed files with 60 additions and 64 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/modules/home/programs/graphical/wms/hyprland/default.nix b/modules/home/programs/graphical/wms/hyprland/default.nix
@@ -145,7 +145,6 @@ in
         wlr-randr
         wlr-randr
         wtype
-        xwaylandvideobridge
         ydotool
         wlprop
         xorg.xprop

diff --git a/modules/home/services/hyprpaper/default.nix b/modules/home/services/hyprpaper/default.nix
@@ -11,7 +11,6 @@ let
   inherit (lib.${namespace}) mkBoolOpt;
 
   cfg = config.${namespace}.services.hyprpaper;
-
 in
 {
 
@@ -24,6 +23,7 @@ in
       preload = ${config.stylix.image}
       wallpaper = , ${config.stylix.image}
     '';
+
     systemd.user.services.hyprpaper = {
       Unit = {
         Description = "Hyprland wallpaper daemon";

diff --git a/modules/home/theme/gtk/default.nix b/modules/home/theme/gtk/default.nix
@@ -23,7 +23,6 @@ in
   config = mkIf (cfg.enable && pkgs.stdenv.isLinux) {
     home = {
       packages = with pkgs; [
-        # NOTE: required explicitly with noXlibs and home-manager
         dconf
         glib # gsettings
         gtk3.out # for gtk-launch

diff --git a/modules/nixos/displaymanager/sddm/default.nix b/modules/nixos/displaymanager/sddm/default.nix
@@ -18,15 +18,15 @@ in
 
   config = mkIf cfg.enable {
     environment.systemPackages = with pkgs; [
-      catppuccin-sddm-corners
+      where-is-my-sddm-theme
       sddm
     ];
 
     services = {
       displayManager = {
         sddm = {
           inherit (cfg) enable;
-          theme = "catppuccin-sddm-corners";
+          theme = "where_is_my_sddm_theme";
           wayland = enabled;
         };
       };
@@ -37,7 +37,6 @@ in
         ''
           echo "Setting sddm permissions for user icon"
           ${getExe' pkgs.acl "setfacl"} -m u:sddm:x /home/${config.${namespace}.user.name}
-          ${getExe' pkgs.acl "setfacl"} -m u:sddm:r /home/${config.${namespace}.user.name}/.face.icon || true
         '';
   };
 }
diff --git a/modules/nixos/programs/graphical/addons/xdg-portal/default.nix b/modules/nixos/programs/graphical/addons/xdg-portal/default.nix
@@ -10,7 +10,7 @@
 let
   inherit (lib) mkIf;
   inherit (lib.${namespace}) mkBoolOpt;
-  inherit (inputs) hyprland xdg-desktop-portal-hyprland;
+  inherit (inputs) hyprland;
 
   cfg = config.${namespace}.programs.graphical.addons.xdg-portal;
 in
@@ -45,16 +45,10 @@ in
           };
         };
 
-        extraPortals =
-          with pkgs;
-          [ xdg-desktop-portal-gtk ]
-          ++ (lib.optional config.${namespace}.programs.graphical.wms.hyprland.enable (
-            xdg-desktop-portal-hyprland.packages.${system}.xdg-desktop-portal-hyprland.override {
-              debug = true;
-              # TODO: use same package as home-manager
-              inherit (hyprland.packages.${system}) hyprland;
-            }
-          ));
+        extraPortals = with pkgs; [
+          xdg-desktop-portal-gtk
+          xdg-desktop-portal-wlr
+        ];
         # xdgOpenUsePortal = true;
 
         wlr = {

diff --git a/modules/nixos/suites/wlroots/default.nix b/modules/nixos/suites/wlroots/default.nix
@@ -25,7 +25,6 @@ in
     };
     programs = {
       nm-applet.enable = true;
-      xwayland.enable = true;
 
       wshowkeys = {
         enable = true;

diff --git a/modules/nixos/system/boot/default.nix b/modules/nixos/system/boot/default.nix
@@ -53,14 +53,20 @@ in
           canTouchEfiVariables = true;
           efiSysMountPoint = "/boot";
         };
+        grub = {
+          enable = true;
+          useOSProber = true;
+          efiSupport = true;
+          device = "nodev";
+        };
 
         generationsDir.copyKernels = true;
 
-        systemd-boot = {
-          enable = true;
-          configurationLimit = 20;
-          editor = false;
-        };
+        # systemd-boot = {
+        #   enable = true;
+        #   configurationLimit = 20;
+        #   editor = false;
+        # };
       };
 
       tmp = default-attrs {

diff --git a/systems/x86_64-linux/grovetender/hyprlandOutput b/systems/x86_64-linux/grovetender/hyprlandOutput
@@ -1,4 +1,4 @@
-monitor=HDMI-A-1,	2440x1080@143,	0x0,	2, bitdepth, 10
+monitor=HDMI-A-1,	2440x1080@143,	0x0,	1, bitdepth, 10
 
 workspace = name:hello, monitor:DP-1, defafult:true
 windowrulev2 = workspace name:hello, class:^(nwg-hello)$