enforce new flake schema. formatting.

modules/home/hyprland/applications/bitwarden/default.nix

@@ -16,31 +16,33 @@ in
   imports = [ ../../../rofi-rbw ];
 
   config = mkIf (cfg.enable && app == "rofi-rbw") {
-    programs.rbw = {
-      enable = true;
-      settings = {
-        # email = "you@example.tld"; # You have to set this in your config
-        pinentry = mkDefault pkgs.pinentry-gnome3;
-        lock_timeout = mkDefault 3600;
+    programs = {
+      rbw = {
+        enable = true;
+        settings = {
+          # email = "you@example.tld"; # You have to set this in your config
+          pinentry = mkDefault pkgs.pinentry-gnome3;
+          lock_timeout = mkDefault 3600;
+        };
       };
-    };
 
-    programs.rofi-rbw = {
-      enable = true;
-      package = mkDefault pkgs.rofi-rbw-wayland;
-      settings = {
-        selector = mkDefault "bemenu";
-        selector-args = mkDefault "-i -l 20";
-        action = mkDefault "copy";
-        typing-key-delay = mkDefault 0;
+      rofi-rbw = {
+        enable = true;
+        package = mkDefault pkgs.rofi-rbw-wayland;
+        settings = {
+          selector = mkDefault "bemenu";
+          selector-args = mkDefault "-i -l 20";
+          action = mkDefault "copy";
+          typing-key-delay = mkDefault 0;
+        };
       };
-    };
 
-    programs.librewolf = mkIf config.programs.librewolf.enable {
-      profiles.default.extensions.packages =
-        with inputs.nur.legacyPackages."${pkgs.stdenv.hostPlatform.system}".repos.rycee.firefox-addons; [
-          bitwarden
-        ];
+      librewolf = mkIf config.programs.librewolf.enable {
+        profiles.default.extensions.packages =
+          with inputs.nur.legacyPackages."${pkgs.stdenv.hostPlatform.system}".repos.rycee.firefox-addons; [
+            bitwarden
+          ];
+      };
     };
   };
 }

modules/home/hyprland/applications/default.nix

@@ -22,7 +22,7 @@ let
     {
       default = mkOption {
         type = types.str;
-        default = default;
+        inherit default;
         description = "The default application to use for the ${default}.";
       };
       bind = mkOption {
@@ -38,12 +38,8 @@ let
     };
 
   # generate lists of all binds and window rules and remove empty strings
-  binds = filter (s: s != "") (
-    builtins.concatLists (map (app: app.bind or [ "" ]) (attrValues apps))
-  );
-  windowrules = filter (s: s != "") (
-    builtins.concatLists (map (app: app.windowrule or [ "" ]) (attrValues apps))
-  );
+  binds = filter (s: s != "") (builtins.concatLists (map (app: app.bind or [ "" ]) (attrValues apps)));
+  windowrules = filter (s: s != "") (builtins.concatLists (map (app: app.windowrule or [ "" ]) (attrValues apps)));
 
   inherit (lib)
     attrValues

modules/home/hyprland/applications/dunst-toggle/dunst-toggle.nix

@@ -5,7 +5,7 @@ let
   pkill = "${pkgs.procps}/bin/pkill";
   signal = "${toString config.programs.waybar.settings.mainBar."custom/notifications".signal}";
 in
-(pkgs.writeShellScriptBin "dunst-toggle" ''
+pkgs.writeShellScriptBin "dunst-toggle" ''
   ${dunst} set-paused toggle
   ${pkill} -RTMIN+${signal} waybar
-'')
+''

modules/home/hyprland/applications/newsboat/default.nix

@@ -9,7 +9,7 @@ let
   cfg = config.wayland.windowManager.hyprland;
   app = cfg.applications.rssreader.default;
   reloadTime = "${toString config.programs.newsboat.reloadTime}";
-  newsboat-reload = (import ./newsboat-reload.nix { inherit config pkgs; });
+  newsboat-reload = import ./newsboat-reload.nix { inherit config pkgs; };
 
   inherit (lib) mkIf;
 in
@@ -27,9 +27,11 @@ in
       timers.newsboat-reload = {
         Unit.Description = "Reload newsboat every ${reloadTime} minutes";
 
-        Timer.OnBootSec = "10sec";
-        Timer.OnUnitActiveSec = "${reloadTime}min";
-        Timer.Unit = "newsboat-reload.service";
+        Timer = {
+          OnBootSec = "10sec";
+          OnUnitActiveSec = "${reloadTime}min";
+          Unit = "newsboat-reload.service";
+        };
 
         Install.WantedBy = [ "timers.target" ];
       };

modules/home/hyprland/applications/newsboat/newsboat-reload.nix

@@ -5,6 +5,6 @@ let
   notify = "${pkgs.libnotify}/bin/notify-send";
   signal = "${toString config.programs.waybar.settings.mainBar."custom/newsboat".signal}";
 in
-(pkgs.writeShellScriptBin "newsboat-reload" ''
+pkgs.writeShellScriptBin "newsboat-reload" ''
   ${notify} -u low 'Newsboat' 'Reloading RSS feeds...' && ${newsboat} -x reload && ${notify} -u low 'Newsboat' 'RSS feeds reloaded.' && pkill -RTMIN+${signal} waybar
-'')
+''

modules/home/hyprland/applications/presentation-mode-bemenu/default.nix

@@ -14,9 +14,7 @@ in
 {
   config = mkIf (cfg.enable && app == "presentation-mode-bemenu") {
     home.packages = [
-      (pkgs.writeShellScriptBin "presentation-mode-bemenu" (
-        builtins.readFile ./presentation-mode-bemenu.sh
-      ))
+      (pkgs.writeShellScriptBin "presentation-mode-bemenu" (builtins.readFile ./presentation-mode-bemenu.sh))
     ];
   };
 }

modules/home/hyprland/applications/presentation-mode-bemenu/presentation-mode-bemenu.sh

@@ -1,5 +1,6 @@
+#!/usr/bin/env bash
 # Variables
-DISPLAYS=( $(hyprctl monitors | grep -E '^Monitor' | awk '{print $2}') )
+mapfile -t DISPLAYS < <(hyprctl monitors | grep -E '^Monitor' | awk '{print $2}')
 EXTEND_RIGHT="Extend to right of main"
 EXTEND_LEFT="Extend to left of main"
 MIRROR="Mirror main"

modules/home/hyprland/applications/screenshot/screenshot.nix

@@ -5,7 +5,7 @@
 let
   screenshotDir = "${config.xdg.userDirs.pictures}/screenshots";
 in
-(pkgs.writeShellScriptBin "screenshot" ''
+pkgs.writeShellScriptBin "screenshot" ''
   mkdir -p ${screenshotDir}
   ${pkgs.hyprshot}/bin/hyprshot --mode $1 --output-folder ${screenshotDir} --filename screenshot_$(date +"%Y-%m-%d_%H-%M-%S").png
-'')
+''

modules/home/hyprland/binds/default.nix

@@ -27,7 +27,7 @@ in
     wayland.windowManager.hyprland = {
       settings = {
         bind = binds;
-        bindm = (import ./mouse.nix);
+        bindm = import ./mouse.nix;
       };
     };
   };

modules/home/hyprland/cursor.nix

@@ -9,17 +9,19 @@ let
   inherit (lib) mkForce;
 in
 {
-  home.pointerCursor = {
-    name = mkForce "Bibata-Original-Ice";
-    size = mkForce 24;
-    package = mkForce pkgs.bibata-cursors;
-  };
+  home = {
+    pointerCursor = {
+      name = mkForce "Bibata-Original-Ice";
+      size = mkForce 24;
+      package = mkForce pkgs.bibata-cursors;
+    };
 
-  home.packages = [ pkgs.hyprcursor ];
+    packages = [ pkgs.hyprcursor ];
 
-  home.sessionVariables = {
-    HYPRCURSOR_THEME = config.home.pointerCursor.name;
-    HYPRCURSOR_SIZE = toString config.home.pointerCursor.size;
+    sessionVariables = {
+      HYPRCURSOR_THEME = config.home.pointerCursor.name;
+      HYPRCURSOR_SIZE = toString config.home.pointerCursor.size;
+    };
   };
 
   # wayland.windowManager.hyprland.cursor.no_hardware_cursors = true;

modules/home/hyprland/default.nix

@@ -78,12 +78,6 @@ in
     # auto discover fonts in `home.packages`
     fonts.fontconfig.enable = true;
 
-    # notifications
-    services.dunst = {
-      enable = mkDefault true;
-      waylandDisplay = config.home.sessionVariables.WAYLAND_DISPLAY;
-    };
-
     # install some applications
     home.packages = import ./packages.nix { inherit pkgs; }; # use programs.PACKAGE or services.SERVICE when possible
 
@@ -94,11 +88,19 @@ in
       fi
     '';
 
-    services.udiskie = {
-      enable = mkDefault true;
-      tray = mkDefault "never";
-    };
+    # notifications
+    services = {
+      dunst = {
+        enable = mkDefault true;
+        waylandDisplay = config.home.sessionVariables.WAYLAND_DISPLAY;
+      };
 
-    services.network-manager-applet.enable = mkDefault true;
+      udiskie = {
+        enable = mkDefault true;
+        tray = mkDefault "never";
+      };
+
+      network-manager-applet.enable = mkDefault true;
+    };
   };
 }

modules/home/hyprland/xdg/default.nix

@@ -20,8 +20,10 @@ in
       enable = mkDefault true;
       createDirectories = mkDefault true;
     };
-    portal.enable = mkDefault true;
-    portal.extraPortals = [ portal ];
-    portal.configPackages = [ portal ];
+    portal = {
+      enable = mkDefault true;
+      extraPortals = [ portal ];
+      configPackages = [ portal ];
+    };
   };
 }