merge ace xps

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

home-modules/hyprland.nix

@@ -91,7 +91,7 @@ lib.mkIf (user != "tv")
           d1 = if host == "NxXPS" then monitors.xps.main.name else (if host == "NxNORTH" then monitors.north.main.name else monitors.ace.main.name);
           d2 = if host == "NxXPS" then monitors.xps.second.name else (if host == "NxNORTH" then monitors.north.left.name else monitors.ace.main.name);
           d3 = if host == "NxXPS" then monitors.xps.main.name else (if host == "NxNORTH" then monitors.north.right.name else monitors.ace.main.name);
-          compact = "gapsin:0, gapsout:0, bordersize:1, rounding:false";
+         compact = "gapsin:0, gapsout:0, bordersize:1, rounding:false";
         in
         [
           "11, monitor:${d1}, default:true"