redoing some stuff
This commit is contained in:
parent
58808c57ce
commit
77c891f229
2 changed files with 118 additions and 101 deletions
|
|
@ -18,8 +18,6 @@
|
|||
foliate
|
||||
fzf
|
||||
gimp
|
||||
gnome-solanum
|
||||
gocryptfs
|
||||
helvum
|
||||
# heroic # Currently using unsafe electron version
|
||||
inkscape
|
||||
|
|
@ -35,11 +33,9 @@
|
|||
nextcloud-client
|
||||
nix-init
|
||||
obs-studio
|
||||
onlyoffice-bin_7_5
|
||||
p7zip
|
||||
platformio
|
||||
prismlauncher-qt5
|
||||
protontricks
|
||||
protonup
|
||||
qbittorrent
|
||||
quickemu
|
||||
|
|
@ -47,10 +43,7 @@
|
|||
ripgrep
|
||||
solvespace
|
||||
space-cadet-pinball
|
||||
steamtinkerlaunch
|
||||
steam-run
|
||||
tdesktop
|
||||
thunderbird
|
||||
ungoogled-chromium
|
||||
unrar
|
||||
vagrant
|
||||
|
|
|
|||
|
|
@ -1,60 +1,6 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
|
||||
let
|
||||
MangoHudConf = pkgs.writeTextFile {
|
||||
name = "MangoHud.conf";
|
||||
text = ''
|
||||
time
|
||||
fps
|
||||
gpu_stats
|
||||
gpu_temp
|
||||
vram
|
||||
cpu_stats
|
||||
cpu_temp
|
||||
ram
|
||||
frame_timing
|
||||
battery_icon
|
||||
gamepad_battery_icon
|
||||
#media_player
|
||||
|
||||
horizontal
|
||||
horizontal_stretch=0
|
||||
legacy_layout=0
|
||||
background_alpha=0
|
||||
position=top-left
|
||||
control=mangohud
|
||||
offset_x=4
|
||||
offset_y=4
|
||||
table_columns=20
|
||||
time_format=%H:%M
|
||||
toggle_hud=Shift_R+F12
|
||||
media_player_format={title} - {artist}
|
||||
font_scale_media_player=1
|
||||
|
||||
core_load_change
|
||||
cpu_color=ffffff
|
||||
cpu_load_change
|
||||
cpu_load_color=FFFFFF,FFAA7F,CC0000
|
||||
cpu_load_value=50,90
|
||||
cpu_text=CPU
|
||||
|
||||
gpu_color=ffffff
|
||||
gpu_load_change
|
||||
gpu_load_color=FFFFFF,FFAA7F,CC0000
|
||||
gpu_load_value=50,90
|
||||
gpu_text=GPU
|
||||
|
||||
io_color=ffffff
|
||||
media_player_color=ffffff
|
||||
ram_color=ffffff
|
||||
text_color=ffffff
|
||||
vram_color=ffffff
|
||||
engine_color=ffffff
|
||||
frametime_color=ffffff
|
||||
'';
|
||||
};
|
||||
|
||||
in {
|
||||
{
|
||||
fonts.fontconfig.enable = true;
|
||||
|
||||
gtk = {
|
||||
|
|
@ -111,49 +57,127 @@ in {
|
|||
wezterm = {
|
||||
enable = true;
|
||||
extraConfig = ''
|
||||
local act = wezterm.action
|
||||
local config = {}
|
||||
if wezterm.config_builder then config = wezterm.config_builder() end
|
||||
config.color_scheme = "Catppuccin Mocha"
|
||||
config.font = wezterm.font_with_fallback ({
|
||||
{family = "Hack Nerd Font", scale = 1},
|
||||
{family = "Noto Color Emoji", scale = 1},
|
||||
})
|
||||
config.initial_cols = 108
|
||||
config.initial_rows = 32
|
||||
config.enable_scroll_bar = true
|
||||
config.inactive_pane_hsb = {
|
||||
saturation = 0.7,
|
||||
brightness = 0.5
|
||||
}
|
||||
config.window_frame = {
|
||||
font = wezterm.font_with_fallback ({
|
||||
{family = "Hack Nerd Font", scale = 1},
|
||||
{family = "Noto Color Emoji", scale = 1},
|
||||
}),
|
||||
active_titlebar_bg = '#303446',
|
||||
inactive_titlebar_bg = '#303446',
|
||||
}
|
||||
config.show_new_tab_button_in_tab_bar = false
|
||||
config.hide_tab_bar_if_only_one_tab = true
|
||||
config.colors = {
|
||||
tab_bar = {
|
||||
background = '#303446',
|
||||
active_tab = {
|
||||
bg_color = '#1e1e2e',
|
||||
fg_color = '#9197b0',
|
||||
},
|
||||
inactive_tab = {
|
||||
bg_color = '#303446',
|
||||
fg_color = '#9197b0'
|
||||
},
|
||||
inactive_tab_edge = '#303062',
|
||||
}
|
||||
local act = wezterm.action
|
||||
local config = {}
|
||||
if wezterm.config_builder then config = wezterm.config_builder() end
|
||||
config.disable_default_key_bindings = true
|
||||
config.color_scheme = "Catppuccin Mocha"
|
||||
config.font = wezterm.font_with_fallback ({
|
||||
{family = "Hack Nerd Font", scale = 1},
|
||||
{family = "Noto Color Emoji", scale = 1},
|
||||
})
|
||||
config.initial_cols = 108
|
||||
config.initial_rows = 32
|
||||
config.enable_scroll_bar = true
|
||||
config.inactive_pane_hsb = {
|
||||
saturation = 0.7,
|
||||
brightness = 0.5
|
||||
}
|
||||
config.window_frame = {
|
||||
font = wezterm.font_with_fallback ({
|
||||
{family = "Hack Nerd Font", scale = 1},
|
||||
{family = "Noto Color Emoji", scale = 1},
|
||||
}),
|
||||
active_titlebar_bg = '#303446',
|
||||
inactive_titlebar_bg = '#303446',
|
||||
}
|
||||
config.show_new_tab_button_in_tab_bar = false
|
||||
config.hide_tab_bar_if_only_one_tab = true
|
||||
config.colors = {
|
||||
tab_bar = {
|
||||
background = '#303446',
|
||||
active_tab = {
|
||||
bg_color = '#1e1e2e',
|
||||
fg_color = '#9197b0',
|
||||
},
|
||||
inactive_tab = {
|
||||
bg_color = '#303446',
|
||||
fg_color = '#9197b0'
|
||||
},
|
||||
inactive_tab_edge = '#303062',
|
||||
}
|
||||
}
|
||||
config.keys = {
|
||||
{ key = 'Tab', mods = 'CTRL', action = act.ActivateTabRelative(1) },
|
||||
{ key = 'Tab', mods = 'SHIFT|CTRL', action = act.ActivateTabRelative(-1) },
|
||||
{ key = 'Enter', mods = 'ALT', action = act.ToggleFullScreen },
|
||||
{ key = ':', mods = 'SHIFT|CTRL', action = act.SplitVertical{ domain = 'CurrentPaneDomain' } },
|
||||
{ key = '?', mods = 'SHIFT|CTRL', action = act.SplitHorizontal{ domain = 'CurrentPaneDomain' } },
|
||||
{ key = '+', mods = 'CTRL', action = act.IncreaseFontSize },
|
||||
{ key = '=', mods = 'CTRL', action = act.IncreaseFontSize },
|
||||
{ key = '-', mods = 'CTRL', action = act.DecreaseFontSize },
|
||||
{ key = '_', mods = 'SHIFT|CTRL', action = act.DecreaseFontSize },
|
||||
{ key = '0', mods = 'CTRL', action = act.ResetFontSize },
|
||||
{ key = 'C', mods = 'SHIFT|CTRL', action = act.CopyTo 'Clipboard' },
|
||||
{ key = 'F', mods = 'SHIFT|CTRL', action = act.Search 'CurrentSelectionOrEmptyString' },
|
||||
{ key = 'B', mods = 'SHIFT|CTRL', action = act.ClearScrollback 'ScrollbackOnly' },
|
||||
{ key = 'R', mods = 'SHIFT|CTRL', action = act.ReloadConfiguration },
|
||||
{ key = 'T', mods = 'SHIFT|CTRL', action = act.SpawnTab 'CurrentPaneDomain' },
|
||||
{ key = 'V', mods = 'SHIFT|CTRL', action = act.PasteFrom 'Clipboard' },
|
||||
{ key = 'W', mods = 'SHIFT|CTRL', action = act.CloseCurrentTab{ confirm = true } },
|
||||
{ key = 'PageUp', mods = 'SHIFT', action = act.ScrollByPage(-1) },
|
||||
{ key = 'PageUp', mods = 'CTRL', action = act.ActivateTabRelative(-1) },
|
||||
{ key = 'PageUp', mods = 'SHIFT|CTRL', action = act.MoveTabRelative(-1) },
|
||||
{ key = 'PageDown', mods = 'SHIFT', action = act.ScrollByPage(1) },
|
||||
{ key = 'PageDown', mods = 'CTRL', action = act.ActivateTabRelative(1) },
|
||||
{ key = 'PageDown', mods = 'SHIFT|CTRL', action = act.MoveTabRelative(1) },
|
||||
{ key = 'H', mods = 'SHIFT|CTRL', action = act.ActivatePaneDirection 'Left' },
|
||||
{ key = 'L', mods = 'SHIFT|CTRL', action = act.ActivatePaneDirection 'Right' },
|
||||
{ key = 'K', mods = 'SHIFT|CTRL', action = act.ActivatePaneDirection 'Up' },
|
||||
{ key = 'J', mods = 'SHIFT|CTRL', action = act.ActivatePaneDirection 'Down' },
|
||||
}
|
||||
return config
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
home.file.".config/MangoHud/MangoHud.conf".source = MangoHudConf;
|
||||
home.file.".config/MangoHud/MangoHud.conf".text = ''
|
||||
time
|
||||
fps
|
||||
gpu_stats
|
||||
gpu_temp
|
||||
vram
|
||||
cpu_stats
|
||||
cpu_temp
|
||||
ram
|
||||
frame_timing
|
||||
battery_icon
|
||||
gamepad_battery_icon
|
||||
#media_player
|
||||
|
||||
horizontal
|
||||
horizontal_stretch=0
|
||||
legacy_layout=0
|
||||
background_alpha=0
|
||||
position=top-left
|
||||
control=mangohud
|
||||
offset_x=4
|
||||
offset_y=4
|
||||
table_columns=20
|
||||
time_format=%H:%M
|
||||
toggle_hud=Shift_R+F12
|
||||
media_player_format={title} - {artist}
|
||||
font_scale_media_player=1
|
||||
|
||||
core_load_change
|
||||
cpu_color=ffffff
|
||||
cpu_load_change
|
||||
cpu_load_color=FFFFFF,FFAA7F,CC0000
|
||||
cpu_load_value=50,90
|
||||
cpu_text=CPU
|
||||
|
||||
gpu_color=ffffff
|
||||
gpu_load_change
|
||||
gpu_load_color=FFFFFF,FFAA7F,CC0000
|
||||
gpu_load_value=50,90
|
||||
gpu_text=GPU
|
||||
|
||||
io_color=ffffff
|
||||
media_player_color=ffffff
|
||||
ram_color=ffffff
|
||||
text_color=ffffff
|
||||
vram_color=ffffff
|
||||
engine_color=ffffff
|
||||
frametime_color=ffffff
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue