diff --git a/home/config/top/btop/default.nix b/home/config/btop/default.nix similarity index 100% rename from home/config/top/btop/default.nix rename to home/config/btop/default.nix diff --git a/home/config/default.nix b/home/config/default.nix index 65bb548..0b10958 100644 --- a/home/config/default.nix +++ b/home/config/default.nix @@ -1,11 +1,10 @@ { self, config, ... } @args: let - btop = import ./top/btop args; + btop = import ./btop args; editor = import ./editorconfig args; foot = import ./foot args; fuzzel = import ./fuzzel args; git = import ./git args; gtk3 = import ./gtk/3 args; - htop = import ./top/htop args; jetbrains = import ./jetbrains args; keyd = import ./keyd args; mako = import ./mako args; @@ -18,13 +17,13 @@ waybar = import ./waybar args; yazi = import ./yazi args; in { + ".Wallpaper".source = config.module.wallpaper.path; ".config/MangoHud/MangoHud.conf".source = mangohud.config; ".config/MangoHud/presets.conf".source = mangohud.presets; ".config/btop/btop.conf".text = btop.text; ".config/foot/foot.ini".source = foot.file; ".config/fuzzel/fuzzel.ini".source = fuzzel.file; ".config/gtk-3.0/bookmarks".text = gtk3.bookmarks; - ".config/htop/htoprc".text = htop.text; ".config/keyd/app.conf".text = keyd.text; ".config/mako/config".source = mako.file; ".config/nvim/init.vim".text = nvim.text; @@ -39,10 +38,9 @@ in { ".config/yazi/yazi.toml".source = yazi.yazi; ".editorconfig".source = editor.file; ".gitconfig".source = git.file; - ".nixos".source = self; + ".ideavimrc".text = jetbrains.ideavimrc; + ".nix".source = self; ".parallel/will-cite".text = ""; ".ssh/config".text = ssh.text; - ".Wallpaper".source = config.module.wallpaper.path; ".template".source = ./template; - ".ideavimrc".text = jetbrains.ideavimrc; } diff --git a/home/config/top/htop/default.nix b/home/config/top/htop/default.nix deleted file mode 100644 index 1e2bccb..0000000 --- a/home/config/top/htop/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ util, ... }: { - text = util.trimTabs '' - # Beware! This file is rewritten by htop when settings are changed in the interface. - # The parser is also very primitive, and not human-friendly. - htop_version=3.2.2 - config_reader_min_version=3 - fields=0 48 17 18 38 39 40 2 46 47 49 1 - hide_kernel_threads=1 - hide_userland_threads=1 - hide_running_in_container=0 - shadow_other_users=0 - show_thread_names=0 - show_program_path=1 - highlight_base_name=0 - highlight_deleted_exe=1 - shadow_distribution_path_prefix=0 - highlight_megabytes=1 - highlight_threads=1 - highlight_changes=0 - highlight_changes_delay_secs=5 - find_comm_in_cmdline=1 - strip_exe_from_cmdline=1 - show_merged_command=0 - header_margin=1 - screen_tabs=0 - detailed_cpu_time=0 - cpu_count_from_one=0 - show_cpu_usage=1 - show_cpu_frequency=1 - show_cpu_temperature=1 - degree_fahrenheit=0 - update_process_names=0 - account_guest_in_cpu_meter=0 - color_scheme=0 - enable_mouse=1 - delay=15 - hide_function_bar=0 - header_layout=two_50_50 - column_meters_0=LeftCPUs2 Memory Swap - column_meter_modes_0=1 1 1 - column_meters_1=RightCPUs2 DateTime Tasks LoadAverage DiskIO NetworkIO Uptime - column_meter_modes_1=1 2 2 2 2 2 2 - tree_view=0 - sort_key=46 - tree_sort_key=0 - sort_direction=-1 - tree_sort_direction=1 - tree_view_always_by_pid=0 - all_branches_collapsed=0 - screen:Main=PID USER PRIORITY NICE M_VIRT M_RESIDENT M_SHARE STATE PERCENT_CPU PERCENT_MEM TIME Command - .sort_key=PERCENT_CPU - .tree_sort_key=PID - .tree_view=0 - .tree_view_always_by_pid=0 - .sort_direction=-1 - .tree_sort_direction=1 - .all_branches_collapsed=0 - screen:I/O=PID USER IO_PRIORITY IO_RATE IO_READ_RATE IO_WRITE_RATE - .sort_key=IO_RATE - .tree_sort_key=PID - .tree_view=0 - .tree_view_always_by_pid=0 - .sort_direction=-1 - .tree_sort_direction=1 - .all_branches_collapsed=0 - ''; -}