dotfiles
My PC Dotfiles & Websitegit clone https://github.com/maydayv7/dotfiles
commit bcfbdcd0258e23fbf0d4a00a0fa129c3dd059825 parent 26776dbdcc8c7a67495506c78132e9124e517ea9 Author: maydayv7 <maydayv7@gmail.com> Date: Tue, 19 Sep 2023 23:05:03 +0530 feat: Update GNOME Experience + Remove `touchegg` Support + Fix Scripts and Checks
Diffstat:
| M | .version | | | 4 | ++-- |
| M | README.md | | | 7 | ++++--- |
| M | files/README.md | | | 1 | - |
| M | files/archive/Linux/Pop/conky/conky.lua | | | 944 | ++++++++++++++++++++++++++++++++++++++++---------------------------------------- |
| M | files/default.nix | | | 3 | --- |
| M | files/gnome/dconf.nix | | | 206 | +++++++++++++++++++++++++------------------------------------------------------ |
| D | files/touchegg/touchegg.conf | | | 109 | ------------------------------------------------------------------------------- |
| M | files/vscode/settings.json | | | 2 | +- |
| M | modules/base/firmware.nix | | | 1 | - |
| M | modules/gui/gnome.nix | | | 22 | +++++++++++----------- |
| M | modules/nix/checks.nix | | | 2 | +- |
| M | packages/dotfiles.nix | | | 2 | +- |
| M | packages/fly-pie.nix | | | 4 | ++-- |
| M | scripts/packages.sh | | | 8 | ++++---- |
| M | shells/python.nix | | | 3 | +-- |
15 files changed, 563 insertions(+), 755 deletions(-)
diff --git a/.version b/.version @@ -1 +1 @@ -22.11 -\ No newline at end of file +23.05 +\ No newline at end of file diff --git a/README.md b/README.md @@ -1,7 +1,7 @@   -   [](https://nixos.org) +   [](https://nixos.org) This [repository](https://github.com/maydayv7/dotfiles) contains the configuration and `dotfiles` for my continuously evolving multi-PC setup (using [Nix](https://nixos.org/)). All the devices I own, controlled by code. It also builds and deploys my website to [maydayv7.tk](https://maydayv7.tk). You can follow along with my [NixOS Desktop](https://maydayv7.tk/series/nixos-desktop/) Series @@ -420,13 +420,14 @@ You can navigate to the `README`'s present in the various directories to know mo <details> <summary><b>Changelog</b></summary> -### 23.xy (v12) +### 23.05 (v12) -- Upgrade to NixOS v22.11 (Raccoon)! +- Upgrade to NixOS v23.05 (Stoat)! - Drop `cod`, `nix-linter` and `mutter-rounded` - Fix GNOME Extensions - Improve XFCE Configuration Handling - Improve Automatic Package Update Script +- Drop `touchegg` Support ### 22.11 (v11) diff --git a/files/README.md b/files/README.md @@ -16,7 +16,6 @@ The `files` directory is used to store all my plain-text program configuration f - [`neofetch`](./neofetch) - `neofetch` CLI Theming - [`plank`](./plank) - `plank` Dock Theming - [`templates`](./templates) - Document Templates -- [`touchegg`](./touchegg) - X11 Gestures provided by `touchegg` - [`vscode`](./vscode) - Visual Studio Code Editor Configuration - [`wine`](./wine) - Configuration and Theming for `wine` applications - [`xdg`](./xdg) - XDG Desktop Utilities Configuration diff --git a/files/archive/Linux/Pop/conky/conky.lua b/files/archive/Linux/Pop/conky/conky.lua @@ -10,544 +10,544 @@ require("cairo") -- Clock DATA -- HOURS clock_h = { - { - name = "time", - arg = "%H", - max_value = 12, - x = 110, - y = 80, - graph_radius = 53, - graph_thickness = 3, - graph_unit_angle = 30, - graph_unit_thickness = 30, - graph_bg_colour = 0xffffff, - graph_bg_alpha = 0.0, - graph_fg_colour = 0xFFFFFF, - graph_fg_alpha = 0.3, - txt_radius = 34, - txt_weight = 1, - txt_size = 10.0, - txt_fg_colour = 0xFFFFFF, - txt_fg_alpha = 0.6, - graduation_radius = 53, - graduation_thickness = 6, - graduation_mark_thickness = 2, - graduation_unit_angle = 30, - graduation_fg_colour = 0xFFFFFF, - graduation_fg_alpha = 0.3, - }, + { + name = "time", + arg = "%H", + max_value = 12, + x = 110, + y = 80, + graph_radius = 53, + graph_thickness = 3, + graph_unit_angle = 30, + graph_unit_thickness = 30, + graph_bg_colour = 0xffffff, + graph_bg_alpha = 0.0, + graph_fg_colour = 0xFFFFFF, + graph_fg_alpha = 0.3, + txt_radius = 34, + txt_weight = 1, + txt_size = 10.0, + txt_fg_colour = 0xFFFFFF, + txt_fg_alpha = 0.6, + graduation_radius = 53, + graduation_thickness = 6, + graduation_mark_thickness = 2, + graduation_unit_angle = 30, + graduation_fg_colour = 0xFFFFFF, + graduation_fg_alpha = 0.3, + }, } -- MINUTES clock_m = { - { - name = "time", - arg = "%M", - max_value = 60, - x = 110, - y = 80, - graph_radius = 57, - graph_thickness = 2, - graph_unit_angle = 6, - graph_unit_thickness = 6, - graph_bg_colour = 0xffffff, - graph_bg_alpha = 0.1, - graph_fg_colour = 0xFFFFFF, - graph_fg_alpha = 0.3, - txt_radius = 70, - txt_weight = 0, - txt_size = 9.0, - txt_fg_colour = 0xFFFFFF, - txt_fg_alpha = 0.6, - graduation_radius = 57, - graduation_thickness = 0, - graduation_mark_thickness = 2, - graduation_unit_angle = 30, - graduation_fg_colour = 0xFFFFFF, - graduation_fg_alpha = 0.3, - }, + { + name = "time", + arg = "%M", + max_value = 60, + x = 110, + y = 80, + graph_radius = 57, + graph_thickness = 2, + graph_unit_angle = 6, + graph_unit_thickness = 6, + graph_bg_colour = 0xffffff, + graph_bg_alpha = 0.1, + graph_fg_colour = 0xFFFFFF, + graph_fg_alpha = 0.3, + txt_radius = 70, + txt_weight = 0, + txt_size = 9.0, + txt_fg_colour = 0xFFFFFF, + txt_fg_alpha = 0.6, + graduation_radius = 57, + graduation_thickness = 0, + graduation_mark_thickness = 2, + graduation_unit_angle = 30, + graduation_fg_colour = 0xFFFFFF, + graduation_fg_alpha = 0.3, + }, } -- SECONDS clock_s = { - { - name = "time", - arg = "%S", - max_value = 60, - x = 110, - y = 80, - graph_radius = 50, - graph_thickness = 2, - graph_unit_angle = 6, - graph_unit_thickness = 2, - graph_bg_colour = 0xffffff, - graph_bg_alpha = 0.0, - graph_fg_colour = 0xFFFFFF, - graph_fg_alpha = 0.2, - txt_radius = 40, - txt_weight = 0, - txt_size = 12.0, - txt_fg_colour = 0xFFFFFF, - txt_fg_alpha = 0.3, - graduation_radius = 0, - graduation_thickness = 0, - graduation_mark_thickness = 0, - graduation_unit_angle = 0, - graduation_fg_colour = 0xFFFFFF, - graduation_fg_alpha = 0.0, - }, + { + name = "time", + arg = "%S", + max_value = 60, + x = 110, + y = 80, + graph_radius = 50, + graph_thickness = 2, + graph_unit_angle = 6, + graph_unit_thickness = 2, + graph_bg_colour = 0xffffff, + graph_bg_alpha = 0.0, + graph_fg_colour = 0xFFFFFF, + graph_fg_alpha = 0.2, + txt_radius = 40, + txt_weight = 0, + txt_size = 12.0, + txt_fg_colour = 0xFFFFFF, + txt_fg_alpha = 0.3, + graduation_radius = 0, + graduation_thickness = 0, + graduation_mark_thickness = 0, + graduation_unit_angle = 0, + graduation_fg_colour = 0xFFFFFF, + graduation_fg_alpha = 0.0, + }, } -------------------------------------------------------------------------------- -- Gauge DATA gauge = { - { - name = "cpu", - arg = "cpu0", - max_value = 100, - x = 85, - y = 200, - graph_radius = 24, - graph_thickness = 5, - graph_start_angle = 180, - graph_unit_angle = 2.7, - graph_unit_thickness = 2.7, - graph_bg_colour = 0xffffff, - graph_bg_alpha = 0.1, - graph_fg_colour = 0xFFFFFF, - graph_fg_alpha = 0.2, - hand_fg_colour = 0xEF5A29, - hand_fg_alpha = 1.0, - txt_radius = 34, - txt_weight = 0, - txt_size = 8.0, - txt_fg_colour = 0xEF5A29, - txt_fg_alpha = 1.0, - graduation_radius = 28, - graduation_thickness = 0, - graduation_mark_thickness = 1, - graduation_unit_angle = 27, - graduation_fg_colour = 0xFFFFFF, - graduation_fg_alpha = 0.3, - caption = "", - caption_weight = 1, - caption_size = 8.0, - caption_fg_colour = 0xFFFFFF, - caption_fg_alpha = 0.3, - }, - { - name = "cpu", - arg = "cpu1", - max_value = 100, - x = 85, - y = 200, - graph_radius = 18, - graph_thickness = 5, - graph_start_angle = 180, - graph_unit_angle = 2.7, - graph_unit_thickness = 2.7, - graph_bg_colour = 0xffffff, - graph_bg_alpha = 0.1, - graph_fg_colour = 0xFFFFFF, - graph_fg_alpha = 0.2, - hand_fg_colour = 0xEF5A29, - hand_fg_alpha = 1.0, - txt_radius = 10, - txt_weight = 0, - txt_size = 8.0, - txt_fg_colour = 0xEF5A29, - txt_fg_alpha = 1.0, - graduation_radius = 28, - graduation_thickness = 0, - graduation_mark_thickness = 1, - graduation_unit_angle = 27, - graduation_fg_colour = 0xFFFFFF, - graduation_fg_alpha = 0.3, - caption = "", - caption_weight = 1, - caption_size = 8.0, - caption_fg_colour = 0xFFFFFF, - caption_fg_alpha = 0.3, - }, - { - name = "memperc", - arg = "", - max_value = 100, - x = 85, - y = 300, - graph_radius = 24, - graph_thickness = 5, - graph_start_angle = 180, - graph_unit_angle = 2.7, - graph_unit_thickness = 2.7, - graph_bg_colour = 0xffffff, - graph_bg_alpha = 0.1, - graph_fg_colour = 0xFFFFFF, - graph_fg_alpha = 0.2, - hand_fg_colour = 0xEF5A29, - hand_fg_alpha = 1.0, - txt_radius = 10, - txt_weight = 0, - txt_size = 8.0, - txt_fg_colour = 0xEF5A29, - txt_fg_alpha = 1.0, - graduation_radius = 23, - graduation_thickness = 0, - graduation_mark_thickness = 2, - graduation_unit_angle = 27, - graduation_fg_colour = 0xFFFFFF, - graduation_fg_alpha = 0.5, - caption = "", - caption_weight = 1, - caption_size = 8.0, - caption_fg_colour = 0xFFFFFF, - caption_fg_alpha = 0.3, - }, - { - name = "fs_used_perc", - arg = "/", - max_value = 100, - x = 85, - y = 380, - graph_radius = 24, - graph_thickness = 5, - graph_start_angle = 180, - graph_unit_angle = 2.7, - graph_unit_thickness = 2.7, - graph_bg_colour = 0xffffff, - graph_bg_alpha = 0.1, - graph_fg_colour = 0xFFFFFF, - graph_fg_alpha = 0.2, - hand_fg_colour = 0xEF5A29, - hand_fg_alpha = 1.0, - txt_radius = 34, - txt_weight = 0, - txt_size = 8.0, - txt_fg_colour = 0xEF5A29, - txt_fg_alpha = 1.0, - graduation_radius = 28, - graduation_thickness = 0, - graduation_mark_thickness = 1, - graduation_unit_angle = 27, - graduation_fg_colour = 0xFFFFFF, - graduation_fg_alpha = 0.3, - caption = "/", - caption_weight = 1, - caption_size = 8.0, - caption_fg_colour = 0xFFFFFF, - caption_fg_alpha = 0.5, - }, - { - name = "fs_used_perc", - arg = "/home/", - max_value = 100, - x = 85, - y = 380, - graph_radius = 18, - graph_thickness = 5, - graph_start_angle = 180, - graph_unit_angle = 2.7, - graph_unit_thickness = 2.7, - graph_bg_colour = 0xffffff, - graph_bg_alpha = 0.1, - graph_fg_colour = 0xFFFFFF, - graph_fg_alpha = 0.2, - hand_fg_colour = 0xEF5A29, - hand_fg_alpha = 1.0, - txt_radius = 10, - txt_weight = 0, - txt_size = 8.0, - txt_fg_colour = 0xEF5A29, - txt_fg_alpha = 1.0, - graduation_radius = 28, - graduation_thickness = 0, - graduation_mark_thickness = 1, - graduation_unit_angle = 27, - graduation_fg_colour = 0xFFFFFF, - graduation_fg_alpha = 0.3, - caption = "/home", - caption_weight = 1, - caption_size = 8.0, - caption_fg_colour = 0xFFFFFF, - caption_fg_alpha = 0.5, - }, + { + name = "cpu", + arg = "cpu0", + max_value = 100, + x = 85, + y = 200, + graph_radius = 24, + graph_thickness = 5, + graph_start_angle = 180, + graph_unit_angle = 2.7, + graph_unit_thickness = 2.7, + graph_bg_colour = 0xffffff, + graph_bg_alpha = 0.1, + graph_fg_colour = 0xFFFFFF, + graph_fg_alpha = 0.2, + hand_fg_colour = 0xEF5A29, + hand_fg_alpha = 1.0, + txt_radius = 34, + txt_weight = 0, + txt_size = 8.0, + txt_fg_colour = 0xEF5A29, + txt_fg_alpha = 1.0, + graduation_radius = 28, + graduation_thickness = 0, + graduation_mark_thickness = 1, + graduation_unit_angle = 27, + graduation_fg_colour = 0xFFFFFF, + graduation_fg_alpha = 0.3, + caption = "", + caption_weight = 1, + caption_size = 8.0, + caption_fg_colour = 0xFFFFFF, + caption_fg_alpha = 0.3, + }, + { + name = "cpu", + arg = "cpu1", + max_value = 100, + x = 85, + y = 200, + graph_radius = 18, + graph_thickness = 5, + graph_start_angle = 180, + graph_unit_angle = 2.7, + graph_unit_thickness = 2.7, + graph_bg_colour = 0xffffff, + graph_bg_alpha = 0.1, + graph_fg_colour = 0xFFFFFF, + graph_fg_alpha = 0.2, + hand_fg_colour = 0xEF5A29, + hand_fg_alpha = 1.0, + txt_radius = 10, + txt_weight = 0, + txt_size = 8.0, + txt_fg_colour = 0xEF5A29, + txt_fg_alpha = 1.0, + graduation_radius = 28, + graduation_thickness = 0, + graduation_mark_thickness = 1, + graduation_unit_angle = 27, + graduation_fg_colour = 0xFFFFFF, + graduation_fg_alpha = 0.3, + caption = "", + caption_weight = 1, + caption_size = 8.0, + caption_fg_colour = 0xFFFFFF, + caption_fg_alpha = 0.3, + }, + { + name = "memperc", + arg = "", + max_value = 100, + x = 85, + y = 300, + graph_radius = 24, + graph_thickness = 5, + graph_start_angle = 180, + graph_unit_angle = 2.7, + graph_unit_thickness = 2.7, + graph_bg_colour = 0xffffff, + graph_bg_alpha = 0.1, + graph_fg_colour = 0xFFFFFF, + graph_fg_alpha = 0.2, + hand_fg_colour = 0xEF5A29, + hand_fg_alpha = 1.0, + txt_radius = 10, + txt_weight = 0, + txt_size = 8.0, + txt_fg_colour = 0xEF5A29, + txt_fg_alpha = 1.0, + graduation_radius = 23, + graduation_thickness = 0, + graduation_mark_thickness = 2, + graduation_unit_angle = 27, + graduation_fg_colour = 0xFFFFFF, + graduation_fg_alpha = 0.5, + caption = "", + caption_weight = 1, + caption_size = 8.0, + caption_fg_colour = 0xFFFFFF, + caption_fg_alpha = 0.3, + }, + { + name = "fs_used_perc", + arg = "/", + max_value = 100, + x = 85, + y = 380, + graph_radius = 24, + graph_thickness = 5, + graph_start_angle = 180, + graph_unit_angle = 2.7, + graph_unit_thickness = 2.7, + graph_bg_colour = 0xffffff, + graph_bg_alpha = 0.1, + graph_fg_colour = 0xFFFFFF, + graph_fg_alpha = 0.2, + hand_fg_colour = 0xEF5A29, + hand_fg_alpha = 1.0, + txt_radius = 34, + txt_weight = 0, + txt_size = 8.0, + txt_fg_colour = 0xEF5A29, + txt_fg_alpha = 1.0, + graduation_radius = 28, + graduation_thickness = 0, + graduation_mark_thickness = 1, + graduation_unit_angle = 27, + graduation_fg_colour = 0xFFFFFF, + graduation_fg_alpha = 0.3, + caption = "/", + caption_weight = 1, + caption_size = 8.0, + caption_fg_colour = 0xFFFFFF, + caption_fg_alpha = 0.5, + }, + { + name = "fs_used_perc", + arg = "/home/", + max_value = 100, + x = 85, + y = 380, + graph_radius = 18, + graph_thickness = 5, + graph_start_angle = 180, + graph_unit_angle = 2.7, + graph_unit_thickness = 2.7, + graph_bg_colour = 0xffffff, + graph_bg_alpha = 0.1, + graph_fg_colour = 0xFFFFFF, + graph_fg_alpha = 0.2, + hand_fg_colour = 0xEF5A29, + hand_fg_alpha = 1.0, + txt_radius = 10, + txt_weight = 0, + txt_size = 8.0, + txt_fg_colour = 0xEF5A29, + txt_fg_alpha = 1.0, + graduation_radius = 28, + graduation_thickness = 0, + graduation_mark_thickness = 1, + graduation_unit_angle = 27, + graduation_fg_colour = 0xFFFFFF, + graduation_fg_alpha = 0.3, + caption = "/home", + caption_weight = 1, + caption_size = 8.0, + caption_fg_colour = 0xFFFFFF, + caption_fg_alpha = 0.5, + }, } ------------------------------------------------------------------------------- -- Converts Color in Hexa to Decimal -- function rgb_to_r_g_b(colour, alpha) - return ((colour / 0x10000) % 0x100) / 255., ((colour / 0x100) % 0x100) / 255., (colour % 0x100) / 255., alpha + return ((colour / 0x10000) % 0x100) / 255., ((colour / 0x100) % 0x100) / 255., (colour % 0x100) / 255., alpha end ------------------------------------------------------------------------------- -- Converts Degree to rad and Rotates (0 is on the Top) -- function angle_to_position(start_angle, current_angle) - local pos = current_angle + start_angle - return ((pos * (2 * math.pi / 360)) - (math.pi / 2)) + local pos = current_angle + start_angle + return ((pos * (2 * math.pi / 360)) - (math.pi / 2)) end ------------------------------------------------------------------------------- -- Displays Clock -- function draw_clock_ring(display, data, value) - local max_value = data["max_value"] - local x, y = data["x"], data["y"] - local graph_radius = data["graph_radius"] - local graph_thickness, graph_unit_thickness = data["graph_thickness"], data["graph_unit_thickness"] - local graph_unit_angle = data["graph_unit_angle"] - local graph_bg_colour, graph_bg_alpha = data["graph_bg_colour"], data["graph_bg_alpha"] - local graph_fg_colour, graph_fg_alpha = data["graph_fg_colour"], data["graph_fg_alpha"] + local max_value = data["max_value"] + local x, y = data["x"], data["y"] + local graph_radius = data["graph_radius"] + local graph_thickness, graph_unit_thickness = data["graph_thickness"], data["graph_unit_thickness"] + local graph_unit_angle = data["graph_unit_angle"] + local graph_bg_colour, graph_bg_alpha = data["graph_bg_colour"], data["graph_bg_alpha"] + local graph_fg_colour, graph_fg_alpha = data["graph_fg_colour"], data["graph_fg_alpha"] - -- Background Ring - cairo_arc(display, x, y, graph_radius, 0, 2 * math.pi) - cairo_set_source_rgba(display, rgb_to_r_g_b(graph_bg_colour, graph_bg_alpha)) - cairo_set_line_width(display, graph_thickness) - cairo_stroke(display) + -- Background Ring + cairo_arc(display, x, y, graph_radius, 0, 2 * math.pi) + cairo_set_source_rgba(display, rgb_to_r_g_b(graph_bg_colour, graph_bg_alpha)) + cairo_set_line_width(display, graph_thickness) + cairo_stroke(display) - -- Arc - local val = (value % max_value) - local i = 1 - while i <= val do - cairo_arc( - display, - x, - y, - graph_radius, - (((graph_unit_angle * i) - graph_unit_thickness) * (2 * math.pi / 360)) - (math.pi / 2), - ((graph_unit_angle * i) * (2 * math.pi / 360)) - (math.pi / 2) - ) - cairo_set_source_rgba(display, rgb_to_r_g_b(graph_fg_colour, graph_fg_alpha)) - cairo_stroke(display) - i = i + 1 - end - local angle = (graph_unit_angle * i) - graph_unit_thickness + -- Arc + local val = (value % max_value) + local i = 1 + while i <= val do + cairo_arc( + display, + x, + y, + graph_radius, + (((graph_unit_angle * i) - graph_unit_thickness) * (2 * math.pi / 360)) - (math.pi / 2), + ((graph_unit_angle * i) * (2 * math.pi / 360)) - (math.pi / 2) + ) + cairo_set_source_rgba(display, rgb_to_r_g_b(graph_fg_colour, graph_fg_alpha)) + cairo_stroke(display) + i = i + 1 + end + local angle = (graph_unit_angle * i) - graph_unit_thickness - -- Graduations - local graduation_radius = data["graduation_radius"] - local graduation_thickness, graduation_mark_thickness = - data["graduation_thickness"], data["graduation_mark_thickness"] - local graduation_unit_angle = data["graduation_unit_angle"] - local graduation_fg_colour, graduation_fg_alpha = data["graduation_fg_colour"], data["graduation_fg_alpha"] - if graduation_radius > 0 and graduation_thickness > 0 and graduation_unit_angle > 0 then - local nb_graduation = 360 / graduation_unit_angle - local i = 1 - while i <= nb_graduation do - cairo_set_line_width(display, graduation_thickness) - cairo_arc( - display, - x, - y, - graduation_radius, - (((graduation_unit_angle * i) - (graduation_mark_thickness / 2)) * (2 * math.pi / 360)) - (math.pi / 2), - (((graduation_unit_angle * i) + (graduation_mark_thickness / 2)) * (2 * math.pi / 360)) - (math.pi / 2) - ) - cairo_set_source_rgba(display, rgb_to_r_g_b(graduation_fg_colour, graduation_fg_alpha)) - cairo_stroke(display) - cairo_set_line_width(display, graph_thickness) - i = i + 1 - end - end + -- Graduations + local graduation_radius = data["graduation_radius"] + local graduation_thickness, graduation_mark_thickness = + data["graduation_thickness"], data["graduation_mark_thickness"] + local graduation_unit_angle = data["graduation_unit_angle"] + local graduation_fg_colour, graduation_fg_alpha = data["graduation_fg_colour"], data["graduation_fg_alpha"] + if graduation_radius > 0 and graduation_thickness > 0 and graduation_unit_angle > 0 then + local nb_graduation = 360 / graduation_unit_angle + local i = 1 + while i <= nb_graduation do + cairo_set_line_width(display, graduation_thickness) + cairo_arc( + display, + x, + y, + graduation_radius, + (((graduation_unit_angle * i) - (graduation_mark_thickness / 2)) * (2 * math.pi / 360)) - (math.pi / 2), + (((graduation_unit_angle * i) + (graduation_mark_thickness / 2)) * (2 * math.pi / 360)) - (math.pi / 2) + ) + cairo_set_source_rgba(display, rgb_to_r_g_b(graduation_fg_colour, graduation_fg_alpha)) + cairo_stroke(display) + cairo_set_line_width(display, graph_thickness) + i = i + 1 + end + end - -- Text - local txt_radius = data["txt_radius"] - local txt_weight, txt_size = data["txt_weight"], data["txt_size"] - local txt_fg_colour, txt_fg_alpha = data["txt_fg_colour"], data["txt_fg_alpha"] - local movex = txt_radius * (math.cos((angle * 2 * math.pi / 360) - (math.pi / 2))) - local movey = txt_radius * (math.sin((angle * 2 * math.pi / 360) - (math.pi / 2))) - cairo_select_font_face(display, "ubuntu", CAIRO_FONT_SLANT_NORMAL, txt_weight) - cairo_set_font_size(display, txt_size) - cairo_set_source_rgba(display, rgb_to_r_g_b(txt_fg_colour, txt_fg_alpha)) - cairo_move_to(display, x + movex - (txt_size / 2), y + movey + 3) - cairo_show_text(display, value) - cairo_stroke(display) + -- Text + local txt_radius = data["txt_radius"] + local txt_weight, txt_size = data["txt_weight"], data["txt_size"] + local txt_fg_colour, txt_fg_alpha = data["txt_fg_colour"], data["txt_fg_alpha"] + local movex = txt_radius * (math.cos((angle * 2 * math.pi / 360) - (math.pi / 2))) + local movey = txt_radius * (math.sin((angle * 2 * math.pi / 360) - (math.pi / 2))) + cairo_select_font_face(display, "ubuntu", CAIRO_FONT_SLANT_NORMAL, txt_weight) + cairo_set_font_size(display, txt_size) + cairo_set_source_rgba(display, rgb_to_r_g_b(txt_fg_colour, txt_fg_alpha)) + cairo_move_to(display, x + movex - (txt_size / 2), y + movey + 3) + cairo_show_text(display, value) + cairo_stroke(display) end ------------------------------------------------------------------------------- -- Displays Gauges -- function draw_gauge_ring(display, data, value) - local max_value = data["max_value"] - local x, y = data["x"], data["y"] - local graph_radius = data["graph_radius"] - local graph_thickness, graph_unit_thickness = data["graph_thickness"], data["graph_unit_thickness"] - local graph_start_angle = data["graph_start_angle"] - local graph_unit_angle = data["graph_unit_angle"] - local graph_bg_colour, graph_bg_alpha = data["graph_bg_colour"], data["graph_bg_alpha"] - local graph_fg_colour, graph_fg_alpha = data["graph_fg_colour"], data["graph_fg_alpha"] - local hand_fg_colour, hand_fg_alpha = data["hand_fg_colour"], data["hand_fg_alpha"] - local graph_end_angle = (max_value * graph_unit_angle) % 360 + local max_value = data["max_value"] + local x, y = data["x"], data["y"] + local graph_radius = data["graph_radius"] + local graph_thickness, graph_unit_thickness = data["graph_thickness"], data["graph_unit_thickness"] + local graph_start_angle = data["graph_start_angle"] + local graph_unit_angle = data["graph_unit_angle"] + local graph_bg_colour, graph_bg_alpha = data["graph_bg_colour"], data["graph_bg_alpha"] + local graph_fg_colour, graph_fg_alpha = data["graph_fg_colour"], data["graph_fg_alpha"] + local hand_fg_colour, hand_fg_alpha = data["hand_fg_colour"], data["hand_fg_alpha"] + local graph_end_angle = (max_value * graph_unit_angle) % 360 - -- Background Ring - cairo_arc( - display, - x, - y, - graph_radius, - angle_to_position(graph_start_angle, 0), - angle_to_position(graph_start_angle, graph_end_angle) - ) - cairo_set_source_rgba(display, rgb_to_r_g_b(graph_bg_colour, graph_bg_alpha)) - cairo_set_line_width(display, graph_thickness) - cairo_stroke(display) + -- Background Ring + cairo_arc( + display, + x, + y, + graph_radius, + angle_to_position(graph_start_angle, 0), + angle_to_position(graph_start_angle, graph_end_angle) + ) + cairo_set_source_rgba(display, rgb_to_r_g_b(graph_bg_colour, graph_bg_alpha)) + cairo_set_line_width(display, graph_thickness) + cairo_stroke(display) - -- Arc - local val = value % (max_value + 1) - local start_arc = 0 - local stop_arc = 0 - local i = 1 - while i <= val do - start_arc = (graph_unit_angle * i) - graph_unit_thickness - stop_arc = (graph_unit_angle * i) - cairo_arc( - display, - x, - y, - graph_radius, - angle_to_position(graph_start_angle, start_arc), - angle_to_position(graph_start_angle, stop_arc) - ) - cairo_set_source_rgba(display, rgb_to_r_g_b(graph_fg_colour, graph_fg_alpha)) - cairo_stroke(display) - i = i + 1 - end - local angle = start_arc + -- Arc + local val = value % (max_value + 1) + local start_arc = 0 + local stop_arc = 0 + local i = 1 + while i <= val do + start_arc = (graph_unit_angle * i) - graph_unit_thickness + stop_arc = (graph_unit_angle * i) + cairo_arc( + display, + x, + y, + graph_radius, + angle_to_position(graph_start_angle, start_arc), + angle_to_position(graph_start_angle, stop_arc) + ) + cairo_set_source_rgba(display, rgb_to_r_g_b(graph_fg_colour, graph_fg_alpha)) + cairo_stroke(display) + i = i + 1 + end + local angle = start_arc - -- Hand - start_arc = (graph_unit_angle * val) - (graph_unit_thickness * 2) - stop_arc = (graph_unit_angle * val) - cairo_arc( - display, - x, - y, - graph_radius, - angle_to_position(graph_start_angle, start_arc), - angle_to_position(graph_start_angle, stop_arc) - ) - cairo_set_source_rgba(display, rgb_to_r_g_b(hand_fg_colour, hand_fg_alpha)) - cairo_stroke(display) + -- Hand + start_arc = (graph_unit_angle * val) - (graph_unit_thickness * 2) + stop_arc = (graph_unit_angle * val) + cairo_arc( + display, + x, + y, + graph_radius, + angle_to_position(graph_start_angle, start_arc), + angle_to_position(graph_start_angle, stop_arc) + ) + cairo_set_source_rgba(display, rgb_to_r_g_b(hand_fg_colour, hand_fg_alpha)) + cairo_stroke(display) - -- Graduations - local graduation_radius = data["graduation_radius"] - local graduation_thickness, graduation_mark_thickness = - data["graduation_thickness"], data["graduation_mark_thickness"] - local graduation_unit_angle = data["graduation_unit_angle"] - local graduation_fg_colour, graduation_fg_alpha = data["graduation_fg_colour"], data["graduation_fg_alpha"] - if graduation_radius > 0 and graduation_thickness > 0 and graduation_unit_angle > 0 then - local nb_graduation = graph_end_angle / graduation_unit_angle - local i = 0 - while i < nb_graduation do - cairo_set_line_width(display, graduation_thickness) - start_arc = (graduation_unit_angle * i) - (graduation_mark_thickness / 2) - stop_arc = (graduation_unit_angle * i) + (graduation_mark_thickness / 2) - cairo_arc( - display, - x, - y, - graduation_radius, - angle_to_position(graph_start_angle, start_arc), - angle_to_position(graph_start_angle, stop_arc) - ) - cairo_set_source_rgba(display, rgb_to_r_g_b(graduation_fg_colour, graduation_fg_alpha)) - cairo_stroke(display) - cairo_set_line_width(display, graph_thickness) - i = i + 1 - end - end + -- Graduations + local graduation_radius = data["graduation_radius"] + local graduation_thickness, graduation_mark_thickness = + data["graduation_thickness"], data["graduation_mark_thickness"] + local graduation_unit_angle = data["graduation_unit_angle"] + local graduation_fg_colour, graduation_fg_alpha = data["graduation_fg_colour"], data["graduation_fg_alpha"] + if graduation_radius > 0 and graduation_thickness > 0 and graduation_unit_angle > 0 then + local nb_graduation = graph_end_angle / graduation_unit_angle + local i = 0 + while i < nb_graduation do + cairo_set_line_width(display, graduation_thickness) + start_arc = (graduation_unit_angle * i) - (graduation_mark_thickness / 2) + stop_arc = (graduation_unit_angle * i) + (graduation_mark_thickness / 2) + cairo_arc( + display, + x, + y, + graduation_radius, + angle_to_position(graph_start_angle, start_arc), + angle_to_position(graph_start_angle, stop_arc) + ) + cairo_set_source_rgba(display, rgb_to_r_g_b(graduation_fg_colour, graduation_fg_alpha)) + cairo_stroke(display) + cairo_set_line_width(display, graph_thickness) + i = i + 1 + end + end - -- Text - local txt_radius = data["txt_radius"] - local txt_weight, txt_size = data["txt_weight"], data["txt_size"] - local txt_fg_colour, txt_fg_alpha = data["txt_fg_colour"], data["txt_fg_alpha"] - local movex = txt_radius * math.cos(angle_to_position(graph_start_angle, angle)) - local movey = txt_radius * math.sin(angle_to_position(graph_start_angle, angle)) - cairo_select_font_face(display, "ubuntu", CAIRO_FONT_SLANT_NORMAL, txt_weight) - cairo_set_font_size(display, txt_size) - cairo_set_source_rgba(display, rgb_to_r_g_b(txt_fg_colour, txt_fg_alpha)) - cairo_move_to(display, x + movex - (txt_size / 2), y + movey + 3) - cairo_show_text(display, value) - cairo_stroke(display) + -- Text + local txt_radius = data["txt_radius"] + local txt_weight, txt_size = data["txt_weight"], data["txt_size"] + local txt_fg_colour, txt_fg_alpha = data["txt_fg_colour"], data["txt_fg_alpha"] + local movex = txt_radius * math.cos(angle_to_position(graph_start_angle, angle)) + local movey = txt_radius * math.sin(angle_to_position(graph_start_angle, angle)) + cairo_select_font_face(display, "ubuntu", CAIRO_FONT_SLANT_NORMAL, txt_weight) + cairo_set_font_size(display, txt_size) + cairo_set_source_rgba(display, rgb_to_r_g_b(txt_fg_colour, txt_fg_alpha)) + cairo_move_to(display, x + movex - (txt_size / 2), y + movey + 3) + cairo_show_text(display, value) + cairo_stroke(display) - -- Caption - local caption = data["caption"] - local caption_weight, caption_size = data["caption_weight"], data["caption_size"] - local caption_fg_colour, caption_fg_alpha = data["caption_fg_colour"], data["caption_fg_alpha"] - local tox = graph_radius * (math.cos((graph_start_angle * 2 * math.pi / 360) - (math.pi / 2))) - local toy = graph_radius * (math.sin((graph_start_angle * 2 * math.pi / 360) - (math.pi / 2))) - cairo_select_font_face(display, "ubuntu", CAIRO_FONT_SLANT_NORMAL, caption_weight) - cairo_set_font_size(display, caption_size) - cairo_set_source_rgba(display, rgb_to_r_g_b(caption_fg_colour, caption_fg_alpha)) - cairo_move_to(display, x + tox + 5, y + toy + 1) - if graph_start_angle < 105 then - cairo_move_to(display, x + tox - 30, y + toy + 1) - end - cairo_show_text(display, caption) - cairo_stroke(display) + -- Caption + local caption = data["caption"] + local caption_weight, caption_size = data["caption_weight"], data["caption_size"] + local caption_fg_colour, caption_fg_alpha = data["caption_fg_colour"], data["caption_fg_alpha"] + local tox = graph_radius * (math.cos((graph_start_angle * 2 * math.pi / 360) - (math.pi / 2))) + local toy = graph_radius * (math.sin((graph_start_angle * 2 * math.pi / 360) - (math.pi / 2))) + cairo_select_font_face(display, "ubuntu", CAIRO_FONT_SLANT_NORMAL, caption_weight) + cairo_set_font_size(display, caption_size) + cairo_set_source_rgba(display, rgb_to_r_g_b(caption_fg_colour, caption_fg_alpha)) + cairo_move_to(display, x + tox + 5, y + toy + 1) + if graph_start_angle < 105 then + cairo_move_to(display, x + tox - 30, y + toy + 1) + end + cairo_show_text(display, caption) + cairo_stroke(display) end ------------------------------------------------------------------------------- -- Loads data and Displays Clock -- function go_clock_rings(display) - local function load_clock_rings(display, data) - local str, value = "", 0 - str = string.format("${%s %s}", data["name"], data["arg"]) - str = conky_parse(str) - value = tonumber(str) - draw_clock_ring(display, data, value) - end + local function load_clock_rings(display, data) + local str, value = "", 0 + str = string.format("${%s %s}", data["name"], data["arg"]) + str = conky_parse(str) + value = tonumber(str) + draw_clock_ring(display, data, value) + end - for i in pairs(clock_h) do - load_clock_rings(display, clock_h[i]) - end - for i in pairs(clock_m) do - load_clock_rings(display, clock_m[i]) - end - for i in pairs(clock_s) do - load_clock_rings(display, clock_s[i]) - end + for i in pairs(clock_h) do + load_clock_rings(display, clock_h[i]) + end + for i in pairs(clock_m) do + load_clock_rings(display, clock_m[i]) + end + for i in pairs(clock_s) do + load_clock_rings(display, clock_s[i]) + end end ------------------------------------------------------------------------------- -- Loads data and Displays Gauges -- function go_gauge_rings(display) - local function load_gauge_rings(display, data) - local str, value = "", 0 - str = string.format("${%s %s}", data["name"], data["arg"]) - str = conky_parse(str) - value = tonumber(str) - draw_gauge_ring(display, data, value) - end + local function load_gauge_rings(display, data) + local str, value = "", 0 + str = string.format("${%s %s}", data["name"], data["arg"]) + str = conky_parse(str) + value = tonumber(str) + draw_gauge_ring(display, data, value) + end - for i in pairs(gauge) do - load_gauge_rings(display, gauge[i]) - end + for i in pairs(gauge) do + load_gauge_rings(display, gauge[i]) + end end ------------------------------------------------------------------------------- -- MAIN function conky_main() - if conky_window == nil then - return - end + if conky_window == nil then + return + end - local cs = cairo_xlib_surface_create( - conky_window.display, - conky_window.drawable, - conky_window.visual, - conky_window.width, - conky_window.height - ) - local display = cairo_create(cs) + local cs = cairo_xlib_surface_create( + conky_window.display, + conky_window.drawable, + conky_window.visual, + conky_window.width, + conky_window.height + ) + local display = cairo_create(cs) - local updates = conky_parse("${updates}") - update_num = tonumber(updates) + local updates = conky_parse("${updates}") + update_num = tonumber(updates) - if update_num > 5 then - go_clock_rings(display) - go_gauge_rings(display) - end + if update_num > 5 then + go_clock_rings(display) + go_gauge_rings(display) + end - cairo_surface_destroy(cs) - cairo_destroy(display) + cairo_surface_destroy(cs) + cairo_destroy(display) end diff --git a/files/default.nix b/files/default.nix @@ -33,9 +33,6 @@ in rec { config = readFile ./fonts/fontconfig.xml; }; - # X11 Gestures - gestures = readFile ./touchegg/touchegg.conf; - # 'git' Version Control git.hooks = ./git/hooks; diff --git a/files/gnome/dconf.nix b/files/gnome/dconf.nix @@ -118,6 +118,7 @@ in { "org/gnome/mutter" = { attach-modal-dialogs = true; + center-new-windows = true; dynamic-workspaces = false; edge-tiling = true; focus-change-on-pointer-rest = true; @@ -129,7 +130,7 @@ in { clock-show-weekday = true; document-font-name = "Product Sans 11"; enable-animations = true; - enable-hot-corners = false; + enable-hot-corners = true; font-antialiasing = "grayscale"; font-hinting = "slight"; font-name = "Product Sans Medium, Medium 11"; @@ -229,6 +230,7 @@ in { enable-mouse-gestures = true; }; + "org/gtk/gtk4/settings/file-chooser".sort-directories-first = true; "org/gnome/nautilus/icon-view" = { captions = ["size" "date_modified" "none"]; default-zoom-level = "medium"; @@ -244,6 +246,14 @@ in { show-delete-permanently = true; }; + "org/gnome/TextEditor" = { + highlight-current-line = true; + indent-style = "tab"; + show-line-numbers = true; + show-map = true; + tab-width = mkUint32 4; + }; + "com/github/hugolabe/Wike" = { custom-font = true; dark-mode = true; @@ -262,13 +272,6 @@ in { style-scheme-name = "builder-dark"; }; - "org/gnome/gedit/preferences/ui".show-tabs-mode = "auto"; - "org/gnome/gedit/preferences/editor" = { - scheme = "tango-dark"; - wrap-last-split-mode = "word"; - ensure-trailing-newline = false; - }; - "org/gnome/gnome-screenshot" = { delay = 0; include-pointer = true; @@ -284,32 +287,36 @@ in { enabled-extensions = [ "AlphabeticalAppGrid@stuarthayhurst" "appindicatorsupport@rgcjonas.gmail.com" - "avatar@pawel.swiszcz.com" "caffeine@patapon.info" - "color-picker@tuberry" - "custom-hot-corners-extended@G-dH.github.com" - "dash-to-panel@jderose9.github.com" - "desktop-cube@schneegans.github.com" + "CoverflowAltTab@palatis.blogspot.com" "drive-menu@gnome-shell-extensions.gcampax.github.com" "flypie@schneegans.github.com" + "gestureImprovements@gestures" + "gnome-ui-tune@itstime.tech" "gTile@vibou" + "guillotine@fopdoodle.net" "just-perfection-desktop@just-perfection" "lock-screen-message@advendradeswanta.gitlab.com" "lockkeys@vaina.lt" "pano@elhan.io" + "quick-settings-avatar@d-go" + "quick-settings-tweaks@qwreey" "rounded-window-corners@yilozt" + "space-bar@luchrioh" + "status-area-horizontal-spacing@mathematical.coffee.gmail.com" "timepp@zagortenay333" "top-bar-organizer@julian.gse.jsts.xyz" + "transparent-top-bar@ftpix.com" "user-theme@gnome-shell-extensions.gcampax.github.com" "Vitals@CoreCoding.com" - "x11gestures@joseexposito.github.io" + "weatheroclock@CleoMenezesJr.github.io" ]; favorite-apps = [ "google-chrome.desktop" "org.gnome.Geary.desktop" "org.gnome.Nautilus.desktop" "org.gnome.Console.desktop" - "org.gnome.gedit.desktop" + "org.gnome.gnome-text-editor.desktop" "org.gnome.Settings.desktop" ]; }; @@ -377,67 +384,34 @@ in { # Shell Extensions "org/gnome/shell/extensions/user-theme".name = "Adwaita"; "org/gnome/shell/extensions/alphabetical-app-grid".folder-order-position = "start"; - "org/gnome/shell/extensions/lock-screen-message".message = "Welcome, ${config.credentials.fullname}!"; + "org/gnome/shell/extensions/gestureImprovements".allow-minimize-window = true; + "org/gnome/shell/extensions/gnome-ui-tune".hide-search = false; "org/gnome/shell/extensions/lockkeys".style = "show-hide"; - - "org/gnome/shell/extensions/avatar" = { - avatar-shadow = true; - avatar-shadow-user-name = false; - buttons-icon-size = 20; - buttons-position = 50; - name-style-dark = false; - set-custom-panel-menu-width = 0; - show-buttons = false; - show-media-center = false; - show-system-name = false; - show-top-image = false; - }; + "org/gnome/shell/extensions/lock-screen-message".message = "Welcome, ${config.credentials.fullname}!"; + "org/gnome/shell/extensions/status-area-horizontal-spacing".hpadding = 4; + "com/ftpix/transparentbar".transparency = 0; "org/gnome/shell/extensions/caffeine" = { + indicator-position = 0; inhibit-apps = ["teams.desktop" "startcenter.desktop"]; nightlight-control = "never"; + show-indicator = "always"; show-notifications = false; - user-enabled = true; }; - "org/gnome/shell/extensions/color-picker" = { - color-picker-shortcut = ["<Super>c"]; - enable-shortcut = true; - enable-systray = true; - menu-size = "uint32 8"; - notify-style = "uint32 1"; - persistent-mode = true; + "org/gnome/shell/extensions/coverflowalttab" = { + animation-time = 0.256; + easing-function = "ease-in-sine"; + hide-panel = false; + icon-has-shadow = false; + icon-style = "Overlay"; }; "org/gnome/shell/extensions/custom-hot-corners-extended/misc" = { ws-switch-wrap = true; ws-switch-ignore-last = true; ws-switch-indicator-mode = 1; - }; - - "org/gnome/shell/extensions/custom-hot-corners-extended/monitor-0-top-left-0".action = "toggle-overview"; - "org/gnome/shell/extensions/custom-hot-corners-extended/monitor-0-bottom-left-0".action = "show-applications"; - - "org/gnome/shell/extensions/custom-hot-corners-extended/monitor-0-bottom-right-0" = { - action = "show-desktop"; - ctrl = true; - }; - - "org/gnome/shell/extensions/custom-hot-corners-extended/monitor-0-top-right-0" = { - action = "next-workspace"; - ctrl = true; - }; - - "org/gnome/shell/extensions/desktop-cube" = { - active-workpace-opacity = 195; - depth-separation = 25; - enable-desktop-edge-switch = false; - horizontal-stretch = 100; - inactive-workpace-opacity = 224; - overview-transition-time = 0; - unfold-to-desktop = false; - workpace-separation = 25; - workspace-transition-time = 250; + show-osd-monitor-indexes = false; }; "org/gnome/shell/extensions/gtile" = { @@ -453,7 +427,6 @@ in { aggregate-menu = true; animation = 4; app-menu-icon = false; - dash = false; hot-corner = false; notification-banner-position = 2; show-prefs-intro = false; @@ -468,6 +441,25 @@ in { global-shortcut = ["<Super>v"]; history-length = 250; incognito-shortcut = ["<Ctrl><Super>v"]; + play-audio-on-copy = false; + send-notification-on-copy = false; + }; + + "org/gnome/shell/extensions/quick-settings-avatar" = { + avatar-position = 1; + avatar-realname = false; + avatar-size = 56; + }; + + "org/gnome/shell/extensions/quick-settings-tweaks" = { + add-dnd-quick-toggle-enabled = false; + add-unsafe-quick-toggle-enabled = false; + datemenu-remove-notifications = false; + media-control-compact-mode = true; + media-control-enabled = true; + notifications-enabled = false; + volume-mixer-enabled = false; + volume-mixer-position = "bottom"; }; "org/gnome/shell/extensions/rounded-window-corners" = { @@ -479,6 +471,12 @@ in { unfocused-shadow = "{'horizontal_offset': 0, 'vertical_offset': 2, 'blur_offset': 12, 'spread_radius': -1, 'opacity': 65}"; }; + "org/gnome/shell/extensions/space-bar/behavior" = { + scroll-wheel = "disabled"; + show-empty-workspaces = true; + smart-workspace-names = true; + }; + "org/gnome/shell/extensions/timepp" = { alarms-separate-menu = false; panel-item-position = "Left"; @@ -494,21 +492,20 @@ in { "org/gnome/shell/extensions/top-bar-organizer" = { center-box-order = ["dateMenu"]; - left-box-order = ["workspace-name-indicator" "timepp" "appMenu" "activities"]; + left-box-order = ["Space Bar" "activities" "timepp" "guillotine" "appMenu"]; right-box-order = [ + "a11y" "aggregateMenu" "drive-menu" - "color-picker@tuberry" "GTileStatusButton" - "Caffeine" "pano@elhan.io" "vitalsMenu" "dwellClick" "lockkeys" - "a11y" "keyboard" "screenSharing" "screenRecording" + "quickSettings" ]; }; @@ -518,81 +515,6 @@ in { show-storage = false; }; - "org/gnome/shell/extensions/dash-to-panel" = { - animate-appicon-hover = true; - animate-appicon-hover-animation-convexity = "{'RIPPLE': 2.2000000000000002, 'PLANK': 1.0, 'SIMPLE': 0.0}"; - animate-appicon-hover-animation-extent = "{'RIPPLE': 6, 'PLANK': 4, 'SIMPLE': 1}"; - animate-appicon-hover-animation-rotation = "{'SIMPLE': 7, 'RIPPLE': 10, 'PLANK': 0}"; - animate-appicon-hover-animation-travel = "{'SIMPLE': 0.16, 'RIPPLE': 0.27000000000000002, 'PLANK': 0.0}"; - animate-appicon-hover-animation-type = "RIPPLE"; - animate-appicon-hover-animation-zoom = "{'SIMPLE': 1.0900000000000001, 'RIPPLE': 1.1399999999999999, 'PLANK': 2.0}"; - appicon-margin = 6; - appicon-padding = 4; - available-monitors = [0]; - desktop-line-custom-color = "rgb(138,180,248)"; - desktop-line-use-custom-color = false; - dot-color-dominant = true; - dot-color-override = false; - dot-position = "BOTTOM"; - dot-size = 3; - dot-style-focused = "CILIORA"; - dot-style-unfocused = "CILIORA"; - enter-peek-mode-timeout = 1100; - focus-highlight = true; - focus-highlight-color = "#eeeeee"; - focus-highlight-dominant = false; - focus-highlight-opacity = 20; - hide-overview-on-startup = false; - hot-keys = true; - hotkeys-overlay-combo = "TEMPORARILY"; - intellihide = false; - isolate-workspaces = true; - leftbox-padding = -1; - middle-click-action = "LAUNCH"; - overview-click-to-exit = false; - panel-anchors = ''{"0":"MIDDLE"}''; - panel-element-positions = '' - {"0":[{"element":"showAppsButton","visible":true,"position":"stackedTL"},{"element":"activitiesButton","visible":false,"position":"stackedTL"},{"element":"dateMenu","visible":true,"position":"stackedTL"},{"element":"leftBox","visible":true,"position":"stackedTL"},{"element":"taskbar","visible":true,"position":"centerMonitor"},{"element":"centerBox","visible":true,"position":"stackedBR"},{"element":"rightBox","visible":true,"position":"stackedBR"},{"element":"systemMenu","visible":true,"position":"stackedBR"},{"element":"desktopButton","visible":true,"position":"stackedBR"}]}''; - panel-element-positions-monitors-sync = true; - panel-lengths = ''{"0":100}''; - panel-positions = ''{"0":"BOTTOM"}''; - panel-sizes = ''{"0":48}''; - scroll-panel-delay = 10; - scroll-panel-show-ws-popup = true; - secondarymenu-contains-appmenu = true; - secondarymenu-contains-showdetails = true; - shift-click-action = "QUIT"; - shift-middle-click-action = "RAISE"; - shortcut-previews = true; - show-appmenu = true; - show-apps-icon-file = ""; - show-showdesktop-hover = true; - show-tooltip = true; - showdesktop-button-width = 3; - status-icon-padding = -1; - stockgs-keep-dash = false; - stockgs-keep-top-panel = false; - stockgs-panelbtn-click-only = false; - taskbar-locked = false; - trans-bg-color = "#232323"; - trans-dynamic-anim-target = 1.0; - trans-dynamic-anim-time = 200; - trans-dynamic-behavior = "MAXIMIZED_WINDOWS"; - trans-dynamic-distance = 0; - trans-gradient-bottom-color = "#8ab4f8"; - trans-gradient-bottom-opacity = 5.0e-2; - trans-panel-opacity = 0.0; - trans-use-custom-bg = true; - trans-use-custom-gradient = false; - trans-use-custom-opacity = false; - trans-use-dynamic-opacity = false; - tray-padding = 1; - tray-size = 0; - window-preview-show-title = true; - window-preview-size = 150; - window-preview-title-position = "TOP"; - }; - "org/gnome/shell/extensions/flypie" = { active-stack-child = "settings-page"; background-color = "rgba(0, 0, 0, 0.26)"; diff --git a/files/touchegg/touchegg.conf b/files/touchegg/touchegg.conf @@ -1,109 +0,0 @@ -<touchégg> -<!-- My Epic Touchegg X11 Gestures Config --> - <settings> - <!-- - Delay (in ms), since the Gesture starts before animation - Default: 150ms - --> - <property name="animation_delay">150</property> - - <!-- - Percentage of the Gesture to be completed to apply action - Default: 20% - --> - <property name="action_execute_threshold">20</property> - - <!-- - Global animation Colors - Specify Hex Code or use 'auto' - --> - <property name="color">auto</property> - <property name="borderColor">auto</property> - </settings> - - <!-- - Configuration for every application - --> - - <application name="All"> - <gesture type="SWIPE" fingers="4" direction="UP"> - <action type="MAXIMIZE_RESTORE_WINDOW"> - <animate>true</animate> - </action> - </gesture> - - <gesture type="SWIPE" fingers="4" direction="DOWN"> - <action type="MINIMIZE_WINDOW"> - <animate>true</animate> - </action> - </gesture> - - <gesture type="SWIPE" fingers="4" direction="LEFT"> - <action type="TILE_WINDOW"> - <direction>left</direction> - <animate>true</animate> - </action> - </gesture> - - <gesture type="SWIPE" fingers="4" direction="RIGHT"> - <action type="TILE_WINDOW"> - <direction>right</direction> - <animate>true</animate> - </action> - </gesture> - - <gesture type="PINCH" fingers="4" direction="IN"> - <action type="CLOSE_WINDOW"> - <animate>true</animate> - <color>F84A53</color> - <borderColor>F84A53</borderColor> - </action> - </gesture> - - <gesture type="PINCH" fingers="4" direction="OUT"> - <action type="CLOSE_WINDOW"> - <animate>true</animate> - <color>F84A53</color> - <borderColor>F84A53</borderColor> - </action> - </gesture> - - <gesture type="TAP" fingers="2"> - <action type="MOUSE_CLICK"> - <button>3</button> - <on>begin</on> - </action> - </gesture> - - <gesture type="TAP" fingers="3"> - <action type="MOUSE_CLICK"> - <button>2</button> - <on>begin</on> - </action> - </gesture> - </application> - - <!-- - Configuration for specific applications - --> - - <application name="Google-chrome,Chromium-browser,Firefox"> - <gesture type="PINCH" fingers="2" direction="IN"> - <action type="SEND_KEYS"> - <repeat>true</repeat> - <modifiers>Control_L</modifiers> - <keys>KP_Subtract</keys> - <decreaseKeys>KP_Add</decreaseKeys> - </action> - </gesture> - - <gesture type="PINCH" fingers="2" direction="OUT"> - <action type="SEND_KEYS"> - <repeat>true</repeat> - <modifiers>Control_L</modifiers> - <keys>KP_Add</keys> - <decreaseKeys>KP_Subtract</decreaseKeys> - </action> - </gesture> - </application> -</touchégg> diff --git a/files/vscode/settings.json b/files/vscode/settings.json @@ -1,6 +1,6 @@ { "better-comments.highlightPlainText": true, - "editor.cursorSmoothCaretAnimation": true, + "editor.cursorSmoothCaretAnimation": "on", "editor.cursorStyle": "line-thin", "editor.formatOnSave": true, "editor.smoothScrolling": true, diff --git a/modules/base/firmware.nix b/modules/base/firmware.nix @@ -88,7 +88,6 @@ with {inherit (lib) mkAfter mkForce;}; { enable = true; enableSSHSupport = true; }; - user.persist.dirs = [ { directory = ".gnupg"; diff --git a/modules/gui/gnome.nix b/modules/gui/gnome.nix @@ -45,7 +45,6 @@ in { services = { dbus.packages = [pkgs.dconf]; udev.packages = [pkgs.gnome.gnome-settings-daemon]; - touchegg.enable = true; telepathy.enable = true; gnome = { core-developer-tools.enable = true; @@ -109,9 +108,6 @@ in { # GTK+ Bookmarks ".config/gtk-3.0/bookmarks".text = gtk.bookmarks; - # X11 Gestures - ".config/touchegg/touchegg.conf".text = gestures; - # Prevent Suspension on lid close ".config/autostart/ignore-lid-switch-tweak.desktop".text = '' [Desktop Entry] @@ -190,23 +186,27 @@ in { # GNOME Shell Extensions alphabetical-app-grid appindicator - avatar caffeine - color-picker - custom-hot-corners-extended - dash-to-panel - desktop-cube + coverflow-alt-tab custom.fly-pie + gesture-improvements + gnome-40-ui-improvements + guillotine gtile just-perfection lock-keys lock-screen-message - unstable.gnomeExtensions.pano + pano + quick-settings-tweaker rounded-window-corners + space-bar + status-area-horizontal-spacing timepp + transparent-top-bar top-bar-organizer + user-avatar-in-quick-settings vitals - x11-gestures + weather-oclock ]); # Persisted Files diff --git a/modules/nix/checks.nix b/modules/nix/checks.nix @@ -15,7 +15,7 @@ with {inherit (lib) deploy filters hooks util;}; hooks = { alejandra.enable = true; prettier.enable = true; - shellcheck.enable = true; + shellcheck.enable = false; statix.enable = true; stylua.enable = true; }; diff --git a/packages/dotfiles.nix b/packages/dotfiles.nix @@ -7,7 +7,7 @@ pkgs.stdenv.mkDerivation rec { pname = "Dotfiles"; version = "v12"; - longVersion = "23.xy"; + longVersion = "23.05"; src = files.path.toplevel; dontBuild = true; diff --git a/packages/fly-pie.nix b/packages/fly-pie.nix @@ -6,12 +6,12 @@ with pkgs; stdenv.mkDerivation rec { pname = "gnome-shell-extension-fly-pie"; - version = "v17"; + version = "v22"; src = fetchzip { stripRoot = false; url = "https://extensions.gnome.org/extension-data/flypieschneegans.github.com.${version}.shell-extension.zip"; - sha256 = "sha256-ly6SuDOJL90DcMhGBHcOcAI2ezY9FOtk1bqlyRTJ24w="; + sha256 = "sha256-r1tsr0vmZrIVTnH2HE487M1l3OAllmflEkPDLIzpD/g="; }; dontBuild = true; diff --git a/scripts/packages.sh b/scripts/packages.sh @@ -9,9 +9,9 @@ set -euo pipefail update() { if [[ "${1:-""}" != "" ]] then - t="$(mktemp)"; trap "rm ${t}" EXIT; - m="$(mktemp)"; trap "rm ${m}" EXIT; - l="$(mktemp)"; trap "rm ${l}" EXIT; + t="$(mktemp)"; trap 'rm ${t}' EXIT; + m="$(mktemp)"; trap 'rm ${m}' EXIT; + l="$(mktemp)"; trap 'rm ${l}' EXIT; pkg="${1}" metadata="${pkg}/metadata.nix" pkgname="$(basename "${pkg}")" @@ -49,7 +49,7 @@ update() { then if [[ "${release}" == "true" ]] then - newrev="$(git ls-remote --refs --sort="version:refname" --tags ${repo} | cut -d/ -f3- | tail -n1)" + newrev="$(git ls-remote --refs --sort="version:refname" --tags "${repo}" | cut -d/ -f3- | tail -n1)" else if [[ "${branch}" == "null" ]] then diff --git a/shells/python.nix b/shells/python.nix @@ -5,14 +5,13 @@ pkgs: { python39 ipython pip - poetry + poetry-core pylint setuptools ]; shellHook = '' echo "## Python Development Shell ##" - PYTHON_DIR="$XDG_DATA_HOME/python" export PYTHONSTARTUP="$PYTHON_DIR/pythonrc"; export PIP_CONFIG_FILE="$PYTHON_DIR/pip/pip.conf";