From 4c06dc6b458999b20efaf0f20c7d0112565c092b Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Wed, 5 Apr 2023 16:40:14 +0100
Subject: [PATCH] Add extra packages from env, fix formatting exclusion

---
 config/nvim/lua/lsp/formatting.lua               | 4 +++-
 nixos/home-manager/env/rofi.nix                  | 6 +++++-
 nixos/home-manager/env/sxhkd.nix                 | 1 -
 nixos/home-manager/packages/config/starship.toml | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/config/nvim/lua/lsp/formatting.lua b/config/nvim/lua/lsp/formatting.lua
index 31f4a14f..796a682e 100644
--- a/config/nvim/lua/lsp/formatting.lua
+++ b/config/nvim/lua/lsp/formatting.lua
@@ -3,7 +3,9 @@ local lsp_formatting = function(bufnr)
         bufnr = bufnr,
         timeout_ms = 2000,
         async = true,
-        filter = function(client) return client.name == "null-ls" end,
+        filter = function(client)
+            return client.name ~= "jedi_language_server" and client.name ~= "lua_ls"
+        end,
     }
 end
 return lsp_formatting
diff --git a/nixos/home-manager/env/rofi.nix b/nixos/home-manager/env/rofi.nix
index 1af9d243..4e7c3212 100644
--- a/nixos/home-manager/env/rofi.nix
+++ b/nixos/home-manager/env/rofi.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ pkgs, ... }:
 {
   programs.rofi = {
     enable = true;
@@ -6,4 +6,8 @@
     pass.enable = true;
     terminal = "kitty";
   };
+  home.packages = with pkgs; [
+    i3lock
+    scrot
+  ];
 }
diff --git a/nixos/home-manager/env/sxhkd.nix b/nixos/home-manager/env/sxhkd.nix
index a9506c5e..dd9421a8 100644
--- a/nixos/home-manager/env/sxhkd.nix
+++ b/nixos/home-manager/env/sxhkd.nix
@@ -5,7 +5,6 @@
     keybindings = {
       # Terminal emulators
       "super + Return" = "kitty";
-      "super + n" = "kitty -e \"nvim\"";
       "super + shift + Return" = "xfce4-terminal --drop-down";
 
       # Launcher
diff --git a/nixos/home-manager/packages/config/starship.toml b/nixos/home-manager/packages/config/starship.toml
index a7168e8a..6282873e 100644
--- a/nixos/home-manager/packages/config/starship.toml
+++ b/nixos/home-manager/packages/config/starship.toml
@@ -69,7 +69,7 @@ symbol = " "
 symbol = "⌘ "
 
 [hostname]
-ssh_symbol = "🖥 "
+ssh_symbol = "🌐"
 style = "bold green"
 
 [hg_branch]