replace gotop with bottomnew-laptop

8 files changed, 108 insertions, 12 deletions

diff --git a/config/bottom.toml b/config/bottom.toml
new file mode 100644
index 0000000..69f48f3
--- /dev/null
+++ b/config/bottom.toml
@@ -0,0 +1,91 @@
+[flags]
+left_legend = true
+rate = 700
+current_usage = true
+case_sensitive = false
+regex = false
+temperature_type = "celsius"
+expanded_on_startup = false
+hide_table_gap = true
+# battery = false
+# Built-in themes.  Valid values are "default", "default-light", "gruvbox", "gruvbox-light", "nord", "nord-light"
+#color = "default"
+show_table_scroll_position = true
+
+[colors]
+border_color="#333333"
+highlighted_border_color="#4e3aA3"
+widget_title_color="#555555"
+selected_text_color="#ffffff"
+selected_bg_color="#4e3aA3"
+table_header_color="#888888"
+# Represents the colour of table headers (processes, CPU, disks, temperature).
+#table_header_color="LightBlue"
+# Represents the colour of the label each widget has.
+#widget_title_color="Gray"
+# Represents the average CPU color.
+#avg_cpu_color="Red"
+# Represents the colour the core will use in the CPU legend and graph.
+#cpu_core_colors=["LightMagenta", "LightYellow", "LightCyan", "LightGreen", "LightBlue", "LightRed", "Cyan", "Green", "Blue", "Red"]
+# Represents the colour RAM will use in the memory legend and graph.
+#ram_color="LightMagenta"
+# Represents the colour SWAP will use in the memory legend and graph.
+#swap_color="LightYellow"
+# Represents the colour ARC will use in the memory legend and graph.
+#arc_color="LightCyan"
+# Represents the colour the GPU will use in the memory legend and graph.
+#gpu_core_colors=["LightGreen", "LightBlue", "LightRed", "Cyan", "Green", "Blue", "Red"]
+# Represents the colour rx will use in the network legend and graph.
+#rx_color="LightCyan"
+# Represents the colour tx will use in the network legend and graph.
+#tx_color="LightGreen"
+# Represents the colour of the border of unselected widgets.
+#border_color="Gray"
+# Represents the colour of the border of selected widgets.
+#highlighted_border_color="LightBlue"
+# Represents the colour of most text.
+#text_color="Gray"
+# Represents the colour of text that is selected.
+#selected_text_color="Black"
+# Represents the background colour of text that is selected.
+#selected_bg_color="LightBlue"
+# Represents the colour of the lines and text of the graph.
+#graph_color="Gray"
+# Represents the colours of the battery based on charge
+#high_battery_color="green"
+#medium_battery_color="yellow"
+#low_battery_color="red"
+
+# Layout - layouts follow a pattern like this:
+# [[row]] represents a row in the application.
+# [[row.child]] represents either a widget or a column.
+# [[row.child.child]] represents a widget.
+[[row]]
+  ratio=30
+  [[row.child]]
+  type="cpu"
+  # ratio=6
+  # [[row.child]]
+  # ratio=1
+  # type="battery"
+[[row]]
+    ratio=30
+    [[row.child]]
+      ratio=3
+      [[row.child.child]]
+        type="net"
+      [[row.child.child]]
+        type="disk"
+    [[row.child]]
+      type="mem"
+      ratio=5
+[[row]]
+  ratio=40
+  [[row.child]]
+    type="temp"
+    ratio=3
+  [[row.child]]
+    type="proc"
+    ratio=5
+    default=true
+
diff --git a/config/nvim b/config/nvim
-Subproject 6abd26ba0c7e81237ea37da427c0269f52838d2
+Subproject 24532c4cf66ab42019c30c95f2e71960399b568
diff --git a/configuration.nix b/configuration.nix
index 1c30b42..af53443 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -94,12 +94,16 @@ in
       # xdg-desktop-portal-gtk
       xdg-desktop-portal-xapp
     ]);
+    config = {
+      common.default = "*";
+    };
   };
+  programs.darling.enable = true; # macos emu
 
   # I18n and keyboard layout
   time.timeZone = "Asia/Kolkata";
   i18n.defaultLocale = "en_US.UTF-8";
-  services.xserver.layout = "us";
+  services.xserver.xkb.layout = "us";
 
   # Home manager
   home-manager.users.imsohexy = { pkgs, ... }: {
@@ -138,15 +142,6 @@ in
     suspendKey = "ignore";
   };
 
-  # programs.firefox = {
-  #   enable = true;
-  #   preferences = {
-  #     "browser.uidensity" = 1;
-  #     "browser.compactmode.show" = true;
-  #     "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
-  #   };
-  # };
-
   nix.settings = {
     experimental-features = [ "nix-command" "flakes" ];
     auto-optimise-store = true;
diff --git a/extras/notes b/extras/notes
-Subproject 1da4d0064be48626109bd4933bed8c158fc01cf
+Subproject fbe3504d9ceb92e76a2a73a045416a486b05914
diff --git a/home.nix b/home.nix
index 54c10b7..91fa3be 100644
--- a/home.nix
+++ b/home.nix
@@ -102,6 +102,7 @@ in
     ".config/picom.conf".source = ./config/picom.conf;
     ".wyrdrc".source = ./config/remind/.wyrdrc;
     "scripts".source = ./scripts;
+    ".config/bottom/bottom.toml".source = ./config/bottom.toml;
   };
 
   # https://search.nixos.org/options?channel=unstable&from=0&size=50&sort=relevance&type=packages&query=programs.chromium
diff --git a/modules/keyboard/kmonad.k2.kbd b/modules/keyboard/kmonad.k2.kbd
index da6c072..094224b 100644
--- a/modules/keyboard/kmonad.k2.kbd
+++ b/modules/keyboard/kmonad.k2.kbd
@@ -1,3 +1,12 @@
+#| Test config
+(defcfg
+  input  (device-file "/dev/input/by-id/usb-Keychron_Keychron_K2-event-kbd")
+  output (uinput-sink "kmonad-k2")
+  fallthrough true
+  allow-cmd false
+)
+|#
+
 (defsrc
 	esc
   grv  1    2    3    4    5    6    7    8    9    0    -    =    bspc
diff --git a/packages.nix b/packages.nix
index 61002fa..21a9303 100644
--- a/packages.nix
+++ b/packages.nix
@@ -88,7 +88,7 @@ let
 
     # TUI stuff
     lf
-    gotop
+    bottom
     tremc
     wyrd
     dua
diff --git a/packages/dmenu/pkg.nix b/packages/dmenu/pkg.nix
index f7f8901..980184c 100644
--- a/packages/dmenu/pkg.nix
+++ b/packages/dmenu/pkg.nix
@@ -4,12 +4,12 @@ with pkgs.lib;
 stdenv.mkDerivation rec {
   name = "local-dmenu-${version}";
   version = "6.2.0";
+  meta = { mainProgram = "dmenu"; };
 
   src = ./source;
 
   buildInputs = [ libX11 libXinerama libXft ];
 
-
   unpackPhase = ''cp -r $src/* .'';
 
   buildPhase = ''make'';