merge conflict

home/lilith/default.nix

@@ -1,4 +1,5 @@
-{ sops-nix, stylix, ...}: {
+{ sops-nix, ... }:
+{
   imports = [
     sops-nix.homeManagerModules.sops
 
@@ -9,13 +10,14 @@
 
     ./env.nix
 
-    ./firefox
+    #zen-browser (WIP)
+    # ./firefox
 
     ./alacritty.nix
     ./clipman.nix
     ./common.nix
     ./direnv.nix
-    # ./firefox.nix
+    ./firefox.nix
     ./fzf.nix
     ./git.nix
     ./gpg.nix

home/lilith/helix.nix

@@ -1,5 +1,6 @@
 {
   pkgs,
+  lib,
   ...
 }: {
   programs.helix = {
@@ -31,6 +32,10 @@
           ];
           separator = "|";
         };
+        inline-diagnostics = {
+          cursor-line = "hint";
+          other-lines = "warning";
+        };
         lsp = {
           display-messages = true;
           display-inlay-hints = true;
@@ -48,5 +53,51 @@
         };
       };
     };
+
+    languages = {
+      language-server = {
+        rust-analyzer = {
+          config = {
+            checkOnSave.command = "clippy";
+            cargo.features = "all";
+            cargo.unsetTest = [];
+          };
+        };
+        pyright = {
+          command = "${pkgs.pyright}/bin/pyright-langserver";
+          args = ["--stdio"];
+          config = {};
+        };
+        nil.command = "${pkgs.nil}/bin/nil";
+        bash-language-server = {
+          command = "${pkgs.bash-language-server}/bin/bash-language-server";
+          args = ["start"];
+        };
+      };
+
+      language = [
+        {
+          name = "python";
+          auto-format = true;
+          language-servers = [{name = "pyright";}];
+          formatter = {
+            command = "/bin/sh";
+            args = [
+              "-c"
+              "${pkgs.isort}/bin/isort - | ${pkgs.black}/bin/black -q -l 120 -C -"
+            ];
+          };
+        }
+        {
+          name = "nix";
+          auto-format = true;
+          language-servers = [{name = "nil";}];
+          formatter = {
+            command = lib.getExe pkgs.nixfmt-rfc-style;
+            args = ["-s"];
+          };
+        }
+      ];
+    };
   };
 }

home/lilith/hyprland/default.nix

@@ -1,13 +1,16 @@
-{ lib, ...}: {
+{ hyprland, ... }:
+{
   imports = [
+    hyprland.homeManagerModules.default
     ./hyprpaper.nix
     ./hyprlock.nix
-#    ./hyprgrass.nix
-#    ./utils.nix
+    ./hyprgrass.nix
+    #    ./utils.nix
   ];
 
   wayland.windowManager.hyprland = {
     enable = true;
+    # package = hyprland.packages.${pkgs.system}.hyprland;
 
     xwayland.enable = true;
 
@@ -16,15 +19,11 @@
     settings = {
       "$terminal" = "alacritty";
 
-      env = [
-        "HYPRCURSOR_THEME,rose-pine-hyprcursor"
-      ];
+      env = [ "HYPRCURSOR_THEME,rose-pine-hyprcursor" ];
 
       xwayland.force_zero_scaling = true;
 
-      monitor = [
-        ",preferred,1"
-      ];
+      monitor = [ ",preferred,1" ];
 
       exec-once = [
         "hyprlock"

home/lilith/hyprland/hyprgrass.nix

@@ -0,0 +1,23 @@
+{
+  config,
+  lib,
+  pkgs,
+  hyprgrass,
+  ...
+}:
+{
+  options.desktop.touchSupport = lib.mkEnableOption "Enables touch-related features";
+  config.wayland.windowManager.hyprland = lib.mkIf config.desktop.touchSupport {
+    plugins = [ hyprgrass.packages.${pkgs.system}.default ];
+
+    settings.plugin.touch_gestures = {
+      sensitivity = 2.0;
+      workspace_swipe_fingers = 3;
+      workspace_swipe_edge = "d";
+
+      long_press_delay = 500;
+      resize_on_border_long_press = true;
+      edge_margin = 20;
+    };
+  };
+}

home/lilith/hyprland/hyprlock.nix

@@ -1,4 +1,5 @@
-{ config, lib, ...}:{
+{ lib, ... }:
+{
   programs.hyprlock = {
     enable = true;
 
@@ -26,7 +27,7 @@
 
       input-field = [
         {
-          size = "800, 80";
+          size = "30%, 5%";
           position = "0, 0";
           monitor = "";
           dots_center = true;
@@ -39,6 +40,25 @@
           shadow_passes = 2;
         }
       ];
+
+      label = [
+        {
+          text = "Welcome!";
+          position = "0, 20%";
+          font_size = 40;
+          font_family = "JetBrains Mono";
+          halign = "center";
+          valign = "center";
+        }
+        {
+          text = "$TIME";
+          position = "0, 15%";
+          font_size = 25;
+          font_family = "JetBrains Mono";
+          halign = "center";
+          valign = "center";
+        }
+      ];
     };
   };
 }

home/lilith/hyprpanel.nix

@@ -1,4 +1,5 @@
-{hyprpanel, ...}: {
+{ hyprpanel, ... }:
+{
   imports = [ hyprpanel.homeManagerModules.hyprpanel ];
 
   programs.hyprpanel = {

home/lilith/persist.nix

@@ -1,20 +1,23 @@
-{lib, config, ... }: {
+{
+  lib,
+  config,
+  ...
+}: {
   data = {
     directories = [
       ".config/syncthing"
       ".config/sops"
       ".config/keepassxc"
-      ".config/obsidian"
       ".config/vesktop"
       ".gnupg"
       ".ssh"
 
       ".thunderbird"
       ".mozilla"
+      ".zen"
 
       "nixos"
       "sync"
-      "obsidian"
       "code"
       ".keepass"
       ".local/share/PrismLauncher"
@@ -28,11 +31,9 @@
   cache = {
     directories = [
       ".cache/nix"
-      ".cache/spotify"
       ".cache/keepassxc"
       ".cargo"
       ".local/state/wireplumber"
-      "tmp"
     ];
     files = [];
   };

home/lilith/stylix.nix

@@ -1,4 +1,5 @@
-{...}: {
+{ ... }:
+{
   stylix.targets = {
     firefox.enable = true;
   };