From 0cdbaa40f76e8c0b951822a584bd66bc5e37ef04 Mon Sep 17 00:00:00 2001
From: iFargle <albert@sysctl.io>
Date: Thu, 4 Jan 2024 22:22:55 +0900
Subject: [PATCH] Test

---
 .../hyprland/themes/stylix/waybar-conf.nix    |  7 +-
 home-manager/common/software/cli/bash.nix     |  2 +-
 .../software/cli/themes/stylix/btop.nix       | 87 ++-----------------
 nixos/common/desktops/hyprland/default.nix    |  2 +-
 4 files changed, 11 insertions(+), 87 deletions(-)

diff --git a/home-manager/common/desktops/hyprland/themes/stylix/waybar-conf.nix b/home-manager/common/desktops/hyprland/themes/stylix/waybar-conf.nix
index 6f46f3f0..783289d6 100644
--- a/home-manager/common/desktops/hyprland/themes/stylix/waybar-conf.nix
+++ b/home-manager/common/desktops/hyprland/themes/stylix/waybar-conf.nix
@@ -1,4 +1,4 @@
-{ ...}: {
+{ inputs, ... }: {
   imports = [ ../../common/waybar/scripts.nix ];
 
   programs.waybar = {
@@ -13,7 +13,7 @@
                 "clock"
                 "mpris"
             ];
-            module-center = [
+            modules-center = [
                 "hyprland/workspaces"
             ];
             modules-right = [
@@ -126,7 +126,6 @@
         * {
             border: none;
             border-radius: 0;
-            font-family: JetbrainsMono Regular;
         }
 
         #waybar {
@@ -172,7 +171,7 @@
         #custom-wlogout,
         #window {
             font-size: 16px;
-            padding: 0px 10px;
+            // padding: 0px 10px;
             margin: 5px;
             border-radius: 5px;
             font-weight: bold;
diff --git a/home-manager/common/software/cli/bash.nix b/home-manager/common/software/cli/bash.nix
index f84ecf53..ffd2cd78 100644
--- a/home-manager/common/software/cli/bash.nix
+++ b/home-manager/common/software/cli/bash.nix
@@ -10,7 +10,7 @@
     settings = { 
       hostname-only-if-ssh = true;
       cwd-max-depth = 1;
-      condensed = true;
+      condensed = false;
       # valid choices: default, low-contrast, gruvbox, solarized-dark16, solarized-light16
       # theme = "gruvbox";
      };
diff --git a/home-manager/common/software/cli/themes/stylix/btop.nix b/home-manager/common/software/cli/themes/stylix/btop.nix
index a99c667b..1cab803e 100644
--- a/home-manager/common/software/cli/themes/stylix/btop.nix
+++ b/home-manager/common/software/cli/themes/stylix/btop.nix
@@ -1,83 +1,8 @@
 { ... }: {
-  home.file.".config/btop/btop.conf".text = ''
-#* Themes should be placed in "../share/btop/themes" relative to binary or "$HOME/.config/btop/themes"
-color_theme = "tty"
-theme_background = True
-truecolor = True
-force_tty = False
-presets = "cpu:1:default,proc:0:default cpu:0:default,mem:0:default,net:0:default cpu:0:block,net:0:tty"
-vim_keys = False
-rounded_corners = True
-
-#* Default symbols to use for graph creation, "braille", "block" or "tty".
-#* "braille" offers the highest resolution but might not be included in all fonts.
-#* "block" has half the resolution of braille but uses more common characters.
-#* "tty" uses only 3 different symbols but will work with most fonts and should work in a real TTY.
-#* Note that "tty" only has half the horizontal resolution of the other two, so will show a shorter historical view.
-graph_symbol = "braille"
-graph_symbol_cpu = "default"
-graph_symbol_mem = "default"
-graph_symbol_net = "default"
-graph_symbol_proc = "default"
-shown_boxes = "cpu net proc mem"
-update_ms = 1000
-
-#* Processes sorting, "pid" "program" "arguments" "threads" "user" "memory" "cpu lazy" "cpu direct",
-#* "cpu lazy" sorts top process over time (easier to follow), "cpu direct" updates top process directly.
-proc_sorting = "cpu lazy"
-
-proc_reversed = False
-proc_tree = True
-proc_colors = True
-proc_gradient = True
-proc_per_core = False
-proc_mem_bytes = True
-proc_cpu_graphs = True
-proc_info_smaps = False
-proc_left = False
-proc_filter_kernel = False
-cpu_graph_upper = "total"
-cpu_graph_lower = "total"
-cpu_invert_lower = True
-cpu_single_graph = False
-cpu_bottom = False
-show_uptime = True
-check_temp = True
-cpu_sensor = "Auto"
-show_coretemp = True
-cpu_core_map = ""
-temp_scale = "celsius"
-base_10_sizes = False
-show_cpu_freq = True
-
-#* Special formatting: /host = hostname | /user = username | /uptime = system uptime
-clock_format = "[/user@/host] [/uptime] [%X]"
-
-background_update = True
-custom_cpu_name = ""
-disks_filter = ""
-mem_graphs = True
-mem_below_net = False
-zfs_arc_cached = True
-show_swap = True
-swap_disk = True
-show_disks = True
-only_physical = True
-use_fstab = True
-zfs_hide_datasets = False
-disk_free_priv = False
-show_io_stat = True
-io_mode = False
-io_graph_combined = False
-io_graph_speeds = ""
-net_download = 100
-net_upload = 100
-net_auto = True
-net_sync = False
-net_iface = ""
-show_battery = True
-selected_battery = "Auto"
-log_level = "WARNING"
-
-  '';
+  programs.btop = {
+    enable = true;
+    settings = {
+      color_theme = "TTY";
+    };
+  };
 }
diff --git a/nixos/common/desktops/hyprland/default.nix b/nixos/common/desktops/hyprland/default.nix
index ba0f21c3..6b9e0a6b 100644
--- a/nixos/common/desktops/hyprland/default.nix
+++ b/nixos/common/desktops/hyprland/default.nix
@@ -47,7 +47,7 @@
     enable = true;
     settings = {
       default_session = {
-        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd Hyprland -g 'Authorized Personnel Only'";
+        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd Hyprland";
         user = "greeter";
       };
     };