diff --git a/README.org b/README.org index 291567f..d6a11b2 100644 --- a/README.org +++ b/README.org @@ -352,7 +352,7 @@ gzip qrencode brave scribus -appflowy +# appflowy darktable qutebrowser # firefox @@ -857,6 +857,7 @@ Kaladin is my desktop machine. A powerhouse for the most part with a recent i7 a # ethminer lutris protonup + nvtop # Dev tools <> <> diff --git a/awesome/rules.fnl b/awesome/rules.fnl index 5295b02..876f1d1 100644 --- a/awesome/rules.fnl +++ b/awesome/rules.fnl @@ -41,10 +41,8 @@ :floating true :raise true ;; :height (dpi 1200) - :width (dpi 1450) - :screen (if (= (screen.count) 3) - 2 - (screen.count)) + :width (dpi 1650) + :screen 1 :sticky true :placement awful.placement.centered ;; :size_hints_honor false diff --git a/bpytop/btop.conf b/bpytop/btop.conf index 5f0e95f..3bd8c01 100644 --- a/bpytop/btop.conf +++ b/bpytop/btop.conf @@ -1,4 +1,4 @@ -#? Config file for btop v. 1.2.8 +#? Config file for btop v. 1.2.9 #* 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" @@ -47,7 +47,7 @@ graph_symbol_net = "default" graph_symbol_proc = "default" #* Manually set which boxes to show. Available values are "cpu mem net proc", separate values with whitespace. -shown_boxes = "cpu proc" +shown_boxes = "cpu mem net proc" #* Update time in milliseconds, recommended 2000 ms or above for better sample times for graphs. update_ms = 2000 @@ -74,6 +74,9 @@ 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 @@ -98,7 +101,7 @@ cpu_invert_lower = True cpu_single_graph = False #* Show cpu box at bottom of screen instead of top. -cpu_bottom = True +cpu_bottom = False #* Shows the system uptime in the CPU box. show_uptime = True @@ -165,6 +168,9 @@ 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 diff --git a/flake.lock b/flake.lock index 8ba7a7b..9d09a22 100644 --- a/flake.lock +++ b/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1662694070, - "narHash": "sha256-QExchB6abtMlrIibrtokCcLC6lpr2goZD1mmUrKBD1A=", + "lastModified": 1663219003, + "narHash": "sha256-g+FkhLtjjWJss6mUkWYxeI1kSd1ytd7gdThm3v2bRuw=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "71739f7fe9ea259e82facd98930b6300cb340279", + "rev": "e6e2da01c61c6ee0a95ea3ecc2fe4d751caa4554", "type": "github" }, "original": { @@ -42,11 +42,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1662717397, - "narHash": "sha256-syEbuNepU1RJMVBxPzv52MpqE0CRHm4rEj7J1g55ON8=", + "lastModified": 1663227421, + "narHash": "sha256-8M2ZQPLQw0CUylKbF8pgDMQ5vxOH4i0rxwUhtPIsf7Q=", "owner": "nix-community", "repo": "home-manager", - "rev": "f9f4c8e1e77c7447db5f7edd6b8d343b4c864550", + "rev": "5408e27961599b1350b651f88715daf6e67244a7", "type": "github" }, "original": { @@ -64,11 +64,11 @@ "wlroots": "wlroots" }, "locked": { - "lastModified": 1662670949, - "narHash": "sha256-VB/34YMiW9mL6sdEAnYOqi1sjOiJcu8ZmQx3R8PI2iI=", + "lastModified": 1663169416, + "narHash": "sha256-BGN7XiiLx1D03L5j6OL7WPknxlt5cSejqfR+xQXpv5E=", "owner": "vaxerski", "repo": "Hyprland", - "rev": "928158bbfb906bd871738d60610d85634d1f8c7e", + "rev": "037d4ed422bb3bb34617f444a360a8abab6863cb", "type": "github" }, "original": { @@ -79,11 +79,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1662096612, - "narHash": "sha256-R+Q8l5JuyJryRPdiIaYpO5O3A55rT+/pItBrKcy7LM4=", + "lastModified": 1663235518, + "narHash": "sha256-q8zLK6rK/CLXEguaPgm9yQJcY0VQtOBhAT9EV2UFK/A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "21de2b973f9fee595a7a1ac4693efff791245c34", + "rev": "2277e4c9010b0f27585eb0bed0a86d7cbc079354", "type": "github" }, "original": { @@ -93,11 +93,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1662099760, - "narHash": "sha256-MdZLCTJPeHi/9fg6R9fiunyDwP3XHJqDd51zWWz9px0=", + "lastModified": 1663067291, + "narHash": "sha256-1BTrqhLMamWf53sJobtMiUDI91PEw6xF8YEwg2VE8w4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "67e45078141102f45eff1589a831aeaa3182b41e", + "rev": "d86a4619b7e80bddb6c01bc01a954f368c56d1df", "type": "github" }, "original": { @@ -109,11 +109,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1662019588, - "narHash": "sha256-oPEjHKGGVbBXqwwL+UjsveJzghWiWV0n9ogo1X6l4cw=", + "lastModified": 1663087123, + "narHash": "sha256-cNIRkF/J4mRxDtNYw+9/fBNq/NOA2nCuPOa3EdIyeDs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2da64a81275b68fdad38af669afeda43d401e94b", + "rev": "9608ace7009ce5bc3aeb940095e01553e635cbc7", "type": "github" }, "original": { @@ -134,11 +134,11 @@ }, "utils": { "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "type": "github" }, "original": { diff --git a/scripts/emacslof b/scripts/emacslof index 86fa122..ad0a49a 100755 --- a/scripts/emacslof +++ b/scripts/emacslof @@ -4,7 +4,7 @@ if [ $(pgrep -c emacsclient) -gt 0 ]; then echo hi - if [ "$XDG_SESSION_TYPE" == "x11" ]; then + if [ "$XDG_SESSION_TYPE" = "x11" ]; then #X11 emacsrg=$(wmctrl -lx | rg emacs.Emacs | rg -v org-agenda | awk '{print $1}') echo $emacsrg @@ -17,7 +17,7 @@ if [ $(pgrep -c emacsclient) -gt 0 ]; then exit fi else - if [ "$KDE_FULL_SESSION" == "true" ]; then + if [ "$KDE_FULL_SESSION" = "true" ]; then exec /home/chris/bin/ww -fa Emacs -c emacsclient exit else diff --git a/scripts/rifle-imv b/scripts/rifle-imv index 493cdca..49e7696 100755 --- a/scripts/rifle-imv +++ b/scripts/rifle-imv @@ -41,7 +41,7 @@ abspath () { listfiles () { find -L "$(dirname "$target")" -maxdepth 1 -type f -iregex \ - '.*\(jpe?g\|bmp\|png\|gif\)$' -print0 | sort -z + '.*\(jpe?g\|bmp\|png\|gif\|heic\)$' -print0 | sort -z } target="$(abspath "$1")" diff --git a/system/kaladin/configuration.nix b/system/kaladin/configuration.nix index b6e4212..a0b6f62 100644 --- a/system/kaladin/configuration.nix +++ b/system/kaladin/configuration.nix @@ -249,7 +249,7 @@ qrencode brave scribus - appflowy + # appflowy darktable qutebrowser # firefox @@ -303,6 +303,7 @@ # ethminer lutris protonup + nvtop # Dev tools android-tools nix-index diff --git a/system/syl/configuration.nix b/system/syl/configuration.nix index 985e9e9..bbfa2fd 100644 --- a/system/syl/configuration.nix +++ b/system/syl/configuration.nix @@ -262,7 +262,7 @@ qrencode brave scribus - appflowy + # appflowy darktable qutebrowser # firefox