some more needed changes!

README.md

@@ -22,7 +22,7 @@ Don't forget to add the `#<host>` to the end of the target to specify the host c
 
 ## Usage
 ### Deploying to a machine
-Run 
+Run
 ```bash
 nixos-rebuild switch --flake <target>#<machine>
 # for instance
@@ -30,6 +30,7 @@ nixos-rebuild switch --flake .#spectre
 ```
 to apply the configuration.
 
+
 ### Installer iso
 To build an installer iso, run
 ```bash
@@ -38,6 +39,12 @@ nix build .#nixosConfigurations.bcachefs-iso.config.system.build.isoImage
 This will create an iso image in the result directory.
 
 
+## Installation
+TODO - disable root user
+```
+ I install with --no-root-passwd and set users.mutableUsers = false in configuration.nix
+```
+
 
 ## Inspirations
 - https://github.com/the-nix-way/dev-templates

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

@@ -78,16 +78,22 @@
         "$mod, right, resizeactive, 2% 0"
 
       ];
-      # bindl = [
-      #   ", switch:on:Lid Switch, exec, hyprctl dispatch dpms off"
-      #   ", switch:off:Lid Switch, exec, hyprctl dispatch dpms on"
-      # ];
 
-      bindr = [
-          # Overview
-        "$mod, , overview:toggle"
+      # lock-screen bindings
+      bindl = [
+        # on lid close, lock the screen
+        # if another monitor is connected, only turn the internal monitor off and don't lock the screen
+        ", switch:on:Lid Switch, exec, hyprctl dispatch dpms off eDP-1"
+        # if there is no active monitor, perform a screen lock
+        ", switch:on:Lid Switch, exec, hyprctl monitors | grep 'dpmsStatus: 1' || hyprlock"
+        ", switch:off:Lid Switch, exec, hyprctl dispatch dpms on eDP-1"
       ];
 
+      # bindr = [
+      #     # Overview
+      #   "$mod, , overview:toggle"
+      # ];
+
       bindm = [
         # move the window
         "$mod, mouse:272, movewindow"
@@ -183,14 +189,12 @@
         "ELECTRON_OZONE_PLATFORM_HINT, wayland"
         # set the scale factor for GDK apps
         "GDK_SCALE, 1.5"
-        "XCURSOR_SIZE, 32"
         # set the scale factor for QT apps
         "QT_SCALE_FACTOR, 1.5"
         # set the scale factor for GTK apps
       ];
     };
 
-    # TODO - plugins are broken for now
     plugins = [
       # Global overview
       pkgs.hyprlandPlugins.hyprspace
@@ -198,13 +202,6 @@
       pkgs.hyprlandPlugins.hyprgrass
     ];
 
-    # plugin = {
-    #   touch_gestures = {
-    #     sensitivity = 4.0;
-    #     # must be >= 3
-    #     workspace_swipe_fingers = 3;
-    #   };
-    # };
   };
 
   services.swaync.enable = true;

modules/home-manager/hypr/hyprlock.nix

@@ -37,7 +37,7 @@
         # Time
         {
           monitor = "";
-          text = ''cmd[update:1000] echo "<span>$(date +"%I:%M")</span>"'';
+          text = ''cmd[update:1000] echo "<span>$(date +"%H:%M")</span>"'';
           font_size = 160;
           font_weight = "bold";
           # font_family = "steelfish outline regular";

modules/home-manager/kitty.nix

@@ -1,16 +1,24 @@
-{pkgs, ...}:
+{pkgs, lib, ...}:
 {
     programs.kitty = {
         enable = true;
         shellIntegration.enableFishIntegration = true;
         settings = {
-            # background_opacity = 0.8;
+            # # import the colors from the stylix theme, but keep the background black
+            # color0 = stylix.colors.background;
+            # color1 = stylix.colors.red;
+            # color2 = stylix.colors.green;
+            # color3 = stylix.colors.yellow;
+
+            background = "#000000";
             confirm_os_window_close = 0;
             enable_audio_bell = false;
             cursor_trail = 3;
             cursor_trail_decay = "0.1 0.4";
             url_style = "curly";
+            notify_on_cmd_finish = "unfocused";
         };
+
         keybindings = {
             # copy and paste
             "ctrl+shift+c" = "copy_to_clipboard";

modules/home-manager/stylix.nix

@@ -12,14 +12,12 @@
             size = 32;
         };
 
-        # TODO
-        # fonts = {};
-
         iconTheme = {
             enable = true;
             package = pkgs.tela-icon-theme;
         };
 
+
         image = ./../../wallpapers/magicpattern-87PP9Zd7MNo-unsplash.jpg;
 
 
@@ -46,10 +44,10 @@
             };
 
             sizes = {
-                applications = 15;
-                desktop = 12;
+                applications = 14;
+                desktop = 14;
                 popups = 12;
-                terminal = 15;
+                terminal = 14;
             };
         };
 
@@ -61,13 +59,37 @@
         };
     };
 
+    stylix.base16Scheme = {
+        scheme = "onelight";
+        author = "https://github.com/one-dark";
+        base00 = "#fafafa";
+        base01 = "#f4f4f4";
+        base02 = "#e5e5e6";
+        base03 = "#dfdfe0";
+        base04 = "#d7d7d8";
+        base05 = "#383a42";
+        base06 = "#202227";
+        base07 = "#090a0b";
+        base08 = "#d84a3d";
+        base09 = "#a626a4";
+        base0A = "#c18401";
+        base0B = "#50a14f";
+        base0C = "#0070a8";
+        base0D = "#4078f2";
+        base0E = "#a626a4";
+        base0F = "#986801";
+
+    };
+
     stylix.targets = {
         vscode.enable = true;
         hyprpaper.enable = true;
         hyprlock.enable = true;
-        waybar.enable = true;
         wofi.enable = true;
-        kitty.enable = true;
+
+        # disabled because they overwrite too many settings
+        # waybar.enable = true;
+        # kitty.enable = true;
 
     };
 }

modules/home-manager/wofi.nix

@@ -4,7 +4,6 @@ let
   background = "#000000";
   background-alt = "#000000";
   foreground = "##ffffff";
-  font = "Roboto";
   rounding = 5;
   font-size = 25;
 in {
@@ -42,9 +41,7 @@ in {
       key_exit = "Escape";
     };
 
-    style = lib.mkForce
-      # css
-      ''
+    style = ''
         * {
           font-family: "${font}";
           font-weight: 500;
@@ -105,4 +102,4 @@ in {
         }
       '';
   };
-}
+}