From 0ed3a0fceaea0bbf38aeacb9b1e5109bf9d430d0 Mon Sep 17 00:00:00 2001
From: cnst <adamhilmersson@gmail.com>
Date: Sun, 15 Sep 2024 18:27:29 +0200
Subject: [PATCH] hyprland runix changes

---
 home/modules/devtools/neovim/default.nix       | 12 ++++++++++--
 home/modules/devtools/neovim/lsp.nix           |  2 +-
 .../devtools/neovim/plugins/conform.nix        | 18 +++++-------------
 home/modules/terminal/wezterm/default.nix      |  6 +++---
 home/modules/wm/hyprland/toothpick/rules.nix   |  4 ++++
 5 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/home/modules/devtools/neovim/default.nix b/home/modules/devtools/neovim/default.nix
index 64d8a584..f5e80b89 100644
--- a/home/modules/devtools/neovim/default.nix
+++ b/home/modules/devtools/neovim/default.nix
@@ -90,6 +90,14 @@ in {
           	group = "fix_size",
           })
 
+          -- Optionally, set up a command or auto-command to format on save
+          vim.api.nvim_create_autocmd("BufWritePre", {
+          	pattern = "*",
+          	callback = function()
+          		require("conform").format()
+          	end,
+          })
+
           -- Highlight when yanking (copying) text
           vim.api.nvim_create_autocmd("TextYankPost", {
           	desc = "Highlight when yanking (copying) text",
@@ -108,8 +116,8 @@ in {
           add_sign("DiagnosticSignWarn", " ")
           add_sign("DiagnosticSignHint", "󰌶 ")
           add_sign("DiagnosticSignInfo", " ")
-        
-'';
+
+        '';
 
       plugins = with pkgs.vimPlugins; [
         vim-table-mode
diff --git a/home/modules/devtools/neovim/lsp.nix b/home/modules/devtools/neovim/lsp.nix
index edcfaaef..e5a6c9a5 100644
--- a/home/modules/devtools/neovim/lsp.nix
+++ b/home/modules/devtools/neovim/lsp.nix
@@ -47,7 +47,7 @@
           	onEdit = true,
           	onOpenAndSave = true,
           } })
-          add_lsp(lspconfig.tsserver, {})
+          add_lsp(lspconfig.ts_ls, {})
           add_lsp(lspconfig.typst_lsp, {})
           add_lsp(lspconfig.elixirls, { cmd = { "elixir-ls" } })
         '';
diff --git a/home/modules/devtools/neovim/plugins/conform.nix b/home/modules/devtools/neovim/plugins/conform.nix
index f3fbc0ed..c68c8af8 100644
--- a/home/modules/devtools/neovim/plugins/conform.nix
+++ b/home/modules/devtools/neovim/plugins/conform.nix
@@ -11,9 +11,9 @@
           require("conform").setup({
           	default_format_opts = {
           		timeout_ms = 3000,
-          		async = false, -- not recommended to change
-          		quiet = false, -- not recommended to change
-          		lsp_format = "fallback", -- not recommended to change
+          		async = false,
+          		quiet = false,
+          		lsp_format = "fallback",
           	},
           	formatters_by_ft = {
           		bash = { "shfmt" },
@@ -23,8 +23,8 @@
           		json = { "fixjson" },
           		lua = { "stylua" },
           		nix = { "alejandra" },
-          		php = { "php_cs_fixer" },
-           		python = { "black" },
+             		php = { "php_cs_fixer" },
+          		python = { "black" },
           		rust = { "rustfmt" },
           		sh = { "shfmt" },
           		typescript = { "prettierd" },
@@ -33,14 +33,6 @@
           		["*"] = { "injected" },
           	},
           })
-
-          -- Optionally, set up a command or auto-command to format on save
-          vim.api.nvim_create_autocmd("BufWritePre", {
-          	pattern = "*",
-          	callback = function()
-          		require("conform").format()
-          	end,
-          })
         '';
     }
   ];
diff --git a/home/modules/terminal/wezterm/default.nix b/home/modules/terminal/wezterm/default.nix
index 9ec008f1..237ca6f5 100644
--- a/home/modules/terminal/wezterm/default.nix
+++ b/home/modules/terminal/wezterm/default.nix
@@ -6,8 +6,8 @@
   ...
 }: let
   enable_wayland = "true";
-  # weztermPkg = pkgs.wezterm;
-  weztermFlake = inputs.wezterm.packages.${pkgs.system}.default;
+  weztermPkg = pkgs.wezterm;
+  # weztermFlake = inputs.wezterm.packages.${pkgs.system}.default;
   inherit (lib) mkIf mkEnableOption;
   cfg = config.modules.terminal.wezterm;
 in {
@@ -17,7 +17,7 @@ in {
   config = mkIf cfg.enable {
     programs.wezterm = {
       enable = true;
-      package = weztermFlake;
+      package = weztermPkg;
       extraConfig =
         /*
         lua
diff --git a/home/modules/wm/hyprland/toothpick/rules.nix b/home/modules/wm/hyprland/toothpick/rules.nix
index 4ed026e7..8258b7db 100644
--- a/home/modules/wm/hyprland/toothpick/rules.nix
+++ b/home/modules/wm/hyprland/toothpick/rules.nix
@@ -17,6 +17,10 @@ in {
         "size 843 650,initialTitle:(floatcal)"
         "move 100%-w-20 40,initialTitle:(floatcal)"
         #windowrulev2 = move 1708 32,class:(floatcal)
+        "float,initialTitle:(runix)"
+        "size 600 400,initialTitle:(runix)"
+        "center,initialTitle:(runix)"
+        "workspace special:runix,initialTitle:(runix)"
         "float,class:(org.keepassxc.KeePassXC)"
         "size 843 500,class:(org.keepassxc.KeePassXC)"
         "move 100%-w-20 40,class:(org.keepassxc.KeePassXC)"