From d1926aff7d744321b2c9496e2e94262aa3e299e3 Mon Sep 17 00:00:00 2001
From: rocketcamel <luca_lise@icloud.com>
Date: Mon, 27 Jan 2025 10:23:07 -0800
Subject: [PATCH] fix: merge dolphin with systemPkgs when i3 enabled

---
 .config/nvim/lua/rocketcamel/plugins/lsp.lua | 50 ++++++++++----------
 nix/hosts/tux/configuration.nix              |  1 -
 nix/modules/i3.nix                           |  4 ++
 3 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/.config/nvim/lua/rocketcamel/plugins/lsp.lua b/.config/nvim/lua/rocketcamel/plugins/lsp.lua
index 4abdc8a..aa37258 100755
--- a/.config/nvim/lua/rocketcamel/plugins/lsp.lua
+++ b/.config/nvim/lua/rocketcamel/plugins/lsp.lua
@@ -1,27 +1,27 @@
 return {
-	{
-		"neovim/nvim-lspconfig",
-		dependencies = {
-			"williamboman/mason.nvim",
-			"williamboman/mason-lspconfig.nvim",
-			"j-hui/fidget.nvim",
-		},
-		config = function()
-			require("mason").setup()
-			require("fidget").setup()
-			require("mason-lspconfig").setup({
-				ensure_installed = {
-					"ts_ls",
-					"lua_ls",
-					"rust_analyzer",
-					"nil_ls",
-				},
-				handlers = {
-					function(server)
-						require("lspconfig")[server].setup({})
-					end,
-				},
-			})
-		end,
-	},
+  {
+    "neovim/nvim-lspconfig",
+    dependencies = {
+      "williamboman/mason.nvim",
+      "williamboman/mason-lspconfig.nvim",
+      "j-hui/fidget.nvim",
+    },
+    config = function()
+      require("mason").setup()
+      require("fidget").setup()
+      require("mason-lspconfig").setup({
+        ensure_installed = {
+          "ts_ls",
+          "lua_ls",
+          "rust_analyzer",
+          "nil_ls",
+        },
+        handlers = {
+          function(server)
+            require("lspconfig")[server].setup({})
+          end,
+        },
+      })
+    end,
+  },
 }
diff --git a/nix/hosts/tux/configuration.nix b/nix/hosts/tux/configuration.nix
index cf95331..f4fc3ee 100755
--- a/nix/hosts/tux/configuration.nix
+++ b/nix/hosts/tux/configuration.nix
@@ -96,7 +96,6 @@
     with pkgs;
     config.commonPackages
     ++ [
-      dolphin
     ];
 
   # Some programs need SUID wrappers, can be configured further or are
diff --git a/nix/modules/i3.nix b/nix/modules/i3.nix
index 487a6ba..9596cde 100755
--- a/nix/modules/i3.nix
+++ b/nix/modules/i3.nix
@@ -20,6 +20,10 @@
     };
     services.libinput.touchpad.naturalScrolling = true;
 
+    environment.systemPackages = with pkgs; [
+      dolphin
+    ];
+
     home-manager.users.luca = {
       programs = {
         alacritty = {