From a7a3da24c24137c95f0eb0546dd3281f71a32362 Mon Sep 17 00:00:00 2001
From: Liam Malone <maloneliam@proton.me>
Date: Tue, 20 May 2025 17:59:40 +0200
Subject: [PATCH] update term + vim colors, hyprland config, remove
 alacritty/kitty

---
 modules/desktop/hyprland.nix                  | 25 +++------
 modules/home-manager/terminals/alacritty.nix  | 55 -------------------
 modules/home-manager/terminals/default.nix    |  0
 modules/home-manager/terminals/kitty.nix      |  0
 modules/non-nix_configs/ghostty/config        | 11 ++--
 .../nvim/after/plugin/colors.lua              |  6 +-
 .../non-nix_configs/nvim/lua/liamm/packer.lua |  4 +-
 7 files changed, 20 insertions(+), 81 deletions(-)
 delete mode 100644 modules/home-manager/terminals/alacritty.nix
 delete mode 100644 modules/home-manager/terminals/default.nix
 delete mode 100644 modules/home-manager/terminals/kitty.nix

diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix
index 97fc907..6e4fdbb 100644
--- a/modules/desktop/hyprland.nix
+++ b/modules/desktop/hyprland.nix
@@ -24,31 +24,24 @@
   ];
 
   wayland.windowManager.hyprland = {
-    package = inputs.hyprland.packages.${pkgs.system}.hyprland;
     enable = true;
+    package = inputs.hyprland.packages.${pkgs.system}.hyprland;
+
     xwayland.enable = true;
-    systemd = {
-      enable = true;
-      variables = [
-        "--all"
-      ];
-    };
+    systemd.enable = true;
+
+    # Tell home-manager not to manage the config file
+    extraConfig = "";
   };
 
   lib.inputMethod.fcitx5.waylandFrontend = true;
 
   programs = {
-    hyprlock = {
-      enable = true;
-    };
+    hyprlock.enable = true;
   };
 
   services = {
-    hyprpaper = {
-      enable = true;
-    };
-    hypridle = {
-      enable = true;
-    };
+    hyprpaper.enable = true;
+    hypridle.enable = true;
   };
 }
diff --git a/modules/home-manager/terminals/alacritty.nix b/modules/home-manager/terminals/alacritty.nix
deleted file mode 100644
index 82569f4..0000000
--- a/modules/home-manager/terminals/alacritty.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  programs.alacritty = {
-    enable = true;
-    settings = {
-      general.live_config_reload = false;
-      font = {
-        normal.family = "FiraCodeNerdFontMono";
-        size = 16;
-      };
-      window = {
-        dimensions = {
-          lines = 20;
-          columns = 200;
-        };
-        padding = {
-          x = 8;
-          y = 8;
-        };
-        decorations = "None";
-        opacity = 0.80;
-        blur = true;
-      };
-      colors = {
-        primary = {
-          background =  "#0c0c0c";
-          foreground =  "#cccccc";
-        };
-        normal = {
-          black =      "#0c0c0c"; 
-          red =        "#c50f1f"; 
-          green =      "#13a10e"; 
-          yellow =     "#c19c00"; 
-          blue =       "#0037da"; 
-          magenta =    "#881798"; 
-          cyan =       "#3a96dd"; 
-          white =      "#cccccc"; 
-        };
-        bright = {
-          black =      "#767676"; 
-          red =        "#e74856"; 
-          green =      "#16c60c"; 
-          yellow =     "#f9f1a5"; 
-          blue =       "#3b78ff"; 
-          magenta =    "#b4009e"; 
-          cyan =       "#61d6d6"; 
-          white =      "#f2f2f2"; 
-        };
-        draw_bold_text_with_bright_colors = true;
-
-      };
-    };
-  };
-}
diff --git a/modules/home-manager/terminals/default.nix b/modules/home-manager/terminals/default.nix
deleted file mode 100644
index e69de29..0000000
diff --git a/modules/home-manager/terminals/kitty.nix b/modules/home-manager/terminals/kitty.nix
deleted file mode 100644
index e69de29..0000000
diff --git a/modules/non-nix_configs/ghostty/config b/modules/non-nix_configs/ghostty/config
index beb4117..b5f0fc0 100644
--- a/modules/non-nix_configs/ghostty/config
+++ b/modules/non-nix_configs/ghostty/config
@@ -20,15 +20,12 @@ gtk-wide-tabs = true
 #macos-non-native-fullscreen = true
 
 # Font
-font-size = 14
-font-family = JetBrainsMono NF
+font-size = 16
+font-family = Kelmscott Mono
 
 # Theme
-# theme = Grape
-# theme = Bright Lights
-theme = tokyonight
-# theme = Purple Rain
-# theme = Mariana
+theme = Obsidian
+# theme = Relaxed
 
 # Cursor And Mouse
 cursor-style = block
diff --git a/modules/non-nix_configs/nvim/after/plugin/colors.lua b/modules/non-nix_configs/nvim/after/plugin/colors.lua
index a30211b..112bec3 100644
--- a/modules/non-nix_configs/nvim/after/plugin/colors.lua
+++ b/modules/non-nix_configs/nvim/after/plugin/colors.lua
@@ -1,5 +1,7 @@
+local default_color = "sonokai"
+
 function ColorMyTerminal(color)
-    color = color or "tokyonight-night"
+    color = color or default_color
     vim.cmd.colorscheme(color)
 
     vim.cmd("hi ColorColumn ctermbg=0 guibg=purple")
@@ -7,4 +9,4 @@ function ColorMyTerminal(color)
     vim.api.nvim_set_hl(0, "NormalFloat", {bg = "none"})
 end
 
-vim.cmd.colorscheme("tokyonight-night")
+vim.cmd.colorscheme(default_color)
diff --git a/modules/non-nix_configs/nvim/lua/liamm/packer.lua b/modules/non-nix_configs/nvim/lua/liamm/packer.lua
index 7569e56..2e244c9 100644
--- a/modules/non-nix_configs/nvim/lua/liamm/packer.lua
+++ b/modules/non-nix_configs/nvim/lua/liamm/packer.lua
@@ -1,10 +1,12 @@
 return require('packer').startup(function(use)
   use 'wbthomason/packer.nvim'
 
-  use({ 'rose-pine/neovim', as = 'rose-pine' })
   use({ 'folke/tokyonight.nvim', as = 'tokyonight' })
   use({ 'karoliskoncevicius/sacredforest-vim', as = 'sacredforest' })
   use({ 'EdenEast/nightfox.nvim', as = 'nightfox' })
+  use({ 'rebelot/kanagawa.nvim', as = 'kanagawa'})
+  use({ 'sainnhe/sonokai', as = 'sonokai'})
+  use({ 'p00f/alabaster.nvim', as = 'alabaster'})
 
   use 'nvim-telescope/telescope.nvim'
   use('nvim-treesitter/nvim-treesitter', {run = ':TSUpdate'})