merge ace xps

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": {

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;

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";

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;
         };
       };
     };