moore updates

modules/home-manager/backup.nix

@@ -1,4 +1,4 @@
-{pkgs, ...}: 
+{pkgs, ...}:
 {
   # Add a udev rule that launches a backup using restic when a specific USB device (the backup drive) is plugged in
 
@@ -22,4 +22,4 @@
       ExecStart = "${pkgs.restic}/bin/restic backup /home/username";
     };
   };
-}
+}

modules/home-manager/flatpaks.nix

@@ -8,7 +8,6 @@
   services.flatpak.uninstallUnmanaged = false;
 
   services.flatpak.packages = [
-    "com.calibre_ebook.calibre"
     "com.github.flxzt.rnote"
     "com.github.tchx84.Flatseal"
     "com.spotify.Client"

modules/home-manager/hypr/better-control.nix

@@ -0,0 +1,11 @@
+{
+  inputs,
+  pkgs,
+  ...
+}:
+{
+  environment.systemPackages =
+    with pkgs; [
+        inputs.better-control.packages.${pkgs.system}.better-control
+  ];
+}

modules/home-manager/hypr/default.nix

@@ -1,5 +1,6 @@
 {
   imports = [
+    # ./better-control.nix
     ./cursor.nix
     ./hyprland-customization.nix
     ./hyprpaper.nix
@@ -7,4 +8,4 @@
     ./hypridle.nix
     ./waybar.nix
   ];
-}
+}

modules/home-manager/hypr/hyprland-customization.nix

@@ -54,7 +54,6 @@
         "$mod, Tab, cyclenext,"
         "$mod, Tab, bringactivetotop,"
 
-
         # Move the window
         "$mod+Shift, left, movewindow, l"
         "$mod+Shift, right, movewindow, r"
@@ -65,8 +64,8 @@
         "$mod+Ctrl, right, movetoworkspace, +1"
 
         # # Switch workspace
-        # "$mod+Ctrl, left, workspace, -1"
-        # "$mod+Ctrl, right, workspace, +1"
+        "$mod+Alt, left, workspace, -1"
+        "$mod+Alt, right, workspace, +1"
 
         # Screenshot
         "$mod, Print, exec, hyprshot -m region -o ~/Pictures/Screenshots"
@@ -161,7 +160,7 @@
       };
 
       decoration = {
-        rounding = 5;
+        rounding = 7;
         # active_opacity = 0.95;
         inactive_opacity = 0.9;
 

modules/home-manager/hypr/hyprlock.nix

@@ -4,7 +4,8 @@
     enable = true;
     settings = {
       general = {
-        grace = 5;
+        # immediately lock the screen
+        grace = 0;
         no_fade_in = false;
         disable_loading_bar = false;
       };

modules/home-manager/hypr/waybar.nix

@@ -204,7 +204,7 @@
             .module {
                 background: rgba(0, 0, 0, 0.6);
                 color: white;
-                border-radius: 5px;
+                border-radius: 7px;
                 padding: 5px 5px 5px 5px;
                 margin: 5px 0;
             }