From 6c3513129f5861d52acfe0a56a29e01f15e70a57 Mon Sep 17 00:00:00 2001 From: William Date: Tue, 12 Dec 2023 13:28:59 -0300 Subject: [PATCH] some changes --- hosts/desktops/common/packages.nix | 1 - users/common/home.nix | 54 +------------------- users/desktops/common/home.nix | 6 --- users/desktops/common/programs.nix | 82 +++++++++++++++--------------- 4 files changed, 42 insertions(+), 101 deletions(-) diff --git a/hosts/desktops/common/packages.nix b/hosts/desktops/common/packages.nix index b5360c2..611ac01 100644 --- a/hosts/desktops/common/packages.nix +++ b/hosts/desktops/common/packages.nix @@ -54,7 +54,6 @@ # Package overrides (appimage-run.override { extraPkgs = pkgs: [ libthai ]; }) # Packages from 3rd party - koi ]; programs = { diff --git a/users/common/home.nix b/users/common/home.nix index 333e412..fcbda20 100644 --- a/users/common/home.nix +++ b/users/common/home.nix @@ -1,55 +1,6 @@ { config, pkgs, lib, ... }: -let - btop_catppuccin_mocha = pkgs.writeTextFile { - name = "catppuccin_mocha.theme"; - text = '' - theme[main_bg]="#1E1E2E" - theme[main_fg]="#CDD6F4" - theme[title]="#CDD6F4" - theme[hi_fg]="#89B4FA" - theme[selected_bg]="#45475A" - theme[selected_fg]="#89B4FA" - theme[inactive_fg]="#7F849C" - theme[graph_text]="#F5E0DC" - theme[meter_bg]="#45475A" - theme[proc_misc]="#F5E0DC" - theme[cpu_box]="#74C7EC" - theme[mem_box]="#A6E3A1" - theme[net_box]="#CBA6F7" - theme[proc_box]="#F2CDCD" - theme[div_line]="#6C7086" - theme[temp_start]="#F9E2AF" - theme[temp_mid]="#FAB387" - theme[temp_end]="#F38BA8" - theme[cpu_start]="#74C7EC" - theme[cpu_mid]="#89DCEB" - theme[cpu_end]="#94E2D5" - theme[free_start]="#94E2D5" - theme[free_mid]="#94E2D5" - theme[free_end]="#A6E3A1" - theme[cached_start]="#F5C2E7" - theme[cached_mid]="#F5C2E7" - theme[cached_end]="#CBA6F7" - theme[available_start]="#F5E0DC" - theme[available_mid]="#F2CDCD" - theme[available_end]="#F2CDCD" - theme[used_start]="#FAB387" - theme[used_mid]="#FAB387" - theme[used_end]="#F38BA8" - theme[download_start]="#B4BEFE" - theme[download_mid]="#B4BEFE" - theme[download_end]="#CBA6F7" - theme[upload_start]="#B4BEFE" - theme[upload_mid]="#B4BEFE" - theme[upload_end]="#CBA6F7" - theme[process_start]="#74C7EC" - theme[process_mid]="#89DCEB" - theme[process_end]="#94E2D5" - ''; - }; - -in { +{ home = { username = "user"; homeDirectory = "/home/user"; @@ -58,9 +9,6 @@ in { TZ = ":/etc/localtime"; EDITOR = "hx"; }; - file = { - ".config/btop/themes/catppuccin_mocha".source = btop_catppuccin_mocha; - }; packages = with pkgs; [ nix-your-shell ]; }; } diff --git a/users/desktops/common/home.nix b/users/desktops/common/home.nix index 605cb7e..ee17465 100644 --- a/users/desktops/common/home.nix +++ b/users/desktops/common/home.nix @@ -9,11 +9,5 @@ name = "breeze_cursors"; package = pkgs.breeze-icons; }; - file = { - # Autostart programs - ".config/autostart/koi.desktop".source = - config.lib.file.mkOutOfStoreSymlink - "/var/run/current-system/sw/share/applications/koi.desktop"; - }; }; } diff --git a/users/desktops/common/programs.nix b/users/desktops/common/programs.nix index fc789be..b492b83 100644 --- a/users/desktops/common/programs.nix +++ b/users/desktops/common/programs.nix @@ -57,47 +57,47 @@ wezterm = { enable = true; extraConfig = '' - 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 = { + 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 },