From 1645cf034aaecf3938cd9adeb2de58d2380780c1 Mon Sep 17 00:00:00 2001
From: "Lennart J. Kurzweg (Nx2)" <git@nx2.site>
Date: Wed, 15 May 2024 15:48:20 +0200
Subject: [PATCH] color + chatterini oauthtempfix

---
 flake.lock                             |  14 +++++++-------
 flake.nix                              |  16 ++++++++--------
 home-modules/fish.nix                  |   6 ++++++
 home-modules/helix.nix                 |  15 +++++++++++----
 home-modules/hyprland.nix              |  14 +++++++-------
 secrets/passwords-and-certificates.nix | Bin 2375 -> 2375 bytes
 6 files changed, 39 insertions(+), 26 deletions(-)

diff --git a/flake.lock b/flake.lock
index 1ebdfc9..e805c96 100755
--- a/flake.lock
+++ b/flake.lock
@@ -170,11 +170,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1715701512,
-        "narHash": "sha256-WDu35MgBgfaBM7OFnA9YotU9iJEYQrWKdljAJ3I5Gd0=",
+        "lastModified": 1715724815,
+        "narHash": "sha256-I1ioStn+IZEURbjvsB+ZHuABldyqNefwi2utovefn+I=",
         "ref": "refs/heads/main",
-        "rev": "4cdddcfe466cb21db81af0ac39e51cc15f574da9",
-        "revCount": 4686,
+        "rev": "94c20a186372aace78b188842848b873eb3ebbd7",
+        "revCount": 4693,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland"
@@ -197,11 +197,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1715609979,
-        "narHash": "sha256-3v/P6UyVhQxrQfIv2/0fCO0moCyWv+4QKp6EfD+TPww=",
+        "lastModified": 1715722806,
+        "narHash": "sha256-KrSLG2H3KGELxTFdiBhv8U6D53Q3UsJsQO+KgEabsNA=",
         "owner": "hyprwm",
         "repo": "hyprland-plugins",
-        "rev": "c2c70332a173c93b568ba41a5bb17c66db58d95e",
+        "rev": "c28d1011f4868c1a1ee80b10d9ee79900686df82",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index e12c275..06f011f 100755
--- a/flake.nix
+++ b/flake.nix
@@ -89,14 +89,14 @@
             bright = (0.5);  
             alter = let f = rice.lib.alter-luminace-hex; in color-name: color-value: { base = color-value; dark = f color-value dark; bright = f color-value bright; };
             ccolor = builtins.mapAttrs alter {
-              black =   "#001100"; # "#111111";
-              white =   "#66dd66"; # "#dddddd";
-              blue =    "#003300"; # "#1111dd";
-              cyan =    "#00dd55"; # "#11dddd";
-              green =   "#11dd11"; # "#11dd11";
-              magenta = "#005500"; # "#dd11dd";
-              red =     "#00aa00"; # "#dd1111";
-              yellow =  "#ffff00"; # "#dddd11";
+              black =   "#110022"; # "#111111" "#001100";
+              white =   "#dddddd"; # "#dddddd" "#66dd66";
+              blue =    "#6611dd"; # "#3333dd" "#003300";
+              cyan =    "#11dddd"; # "#11dddd" "#00dd55";
+              green =   "#00ddaa"; # "#11dd11" "#11dd11";
+              magenta = "#dd00dd"; # "#dd11dd" "#005500";
+              red =     "#dd1166"; # "#dd1111" "#00aa00";
+              yellow =  "#dd6611"; # "#dddd11" "#ffff00";
             };
             xcolor = with ccolor; {
               background = black.dark;
diff --git a/home-modules/fish.nix b/home-modules/fish.nix
index fe7d29f..18a4271 100755
--- a/home-modules/fish.nix
+++ b/home-modules/fish.nix
@@ -61,6 +61,12 @@ lib.mkIf (user != "tv")
         gpl = "git pull";
         gad = "git add";
         gcm = "git commit -m ";
+        gmr = "git merge";
+        gin = "git init";
+        gdf = "git diff";
+        grs = "git reset";
+        grh = "git reset --hard";
+        gch = "git checkout";
         gsh = "git stash";
         gsp = "git stash pop";
         glg = "git log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(auto)%d%C(reset)' --all";
diff --git a/home-modules/helix.nix b/home-modules/helix.nix
index d968e58..37c97c8 100644
--- a/home-modules/helix.nix
+++ b/home-modules/helix.nix
@@ -1,13 +1,15 @@
-{ config, pkgs, rice, ... }:
+{ config, pkgs, pkgs-unstable, rice, ... }:
 
 {
   home = {
     packages = with pkgs; [
-      helix
       nixfmt # nix formater
       nil # nix language server
       python311Packages.python-lsp-server
-    ];
+      lldb # debugger for llvm stuff
+     ] ++ (with pkgs-unstable; [
+      helix
+    ]);
     sessionVariables = {
       EDITOR = "hx";
       VISUAL = "hx";
@@ -15,6 +17,8 @@
   };
   programs.helix = {
     enable = true;
+    defaultEditor = true;
+    package = pkgs-unstable.helix;
     settings = {
       # theme = "base16_terminal";
       theme = "base16";
@@ -27,6 +31,9 @@
         line-number = "relative";
         color-modes = true;
         bufferline = "always";
+        popup-border = "all";
+        completion-trigger-len = 1;
+        completion-timeout = 5; 
         file-picker.hidden = false;
         middle-click-paste = false;
         cursorline = true;
@@ -199,7 +206,7 @@
           "bg" = background;
         };
         "ui.window" = {
-          "bg" = background;
+          "bg" = black.base;
         };
       };
     };
diff --git a/home-modules/hyprland.nix b/home-modules/hyprland.nix
index 7230ca0..fcbeeac 100755
--- a/home-modules/hyprland.nix
+++ b/home-modules/hyprland.nix
@@ -75,10 +75,10 @@ lib.mkIf (user != "tv")
 
     settings = {
       monitor =
-        if host == "NxXPS" then [
-          "${monitors.xps.main.name}, ${monitors.xps.main.resolution}, ${monitors.xps.main.position}, ${monitors.xps.main.scale}"
-          "${monitors.xps.second.name}, ${monitors.xps.second.resolution}, ${monitors.xps.second.position}, ${monitors.xps.second.scale}"
-        ] else if host == "NxNORTH" then [
+        if host == "NxXPS" then (with monitors.xps; [
+          "${main.name}, ${main.resolution}, ${main.position}, ${main.scale}"
+          "${second.name}, ${second.resolution}, ${second.position}, ${second.scale}"
+        ]) else if host == "NxNORTH" then [
           "${monitors.north.main.name}, ${monitors.north.main.resolution}, ${monitors.north.main.position}, ${monitors.north.main.scale}"
           "${monitors.north.left.name}, ${monitors.north.left.resolution}, ${monitors.north.left.position}, ${monitors.north.left.scale}"
           "${monitors.north.right.name}, ${monitors.north.right.resolution}, ${monitors.north.right.position}, ${monitors.north.right.scale}"
@@ -88,9 +88,9 @@ lib.mkIf (user != "tv")
 
       workspace =
         let
-          d1 = if host == "NxXPS" then monitors.xps.main.name else if host == "NxNORTH" then monitors.north.main.name else monitors.ace.main;
-          d2 = if host == "NxXPS" then monitors.xps.second.name else if host == "NxNORTH" then monitors.north.left.name else monitors.ace.main;
-          d3 = if host == "NxXPS" then monitors.xps.main.name else if host == "NxNORTH" then monitors.north.right.name else monitors.ace.main;
+          d1 = if host == "NxXPS" then monitors.xps.main.name else (if host == "NxNORTH" then monitors.north.main.name else monitors.ace.main);
+          d2 = if host == "NxXPS" then monitors.xps.second.name else (if host == "NxNORTH" then monitors.north.left.name else monitors.ace.main);
+          d3 = if host == "NxXPS" then monitors.xps.main.name else (if host == "NxNORTH" then monitors.north.right.name else monitors.ace.main);
           compact = "gapsin:0, gapsout:0, bordersize:1, rounding:false";
         in
         [
diff --git a/secrets/passwords-and-certificates.nix b/secrets/passwords-and-certificates.nix
index 45af7f59b6e296a0f217853435b717c9b73bde07..cc943b24cb60f6a41430d0daa818a638d353aa40 100755
GIT binary patch
literal 2375
zcmZQ@_Y83kiVO&0n922DyLa*wMMgRC4XPo31Hb<)RXg5!U`I(EcaWcX#uK$IRthW=
zwzuRgy{7Tnw0Fu4rZwfaURQC&i0eG~uDxWTR<_B@y?X+FUs&x}nb04>pZ(*BR;}z0
z#dmTqtmA%dxOnIm*Vh7ub+b-zcQt3~<{smlb9~LB4!s3lM%Qh0r+lB0V?2XHBK*aS
z;2FJwKYqkj{@j=FNKIVTaN@@B51#rNP75V0y_C0`G0$mO<@G>w-r?1EgwMXL<OtT|
z?E7cz{&aD}lhFH}TW2&po>=U0pjx_J>6IC8?t}erC#~VyWo-7^>tcl+C*$Lb-Hb9{
zvdz{!<@|nSYen_Z-KV(qwrSihX+O7naew>~t7CGJm2YJfCe?Fia$TPM+oC@~H*2AF
zT$^)#$)4c<ufiS9J>c4quC&hNv&^K|o{PeGugJgjTf!|mw|n=U<p<I&lI3KtE=v9%
zq4QisVV3CQe;yj)zZONmW_c9hCo6ULuHD<)JHJGq;E`UQxX4S^@~+0W7vfhL7xHPm
z+Nk<h`OM1hHPc@tf6%zmF8t%v>a|Zq>z*o{bzT{K-23jWv=<rIJoyhPu1&bP{==;Y
zEZ2CS)g4*CPHx7x$={@$+t0Bs{OEG?yi;Pp$49!FM?1a-SLi6#U3+-wSWC8C<nA9S
zJF0rZ{(jt3F7LR1^=Ia^R0dh~cHOM=(j12i?j8N^<J(d2A@p}fPg->IoHqW7*%`vK
z|E)7(_{H`yR{Z48iQy{quG;Th81_hf{wA){H!8s*u8X#Y-2V`@L_;&7_;uw)<8Atn
z`GYRp?ClPeaj<;zb*Vy>)8@4Mr_yCJ>VLieby>rfQD#llhM#q>w!OBDwA}V^+V;{F
z;-#r`7IoBCPD$x2f6|~I5G1|ra>edIL!Om>lU^1`pZ~t$6mQ#(t?Ex3F6Whq+HEYi
zYQ1*no$3v}dDVM9-CC3Tr!`hdYyLLJ>0-VHmz<sT?|ohr&tlx{zHXV?^jMSWGbg2e
zvP;>-xFkKyp{(FatYn|^8JBBU-ZOnu+w>u>Z0VY_`xf6hmte5yQvVZ<ugy`ytucGw
zKbgXKZRPZk-qlMoer?DLHk=rK=EJf@ZHKI7J(Z4reZsYOm9^g1vurEh{^<MQ%kyT{
zleK#~rx*(+2KlJG6!~ehjD3sS-NlAaj~~{PwwNK9bUs?N<om8C%`+DM`K8a$z4qAF
zV@aFTZmeHsx5V*1^Uuyby$^LgS%uA?2Y&Bca-$<Un?+e7LH_%h*(+FIpD0yW>-M?k
z&BWTrxnH9{{(fiidK+&+aLuo})lb(?3|Jfgs4y|4NcpzdooQE}uB))`K9;O2rTpLP
z>g3?(>v*09__Q30w$yKo_!x4?-YJ|%__frh%@=|eD81jh{ni)1+#I$qo%~lmJig!W
zbT`ZYO0NCO)7#Q6b<R7_^Q!aTF8gc^-{_wwqOHwN|L=QIS*oIG6?2yL&EJp3B{@3|
zA6+=z$<o?+yX>uny5TI#WAxbGcx`y4(Z1c7UHiG=B++w`>mGFKUAY|hG$H8rt#$E7
z^|%s_JYkDZb$L4X@Rj#3opff1)QIHyK9u9Ta+bH}K*6gB{pr&4SVb<s`l3~T$>8<>
z$IFyd(ifU~^_~50A$5gA>)rOB3Aej9#`G2!xU)5g_5VpX*r#!CRgJ=`m+?wFmnt#0
zN&E71NXl9yv24v;ZDY?7CuStVwfME+(M{i1|4IF`JMvQ7*K6&Mt8O24*H0^X@;}>a
z;pL30#?N<suI>|b<aws!{x~I?ZCiS3-KSrn|06V+B#xfQ?K|e6viRGL{j-Fw<-`|>
zFHe@@);O`H{GIazJDs2MbKdT&m|DMSvun@QnTo43eU3XFk5f6pbA;uO-Px2Ue%D=h
z=LxaBf9(>zuQKuF$Dq_3T|HgXd>4eNRd@+($-AJ@sbl4}Lw>;-y=?~F|GPfl{k!iZ
zdxTHqR<6vzi#|J^)q5mH%(x~u#jS0+qAA~FV};c#7Vtha`y^Ygm%n|ph1I2n3@)+{
zAO3n8q?%tiTkp(a^*-}yfBZgr$Ex$F7-?G`XE-K%^vc@R3M;B4m|wh^vYvNQs@uA$
zno=6Mi@cRGo7gVq-7VG9-jQegbh9e+goBSt4$8;cUrC;jzk2OlH_vt3C%N8=xhr&g
zzk7?7AJ=o!I+H^@Crz3ATX<u_4>g|G*mPRng#G`Nm5*l4h|6<|5t0ACzeCVx@`krP
z>ksdhR%+c-ly*kppp)1<ABBF~+}T&M{qN;Z57X}0RLyWK;CN<w!oN@YuR6AxaW^`p
zZO#7VcVXImm9XU+p_hHd6iX^x^!&3{**fk!viwA;{pK0-KH6PjV|^aKTX(Ne$s67O
zk+0s_>!vTe`hDZCkjpo}x*XQpFku$IuB_Yh()taHQw@`zeOF$!JYwzy<%X>fBkEsX
z(RdlSF`p@#e@atmRm|ce@4lQl^|k(D-j7+r+(A)MKO+)LUrxJq{7c8$hNjydR~VF!
zZ`e}pJyVKFz3CT^$W8mFsoo6wv3G?&T)X~q?!+t4ZI=X!{F7}-nGt&7Z(XVRe)|`!
z(T`fJ+%8<OEqJmpJc6_5<L^~Vy<?X~{oFle_Uft@>*{Y)m)^YNGv#4>iLIUD@*NW$
zWNn+Q^Q7&qeb$&%)&y%ElVJI`k|pP#@6E=uuhuy^{FS?UoiCk_Px6AWOxUEKT5>Ck
zKd0ND{}fx?UR~S7ol`C$p0|cWQtSBXwx>#S1=^HWPk8GU8ujCLYHi>=>4nXfr^IcK
zH-*mZ?s0niv2qo|m)#G|y(0JR)XiPCaq4X5mRl>|1Z}zYJ^mY`L}gl2Na^?Xsb4cJ
z!Xj<%?+<<voR{V}t2bfSjT0Z_ZeLo__f3k)@Y$BvLg(KEJk?H=&APh4to)k)nn$d4
z7kwwK_IC4oBD9yMN7x|X)-37tsDsl|LaI~pxf@q~a$(T3;>>JP_nRg@U+6}pzJDiE
ziS4_o{i|8xzaO2aY5rh+f+GvhcFWV9Y_kNd!u1$;{FO1;%6eqY0;!HO>A}Tzl3zVM
z&DV+qT#Arj*mq$vbE&X)cxu91tuGdfXICagvbi$fwURsjmGPXf@EPH=tl{OcZx8bx
zT+h1lY`KJO+8ieCK!p>hbmr;p+blkPpPpAb=gOt`7PoFl++*9tV(SnT>}~M*UD_cZ
z&7CVH_*HkmW%d4K%B$wWQ5PJ%Gg@*ZGn4(x#^2fOtv%W+XHUrs5WQ%T<9x7;@te?M
P+s%PeqI%2nW=8=4SLc?y

literal 2375
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
S&3pJ#wleOv&RRCp^f3TLsG&^&