configuration.nix

@@ -44,13 +44,6 @@
     NIXOS_CONFIG_PATH = "/etc/nixos";
   };
 
-  fonts = {
-    fontconfig.enable = true;
-    packages = with pkgs; [
-      nerd-fonts.jetbrains-mono
-    ];
-  };
-
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [

home/default.nix

@@ -42,6 +42,9 @@ in
       enable = true;
       settings = (with builtins; fromTOML (readFile ./starship.toml)) // { };
     };
+
+    # Lock desktop
+    swaylock.enable = true;
   };
 
   services = {

home/hyprland/default.nix

@@ -5,8 +5,6 @@
   imports = [
     ./hyprcursor
     ./waybar
-    ./hypridle
-    ./hyprlock
   ];
 
   home.file.".config/hypr/hyprland.conf".source = ./hyprland.conf;

home/hyprland/hypridle/default.nix

@@ -1,26 +0,0 @@
-{ ... }:
-
-{
-  services.hypridle = {
-    enable = true;
-    settings = {
-      general = {
-        after_sleep_cmd = "hyprctl dispatch dpms on";
-        ignore_dbus_inhibit = false;
-        lock_cmd = "hyprlock";
-      };
-
-      listener = [
-        {
-          timeout = 900; # Seconds
-          on-timeout = "hyprlock";
-        }
-        {
-          timeout = 5;
-          on-timeout = "hyprctl dispatch dpms off";
-          on-resume = "hyprctl dispatch dpms on";
-        }
-      ];
-    };
-  };
-}

home/hyprland/hyprland.conf

@@ -301,7 +301,7 @@ bind = $mainMod, R, exec, $menu
 bind = $mainMod, P, pseudo, # dwindle
 bind = $mainMod, J, togglesplit, # dwindle
 bind = $mainMod, B, exec, $browser
-bind = $mainMod, L, exec, hyprlock
+bind = $mainMod, L, exec, swaylock & disown
 
 # Move focus with mainMod + arrow keys
 bind = $mainMod, left, movefocus, l

home/hyprland/hyprlock/default.nix

@@ -1,95 +0,0 @@
-{ lib, ... }:
-
-{
-  home.file.".face.png".source = ./face.png;
-  # TODO style face and wallpaper
-  programs.hyprlock = {
-    enable = true;
-    settings = {
-      "$base" = "rgb(1e1e2e)";
-      "$text" = "rgb(cdd6f4)";
-      "$textAlpha" = "cdd6f4";
-      "$mauve" = "rgb(cba6f7)";
-      "$mauveAlpha" = "cba6f7";
-      "$red" = "rgb(f38ba8)";
-      "$yellow" = "rgb(f9e2af)";
-      "$accent" = "$mauve";
-      "$accentAlpha" = "$mauveAlpha";
-      "$surface0" = "rgb(313244)";
-      "$font" = "JetBrainsMono Nerd Font";
-
-      # GENERAL
-      general = {
-        disable_loading_bar = true;
-        hide_cursor = true;
-      };
-
-      # LAYOUT
-      label = [
-        {
-          text = "$LAYOUT";
-          color = "$text";
-          font_size = 25;
-          font_family = "$font";
-          position = "30, -30";
-          halign = "left";
-          valign = "top";
-        }
-
-        # TIME
-        {
-          text = "$TIME";
-          color = "$text";
-          font_size = 90;
-          font_family = "$font";
-          position = "-30, 0";
-          halign = "right";
-          valign = "top";
-        }
-
-        # DATE
-        {
-          text = "cmd[update:43200000] date +\"%A, %d %B %Y\"";
-          color = "$text";
-          font_size = 25;
-          font_family = "$font";
-          position = "-30, -150";
-          halign = "right";
-          valign = "top";
-        }
-      ];
-
-      # USER AVATAR
-      image = {
-        path = "~/.face.png";
-        size = 100;
-        border_color = "$accent";
-        position = "0, 75";
-        halign = "center";
-        valign = "center";
-      };
-
-      # INPUT FIELD
-      input-field = {
-        size = "300, 60";
-        outline_thickness = 4;
-        dots_size = 0.2;
-        dots_spacing = 0.2;
-        dots_center = true;
-        outer_color = lib.mkDefault "$accent";
-        inner_color = lib.mkDefault "$surface0";
-        font_color = lib.mkDefault "$text";
-        fade_on_empty = false;
-        placeholder_text = "<span foreground=\"##$textAlpha\"><i>󰌾 Logged in as </i><span foreground=\"##$accentAlpha\">$USER</span></span>";
-        hide_input = false;
-        check_color = lib.mkDefault "$accent";
-        fail_color = lib.mkDefault "$red";
-        fail_text = "<i>$FAIL <b>($ATTEMPTS)</b></i>";
-        capslock_color = lib.mkDefault "$yellow";
-        position = "0, -47";
-        halign = "center";
-        valign = "center";
-      };
-    };
-  };
-}

home/hyprland/waybar/config/config.jsonc

@@ -96,7 +96,7 @@
   },
   "custom/lock": {
     "tooltip": false,
-    "on-click": "sh -c '(sleep 0.5s; hyprlock)'",
+    "on-click": "sh -c '(sleep 0.5s; swaylock)' & disown",
     "format": ""
   },
   "custom/power": {

home/hyprland/waybar/default.nix

@@ -1,8 +1,8 @@
-{ ... }:
+{...}:
 
 {
-  home.file.".config/waybar" = {
+    home.file.".config/waybar" = {
-    source = ./config;
+        source = ./config;
-    recursive = true;
+        recursive = true;
-  };
+    };
 }

home/wlogout/default.nix

@@ -16,7 +16,7 @@
     layout = [
       {
         label = "lock";
-        action = "sh -c '(sleep 0.5s; hyprlock)'";
+        action = "sh -c '(sleep 0.5s; swaylock)' & disown";
         text = "Lock";
         keybind = "l";
       }

hyprland/default.nix

@@ -13,13 +13,8 @@
     hyprpolkitagent # Auth deamon providing modals for password auth
   ];
 
-  programs = {
+  programs.hyprland = {
-    hyprland = {
+    enable = true;
-      enable = true;
+    xwayland.enable = true;
-      xwayland.enable = true;
-    };
-    hyprlock.enable = true; # Lock screen
   };
-
-  services.hypridle.enable = true; # Lock when unused
 }