chore: switch back to hyprlock since i can't let it go

README.md

@@ -55,8 +55,9 @@
 - [wallpapers](wallpapers/): wallpaper collection
 
 ### Components
+
 |                             |          NixOS + Hyprland          |
-| --------------------------- | :---------------------------------------------------------------------------------------------:
+| --------------------------- | :--------------------------------: |
 | **Compositor**              |        [hyprland][hyprland]        |
 | **Bar**                     |          [waybar][waybar]          |
 | **Application launcher**    |          [bemenu][bemenu]          |
@@ -65,16 +66,15 @@
 | **Shell**                   |             [zsh][zsh]             |
 | **Text editor**             |          [neovim][neovim]          |
 | **Network management tool** |  [networkmanager][networkmanager]  |
-| **File manager**            | [thunar][thunar]
+| **File manager**            |          [thunar][thunar]          |
 | **Fonts**                   |      [nerd fonts][nerd fonts]      |
-| **Lockscreen**              | [swaylock][swaylock] |
+| **Lockscreen**              |        [hyprlock][hyprlock]        |
 | **Image viewer**            |       [nsxiv][nsxiv] + [imv]       |
 | **Media player**            |             [mpv][mpv]             |
 | **Screenshot software**     |       [grimblast][grimblast]       |
 | **Clipboard**               | [wl-clip-persist][wl-clip-persist] |
 | **Color picker**            |      [hyprpicker][hyprpicker]      |
 
-
 ### Shell aliases
 
 <details>
@@ -84,17 +84,17 @@ NixOS (expand)
 
 > TODO: ${host} is either `desktop` or `laptop`
 
-- ```cdnix```            $\rightarrow$ ```cd ~/nixos-config && codium ~/nixos-config```
+- `cdnix` $\rightarrow$ `cd ~/nixos-config && codium ~/nixos-config`
-- ```ns```               $\rightarrow$ ```nix-shell --run zsh```
+- `ns` $\rightarrow$ `nix-shell --run zsh`
-- ```nix-switch```       $\rightarrow$ ```sudo nixos-rebuild switch --flake ~/nixos-config#${host}```
+- `nix-switch` $\rightarrow$ `sudo nixos-rebuild switch --flake ~/nixos-config#${host}`
-- ```nix-switchu```      $\rightarrow$ ```sudo nixos-rebuild switch --upgrade --flake ~/nixos-config#${host}```
+- `nix-switchu` $\rightarrow$ `sudo nixos-rebuild switch --upgrade --flake ~/nixos-config#${host}`
-- ```nix-flake-update``` $\rightarrow$ ```sudo nix flake update ~/nixos-config#```
+- `nix-flake-update` $\rightarrow$ `sudo nix flake update ~/nixos-config#`
-- ```nix-clean```        $\rightarrow$ ```sudo nix-collect-garbage && sudo nix-collect-garbage -d && sudo rm /nix/var/nix/gcroots/auto/* && nix-collect-garbage && nix-collect-garbage -d```
+- `nix-clean` $\rightarrow$ `sudo nix-collect-garbage && sudo nix-collect-garbage -d && sudo rm /nix/var/nix/gcroots/auto/* && nix-collect-garbage && nix-collect-garbage -d`
 </details>
 
 ### Scripts
 
-All the scripts are in ```modules/home/scripts/scripts/``` and are exported as packages in ```modules/home/scripts/default.nix```
+All the scripts are in `modules/home/scripts/scripts/` and are exported as packages in `modules/home/scripts/default.nix`
 
 <details>
 <summary>
@@ -103,7 +103,8 @@ toggle_blur.sh
 
 **Description:** This script toggles the Hyprland blur effect. If the blur is currently enabled, it will be disabled, and if it's disabled, it will be turned on.
 
-**Usage:** ```toggle_blur```
+**Usage:** `toggle_blur`
+
 </details>
 
 <details>
@@ -113,7 +114,8 @@ toggle_oppacity.sh
 
 **Description:** This script toggles the Hyperland oppacity effect. If the oppacity is currently set to 0.90, it will be set to 1, and if it's set to 1, it will be set to 0.90.
 
-**Usage:** ```toggle_oppacity```
+**Usage:** `toggle_oppacity`
+
 </details>
 
 <details>
@@ -123,7 +125,8 @@ runbg.sh
 
 **Description:** This script runs a provided command along with its arguments and detaches it from the terminal. Handy for launching apps from the command line without blocking it.
 
-**Usage:** ```runbg <command> <arg1> <arg2> <...>```
+**Usage:** `runbg <command> <arg1> <arg2> <...>`
+
 </details>
 
 # Installation
@@ -131,15 +134,15 @@ runbg.sh
 > This is unchanged of Frost-Phoenix's dots, needs to be remade but don't feel like spending that time currently.
 
 > **⚠️ Use this configuration at your own risk! ⚠️** <br>
-> Applying custom configurations, especially those related to your operating system, can have unexpected consequences and may interfere with your system's normal behavior. While I have tested these configurations on my own setup, there is no guarantee that they will work flawlessly on all systems. <br>
+> Applying custom configurations, especially those related to your operating system, can have unexpected consequences and may interfere with your system's normal behavior. While I have tested these configurations on my own setup, there is no guarantee that they will work flawlessly on all systems. <br> > **I am not responsible for any issues that may arise from using this configuration.**
-> **I am not responsible for any issues that may arise from using this configuration.**
 
 > It is highly recommended to review the configuration contents and make necessary modifications to customize it to your needs before attempting the installation.
 
 1. **Install NixOS**
 
    First install nixos using any [graphical ISO image](https://nixos.org/download.html#nixos-iso).
-   > Only been tested using the Gnome graphical installer and choosing the ```No desktop``` option durring instalation.
+
+   > Only been tested using the Gnome graphical installer and choosing the `No desktop` option durring instalation.
 
 2. **Clone the repo**
 
@@ -148,15 +151,19 @@ runbg.sh
    git clone https://github.com/Frost-Phoenix/nixos-config
    cd nixos-config
    ```
+
 3. **Install script**
 
    > First make sure to read the install script, it isn't long
 
    Execute and follow the installation script :
+
    ```
    ./install.sh
    ```
+
    > You will need to change the git account yourself in ./modules/home/git.nix
+
    ```
       programs.git = {
          ...
@@ -165,11 +172,13 @@ runbg.sh
          ...
       };
    ```
+
 4. **Reboot**
 
 5. **Manual config**
 
    Even though I use home manager, there is still a little bit of manual configuration to do:
+
    - Set Aseprite theme (they are in the folder `./nixos-config/modules/home/aseprite/themes`).
    - Enable Discord theme (in Discord settings under VENCORD > Themes).
    - Configure the browser (for now, all browser configuration is done manually).
@@ -184,22 +193,23 @@ A brief walkthrough of what the install script does.
 
 2. **Set username**
 
-   The script will replace all occurancies of the default usename ```CURRENT_USERNAME``` by the given one stored in ```$username```
+   The script will replace all occurancies of the default usename `CURRENT_USERNAME` by the given one stored in `$username`
 
 3. Create basic directories
 
    The following directories will be created:
-   - ```~/Music```
+
-   - ```~/Documents```
+   - `~/Music`
-   - ```~/Pictures/wallpapers/others```
+   - `~/Documents`
+   - `~/Pictures/wallpapers/others`
 
 4. Copy the wallpapers
 
-   Then the wallpapers will be copied into ```~/Pictures/wallpapers/others``` which is the folder in which the ```wallpaper-picker.sh``` script will be looking for them.
+   Then the wallpapers will be copied into `~/Pictures/wallpapers/others` which is the folder in which the `wallpaper-picker.sh` script will be looking for them.
 
 5. Get the hardware configuration
 
-   It will also automatically copy the hardware configuration from ```/etc/nixos/hardware-configuration.nix``` to ```./hosts/nixos/hardware-configuration.nix``` so that the hardware configuration used is yours and not the default one.
+   It will also automatically copy the hardware configuration from `/etc/nixos/hardware-configuration.nix` to `./hosts/nixos/hardware-configuration.nix` so that the hardware configuration used is yours and not the default one.
 
 6. Choose a host (desktop / laptop)
 
@@ -219,14 +229,15 @@ Other dotfiles that I learned / copy from:
 - [mrusme/dotfiles](https://github.com/mrusme/dotfiles)
 
 <!-- Links -->
+
 [hyprland]: https://github.com/hyprwm/Hyprland
 [kitty]: https://github.com/kovidgoyal/kitty
 [waybar]: https://github.com/Alexays/Waybar
 [bemenu]: https://github.com/Cloudef/bemenu
 [zsh]: https://ohmyz.sh/
-[swaylock]: https://github.com/swaywm/swaylock
+[hyprlock]: https://github.com/hyprwm/hyprlock
 [mpv]: https://github.com/mpv-player/mpv
-[VSCodium]:https://vscodium.com/
+[VSCodium]: https://vscodium.com/
 [neovim]: https://github.com/neovim/neovim
 [grimblast]: https://github.com/hyprwm/contrib
 [htop]: https://github.com/htop-dev/htop

modules/home/default.nix

@@ -1,16 +1,17 @@
-{ ... }: {
+{ ... }:
+{
   imports =
-       [(import ./git.nix)]
+    [ (import ./git.nix) ]
-    ++ [(import ./swaync/default.nix)]
+    ++ [ (import ./swaync/default.nix) ]
-    ++ [(import ./fonts.nix)]
+    ++ [ (import ./fonts.nix) ]
-    ++ [(import ./hyprland)]
+    ++ [ (import ./hyprland) ]
-    ++ [(import ./kitty.nix)]
+    ++ [ (import ./hyprlock) ]
-    ++ [(import ./nvim.nix)]
+    ++ [ (import ./kitty.nix) ]
-    ++ [(import ./zathura.nix)]
+    ++ [ (import ./nvim.nix) ]
-    ++ [(import ./packages.nix)]
+    ++ [ (import ./zathura.nix) ]
-    ++ [(import ./scripts/scripts.nix)]
+    ++ [ (import ./packages.nix) ]
-    ++ [(import ./swaylock.nix)]
+    ++ [ (import ./scripts/scripts.nix) ]
-    ++ [(import ./waybar)]
+    ++ [ (import ./waybar) ]
-    ++ [(import ./zsh.nix)]
+    ++ [ (import ./zsh.nix) ]
-    ++ [(import ./tmux.nix)];
+    ++ [ (import ./tmux.nix) ];
 }

modules/home/hyprland/config.nix

@@ -216,7 +216,7 @@
         "$mainMod, F, fullscreen, 0" # set 1 to 0 to set full screen without waybar
         "$mainMod, Space, togglefloating,"
         "$mainMod, D, exec, bemenu-run -l 5 --ignorecase"
-        "SUPER SHIFT, L, exec, swaylock"
+        "SUPER SHIFT, L, exec, hyprlock"
         "$mainMod, E, exec, thunar"
         "$mainMod SHIFT, B, exec, pkill -SIGUSR1 .waybar-wrapped"
         "$mainMod, C ,exec, hyprpicker -a"