From 3bde745afda14818eac9ec354e38d8cdb5cbd36d Mon Sep 17 00:00:00 2001 From: wayne <...> Date: Thu, 19 Jun 2025 10:17:25 -0700 Subject: [PATCH] Unstable 25.05 --- configuration.nix | 6 +- flake.lock | 6 +- flake.nix | 4 +- modules/network.nix | 2 +- pkgs/wm/hyprland/hyprland.nix | 2 +- system.sublime-workspace | 599 +++++++++++++++++----------------- 6 files changed, 314 insertions(+), 305 deletions(-) diff --git a/configuration.nix b/configuration.nix index d33b2c6..344b1ca 100644 --- a/configuration.nix +++ b/configuration.nix @@ -37,8 +37,8 @@ in # ./pkgs/app/utilities/bacula.nix # ./pkgs/app/servers/ff-sync.nix - ./pkgs/virtualisation/docker.nix - ./pkgs/virtualisation/vbox.nix + # ./pkgs/virtualisation/docker.nix + # ./pkgs/virtualisation/vbox.nix # ./flakes/scribeVault.nix ]; @@ -80,7 +80,7 @@ in environmentVariables = {}; }; open-webui = { - enable = true; + enable = false; package = pkgs.open-webui; port = 4040; # host = "192.18.12.40"; diff --git a/flake.lock b/flake.lock index 0d984d7..cf9b008 100644 --- a/flake.lock +++ b/flake.lock @@ -320,11 +320,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1750005367, - "narHash": "sha256-h/aac1dGLhS3qpaD2aZt25NdKY7b+JT0ZIP2WuGsJMU=", + "lastModified": 1750133334, + "narHash": "sha256-urV51uWH7fVnhIvsZIELIYalMYsyr2FCalvlRTzqWRw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6c64dabd3aa85e0c02ef1cdcb6e1213de64baee3", + "rev": "36ab78dab7da2e4e27911007033713bab534187b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ca92a20..122cbd6 100644 --- a/flake.nix +++ b/flake.nix @@ -3,8 +3,8 @@ inputs = { # Switched to unstable 10/13/24 Generation 109 and below stable - nixpkgs-unstable.url = "github:nixos/nixpkgs?ref=nixos-unstable"; - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; + nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.05"; legacy.url = "github:NixOS/nixpkgs-channels"; # Home manager diff --git a/modules/network.nix b/modules/network.nix index 2e34492..a1a133a 100644 --- a/modules/network.nix +++ b/modules/network.nix @@ -67,7 +67,7 @@ }; }; defaultGateway = "192.168.1.1"; - nameservers = [ "10.0.0.25" ]; + nameservers = [ "192.168.1.25" ]; firewall = { enable = true; # { from = 5000; to = 6000; } diff --git a/pkgs/wm/hyprland/hyprland.nix b/pkgs/wm/hyprland/hyprland.nix index bee7476..f8d99c0 100644 --- a/pkgs/wm/hyprland/hyprland.nix +++ b/pkgs/wm/hyprland/hyprland.nix @@ -251,7 +251,7 @@ # "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" "dbus-update-activation-environment --systemd --all" "systemctl --user start plasma-polkit-agent" - "/nix/store/jzak3afif9w9hf0xhqx3mdyayngz9iwa-kwallet-pam-6.2.5/libexec/pam_kwallet_init --no-startup-id" # Find a better path, changes on garbage collection + "/nix/store/4ll6r54d0v5lds248nm1nzhgbicja4da-kwallet-pam-6.3.5/libexec/pam_kwallet_init --no-startup-id" # Find a better path, changes on garbage collection "waybar &" # "hyprpaper &" "hypridle &" diff --git a/system.sublime-workspace b/system.sublime-workspace index c7a6151..899c948 100644 --- a/system.sublime-workspace +++ b/system.sublime-workspace @@ -344,16 +344,7 @@ "file": "configuration.nix", "settings": { - "buffer_size": 7941, - "encoding": "UTF-8", - "line_ending": "Unix" - } - }, - { - "file": "modules/network.nix", - "settings": - { - "buffer_size": 2791, + "buffer_size": 8063, "encoding": "UTF-8", "line_ending": "Unix" } @@ -362,7 +353,7 @@ "file": "modules/containers.nix", "settings": { - "buffer_size": 39494, + "buffer_size": 48863, "encoding": "UTF-8", "line_ending": "Unix" } @@ -371,19 +362,11 @@ "file": "hm/home.nix", "settings": { - "buffer_size": 7531, + "buffer_size": 7550, "encoding": "UTF-8", "line_ending": "Unix" } }, - { - "file": "hm/pkgs/inet-packages.nix", - "settings": - { - "buffer_size": 742, - "line_ending": "Unix" - } - }, { "file": "pkgs/wm/waybar/default.json", "settings": @@ -406,22 +389,30 @@ "file": "/home/wayne/.config/waybar/style.css", "settings": { - "buffer_size": 11728, + "buffer_size": 11677, "encoding": "UTF-8", "line_ending": "Unix" } }, + { + "file": "modules/fonts.nix", + "settings": + { + "buffer_size": 286, + "line_ending": "Unix" + } + }, { "file": "pkgs/wm/hyprland/hyprland.nix", "settings": { - "buffer_size": 15143, + "buffer_size": 15707, "encoding": "UTF-8", "line_ending": "Unix" } }, { - "contents": "gitlab_rails['smtp_enable'] = true\ngitlab_rails['smtp_address'] = \"smtp.server\"\ngitlab_rails['smtp_port'] = 465\ngitlab_rails['smtp_user_name'] = \"smtp user\"\ngitlab_rails['smtp_password'] = \"smtp password\"\ngitlab_rails['smtp_domain'] = \"example.com\"\ngitlab_rails['smtp_authentication'] = \"login\"\ngitlab_rails['smtp_enable_starttls_auto'] = true\ngitlab_rails['smtp_tls'] = false\ngitlab_rails['smtp_pool'] = false\ngitlab_rails['smtp_openssl_verify_mode'] = 'none'\n\nNotify.test_email('wayne@waynehayesdevelopment.com', 'Message Subject', 'Message Body').deliver_now\n\n\ngitlab-runner register --url http://tests.local --token glrt-t3_YrzjGyPj5FUyzrtpUXFy --executor docker --docker-privileged", + "contents": "gitlab_rails['smtp_enable'] = true\ngitlab_rails['smtp_address'] = \"smtp.server\"\ngitlab_rails['smtp_port'] = 465\ngitlab_rails['smtp_user_name'] = \"smtp user\"\ngitlab_rails['smtp_password'] = \"smtp password\"\ngitlab_rails['smtp_domain'] = \"example.com\"\ngitlab_rails['smtp_authentication'] = \"login\"\ngitlab_rails['smtp_enable_starttls_auto'] = true\ngitlab_rails['smtp_tls'] = false\ngitlab_rails['smtp_pool'] = false\ngitlab_rails['smtp_openssl_verify_mode'] = 'none'\n\nNotify.test_email('wayne@waynehayesdevelopment.com', 'Message Subject', 'Message Body').deliver_now\n\n\ngitlab-runner register --url http://tests.local --token glrt-t3_YrzjGyPj5FUyzrtpUXFy .--executor docker --docker-privilege", "settings": { "buffer_size": 688, @@ -456,6 +447,15 @@ "line_ending": "Unix" } }, + { + "contents": "https://openwrt.org/user/huj3r/separate_lan_using_wan_port\n\nhttps://forum.openwrt.org/t/solved-need-help-configuring-a-separate-lan-using-the-wan-port/125538", + "settings": + { + "buffer_size": 157, + "line_ending": "Unix", + "name": "https://openwrt.org/user/huj3r/separate_lan_using_" + } + }, { "contents": ".dandelion-background\n .jumbotron\n .container-fluid.home-user\n .row\n .col-md-8.text-center\n %h1= t(\"home.default.headline\", pod_name: pod_name)\n - if pod_name != \"diaspora*\"\n .text-center\n %h2 Customized for you, optimized for success.\n %h2 Your partner in innovation, every step of the way.\n %h2 Elevate your business, with technology tailored to your needs.\n %h2= t(\"home.default.byline\")\n .col-md-4.login-form\n = render partial: \"sessions/form\", locals: {mobile: false, resource: User.new, resource_name: :user}\n\n.text-center\n %h2 Customized for you, optimized for success.\n %h2 Your partner in innovation, every step of the way.\n %h2 Elevate your business, with technology tailored to your needs.\n", "settings": @@ -545,28 +545,52 @@ "/home/wayne/system/modules", "/home/wayne/system/nix", "/home/wayne/system/pkgs", - "/home/wayne/system/pkgs/app", - "/home/wayne/system/pkgs/app/terminal", - "/home/wayne/system/pkgs/app/utilities", "/home/wayne/system/pkgs/virtualisation", "/home/wayne/system/secrets" ], "file_history": [ + "/home/wayne/system/modules/network.nix", + "/home/wayne/system/hm/pkgs/inet-packages.nix", + "/home/wayne/system/hm/pkgs/wm-packages.nix", + "/home/wayne/system/pkgs/app/terminal/kitty.nix", + "/home/wayne/system/pkgs/wm/mako/mako.nix", + "/home/wayne/system/pkgs/derivations/polycat/default.nix", + "/home/wayne/system/modules/display.nix", + "/home/wayne/system/modules/fonts.nix", + "/home/wayne/system/hardware-configuration.nix", + "/home/wayne/dev/glance/config/glance.yml", + "/home/wayne/dev/glance/config/home.yml", + "/home/wayne/.config/hypr/hyprland.conf", + "/home/wayne/bin/backup.sh", + "/home/wayne/bin/nextcloud_backup.sh", + "/home/wayne/dev/www/v2-scribevault/backend/app.js", + "/home/wayne/dev/www/v2-scribevault/backend/.env", + "/home/wayne/dev/www/v2-scribevault/backend/.env.dev", + "/home/wayne/dev/www/v2-scribevault/backend/.env.test", + "/home/wayne/dev/www/v2-scribevault/backend/notes.json", + "/home/wayne/dev/www/v2-scribevault/frontend/vite.config.js", + "/home/wayne/dev/www/v2-scribevault/frontend/.env", + "/home/wayne/check.sh", + "/home/wayne/bin/rsync.sh", + "/home/wayne/dev/whd/DMP/.editorconfig", + "/home/wayne/system/modules/tailscale.nix", + "/home/wayne/bin/scale.sh", + "/home/wayne/bin/polycat.sh", + "/home/wayne/bin/mkvhost.sh", + "/home/wayne/.nix-profile/bin/loginctl", + "/nix/var/nix/profiles/system/sw/bin/cat", + "/home/wayne/.ssh/config", + "/home/wayne/system/hm/home.nix", + "/home/wayne/system/pkgs/app/terminal/ghostty.nix", + "/home/wayne/system/configuration.nix", "/home/wayne/system/modules/files.nix", "/home/wayne/system/modules/users.nix", "/home/wayne/.config/waybar/style.css.bak", - "/home/wayne/.config/hypr/hyprland.conf", "/home/wayne/system/modules/security.nix", "/home/wayne/system/pkgs/virtualisation/vbox.nix", - "/home/wayne/bin/nextcloud_backup.sh", "/home/wayne/system/modules/containers.nix", - "/home/wayne/bin/rsync.sh", - "/home/wayne/system/hm/pkgs/inet-packages.nix", "/home/wayne/system/hm/pkgs/default.nix", - "/home/wayne/system/modules/display.nix", - "/home/wayne/system/hardware-configuration.nix", - "/home/wayne/.ssh/config", "/home/wayne/system/hm/pkgs/utilities.nix", "/home/wayne/.dotfiles/home/bin/bin/rsync.sh", "/home/wayne/backups/mail/2025/04/soldmyemail.info-full_20250424-000.snar", @@ -587,13 +611,11 @@ "/home/wayne/system/pkgs/app/servers/ff-sync.nix", "/home/wayne/system/hm/modules/hypr.nix", "/home/wayne/.config/wlogout/layout", - "/home/wayne/system/pkgs/app/terminal/ghostty.nix", "/home/wayne/.config/systemd/user/blueman-applet.service", "/etc/systemd/system/polkit.service", "/etc/systemd/system/polkit.service.d/overrides.conf", "/home/wayne/system/pkgs/virtualisation/docker.nix", "/home/wayne/system/hm/modules/theme.nix", - "/home/wayne/system/hm/pkgs/wm-packages.nix", "/home/wayne/bin/hypr-logout.sh", "/home/wayne/tmp/hypr/hyprexitwithgrace.log", "/home/wayne/system/pkgs/app/utilities/bacula.nix", @@ -610,7 +632,6 @@ "/home/wayne/.zsh_history", "/home/wayne/system/pkgs/shell/zsh.nix", "/home/wayne/ai-api/stable-diffusion-webui/webui.sh", - "/home/wayne/system/configuration.nix", "/home/wayne/system/pkgs/wm/hyprland/hyprland.nix", "/home/wayne/invokeai/databases/invokeai.db", "/home/wayne/invokeai/configs/models.yaml", @@ -621,7 +642,6 @@ "/home/wayne/.config/hypr/scripts/start-keybase-gui.sh", "/home/wayne/system/hm/modules/wayland.nix", "/home/wayne/.config/ghostty/config", - "/home/wayne/system/modules/network.nix", "/home/wayne/.config/kiorc", "/home/wayne/.config/kioslaverc", "/etc/samba/smb.conf", @@ -629,7 +649,6 @@ "/etc/nixos/smb-secrets", "/home/wayne/system/pkgs/wm/waybar/default.json", "/home/wayne/system/pkgs/wm/waybar/waybar.nix", - "/home/wayne/system/hm/home.nix", "/home/wayne/system/hm/pkgs/gramming-packages.nix", "/home/wayne/.ssh/known_hosts", "/home/wayne/.ssh/id_rsa.pub", @@ -658,33 +677,11 @@ "/home/wayne/Documents/lineageOS.txt", "/home/wayne/dev/www/whc/2025/dashboard/notes/calendar.txt", "/home/wayne/dev/www/whc/2025/dashboard/notes/time.txt", - "/home/wayne/dev/www/whc/2025/dashboard/credits.txt", - "/home/wayne/dev/www/whc/2025/dashboard/test.html", - "/home/wayne/dev/www/whc/2025/dashboard/assets/css/weather.css", - "/home/wayne/dev/www/whc/2025/dashboard/assets/css/style.css", - "/home/wayne/dev/www/whc/2025/dashboard/js/cols.js", - "/home/wayne/dev/www/whc/2025/dashboard/js/weather.js", - "/home/wayne/dev/www/whc/2025/dashboard/js/feed.js", - "/home/wayne/dev/www/whc/2025/dashboard/js/search.js", - "/home/wayne/dev/www/whc/2025/dashboard/js/ticker.js", - "/home/wayne/dev/www/whc/2025/dashboard/weather.html", - "/home/wayne/system/flake.nix", - "/home/wayne/dev/www/whc/2025/dashboard/notes/atom_rss-feeds.txt", - "/home/wayne/dev/www/whc/2025/dashboard/index.html", - "/home/wayne/dev/www/whc/2025/dashboard/ticker.html", - "/home/wayne/dev/www/whc/2025/dashboard/js/calendar.js", - "/home/wayne/system/pkgs/shell/cli-collection.nix", - "/home/wayne/.config/remmina/remmina.pref", - "/home/wayne/.config/cava/config", - "/home/wayne/system/modules/tailscale.nix", - "/home/wayne/dev/whd/live/public/tpl/why.tpl.php", - "/home/wayne/dev/whd/live/public/index.php_", - "/home/wayne/dev/whd/live/public/tpl/services.tpl.php", - "/home/wayne/dev/whd/live/public/tpl/head.tpl.php" + "/home/wayne/dev/www/whc/2025/dashboard/credits.txt" ], "find": { - "height": 47.0 + "height": 35.0 }, "find_in_files": { @@ -701,6 +698,18 @@ "case_sensitive": false, "find_history": [ + " Nerd Font", + "polycat", + "enable = false", + "/27", + "10.0.0", + "tailscale", + "/24", + "localAddress = \"192.168.1", + "192", + "legacy", + ".76.", + "tailscale", "2ou", "8153", "859", @@ -816,19 +825,7 @@ ":[D]", ":*[d]", ":[*d]", - ":", - "^//:[d]", - "/^:[d]", - ":[d]", - " /etc", - "2024/12/01 14:20:29 [warn] 2027960#2027960: the \"listen ... http2\" directive is deprecated, use the \"http2\" directive instead in", - "reaper", - "diaspora_server", - "root", - "mastadon", - "streaming", - "mastadon", - "zone" + ":" ], "highlight": false, "in_selection": false, @@ -836,6 +833,13 @@ "regex": false, "replace_history": [ + "", + "enable = true", + "/24", + "192.168.1", + "/27", + "localAddress = \"10.0.0", + ".1.", ".76.", "${symbol}", "", @@ -894,7 +898,7 @@ "groups": [ { - "selected": 2, + "selected": 3, "sheets": [ { @@ -910,8 +914,8 @@ "selection": [ [ - 1210, - 1210 + 384, + 384 ] ], "settings": @@ -920,11 +924,11 @@ "tab_size": 2, "translate_tabs_to_spaces": true }, - "translation.x": 28.0, - "translation.y": 273.0, + "translation.x": 402.0, + "translation.y": 0.0, "zoom_level": 1.0 }, - "stack_index": 7, + "stack_index": 10, "type": "text" }, { @@ -933,76 +937,15 @@ "semi_transient": false, "settings": { - "buffer_size": 7941, + "buffer_size": 8063, "regions": { }, "selection": [ [ - 5465, - 5465 - ] - ], - "settings": - { - "syntax": "Packages/Nix/nix.tmLanguage", - "tab_size": 2, - "translate_tabs_to_spaces": true - }, - "translation.x": 0.0, - "translation.y": 5148.0, - "zoom_level": 1.0 - }, - "stack_index": 3, - "type": "text" - }, - { - "buffer": 2, - "file": "modules/network.nix", - "semi_transient": false, - "settings": - { - "buffer_size": 2791, - "regions": - { - }, - "selection": - [ - [ - 704, - 704 - ] - ], - "settings": - { - "spell_check": true, - "syntax": "Packages/Nix/nix.tmLanguage", - "tab_size": 2, - "translate_tabs_to_spaces": true - }, - "translation.x": 0.0, - "translation.y": 0.0, - "zoom_level": 1.0 - }, - "stack_index": 0, - "type": "text" - }, - { - "buffer": 3, - "file": "modules/containers.nix", - "semi_transient": false, - "settings": - { - "buffer_size": 39494, - "regions": - { - }, - "selection": - [ - [ - 281, - 281 + 917, + 917 ] ], "settings": @@ -1019,50 +962,20 @@ "type": "text" }, { - "buffer": 4, - "file": "hm/home.nix", + "buffer": 2, + "file": "modules/containers.nix", "semi_transient": false, "settings": { - "buffer_size": 7531, + "buffer_size": 48863, "regions": { }, "selection": [ [ - 7251, - 7251 - ] - ], - "settings": - { - "syntax": "Packages/Nix/nix.tmLanguage", - "tab_size": 2, - "translate_tabs_to_spaces": true - }, - "translation.x": 0.0, - "translation.y": 3526.0, - "zoom_level": 1.0 - }, - "stack_index": 1, - "type": "text" - }, - { - "buffer": 5, - "file": "hm/pkgs/inet-packages.nix", - "semi_transient": true, - "settings": - { - "buffer_size": 742, - "regions": - { - }, - "selection": - [ - [ - 0, - 0 + 26242, + 26242 ] ], "settings": @@ -1075,11 +988,41 @@ "translation.y": 0.0, "zoom_level": 1.0 }, - "stack_index": 4, + "stack_index": 3, "type": "text" }, { - "buffer": 6, + "buffer": 3, + "file": "hm/home.nix", + "semi_transient": false, + "settings": + { + "buffer_size": 7550, + "regions": + { + }, + "selection": + [ + [ + 6429, + 6429 + ] + ], + "settings": + { + "syntax": "Packages/Nix/nix.tmLanguage", + "tab_size": 2, + "translate_tabs_to_spaces": true + }, + "translation.x": 0.0, + "translation.y": 3159.0, + "zoom_level": 1.0 + }, + "stack_index": 0, + "type": "text" + }, + { + "buffer": 4, "file": "pkgs/wm/waybar/default.json", "semi_transient": false, "settings": @@ -1091,8 +1034,8 @@ "selection": [ [ - 1922, - 1922 + 5980, + 5980 ] ], "settings": @@ -1101,15 +1044,15 @@ "tab_size": 2, "translate_tabs_to_spaces": true }, - "translation.x": 177.0, - "translation.y": 1143.0, + "translation.x": 0.0, + "translation.y": 702.0, "zoom_level": 1.0 }, "stack_index": 5, "type": "text" }, { - "buffer": 7, + "buffer": 5, "file": "pkgs/wm/waybar/waybar.nix", "semi_transient": false, "settings": @@ -1121,8 +1064,8 @@ "selection": [ [ - 65, - 82 + 1988, + 1988 ] ], "settings": @@ -1131,20 +1074,20 @@ "tab_size": 2, "translate_tabs_to_spaces": true }, - "translation.x": 0.0, + "translation.x": 65.0, "translation.y": 0.0, "zoom_level": 1.0 }, - "stack_index": 10, + "stack_index": 6, "type": "text" }, { - "buffer": 8, + "buffer": 6, "file": "/home/wayne/.config/waybar/style.css", "semi_transient": false, "settings": { - "buffer_size": 11728, + "buffer_size": 11677, "regions": { "col_0000004C": @@ -1203,8 +1146,8 @@ "regions": [ [ - 1804, - 1808 + 1793, + 1797 ] ], "scope": "col_000000FF" @@ -1216,8 +1159,8 @@ "regions": [ [ - 1789, - 1789 + 1778, + 1778 ] ], "scope": "col_gutter" @@ -1228,12 +1171,12 @@ "regions": [ [ - 11256, - 11261 + 11205, + 11210 ], [ - 11645, - 11650 + 11594, + 11599 ] ], "scope": "col_008000FF" @@ -1245,12 +1188,12 @@ "regions": [ [ - 11247, - 11247 + 11196, + 11196 ], [ - 11636, - 11636 + 11585, + 11585 ] ], "scope": "col_gutter" @@ -1506,16 +1449,16 @@ 871 ], [ - 9414, - 9421 + 9363, + 9370 ], [ - 10361, - 10368 + 10310, + 10317 ], [ - 10783, - 10790 + 10732, + 10739 ] ], "scope": "col_8FBCBBFF" @@ -1531,16 +1474,16 @@ 863 ], [ - 9398, - 9398 + 9347, + 9347 ], [ - 10347, - 10347 + 10296, + 10296 ], [ - 10767, - 10767 + 10716, + 10716 ] ], "scope": "col_gutter" @@ -1792,16 +1735,16 @@ "regions": [ [ - 9727, - 9730 + 9676, + 9679 ], [ - 11308, - 11311 + 11257, + 11260 ], [ - 11684, - 11687 + 11633, + 11636 ] ], "scope": "col_FF0000FF" @@ -1813,16 +1756,16 @@ "regions": [ [ - 9713, - 9713 + 9662, + 9662 ], [ - 11299, - 11299 + 11248, + 11248 ], [ - 11675, - 11675 + 11624, + 11624 ] ], "scope": "col_gutter" @@ -1833,8 +1776,8 @@ "regions": [ [ - 5002, - 5025 + 4961, + 4984 ] ], "scope": "col_FFC80059" @@ -1846,8 +1789,8 @@ "regions": [ [ - 4988, - 4988 + 4947, + 4947 ] ], "scope": "col_gutter" @@ -1908,8 +1851,8 @@ "regions": [ [ - 6718, - 6742 + 6677, + 6701 ] ], "scope": "col_FFFFFF4C" @@ -1921,8 +1864,8 @@ "regions": [ [ - 6692, - 6692 + 6651, + 6651 ] ], "scope": "col_gutter" @@ -1937,24 +1880,24 @@ 524 ], [ - 4666, - 4671 + 4625, + 4630 ], [ - 6836, - 6841 + 6795, + 6800 ], [ - 6956, - 6961 + 6915, + 6920 ], [ - 7041, - 7046 + 7000, + 7005 ], [ - 8310, - 8315 + 8269, + 8274 ] ], "scope": "col_FFFFFFFF" @@ -1970,24 +1913,24 @@ 492 ], [ - 4640, - 4640 + 4599, + 4599 ], [ - 6828, - 6828 + 6787, + 6787 ], [ - 6930, - 6930 + 6889, + 6889 ], [ - 7015, - 7015 + 6974, + 6974 ], [ - 8284, - 8284 + 8243, + 8243 ] ], "scope": "col_gutter" @@ -1996,8 +1939,8 @@ "selection": [ [ - 8026, - 8026 + 2356, + 2356 ] ], "settings": @@ -2007,19 +1950,47 @@ "translate_tabs_to_spaces": true }, "translation.x": 0.0, - "translation.y": 9451.0, + "translation.y": 2340.0, "zoom_level": 1.0 }, - "stack_index": 11, + "stack_index": 1, "type": "text" }, { - "buffer": 9, + "buffer": 7, + "file": "modules/fonts.nix", + "semi_transient": true, + "settings": + { + "buffer_size": 286, + "regions": + { + }, + "selection": + [ + [ + 0, + 0 + ] + ], + "settings": + { + "syntax": "Packages/Nix/nix.tmLanguage" + }, + "translation.x": 521.0, + "translation.y": 0.0, + "zoom_level": 1.0 + }, + "stack_index": 4, + "type": "text" + }, + { + "buffer": 8, "file": "pkgs/wm/hyprland/hyprland.nix", "semi_transient": false, "settings": { - "buffer_size": 15143, + "buffer_size": 15707, "regions": { "col_66000001": @@ -2028,8 +1999,8 @@ "regions": [ [ - 10909, - 10919 + 11473, + 11483 ] ], "scope": "col_66000001" @@ -2041,8 +2012,8 @@ "regions": [ [ - 10890, - 10890 + 11454, + 11454 ] ], "scope": "col_gutter" @@ -2051,25 +2022,31 @@ "selection": [ [ - 10144, - 10144 + 9588, + 9588 ] ], "settings": { "syntax": "Packages/Nix/nix.tmLanguage", "tab_size": 2, - "translate_tabs_to_spaces": true + "translate_tabs_to_spaces": true, + "typescript_plugin_format_options": + { + "convertTabsToSpaces": true, + "indentSize": 2, + "tabSize": 2 + } }, - "translation.x": 0.0, - "translation.y": 2577.0, + "translation.x": 104.0, + "translation.y": 5564.0, "zoom_level": 1.0 }, - "stack_index": 6, + "stack_index": 7, "type": "text" }, { - "buffer": 10, + "buffer": 9, "semi_transient": false, "settings": { @@ -2080,8 +2057,8 @@ "selection": [ [ - 688, - 688 + 652, + 652 ] ], "settings": @@ -2090,20 +2067,20 @@ "syntax": "Packages/Text/Plain text.tmLanguage" }, "translation.x": 0.0, - "translation.y": 0.0, + "translation.y": 469.0, "zoom_level": 1.0 }, - "stack_index": 13, + "stack_index": 9, "type": "text" } ] }, { - "selected": 2, + "selected": 0, "sheets": [ { - "buffer": 11, + "buffer": 10, "semi_transient": false, "settings": { @@ -2114,8 +2091,8 @@ "selection": [ [ - 464, - 464 + 1057, + 1057 ] ], "settings": @@ -2124,14 +2101,14 @@ "syntax": "Packages/Text/Plain text.tmLanguage" }, "translation.x": 0.0, - "translation.y": 781.0, + "translation.y": 909.0, "zoom_level": 1.0 }, - "stack_index": 12, + "stack_index": 8, "type": "text" }, { - "buffer": 12, + "buffer": 11, "file": "/home/wayne/.config/hypr/scripts/start-in-tray.sh", "semi_transient": false, "settings": @@ -2154,14 +2131,14 @@ "translate_tabs_to_spaces": true }, "translation.x": 0.0, - "translation.y": 819.0, + "translation.y": 0.0, "zoom_level": 1.0 }, - "stack_index": 9, + "stack_index": 12, "type": "text" }, { - "buffer": 13, + "buffer": 12, "file": "/home/wayne/.config/hypr/scripts/start-keybase-gui.sh", "semi_transient": false, "settings": @@ -2173,8 +2150,8 @@ "selection": [ [ - 1285, - 1285 + 516, + 516 ] ], "settings": @@ -2184,10 +2161,38 @@ "translate_tabs_to_spaces": true }, "translation.x": 0.0, - "translation.y": 585.0, + "translation.y": 0.0, "zoom_level": 1.0 }, - "stack_index": 8, + "stack_index": 13, + "type": "text" + }, + { + "buffer": 13, + "semi_transient": false, + "settings": + { + "buffer_size": 157, + "regions": + { + }, + "selection": + [ + [ + 0, + 0 + ] + ], + "settings": + { + "auto_name": "https://openwrt.org/user/huj3r/separate_lan_using_", + "syntax": "Packages/Text/Plain text.tmLanguage" + }, + "translation.x": 0.0, + "translation.y": 0.0, + "zoom_level": 1.0 + }, + "stack_index": 11, "type": "text" } ] @@ -2269,7 +2274,7 @@ "rows": [ 0.0, - 0.867532136773, + 0.972191323693, 1.0 ] }, @@ -2278,6 +2283,10 @@ { "height": 174.0 }, + "output.doc": + { + "height": 0.0 + }, "output.exec": { "height": 162.0 @@ -2290,7 +2299,7 @@ "project": "system.sublime-project", "replace": { - "height": 66.0 + "height": 86.0 }, "save_all_on_build": true, "select_file": @@ -2332,7 +2341,7 @@ "show_open_files": false, "show_tabs": true, "side_bar_visible": true, - "side_bar_width": 239.0, + "side_bar_width": 260.0, "status_bar_visible": true, "template_settings": {