fix jade

home-manager/jade/default.nix

@@ -1,20 +1,19 @@
 { inputs, outputs, lib, config, pkgs, ... }:
 
 {
-  imports = [
-    ./xmonad
-  ];
+  imports = [ ];
 
   home.packages = with pkgs; [
     dmenu
     feh
     wezterm
+    xmobar-jsm
   ];
   
-  xdg.configFile = {
-    wezterm = { source = ./wezterm; recursive = true; };
+  xsession.windowManager.xmonad = {
+    enable = true;
+    enableContribAndExtras = true;
+    config = /etc/nixos/home-manager/jade/xmonad-jsm/src/xmonad.hs;
   };
-
-  home.file.".xinitrc".source = ./xinitrc;
 }
 

home-manager/jade/wezterm/colors/gruvbox_material_dark_hard.toml

@@ -1,36 +0,0 @@
-[colors]
-background = '#1d2021'
-foreground = '#d4be98'
-selection_bg = '#d4be98'
-selection_fg = '#3c3836'
-cursor_bg = '#d4be98'
-cursor_fg = '#1d2021'
-cursor_border = '#d4be98'
-
-ansi = [
-    '#1d2021',
-    '#ea6962',
-    '#a9b665',
-    '#d8a657',
-    '#7daea3',
-    '#d3869b',
-    '#89b482',
-    '#d4be98',
-]
-
-brights = [
-    '#7c6f64',
-    '#ea6962',
-    '#a9b665',
-    '#d8a657',
-    '#7daea3',
-    '#d3869b',
-    '#89b482',
-    '#d4be98',
-]
-
-[colors.indexed]
-
-[metadata]
-name = 'gruvbox_material_dark_hard'
-origin_url = 'https://gist.github.com/theoriginalstove/89aa16316a756721816886398080dbd6'

home-manager/jade/wezterm/wezterm.lua

@@ -1,113 +0,0 @@
--- Pull in the wezterm API
-local wezterm = require 'wezterm'
-local act = wezterm.action
-
--- This table will hold the configuration.
-local config = {}
-
--- In newer versions of wezterm, use the config_builder which will
--- help provide clearer error messages
-if wezterm.config_builder then
-  config = wezterm.config_builder()
-end
-
--- This function returns the suggested title for a tab.
--- It prefers the title that was set via `tab:set_title()`
--- or `wezterm cli set-tab-title`, but falls back to the
--- title of the active pane in that tab.
-function tab_title(tab_info)
-  local title = tab_info.tab_title
-  -- if the tab title is explicitly set, take that
-  if title and #title > 0 then
-    return title
-  end
-  -- Otherwise, use the title from the active pane
-  -- in that tab
-  return tab_info.active_pane.title
-end
-
-wezterm.on(
-  'format-tab-title',
-  function(tab, tabs, panes, config, hover, max_width)
-    local title = tab_title(tab)
-    return { { Text = ' ' .. title .. '' }, }
-  end
-)
-
--- Do not check for or show window with update information
-config.check_for_updates = false
-config.show_update_window = false
-
--- Font
-config.font = wezterm.font 'Fira Code'
-config.font_size = 10.0
-
--- Color scheme
-config.color_scheme = 'gruvbox_material_dark_hard'
-
--- Padding
-config.window_padding = {
-  left   = 20,
-  right  = 20,
-  top    = 20,
-  bottom = 0,
-}
-
--- Tab bar appearance
-config.use_fancy_tab_bar            = false
-config.enable_tab_bar               = true
-config.hide_tab_bar_if_only_one_tab = false
-config.tab_bar_at_bottom            = true
-config.tab_max_width                = 24
-config.show_tab_index_in_tab_bar    = false
-
--- Colors
-config.colors = {
-  tab_bar = {
-    background = '#1d2021',
-    -- style tabs
-    active_tab          = { bg_color = '#1d2021', fg_color = '#d3869b', intensity = 'Bold', italic = false, },
-    inactive_tab        = { bg_color = '#1d2021', fg_color = '#7daea3', intensity = 'Bold', italic = false, },
-    inactive_tab_hover  = { bg_color = '#1d2021', fg_color = '#7daea3', intensity = 'Bold', italic = false, },
-    new_tab             = { bg_color = '#1d2021', fg_color = '#7c6f64', intensity = 'Bold', italic = false, },
-    new_tab_hover       = { bg_color = '#1d2021', fg_color = '#7c6f64', intensity = 'Bold', italic = false, },
-  }
-}
-
--- Key Assignments
-config.disable_default_key_bindings = true
-config.keys = {}
-
-for i = 1, 8 do
-  -- CTRL+ALT + number to activate that tab
-  table.insert(config.keys, {
-    key = tostring(i),
-    mods = 'CTRL|ALT',
-    action = act.ActivateTab(i - 1),
-  })
-end
-
-config.keys = {
-  -- Tabs
-  { key = 't', mods = 'ALT',      action = act.SpawnTab 'CurrentPaneDomain',        },
-  { key = 'w', mods = "ALT|CTRL", action = act.CloseCurrentTab { confirm = false }, },
-
-  -- Panes
-  { key = 'v', mods = 'ALT', action = act.SplitVertical    { domain  = 'CurrentPaneDomain' }, },
-  { key = 'h', mods = 'ALT', action = act.SplitHorizontal  { domain  = 'CurrentPaneDomain' }, },
-  { key = 'x', mods = "ALT", action = act.CloseCurrentPane { confirm = false               }, },
-
-  -- Navigation
-  { key = 'LeftArrow',  mods = 'ALT', action = act.ActivateTabRelative(-1)       },
-  { key = 'RightArrow', mods = 'ALT', action = act.ActivateTabRelative(1)        },
-  { key = 'DownArrow',  mods = 'ALT', action = act.ActivatePaneDirection 'Next', },
-  { key = 'UpArrow',    mods = 'ALT', action = act.ActivatePaneDirection 'Prev', },
-
-  -- Copy Mode / Clipboard
-  { key = 'X', mods = 'CTRL', action = act.ActivateCopyMode,                         },
-  { key = 'C', mods = 'CTRL', action = act.CopyTo    'ClipboardAndPrimarySelection', },
-  { key = 'V', mods = 'CTRL', action = act.PasteFrom 'Clipboard',                    },
-}
-
-return config
-

home-manager/jade/xinitrc

@@ -1,10 +0,0 @@
-#/bin/bash
-
-# Setup our monitors
-xrandr --output HDMI-A-0 --mode 1920x1080 --output DisplayPort-0 --mode 2560x1440 --right-of HDMI-A-0
-
-# Apply our wallpaper
-feh --bg-scale /etc/nixos/assets/chinatown.png
-
-# Launch our window manager
-exec xmonad

home-manager/jade/xmonad/default.nix

@@ -1,10 +0,0 @@
-{ inputs, outputs, lib, config, pkgs, ... }:
-
-{
-  xsession.windowManager.xmonad = {
-    enable = true;
-    enableContribAndExtras = true;
-    config = /etc/nixos/home-manager/jade/xmonad/xmonad-jsm/src/xmonad.hs;
-  };
-}
-