introducting rive in flake, extending git

flake.nix

@@ -29,6 +29,24 @@
       ];
     };
     secrets = import ./secrets/passwords-and-certificates.nix;
+    rice = {
+      transparency = "0.8";
+      colors = {
+        main-fg = "#ffffff";
+        main-bg = "#000000";
+        bubble-fg = "#ffffff";
+        bubble-bg = "#222222";
+        bubble-border = "#bbbbbb";
+        secondary-fg = "#ffffff";
+        secondary-bg = "#222255";
+        lines = "#bbbbbb";
+        accent = "#ff00ff"
+      };
+      font = {
+        code = "CascadiaCove-NF";
+        base = "Atkinson Hyperlegible";
+      };
+    };
   in 
   {
     nixosConfigurations = {
@@ -37,7 +55,7 @@
         modules = [
           ./configuration.nix 
         ];
-        specialArgs = {inherit user allowed secrets;};
+        specialArgs = {inherit user allowed secrets rice;};
       };
     };
 
@@ -45,7 +63,7 @@
       nx2 = home-manager.lib.homeManagerConfiguration {
         inherit pkgs;
         modules = [ ./home.nix ];
-        extraSpecialArgs = {inherit system user allowed secrets pkgs-unstable;};
+        extraSpecialArgs = {inherit system user allowed secrets pkgs-unstable rice;};
       };
     };
 

home-modules/git.nix

@@ -1,9 +1,31 @@
 { config, pkgs, lib, system, user, allowed, secrets, ... }: 
 
 {
+  home.packages = with pkgs; [
+    git
+    delta
+
+    # only works on spec arch, chage url for others
+    (stdenv.mkDerivation {
+      name = "easycommit";
+      src = pkgs.fetchurl {
+        url = "https://github.com/blackironj/easycommit/releases/download/v0.0.1/easycommit-v0.0.1-linux-amd64.tar.gz";
+        sha256 = "sha256-Ip5wfVe/RzCxGGh1YFBllAn84nD7mUXbnMko+ue/C2E=";
+      };
+      phases = ["installPhase"];
+      installPhase = ''
+        mkdir -p $out/bin
+        tar xf $src -C $out/
+        ls -la $out
+        mv $out/easycommit $out/bin/
+        chmod +x $out/bin/easycommit
+      '';
+    })
+  ];
+
   programs.git = {
     enable = true;
-    userName = "nx2";
+    userName = ''Lennart J. Kurzweg (Nx2)'';
     userEmail = "nx2@nx2.site";
     delta = {
       enable = true;

home-modules/hyprland/hyprland.nix

@@ -1,6 +1,6 @@
-{ config, pkgs, lib, ... }: 
+{ config, pkgs, pkgs-unstable, rice, lib, ... }:
 let
-  animation-speed = "4";
+  animation-speed = "2";
   transparency = "0.9";
   gap-size = 10;
   monitors = {
@@ -19,10 +19,14 @@ let
   };
 in
 {
-  home.packages = with pkgs; [
+  home.packages = [
     # hyprland itself is a system package
-    hyprland-protocols
+    pkgs.hyprland-protocols
-    (writeShellScriptBin "waybar_mode" ''
+
+    pkgs-unstable.hyprlock
+    pkgs-unstable.hypridle
+
+    (pkgs.writeShellScriptBin "waybar_mode" ''
       #!/bin/bash
 
       # Function to print help message
@@ -161,7 +165,9 @@ workspace = [
 
       animations = {
         enabled = true;
-          bezier = "myBezier, 0.01, 0.9, 0.1, 1.0";
+        # bezier = "myBezier, 0.01, 0.9, 0.1, 1.0"; #o
+        # bezier = "myBezier, 0.83, 0, 0.17, 1"; # io
+        bezier = "myBezier, 0.33, 1, 0.68, 1";
         animation = [
           "windows, 1, ${animation-speed}, myBezier, slide"
           "border, 1, ${animation-speed}, myBezier"
@@ -216,29 +222,31 @@ workspace = [
       ];
 
       windowrulev2 = [
-        "opacity $trans,class:^(com.chatterino.chatterino)$"
+        "opacity ${transparency},class:^(com.chatterino.chatterino)$"
-        "opacity $trans,class:^(chatterino)$"
+        "opacity ${transparency},class:^(chatterino)$"
         "bordercolor rgba(ff00ffff) rgba(ff00ff66), pinned:1"
       ];
 
       windowrule = [
-        "opacity $trans, code-oss"
+        "opacity ${transparency}, firefox"
-        "opacity $trans, VSCodium"
+        "opacity ${transparency}, code-oss"
-        "opacity $trans, Code"
+        "opacity ${transparency}, VSCodium"
-        "opacity $trans, neovide"
+        "opacity ${transparency}, Code"
-        "opacity $trans, obsidian"
+        "opacity ${transparency}, neovide"
-        "opacity $trans, zathura"
+        "opacity ${transparency}, obsidian"
+        "opacity ${transparency}, zathura"
         "bordercolor rgba(ffffffff) rgba(000000b2), Alacritty"
         "bordercolor rgba(ffffffff) rgba(000000b2), Kitty"
-        "opacity $trans, discord"
+        "opacity ${transparency}, discord"
-        "opacity $trans, vesktop"
+        "opacity ${transparency}, vesktop"
-        "opacity $trans, Element"
+        "opacity ${transparency}, Element"
-        "opacity $trans, thunderbird"
+        "opacity ${transparency}, thunderbird"
-        "opacity $trans, lutris"
+        "opacity ${transparency}, lutris"
-        "opacity $trans, element"
+        "opacity ${transparency}, element"
-        "opacity $trans, ^([sS]potify)$"
+        "opacity ${transparency}, ^([sS]potify)$"
-        "opacity $trans, virt-manager"
+        "opacity ${transparency}, virt-manager"
-        "opacity $trans, thunar"
+        "opacity ${transparency}, thunar"
+        "opacity ${transparency}, title:^(wlogout)$"
         "opaque, title:^(GNU Image Manipulation Program)$"
         "dimaround, Rofi"
         "float, title:^(Picture-in-Picture)$"
@@ -727,6 +735,80 @@ workspace = [
       submap = reset
     '';
   };
+
+  home.file = {
+    ".config/hypr/hyprlock.conf".text = ''
+
+      background {
+          monitor = ${monitors.main.name}
+
+          # all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations
+          path = /home/nx2/Pictures/nix-wall.png
+          blur_size = 4
+          blur_passes = 3 # 0 disables blurring
+          noise = 0.0117
+          contrast = 1.3000 # Vibrant!!!
+          brightness = 0.8000
+          vibrancy = 0.2100
+          vibrancy_darkness = 0.0
+      }
+
+      input-field {
+          monitor =
+          size = 250, 50
+          outline_thickness = 1
+          dots_size = 0.2 # Scale of input-field height, 0.2 - 0.8
+          dots_spacing = 0.64 # Scale of dots' absolute size, 0.0 - 1.0
+          dots_center = true
+          outer_color = rgba(aaaaaaff)
+          inner_color = rgba(000000ff)
+          font_color = rgba(ffffffff)
+          fade_on_empty = true
+          placeholder_text = <i>Password...</i> # Text rendered in the input box when it's empty.
+          hide_input = false
+          position = 0, 50
+          halign = center
+          valign = bottom
+      }
+
+      # Current time
+      label {
+          monitor =
+          text = cmd[update:1000] echo "<b><big> $(date +"%H:%M:%S") </big></b>"
+          color = $color0
+          font_size = 64
+          font_family = ${font.code} 10
+          position = 0, 16
+          halign = center
+          valign = center
+      }
+
+      # User label
+      label {
+          monitor =
+          text = Hey <span text_transform="capitalize" size="larger">$USER</span>
+          color = $color0
+          font_size = 20
+          font_family = ${font.code} 10
+          position = 0, 0
+          halign = center
+          valign = center
+      }
+
+
+      # Type to unlock
+      label {
+          monitor =
+          text = Type to unlock!
+          color = $color0
+          font_size = 16
+          font_family = ${font.code} 10
+          position = 0, 30
+          halign = center
+          valign = bottom
+      }
+    '';
+  };
 }
 
 

home.nix

@@ -51,7 +51,7 @@
     
     imv mpv mediainfo exiftool ffmpeg
     pavucontrol fontpreview gtk2fontsel
-    lynx bat du-dust eza neofetch tldr fzf figlet delta ripgrep lolcat jq glow
+    lynx bat du-dust eza neofetch tldr fzf figlet ripgrep lolcat jq glow
     brightnessctl wev 
     element sssnake pipes
 
@@ -64,42 +64,13 @@
       python-pkgs.pipdeptree
       python-pkgs.requests
     ]))
-    (writeShellScriptBin "nxrbs-nix" ''
+    # (writeShellScriptBin "nxrbs-nix" ''
-      set -e
+    #   set -e
-      pushd ~/.nix-dots/
+    #   pushd ~/.nix-dots/
-      git diff
+    #   git diff
-    '')
+    # '')
-    # only works on spec arch, chage url for others
-    (stdenv.mkDerivation {
-      name = "easycommit";
-      src = pkgs.fetchurl {
-        url = "https://github.com/blackironj/easycommit/releases/download/v0.0.1/easycommit-v0.0.1-linux-amd64.tar.gz";
-        sha256 = "sha256-Ip5wfVe/RzCxGGh1YFBllAn84nD7mUXbnMko+ue/C2E=";
-      };
-      phases = ["installPhase"];
-      installPhase = ''
-        mkdir -p $out/bin
-        tar xf $src -C $out/
-        ls -la $out
-        mv $out/easycommit $out/bin/
-        chmod +x $out/bin/easycommit
-      '';
-    })
-  ];
 
-  home.file = {
+  ];
-  };
-  # Home Manager can also manage your environment variables through
-  # 'home.sessionVariables'. If you don't want to manage your shell through Home
-  # Manager then you have to manually source 'hm-session-vars.sh' located at
-  # either
-  #
-  #  ~/.nix-profile/etc/profile.d/hm-session-vars.sh
-  #
-  # or
-  #
-  #  /etc/profiles/per-user/nx2/etc/profile.d/hm-session-vars.sh
-  #
 
   xdg = {
     enable = true;