Merge branch 'master' of ssh://git.nx2.site:20022/nx2/dotfiles

home-modules/gpg.nix

@@ -9,7 +9,10 @@
   ]);
 
   # services.pcscd.enable = true;
-  services.gpg-agent = {
+  services.gpg-agent =
+  let 
+    min2sec = min: (min * 60); 
+  in {
     enable = true;
     verbose = true;
     sshKeys = [
@@ -17,6 +20,8 @@
     ];
     enableSshSupport = true;
     enableFishIntegration = true;
+    defaultCacheTtlSsh = min2sec 60;
+    defaultCacheTtl = min2sec 30;
     # pinentryPackage = pkgs.pinentry-gtk2;
   };
 

home-modules/hyprland.nix

@@ -42,7 +42,7 @@ let
         name = "HDMI-A-1";
         resolution = "3840x2160";
         position = "0x0";
-        scale = "1.0";
+        scale = "2.0";
       };
     };
   };

home-modules/waybar.nix

@@ -4,9 +4,9 @@ let
 in
 lib.mkIf (user != "tv")
 {
-  home.packages = with pkgs; [
-    (pkgs.writeShellScriptBin "waybar_mode" ''
-      #!/usr/bin/env bash
+  home.packages = 
+  let
+    waybar_mode_script = /*bash*/ ''
       print_help() {
           echo "Usage: waybar_mode {set <string>|unset}"
       }
@@ -36,18 +36,19 @@ lib.mkIf (user != "tv")
               ;;
       esac
       exit 0
-    '')
-    (pkgs.writeShellScriptBin "cclock" ''
-      #!/bin/bash
-      #ord=$(date +"%e" | awk '{printf("%d%s\n", $1, substr("thstndrd", ($1%100-20)%10*2+1, 2))}')
+    '';  
+    cclock_script = /*bash*/ ''
       ord=$(date +"%e" | awk '{printf("%d%s\n", $1, ($1==11||$1==12||$1==13)?"th":((($1%10)==1)?"st":((($1%10)==2)?"nd":((($1%10)==3)?"rd":"th"))))}')
       if [ $# -eq 0 ]; then
         echo "󰃮${sep}$(date +'%A the')" "$ord" "of" "$(date +'%B')" " ${sep}$(date +'%R')"
       elif [ "$1" = "--no-icons" ]; then
         echo "$(date +'%A the')" "$ord" "of" "$(date +'%B')"  "$(date +'%R')"
       fi
-    '')
-
+    '';
+  in 
+  with pkgs; [
+    (writeShellApplication "waybar_mode" waybar_mode_script) 
+    (writeShellApplication "cclock" cclock_script)
   ] ++ [ pkgs-unstable.waybar ];
 
   programs.waybar = {