From 61b4615aee1b82932369dd0092afd35884cb5617 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Fri, 21 Feb 2025 21:49:44 +1000 Subject: [PATCH] light cleaning --- HELIX_LSP_GUIDE | 18 --- btop.conf.bak | 248 ----------------------------- DEVDOC.md => docs/DEVDOC.md | 0 DEV_ENV => docs/DEV_ENV.md | 12 +- TODO => docs/TODO.md | 0 TODO_UI => docs/TODO_UI.md | 0 INSPIRATION => docs/inspiration.md | 0 gitkraken_issue_solution | 10 -- gitkraken_themes | 1 - homes/modules/btop.nix | 2 +- hosts/lolcathost/default.nix | 1 + hosts/myputer/default.nix | 1 + result | 1 - 13 files changed, 9 insertions(+), 285 deletions(-) delete mode 100644 HELIX_LSP_GUIDE delete mode 100644 btop.conf.bak rename DEVDOC.md => docs/DEVDOC.md (100%) rename DEV_ENV => docs/DEV_ENV.md (87%) rename TODO => docs/TODO.md (100%) rename TODO_UI => docs/TODO_UI.md (100%) rename INSPIRATION => docs/inspiration.md (100%) delete mode 100644 gitkraken_issue_solution delete mode 100644 gitkraken_themes delete mode 120000 result diff --git a/HELIX_LSP_GUIDE b/HELIX_LSP_GUIDE deleted file mode 100644 index e8bf5c5..0000000 --- a/HELIX_LSP_GUIDE +++ /dev/null @@ -1,18 +0,0 @@ -`gd` (goto definition when LSP is active) -`gy` (goto type definition) -`gr` (goto references) -`gi` (goto implementation) - -`k` (show documentation for item under cursor) -`s` (show picker for symbols in file) -`S` (show picker for symbols in workspace) -`d` (document diagnostics picker for file) -`D` (document diagnostics picker for workspace) -`r` (rename symbol) -`a` (apply code action, not show what that means though...) -`h` (select symbol references) - -`]d` (goto next diagnostic) -`[d` (goto previous diagnostic) -`]D` (goto last diagnostic in document) -`[D` (goto first diagnostic in document) diff --git a/btop.conf.bak b/btop.conf.bak deleted file mode 100644 index bbd095e..0000000 --- a/btop.conf.bak +++ /dev/null @@ -1,248 +0,0 @@ -#? Config file for btop v. 1.4.0 - -#* Name of a btop++/bpytop/bashtop formatted ".theme" file, "Default" and "TTY" for builtin themes. -#* Themes should be placed in "../share/btop/themes" relative to binary or "$HOME/.config/btop/themes" -color_theme = "Default" - -#* If the theme set background should be shown, set to False if you want terminal background transparency. -theme_background = True - -#* Sets if 24-bit truecolor should be used, will convert 24-bit colors to 256 color (6x6x6 color cube) if false. -truecolor = True - -#* Set to true to force tty mode regardless if a real tty has been detected or not. -#* Will force 16-color mode and TTY theme, set all graph symbols to "tty" and swap out other non tty friendly symbols. -force_tty = False - -#* Define presets for the layout of the boxes. Preset 0 is always all boxes shown with default settings. Max 9 presets. -#* Format: "box_name:P:G,box_name:P:G" P=(0 or 1) for alternate positions, G=graph symbol to use for box. -#* Use whitespace " " as separator between different presets. -#* Example: "cpu:0:default,mem:0:tty,proc:1:default cpu:0:braille,proc:0:tty" -presets = "cpu:1:default,proc:0:default cpu:0:default,mem:0:default,net:0:default cpu:0:block,net:0:tty" - -#* Set to True to enable "h,j,k,l,g,G" keys for directional control in lists. -#* Conflicting keys for h:"help" and k:"kill" is accessible while holding shift. -vim_keys = False - -#* Rounded corners on boxes, is ignored if TTY mode is ON. -rounded_corners = True - -#* Default symbols to use for graph creation, "braille", "block" or "tty". -#* "braille" offers the highest resolution but might not be included in all fonts. -#* "block" has half the resolution of braille but uses more common characters. -#* "tty" uses only 3 different symbols but will work with most fonts and should work in a real TTY. -#* Note that "tty" only has half the horizontal resolution of the other two, so will show a shorter historical view. -graph_symbol = "braille" - -# Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty". -graph_symbol_cpu = "default" - -# Graph symbol to use for graphs in gpu box, "default", "braille", "block" or "tty". -graph_symbol_gpu = "default" - -# Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty". -graph_symbol_mem = "default" - -# Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty". -graph_symbol_net = "default" - -# Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty". -graph_symbol_proc = "default" - -#* Manually set which boxes to show. Available values are "cpu mem net proc" and "gpu0" through "gpu5", separate values with whitespace. -shown_boxes = "cpu mem net proc" - -#* Update time in milliseconds, recommended 2000 ms or above for better sample times for graphs. -update_ms = 2000 - -#* Processes sorting, "pid" "program" "arguments" "threads" "user" "memory" "cpu lazy" "cpu direct", -#* "cpu lazy" sorts top process over time (easier to follow), "cpu direct" updates top process directly. -proc_sorting = "memory" - -#* Reverse sorting order, True or False. -proc_reversed = False - -#* Show processes as a tree. -proc_tree = False - -#* Use the cpu graph colors in the process list. -proc_colors = True - -#* Use a darkening gradient in the process list. -proc_gradient = True - -#* If process cpu usage should be of the core it's running on or usage of the total available cpu power. -proc_per_core = False - -#* Show process memory as bytes instead of percent. -proc_mem_bytes = True - -#* Show cpu graph for each process. -proc_cpu_graphs = True - -#* Use /proc/[pid]/smaps for memory information in the process info box (very slow but more accurate) -proc_info_smaps = False - -#* Show proc box on left side of screen instead of right. -proc_left = False - -#* (Linux) Filter processes tied to the Linux kernel(similar behavior to htop). -proc_filter_kernel = False - -#* In tree-view, always accumulate child process resources in the parent process. -proc_aggregate = False - -#* Sets the CPU stat shown in upper half of the CPU graph, "total" is always available. -#* Select from a list of detected attributes from the options menu. -cpu_graph_upper = "Auto" - -#* Sets the CPU stat shown in lower half of the CPU graph, "total" is always available. -#* Select from a list of detected attributes from the options menu. -cpu_graph_lower = "Auto" - -#* If gpu info should be shown in the cpu box. Available values = "Auto", "On" and "Off". -show_gpu_info = "Auto" - -#* Toggles if the lower CPU graph should be inverted. -cpu_invert_lower = True - -#* Set to True to completely disable the lower CPU graph. -cpu_single_graph = False - -#* Show cpu box at bottom of screen instead of top. -cpu_bottom = False - -#* Shows the system uptime in the CPU box. -show_uptime = True - -#* Show cpu temperature. -check_temp = True - -#* Which sensor to use for cpu temperature, use options menu to select from list of available sensors. -cpu_sensor = "Auto" - -#* Show temperatures for cpu cores also if check_temp is True and sensors has been found. -show_coretemp = True - -#* Set a custom mapping between core and coretemp, can be needed on certain cpus to get correct temperature for correct core. -#* Use lm-sensors or similar to see which cores are reporting temperatures on your machine. -#* Format "x:y" x=core with wrong temp, y=core with correct temp, use space as separator between multiple entries. -#* Example: "4:0 5:1 6:3" -cpu_core_map = "" - -#* Which temperature scale to use, available values: "celsius", "fahrenheit", "kelvin" and "rankine". -temp_scale = "celsius" - -#* Use base 10 for bits/bytes sizes, KB = 1000 instead of KiB = 1024. -base_10_sizes = False - -#* Show CPU frequency. -show_cpu_freq = True - -#* Draw a clock at top of screen, formatting according to strftime, empty string to disable. -#* Special formatting: /host = hostname | /user = username | /uptime = system uptime -clock_format = "%X" - -#* Update main ui in background when menus are showing, set this to false if the menus is flickering too much for comfort. -background_update = True - -#* Custom cpu model name, empty string to disable. -custom_cpu_name = "" - -#* Optional filter for shown disks, should be full path of a mountpoint, separate multiple values with whitespace " ". -#* Begin line with "exclude=" to change to exclude filter, otherwise defaults to "most include" filter. Example: disks_filter="exclude=/boot /home/user". -disks_filter = "" - -#* Show graphs instead of meters for memory values. -mem_graphs = True - -#* Show mem box below net box instead of above. -mem_below_net = False - -#* Count ZFS ARC in cached and available memory. -zfs_arc_cached = True - -#* If swap memory should be shown in memory box. -show_swap = True - -#* Show swap as a disk, ignores show_swap value above, inserts itself after first disk. -swap_disk = True - -#* If mem box should be split to also show disks info. -show_disks = True - -#* Filter out non physical disks. Set this to False to include network disks, RAM disks and similar. -only_physical = True - -#* Read disks list from /etc/fstab. This also disables only_physical. -use_fstab = True - -#* Setting this to True will hide all datasets, and only show ZFS pools. (IO stats will be calculated per-pool) -zfs_hide_datasets = False - -#* Set to true to show available disk space for privileged users. -disk_free_priv = False - -#* Toggles if io activity % (disk busy time) should be shown in regular disk usage view. -show_io_stat = True - -#* Toggles io mode for disks, showing big graphs for disk read/write speeds. -io_mode = False - -#* Set to True to show combined read/write io graphs in io mode. -io_graph_combined = False - -#* Set the top speed for the io graphs in MiB/s (100 by default), use format "mountpoint:speed" separate disks with whitespace " ". -#* Example: "/mnt/media:100 /:20 /boot:1". -io_graph_speeds = "" - -#* Set fixed values for network graphs in Mebibits. Is only used if net_auto is also set to False. -net_download = 100 - -net_upload = 100 - -#* Use network graphs auto rescaling mode, ignores any values set above and rescales down to 10 Kibibytes at the lowest. -net_auto = True - -#* Sync the auto scaling for download and upload to whichever currently has the highest scale. -net_sync = True - -#* Starts with the Network Interface specified here. -net_iface = "" - -#* Show battery stats in top right if battery is present. -show_battery = True - -#* Which battery to use if multiple are present. "Auto" for auto detection. -selected_battery = "Auto" - -#* Show power stats of battery next to charge indicator. -show_battery_watts = True - -#* Set loglevel for "~/.config/btop/btop.log" levels are: "ERROR" "WARNING" "INFO" "DEBUG". -#* The level set includes all lower levels, i.e. "DEBUG" will show all logging info. -log_level = "WARNING" - -#* Measure PCIe throughput on NVIDIA cards, may impact performance on certain cards. -nvml_measure_pcie_speeds = True - -#* Horizontally mirror the GPU graph. -gpu_mirror_graph = True - -#* Custom gpu0 model name, empty string to disable. -custom_gpu_name0 = "" - -#* Custom gpu1 model name, empty string to disable. -custom_gpu_name1 = "" - -#* Custom gpu2 model name, empty string to disable. -custom_gpu_name2 = "" - -#* Custom gpu3 model name, empty string to disable. -custom_gpu_name3 = "" - -#* Custom gpu4 model name, empty string to disable. -custom_gpu_name4 = "" - -#* Custom gpu5 model name, empty string to disable. -custom_gpu_name5 = "" diff --git a/DEVDOC.md b/docs/DEVDOC.md similarity index 100% rename from DEVDOC.md rename to docs/DEVDOC.md diff --git a/DEV_ENV b/docs/DEV_ENV.md similarity index 87% rename from DEV_ENV rename to docs/DEV_ENV.md index 32e6adf..65e8bb0 100644 --- a/DEV_ENV +++ b/docs/DEV_ENV.md @@ -4,13 +4,13 @@ for NixOS to be a good development environment. Issues I've encountered: - [X] Audio not working -- [ ] Tesseract is a pain in the ass to setup on Nix +- [X] Tesseract is a pain in the ass to setup on Nix - [ ] ags no longer supports `-t` flag, so applauncher won't work, requires switching to Astral - [ ] script to enable/disable passwordless sudo -- [ ] Move Emile.Vault to new vault (I lost the password...) +- [X] Move Emile.Vault to new vault (I lost the password...) -- [ ] Add a simple and ugly bar +- [X] Add a simple and ugly bar - [ ] Install powertop (funny name) for monitoring power usage by processes - [ ] Try to make my battery life bettery @@ -20,7 +20,7 @@ Issues I've encountered: 2. Imperative development environment behind NixOS (declarative), similar to python's virtualenv but for the entirety of my system. -- [ ] Call my wishlist command "subspace (highway)" (Scott Pilgrim reference) +- [X] Call my wishlist command "subspace (highway)" (Scott Pilgrim reference) - [ ] Create a GitHub profile readme like this persons: https://github.com/yuyudhn @@ -46,8 +46,8 @@ similar to python's virtualenv but for the entirety of my system. TODO: - [X] make btop theming declarative -- [ ] Merge laptop and PC dotfiles repos - +- [X] Merge laptop and PC dotfiles repos +- [ ] declaratively install themes for gitkraken using home-manager Cool Technologies: - wishlist (by charmbracelet) diff --git a/TODO b/docs/TODO.md similarity index 100% rename from TODO rename to docs/TODO.md diff --git a/TODO_UI b/docs/TODO_UI.md similarity index 100% rename from TODO_UI rename to docs/TODO_UI.md diff --git a/INSPIRATION b/docs/inspiration.md similarity index 100% rename from INSPIRATION rename to docs/inspiration.md diff --git a/gitkraken_issue_solution b/gitkraken_issue_solution deleted file mode 100644 index 4d8b58b..0000000 --- a/gitkraken_issue_solution +++ /dev/null @@ -1,10 +0,0 @@ -If gitkraken won't work make sure: - -The ssh-agent is running and "$SSH_AUTH_SOCK" equals "$XDG_RUNTIME_DIR/ssh-agent" -(this is the known ssh-agent issue I've already solved). - -Next make sure whatever you're cloning/etc from is in your ~/.ssh/known_hosts file -(if using ssh). Gitkraken may fail to do this automatically. ie for gitlab run: -```sh -ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts -``` diff --git a/gitkraken_themes b/gitkraken_themes deleted file mode 100644 index e7afa74..0000000 --- a/gitkraken_themes +++ /dev/null @@ -1 +0,0 @@ -https://jonbunator.github.io/gitkraken-custom-themes/#dracula---source diff --git a/homes/modules/btop.nix b/homes/modules/btop.nix index 119da4f..918eb25 100644 --- a/homes/modules/btop.nix +++ b/homes/modules/btop.nix @@ -18,7 +18,7 @@ background_update = true; update_ms = 2000; rounded_corners = false; - graph_symbol = "braille"; # braille/block/tty + graph_symbol = "block"; # braille/block/tty graph_symbol_cpu = "default"; graph_symbol_mem = "default"; graph_symbol_net = "default"; diff --git a/hosts/lolcathost/default.nix b/hosts/lolcathost/default.nix index 42defdb..2c4d794 100755 --- a/hosts/lolcathost/default.nix +++ b/hosts/lolcathost/default.nix @@ -204,6 +204,7 @@ in { # Pretty necessary git + git-filter-repo brightnessctl acpi vim diff --git a/hosts/myputer/default.nix b/hosts/myputer/default.nix index 73d2eb1..3f5afed 100755 --- a/hosts/myputer/default.nix +++ b/hosts/myputer/default.nix @@ -208,6 +208,7 @@ in { # Pretty necessary git + git-filter-repo brightnessctl acpi vim diff --git a/result b/result deleted file mode 120000 index fab173e..0000000 --- a/result +++ /dev/null @@ -1 +0,0 @@ -/nix/store/clc95m2c889yns3n8c71vfgb1q2qd419-nixos-system-myputer-24.11.20250212.0ff09db \ No newline at end of file