From 41660a217f50bf53c61b44ce2944abc968379453 Mon Sep 17 00:00:00 2001
From: pagedMov <pagedMov@gmail.com>
Date: Fri, 11 Oct 2024 03:26:30 -0400
Subject: [PATCH] Gen 336: tweaked visuals in nvim and btop, added more
 configuration for btop

---
 flake.lock                                    | 21 +++++++++++++++++--
 flake.nix                                     | 17 ++++++++-------
 glasshouse-desktop/home/btop.nix              |  8 ++++++-
 .../home/nixvim/config/options.nix            | 10 +++++++--
 .../nixvim/config/plugins/extra_plugins.nix   |  8 +------
 .../home/nixvim/config/plugins/lualine.nix    |  4 ++--
 6 files changed, 47 insertions(+), 21 deletions(-)

diff --git a/flake.lock b/flake.lock
index f82588a..4147925 100644
--- a/flake.lock
+++ b/flake.lock
@@ -81,6 +81,22 @@
         "type": "github"
       }
     },
+    "catppuccin-yazi": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1722538198,
+        "narHash": "sha256-oJo52hMSK7mr5f0DtnyaN1FVOSKKUOHWCT80V1qfyrU=",
+        "owner": "catppuccin",
+        "repo": "yazi",
+        "rev": "37dec9bf1f7e52e0d593c225827b9dbc71ce504c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "catppuccin",
+        "repo": "yazi",
+        "type": "github"
+      }
+    },
     "devshell": {
       "inputs": {
         "nixpkgs": [
@@ -838,8 +854,8 @@
         "pre-commit-hooks": "pre-commit-hooks_2"
       },
       "locked": {
-        "lastModified": 1728600794,
-        "narHash": "sha256-PmRJCfpY1PoJ3YP5IjCsQL1vc5zElFowAWJLjUwvlJc=",
+        "lastModified": 1728630754,
+        "narHash": "sha256-4AcRtmk2axQHKMd07X8fEPXCgiqv0hst7n/bg37CDfI=",
         "path": "/home/pagedmov/sysflakes/glasshouse-desktop/home/nixvim",
         "type": "path"
       },
@@ -901,6 +917,7 @@
         "catppuccin-bat": "catppuccin-bat",
         "catppuccin-cava": "catppuccin-cava",
         "catppuccin-starship": "catppuccin-starship",
+        "catppuccin-yazi": "catppuccin-yazi",
         "home-manager": "home-manager",
         "hypr-contrib": "hypr-contrib",
         "hyprland": "hyprland",
diff --git a/flake.nix b/flake.nix
index 6b6a20c..d598936 100644
--- a/flake.nix
+++ b/flake.nix
@@ -18,18 +18,21 @@
 		};
 
 		catppuccin-bat = {
-		  url = "github:catppuccin/bat";
-		  flake = false;
+			url = "github:catppuccin/bat";
+			flake = false;
 		};
 		catppuccin-cava = {
-		  url = "github:catppuccin/cava";
-		  flake = false;
+			url = "github:catppuccin/cava";
+			flake = false;
 		};
 		catppuccin-starship = {
-		  url = "github:catppuccin/starship";
-		  flake = false;
+			url = "github:catppuccin/starship";
+			flake = false;
+		};
+		catppuccin-yazi = {
+			url = "github:catppuccin/yazi";
+			flake = false;
 		};
-
 		spicetify-nix = {
 			url = "github:gerg-l/spicetify-nix";
 			inputs.nixpkgs.follows = "nixpkgs";
diff --git a/glasshouse-desktop/home/btop.nix b/glasshouse-desktop/home/btop.nix
index 5cc20e9..469f116 100644
--- a/glasshouse-desktop/home/btop.nix
+++ b/glasshouse-desktop/home/btop.nix
@@ -5,9 +5,15 @@
     enable = true;
     
     settings = {
-      color_theme = "dracula";
+      color_theme = "tokyo-night";
       theme_background = false;
       update_ms = 500;
+	  vim_keys = true;
+	  proc_tree = true;
+	  temp_scale = "fahrenheit";
+	  disks_filter = "exclude=/boot";
+	  show_swap = false;
+	  swap_disk = false;
     };
   };
 
diff --git a/glasshouse-desktop/home/nixvim/config/options.nix b/glasshouse-desktop/home/nixvim/config/options.nix
index 0bd527d..19b85a7 100644
--- a/glasshouse-desktop/home/nixvim/config/options.nix
+++ b/glasshouse-desktop/home/nixvim/config/options.nix
@@ -1,6 +1,12 @@
 {
-		colorschemes.kanagawa = {
-			enable = true;
+		colorschemes = {
+			catppuccin = {
+				enable = true;
+				settings.flavour = "mocha";
+			};
+			kanagawa = {
+				enable = false;
+			};
 		};
 		
 		diagnostics.signs = false;
diff --git a/glasshouse-desktop/home/nixvim/config/plugins/extra_plugins.nix b/glasshouse-desktop/home/nixvim/config/plugins/extra_plugins.nix
index afa3ca2..f474d0d 100644
--- a/glasshouse-desktop/home/nixvim/config/plugins/extra_plugins.nix
+++ b/glasshouse-desktop/home/nixvim/config/plugins/extra_plugins.nix
@@ -1,12 +1,6 @@
-{ lib, pkgs, ... }:
+{ pkgs, ... }:
 
 {
-# need:
-#vim-markdown
-#vim-sneak
-#vim-slash
-#undotree
-#automkdr.nvim
 	extraPlugins = [
 		(pkgs.vimUtils.buildVimPlugin { # vimwiki
 			name = "vimwiki";
diff --git a/glasshouse-desktop/home/nixvim/config/plugins/lualine.nix b/glasshouse-desktop/home/nixvim/config/plugins/lualine.nix
index 7c2ecd4..8ed1050 100644
--- a/glasshouse-desktop/home/nixvim/config/plugins/lualine.nix
+++ b/glasshouse-desktop/home/nixvim/config/plugins/lualine.nix
@@ -5,8 +5,8 @@
 			options = {
 				icons_enabled = true;
 				theme = "auto";
-				component_separators = {left = ""; right = "";};
-				section_separators = {left = ""; right = "";};
+				component_separators = {left = ""; right = "";};
+				section_separators = {left = ""; right = "";};
 				always_divide_middle = true;
 				globalstatus = false;
 				refresh = {