From 7b2f97155fdae3d1eb5a9039e4bba8163d6cb6c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 15 Jan 2024 22:37:11 -0300 Subject: [PATCH 001/404] WIP: use hyprland --- flake.nix | 2 +- system/configuration.nix | 10 ++++++++++ user/home.nix | 2 +- user/hyprland.nix | 24 ++++++++++++------------ user/variables.nix | 2 +- user/waybar/default.nix | 33 +++++++++++++++++++++++++++++++-- 6 files changed, 56 insertions(+), 17 deletions(-) diff --git a/flake.nix b/flake.nix index b9293df..2716537 100644 --- a/flake.nix +++ b/flake.nix @@ -99,7 +99,7 @@ { login-manager.greetd.enable = desktop == "sway" || desktop == "hyprland"; } inputs.agenix.nixosModules.default - inputs.hyprland.nixosModules.default + # inputs.hyprland.nixosModules.default inputs.dzgui-nix.nixosModules.default { programs.hyprland.enable = (desktop == "hyprland"); } inputs.home-manager.nixosModules.home-manager diff --git a/system/configuration.nix b/system/configuration.nix index dc5ac8e..2e3eed5 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -99,6 +99,16 @@ # Enable touchpad support (enabled default in most desktopManager). services.xserver.libinput.enable = true; + xdg.portal = { + config.common.default = "*"; + enable = true; + wlr.enable = true; + # Always pick the first monitor, this is fine since I only ever use a single monitor + wlr.settings.screencast.chooser_type = "none"; + # gtk portal needed to make gtk apps happy + extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; + }; + # Define a user account. Don't forget to set a password with ‘passwd’. users.mutableUsers = false; users.users.lelgenio = { diff --git a/user/home.nix b/user/home.nix index f27c0e0..fac2170 100644 --- a/user/home.nix +++ b/user/home.nix @@ -36,7 +36,7 @@ ./gnome.nix ./thunar.nix ./xdg-dirs.nix - inputs.hyprland.homeManagerModules.default + # inputs.hyprland.homeManagerModules.default inputs.nix-index-database.hmModules.nix-index ]; diff --git a/user/hyprland.nix b/user/hyprland.nix index 992964a..4b29468 100644 --- a/user/hyprland.nix +++ b/user/hyprland.nix @@ -32,18 +32,18 @@ apply_sens_to_raw=0 # whether to apply the sensitivity to raw input (e.g. used by games where you aim using your mouse) - damage_tracking=full # leave it on full unless you hate your GPU and want to make it suffer + # damage_tracking=full # leave it on full unless you hate your GPU and want to make it suffer } - decoration { - rounding=5 - blur=1 - blur_size=3 # minimum 1 - blur_passes=1 # minimum 1, more passes = more resource intensive. - # Your blur "amount" is blur_size * blur_passes, but high blur_size (over around 5-ish) will produce artifacts. - # if you want heavy blur, you need to up the blur_passes. - # the more passes, the more you can up the blur_size without noticing artifacts. - } + # decoration { + # rounding=5 + # blur=1 + # # blur_size=3 # minimum 1 + # # blur_passes=1 # minimum 1, more passes = more resource intensive. + # # Your blur "amount" is blur_size * blur_passes, but high blur_size (over around 5-ish) will produce artifacts. + # # if you want heavy blur, you need to up the blur_passes. + # # the more passes, the more you can up the blur_size without noticing artifacts. + # } animations { enabled=1 @@ -121,7 +121,7 @@ bind=SUPER,mouse_up,workspace,e+1 ''; }; - home.file.".config/eww".source = ./eww; - home.packages = with pkgs; [ eww-wayland jq ]; + # home.file.".config/eww".source = ./eww; + # home.packages = with pkgs; [ eww-wayland jq ]; }; } diff --git a/user/variables.nix b/user/variables.nix index b8bb262..b8d7cce 100644 --- a/user/variables.nix +++ b/user/variables.nix @@ -129,7 +129,7 @@ rec { }; dmenu = "bmenu"; - desktop = "sway"; + desktop = "hyprland"; browser = "firefox"; editor = "kakoune"; email-client = "thunderbird"; diff --git a/user/waybar/default.nix b/user/waybar/default.nix index a0008c6..90d2f49 100644 --- a/user/waybar/default.nix +++ b/user/waybar/default.nix @@ -11,10 +11,18 @@ in systemd.target = "sway-session.target"; settings = [{ layer = "top"; - modules-left = [ "sway/workspaces" "sway/mode" "sway/window" ]; + modules-left = [ + "sway/workspaces" + "sway/mode" + "sway/window" + "hyprland/workspaces" + "hyprland/mode" + "hyprland/window" + ]; modules-center = [ "clock" ]; modules-right = lib.flatten [ "sway/language" + "hyprland/language" "mpd" "custom/playerctl" # "tray" @@ -68,6 +76,28 @@ in }; }; "sway/window" = { max-length = 40; }; + "sway/language" = { format = "{short} {variant}"; }; + "hyprland/workspaces" = { + enable-bar-scroll = true; + format = "{icon}"; + format-icons = { + "1" = ""; + "2" = ""; + "3" = "󰅩"; + "4" = ""; + "5" = ""; + "6" = ""; + "7" = "󰇮"; + "8" = ""; + "9" = ""; + "10" = ""; + urgent = ""; + # focused = ""; + default = ""; + }; + }; + "hyprland/window" = { max-length = 40; }; + "hyprland/language" = { format = "{short} {variant}"; }; "tray" = { "spacing" = 7; "icon-size" = 19; @@ -123,7 +153,6 @@ in interval = 1; tooltip = false; }; - "sway/language" = { format = "{short} {variant}"; }; "custom/caffeine" = { format = "{}"; exec = "systemctl --user status swayidle > /dev/null && echo 󰒲 || echo 󰒳"; From 6ad0d3685eef63432664342c6869bba92ef5a384 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sun, 21 Jan 2024 00:03:50 -0300 Subject: [PATCH 002/404] hyprland: minimal config --- user/firefox.nix | 7 +- user/home.nix | 2 +- user/hyprland.nix | 127 ------------------ user/hyprland/default.nix | 54 ++++++++ user/hyprland/hyprland.conf | 254 ++++++++++++++++++++++++++++++++++++ user/sway/default.nix | 2 + user/waybar/default.nix | 2 + user/waybar/style.css | 3 +- 8 files changed, 321 insertions(+), 130 deletions(-) delete mode 100644 user/hyprland.nix create mode 100644 user/hyprland/default.nix create mode 100644 user/hyprland/hyprland.conf diff --git a/user/firefox.nix b/user/firefox.nix index ea3c3b5..4699999 100644 --- a/user/firefox.nix +++ b/user/firefox.nix @@ -1,7 +1,12 @@ { config, pkgs, lib, font, ... }: let inherit (pkgs.uservars) desktop browser; bugfixedFirefox = pkgs.firefox-esr-unwrapped // { requireSigning = false; allowAddonSideload = true; }; + cfg = config.packages.firefox; in { + options.packages.firefox = { + hideTitleBar = lib.mkEnableOption "Hide firefox title bar"; + }; + config = { programs.firefox = { enable = true; @@ -92,7 +97,7 @@ in { "devtools.chrome.enabled" = true; "devtools.debugger.remote-enabled" = true; }; - userChrome = lib.mkIf (desktop == "sway") '' + userChrome = lib.mkIf cfg.hideTitleBar '' #titlebar { display: none !important; } #sidebar-header { display: none !important; } ''; diff --git a/user/home.nix b/user/home.nix index fac2170..8defc45 100644 --- a/user/home.nix +++ b/user/home.nix @@ -7,7 +7,7 @@ ./vscode ./fish ./firefox.nix - ./hyprland.nix + ./hyprland ./alacritty.nix ./git.nix ./ssh.nix diff --git a/user/hyprland.nix b/user/hyprland.nix deleted file mode 100644 index 4b29468..0000000 --- a/user/hyprland.nix +++ /dev/null @@ -1,127 +0,0 @@ -{ config, pkgs, lib, ... }: { - config = lib.mkIf (pkgs.uservars.desktop == "hyprland") { - wayland.windowManager.hyprland = { - enable = false; - extraConfig = '' - monitor=,preferred,auto,1 - - input { - kb_file= - kb_layout=us(colemak) - kb_variant= - kb_model= - kb_options= - kb_rules= - - follow_mouse=1 - - touchpad { - natural_scroll=no - } - } - - general { - sensitivity=1.0 # for mouse cursor - main_mod=SUPER - - gaps_in=5 - gaps_out=10 - border_size=2 - col.active_border=0xffF44336 - col.inactive_border=0x66333333 - - apply_sens_to_raw=0 # whether to apply the sensitivity to raw input (e.g. used by games where you aim using your mouse) - - # damage_tracking=full # leave it on full unless you hate your GPU and want to make it suffer - } - - # decoration { - # rounding=5 - # blur=1 - # # blur_size=3 # minimum 1 - # # blur_passes=1 # minimum 1, more passes = more resource intensive. - # # Your blur "amount" is blur_size * blur_passes, but high blur_size (over around 5-ish) will produce artifacts. - # # if you want heavy blur, you need to up the blur_passes. - # # the more passes, the more you can up the blur_size without noticing artifacts. - # } - - animations { - enabled=1 - animation=windows,1,7,default - animation=border,1,10,default - animation=fade,1,10,default - animation=workspaces,1,6,default - } - - dwindle { - pseudotile=0 # enable pseudotiling on dwindle - } - - gestures { - workspace_swipe=no - } - - # example window rules - # for windows named/classed as abc and xyz - #windowrule=move 69 420,abc - #windowrule=size 420 69,abc - #windowrule=tile,xyz - #windowrule=float,abc - #windowrule=pseudo,abc - #windowrule=monitor 0,xyz - - # example binds - bind=SUPER,Q,exec,kitty - bind=SUPER,RETURN,exec,alacritty - bind=SUPER,x,killactive, - bind=SUPER,M,exit, - # bind=SUPER,E,exec,dolphin - bind=SUPER,V,togglefloating, - bind=SUPER,s,exec,wlauncher - bind=SUPER,P,pseudo, - - bind=SUPER,f,fullscreen - - bind=SUPER,n,movefocus,l - bind=SUPER,o,movefocus,r - bind=SUPER,i,movefocus,u - bind=SUPER,e,movefocus,d - - bind=SUPER,left,movefocus,l - bind=SUPER,right,movefocus,r - bind=SUPER,up,movefocus,u - bind=SUPER,down,movefocus,d - - bind=SUPER,1,workspace,1 - bind=SUPER,2,workspace,2 - bind=SUPER,3,workspace,3 - bind=SUPER,4,workspace,4 - bind=SUPER,5,workspace,5 - bind=SUPER,6,workspace,6 - bind=SUPER,7,workspace,7 - bind=SUPER,8,workspace,8 - bind=SUPER,9,workspace,9 - bind=SUPER,0,workspace,10 - - bind=ALT,1,movetoworkspace,1 - bind=ALT,2,movetoworkspace,2 - bind=ALT,3,movetoworkspace,3 - bind=ALT,4,movetoworkspace,4 - bind=ALT,5,movetoworkspace,5 - bind=ALT,6,movetoworkspace,6 - bind=ALT,7,movetoworkspace,7 - bind=ALT,8,movetoworkspace,8 - bind=ALT,9,movetoworkspace,9 - bind=ALT,0,movetoworkspace,10 - - bind=SUPER,u,workspace,e-1 - bind=SUPER,y,workspace,e+1 - - bind=SUPER,mouse_down,workspace,e-1 - bind=SUPER,mouse_up,workspace,e+1 - ''; - }; - # home.file.".config/eww".source = ./eww; - # home.packages = with pkgs; [ eww-wayland jq ]; - }; -} diff --git a/user/hyprland/default.nix b/user/hyprland/default.nix new file mode 100644 index 0000000..2c01888 --- /dev/null +++ b/user/hyprland/default.nix @@ -0,0 +1,54 @@ +{ config, pkgs, lib, ... }: { + imports = [ + ../sway/kanshi.nix + ../sway/mako.nix + # ../sway/sway-binds.nix + # ../sway/sway-modes.nix + # ../sway/sway-assigns.nix + # ../sway/swayidle.nix + # ../sway/swaylock.nix + ../sway/theme.nix + ]; + + config = lib.mkIf (pkgs.uservars.desktop == "hyprland") { + wayland.windowManager.hyprland = { + enable = false; + extraConfig = lib.readFile ./hyprland.conf; + # systemd.enable = true; + }; + # home.file.".config/eww".source = ./eww; + + packages.firefox.hideTitleBar = true; + + home.packages = with pkgs; [ + eww-wayland + jq + hyprpaper + wdisplays + + waybar + dhist + demoji + bmenu + wdmenu + wlauncher + volumesh + showkeys + pamixer + libnotify + xdg-utils + screenshotsh + color_picker + wf-recorder + wl-clipboard + wtype + wl-crosshair + + grim + swappy + (tesseract5.override { + enableLanguages = [ "eng" "por" ]; + }) + ]; + }; +} diff --git a/user/hyprland/hyprland.conf b/user/hyprland/hyprland.conf new file mode 100644 index 0000000..bba5a18 --- /dev/null +++ b/user/hyprland/hyprland.conf @@ -0,0 +1,254 @@ + +######################################################################################## +AUTOGENERATED HYPR CONFIG. +PLEASE USE THE CONFIG PROVIDED IN THE GIT REPO /examples/hypr.conf AND EDIT IT, +OR EDIT THIS ONE ACCORDING TO THE WIKI INSTRUCTIONS. +######################################################################################## + +# +# Please note not all available settings / options are set here. +# For a full list, see the wiki +# + +# autogenerated = 1 # remove this line to remove the warning + +# See https://wiki.hyprland.org/Configuring/Monitors/ +monitor=,preferred,auto,auto + + +# See https://wiki.hyprland.org/Configuring/Keywords/ for more + +# Execute your favorite apps at launch +exec-once = waybar & hyprpaper & firefox + +# Source a file (multi-file configs) +# source = ~/.config/hypr/myColors.conf + +# Some default env vars. +env = XCURSOR_SIZE,24 + +# For all categories, see https://wiki.hyprland.org/Configuring/Variables/ +input { + kb_layout = us(colemak) + kb_variant = + kb_model = + kb_options = + kb_rules = + + follow_mouse = 1 + + touchpad { + natural_scroll = no + } + + sensitivity = 0 # -1.0 - 1.0, 0 means no modification. +} + +general { + # See https://wiki.hyprland.org/Configuring/Variables/ for more + + gaps_in = 5 + gaps_out = 10 + border_size = 2 + col.active_border = rgba(F44336ee) rgba(202020ee) 45deg + col.inactive_border = rgba(202020ee) + + layout = master + + # Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on + allow_tearing = false +} + +decoration { + # See https://wiki.hyprland.org/Configuring/Variables/ for more + + rounding = 5 + + blur { + enabled = true + size = 3 + passes = 1 + } + + drop_shadow = yes + shadow_range = 4 + shadow_render_power = 3 + col.shadow = rgba(1a1a1aee) +} + +animations { + enabled = yes + + # Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more + + bezier = myBezier, 0.05, 0.9, 0.1, 1.05 + + animation = windows, 1, 7, myBezier + animation = windowsOut, 1, 7, default, popin 80% + animation = border, 1, 10, default + animation = borderangle, 1, 8, default + animation = fade, 1, 7, default + animation = workspaces, 1, 6, default +} + +dwindle { + # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more + pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below + preserve_split = yes # you probably want this +} + +master { + # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more + new_is_master = true + no_gaps_when_only = 1 +} + +gestures { + # See https://wiki.hyprland.org/Configuring/Variables/ for more + workspace_swipe = off +} + +misc { + # See https://wiki.hyprland.org/Configuring/Variables/ for more + force_default_wallpaper = 0 # Set to 0 to disable the anime mascot wallpapers +} + +# Example per-device config +# See https://wiki.hyprland.org/Configuring/Keywords/#executing for more +device:epic-mouse-v1 { + sensitivity = -0.5 +} + +# Example windowrule v1 +# windowrule = float, ^(kitty)$ +# Example windowrule v2 +# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$ + + +windowrulev2 = workspace 2, class:qutebrowser +windowrulev2 = workspace 2, class:qutebrowser +windowrulev2 = workspace 2, class:firefox +windowrulev2 = workspace 2, class:firefox +windowrulev2 = workspace 2, class:Chromium +windowrulev2 = workspace 2, class:chromium + +windowrulev2 = workspace 6, class:org.nicotine_plus.Nicotine +windowrulev2 = workspace 6, class:deluge +windowrulev2 = workspace 6, class:com.obsproject.Studio + +windowrulev2 = workspace 7, class:thunderbird +windowrulev2 = workspace 7, class:astroid + +windowrulev2 = workspace 9, class:.*[Ss]team.* +windowrulev2 = workspace 9, class:.*[Ss]team.* +windowrulev2 = workspace 9, class:[Ll]utris + +windowrulev2 = workspace 10, class:.*[Tt]elegram.* +windowrulev2 = workspace 10, class:.*[Tt]elegram.* +windowrulev2 = workspace 10, class:Jitsi Meet +windowrulev2 = workspace 10, class:discord +windowrulev2 = workspace 10, class:Discord +windowrulev2 = workspace 10, class:WebCord +windowrulev2 = workspace 10, class:WebCord +windowrulev2 = workspace 10, class:Element +windowrulev2 = workspace 10, class:Element + +# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more + +# See https://wiki.hyprland.org/Configuring/Keywords/ for more +$mainMod = SUPER + +# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more +bind = $mainMod, Return, exec, alacritty +bind = $mainMod, X, killactive, +# bind = $mainMod, M, exit, +bind = $mainMod Control, Return, exec, thunar +bind = $mainMod Shift, Space, togglefloating, +bind = $mainMod, R, exec, wofi --show drun +bind = $mainMod, P, pseudo, # dwindle +bind = $mainMod, J, togglesplit, # dwindle + +# Move focus with mainMod + arrow keys +bind = $mainMod, left, movefocus, l +bind = $mainMod, right, movefocus, r +bind = $mainMod, up, movefocus, u +bind = $mainMod, down, movefocus, d + +# Switch workspaces with mainMod + [0-9] +bind = $mainMod, 1, workspace, 1 +bind = $mainMod, 2, workspace, 2 +bind = $mainMod, 3, workspace, 3 +bind = $mainMod, 4, workspace, 4 +bind = $mainMod, 5, workspace, 5 +bind = $mainMod, 6, workspace, 6 +bind = $mainMod, 7, workspace, 7 +bind = $mainMod, 8, workspace, 8 +bind = $mainMod, 9, workspace, 9 +bind = $mainMod, 0, workspace, 10 + +# Move active window to a workspace with mainMod + SHIFT + [0-9] +bind = $mainMod SHIFT, 1, movetoworkspace, 1 +bind = $mainMod SHIFT, 2, movetoworkspace, 2 +bind = $mainMod SHIFT, 3, movetoworkspace, 3 +bind = $mainMod SHIFT, 4, movetoworkspace, 4 +bind = $mainMod SHIFT, 5, movetoworkspace, 5 +bind = $mainMod SHIFT, 6, movetoworkspace, 6 +bind = $mainMod SHIFT, 7, movetoworkspace, 7 +bind = $mainMod SHIFT, 8, movetoworkspace, 8 +bind = $mainMod SHIFT, 9, movetoworkspace, 9 +bind = $mainMod SHIFT, 0, movetoworkspace, 10 + +# Example special workspace (scratchpad) +bind = $mainMod, j, togglespecialworkspace, magic +bind = $mainMod SHIFT, j, movetoworkspace, special:magic + +# Scroll through existing workspaces with mainMod + scroll +bind = $mainMod, mouse_down, workspace, e+1 +bind = $mainMod, mouse_up, workspace, e-1 + +# Move/resize windows with mainMod + LMB/RMB and dragging +bindm = $mainMod, mouse:272, movewindow +bindm = $mainMod, mouse:273, resizewindow + +bind = $mainMod, S, exec, wlauncher +bind = $mainMod, B, layoutmsg, swapwithmaster + + bind=$mainMod,f,fullscreen + + bind=$mainMod,n,movefocus,l + bind=$mainMod,o,movefocus,r + bind=$mainMod,i,movefocus,u + bind=$mainMod,e,movefocus,d + + bind=$mainMod,left,movefocus,l + bind=$mainMod,right,movefocus,r + bind=$mainMod,up,movefocus,u + bind=$mainMod,down,movefocus,d + + bind=$mainMod,1,workspace,1 + bind=$mainMod,2,workspace,2 + bind=$mainMod,3,workspace,3 + bind=$mainMod,4,workspace,4 + bind=$mainMod,5,workspace,5 + bind=$mainMod,6,workspace,6 + bind=$mainMod,7,workspace,7 + bind=$mainMod,8,workspace,8 + bind=$mainMod,9,workspace,9 + bind=$mainMod,0,workspace,10 + + # bind=ALT,1,movetoworkspace,1 + # bind=ALT,2,movetoworkspace,2 + # bind=ALT,3,movetoworkspace,3 + # bind=ALT,4,movetoworkspace,4 + # bind=ALT,5,movetoworkspace,5 + # bind=ALT,6,movetoworkspace,6 + # bind=ALT,7,movetoworkspace,7 + # bind=ALT,8,movetoworkspace,8 + # bind=ALT,9,movetoworkspace,9 + # bind=ALT,0,movetoworkspace,10 + + bind=$mainMod,u,workspace,e-1 + bind=$mainMod,y,workspace,e+1 + + bind=$mainMod,mouse_down,workspace,e-1 + bind=$mainMod,mouse_up,workspace,e+1 diff --git a/user/sway/default.nix b/user/sway/default.nix index 0449e30..c79e0d8 100644 --- a/user/sway/default.nix +++ b/user/sway/default.nix @@ -98,6 +98,8 @@ in indicator = true; }; + packages.firefox.hideTitleBar = true; + home.packages = with pkgs; [ sway swaybg diff --git a/user/waybar/default.nix b/user/waybar/default.nix index 90d2f49..f6163b8 100644 --- a/user/waybar/default.nix +++ b/user/waybar/default.nix @@ -79,6 +79,8 @@ in "sway/language" = { format = "{short} {variant}"; }; "hyprland/workspaces" = { enable-bar-scroll = true; + on-scroll-up = "hyprctl dispatch workspace e-1"; + on-scroll-down = "hyprctl dispatch workspace e+1"; format = "{icon}"; format-icons = { "1" = ""; diff --git a/user/waybar/style.css b/user/waybar/style.css index f9c0fb1..0f82fea 100644 --- a/user/waybar/style.css +++ b/user/waybar/style.css @@ -20,7 +20,8 @@ window#waybar.solo { background-color: transparent; border: 3px solid transparent; } -#workspaces button.focused { +#workspaces button.focused, +#workspaces button.active { color: @color_txt@; border-top: 3px solid @accent_color@; } From f3ef67949900aceb3a92630ccd450990bc52c5a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sun, 21 Jan 2024 00:23:36 -0300 Subject: [PATCH 003/404] hyprland improve systemd integration --- system/greetd.nix | 5 ++++- user/hyprland/default.nix | 2 +- user/sway/mako.nix | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/system/greetd.nix b/system/greetd.nix index 72b82c1..d8d1531 100644 --- a/system/greetd.nix +++ b/system/greetd.nix @@ -35,7 +35,10 @@ in greetd_main_script = pkgs.writeShellScriptBin "main" '' ${pkgs.dbus-sway-environment}/bin/dbus-sway-environment export XDG_CURRENT_DESKTOP=sway GTK_THEME="${theme.gtk_theme}" XCURSOR_THEME="${theme.cursor_theme}" - ${pkgs.greetd.gtkgreet}/bin/gtkgreet -l -c ${desktop} + ${pkgs.greetd.gtkgreet}/bin/gtkgreet -l -c ${{ + sway = "sway"; + hyprland = "Hyprland"; + }.${desktop}} swaymsg exit ''; swayConfig = pkgs.writeText "greetd-sway-config" '' diff --git a/user/hyprland/default.nix b/user/hyprland/default.nix index 2c01888..eacb59f 100644 --- a/user/hyprland/default.nix +++ b/user/hyprland/default.nix @@ -14,7 +14,7 @@ wayland.windowManager.hyprland = { enable = false; extraConfig = lib.readFile ./hyprland.conf; - # systemd.enable = true; + systemd.enable = true; }; # home.file.".config/eww".source = ./eww; diff --git a/user/sway/mako.nix b/user/sway/mako.nix index 637a2d5..2fced8d 100644 --- a/user/sway/mako.nix +++ b/user/sway/mako.nix @@ -48,6 +48,6 @@ in ExecStart = "${pkgs.mako}/bin/mako"; Restart = "on-failure"; }; - Install = { WantedBy = [ "sway-session.target" ]; }; + Install = { WantedBy = [ "sway-session.target" "hyprland-sessions.target" ]; }; }; } From fb323ec2274a6ac0bb73673d1ed53ae7021c7f44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sun, 21 Jan 2024 01:24:23 -0300 Subject: [PATCH 004/404] hyprland: more improvements --- user/chat.nix | 6 ++++++ user/home.nix | 7 +++++++ user/hyprland/default.nix | 18 +++++++++++++++--- user/hyprland/hyprland.conf | 34 +++++++++++++++++++++++++++++++--- user/sway/mako.nix | 3 ++- user/variables.nix | 2 +- user/waybar/default.nix | 4 ++-- 7 files changed, 64 insertions(+), 10 deletions(-) diff --git a/user/chat.nix b/user/chat.nix index 34ddd84..7e27892 100644 --- a/user/chat.nix +++ b/user/chat.nix @@ -7,6 +7,12 @@ ''; }; + wayland.windowManager.hyprland.extraConfig = '' + exec-once = thunderbird + exec-once = webcord + exec-once = telegram-desktop + ''; + home.packages = with pkgs; [ tdesktop webcord diff --git a/user/home.nix b/user/home.nix index 8defc45..7dfc0ed 100644 --- a/user/home.nix +++ b/user/home.nix @@ -172,6 +172,13 @@ exec nicotine ''; + wayland.windowManager.hyprland.extraConfig = lib.optionalString (osConfig.networking.hostName or "" == "monolith") '' + exec-once = steam + exec-once = obs --startreplaybuffer + exec-once = deluge-gtk + exec-once = nicotine + ''; + systemd.user.services.rm-target = { Unit = { Description = "Remove directories named 'target'"; diff --git a/user/hyprland/default.nix b/user/hyprland/default.nix index eacb59f..6eaa16f 100644 --- a/user/hyprland/default.nix +++ b/user/hyprland/default.nix @@ -1,4 +1,8 @@ -{ config, pkgs, lib, ... }: { +{ config, pkgs, lib, ... }: +let + inherit (pkgs.uservars) theme; +in +{ imports = [ ../sway/kanshi.nix ../sway/mako.nix @@ -11,11 +15,19 @@ ]; config = lib.mkIf (pkgs.uservars.desktop == "hyprland") { + services.mako.enable = true; + wayland.windowManager.hyprland = { - enable = false; - extraConfig = lib.readFile ./hyprland.conf; + enable = true; + extraConfig = '' + source = /home/lelgenio/projects/nixos-config/user/hyprland/hyprland.conf + ''; systemd.enable = true; }; + home.file.".config/hypr/hyprpaper.conf".text = '' + preload = ${theme.background} + wallpaper = ,${theme.background} + ''; # home.file.".config/eww".source = ./eww; packages.firefox.hideTitleBar = true; diff --git a/user/hyprland/hyprland.conf b/user/hyprland/hyprland.conf index bba5a18..f84aa97 100644 --- a/user/hyprland/hyprland.conf +++ b/user/hyprland/hyprland.conf @@ -14,12 +14,12 @@ OR EDIT THIS ONE ACCORDING TO THE WIKI INSTRUCTIONS. # See https://wiki.hyprland.org/Configuring/Monitors/ monitor=,preferred,auto,auto - +monitor=DP-1,1920x1080@144,auto,auto # See https://wiki.hyprland.org/Configuring/Keywords/ for more # Execute your favorite apps at launch -exec-once = waybar & hyprpaper & firefox +exec-once = hyprpaper & firefox # Source a file (multi-file configs) # source = ~/.config/hypr/myColors.conf @@ -99,7 +99,7 @@ dwindle { master { # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more - new_is_master = true + new_is_master = false no_gaps_when_only = 1 } @@ -164,6 +164,9 @@ bind = $mainMod, X, killactive, # bind = $mainMod, M, exit, bind = $mainMod Control, Return, exec, thunar bind = $mainMod Shift, Space, togglefloating, + +bind = $mainMod Control, z, exec, swaylock & systemctl suspend + bind = $mainMod, R, exec, wofi --show drun bind = $mainMod, P, pseudo, # dwindle bind = $mainMod, J, togglesplit, # dwindle @@ -213,6 +216,9 @@ bindm = $mainMod, mouse:273, resizewindow bind = $mainMod, S, exec, wlauncher bind = $mainMod, B, layoutmsg, swapwithmaster +bind = $mainMod Shift, E, layoutmsg, swapnext +bind = $mainMod Shift, I, layoutmsg, swapprev + bind=$mainMod,f,fullscreen bind=$mainMod,n,movefocus,l @@ -252,3 +258,25 @@ bind = $mainMod, B, layoutmsg, swapwithmaster bind=$mainMod,mouse_down,workspace,e-1 bind=$mainMod,mouse_up,workspace,e+1 + +# Music mode + +bind=$mainMod,M,submap,music +submap=music + +binde=,Space,exec,mpc toggle + +binde=,U,exec,volumesh -i 10 +binde=,Y,exec,volumesh -d 10 +binde=,O,exec,mpc next +binde=,N,exec,mpc prev +binde=,I,exec,volumesh --mpd -i 10 +binde=,E,exec,volumesh --mpd -d 10 + +binde=,s,exec,pulse_sink + +# use reset to go back to the global submap +bind=,escape,submap,reset + +# will reset the submap, meaning end the current one and return to the global one +submap=reset diff --git a/user/sway/mako.nix b/user/sway/mako.nix index 2fced8d..2089d22 100644 --- a/user/sway/mako.nix +++ b/user/sway/mako.nix @@ -1,11 +1,12 @@ { config, pkgs, lib, ... }: let - inherit (pkgs.uservars) key accent font theme; + inherit (pkgs.uservars) key accent font theme desktop; inherit (theme) color; in { services.mako = { borderSize = 2; + borderRadius = if desktop == "sway" then 0 else 5; padding = "5"; margin = "15"; layer = "overlay"; diff --git a/user/variables.nix b/user/variables.nix index b8d7cce..1357a63 100644 --- a/user/variables.nix +++ b/user/variables.nix @@ -128,7 +128,7 @@ rec { pass = "disroot.org"; }; - dmenu = "bmenu"; + dmenu = "rofi"; desktop = "hyprland"; browser = "firefox"; editor = "kakoune"; diff --git a/user/waybar/default.nix b/user/waybar/default.nix index f6163b8..3de9b36 100644 --- a/user/waybar/default.nix +++ b/user/waybar/default.nix @@ -1,6 +1,6 @@ { config, osConfig, pkgs, lib, font, ... }: let - inherit (pkgs.uservars) key theme accent font; + inherit (pkgs.uservars) key theme accent font desktop; inherit (theme) color; in { @@ -8,7 +8,7 @@ in programs.waybar = { enable = true; systemd.enable = true; - systemd.target = "sway-session.target"; + systemd.target = "${desktop}-session.target"; settings = [{ layer = "top"; modules-left = [ From 2b642b2aaf010bdae5f3ec39c0f0c2dcbd148eee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 22 Jan 2024 20:37:43 -0300 Subject: [PATCH 005/404] sway: Ignore PS4 controller touchpad events --- user/sway/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/user/sway/default.nix b/user/sway/default.nix index 0449e30..7f7b8b8 100644 --- a/user/sway/default.nix +++ b/user/sway/default.nix @@ -61,6 +61,8 @@ in names = [ font.interface ]; size = font.size.medium * 1.0; }; + # Ignore PS4 controller touchpad events + input."1356:2508:Wireless_Controller_Touchpad".events = "disabled"; input."type:touchpad" = { # Disable While Typing dwt = "enabled"; From fe06b965b8765c82e1be081ec3fd66bf0f91554e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 24 Jan 2024 21:59:57 -0300 Subject: [PATCH 006/404] wacom: Install OpenTabletDriver --- hosts/monolith.nix | 2 + user/sway/default.nix | 2 + user/sway/open-tablet-driver.json | 114 ++++++++++++++++++++++++++++++ 3 files changed, 118 insertions(+) create mode 100644 user/sway/open-tablet-driver.json diff --git a/hosts/monolith.nix b/hosts/monolith.nix index c78f64f..24588dc 100644 --- a/hosts/monolith.nix +++ b/hosts/monolith.nix @@ -11,6 +11,8 @@ in boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; + hardware.opentabletdriver.enable = true; + boot.extraModulePackages = with config.boot.kernelPackages; [ zenpower ]; diff --git a/user/sway/default.nix b/user/sway/default.nix index 7f7b8b8..16cb78e 100644 --- a/user/sway/default.nix +++ b/user/sway/default.nix @@ -100,6 +100,8 @@ in indicator = true; }; + xdg.configFile."OpenTabletDriver/settings.json".source = ./open-tablet-driver.json; + home.packages = with pkgs; [ sway swaybg diff --git a/user/sway/open-tablet-driver.json b/user/sway/open-tablet-driver.json new file mode 100644 index 0000000..834c323 --- /dev/null +++ b/user/sway/open-tablet-driver.json @@ -0,0 +1,114 @@ +{ + "Profiles": [ + { + "Tablet": "Wacom CTL-4100", + "OutputMode": { + "Path": "OpenTabletDriver.Desktop.Output.LinuxArtistMode", + "Settings": [], + "Enable": true + }, + "Filters": [], + "AbsoluteModeSettings": { + "Display": { + "Width": 1920.0, + "Height": 1080.0, + "X": 960.0, + "Y": 540.0, + "Rotation": 0.0 + }, + "Tablet": { + "Width": 152.0, + "Height": 85.5, + "X": 76.0, + "Y": 47.5, + "Rotation": 0.0 + }, + "EnableClipping": false, + "EnableAreaLimiting": false, + "LockAspectRatio": true + }, + "RelativeModeSettings": { + "XSensitivity": 10.0, + "YSensitivity": 10.0, + "RelativeRotation": 0.0, + "RelativeResetDelay": "00:00:00.1000000" + }, + "Bindings": { + "TipActivationThreshold": 0.0, + "TipButton": null, + "EraserActivationThreshold": 0.0, + "EraserButton": null, + "PenButtons": [ + { + "Path": "OpenTabletDriver.Desktop.Binding.LinuxArtistMode.LinuxArtistModeButtonBinding", + "Settings": [ + { + "Property": "Button", + "Value": "Pen Button 1" + } + ], + "Enable": true + }, + { + "Path": "OpenTabletDriver.Desktop.Binding.LinuxArtistMode.LinuxArtistModeButtonBinding", + "Settings": [ + { + "Property": "Button", + "Value": "Pen Button 2" + } + ], + "Enable": true + } + ], + "AuxButtons": [ + { + "Path": "OpenTabletDriver.Desktop.Binding.MultiKeyBinding", + "Settings": [ + { + "Property": "Keys", + "Value": "Control+Z" + } + ], + "Enable": true + }, + { + "Path": "OpenTabletDriver.Desktop.Binding.MultiKeyBinding", + "Settings": [ + { + "Property": "Keys", + "Value": "Control+Shift+Z" + } + ], + "Enable": true + }, + { + "Path": "OpenTabletDriver.Desktop.Binding.MultiKeyBinding", + "Settings": [ + { + "Property": "Keys", + "Value": "Control+Minus" + } + ], + "Enable": true + }, + { + "Path": "OpenTabletDriver.Desktop.Binding.MultiKeyBinding", + "Settings": [ + { + "Property": "Keys", + "Value": "Control+Shift+Equal" + } + ], + "Enable": true + } + ], + "MouseButtons": [], + "MouseScrollUp": null, + "MouseScrollDown": null + } + } + ], + "LockUsableAreaDisplay": true, + "LockUsableAreaTablet": true, + "Tools": [] +} \ No newline at end of file From e2e6b85d623936e62e8214e2287af49fa11b5dff Mon Sep 17 00:00:00 2001 From: lelgenio Date: Thu, 1 Feb 2024 17:57:46 -0300 Subject: [PATCH 007/404] kakoune: don't show changelog --- user/kakoune/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/kakoune/default.nix b/user/kakoune/default.nix index d2ef8eb..c39b61b 100644 --- a/user/kakoune/default.nix +++ b/user/kakoune/default.nix @@ -87,7 +87,7 @@ in set global scrolloff 10,20 set global autoreload yes - set global startup_info_version 20200901 + set global startup_info_version 99999999 '' + (import ./colors.nix { inherit pkgs lib color accent; From 7ddc64cf614aa1df4f8632f728c0a61a14b7e215 Mon Sep 17 00:00:00 2001 From: lelgenio Date: Fri, 2 Feb 2024 13:43:33 -0300 Subject: [PATCH 008/404] sway: add keybind to disable cursor --- user/sway/sway-binds.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/user/sway/sway-binds.nix b/user/sway/sway-binds.nix index 12a69cc..bb5488b 100644 --- a/user/sway/sway-binds.nix +++ b/user/sway/sway-binds.nix @@ -156,6 +156,8 @@ let "${mod}+m" = "mode audio"; "${mod}+escape" = "mode passthrough;exec notify-send 'Passthrough on'"; + "${mod}+ctrl+k" = "exec swaymsg input type:pointer events disabled"; + "${mod}+ctrl+shift+k" = "exec swaymsg input type:pointer events enabled"; "${mod}+f" = "fullscreen toggle"; "${mod}+Shift+space" = "floating toggle"; "${mod}+space" = "focus mode_toggle"; From 6ab508f37420047bd7d9c00ce48ebaf14e0f9458 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 2 Feb 2024 20:48:01 -0300 Subject: [PATCH 009/404] update --- flake.lock | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index 0c0e72a..6754684 100644 --- a/flake.lock +++ b/flake.lock @@ -476,11 +476,11 @@ ] }, "locked": { - "lastModified": 1705476964, - "narHash": "sha256-W5OK1fnj4qdn1HWOlxV2S3YiUvfaVjQM5ldWVpGV1fs=", + "lastModified": 1705659542, + "narHash": "sha256-WA3xVfAk1AYmFdwghT7mt/erYpsU6JPu9mdTEP/e9HQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "85c3b600f660abd86e94cbcd1c46733943197a07", + "rev": "10cd9c53115061aa6a0a90aad0b0dde6a999cdb9", "type": "github" }, "original": { @@ -501,11 +501,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1705503680, - "narHash": "sha256-e+ou1KvZeZp104yeCgvgTTp5G+DB380CUZuUkijZxAc=", + "lastModified": 1706838674, + "narHash": "sha256-umU1VC3bI4L/ZHpl/bZsm4MSUnX9wZrQRmbEjNLeQV4=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "c4365f20ed8ff0dd480b7ed7cf1bfff1a0b6911a", + "rev": "7447be822080fac5b8515a177773ec74b4d6c925", "type": "github" }, "original": { @@ -623,11 +623,11 @@ ] }, "locked": { - "lastModified": 1705282324, - "narHash": "sha256-LnURMA7yCM5t7et9O2+2YfGQh0FKAfE5GyahNDDzJVM=", + "lastModified": 1706411424, + "narHash": "sha256-BzziJYucEZvdCE985vjPoo3ztWcmUiSQ1wJ2CoT6jCc=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "49aaeecf41ae0a0944e2c627cb515bcde428a1d1", + "rev": "c782f2a4f6fc94311ab5ef31df2f1149a1856181", "type": "github" }, "original": { @@ -740,11 +740,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1705458851, - "narHash": "sha256-uQvEhiv33Zj/Pv364dTvnpPwFSptRZgVedDzoM+HqVg=", + "lastModified": 1706718339, + "narHash": "sha256-S+S97c/HzkO2A/YsU7ZmNF9w2s7Xk6P8dzmfDdckzLs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8bf65f17d8070a0a490daf5f1c784b87ee73982c", + "rev": "53fbe41cf76b6a685004194e38e889bc8857e8c2", "type": "github" }, "original": { @@ -1115,18 +1115,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1703963193, - "narHash": "sha256-ke8drv6PTrdQDruWbajrRJffP9A9PU6FRyjJGNZRTs4=", + "lastModified": 1706359063, + "narHash": "sha256-5HUTG0p+nCJv3cn73AmFHRZdfRV5AD5N43g8xAePSKM=", "owner": "wlroots", "repo": "wlroots", - "rev": "f81c3d93cd6f61b20ae784297679283438def8df", + "rev": "00b869c1a96f300a8f25da95d624524895e0ddf2", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "f81c3d93cd6f61b20ae784297679283438def8df", + "rev": "00b869c1a96f300a8f25da95d624524895e0ddf2", "type": "gitlab" } }, @@ -1147,11 +1147,11 @@ ] }, "locked": { - "lastModified": 1704659450, - "narHash": "sha256-3lyoUVtUWz1LuxbltAtkJSK2IlVXmKhxCRU2/0PYCms=", + "lastModified": 1706145785, + "narHash": "sha256-j9MP4fv2U/vdRKAXXc2gyMTmYwVnHP6kHx1/y6jprrU=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "6a5de92769d5b7038134044053f90e7458f6a197", + "rev": "5a592647587cd20b9692a347df6939b6d371b3bb", "type": "github" }, "original": { From 3830a01240cd75bf42d84e367fefc3988203d023 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 2 Feb 2024 20:53:36 -0300 Subject: [PATCH 010/404] ghost: update mastodon to fix a vulnerability --- hosts/ghost/mastodon.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/hosts/ghost/mastodon.nix b/hosts/ghost/mastodon.nix index a4262f0..93d4f4b 100644 --- a/hosts/ghost/mastodon.nix +++ b/hosts/ghost/mastodon.nix @@ -6,6 +6,15 @@ smtp.fromAddress = "lelgenio@disroot.org"; extraConfig.SINGLE_USER_MODE = "true"; streamingProcesses = 2; + package = pkgs.mastodon.override { + version = "4.2.5"; + patches = [ + (pkgs.fetchpatch { + url = "https://github.com/mastodon/mastodon/compare/v4.2.4...v4.2.5.patch"; + hash = "sha256-CtzYV1i34s33lV/1jeNcr9p/x4Es1zRaf4l1sNWVKYk="; + }) + ]; + }; }; services.nginx.virtualHosts.${config.services.nextcloud.hostName} = { From 35e0704b82951d2b0b43f3d406a39c86adc141ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 2 Feb 2024 21:03:34 -0300 Subject: [PATCH 011/404] agenix: fix secrets not being opened on boot Agenix runs before some partitions are mounted, one option is to mark those partitions are need for boot: { fileSystems."/home".neededForBoot = true; } I choose to copy my ssh key to the root user's HOME, which is not in a separate partition. --- system/secrets.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/secrets.nix b/system/secrets.nix index 776ee6e..0d0870b 100644 --- a/system/secrets.nix +++ b/system/secrets.nix @@ -1,6 +1,6 @@ { pkgs, ... }: { age = { - identityPaths = [ "/home/lelgenio/.ssh/id_rsa" ]; + identityPaths = [ "/root/.ssh/id_rsa" ]; secrets.lelgenio-cachix.file = ../secrets/lelgenio-cachix.age; secrets.monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.file = ../secrets/monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.age; From 7e2c9b087adc998de0b3bad62b2f841190a62667 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 3 Feb 2024 01:08:05 -0300 Subject: [PATCH 012/404] otd: don't use shift in binds becasue it's bugged --- user/sway/open-tablet-driver.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/user/sway/open-tablet-driver.json b/user/sway/open-tablet-driver.json index 834c323..3b388a1 100644 --- a/user/sway/open-tablet-driver.json +++ b/user/sway/open-tablet-driver.json @@ -76,7 +76,7 @@ "Settings": [ { "Property": "Keys", - "Value": "Control+Shift+Z" + "Value": "Control+O" } ], "Enable": true @@ -96,7 +96,7 @@ "Settings": [ { "Property": "Keys", - "Value": "Control+Shift+Equal" + "Value": "Control+Equal" } ], "Enable": true @@ -111,4 +111,4 @@ "LockUsableAreaDisplay": true, "LockUsableAreaTablet": true, "Tools": [] -} \ No newline at end of file +} From a587610fd11dcbfe9073e33a456f62571673b95c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Tue, 6 Feb 2024 20:54:50 -0300 Subject: [PATCH 013/404] scripts: fix wl-copy-file path handling --- scripts/wl-copy-file | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/wl-copy-file b/scripts/wl-copy-file index 05ffe06..95a4aea 100644 --- a/scripts/wl-copy-file +++ b/scripts/wl-copy-file @@ -10,12 +10,13 @@ if test (count $argv) != 1 end set -a file (realpath $argv[1]) +set -a url (string escape --style=url "$file") set -e argv[1] if test -d "$file" die 1 "Cannot copy directories" >&2 else if test -f "$file" - wl-copy $argv -t text/uri-list "file:///$file" + wl-copy $argv -t text/uri-list "file:///$url" else die 2 "No file found" >&2 end From 325cf58e2ce9d3461cf546c4f5227036a787aa76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 7 Feb 2024 12:45:30 -0300 Subject: [PATCH 014/404] thunar: enable krita thumbnails --- system/thunar.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/system/thunar.nix b/system/thunar.nix index e3af8e7..5a14448 100644 --- a/system/thunar.nix +++ b/system/thunar.nix @@ -10,4 +10,19 @@ services.gvfs.enable = true; # Thumbnail support for images services.tumbler.enable = true; + + environment.systemPackages = [ + ( + pkgs.writeTextFile { + name = "thumbs"; + text = '' + [Thumbnailer Entry] + TryExec=unzip + Exec=sh -c "${pkgs.unzip}/bin/unzip -p %i preview.png > %o" + MimeType=application/x-krita; + ''; + destination = "/share/thumbnailers/kra.thumbnailer"; + } + ) + ]; } From b0bd97336543107496d13051586c69b3025463a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 9 Feb 2024 19:12:31 -0300 Subject: [PATCH 015/404] monolith: add projects mount --- hosts/monolith.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hosts/monolith.nix b/hosts/monolith.nix index 24588dc..cb8df63 100644 --- a/hosts/monolith.nix +++ b/hosts/monolith.nix @@ -101,6 +101,11 @@ in fsType = "btrfs"; options = [ "nofail" ] ++ btrfs_options ++ btrfs_ssd; }; + fileSystems."/home/lelgenio/projects" = { + device = "/dev/disk/by-label/BTRFS_BIGBOY"; + fsType = "btrfs"; + options = [ "subvol=@projects" "nofail" ] ++ btrfs_options ++ btrfs_ssd; + }; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's # still possible to use this option, but it's recommended to use it in conjunction From 9f35809cc6b5e4817b7b2352250e8a978d66e120 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 10 Feb 2024 00:10:16 -0300 Subject: [PATCH 016/404] helix: fix config --- user/helix.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/user/helix.nix b/user/helix.nix index ad02d0d..3e430fc 100644 --- a/user/helix.nix +++ b/user/helix.nix @@ -77,14 +77,21 @@ in keys.insert = { "A-k" = "normal_mode"; }; }; languages.language = [ - { name = "nix"; auto-format = true; formatter = { command = "nixpkgs-fmt"; }; } - { name = "rust"; auto-format = true; } { - name = "php"; - config.intelephense.format.braces = "k&r"; + name = "nix"; + auto-format = true; + formatter.command = "nixpkgs-fmt"; + } + { + name = "rust"; + auto-format = true; } ]; + languages.language-server = { + intelephense.config.intelephense.format.braces = "k&r"; + }; + themes = { my-theme = { "inherits" = "gruvbox"; From 10e4811c3e78f5b693aa55c5f48a6d4c58d2e4bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sun, 11 Feb 2024 01:45:38 -0300 Subject: [PATCH 017/404] nix: enable repl-flake --- system/nix.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/nix.nix b/system/nix.nix index 87e4324..364f2aa 100644 --- a/system/nix.nix +++ b/system/nix.nix @@ -26,7 +26,7 @@ ]; }; extraOptions = '' - experimental-features = nix-command flakes + experimental-features = nix-command flakes repl-flake ''; }; } From 5ee50a33b26e66eb7b3f9c045b4376b4a50e8f9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 12 Feb 2024 10:54:14 -0300 Subject: [PATCH 018/404] kak: fix git mode conflic resolution --- user/kakoune/git-mode.kak | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/user/kakoune/git-mode.kak b/user/kakoune/git-mode.kak index 419f96f..ec4ed14 100644 --- a/user/kakoune/git-mode.kak +++ b/user/kakoune/git-mode.kak @@ -53,18 +53,18 @@ define-command -override git-prev-merge-conflict %{ define-command -override git-merge-head %{ evaluate-commands -draft %{ # delete head marker - execute-keys ^{4,}d + execute-keys ^{4,}xd try %{ # select original marker execute-keys /^[|]{4,} # extend to theirs marker - execute-keys ?^={4,} + execute-keys ?^={4,}x } catch %{ # select theirs marker - execute-keys /^={4,} + execute-keys /^={4,}x } # extend to end marker - execute-keys ?^{4,}d + execute-keys ?^{4,}xd } } -docstring "merge using head" @@ -73,11 +73,11 @@ define-command -override git-merge-original %{ # select head marker execute-keys ^{4,} # select to middle of conflict - execute-keys ?^[|]{4,}d + execute-keys ?^[|]{4,}xd # select theirs marker execute-keys /^={4,} # extend to end marker - execute-keys ?^{4,}d + execute-keys ?^{4,}xd } } -docstring "merge using original" @@ -88,7 +88,7 @@ define-command -override git-merge-new %{ # extend to theirs marker execute-keys ?^={4,}\nd # delete end marker - execute-keys /^{4,}d + execute-keys /^{4,}xd } } -docstring "merge using new" From 6ff64282772ad78d90598c57c871185a1ac1180f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 17 Feb 2024 21:07:55 -0300 Subject: [PATCH 019/404] ghost: enabled automatic updates --- hosts/ghost/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/hosts/ghost/default.nix b/hosts/ghost/default.nix index 3d1afc8..040a093 100644 --- a/hosts/ghost/default.nix +++ b/hosts/ghost/default.nix @@ -28,6 +28,15 @@ identityPaths = [ "/root/.ssh/id_rsa" ]; }; + system.autoUpgrade = { + enable = true; + dates = "04:40"; + allowReboot = true; + operation = "switch"; + flags = [ "--update-input" "nixpkgs" "--no-write-lock-file" "-L" ]; + flake = "github:lelgenio/nixos-config#ghost"; + }; + system.stateVersion = "23.05"; # Never change this } From 3b05a090d61177525b50fa21ecfaeb46d10a0749 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 17 Feb 2024 21:08:15 -0300 Subject: [PATCH 020/404] ghost: remove mastodon update/patch --- hosts/ghost/mastodon.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/hosts/ghost/mastodon.nix b/hosts/ghost/mastodon.nix index 93d4f4b..a4262f0 100644 --- a/hosts/ghost/mastodon.nix +++ b/hosts/ghost/mastodon.nix @@ -6,15 +6,6 @@ smtp.fromAddress = "lelgenio@disroot.org"; extraConfig.SINGLE_USER_MODE = "true"; streamingProcesses = 2; - package = pkgs.mastodon.override { - version = "4.2.5"; - patches = [ - (pkgs.fetchpatch { - url = "https://github.com/mastodon/mastodon/compare/v4.2.4...v4.2.5.patch"; - hash = "sha256-CtzYV1i34s33lV/1jeNcr9p/x4Es1zRaf4l1sNWVKYk="; - }) - ]; - }; }; services.nginx.virtualHosts.${config.services.nextcloud.hostName} = { From fd9628423ba53c909541e541e40de2a9caab40f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sun, 18 Feb 2024 22:10:40 -0300 Subject: [PATCH 021/404] firefox: set default search engine --- user/firefox.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/user/firefox.nix b/user/firefox.nix index ea3c3b5..233e3e2 100644 --- a/user/firefox.nix +++ b/user/firefox.nix @@ -59,6 +59,7 @@ in { profiles = { main = { isDefault = true; + search.default = "DuckDuckGo"; settings = { "devtools.theme" = "auto"; "toolkit.legacyUserProfileCustomizations.stylesheets" = true; From e7d0121d466cb84f241e68fe04ef9f227736e394 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 19 Feb 2024 12:05:14 -0300 Subject: [PATCH 022/404] nix: add nix-community substituter --- system/nix.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/system/nix.nix b/system/nix.nix index 364f2aa..9569e60 100644 --- a/system/nix.nix +++ b/system/nix.nix @@ -11,6 +11,8 @@ settings = { auto-optimise-store = true; substituters = [ + "https://cache.nixos.org" + "https://nix-community.cachix.org" # "http://nixcache.lelgenio.1337.cx:5000" "https://hyprland.cachix.org" "https://lelgenio.cachix.org" @@ -18,6 +20,8 @@ "https://snowflakeos.cachix.org/" ]; trusted-public-keys = [ + "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" # "nixcache.lelgenio.1337.cx:zxCfx7S658llDgAUG0JVyNrlAdFVvPniSdDOkvfTPS8=" "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" "lelgenio.cachix.org-1:W8tMlmDFLU/V+6DlChXjekxoHZpjgVHZpmusC4cueBc=" From 6c534c590f5b3373c91a7e5567d3f73e63c76a8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 19 Feb 2024 12:45:54 -0300 Subject: [PATCH 023/404] nix: keep flake inputs after garbage collection --- system/nix.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/system/nix.nix b/system/nix.nix index 9569e60..aec58cb 100644 --- a/system/nix.nix +++ b/system/nix.nix @@ -1,4 +1,11 @@ -{ config, pkgs, inputs, ... }: { +{ lib, config, pkgs, inputs, ... }: +let + collectFlakeInputs = input: + [ input ] ++ lib.concatMap collectFlakeInputs (builtins.attrValues (input.inputs or { })); +in +{ + system.extraDependencies = collectFlakeInputs inputs.self; + nix.registry.nixpkgs.flake = inputs.nixpkgs; nix = { nixPath = [ "nixpkgs=${inputs.nixpkgs}" ]; From 02c604097271a0c4f9be6aff539d8a43d6dca8cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 19 Feb 2024 12:54:08 -0300 Subject: [PATCH 024/404] nix: collect garbage daily --- system/nix.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/nix.nix b/system/nix.nix index aec58cb..9af7534 100644 --- a/system/nix.nix +++ b/system/nix.nix @@ -11,8 +11,8 @@ in nixPath = [ "nixpkgs=${inputs.nixpkgs}" ]; gc = { automatic = true; - dates = "monthly"; - options = "--delete-older-than 7d"; + dates = "daily"; + options = "--delete-older-than 3d"; }; optimise.automatic = true; settings = { From dc026727c9cd015186936d9491ce999cf0c727ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 22 Feb 2024 21:09:06 -0300 Subject: [PATCH 025/404] obs: disable shutdown safemode check --- user/home.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/home.nix b/user/home.nix index f27c0e0..3a57931 100644 --- a/user/home.nix +++ b/user/home.nix @@ -167,7 +167,7 @@ wayland.windowManager.sway.extraConfig = lib.optionalString (osConfig.networking.hostName or "" == "monolith") '' exec steam - exec obs --startreplaybuffer + exec obs --startreplaybuffer --disable-shutdown-check exec deluge-gtk exec nicotine ''; From 04850913a1fa0dc25225283f584403112cb79be6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 22 Feb 2024 21:09:23 -0300 Subject: [PATCH 026/404] systemd: set a low stop timeout --- system/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/system/configuration.nix b/system/configuration.nix index dc5ac8e..6e7a766 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -151,6 +151,9 @@ }; security.sudo.wheelNeedsPassword = false; + systemd.extraConfig = '' + DefaultTimeoutStopSec=10s + ''; services.logind.extraConfig = '' HandlePowerKey=suspend ''; From 7f8b98c15345a661590ba9af65f4021b3485a967 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 22 Feb 2024 21:17:51 -0300 Subject: [PATCH 027/404] firefox: force search options --- user/firefox.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/user/firefox.nix b/user/firefox.nix index 233e3e2..2ae69fb 100644 --- a/user/firefox.nix +++ b/user/firefox.nix @@ -59,6 +59,7 @@ in { profiles = { main = { isDefault = true; + search.force = true; search.default = "DuckDuckGo"; settings = { "devtools.theme" = "auto"; From a0531650c6725afb5986cc25d2ab253b8d67a5d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 23 Feb 2024 12:01:09 -0300 Subject: [PATCH 028/404] mastodon: remove unnecessary configurations --- hosts/ghost/mastodon.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/hosts/ghost/mastodon.nix b/hosts/ghost/mastodon.nix index a4262f0..3e629d7 100644 --- a/hosts/ghost/mastodon.nix +++ b/hosts/ghost/mastodon.nix @@ -1,16 +1,10 @@ { config, pkgs, inputs, ... }: { services.mastodon = { enable = true; - localDomain = "social.lelgenio.xyz"; configureNginx = true; + localDomain = "social.lelgenio.xyz"; smtp.fromAddress = "lelgenio@disroot.org"; - extraConfig.SINGLE_USER_MODE = "true"; streamingProcesses = 2; - }; - - services.nginx.virtualHosts.${config.services.nextcloud.hostName} = { - forceSSL = true; - enableACME = true; + extraConfig.SINGLE_USER_MODE = "true"; }; } - From d451db8d833c97f8bcc3ca83351952911e7b3a36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 23 Feb 2024 12:01:24 -0300 Subject: [PATCH 029/404] sway: fix suspend scripts --- user/sway/sway-binds.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/user/sway/sway-binds.nix b/user/sway/sway-binds.nix index bb5488b..360ccdc 100644 --- a/user/sway/sway-binds.nix +++ b/user/sway/sway-binds.nix @@ -14,7 +14,8 @@ let systemctl --user start swayidle.service ''; _suspend = pkgs.writeShellScriptBin "_suspend" '' - ${_lock}/bin/_lock + ${pkgs.sway}/bin/swaymsg mode default + systemctl --user start swayidle.service systemctl suspend ''; From a78d416caceaa4ffee7bc36bb982954a627f4666 Mon Sep 17 00:00:00 2001 From: lelgenio Date: Tue, 27 Feb 2024 17:16:38 -0300 Subject: [PATCH 030/404] update --- flake.lock | 73 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 40 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index 6754684..1e35c1a 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1703433843, - "narHash": "sha256-nmtA4KqFboWxxoOAA6Y1okHbZh+HsXaMPFkYHsoDRDw=", + "lastModified": 1707830867, + "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=", "owner": "ryantm", "repo": "agenix", - "rev": "417caa847f9383e111d1397039c9d4337d024bf0", + "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6", "type": "github" }, "original": { @@ -476,11 +476,11 @@ ] }, "locked": { - "lastModified": 1705659542, - "narHash": "sha256-WA3xVfAk1AYmFdwghT7mt/erYpsU6JPu9mdTEP/e9HQ=", + "lastModified": 1706981411, + "narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "10cd9c53115061aa6a0a90aad0b0dde6a999cdb9", + "rev": "652fda4ca6dafeb090943422c34ae9145787af37", "type": "github" }, "original": { @@ -493,6 +493,7 @@ "hyprland": { "inputs": { "hyprland-protocols": "hyprland-protocols", + "hyprlang": "hyprlang", "nixpkgs": [ "nixpkgs" ], @@ -501,11 +502,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1706838674, - "narHash": "sha256-umU1VC3bI4L/ZHpl/bZsm4MSUnX9wZrQRmbEjNLeQV4=", + "lastModified": 1709045487, + "narHash": "sha256-AJ6Xeau/j7O2ApwGUGADJc8S74EgVQpxFaQzp0ainjU=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "7447be822080fac5b8515a177773ec74b4d6c925", + "rev": "98034fea3c1d5c1836bcc3b523cf1089dd5ac502", "type": "github" }, "original": { @@ -543,16 +544,19 @@ "inputs": { "nixpkgs": [ "hyprland", - "xdph", "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" ] }, "locked": { - "lastModified": 1704287638, - "narHash": "sha256-TuRXJGwtK440AXQNl5eiqmQqY4LZ/9+z/R7xC0ie3iA=", + "lastModified": 1708787654, + "narHash": "sha256-7ACgM3ZuAhPqurXHUvR2nWMRcnmzGGPjLK6q4DSTelI=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "6624f2bb66d4d27975766e81f77174adbe58ec97", + "rev": "0fce791ba2334aca183f2ed42399518947550d0d", "type": "github" }, "original": { @@ -623,11 +627,11 @@ ] }, "locked": { - "lastModified": 1706411424, - "narHash": "sha256-BzziJYucEZvdCE985vjPoo3ztWcmUiSQ1wJ2CoT6jCc=", + "lastModified": 1708830466, + "narHash": "sha256-nGKe3Y1/jkLR2eh1aRSVBtKadMBNv8kOnB52UXqRy6A=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "c782f2a4f6fc94311ab5ef31df2f1149a1856181", + "rev": "f070c7eeec3bde8c8c8baa9c02b6d3d5e114d73b", "type": "github" }, "original": { @@ -662,11 +666,11 @@ "snowfall-lib": "snowfall-lib" }, "locked": { - "lastModified": 1703104726, - "narHash": "sha256-9wD01mLe7tQCzTtLIRzUaAvOKzfPuWPfpCfYkeCsQD0=", + "lastModified": 1707338010, + "narHash": "sha256-UtLeZzDdk96sLTRcWsGrkWCslNUDytrGe0VmOTB/iig=", "owner": "vlinkz", "repo": "nixos-conf-editor", - "rev": "18dc1d25b2025dc437490c71653429a05f9e0bf2", + "rev": "27b5e92f580f794c690093503869aab242f075ab", "type": "github" }, "original": { @@ -740,11 +744,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1706718339, - "narHash": "sha256-S+S97c/HzkO2A/YsU7ZmNF9w2s7Xk6P8dzmfDdckzLs=", + "lastModified": 1708979614, + "narHash": "sha256-FWLWmYojIg6TeqxSnHkKpHu5SGnFP5um1uUjH+wRV6g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "53fbe41cf76b6a685004194e38e889bc8857e8c2", + "rev": "b7ee09cf5614b02d289cd86fcfa6f24d4e078c2a", "type": "github" }, "original": { @@ -772,11 +776,11 @@ "ranger-icons": { "flake": false, "locked": { - "lastModified": 1691165140, - "narHash": "sha256-6JEhyU08QEkGdRW2L00ynRaoaaR5PaiVUccEUbtTQuU=", + "lastModified": 1707118400, + "narHash": "sha256-HLeiV3c+8fl3kiht01s3H/HGPABPC2033rMB/uXKwLM=", "owner": "alexanderjeurissen", "repo": "ranger_devicons", - "rev": "de64ab26fb581c00a803381d522c6b3e48b79415", + "rev": "2c3c19dffb4238d01c74515c9eed5088066db243", "type": "github" }, "original": { @@ -1115,18 +1119,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1706359063, - "narHash": "sha256-5HUTG0p+nCJv3cn73AmFHRZdfRV5AD5N43g8xAePSKM=", + "lastModified": 1708558866, + "narHash": "sha256-Mz6hCtommq7RQfcPnxLINigO4RYSNt23HeJHC6mVmWI=", "owner": "wlroots", "repo": "wlroots", - "rev": "00b869c1a96f300a8f25da95d624524895e0ddf2", + "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "00b869c1a96f300a8f25da95d624524895e0ddf2", + "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5", "type": "gitlab" } }, @@ -1136,7 +1140,10 @@ "hyprland", "hyprland-protocols" ], - "hyprlang": "hyprlang", + "hyprlang": [ + "hyprland", + "hyprlang" + ], "nixpkgs": [ "hyprland", "nixpkgs" @@ -1147,11 +1154,11 @@ ] }, "locked": { - "lastModified": 1706145785, - "narHash": "sha256-j9MP4fv2U/vdRKAXXc2gyMTmYwVnHP6kHx1/y6jprrU=", + "lastModified": 1708696469, + "narHash": "sha256-shh5wmpeYy3MmsBfkm4f76yPsBDGk6OLYRVG+ARy2F0=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "5a592647587cd20b9692a347df6939b6d371b3bb", + "rev": "1b713911c2f12b96c2574474686e4027ac4bf826", "type": "github" }, "original": { From 311fb4384e1dd47e93f5bf5c96fe1ed7599f6595 Mon Sep 17 00:00:00 2001 From: lelgenio Date: Mon, 11 Mar 2024 18:02:58 -0300 Subject: [PATCH 031/404] home: update bc implementation --- user/home.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/home.nix b/user/home.nix index 3a57931..6ab152c 100644 --- a/user/home.nix +++ b/user/home.nix @@ -58,7 +58,7 @@ ## CLI eza fd - bc + gavin-bc file jq du-dust From 99576a7cb0ad6ea81d7db059e1b9a4a2b2ea22fe Mon Sep 17 00:00:00 2001 From: lelgenio Date: Tue, 19 Mar 2024 13:44:53 -0300 Subject: [PATCH 032/404] steam: remove steam workaround --- flake.lock | 152 +++++++++++++++++++++++++++++++---------------- flake.nix | 1 - system/steam.nix | 10 +--- 3 files changed, 102 insertions(+), 61 deletions(-) diff --git a/flake.lock b/flake.lock index 1e35c1a..9616b19 100644 --- a/flake.lock +++ b/flake.lock @@ -360,7 +360,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1681202837, @@ -378,7 +378,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_6" + "systems": "systems_7" }, "locked": { "lastModified": 1681202837, @@ -396,7 +396,7 @@ }, "flake-utils_6": { "inputs": { - "systems": "systems_8" + "systems": "systems_9" }, "locked": { "lastModified": 1694529238, @@ -414,7 +414,7 @@ }, "flake-utils_7": { "inputs": { - "systems": "systems_9" + "systems": "systems_10" }, "locked": { "lastModified": 1681202837, @@ -432,7 +432,7 @@ }, "flake-utils_8": { "inputs": { - "systems": "systems_10" + "systems": "systems_11" }, "locked": { "lastModified": 1681202837, @@ -490,23 +490,50 @@ "type": "github" } }, + "hyprcursor": { + "inputs": { + "hyprlang": "hyprlang", + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1710091028, + "narHash": "sha256-yFk2kc8J2kVh0RWlwT+PQf0bpfUNcROOcRYcyQJbpk4=", + "owner": "hyprwm", + "repo": "hyprcursor", + "rev": "05db7dfd7fc261e0195e54f8a6d655d4f370e70f", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprcursor", + "type": "github" + } + }, "hyprland": { "inputs": { + "hyprcursor": "hyprcursor", "hyprland-protocols": "hyprland-protocols", - "hyprlang": "hyprlang", + "hyprlang": "hyprlang_2", "nixpkgs": [ "nixpkgs" ], - "systems": "systems_4", + "systems": "systems_5", "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1709045487, - "narHash": "sha256-AJ6Xeau/j7O2ApwGUGADJc8S74EgVQpxFaQzp0ainjU=", + "lastModified": 1710344304, + "narHash": "sha256-jE+/UGqRYkKBBpLTTV5ayCtVmD9N1WsSKpufszUPzcA=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "98034fea3c1d5c1836bcc3b523cf1089dd5ac502", + "rev": "3e67ee0f5f66c74c0a0bd4f797361fd100c2e2d2", "type": "github" }, "original": { @@ -541,6 +568,29 @@ } }, "hyprlang": { + "inputs": { + "nixpkgs": [ + "hyprland", + "hyprcursor", + "nixpkgs" + ], + "systems": "systems_4" + }, + "locked": { + "lastModified": 1709914708, + "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprlang_2": { "inputs": { "nixpkgs": [ "hyprland", @@ -552,11 +602,11 @@ ] }, "locked": { - "lastModified": 1708787654, - "narHash": "sha256-7ACgM3ZuAhPqurXHUvR2nWMRcnmzGGPjLK6q4DSTelI=", + "lastModified": 1709914708, + "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "0fce791ba2334aca183f2ed42399518947550d0d", + "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2", "type": "github" }, "original": { @@ -627,11 +677,11 @@ ] }, "locked": { - "lastModified": 1708830466, - "narHash": "sha256-nGKe3Y1/jkLR2eh1aRSVBtKadMBNv8kOnB52UXqRy6A=", + "lastModified": 1710120787, + "narHash": "sha256-tlLuB73OCOKtU2j83bQzSYFyzjJo3rjpITZE5MoofG8=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "f070c7eeec3bde8c8c8baa9c02b6d3d5e114d73b", + "rev": "e76ff2df6bfd2abe06abd8e7b9f217df941c1b07", "type": "github" }, "original": { @@ -694,22 +744,6 @@ "type": "indirect" } }, - "nixpkgs-fixed-steam": { - "locked": { - "lastModified": 1701016343, - "narHash": "sha256-UhFqv2bl/ZB4RwGxq1Qp6+91uZDwTEA80rxALTiJ3fg=", - "owner": "lelgenio", - "repo": "nixpkgs", - "rev": "ac4d51306af54a088e29e2e5efcfac5dfe87d95c", - "type": "github" - }, - "original": { - "owner": "lelgenio", - "ref": "test-steam-fix", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1692638711, @@ -744,11 +778,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1708979614, - "narHash": "sha256-FWLWmYojIg6TeqxSnHkKpHu5SGnFP5um1uUjH+wRV6g=", + "lastModified": 1710283656, + "narHash": "sha256-nI+AOy4uK6jLGBi9nsbHjL1EdSIzoo8oa+9oeVhbyFc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b7ee09cf5614b02d289cd86fcfa6f24d4e078c2a", + "rev": "51063ed4f2343a59fdeebb279bb81d87d453942b", "type": "github" }, "original": { @@ -776,11 +810,11 @@ "ranger-icons": { "flake": false, "locked": { - "lastModified": 1707118400, - "narHash": "sha256-HLeiV3c+8fl3kiht01s3H/HGPABPC2033rMB/uXKwLM=", + "lastModified": 1709209315, + "narHash": "sha256-ETE13REDIVuoFIbvWqWvQLj/2fGST+1koowmmuBzGmo=", "owner": "alexanderjeurissen", "repo": "ranger_devicons", - "rev": "2c3c19dffb4238d01c74515c9eed5088066db243", + "rev": "ed718dd6a6d5d2c0f53cba8474c5ad96185057e9", "type": "github" }, "original": { @@ -804,7 +838,6 @@ "nix-software-center": "nix-software-center", "nixos-conf-editor": "nixos-conf-editor", "nixpkgs": "nixpkgs_4", - "nixpkgs-fixed-steam": "nixpkgs-fixed-steam", "plymouth-themes": "plymouth-themes", "ranger-icons": "ranger-icons", "tlauncher": "tlauncher", @@ -935,6 +968,21 @@ "type": "github" } }, + "systems_11": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -982,16 +1030,16 @@ }, "systems_5": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -1078,7 +1126,7 @@ }, "utils": { "inputs": { - "systems": "systems_7" + "systems": "systems_8" }, "locked": { "lastModified": 1689068808, @@ -1119,18 +1167,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1708558866, - "narHash": "sha256-Mz6hCtommq7RQfcPnxLINigO4RYSNt23HeJHC6mVmWI=", + "lastModified": 1709983277, + "narHash": "sha256-wXWIJLd4F2JZeMaihWVDW/yYXCLEC8OpeNJZg9a9ly8=", "owner": "wlroots", "repo": "wlroots", - "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5", + "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5", + "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b", "type": "gitlab" } }, @@ -1154,11 +1202,11 @@ ] }, "locked": { - "lastModified": 1708696469, - "narHash": "sha256-shh5wmpeYy3MmsBfkm4f76yPsBDGk6OLYRVG+ARy2F0=", + "lastModified": 1709299639, + "narHash": "sha256-jYqJM5khksLIbqSxCLUUcqEgI+O2LdlSlcMEBs39CAU=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "1b713911c2f12b96c2574474686e4027ac4bf826", + "rev": "2d2fb547178ec025da643db57d40a971507b82fe", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b9293df..7951467 100644 --- a/flake.nix +++ b/flake.nix @@ -58,7 +58,6 @@ url = "github:lelgenio/wl-crosshair"; inputs.nixpkgs.follows = "nixpkgs"; }; - nixpkgs-fixed-steam.url = "github:lelgenio/nixpkgs/test-steam-fix"; # gnome stuff nixos-conf-editor.url = "github:vlinkz/nixos-conf-editor"; diff --git a/system/steam.nix b/system/steam.nix index 996f16a..3a60930 100644 --- a/system/steam.nix +++ b/system/steam.nix @@ -1,12 +1,6 @@ -{ config, pkgs, inputs, ... }: -let - pkgs' = import inputs.nixpkgs-fixed-steam { - inherit (pkgs) system config; - }; -in -{ +{ config, pkgs, inputs, ... }: { programs.steam.enable = true; - programs.steam.package = pkgs'.steam.override { + programs.steam.package = pkgs.steam.override { extraLibraries = pkgs: with config.hardware.opengl; if pkgs.hostPlatform.is64bit then [ package ] ++ extraPackages From 184ac7ff0322c7d5190e53a9bfba94b3b81136a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Tue, 27 Feb 2024 21:36:17 -0300 Subject: [PATCH 033/404] monolith: enable opencl rocm and blender hardware acceleration This reverts commit 2e4cd80d896575bf7bb49ffd4e792420bdf430b5. --- hosts/monolith.nix | 2 ++ system/media-packages.nix | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/hosts/monolith.nix b/hosts/monolith.nix index cb8df63..451a6e7 100644 --- a/hosts/monolith.nix +++ b/hosts/monolith.nix @@ -41,6 +41,8 @@ in libva libvdpau vaapiVdpau + rocm-opencl-icd + rocm-opencl-runtime ]; programs.corectrl.enable = true; diff --git a/system/media-packages.nix b/system/media-packages.nix index 94a779a..8e4ab74 100644 --- a/system/media-packages.nix +++ b/system/media-packages.nix @@ -17,7 +17,7 @@ in { inkscape krita kdenlive - blender + blender-hip libreoffice godot_4 ]; From 2e090030bd2ddb50be9c0f82ec8a989c5690f043 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 28 Feb 2024 01:00:41 -0300 Subject: [PATCH 034/404] nix: add wheel group to trusted users --- system/nix.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/system/nix.nix b/system/nix.nix index 9af7534..f9b0a82 100644 --- a/system/nix.nix +++ b/system/nix.nix @@ -17,6 +17,7 @@ in optimise.automatic = true; settings = { auto-optimise-store = true; + trusted-users = [ "root" "@wheel" ]; substituters = [ "https://cache.nixos.org" "https://nix-community.cachix.org" From b85144a9f37fc9bf60b056a023a1b42e351ce943 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 29 Feb 2024 22:14:25 -0300 Subject: [PATCH 035/404] email: remove email config --- user/email.nix | 322 --------------------------------------------- user/home.nix | 1 - user/variables.nix | 5 +- 3 files changed, 2 insertions(+), 326 deletions(-) delete mode 100644 user/email.nix diff --git a/user/email.nix b/user/email.nix deleted file mode 100644 index 707cd33..0000000 --- a/user/email.nix +++ /dev/null @@ -1,322 +0,0 @@ -{ pkgs, lib, config, ... }: -let - inherit (pkgs.uservars.theme) color; - - downloadEmails = "${pkgs.offlineimap}/bin/offlineimap"; - afterSync = "${pkgs.notmuch}/bin/notmuch new"; - - defaultAccountSettings = { boxes, }: { - astroid.enable = true; - imapnotify = { - enable = true; - inherit boxes; - onNotify = downloadEmails; - }; - offlineimap = { - enable = true; - postSyncHookCommand = afterSync; - }; - msmtp.enable = true; - notmuch.enable = true; - }; -in -{ - accounts.email.maildirBasePath = "${config.xdg.dataHome}/maildir"; - accounts.email.accounts = - { - "personal" = { - primary = true; - realName = "Leonardo Eugênio"; - address = "lelgenio@disroot.org"; - userName = "lelgenio"; - imap.host = "disroot.org"; - smtp.host = "disroot.org"; - passwordCommand = toString (pkgs.writeShellScript "get_pass" '' - pass "disroot.org" | head -n1 - ''); - } // defaultAccountSettings { - boxes = [ - "INBOX" - "INBOX.Newsletter" - "INBOX.Git" - ]; - }; - "work" = { - realName = "Leonardo Eugênio"; - address = "leonardo@wopus.com.br"; - userName = "leonardo@wopus.com.br"; - imap.host = "imap.wopus.com.br"; - smtp.host = "smtp.wopus.com.br"; - passwordCommand = toString (pkgs.writeShellScript "get_pass" '' - pass "Trabalho/wopus_email/leonardo@wopus.com.br" | head -n1 - ''); - } // defaultAccountSettings { boxes = [ "INBOX" ]; }; - }; - - services.imapnotify.enable = true; - - programs.offlineimap.enable = true; - systemd.user.services.offlineimap = { - Unit = { - Description = "offlineimap mailbox synchronization"; - }; - Service = { - Type = "oneshot"; - ExecStart = downloadEmails; - }; - }; - systemd.user.timers.offlineimap = { - Unit = { Description = "offlineimap mailbox synchronization"; }; - Timer = { - OnCalendar = "*:0/5"; - Unit = "offlineimap.service"; - }; - Install = { WantedBy = [ "timers.target" ]; }; - }; - - systemd.user.services.maildir-notify-daemon = { - Unit = { - Description = "Desktop notification for new email"; - PartOf = [ "graphical-session.target" ]; - After = [ "graphical-session.target" ]; - }; - Service = { - ExecStart = toString (pkgs.writeShellScript "maildir-notify-daemon-service" '' - exec ${pkgs.maildir-notify-daemon}/bin/maildir-notify-daemon $HOME/Maildir/*/*/new - ''); - Restart = "on-failure"; - }; - Install = { WantedBy = [ "sway-session.target" ]; }; - }; - - programs.notmuch.enable = true; - - programs.msmtp.enable = true; - - programs.astroid = { - enable = true; - externalEditor = "terminal -e $EDITOR %1"; - pollScript = downloadEmails; - extraConfig = { }; - }; - - xdg.configFile = lib.mkIf (color.type == "dark") { - "astroid/ui/thread-view.scss".text = '' - /* ui-version: 5 (do not change when modifying theme for yourself) */ - - * { - color: #ffffff !important; - background-color: #181818 !important; - } - - @import '${pkgs.astroid}/share/astroid/ui/thread-view.scss'; - ''; - "astroid/ui/part.scss".text = '' - /* ui-version: 5 (do not change when modifying theme for yourself) */ - - * { - color: #eee !important; - background-color: #202020 !important; - } - - // @import '${pkgs.astroid}/share/astroid/ui/part.scss'; - ''; - "astroid/keybindings".text = '' - - help.down=e - help.page_down=E - log.down=e - log.page_down=E - raw.down=e - raw.page_down=E - searches.down=e - searches.page_down=E - thread_index.scroll_down=E - thread_index.next_thread=e - thread_view.down=e - thread_view.scroll_down=E - - help.up=i - help.page_up=I - log.up=i - log.page_up=I - raw.up=i - raw.page_up=I - searches.up=i - searches.page_up=I - thread_index.scroll_up=I - thread_index.previous_thread=i - thread_view.up=i - thread_view.scroll_up=I - - thread_index.page_up=C-u - thread_view.page_up=C-u - - thread_index.page_down=C-n - thread_view.page_down=C-n - - thread_view.next_message=l - - thread_view.toggle_unread=N - - main_window.previous_page=n - main_window.next_page=o - - # searches.next_unread=Key (GDK_KEY_Tab) # Jump to next unread thread, default: Key (GDK_KEY_Tab) - # thread_index.previous_unread=Key (false, false, (guint) GDK_KEY_ISO_Left_Tab) # Jump to previous unread thread, default: Key (false, false, (guint) GDK_KEY_ISO_Left_Tab) - - # main_window.quit_ask=q # Quit astroid, default: q - # main_window.quit=Q # Quit astroid (without asking), default: Q - # main_window.jump_to_page_1=M-1 # Jump to page 1, default: M-1 - # main_window.jump_to_page_2=M-2 # Jump to page 2, default: M-2 - # main_window.jump_to_page_3=M-3 # Jump to page 3, default: M-3 - # main_window.jump_to_page_4=M-4 # Jump to page 4, default: M-4 - # main_window.jump_to_page_5=M-5 # Jump to page 5, default: M-5 - # main_window.jump_to_page_6=M-6 # Jump to page 6, default: M-6 - # main_window.jump_to_page_7=M-7 # Jump to page 7, default: M-7 - # main_window.jump_to_page_8=M-8 # Jump to page 8, default: M-8 - # main_window.jump_to_page_9=M-9 # Jump to page 9, default: M-9 - # main_window.jump_to_page_0=M-0 # Jump to page 0, default: M-0 - # main_window.close_page=C-w # Close mode (or window if other windows are open), default: C-w - # main_window.close_page_force=C-W # Force close mode (or window if other windows are open), default: C-W - # main_window.search=o # Search, default: o - # main_window.show_saved_searches=M-s # Show saved searches, default: M-s - # main_window.show_help=Key (GDK_KEY_question) # Show help, default: Key (GDK_KEY_question) - # main_window.show_log=z # Show log window, default: z - # main_window.undo=u # Undo last action, default: u - # main_window.new_mail=m # Compose new mail, default: m - # main_window.poll=P # Start manual poll, default: P - # main_window.toggle_auto_poll=M-p # Toggle auto poll, default: M-p - # main_window.cancel_poll=C-c # Cancel ongoing poll, default: C-c - # main_window.open_new_window=C-o # Open new main window, default: C-o - # main_window.clipboard=\" # Set target clipboard, default: \" - # main_window.clipboard.clipboard=+ # Set target clipboard to CLIPBOARD (default), default: + - # main_window.clipboard.primary=* # Set target clipboard to PRIMARY, default: * - # main_window.open_terminal=| # Open terminal, default: | - # edit_message.edit=Key (GDK_KEY_Return) # Edit message in editor, default: Key (GDK_KEY_Return), Key (GDK_KEY_KP_Enter) - # edit_message.send=y # Send message, default: y - # edit_message.cancel=C-c # Cancel sending message (unreliable), default: C-c - # edit_message.view_raw=V # View raw message, default: V - # edit_message.cycle_from=f # Cycle through From selector, default: f - # edit_message.attach=a # Attach file, default: a - # edit_messsage.attach_mids=A # Attach messages by mids, default: A - # edit_message.save_draft=s # Save draft, default: s - # edit_message.delete_draft=D # Delete draft, default: D - # edit_message.toggle_signature=S # Toggle signature, default: S - # edit_message.toggle_encrypt=E # Toggle encryption and signature, default: E - # help.page_top=1 # Scroll to top, default: 1, Key (GDK_KEY_Home) - # help.page_end=0 # Scroll to end, default: 0, Key (GDK_KEY_End) - # log.home=1 # Scroll home, default: 1, Key (GDK_KEY_Home) - # log.end=0 # Scroll to end, default: 0, Key (GDK_KEY_End) - # pane.swap_focus=Key (false, true, (guint) GDK_KEY_space) # Swap focus to other pane if open, default: Key (false, true, (guint) GDK_KEY_space) - # raw.home=1 # Scroll home, default: 1, Key (GDK_KEY_Home) - # raw.end=0 # Scroll to end, default: 0, Key (GDK_KEY_End) - # reply.cycle_reply_to=r # Cycle through reply selector, default: r - # reply.open_reply_to=R # Open reply selector, default: R - # searches.save=s # Save recent query as saved search, default: s - # searches.delete=d # Delete saved query, default: d - # searches.clear_history=C # Clear search history, default: C - # searches.home=1 # Scroll home, default: 1, Key (GDK_KEY_Home) - # searches.end=0 # Scroll to end, default: 0, Key (GDK_KEY_End) - # searches.previous_unread=Key (false, false, (guint) GDK_KEY_ISO_Left_Tab) # Jump to previous unread thread, default: Key (false, false, (guint) GDK_KEY_ISO_Left_Tab) - # searches.open=Key (GDK_KEY_Return) # Open query, default: Key (GDK_KEY_Return), Key (GDK_KEY_KP_Enter) - # searches.show_all_history=! # Show all history lines, default: ! - # thread_index.close_pane=C-w # Close thread view pane if open, default: C-w - # thread_index.refresh=Key((guint) GDK_KEY_dollar) # Refresh query, default: Key((guint) GDK_KEY_dollar) - # thread_index.refine_query=O # Refine query, default: O - # thread_index.duplicate_refine_query=C-v # Duplicate and refine query, default: C-v - # thread_index.cycle_sort=C-s # "Cycle through sort options: 'oldest', default: C-s - # thread_index.save_query=C-S # Save query, default: C-S - # thread_index.next_unread=Key (GDK_KEY_Tab) # Jump to next unread thread, default: Key (GDK_KEY_Tab) - # thread_index.filter=C-f # Filter rows, default: C-f - # thread_index.filter_clear=Key (GDK_KEY_Escape) # Clear filter, default: Key (GDK_KEY_Escape) - # thread_index.multi.mark_unread=N # Toggle unread, default: N - # thread_index.multi.flag=* # Toggle flagged, default: * - # thread_index.multi.archive=a # Toggle archive, default: a - # thread_index.multi.mark_spam=S # Toggle spam, default: S - # thread_index.multi.tag=+ # Tag, default: + - # thread_index.multi.mute=C-m # Toggle mute, default: C-m - # thread_index.multi.toggle=t # Toggle marked, default: t - # thread_index.multi=Key (GDK_KEY_semicolon) # Apply action to marked threads, default: Key (GDK_KEY_semicolon) - # thread_index.scroll_home=1 # Scroll to first line, default: 1, Key(GDK_KEY_Home) - # thread_index.scroll_end=0 # Scroll to last line, default: 0, Key (GDK_KEY_End) - # thread_index.open_thread=Key (GDK_KEY_Return) # Open thread, default: Key (GDK_KEY_Return), Key (GDK_KEY_KP_Enter) - # thread_index.open_paned=Key (false, true, (guint) GDK_KEY_Return) # Open thread in pane, default: Key (false, true, (guint) GDK_KEY_Return), Key (false, true, (guint) GDK_KEY_KP_Enter) - # thread_index.open_new_window=Key (true, false, (guint) GDK_KEY_Return) # Open thread in new window, default: Key (true, false, (guint) GDK_KEY_Return), Key (true, false, (guint) GDK_KEY_KP_Enter) - # thread_index.reply=r # Reply to last message in thread, default: r - # thread_index.reply_all=G # Reply all to last message in thread, default: G - # thread_index.reply_sender=R # Reply to sender of last message in thread, default: R - # thread_index.reply_mailinglist=M # Reply to mailinglist of last message in thread, default: M - # thread_index.forward=f # Forward last message in thread, default: f - # thread_index.toggle_marked_next=t # Toggle mark thread and move to next, default: t - # thread_index.toggle_marked_all=T # Toggle marked on all loaded threads, default: T - # thread_index.archive=a # Toggle 'inbox' tag on thread, default: a - # thread_index.flag=Key (GDK_KEY_asterisk) # Toggle 'flagged' tag on thread, default: Key (GDK_KEY_asterisk) - # thread_index.unread=N # Toggle 'unread' tag on thread, default: N - # thread_index.spam=S # Toggle 'spam' tag on thread, default: S - # thread_index.mute=C-m # "Toggle 'muted' tag on thread, default: C-m - # thread_index.tag=+ # Edit tags for thread, default: + - # thread_index.edit_draft=E # Edit first message marked as draft or last message in thread as new, default: E - # thread_view.reload=$ # Reload everything, default: $ - # thread_view.show_web_inspector=C-I # Show web inspector, default: C-I - # thread_view.next_element=C-j # Move focus to next element, default: C-j - # thread_view.previous_element=C-k # Move focus to previous element, default: C-k - # thread_view.home=1 # Scroll home, default: 1, Key (GDK_KEY_Home) - # thread_view.end=0 # Scroll to end, default: 0, Key (GDK_KEY_End) - # thread_view.activate=Key (GDK_KEY_Return) # Open/expand/activate focused element, default: Key (GDK_KEY_Return), Key (GDK_KEY_KP_Enter), Key (true, false, (guint) GDK_KEY_space) - # thread_view.save=s # Save attachment or message, default: s - # thread_view.delete_attachment=d # Delete attachment (if editing), default: d - # thread_view.expand=e # Toggle expand, default: e - # thread_view.toggle_expand_all=C-e # Toggle expand on all messages, default: C-e - # thread_view.mark=t # Mark or unmark message, default: t - # thread_view.toggle_mark_all=T # Toggle mark on all messages, default: T - # thread_view.show_remote_images=C-i # Show remote images (warning: approves all requests to remote content for this thread!), default: C-i - # thread_view.zoom_in=C-+ # Zoom in, default: C-+ - # thread_view.zoom_out=C-minus # Zoom out, default: C-minus - # thread_view.save_all_attachments=S # Save all attachments, default: S - # thread_view.next_message_expand=C-n # Focus next message (and expand if necessary), default: C-n - # thread_view.previous_message=p # Focus previous message, default: p - # thread_view.previous_message_expand=C-p # Focus previous message (and expand if necessary), default: C-p - # thread_view.next_unread=Key (GDK_KEY_Tab) # Focus the next unread message, default: Key (GDK_KEY_Tab) - # thread_view.previous_unread=Key (false, false, (guint) GDK_KEY_ISO_Left_Tab) # Focus the previous unread message, default: Key (false, false, (guint) GDK_KEY_ISO_Left_Tab) - # thread_view.compose_to_sender=c # Compose a new message to the sender of the message (or all recipients if sender is you), default: c - # thread_view.reply=r # Reply to current message, default: r - # thread_view.reply_all=G # Reply all to current message, default: G - # thread_view.reply_sender=R # Reply to sender of current message, default: R - # thread_view.reply_mailinglist=M # Reply to mailinglist of current message, default: M - # thread_view.forward=f # Forward current message, default: f - # thread_view.flat=C-F # Toggle flat or indented view of messages, default: C-F - # thread_view.view_raw=V # View raw source for current message, default: V - # thread_view.edit_draft=E # Edit currently focused message as new or draft, default: E - # thread_view.delete_draft=D # Delete currently focused draft, default: D - # thread_view.multi.toggle=t # Toggle marked, default: t - # thread_view.multi.tag=+ # Tag, default: + - # thread_view.multi.yank_mids=C-y # Yank message id's, default: C-y - # thread_view.multi.yank=y # Yank, default: y - # thread_view.multi.yank_raw=Y # Yank raw, default: Y - # thread_view.multi.save=s # Save marked, default: s - # thread_view.multi.print=p # Print marked messages, default: p - # thread_view.multi=Key (GDK_KEY_semicolon) # Apply action to marked messages, default: Key (GDK_KEY_semicolon) - # thread_view.flag=* # Toggle the 'flagged' tag on the message, default: * - # thread_view.archive_thread=a # Toggle 'inbox' tag on the whole thread, default: a - # thread_view.print=C-P # Print focused message, default: C-P - # thread_view.tag_message=+ # Tag message, default: + - # thread_view.search.search_or_next=C-f # Search for text or go to next match, default: C-f - # thread_view.search.cancel=GDK_KEY_Escape # Cancel current search, default: GDK_KEY_Escape - # thread_view.search.previous=P # Go to previous match, default: P - # thread_view.yank=y # Yank current element or message text to clipboard, default: y - # thread_view.yank_raw=Y # Yank raw content of current element or message to clipboard, default: Y - # thread_view.yank_mid=C-y # Yank the Message-ID of the focused message to clipboard, default: C-y - # thread_view.multi_next_thread=Key (":") # Open next after.., default: Key (":") - # thread_view.multi_next_thread.archive=Key ("a") # "Archive, default: Key ("a") - # thread_view.multi_next_thread.archive_next_unread_thread=Key ("A") # "Archive, default: Key ("A") - # thread_view.multi_next_thread.close=Key ("x") # "Archive, default: Key ("x") - # thread_view.multi_next_thread.next_thread=Key ("j") # Goto next, default: Key ("j") - # thread_view.multi_next_thread.previous_thread=Key ("k") # Goto previous, default: Key ("k") - # thread_view.multi_next_thread.next_unread=Key (GDK_KEY_Tab) # Goto next unread, default: Key (GDK_KEY_Tab) - # thread_view.multi_next_thread.previous_unread=Key (false, false, (guint) GDK_KEY_ISO_Left_Tab) # Goto previous unread, default: Key (false, false, (guint) GDK_KEY_ISO_Left_Tab) - - - ''; - }; -} diff --git a/user/home.nix b/user/home.nix index 6ab152c..120e346 100644 --- a/user/home.nix +++ b/user/home.nix @@ -20,7 +20,6 @@ ./mimeapps.nix ./desktop-entries.nix ./chat.nix - ./email.nix ./syncthing.nix ./vdir.nix ./bmenu.nix diff --git a/user/variables.nix b/user/variables.nix index b8bb262..1103e8b 100644 --- a/user/variables.nix +++ b/user/variables.nix @@ -116,8 +116,8 @@ rec { work = { from = "Leonardo Eugênio"; user = "leonardo@wopus.com.br"; - imap = "imap.wopus.com.br"; - smtp = "smtp.wopus.com.br"; + imap = "imap.hostinger.com"; + smtp = "smtp.hostinger.com"; pass = "Work/wopus_email"; }; }; @@ -132,5 +132,4 @@ rec { desktop = "sway"; browser = "firefox"; editor = "kakoune"; - email-client = "thunderbird"; } From 754ea46301af94e1c97f53eafacb13d08c51a673 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sun, 3 Mar 2024 18:55:42 -0300 Subject: [PATCH 036/404] media: install pitivi --- system/media-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/system/media-packages.nix b/system/media-packages.nix index 8e4ab74..95675be 100644 --- a/system/media-packages.nix +++ b/system/media-packages.nix @@ -17,6 +17,7 @@ in { inkscape krita kdenlive + pitivi blender-hip libreoffice godot_4 From b16750277b0059fbddab807eb07ea6ce3f02d467 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 15 Mar 2024 23:08:35 -0300 Subject: [PATCH 037/404] lsp: replace rnix-lsp with nil --- user/home.nix | 1 - user/kakoune/kak-lsp.toml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/user/home.nix b/user/home.nix index 120e346..7452406 100644 --- a/user/home.nix +++ b/user/home.nix @@ -122,7 +122,6 @@ nodePackages.typescript-language-server flow # js lsp server nil # nix lsp server - rnix-lsp # nix lsp clang-tools # c/c++ lsp server rust-analyzer # rust analyzer diff --git a/user/kakoune/kak-lsp.toml b/user/kakoune/kak-lsp.toml index 0395ec1..413de9e 100644 --- a/user/kakoune/kak-lsp.toml +++ b/user/kakoune/kak-lsp.toml @@ -120,8 +120,8 @@ command = "nimlsp" [language.nix] filetypes = ["nix"] +command = "nil" roots = ["flake.nix", "shell.nix", ".git"] -command = "rnix-lsp" [language.nix.settings.nil] formatting.command = [ "nixpkgs-fmt" ] From 05d5414d815eb2a05b6085d327015b000cf59191 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 15 Mar 2024 23:09:46 -0300 Subject: [PATCH 038/404] sway: restart daemons more often --- user/sway/default.nix | 1 + user/sway/swayidle.nix | 2 ++ 2 files changed, 3 insertions(+) diff --git a/user/sway/default.nix b/user/sway/default.nix index 16cb78e..96790be 100644 --- a/user/sway/default.nix +++ b/user/sway/default.nix @@ -88,6 +88,7 @@ in for_window [title=.*] inhibit_idle fullscreen exec ${pkgs.dbus-sway-environment}/bin/dbus-sway-environment exec swaymsg workspace 2 + exec_always systemctl --user restart waybar.service ''; }; services.gammastep = { diff --git a/user/sway/swayidle.nix b/user/sway/swayidle.nix index d21f40c..7b659ed 100644 --- a/user/sway/swayidle.nix +++ b/user/sway/swayidle.nix @@ -31,6 +31,8 @@ in event = "after-resume"; command = asScript "after-resume" '' ${pkgs.sway}/bin/swaymsg "output * dpms on" + ${pkgs.systemd}/bin/systemctl --user restart \ + kdeconnect.service kdeconnect-indicator.service ''; } ]; From 3530a814912378def81d0d978176a40671a1fee8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 15 Mar 2024 23:10:43 -0300 Subject: [PATCH 039/404] gpg: simplify config --- system/configuration.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/system/configuration.nix b/system/configuration.nix index 6e7a766..3c146b1 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -121,7 +121,6 @@ packages.media-packages.enable = true; environment.systemPackages = with pkgs; [ - pinentry-curses pavucontrol glib # gsettings @@ -144,11 +143,6 @@ # started in user sessions. # programs.mtr.enable = true; services.pcscd.enable = true; - programs.gnupg.agent = { - enable = true; - enableSSHSupport = true; - pinentryFlavor = "curses"; - }; security.sudo.wheelNeedsPassword = false; systemd.extraConfig = '' From 77d1fa78f54f5962ed4dd59f8e1c8b79fc310c88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 15 Mar 2024 23:41:38 -0300 Subject: [PATCH 040/404] waybar: enable tray again --- user/waybar/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/waybar/default.nix b/user/waybar/default.nix index a0008c6..5e4f329 100644 --- a/user/waybar/default.nix +++ b/user/waybar/default.nix @@ -17,7 +17,7 @@ in "sway/language" "mpd" "custom/playerctl" - # "tray" + "tray" "custom/caffeine" "pulseaudio" (lib.optional (osConfig.services.vpn.enable or false) "custom/vpn") From f84a9e7edddc5b1346a5eef52c5373b326a77b07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 15 Mar 2024 23:41:45 -0300 Subject: [PATCH 041/404] mangohud: fix keyboard shortcuts --- user/mangohud.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/user/mangohud.nix b/user/mangohud.nix index e22d3d6..5e54f46 100644 --- a/user/mangohud.nix +++ b/user/mangohud.nix @@ -11,6 +11,8 @@ in { no_display = true; fps_limit = "0,30,60,72,90,120,144,240,288,320"; toggle_fps_limit = "Shift_R+F10"; + toggle_preset = "Control_R+F9"; + fps_metrics = "Control_R+F8"; # legacy_layout = "false"; # gpu_stats = true; From 33134162918683d72bba634e16e331beb669e6c7 Mon Sep 17 00:00:00 2001 From: lelgenio Date: Tue, 19 Mar 2024 13:47:17 -0300 Subject: [PATCH 042/404] update --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 9616b19..9e14b35 100644 --- a/flake.lock +++ b/flake.lock @@ -503,11 +503,11 @@ ] }, "locked": { - "lastModified": 1710091028, - "narHash": "sha256-yFk2kc8J2kVh0RWlwT+PQf0bpfUNcROOcRYcyQJbpk4=", + "lastModified": 1710257359, + "narHash": "sha256-43re5pzE/cswFAgw92/ugsB3+d5ufDaCcLtl9ztKfBo=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "05db7dfd7fc261e0195e54f8a6d655d4f370e70f", + "rev": "1761f6cefd77f4fcd2039d930c88d6716ddc4974", "type": "github" }, "original": { @@ -529,11 +529,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1710344304, - "narHash": "sha256-jE+/UGqRYkKBBpLTTV5ayCtVmD9N1WsSKpufszUPzcA=", + "lastModified": 1710864211, + "narHash": "sha256-Uve1/UBnwD4M/9xD0E3XATnLrF8B5vL6MTBhX6Is+TE=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "3e67ee0f5f66c74c0a0bd4f797361fd100c2e2d2", + "rev": "bcba3951f45f11245d424274130eb3a0ac790d93", "type": "github" }, "original": { @@ -677,11 +677,11 @@ ] }, "locked": { - "lastModified": 1710120787, - "narHash": "sha256-tlLuB73OCOKtU2j83bQzSYFyzjJo3rjpITZE5MoofG8=", + "lastModified": 1710644923, + "narHash": "sha256-0fjbN5GYYDKPyPay0l8gYoH+tFfNqPPwP5sxxBreeA4=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "e76ff2df6bfd2abe06abd8e7b9f217df941c1b07", + "rev": "e25efda85e39fcdc845e371971ac4384989c4295", "type": "github" }, "original": { @@ -778,11 +778,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1710283656, - "narHash": "sha256-nI+AOy4uK6jLGBi9nsbHjL1EdSIzoo8oa+9oeVhbyFc=", + "lastModified": 1710695816, + "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "51063ed4f2343a59fdeebb279bb81d87d453942b", + "rev": "614b4613980a522ba49f0d194531beddbb7220d3", "type": "github" }, "original": { From eb25c3c32f0b33eb02eb4f7f67af3395de690035 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 23 Mar 2024 12:41:45 -0300 Subject: [PATCH 043/404] flake: add auto formatter --- hosts/ghost/nginx.nix | 2 +- switch | 4 ++++ user/firefox.nix | 3 ++- user/home.nix | 10 ++++++---- user/mpv.nix | 4 ++-- user/pipewire.nix | 2 +- 6 files changed, 16 insertions(+), 9 deletions(-) diff --git a/hosts/ghost/nginx.nix b/hosts/ghost/nginx.nix index 7a795d7..08ece70 100644 --- a/hosts/ghost/nginx.nix +++ b/hosts/ghost/nginx.nix @@ -9,7 +9,7 @@ acceptTerms = true; defaults.email = "lelgenio@disroot.org"; }; - + networking.firewall.allowedTCPPorts = [ 80 443 ]; } diff --git a/switch b/switch index ca04c93..67c08e7 100755 --- a/switch +++ b/switch @@ -1,5 +1,9 @@ #!/usr/bin/env bash +nix fmt + +git diff + sudo nice ionice \ nixos-rebuild \ switch \ diff --git a/user/firefox.nix b/user/firefox.nix index 2ae69fb..9c29b25 100644 --- a/user/firefox.nix +++ b/user/firefox.nix @@ -1,7 +1,8 @@ { config, pkgs, lib, font, ... }: let inherit (pkgs.uservars) desktop browser; bugfixedFirefox = pkgs.firefox-esr-unwrapped // { requireSigning = false; allowAddonSideload = true; }; -in { +in +{ config = { programs.firefox = { enable = true; diff --git a/user/home.nix b/user/home.nix index 7452406..36bb40f 100644 --- a/user/home.nix +++ b/user/home.nix @@ -152,10 +152,12 @@ text-editor = lib.mkDefault "kak.desktop"; image-viewer = lib.mkDefault "pqiv.desktop"; video-player = lib.mkDefault "mpv.desktop"; - web-browser = lib.mkDefault ({ - firefox = lib.mkDefault "firefox.desktop"; - qutebrowser = lib.mkDefault "org.qutebrowser.qutebrowser.desktop"; - }.${pkgs.uservars.browser}); + web-browser = lib.mkDefault ( + { + firefox = lib.mkDefault "firefox.desktop"; + qutebrowser = lib.mkDefault "org.qutebrowser.qutebrowser.desktop"; + }.${pkgs.uservars.browser} + ); document-viewer = lib.mkDefault "org.pwmt.zathura.desktop"; file-manager = lib.mkDefault "thunar.desktop"; archive-manager = "engrampa.desktop"; diff --git a/user/mpv.nix b/user/mpv.nix index e77a08f..b66b2ca 100644 --- a/user/mpv.nix +++ b/user/mpv.nix @@ -1,4 +1,4 @@ -{pkgs, ... }: { +{ pkgs, ... }: { config = { programs.mpv = { enable = true; @@ -16,7 +16,7 @@ cache-pause-initial = true; cache-pause-wait = 10; - hwdec="auto"; + hwdec = "auto"; }; scripts = with pkgs.mpvScripts; [ mpris diff --git a/user/pipewire.nix b/user/pipewire.nix index 44d7c12..8fd5188 100644 --- a/user/pipewire.nix +++ b/user/pipewire.nix @@ -40,7 +40,7 @@ ''; }; - xdg.configFile = { + xdg.configFile = { "pipewire/pipewire.conf.d/99-rtp-sink.conf".text = '' context.modules = [ { name = libpipewire-module-rtp-sink From 08d66a405348b312acdd386a6ee6d072c14795d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 27 Mar 2024 02:28:28 -0300 Subject: [PATCH 044/404] ghost: add mail server --- flake.nix | 5 +++++ hosts/ghost/default.nix | 1 + hosts/ghost/email.nix | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+) create mode 100644 hosts/ghost/email.nix diff --git a/flake.nix b/flake.nix index 7951467..8638820 100644 --- a/flake.nix +++ b/flake.nix @@ -32,6 +32,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + nixos-mailserver = { + url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-23.11"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + dzgui-nix = { url = "github:lelgenio/dzgui-nix"; }; diff --git a/hosts/ghost/default.nix b/hosts/ghost/default.nix index 040a093..04196b3 100644 --- a/hosts/ghost/default.nix +++ b/hosts/ghost/default.nix @@ -11,6 +11,7 @@ ./users.nix ./writefreely.nix ./renawiki.nix + ./email.nix ]; # Use more aggressive compression then the default. diff --git a/hosts/ghost/email.nix b/hosts/ghost/email.nix new file mode 100644 index 0000000..39afdb6 --- /dev/null +++ b/hosts/ghost/email.nix @@ -0,0 +1,34 @@ +{ pkgs, inputs, ... }: { + networking.hostName = "lelgenio.xyz"; + + imports = [ + inputs.nixos-mailserver.nixosModules.mailserver + ]; + + mailserver = { + enable = true; + fqdn = "mail.lelgenio.xyz"; + domains = [ "lelgenio.xyz" ]; + certificateScheme = "acme-nginx"; + loginAccounts = { + "lelgenio@lelgenio.xyz" = { + hashedPassword = "$2y$05$z5s7QCXcs5uTFsfyYpwNJeWzb3RmzgWxNgcPCr0zjSytkLFF/qZmS"; + aliases = [ "postmaster@lelgenio.xyz" ]; + }; + }; + }; + + # Webmail + services.roundcube = rec { + enable = true; + package = pkgs.roundcube.withPlugins (p: [ p.carddav ]); + hostName = "mail.lelgenio.xyz"; + extraConfig = '' + $config['smtp_host'] = "tls://${hostName}:587"; + $config['smtp_user'] = "%u"; + $config['smtp_pass'] = "%p"; + $config['plugins'] = [ "carddav" ]; + ''; + }; + +} From a3e77a96610c9789e173ec50fd15c2e308b9a1c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 27 Mar 2024 12:40:22 -0300 Subject: [PATCH 045/404] scripts: add script to read QR codes --- scripts/default.nix | 1 + scripts/readQrCode | 18 ++++++++++++++++++ user/desktop-entries.nix | 9 +++++++++ user/pass.nix | 1 + 4 files changed, 29 insertions(+) create mode 100755 scripts/readQrCode diff --git a/scripts/default.nix b/scripts/default.nix index 844308b..54ee0a2 100644 --- a/scripts/default.nix +++ b/scripts/default.nix @@ -50,6 +50,7 @@ create_scripts color_picker = [ grim slurp wl-clipboard libnotify imagemagick ]; dzadd = [ procps libnotify final.wdmenu jq mpv pqiv python3Packages.deemix mpc-cli final.mpdDup ]; mpdDup = [ mpc-cli perl ]; + readQrCode = [ grim zbar wl-clipboard ]; } // lib.mapAttrs import_script { wdmenu = ./wdmenu.nix; wlauncher = ./wlauncher.nix; diff --git a/scripts/readQrCode b/scripts/readQrCode new file mode 100755 index 0000000..a86de59 --- /dev/null +++ b/scripts/readQrCode @@ -0,0 +1,18 @@ +#!/bin/sh + +set -o pipefail + +main() { + + if wl-paste | zbarimg -q --raw - | wl-copy + then + notify-send "Copied" "QrCode was copied to clipboard" + rm "$LOGFILE" + else + notify-send "Failed to read QrCode" "Log file is '$LOGFILE'" + fi + +} + +LOGFILE=$(mktemp /tmp/qrcode-XXXXXXXX.log) +main > "$LOGFILE" 2>&1 diff --git a/user/desktop-entries.nix b/user/desktop-entries.nix index cb42d40..eaa4c93 100644 --- a/user/desktop-entries.nix +++ b/user/desktop-entries.nix @@ -54,5 +54,14 @@ icon = "download"; categories = [ "Network" ]; }; + readQrCode = { + name = "Read QR Code"; + genericName = "Read QR Code from clipboard image"; + exec = "readQrCode"; + terminal = true; + type = "Application"; + icon = "download"; + categories = [ "Network" ]; + }; }; } diff --git a/user/pass.nix b/user/pass.nix index 324caa2..365706c 100644 --- a/user/pass.nix +++ b/user/pass.nix @@ -20,6 +20,7 @@ wpass _gpg-unlock qtpass + readQrCode ]; }; } From 55ce6457c83fa476d41e2dc9641945ab876dcf8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 27 Mar 2024 13:50:23 -0300 Subject: [PATCH 046/404] ghost: fix rDNS lookup --- hosts/ghost/email.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hosts/ghost/email.nix b/hosts/ghost/email.nix index 39afdb6..8d3021b 100644 --- a/hosts/ghost/email.nix +++ b/hosts/ghost/email.nix @@ -1,5 +1,6 @@ { pkgs, inputs, ... }: { - networking.hostName = "lelgenio.xyz"; + # It's important to let Digital Ocean set the hostname so we get rDNS to work + networking.hostName = ""; imports = [ inputs.nixos-mailserver.nixosModules.mailserver From c60e22b26a70b9085bcd41e11156fb94e7a867c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 27 Mar 2024 16:43:35 -0300 Subject: [PATCH 047/404] flake: update lockfile with mailserver items --- flake.lock | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/flake.lock b/flake.lock index 9e14b35..8f9720a 100644 --- a/flake.lock +++ b/flake.lock @@ -55,6 +55,22 @@ "type": "github" } }, + "blobs": { + "flake": false, + "locked": { + "lastModified": 1604995301, + "narHash": "sha256-wcLzgLec6SGJA8fx1OEN1yV/Py5b+U5iyYpksUY/yLw=", + "owner": "simple-nixos-mailserver", + "repo": "blobs", + "rev": "2cccdf1ca48316f2cfd1c9a0017e8de5a7156265", + "type": "gitlab" + }, + "original": { + "owner": "simple-nixos-mailserver", + "repo": "blobs", + "type": "gitlab" + } + }, "crane": { "inputs": { "flake-compat": "flake-compat", @@ -289,6 +305,22 @@ "type": "github" } }, + "flake-compat_5": { + "flake": false, + "locked": { + "lastModified": 1668681692, + "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "009399224d5e398d03b22badca40a37ac85412a1", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems_2" @@ -729,6 +761,32 @@ "type": "github" } }, + "nixos-mailserver": { + "inputs": { + "blobs": "blobs", + "flake-compat": "flake-compat_5", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-23_05": "nixpkgs-23_05", + "nixpkgs-23_11": "nixpkgs-23_11", + "utils": "utils_2" + }, + "locked": { + "lastModified": 1706219574, + "narHash": "sha256-qO+8UErk+bXCq2ybHU4GzXG4Ejk4Tk0rnnTPNyypW4g=", + "owner": "simple-nixos-mailserver", + "repo": "nixos-mailserver", + "rev": "e47f3719f1db3e0961a4358d4cb234a0acaa7baf", + "type": "gitlab" + }, + "original": { + "owner": "simple-nixos-mailserver", + "ref": "nixos-23.11", + "repo": "nixos-mailserver", + "type": "gitlab" + } + }, "nixpkgs": { "locked": { "lastModified": 1702539185, @@ -744,6 +802,36 @@ "type": "indirect" } }, + "nixpkgs-23_05": { + "locked": { + "lastModified": 1704290814, + "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-23.05", + "type": "indirect" + } + }, + "nixpkgs-23_11": { + "locked": { + "lastModified": 1706098335, + "narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a77ab169a83a4175169d78684ddd2e54486ac651", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-23.11", + "type": "indirect" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1692638711, @@ -837,6 +925,7 @@ "nix-index-database": "nix-index-database", "nix-software-center": "nix-software-center", "nixos-conf-editor": "nixos-conf-editor", + "nixos-mailserver": "nixos-mailserver", "nixpkgs": "nixpkgs_4", "plymouth-themes": "plymouth-themes", "ranger-icons": "ranger-icons", @@ -1142,6 +1231,21 @@ "type": "github" } }, + "utils_2": { + "locked": { + "lastModified": 1605370193, + "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5021eac20303a61fafe17224c087f5519baed54d", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "wl-crosshair": { "inputs": { "flake-utils": "flake-utils_8", From 7ab7a3459a81c4c6f3bc6632b309d32003224d7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 28 Mar 2024 21:56:52 -0300 Subject: [PATCH 048/404] hosts: add phantom --- flake.nix | 4 ++ hosts/phantom/default.nix | 41 +++++++++++++++++++ hosts/phantom/email.nix | 35 ++++++++++++++++ hosts/phantom/hardware-config.nix | 7 ++++ hosts/phantom/mastodon.nix | 10 +++++ hosts/phantom/nextcloud.nix | 22 ++++++++++ hosts/phantom/nginx.nix | 15 +++++++ hosts/phantom/renawiki.nix | 23 +++++++++++ hosts/phantom/syncthing.nix | 24 +++++++++++ hosts/phantom/users.nix | 38 ++++++++++++++++++ hosts/phantom/vpsadminos.nix | 67 +++++++++++++++++++++++++++++++ hosts/phantom/writefreely.nix | 25 ++++++++++++ 12 files changed, 311 insertions(+) create mode 100644 hosts/phantom/default.nix create mode 100644 hosts/phantom/email.nix create mode 100644 hosts/phantom/hardware-config.nix create mode 100644 hosts/phantom/mastodon.nix create mode 100644 hosts/phantom/nextcloud.nix create mode 100644 hosts/phantom/nginx.nix create mode 100644 hosts/phantom/renawiki.nix create mode 100644 hosts/phantom/syncthing.nix create mode 100644 hosts/phantom/users.nix create mode 100644 hosts/phantom/vpsadminos.nix create mode 100644 hosts/phantom/writefreely.nix diff --git a/flake.nix b/flake.nix index 8638820..4fbdfce 100644 --- a/flake.nix +++ b/flake.nix @@ -161,6 +161,10 @@ inherit system specialArgs; modules = [ ./hosts/ghost ]; }; + phantom = lib.nixosSystem { + inherit system specialArgs; + modules = [ ./hosts/phantom ]; + }; }; homeConfigurations.lelgenio = inputs.home-manager.lib.homeManagerConfiguration { diff --git a/hosts/phantom/default.nix b/hosts/phantom/default.nix new file mode 100644 index 0000000..b56ff10 --- /dev/null +++ b/hosts/phantom/default.nix @@ -0,0 +1,41 @@ +{ config, pkgs, inputs, ... }: { + imports = [ + ./vpsadminos.nix + inputs.agenix.nixosModules.default + ../../system/nix.nix + ./hardware-config.nix + ./mastodon.nix + ./nextcloud.nix + ./nginx.nix + ./syncthing.nix + ./users.nix + ./writefreely.nix + ./renawiki.nix + ./email.nix + ]; + + # # Enable networking + # networking.networkmanager.enable = true; + # Set your time zone. + time.timeZone = "America/Sao_Paulo"; + # Select internationalisation properties. + i18n.defaultLocale = "pt_BR.utf8"; + + boot.kernel.sysctl."fs.inotify.max_user_watches" = 1048576; + + age = { + identityPaths = [ "/root/.ssh/id_rsa" ]; + }; + + system.autoUpgrade = { + enable = true; + dates = "04:40"; + allowReboot = true; + operation = "switch"; + flags = [ "--update-input" "nixpkgs" "--no-write-lock-file" "-L" ]; + flake = "github:lelgenio/nixos-config#phantom"; + }; + + system.stateVersion = "23.05"; # Never change this +} + diff --git a/hosts/phantom/email.nix b/hosts/phantom/email.nix new file mode 100644 index 0000000..8d3021b --- /dev/null +++ b/hosts/phantom/email.nix @@ -0,0 +1,35 @@ +{ pkgs, inputs, ... }: { + # It's important to let Digital Ocean set the hostname so we get rDNS to work + networking.hostName = ""; + + imports = [ + inputs.nixos-mailserver.nixosModules.mailserver + ]; + + mailserver = { + enable = true; + fqdn = "mail.lelgenio.xyz"; + domains = [ "lelgenio.xyz" ]; + certificateScheme = "acme-nginx"; + loginAccounts = { + "lelgenio@lelgenio.xyz" = { + hashedPassword = "$2y$05$z5s7QCXcs5uTFsfyYpwNJeWzb3RmzgWxNgcPCr0zjSytkLFF/qZmS"; + aliases = [ "postmaster@lelgenio.xyz" ]; + }; + }; + }; + + # Webmail + services.roundcube = rec { + enable = true; + package = pkgs.roundcube.withPlugins (p: [ p.carddav ]); + hostName = "mail.lelgenio.xyz"; + extraConfig = '' + $config['smtp_host'] = "tls://${hostName}:587"; + $config['smtp_user'] = "%u"; + $config['smtp_pass'] = "%p"; + $config['plugins'] = [ "carddav" ]; + ''; + }; + +} diff --git a/hosts/phantom/hardware-config.nix b/hosts/phantom/hardware-config.nix new file mode 100644 index 0000000..1a89a15 --- /dev/null +++ b/hosts/phantom/hardware-config.nix @@ -0,0 +1,7 @@ +{ config, pkgs, inputs, ... }: { + swapDevices = [{ + device = "/swap/swapfile"; + size = (1024 * 2); # 2 GB + }]; +} + diff --git a/hosts/phantom/mastodon.nix b/hosts/phantom/mastodon.nix new file mode 100644 index 0000000..3e629d7 --- /dev/null +++ b/hosts/phantom/mastodon.nix @@ -0,0 +1,10 @@ +{ config, pkgs, inputs, ... }: { + services.mastodon = { + enable = true; + configureNginx = true; + localDomain = "social.lelgenio.xyz"; + smtp.fromAddress = "lelgenio@disroot.org"; + streamingProcesses = 2; + extraConfig.SINGLE_USER_MODE = "true"; + }; +} diff --git a/hosts/phantom/nextcloud.nix b/hosts/phantom/nextcloud.nix new file mode 100644 index 0000000..db6b04c --- /dev/null +++ b/hosts/phantom/nextcloud.nix @@ -0,0 +1,22 @@ +{ config, pkgs, inputs, ... }: { + services.nextcloud = { + enable = true; + package = pkgs.nextcloud27; + hostName = "cloud.lelgenio.xyz"; + https = true; + config = { + adminpassFile = config.age.secrets.ghost-nextcloud.path; + }; + }; + + age = { + secrets.ghost-nextcloud = { + file = ../../secrets/ghost-nextcloud.age; + mode = "400"; + owner = "nextcloud"; + group = "nextcloud"; + }; + }; + +} + diff --git a/hosts/phantom/nginx.nix b/hosts/phantom/nginx.nix new file mode 100644 index 0000000..08ece70 --- /dev/null +++ b/hosts/phantom/nginx.nix @@ -0,0 +1,15 @@ +{ config, pkgs, inputs, ... }: { + services.nginx = { + enable = true; + recommendedProxySettings = true; + recommendedTlsSettings = true; + }; + + security.acme = { + acceptTerms = true; + defaults.email = "lelgenio@disroot.org"; + }; + + networking.firewall.allowedTCPPorts = [ 80 443 ]; +} + diff --git a/hosts/phantom/renawiki.nix b/hosts/phantom/renawiki.nix new file mode 100644 index 0000000..009e06e --- /dev/null +++ b/hosts/phantom/renawiki.nix @@ -0,0 +1,23 @@ +{ config, pkgs, inputs, ... }: { + services.mediawiki = { + enable = true; + name = "Rena Wiki"; + + webserver = "nginx"; + nginx.hostName = "renawiki.lelgenio.xyz"; + passwordFile = config.age.secrets.ghost-renawiki.path; + + extensions.VisualEditor = null; + }; + services.nginx.virtualHosts."renawiki.lelgenio.xyz" = { + enableACME = true; + forceSSL = true; + }; + + age.secrets.ghost-renawiki = { + file = ../../secrets/ghost-renawiki.age; + mode = "400"; + owner = "mediawiki"; + }; +} + diff --git a/hosts/phantom/syncthing.nix b/hosts/phantom/syncthing.nix new file mode 100644 index 0000000..a971b86 --- /dev/null +++ b/hosts/phantom/syncthing.nix @@ -0,0 +1,24 @@ +{ config, pkgs, inputs, ... }: { + + services.syncthing = { + enable = true; + dataDir = "/var/lib/syncthing-data"; + guiAddress = "0.0.0.0:8384"; + openDefaultPorts = true; + }; + + services.nginx.virtualHosts."syncthing.lelgenio.xyz" = { + enableACME = true; + forceSSL = true; + locations."/" = { + proxyPass = "http://127.0.0.1:8384"; + extraConfig = + # required when the target is also TLS server with multiple hosts + "proxy_ssl_server_name on;" + + # required when the server wants to use HTTP Authentication + "proxy_pass_header Authorization;" + ; + }; + }; +} + diff --git a/hosts/phantom/users.nix b/hosts/phantom/users.nix new file mode 100644 index 0000000..5cc853a --- /dev/null +++ b/hosts/phantom/users.nix @@ -0,0 +1,38 @@ +{ pkgs, ... }: { + security.rtkit.enable = true; + services.openssh = { + enable = true; + ports = [ 9022 ]; + settings = { + PasswordAuthentication = false; + KbdInteractiveAuthentication = false; + }; + }; + + # Define a user account. Don't forget to set a password with ‘passwd’. + users.mutableUsers = false; + users.users.lelgenio = { + isNormalUser = true; + description = "Leonardo Eugênio"; + hashedPassword = "$y$j9T$0e/rczjOVCy7PuwC3pG0V/$gTHZhfO4wQSlFvbDyfghbCnGI2uDI0a52zSrQ/yOA5A"; + extraGroups = [ "networkmanager" "wheel" "docker" "adbusers" "bluetooth" "corectrl" "vboxusers" ]; + shell = pkgs.fish; + openssh.authorizedKeys.keys = [ + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxR/w+38b2lX90yNBqhq3mUmkn1WGu6GAPhN1tVp2ZjYRJNV/+5gWCnTtOWYtDx35HmK/spQ2Qy8X9ttkzORa24fysNx1Iqn/TiXhD7eIJjbGPnrOpIKTkW5/uB3SD/P5NBSa06//BaqJU4sBlG79hoXRpod052hQtdpTVDiMCIV+iboWPKqopmJJfWdBtVnHXs9rep0htPRExxGslImFk7Z6xjcaHyCpIQZPlOGf+sGsmUU7jRqzvZFV8ucIdbnAlMHrU4pepNFhuraESyZVTa/bi9sw0iozXp5Q5+5thMebEslmT1Z771kI4sieDy+O4r8c0Sx2/VY1UAzcpq1faggc3YB01MTh+tiEC6xdMvZLrQGL1NBWjHleMyL53GU5ERluC0vXJF3Hv3BGGBDfXWbrEm5n06DHr2apRVJGC0LwiQ7Woud1X4V4X1pKSusxCVMjT2lmcOwV6YhKhB2sowJc1OdMx4+tL0UWE+YKSZgBHfolwk6ml0F4EO9nnUHc= lelgenio@i15" + ]; + }; + users.users.root = { + shell = pkgs.fish; + openssh.authorizedKeys.keys = [ + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxR/w+38b2lX90yNBqhq3mUmkn1WGu6GAPhN1tVp2ZjYRJNV/+5gWCnTtOWYtDx35HmK/spQ2Qy8X9ttkzORa24fysNx1Iqn/TiXhD7eIJjbGPnrOpIKTkW5/uB3SD/P5NBSa06//BaqJU4sBlG79hoXRpod052hQtdpTVDiMCIV+iboWPKqopmJJfWdBtVnHXs9rep0htPRExxGslImFk7Z6xjcaHyCpIQZPlOGf+sGsmUU7jRqzvZFV8ucIdbnAlMHrU4pepNFhuraESyZVTa/bi9sw0iozXp5Q5+5thMebEslmT1Z771kI4sieDy+O4r8c0Sx2/VY1UAzcpq1faggc3YB01MTh+tiEC6xdMvZLrQGL1NBWjHleMyL53GU5ERluC0vXJF3Hv3BGGBDfXWbrEm5n06DHr2apRVJGC0LwiQ7Woud1X4V4X1pKSusxCVMjT2lmcOwV6YhKhB2sowJc1OdMx4+tL0UWE+YKSZgBHfolwk6ml0F4EO9nnUHc= lelgenio@i15" + ]; + initialHashedPassword = "$y$j9T$E3aBBSSq0Gma8hZD9L7ov0$iCGDW4fqrXWfHO0qodBYYgMFA9CpIraoklHcPbJJrM3"; + }; + security.sudo.wheelNeedsPassword = false; + + programs.fish.enable = true; + + environment.systemPackages = with pkgs; [ + git + ]; +} diff --git a/hosts/phantom/vpsadminos.nix b/hosts/phantom/vpsadminos.nix new file mode 100644 index 0000000..070017e --- /dev/null +++ b/hosts/phantom/vpsadminos.nix @@ -0,0 +1,67 @@ +# This file provides compatibility for NixOS to run in a container on vpsAdminOS +# hosts. +# +# If you're experiencing issues, try updating this file to the latest version +# from vpsAdminOS repository: +# +# https://github.com/vpsfreecz/vpsadminos/blob/staging/os/lib/nixos-container/vpsadminos.nix + +{ config, pkgs, lib, ... }: +with lib; +let + nameservers = [ + "1.1.1.1" + "2606:4700:4700::1111" + ]; +in { + networking.nameservers = mkDefault nameservers; + services.resolved = mkDefault { fallbackDns = nameservers; }; + networking.dhcpcd.extraConfig = "noipv4ll"; + + systemd.services.systemd-sysctl.enable = false; + systemd.services.systemd-oomd.enable = false; + systemd.sockets."systemd-journald-audit".enable = false; + systemd.mounts = [ {where = "/sys/kernel/debug"; enable = false;} ]; + systemd.services.rpc-gssd.enable = false; + + # Due to our restrictions in /sys, the default systemd-udev-trigger fails + # on accessing PCI devices, etc. Override it to match only network devices. + # In addition, boot.isContainer prevents systemd-udev-trigger.service from + # being enabled at all, so add it explicitly. + systemd.additionalUpstreamSystemUnits = [ + "systemd-udev-trigger.service" + ]; + systemd.services.systemd-udev-trigger.serviceConfig.ExecStart = [ + "" + "-udevadm trigger --subsystem-match=net --action=add" + ]; + + boot.isContainer = true; + boot.enableContainers = mkDefault true; + boot.loader.initScript.enable = true; + boot.specialFileSystems."/run/keys".fsType = mkForce "tmpfs"; + boot.systemdExecutable = mkDefault "/run/current-system/systemd/lib/systemd/systemd systemd.unified_cgroup_hierarchy=0"; + + # Overrides for + documentation.enable = mkOverride 500 true; + documentation.nixos.enable = mkOverride 500 true; + networking.useHostResolvConf = mkOverride 500 false; + services.openssh.startWhenNeeded = mkOverride 500 false; + + # Bring up the network, /ifcfg.{add,del} are supplied by the vpsAdminOS host + systemd.services.networking-setup = { + description = "Load network configuration provided by the vpsAdminOS host"; + before = [ "network.target" ]; + wantedBy = [ "network.target" ]; + after = [ "network-pre.target" ]; + path = [ pkgs.iproute2 ]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + ExecStart = "${pkgs.bash}/bin/bash /ifcfg.add"; + ExecStop = "${pkgs.bash}/bin/bash /ifcfg.del"; + }; + unitConfig.ConditionPathExists = "/ifcfg.add"; + restartIfChanged = false; + }; +} diff --git a/hosts/phantom/writefreely.nix b/hosts/phantom/writefreely.nix new file mode 100644 index 0000000..b5cee3b --- /dev/null +++ b/hosts/phantom/writefreely.nix @@ -0,0 +1,25 @@ +{ config, pkgs, inputs, ... }: { + services.writefreely = { + enable = true; + acme.enable = true; + nginx.enable = true; + nginx.forceSSL = true; + host = "blog.lelgenio.xyz"; + admin.name = "lelgenio"; + admin.initialPasswordFile = config.age.secrets.ghost-writefreely.path; + settings.app = { + site_name = "Leo's blog"; + single_user = true; + }; + }; + + age = { + secrets.ghost-writefreely = { + file = ../../secrets/ghost-writefreely.age; + mode = "400"; + owner = "writefreely"; + group = "writefreely"; + }; + }; +} + From 4cd1e7cab1d34ff082ac9cccf7c339a7f122dd41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 29 Mar 2024 01:04:41 -0300 Subject: [PATCH 049/404] ssh: update hosts list --- user/ssh.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/user/ssh.nix b/user/ssh.nix index 382266f..a4f2b47 100644 --- a/user/ssh.nix +++ b/user/ssh.nix @@ -11,7 +11,12 @@ in { }; ghost = { user = "root"; - hostname = "lelgenio.xyz"; + hostname = "ghost.lelgenio.xyz"; + port = 9022; + }; + phantom = { + user = "root"; + hostname = "phantom.lelgenio.xyz"; port = 9022; }; }; From d3f02f87624ec165b6f9495eb8e96a2fe845090c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 29 Mar 2024 01:06:59 -0300 Subject: [PATCH 050/404] hosts: delete ghost host --- flake.nix | 4 --- hosts/ghost/default.nix | 43 --------------------------------- hosts/ghost/email.nix | 35 --------------------------- hosts/ghost/hardware-config.nix | 13 ---------- hosts/ghost/mastodon.nix | 10 -------- hosts/ghost/nextcloud.nix | 22 ----------------- hosts/ghost/nginx.nix | 15 ------------ hosts/ghost/renawiki.nix | 23 ------------------ hosts/ghost/syncthing.nix | 24 ------------------ hosts/ghost/users.nix | 38 ----------------------------- hosts/ghost/writefreely.nix | 25 ------------------- user/ssh.nix | 5 ---- 12 files changed, 257 deletions(-) delete mode 100644 hosts/ghost/default.nix delete mode 100644 hosts/ghost/email.nix delete mode 100644 hosts/ghost/hardware-config.nix delete mode 100644 hosts/ghost/mastodon.nix delete mode 100644 hosts/ghost/nextcloud.nix delete mode 100644 hosts/ghost/nginx.nix delete mode 100644 hosts/ghost/renawiki.nix delete mode 100644 hosts/ghost/syncthing.nix delete mode 100644 hosts/ghost/users.nix delete mode 100644 hosts/ghost/writefreely.nix diff --git a/flake.nix b/flake.nix index 4fbdfce..529b0ee 100644 --- a/flake.nix +++ b/flake.nix @@ -157,10 +157,6 @@ services.flatpak.enable = lib.mkOverride 0 false; }]; }; - ghost = lib.nixosSystem { - inherit system specialArgs; - modules = [ ./hosts/ghost ]; - }; phantom = lib.nixosSystem { inherit system specialArgs; modules = [ ./hosts/phantom ]; diff --git a/hosts/ghost/default.nix b/hosts/ghost/default.nix deleted file mode 100644 index 04196b3..0000000 --- a/hosts/ghost/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ config, pkgs, inputs, ... }: { - imports = [ - "${inputs.nixpkgs}/nixos/modules/virtualisation/digital-ocean-image.nix" - inputs.agenix.nixosModules.default - ../../system/nix.nix - ./hardware-config.nix - ./mastodon.nix - ./nextcloud.nix - ./nginx.nix - ./syncthing.nix - ./users.nix - ./writefreely.nix - ./renawiki.nix - ./email.nix - ]; - - # Use more aggressive compression then the default. - virtualisation.digitalOceanImage.compressionMethod = "bzip2"; - # Enable networking - networking.networkmanager.enable = true; - # Set your time zone. - time.timeZone = "America/Sao_Paulo"; - # Select internationalisation properties. - i18n.defaultLocale = "pt_BR.utf8"; - - boot.kernel.sysctl."fs.inotify.max_user_watches" = 1048576; - - age = { - identityPaths = [ "/root/.ssh/id_rsa" ]; - }; - - system.autoUpgrade = { - enable = true; - dates = "04:40"; - allowReboot = true; - operation = "switch"; - flags = [ "--update-input" "nixpkgs" "--no-write-lock-file" "-L" ]; - flake = "github:lelgenio/nixos-config#ghost"; - }; - - system.stateVersion = "23.05"; # Never change this -} - diff --git a/hosts/ghost/email.nix b/hosts/ghost/email.nix deleted file mode 100644 index 8d3021b..0000000 --- a/hosts/ghost/email.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ pkgs, inputs, ... }: { - # It's important to let Digital Ocean set the hostname so we get rDNS to work - networking.hostName = ""; - - imports = [ - inputs.nixos-mailserver.nixosModules.mailserver - ]; - - mailserver = { - enable = true; - fqdn = "mail.lelgenio.xyz"; - domains = [ "lelgenio.xyz" ]; - certificateScheme = "acme-nginx"; - loginAccounts = { - "lelgenio@lelgenio.xyz" = { - hashedPassword = "$2y$05$z5s7QCXcs5uTFsfyYpwNJeWzb3RmzgWxNgcPCr0zjSytkLFF/qZmS"; - aliases = [ "postmaster@lelgenio.xyz" ]; - }; - }; - }; - - # Webmail - services.roundcube = rec { - enable = true; - package = pkgs.roundcube.withPlugins (p: [ p.carddav ]); - hostName = "mail.lelgenio.xyz"; - extraConfig = '' - $config['smtp_host'] = "tls://${hostName}:587"; - $config['smtp_user'] = "%u"; - $config['smtp_pass'] = "%p"; - $config['plugins'] = [ "carddav" ]; - ''; - }; - -} diff --git a/hosts/ghost/hardware-config.nix b/hosts/ghost/hardware-config.nix deleted file mode 100644 index 62a744f..0000000 --- a/hosts/ghost/hardware-config.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ config, pkgs, inputs, ... }: { - swapDevices = [{ - device = "/swap/swapfile"; - size = (1024 * 2); # 2 GB - }]; - - fileSystems."/var" = { - device = "/dev/disk/by-uuid/b19e7272-8fd1-4999-93eb-abc6d5c0a1cc"; - fsType = "btrfs"; - options = [ "subvol=@var" ]; - }; -} - diff --git a/hosts/ghost/mastodon.nix b/hosts/ghost/mastodon.nix deleted file mode 100644 index 3e629d7..0000000 --- a/hosts/ghost/mastodon.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ config, pkgs, inputs, ... }: { - services.mastodon = { - enable = true; - configureNginx = true; - localDomain = "social.lelgenio.xyz"; - smtp.fromAddress = "lelgenio@disroot.org"; - streamingProcesses = 2; - extraConfig.SINGLE_USER_MODE = "true"; - }; -} diff --git a/hosts/ghost/nextcloud.nix b/hosts/ghost/nextcloud.nix deleted file mode 100644 index db6b04c..0000000 --- a/hosts/ghost/nextcloud.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ config, pkgs, inputs, ... }: { - services.nextcloud = { - enable = true; - package = pkgs.nextcloud27; - hostName = "cloud.lelgenio.xyz"; - https = true; - config = { - adminpassFile = config.age.secrets.ghost-nextcloud.path; - }; - }; - - age = { - secrets.ghost-nextcloud = { - file = ../../secrets/ghost-nextcloud.age; - mode = "400"; - owner = "nextcloud"; - group = "nextcloud"; - }; - }; - -} - diff --git a/hosts/ghost/nginx.nix b/hosts/ghost/nginx.nix deleted file mode 100644 index 08ece70..0000000 --- a/hosts/ghost/nginx.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ config, pkgs, inputs, ... }: { - services.nginx = { - enable = true; - recommendedProxySettings = true; - recommendedTlsSettings = true; - }; - - security.acme = { - acceptTerms = true; - defaults.email = "lelgenio@disroot.org"; - }; - - networking.firewall.allowedTCPPorts = [ 80 443 ]; -} - diff --git a/hosts/ghost/renawiki.nix b/hosts/ghost/renawiki.nix deleted file mode 100644 index 009e06e..0000000 --- a/hosts/ghost/renawiki.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ config, pkgs, inputs, ... }: { - services.mediawiki = { - enable = true; - name = "Rena Wiki"; - - webserver = "nginx"; - nginx.hostName = "renawiki.lelgenio.xyz"; - passwordFile = config.age.secrets.ghost-renawiki.path; - - extensions.VisualEditor = null; - }; - services.nginx.virtualHosts."renawiki.lelgenio.xyz" = { - enableACME = true; - forceSSL = true; - }; - - age.secrets.ghost-renawiki = { - file = ../../secrets/ghost-renawiki.age; - mode = "400"; - owner = "mediawiki"; - }; -} - diff --git a/hosts/ghost/syncthing.nix b/hosts/ghost/syncthing.nix deleted file mode 100644 index a971b86..0000000 --- a/hosts/ghost/syncthing.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ config, pkgs, inputs, ... }: { - - services.syncthing = { - enable = true; - dataDir = "/var/lib/syncthing-data"; - guiAddress = "0.0.0.0:8384"; - openDefaultPorts = true; - }; - - services.nginx.virtualHosts."syncthing.lelgenio.xyz" = { - enableACME = true; - forceSSL = true; - locations."/" = { - proxyPass = "http://127.0.0.1:8384"; - extraConfig = - # required when the target is also TLS server with multiple hosts - "proxy_ssl_server_name on;" + - # required when the server wants to use HTTP Authentication - "proxy_pass_header Authorization;" - ; - }; - }; -} - diff --git a/hosts/ghost/users.nix b/hosts/ghost/users.nix deleted file mode 100644 index 5cc853a..0000000 --- a/hosts/ghost/users.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ pkgs, ... }: { - security.rtkit.enable = true; - services.openssh = { - enable = true; - ports = [ 9022 ]; - settings = { - PasswordAuthentication = false; - KbdInteractiveAuthentication = false; - }; - }; - - # Define a user account. Don't forget to set a password with ‘passwd’. - users.mutableUsers = false; - users.users.lelgenio = { - isNormalUser = true; - description = "Leonardo Eugênio"; - hashedPassword = "$y$j9T$0e/rczjOVCy7PuwC3pG0V/$gTHZhfO4wQSlFvbDyfghbCnGI2uDI0a52zSrQ/yOA5A"; - extraGroups = [ "networkmanager" "wheel" "docker" "adbusers" "bluetooth" "corectrl" "vboxusers" ]; - shell = pkgs.fish; - openssh.authorizedKeys.keys = [ - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxR/w+38b2lX90yNBqhq3mUmkn1WGu6GAPhN1tVp2ZjYRJNV/+5gWCnTtOWYtDx35HmK/spQ2Qy8X9ttkzORa24fysNx1Iqn/TiXhD7eIJjbGPnrOpIKTkW5/uB3SD/P5NBSa06//BaqJU4sBlG79hoXRpod052hQtdpTVDiMCIV+iboWPKqopmJJfWdBtVnHXs9rep0htPRExxGslImFk7Z6xjcaHyCpIQZPlOGf+sGsmUU7jRqzvZFV8ucIdbnAlMHrU4pepNFhuraESyZVTa/bi9sw0iozXp5Q5+5thMebEslmT1Z771kI4sieDy+O4r8c0Sx2/VY1UAzcpq1faggc3YB01MTh+tiEC6xdMvZLrQGL1NBWjHleMyL53GU5ERluC0vXJF3Hv3BGGBDfXWbrEm5n06DHr2apRVJGC0LwiQ7Woud1X4V4X1pKSusxCVMjT2lmcOwV6YhKhB2sowJc1OdMx4+tL0UWE+YKSZgBHfolwk6ml0F4EO9nnUHc= lelgenio@i15" - ]; - }; - users.users.root = { - shell = pkgs.fish; - openssh.authorizedKeys.keys = [ - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxR/w+38b2lX90yNBqhq3mUmkn1WGu6GAPhN1tVp2ZjYRJNV/+5gWCnTtOWYtDx35HmK/spQ2Qy8X9ttkzORa24fysNx1Iqn/TiXhD7eIJjbGPnrOpIKTkW5/uB3SD/P5NBSa06//BaqJU4sBlG79hoXRpod052hQtdpTVDiMCIV+iboWPKqopmJJfWdBtVnHXs9rep0htPRExxGslImFk7Z6xjcaHyCpIQZPlOGf+sGsmUU7jRqzvZFV8ucIdbnAlMHrU4pepNFhuraESyZVTa/bi9sw0iozXp5Q5+5thMebEslmT1Z771kI4sieDy+O4r8c0Sx2/VY1UAzcpq1faggc3YB01MTh+tiEC6xdMvZLrQGL1NBWjHleMyL53GU5ERluC0vXJF3Hv3BGGBDfXWbrEm5n06DHr2apRVJGC0LwiQ7Woud1X4V4X1pKSusxCVMjT2lmcOwV6YhKhB2sowJc1OdMx4+tL0UWE+YKSZgBHfolwk6ml0F4EO9nnUHc= lelgenio@i15" - ]; - initialHashedPassword = "$y$j9T$E3aBBSSq0Gma8hZD9L7ov0$iCGDW4fqrXWfHO0qodBYYgMFA9CpIraoklHcPbJJrM3"; - }; - security.sudo.wheelNeedsPassword = false; - - programs.fish.enable = true; - - environment.systemPackages = with pkgs; [ - git - ]; -} diff --git a/hosts/ghost/writefreely.nix b/hosts/ghost/writefreely.nix deleted file mode 100644 index b5cee3b..0000000 --- a/hosts/ghost/writefreely.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ config, pkgs, inputs, ... }: { - services.writefreely = { - enable = true; - acme.enable = true; - nginx.enable = true; - nginx.forceSSL = true; - host = "blog.lelgenio.xyz"; - admin.name = "lelgenio"; - admin.initialPasswordFile = config.age.secrets.ghost-writefreely.path; - settings.app = { - site_name = "Leo's blog"; - single_user = true; - }; - }; - - age = { - secrets.ghost-writefreely = { - file = ../../secrets/ghost-writefreely.age; - mode = "400"; - owner = "writefreely"; - group = "writefreely"; - }; - }; -} - diff --git a/user/ssh.nix b/user/ssh.nix index a4f2b47..a29dded 100644 --- a/user/ssh.nix +++ b/user/ssh.nix @@ -9,11 +9,6 @@ in { hostname = "lelgenio.1337.cx"; port = 9022; }; - ghost = { - user = "root"; - hostname = "ghost.lelgenio.xyz"; - port = 9022; - }; phantom = { user = "root"; hostname = "phantom.lelgenio.xyz"; From f8976807755f2ac7d288eae2a523ab8034afbf81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 29 Mar 2024 01:08:21 -0300 Subject: [PATCH 051/404] secrets: rename ghost secrets to phantom --- hosts/phantom/nextcloud.nix | 6 +++--- hosts/phantom/renawiki.nix | 6 +++--- hosts/phantom/writefreely.nix | 6 +++--- .../{ghost-nextcloud.age => phantom-nextcloud.age} | 0 .../{ghost-renawiki.age => phantom-renawiki.age} | 0 ...host-writefreely.age => phantom-writefreely.age} | Bin secrets/secrets.nix | 6 +++--- 7 files changed, 12 insertions(+), 12 deletions(-) rename secrets/{ghost-nextcloud.age => phantom-nextcloud.age} (100%) rename secrets/{ghost-renawiki.age => phantom-renawiki.age} (100%) rename secrets/{ghost-writefreely.age => phantom-writefreely.age} (100%) diff --git a/hosts/phantom/nextcloud.nix b/hosts/phantom/nextcloud.nix index db6b04c..52421f2 100644 --- a/hosts/phantom/nextcloud.nix +++ b/hosts/phantom/nextcloud.nix @@ -5,13 +5,13 @@ hostName = "cloud.lelgenio.xyz"; https = true; config = { - adminpassFile = config.age.secrets.ghost-nextcloud.path; + adminpassFile = config.age.secrets.phantom-nextcloud.path; }; }; age = { - secrets.ghost-nextcloud = { - file = ../../secrets/ghost-nextcloud.age; + secrets.phantom-nextcloud = { + file = ../../secrets/phantom-nextcloud.age; mode = "400"; owner = "nextcloud"; group = "nextcloud"; diff --git a/hosts/phantom/renawiki.nix b/hosts/phantom/renawiki.nix index 009e06e..5b21907 100644 --- a/hosts/phantom/renawiki.nix +++ b/hosts/phantom/renawiki.nix @@ -5,7 +5,7 @@ webserver = "nginx"; nginx.hostName = "renawiki.lelgenio.xyz"; - passwordFile = config.age.secrets.ghost-renawiki.path; + passwordFile = config.age.secrets.phantom-renawiki.path; extensions.VisualEditor = null; }; @@ -14,8 +14,8 @@ forceSSL = true; }; - age.secrets.ghost-renawiki = { - file = ../../secrets/ghost-renawiki.age; + age.secrets.phantom-renawiki = { + file = ../../secrets/phantom-renawiki.age; mode = "400"; owner = "mediawiki"; }; diff --git a/hosts/phantom/writefreely.nix b/hosts/phantom/writefreely.nix index b5cee3b..6a2652e 100644 --- a/hosts/phantom/writefreely.nix +++ b/hosts/phantom/writefreely.nix @@ -6,7 +6,7 @@ nginx.forceSSL = true; host = "blog.lelgenio.xyz"; admin.name = "lelgenio"; - admin.initialPasswordFile = config.age.secrets.ghost-writefreely.path; + admin.initialPasswordFile = config.age.secrets.phantom-writefreely.path; settings.app = { site_name = "Leo's blog"; single_user = true; @@ -14,8 +14,8 @@ }; age = { - secrets.ghost-writefreely = { - file = ../../secrets/ghost-writefreely.age; + secrets.phantom-writefreely = { + file = ../../secrets/phantom-writefreely.age; mode = "400"; owner = "writefreely"; group = "writefreely"; diff --git a/secrets/ghost-nextcloud.age b/secrets/phantom-nextcloud.age similarity index 100% rename from secrets/ghost-nextcloud.age rename to secrets/phantom-nextcloud.age diff --git a/secrets/ghost-renawiki.age b/secrets/phantom-renawiki.age similarity index 100% rename from secrets/ghost-renawiki.age rename to secrets/phantom-renawiki.age diff --git a/secrets/ghost-writefreely.age b/secrets/phantom-writefreely.age similarity index 100% rename from secrets/ghost-writefreely.age rename to secrets/phantom-writefreely.age diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 01af754..9bc7c27 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -7,7 +7,7 @@ in "gitlab-runner-thoreb-telemetria-registrationConfigFile.age".publicKeys = [ main_ssh_public_key ]; "lelgenio-cachix.age".publicKeys = [ main_ssh_public_key ]; "monolith-nix-serve-privkey.age".publicKeys = [ main_ssh_public_key ]; - "ghost-nextcloud.age".publicKeys = [ main_ssh_public_key ]; - "ghost-writefreely.age".publicKeys = [ main_ssh_public_key ]; - "ghost-renawiki.age".publicKeys = [ main_ssh_public_key ]; + "phantom-nextcloud.age".publicKeys = [ main_ssh_public_key ]; + "phantom-writefreely.age".publicKeys = [ main_ssh_public_key ]; + "phantom-renawiki.age".publicKeys = [ main_ssh_public_key ]; } From 748a3ba0bab3f7970e94c1870dd398e4a8dce349 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 30 Mar 2024 16:31:48 -0300 Subject: [PATCH 052/404] phantom: disable auto reboots since it's a container --- hosts/phantom/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/phantom/default.nix b/hosts/phantom/default.nix index b56ff10..47b8757 100644 --- a/hosts/phantom/default.nix +++ b/hosts/phantom/default.nix @@ -30,7 +30,6 @@ system.autoUpgrade = { enable = true; dates = "04:40"; - allowReboot = true; operation = "switch"; flags = [ "--update-input" "nixpkgs" "--no-write-lock-file" "-L" ]; flake = "github:lelgenio/nixos-config#phantom"; From 8de573b35cbeb15c1f2cd1b195b55737e5f891ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 1 Apr 2024 11:57:17 -0300 Subject: [PATCH 053/404] pkgs: add blade-formatter --- pkgs/blade-formatter/default.nix | 61 +++++++++++++++ pkgs/blade-formatter/package.json | 120 ++++++++++++++++++++++++++++++ pkgs/default.nix | 1 + user/home.nix | 1 + 4 files changed, 183 insertions(+) create mode 100644 pkgs/blade-formatter/default.nix create mode 100755 pkgs/blade-formatter/package.json diff --git a/pkgs/blade-formatter/default.nix b/pkgs/blade-formatter/default.nix new file mode 100644 index 0000000..adf2d7f --- /dev/null +++ b/pkgs/blade-formatter/default.nix @@ -0,0 +1,61 @@ +{ lib +, mkYarnPackage +, fetchFromGitHub +, fetchYarnDeps +, testers +, writeText +, runCommand +, blade-formatter +}: + +mkYarnPackage rec { + pname = "blade-formatter"; + version = "1.38.2"; + + src = fetchFromGitHub { + owner = "shufo"; + repo = pname; + rev = "v${version}"; + hash = "sha256-JvILLw7Yp4g/dSsYtZ2ylmlXfS9t+2KADlBrYOJWTpg="; + }; + + packageJSON = ./package.json; + offlineCache = fetchYarnDeps { + yarnLock = "${src}/yarn.lock"; + hash = "sha256-UFDxw3fYMzSUhZw+TCEh/dN7OioKI75LzKSnEwGPKDA="; + }; + + postBuild = "yarn build"; + + passthru.tests = { + version = testers.testVersion { + package = blade-formatter; + command = "blade-formatter --version"; + }; + + simple = testers.testEqualContents { + assertion = "blade-formatter formats a basic blade file"; + expected = writeText "expected" '' + @if (true) + Hello world! + @endif + ''; + actual = runCommand "actual" + { + nativeBuildInputs = [ blade-formatter ]; + base = writeText "base" '' + @if( true ) Hello world! @endif + ''; + } '' + blade-formatter $base > $out + ''; + }; + }; + + meta = with lib; { + description = "Laravel Blade template formatter"; + homepage = "https://github.com/shufo/blade-formatter"; + license = licenses.mit; + maintainers = with maintainers; [ lelgenio ]; + }; +} diff --git a/pkgs/blade-formatter/package.json b/pkgs/blade-formatter/package.json new file mode 100755 index 0000000..b43fa5c --- /dev/null +++ b/pkgs/blade-formatter/package.json @@ -0,0 +1,120 @@ +{ + "name": "blade-formatter", + "engines": { + "node": ">= 14.0.0" + }, + "keywords": [ + "php", + "formatter", + "laravel" + ], + "version": "1.38.2", + "description": "An opinionated blade template formatter for Laravel", + "main": "./dist/bundle.cjs", + "types": "./dist/types/main.d.ts", + "type": "module", + "exports": { + ".": { + "import": "./dist/bundle.js", + "require": "./dist/bundle.cjs", + "default": "./dist/bundle.js" + }, + "./*": "./*" + }, + "scripts": { + "build": "cross-env NODE_ENV=production node esbuild.js && cross-env NODE_ENV=production ESM_BUILD=true node esbuild.js", + "prepublish": "tsc src/main.ts --declaration --emitDeclarationOnly --outDir ./dist/types || true", + "watch": "node esbuild.js", + "test": "yarn run build && node --experimental-vm-modules node_modules/.bin/jest", + "lint": "eslint src -c .eslintrc.json --ext ts", + "fix": "prettier {src,__tests__}/**/*.ts --write", + "check_formatted": "prettier **/*.ts -c", + "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0", + "prepare": "husky install", + "bin": "cross-env ./bin/blade-formatter.cjs" + }, + "bin": { + "blade-formatter": "bin/blade-formatter.cjs" + }, + "author": "Shuhei Hayashibara", + "license": "MIT", + "dependencies": { + "@prettier/plugin-php": "^0.19.7", + "@shufo/tailwindcss-class-sorter": "3.0.1", + "aigle": "^1.14.1", + "ajv": "^8.9.0", + "chalk": "^4.1.0", + "concat-stream": "^2.0.0", + "detect-indent": "^6.0.0", + "find-config": "^1.0.0", + "glob": "^8.0.1", + "html-attribute-sorter": "^0.4.3", + "ignore": "^5.1.8", + "js-beautify": "^1.14.8", + "lodash": "^4.17.19", + "php-parser": "3.1.5", + "prettier": "^2.2.0", + "tailwindcss": "^3.1.8", + "vscode-oniguruma": "1.7.0", + "vscode-textmate": "^7.0.1", + "xregexp": "^5.0.1", + "yargs": "^17.3.1" + }, + "devDependencies": { + "@babel/core": "^7.6.4", + "@babel/plugin-transform-modules-commonjs": "^7.16.5", + "@babel/preset-env": "^7.13.12", + "@babel/preset-typescript": "^7.16.5", + "@types/concat-stream": "^2.0.0", + "@types/find-config": "^1.0.1", + "@types/fs-extra": "^11.0.0", + "@types/glob": "^8.0.0", + "@types/jest": "^29.0.0", + "@types/js-beautify": "^1.13.3", + "@types/lodash": "^4.14.178", + "@types/mocha": "^10.0.0", + "@types/node": "^18.0.0", + "@types/xregexp": "^4.4.0", + "@typescript-eslint/eslint-plugin": "^5.8.1", + "@typescript-eslint/parser": "^5.8.1", + "app-root-path": "^3.0.0", + "babel-jest": "^29.0.0", + "codecov": "^3.8.3", + "cross-env": "^7.0.3", + "esbuild": "^0.19.0", + "esbuild-node-externals": "^1.4.1", + "eslint": "^8.5.0", + "eslint-config-airbnb-base": "^15.0.0", + "eslint-config-airbnb-typescript": "^17.0.0", + "eslint-config-prettier": "^9.0.0", + "eslint-import-resolver-typescript": "^3.0.0", + "eslint-plugin-import": "^2.25.3", + "eslint-plugin-jest": "^26.0.0", + "eslint-plugin-prettier": "^5.0.0", + "fs-extra": "^11.0.0", + "husky": "^8.0.0", + "jest": "^29.0.0", + "lint-staged": ">=10", + "source-map-loader": "^4.0.0", + "ts-jest": "^29.0.0", + "ts-loader": "^9.2.6", + "ts-migrate": "^0.1.27", + "ts-node": "^10.4.0", + "typescript": "^5.0.0" + }, + "repository": { + "type": "git", + "url": "https://github.com/shufo/blade-formatter.git" + }, + "files": [ + "dist", + "src", + "bin", + "wasm", + "syntaxes", + "CHANGELOG.md" + ], + "lint-staged": { + "*.ts": "yarn run fix" + } +} diff --git a/pkgs/default.nix b/pkgs/default.nix index ec52a1c..0fdc3eb 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -2,6 +2,7 @@ # You can build them using 'nix build .#example' or (legacy) 'nix-build -A example' { pkgs, inputs }: { + blade-formatter = pkgs.callPackage ./blade-formatter { }; cargo-checkmate = pkgs.callPackage ./cargo-checkmate.nix { }; lipsum = pkgs.callPackage ./lipsum.nix { inherit inputs; }; emmet-cli = pkgs.callPackage ./emmet-cli.nix { }; diff --git a/user/home.nix b/user/home.nix index 36bb40f..b1e46ae 100644 --- a/user/home.nix +++ b/user/home.nix @@ -125,6 +125,7 @@ clang-tools # c/c++ lsp server rust-analyzer # rust analyzer + blade-formatter nixpkgs-fmt ]; From 9aaa304d2a2e96b0664541a7bd1c75b6c789c1f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 6 Apr 2024 20:38:35 -0300 Subject: [PATCH 054/404] phantom: add forgejo server --- hosts/phantom/default.nix | 1 + hosts/phantom/email.nix | 10 +++- hosts/phantom/forgejo.nix | 56 ++++++++++++++++++++ hosts/phantom/users.nix | 2 +- secrets/phantom-forgejo-mailer-password.age | Bin 0 -> 678 bytes secrets/secrets.nix | 1 + system/secrets.nix | 2 + 7 files changed, 70 insertions(+), 2 deletions(-) create mode 100644 hosts/phantom/forgejo.nix create mode 100644 secrets/phantom-forgejo-mailer-password.age diff --git a/hosts/phantom/default.nix b/hosts/phantom/default.nix index 47b8757..782b783 100644 --- a/hosts/phantom/default.nix +++ b/hosts/phantom/default.nix @@ -12,6 +12,7 @@ ./writefreely.nix ./renawiki.nix ./email.nix + ./forgejo.nix ]; # # Enable networking diff --git a/hosts/phantom/email.nix b/hosts/phantom/email.nix index 8d3021b..fbe33d7 100644 --- a/hosts/phantom/email.nix +++ b/hosts/phantom/email.nix @@ -9,13 +9,21 @@ mailserver = { enable = true; fqdn = "mail.lelgenio.xyz"; - domains = [ "lelgenio.xyz" ]; + domains = [ + "lelgenio.xyz" + "git.lelgenio.xyz" + ]; certificateScheme = "acme-nginx"; + # Create passwords with + # nix-shell -p mkpasswd --run 'mkpasswd -sm bcrypt' loginAccounts = { "lelgenio@lelgenio.xyz" = { hashedPassword = "$2y$05$z5s7QCXcs5uTFsfyYpwNJeWzb3RmzgWxNgcPCr0zjSytkLFF/qZmS"; aliases = [ "postmaster@lelgenio.xyz" ]; }; + "noreply@git.lelgenio.xyz" = { + hashedPassword = "$2b$05$TmR1R7ZwXfec7yrOfeBL7u3ZtyXf0up5dEO6uMWSvb/O7LPEm.j0."; + }; }; }; diff --git a/hosts/phantom/forgejo.nix b/hosts/phantom/forgejo.nix new file mode 100644 index 0000000..94b7169 --- /dev/null +++ b/hosts/phantom/forgejo.nix @@ -0,0 +1,56 @@ +{ lib, pkgs, config, ... }: +let + cfg = config.services.forgejo; + srv = cfg.settings.server; +in +{ + services.nginx = { + virtualHosts.${cfg.settings.server.DOMAIN} = { + forceSSL = true; + enableACME = true; + extraConfig = '' + client_max_body_size 512M; + ''; + locations."/".proxyPass = "http://localhost:${toString srv.HTTP_PORT}"; + }; + }; + + services.openssh = { + authorizedKeysFiles = [ + "${config.services.forgejo.stateDir}/.ssh/authorized_keys" + ]; + # Recommended by forgejo: https://forgejo.org/docs/latest/admin/recommendations/#git-over-ssh + settings.AcceptEnv = "GIT_PROTOCOL"; + }; + + services.forgejo = { + enable = true; + database.type = "postgres"; + lfs.enable = true; + settings = { + service.DISABLE_REGISTRATION = true; + actions = { + ENABLED = true; + DEFAULT_ACTIONS_URL = "github"; + }; + server = { + DOMAIN = "git.lelgenio.xyz"; + HTTP_PORT = 3000; + ROOT_URL = "https://${srv.DOMAIN}/"; + }; + mailer = { + ENABLED = true; + SMTP_ADDR = "mail.lelgenio.xyz"; + FROM = "noreply@git.lelgenio.xyz"; + USER = "noreply@git.lelgenio.xyz"; + }; + }; + mailerPasswordFile = config.age.secrets.phantom-forgejo-mailer-password.path; + }; + + age.secrets.phantom-forgejo-mailer-password = { + file = ../../secrets/phantom-forgejo-mailer-password.age; + mode = "400"; + owner = "forgejo"; + }; +} diff --git a/hosts/phantom/users.nix b/hosts/phantom/users.nix index 5cc853a..75aee27 100644 --- a/hosts/phantom/users.nix +++ b/hosts/phantom/users.nix @@ -2,7 +2,7 @@ security.rtkit.enable = true; services.openssh = { enable = true; - ports = [ 9022 ]; + ports = [ 9022 22 ]; settings = { PasswordAuthentication = false; KbdInteractiveAuthentication = false; diff --git a/secrets/phantom-forgejo-mailer-password.age b/secrets/phantom-forgejo-mailer-password.age new file mode 100644 index 0000000000000000000000000000000000000000..90fbe735e74103886baaf56a7bef66d16e8233ab GIT binary patch literal 678 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!*`Do#{zDlf0_Nau2MH1kaM@bJw@ z)VDDAur#W2_VCJd3(_|UDlsw-4U901a?ZnDN0JO^zy0TN)5CuHcStwu=MiI%+RikbW6#~@N|jtFb+s@)6OW)$_Vo` zt+4d3aL$QxiS)>c@HES}wA9Z}^>Po-bu16d;fe~$GssB_H}S}EDRDOOF7x$BjkGMv zcCJkH4Nh@R4{>vka4R)SNvkOJjIyZ8cCs)u@Cm92N-;?C3y*O3N#Y9iGpO=1j0iEQ z$}G$b2`)4>F)DM;%5w@7mf4KyxuD)KH1NlWrGHTDYf z%gyFW@(N2zEe#LJjB=^)Pc1SIcghWL4$Zglj!dnnFiy_Q^zpCA3^XY*&rb>W^EEf| zjqnU9a5eA_sBkawE-EnPvh?@NPjpKyH%Kz{3Aao(cD2kfa(DKw$TTSR)z|kl_Hywl zFDP^~4)HZE3XdocOp2m_D#+y3<^)PFfH&2HFV|LcK#-FG{c_ Date: Sat, 6 Apr 2024 20:38:46 -0300 Subject: [PATCH 055/404] mastodon: clean up media more often --- hosts/phantom/mastodon.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/phantom/mastodon.nix b/hosts/phantom/mastodon.nix index 3e629d7..adfaf0d 100644 --- a/hosts/phantom/mastodon.nix +++ b/hosts/phantom/mastodon.nix @@ -6,5 +6,6 @@ smtp.fromAddress = "lelgenio@disroot.org"; streamingProcesses = 2; extraConfig.SINGLE_USER_MODE = "true"; + mediaAutoRemove.olderThanDays = 10; }; } From 1b2d1eaa74988efe75ae326d39f10ff68289b2d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 6 Apr 2024 20:44:20 -0300 Subject: [PATCH 056/404] phantom: add script to update, fmt --- hosts/phantom/vpsadminos.nix | 5 +++-- switch-phantom | 12 ++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100755 switch-phantom diff --git a/hosts/phantom/vpsadminos.nix b/hosts/phantom/vpsadminos.nix index 070017e..40401cd 100644 --- a/hosts/phantom/vpsadminos.nix +++ b/hosts/phantom/vpsadminos.nix @@ -13,7 +13,8 @@ let "1.1.1.1" "2606:4700:4700::1111" ]; -in { +in +{ networking.nameservers = mkDefault nameservers; services.resolved = mkDefault { fallbackDns = nameservers; }; networking.dhcpcd.extraConfig = "noipv4ll"; @@ -21,7 +22,7 @@ in { systemd.services.systemd-sysctl.enable = false; systemd.services.systemd-oomd.enable = false; systemd.sockets."systemd-journald-audit".enable = false; - systemd.mounts = [ {where = "/sys/kernel/debug"; enable = false;} ]; + systemd.mounts = [{ where = "/sys/kernel/debug"; enable = false; }]; systemd.services.rpc-gssd.enable = false; # Due to our restrictions in /sys, the default systemd-udev-trigger fails diff --git a/switch-phantom b/switch-phantom new file mode 100755 index 0000000..c824b0c --- /dev/null +++ b/switch-phantom @@ -0,0 +1,12 @@ +#!/bin/sh + +nix fmt + +git diff + +nixos-rebuild switch --flake .#phantom \ + --update-input nixpkgs \ + --no-write-lock-file \ + --build-host phantom \ + --target-host phantom \ + "$@" From ea470aff07bf57be027e549845c49b3726f8a9ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 6 Apr 2024 23:41:34 -0300 Subject: [PATCH 057/404] forgejo: remove unnecessary ssh configuration --- hosts/phantom/forgejo.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/hosts/phantom/forgejo.nix b/hosts/phantom/forgejo.nix index 94b7169..4e6327b 100644 --- a/hosts/phantom/forgejo.nix +++ b/hosts/phantom/forgejo.nix @@ -15,14 +15,6 @@ in }; }; - services.openssh = { - authorizedKeysFiles = [ - "${config.services.forgejo.stateDir}/.ssh/authorized_keys" - ]; - # Recommended by forgejo: https://forgejo.org/docs/latest/admin/recommendations/#git-over-ssh - settings.AcceptEnv = "GIT_PROTOCOL"; - }; - services.forgejo = { enable = true; database.type = "postgres"; From 9b9b33d791d164c6fbdd1c8bfca600d8895d5fed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sun, 7 Apr 2024 02:48:07 -0300 Subject: [PATCH 058/404] pass: Update password-store repository --- user/pass.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/pass.nix b/user/pass.nix index 365706c..e17b62a 100644 --- a/user/pass.nix +++ b/user/pass.nix @@ -11,7 +11,7 @@ git-sync = { enable = true; repositories.password-store = { - uri = "git@git.disroot.org:lelgenio/password-store"; + uri = "forgejo@lelgenio.xyz:lelgenio/password-store"; path = toString config.programs.password-store.settings.PASSWORD_STORE_DIR; }; }; From e3f16867b8db819df25a5bed8f7a6a79a84fca1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 8 Apr 2024 22:14:06 -0300 Subject: [PATCH 059/404] email: add roundcube archive plugin --- hosts/phantom/email.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/phantom/email.nix b/hosts/phantom/email.nix index fbe33d7..05be3a0 100644 --- a/hosts/phantom/email.nix +++ b/hosts/phantom/email.nix @@ -36,7 +36,7 @@ $config['smtp_host'] = "tls://${hostName}:587"; $config['smtp_user'] = "%u"; $config['smtp_pass'] = "%p"; - $config['plugins'] = [ "carddav" ]; + $config['plugins'] = [ "carddav", "archive" ]; ''; }; From a25affacb8e9699f2cd07f2fa95504f7c6492a15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 8 Apr 2024 22:48:02 -0300 Subject: [PATCH 060/404] email: fix fqdn --- hosts/phantom/email.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/phantom/email.nix b/hosts/phantom/email.nix index 05be3a0..d56a946 100644 --- a/hosts/phantom/email.nix +++ b/hosts/phantom/email.nix @@ -8,7 +8,7 @@ mailserver = { enable = true; - fqdn = "mail.lelgenio.xyz"; + fqdn = "lelgenio.xyz"; domains = [ "lelgenio.xyz" "git.lelgenio.xyz" From 808216eccf37a80d6842691caff594de9287556b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 8 Apr 2024 23:38:49 -0300 Subject: [PATCH 061/404] nextcloud: fix ssl certificates --- hosts/phantom/nextcloud.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hosts/phantom/nextcloud.nix b/hosts/phantom/nextcloud.nix index 52421f2..5bddece 100644 --- a/hosts/phantom/nextcloud.nix +++ b/hosts/phantom/nextcloud.nix @@ -9,6 +9,11 @@ }; }; + services.nginx.virtualHosts.${config.services.nextcloud.hostName} = { + forceSSL = true; + enableACME = true; + }; + age = { secrets.phantom-nextcloud = { file = ../../secrets/phantom-nextcloud.age; From b568a17c96d9c20df179f2f110ba6f8232e0483f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Tue, 9 Apr 2024 00:42:40 -0300 Subject: [PATCH 062/404] phantom: add a top level domain page --- hosts/phantom/default.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/hosts/phantom/default.nix b/hosts/phantom/default.nix index 782b783..9cb639f 100644 --- a/hosts/phantom/default.nix +++ b/hosts/phantom/default.nix @@ -15,6 +15,24 @@ ./forgejo.nix ]; + services.nginx.virtualHosts."lelgenio.xyz" = { + enableACME = true; + forceSSL = true; + root = pkgs.runCommand "www-dir" { } '' + mkdir -p $out + cat > $out/index.html < + + +

+ Nothing to see here! +

+ + + EOF + ''; + }; + # # Enable networking # networking.networkmanager.enable = true; # Set your time zone. From a9d3bf78ebf0898b70c46c60b626deefb96efecd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Tue, 9 Apr 2024 00:53:22 -0300 Subject: [PATCH 063/404] phantom: use personal git forge as autoUpdate source --- flake.lock | 12 ++++++------ flake.nix | 2 +- hosts/phantom/default.nix | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index 8f9720a..f25a618 100644 --- a/flake.lock +++ b/flake.lock @@ -1202,15 +1202,15 @@ "locked": { "lastModified": 1684504342, "narHash": "sha256-rJ0eH7BuPizvXPc+LjVtovse4gWEuxP2WiyNdXjPNL4=", - "owner": "lelgenio", - "repo": "tlauncher-nix", + "ref": "refs/heads/main", "rev": "add4df7220bd0b85177a1938c02b60c966c5eb71", - "type": "github" + "revCount": 3, + "type": "git", + "url": "https://git.lelgenio.xyz/lelgenio/tlauncher-nix" }, "original": { - "owner": "lelgenio", - "repo": "tlauncher-nix", - "type": "github" + "type": "git", + "url": "https://git.lelgenio.xyz/lelgenio/tlauncher-nix" } }, "utils": { diff --git a/flake.nix b/flake.nix index 529b0ee..2b64fb4 100644 --- a/flake.nix +++ b/flake.nix @@ -42,7 +42,7 @@ }; tlauncher = { - url = "github:lelgenio/tlauncher-nix"; + url = "git+https://git.lelgenio.xyz/lelgenio/tlauncher-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/hosts/phantom/default.nix b/hosts/phantom/default.nix index 9cb639f..7bb0fb0 100644 --- a/hosts/phantom/default.nix +++ b/hosts/phantom/default.nix @@ -51,7 +51,7 @@ dates = "04:40"; operation = "switch"; flags = [ "--update-input" "nixpkgs" "--no-write-lock-file" "-L" ]; - flake = "github:lelgenio/nixos-config#phantom"; + flake = "git+https://git.lelgenio.xyz/lelgenio/nixos-config#phantom"; }; system.stateVersion = "23.05"; # Never change this From f849a8de1e7630f485bd13234765ada80e8d9fa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 8 Apr 2024 20:58:45 -0300 Subject: [PATCH 064/404] home: disable nextcloud client --- user/home.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/user/home.nix b/user/home.nix index b1e46ae..d55c77b 100644 --- a/user/home.nix +++ b/user/home.nix @@ -143,11 +143,6 @@ }; programs.bash = { enable = true; }; - services.nextcloud-client = { - enable = true; - startInBackground = true; - }; - xdg.defaultApplications = { enable = true; text-editor = lib.mkDefault "kak.desktop"; From 0ec7b7bf4387f71a30d7e5288401ed297b43d5b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 29 Apr 2024 11:35:57 -0300 Subject: [PATCH 065/404] switch: don't show git diff pager --- switch | 2 +- switch-phantom | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/switch b/switch index 67c08e7..65782ae 100755 --- a/switch +++ b/switch @@ -2,7 +2,7 @@ nix fmt -git diff +git --no-pager diff sudo nice ionice \ nixos-rebuild \ diff --git a/switch-phantom b/switch-phantom index c824b0c..0449f75 100755 --- a/switch-phantom +++ b/switch-phantom @@ -2,7 +2,7 @@ nix fmt -git diff +git --no-pager diff nixos-rebuild switch --flake .#phantom \ --update-input nixpkgs \ From 99e4b713ce5d531985938610a2bc9a2998d0b216 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 3 May 2024 12:32:45 -0300 Subject: [PATCH 066/404] email: disable ipv6 smtp --- hosts/phantom/email.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/hosts/phantom/email.nix b/hosts/phantom/email.nix index d56a946..e778de4 100644 --- a/hosts/phantom/email.nix +++ b/hosts/phantom/email.nix @@ -1,4 +1,4 @@ -{ pkgs, inputs, ... }: { +{ pkgs, inputs, config, ... }: { # It's important to let Digital Ocean set the hostname so we get rDNS to work networking.hostName = ""; @@ -27,13 +27,18 @@ }; }; + # Prefer ipv4 and use main ipv6 to avoid reverse DNS issues + services.postfix.extraConfig = '' + smtp_address_preference = ipv4 + ''; + # Webmail - services.roundcube = rec { + services.roundcube = { enable = true; package = pkgs.roundcube.withPlugins (p: [ p.carddav ]); hostName = "mail.lelgenio.xyz"; extraConfig = '' - $config['smtp_host'] = "tls://${hostName}:587"; + $config['smtp_host'] = "tls://${config.mailserver.fqdn}:587"; $config['smtp_user'] = "%u"; $config['smtp_pass'] = "%p"; $config['plugins'] = [ "carddav", "archive" ]; From 51659f4273251b39b5b4bb19eedf5314ae11c7d0 Mon Sep 17 00:00:00 2001 From: lelgenio Date: Wed, 8 May 2024 16:28:34 -0300 Subject: [PATCH 067/404] kak: name clipboard sync hook --- user/kakoune/hooks.kak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/kakoune/hooks.kak b/user/kakoune/hooks.kak index 7bb3cd2..79d85cc 100644 --- a/user/kakoune/hooks.kak +++ b/user/kakoune/hooks.kak @@ -47,7 +47,7 @@ hook global BufOpenFile .*/COMMIT_EDITMSG %{ hook global RegisterModified '"' %{ nop %sh{ { printf %s "$kak_reg_dquote" | wl-copy -n printf %s "$kak_reg_dquote" | xclip -i -selection clipboard -} > /dev/null 2>&1 < /dev/null & }} +} > /dev/null 2>&1 < /dev/null & }} -group sync-clipboard # Trim trailing whitespace hook global BufWritePre .* %{ try %{ From 731aceb5870f8bafd56d0921838bf19010ab8b10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 11 May 2024 17:47:55 -0300 Subject: [PATCH 068/404] phantom: remove wiki --- hosts/phantom/default.nix | 1 - hosts/phantom/renawiki.nix | 23 ----------------------- 2 files changed, 24 deletions(-) delete mode 100644 hosts/phantom/renawiki.nix diff --git a/hosts/phantom/default.nix b/hosts/phantom/default.nix index 7bb0fb0..919e681 100644 --- a/hosts/phantom/default.nix +++ b/hosts/phantom/default.nix @@ -10,7 +10,6 @@ ./syncthing.nix ./users.nix ./writefreely.nix - ./renawiki.nix ./email.nix ./forgejo.nix ]; diff --git a/hosts/phantom/renawiki.nix b/hosts/phantom/renawiki.nix deleted file mode 100644 index 5b21907..0000000 --- a/hosts/phantom/renawiki.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ config, pkgs, inputs, ... }: { - services.mediawiki = { - enable = true; - name = "Rena Wiki"; - - webserver = "nginx"; - nginx.hostName = "renawiki.lelgenio.xyz"; - passwordFile = config.age.secrets.phantom-renawiki.path; - - extensions.VisualEditor = null; - }; - services.nginx.virtualHosts."renawiki.lelgenio.xyz" = { - enableACME = true; - forceSSL = true; - }; - - age.secrets.phantom-renawiki = { - file = ../../secrets/phantom-renawiki.age; - mode = "400"; - owner = "mediawiki"; - }; -} - From e4745d445d4fd4a282a7035699542df2cea1e0c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 11 May 2024 18:00:19 -0300 Subject: [PATCH 069/404] phantom: move from .xyz to .com --- hosts/phantom/default.nix | 4 ++-- hosts/phantom/email.nix | 13 ++++++++++--- hosts/phantom/forgejo.nix | 8 ++++---- hosts/phantom/mastodon.nix | 2 +- hosts/phantom/nextcloud.nix | 2 +- hosts/phantom/syncthing.nix | 2 +- hosts/phantom/writefreely.nix | 2 +- 7 files changed, 20 insertions(+), 13 deletions(-) diff --git a/hosts/phantom/default.nix b/hosts/phantom/default.nix index 919e681..a0e99b7 100644 --- a/hosts/phantom/default.nix +++ b/hosts/phantom/default.nix @@ -14,7 +14,7 @@ ./forgejo.nix ]; - services.nginx.virtualHosts."lelgenio.xyz" = { + services.nginx.virtualHosts."lelgenio.com" = { enableACME = true; forceSSL = true; root = pkgs.runCommand "www-dir" { } '' @@ -50,7 +50,7 @@ dates = "04:40"; operation = "switch"; flags = [ "--update-input" "nixpkgs" "--no-write-lock-file" "-L" ]; - flake = "git+https://git.lelgenio.xyz/lelgenio/nixos-config#phantom"; + flake = "git+https://git.lelgenio.com/lelgenio/nixos-config#phantom"; }; system.stateVersion = "23.05"; # Never change this diff --git a/hosts/phantom/email.nix b/hosts/phantom/email.nix index e778de4..6c637be 100644 --- a/hosts/phantom/email.nix +++ b/hosts/phantom/email.nix @@ -8,20 +8,27 @@ mailserver = { enable = true; - fqdn = "lelgenio.xyz"; + fqdn = "lelgenio.com"; domains = [ "lelgenio.xyz" "git.lelgenio.xyz" + "lelgenio.com" + "git.lelgenio.com" + "social.lelgenio.com" ]; certificateScheme = "acme-nginx"; # Create passwords with # nix-shell -p mkpasswd --run 'mkpasswd -sm bcrypt' loginAccounts = { + "lelgenio@lelgenio.com" = { + hashedPassword = "$2y$05$z5s7QCXcs5uTFsfyYpwNJeWzb3RmzgWxNgcPCr0zjSytkLFF/qZmS"; + aliases = [ "postmaster@lelgenio.com" ]; + }; "lelgenio@lelgenio.xyz" = { hashedPassword = "$2y$05$z5s7QCXcs5uTFsfyYpwNJeWzb3RmzgWxNgcPCr0zjSytkLFF/qZmS"; aliases = [ "postmaster@lelgenio.xyz" ]; }; - "noreply@git.lelgenio.xyz" = { + "noreply@git.lelgenio.com" = { hashedPassword = "$2b$05$TmR1R7ZwXfec7yrOfeBL7u3ZtyXf0up5dEO6uMWSvb/O7LPEm.j0."; }; }; @@ -36,7 +43,7 @@ services.roundcube = { enable = true; package = pkgs.roundcube.withPlugins (p: [ p.carddav ]); - hostName = "mail.lelgenio.xyz"; + hostName = "mail.lelgenio.com"; extraConfig = '' $config['smtp_host'] = "tls://${config.mailserver.fqdn}:587"; $config['smtp_user'] = "%u"; diff --git a/hosts/phantom/forgejo.nix b/hosts/phantom/forgejo.nix index 4e6327b..61f0a51 100644 --- a/hosts/phantom/forgejo.nix +++ b/hosts/phantom/forgejo.nix @@ -26,15 +26,15 @@ in DEFAULT_ACTIONS_URL = "github"; }; server = { - DOMAIN = "git.lelgenio.xyz"; + DOMAIN = "git.lelgenio.com"; HTTP_PORT = 3000; ROOT_URL = "https://${srv.DOMAIN}/"; }; mailer = { ENABLED = true; - SMTP_ADDR = "mail.lelgenio.xyz"; - FROM = "noreply@git.lelgenio.xyz"; - USER = "noreply@git.lelgenio.xyz"; + SMTP_ADDR = "mail.lelgenio.com"; + FROM = "noreply@git.lelgenio.com"; + USER = "noreply@git.lelgenio.com"; }; }; mailerPasswordFile = config.age.secrets.phantom-forgejo-mailer-password.path; diff --git a/hosts/phantom/mastodon.nix b/hosts/phantom/mastodon.nix index adfaf0d..3deaee5 100644 --- a/hosts/phantom/mastodon.nix +++ b/hosts/phantom/mastodon.nix @@ -2,7 +2,7 @@ services.mastodon = { enable = true; configureNginx = true; - localDomain = "social.lelgenio.xyz"; + localDomain = "social.lelgenio.com"; smtp.fromAddress = "lelgenio@disroot.org"; streamingProcesses = 2; extraConfig.SINGLE_USER_MODE = "true"; diff --git a/hosts/phantom/nextcloud.nix b/hosts/phantom/nextcloud.nix index 5bddece..20c7173 100644 --- a/hosts/phantom/nextcloud.nix +++ b/hosts/phantom/nextcloud.nix @@ -2,7 +2,7 @@ services.nextcloud = { enable = true; package = pkgs.nextcloud27; - hostName = "cloud.lelgenio.xyz"; + hostName = "cloud.lelgenio.com"; https = true; config = { adminpassFile = config.age.secrets.phantom-nextcloud.path; diff --git a/hosts/phantom/syncthing.nix b/hosts/phantom/syncthing.nix index a971b86..55e4cbc 100644 --- a/hosts/phantom/syncthing.nix +++ b/hosts/phantom/syncthing.nix @@ -7,7 +7,7 @@ openDefaultPorts = true; }; - services.nginx.virtualHosts."syncthing.lelgenio.xyz" = { + services.nginx.virtualHosts."syncthing.lelgenio.com" = { enableACME = true; forceSSL = true; locations."/" = { diff --git a/hosts/phantom/writefreely.nix b/hosts/phantom/writefreely.nix index 6a2652e..3530e06 100644 --- a/hosts/phantom/writefreely.nix +++ b/hosts/phantom/writefreely.nix @@ -4,7 +4,7 @@ acme.enable = true; nginx.enable = true; nginx.forceSSL = true; - host = "blog.lelgenio.xyz"; + host = "blog.lelgenio.com"; admin.name = "lelgenio"; admin.initialPasswordFile = config.age.secrets.phantom-writefreely.path; settings.app = { From 418a142f15f7650929a1b3bffdaf348e3ba2f470 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 11 May 2024 18:32:05 -0300 Subject: [PATCH 070/404] mastodon: configure noreply email --- hosts/phantom/email.nix | 3 +++ hosts/phantom/mastodon.nix | 14 +++++++++++++- secrets/phantom-mastodon-mailer-password.age | 13 +++++++++++++ secrets/secrets.nix | 1 + 4 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 secrets/phantom-mastodon-mailer-password.age diff --git a/hosts/phantom/email.nix b/hosts/phantom/email.nix index 6c637be..e0a135e 100644 --- a/hosts/phantom/email.nix +++ b/hosts/phantom/email.nix @@ -31,6 +31,9 @@ "noreply@git.lelgenio.com" = { hashedPassword = "$2b$05$TmR1R7ZwXfec7yrOfeBL7u3ZtyXf0up5dEO6uMWSvb/O7LPEm.j0."; }; + "noreply@social.lelgenio.com" = { + hashedPassword = "$2b$05$DcA9xMdvHqqQMZw2.zybI.vfKsQAJtaQ/JB.t9AHu6psstWq97m2C"; + }; }; }; diff --git a/hosts/phantom/mastodon.nix b/hosts/phantom/mastodon.nix index 3deaee5..9d15d6b 100644 --- a/hosts/phantom/mastodon.nix +++ b/hosts/phantom/mastodon.nix @@ -3,9 +3,21 @@ enable = true; configureNginx = true; localDomain = "social.lelgenio.com"; - smtp.fromAddress = "lelgenio@disroot.org"; + smtp = { + authenticate = true; + host = "lelgenio.com"; + fromAddress = "noreply@social.lelgenio.com"; + user = "noreply@social.lelgenio.com"; + passwordFile = config.age.secrets.phantom-mastodon-mailer-password.path; + }; streamingProcesses = 2; extraConfig.SINGLE_USER_MODE = "true"; mediaAutoRemove.olderThanDays = 10; }; + + age.secrets.phantom-mastodon-mailer-password = { + file = ../../secrets/phantom-mastodon-mailer-password.age; + mode = "400"; + owner = "mastodon"; + }; } diff --git a/secrets/phantom-mastodon-mailer-password.age b/secrets/phantom-mastodon-mailer-password.age new file mode 100644 index 0000000..37232fb --- /dev/null +++ b/secrets/phantom-mastodon-mailer-password.age @@ -0,0 +1,13 @@ +age-encryption.org/v1 +-> ssh-rsa BwwxHg +Mnc+/tJ0QqxHkg2nl9gEkz5Oj1RgxtOZnD5gRv66ISUOqZhNm1+F+xVEdKn843/q +/WzH0f1cTF9NXP8vIaEo//bMmp50obJAd+JNovJxV+0gb9L55Nu7ayvK+eyk6j5n +eb8TxUnwh5BPkEyc6akDh/O49GXzLlVoFD6Ik/0f3YCqUDNAYOl2bsssXtevCeK/ +WEPoCFGhZfNUrOo/0eAhiujZZ5zVb0CWNqXi8VTe2eWOE20VJULcN13TEyO3ZePx +bAPBmDfS5GgGlV4INWxVLaIMDrzlm0tYozbBNNUbdLFFOhIOrgvay9RWxdk0u2hJ +MPKoKsJ96EFxrbZJdS0W7a+aZk/Q3A3Civ2rtPx+5UANhmlY8e1lUHa26e1vA4K7 +ApoMtDyCbuZ9FbLurwl9zO64wWP68aKzuyKOIw+wpy41NQ/PcViSY8KNG9Pt7A2N +CcOkByx+rwz+JdNHbOF8O4FFG4fNSWn7SvVtu5ymGgVi1bOd8PdJpjDR+6Is0SX7 + +--- DHNyITb7ZseEV58MOD/zHeH5vff0hhlbKg27rlYECGk +J Date: Tue, 14 May 2024 16:56:09 -0300 Subject: [PATCH 071/404] nginx: add .xyz -> .com redirect --- hosts/phantom/nginx.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/hosts/phantom/nginx.nix b/hosts/phantom/nginx.nix index 08ece70..f0aea0e 100644 --- a/hosts/phantom/nginx.nix +++ b/hosts/phantom/nginx.nix @@ -1,10 +1,23 @@ -{ config, pkgs, inputs, ... }: { +{ config, pkgs, lib, ... }: { services.nginx = { enable = true; recommendedProxySettings = true; recommendedTlsSettings = true; + recommendedOptimisation = true; + recommendedGzipSettings = true; }; + # Redirect *lelgenio.xyz -> *lelgenio.com + services.nginx.virtualHosts = lib.mapAttrs' + (key: value: lib.nameValuePair "${key}lelgenio.xyz" value) + ( + lib.genAttrs [ "" "social." "blog." "cloud." "mail." ] (name: { + enableACME = true; + forceSSL = true; + locations."/".return = "301 $scheme://${name}lelgenio.com$request_uri"; + }) + ); + security.acme = { acceptTerms = true; defaults.email = "lelgenio@disroot.org"; From bc73f786fc665f5fcc1f44f80937968cc85779e0 Mon Sep 17 00:00:00 2001 From: lelgenio Date: Wed, 15 May 2024 15:52:48 -0300 Subject: [PATCH 072/404] nginx: redirect git. to .com --- hosts/phantom/nginx.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/phantom/nginx.nix b/hosts/phantom/nginx.nix index f0aea0e..f1fff66 100644 --- a/hosts/phantom/nginx.nix +++ b/hosts/phantom/nginx.nix @@ -11,7 +11,7 @@ services.nginx.virtualHosts = lib.mapAttrs' (key: value: lib.nameValuePair "${key}lelgenio.xyz" value) ( - lib.genAttrs [ "" "social." "blog." "cloud." "mail." ] (name: { + lib.genAttrs [ "" "social." "blog." "cloud." "mail." "git." ] (name: { enableACME = true; forceSSL = true; locations."/".return = "301 $scheme://${name}lelgenio.com$request_uri"; From 9fdcd8c2ea7bcb795219b1f660ed6f5bf74007c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 16 May 2024 11:19:02 -0300 Subject: [PATCH 073/404] nginx: redirect syncthing. to .com --- hosts/phantom/nginx.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/phantom/nginx.nix b/hosts/phantom/nginx.nix index f1fff66..8692134 100644 --- a/hosts/phantom/nginx.nix +++ b/hosts/phantom/nginx.nix @@ -11,7 +11,7 @@ services.nginx.virtualHosts = lib.mapAttrs' (key: value: lib.nameValuePair "${key}lelgenio.xyz" value) ( - lib.genAttrs [ "" "social." "blog." "cloud." "mail." "git." ] (name: { + lib.genAttrs [ "" "social." "blog." "cloud." "mail." "git." "syncthing." ] (name: { enableACME = true; forceSSL = true; locations."/".return = "301 $scheme://${name}lelgenio.com$request_uri"; From 2f63fe02cbda818b7234c02717cc7d084df370f5 Mon Sep 17 00:00:00 2001 From: lelgenio Date: Mon, 20 May 2024 16:07:05 -0300 Subject: [PATCH 074/404] phantom: open port 8745 --- hosts/phantom/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/phantom/default.nix b/hosts/phantom/default.nix index a0e99b7..32d5544 100644 --- a/hosts/phantom/default.nix +++ b/hosts/phantom/default.nix @@ -53,6 +53,8 @@ flake = "git+https://git.lelgenio.com/lelgenio/nixos-config#phantom"; }; + networking.firewall.allowedTCPPorts = [ 8745 ]; + system.stateVersion = "23.05"; # Never change this } From 40a7fba202b9ea0dbbd383b61c0c86867c0b2d95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Tue, 28 May 2024 01:46:54 -0300 Subject: [PATCH 075/404] vscode: update config --- user/vscode/settings.json | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/user/vscode/settings.json b/user/vscode/settings.json index 9ac0729..2ff41eb 100644 --- a/user/vscode/settings.json +++ b/user/vscode/settings.json @@ -9,4 +9,18 @@ "git.confirmSync": false, "editor.suggest.snippetsPreventQuickSuggestions": false, "update.mode": "none", -} \ No newline at end of file + "intelephense.files.exclude": [ + "**/.git/**", + "**/.svn/**", + "**/.hg/**", + "**/CVS/**", + "**/.DS_Store/**", + "**/node_modules/**", + "**/bower_components/**", + "**/vendor/**/{Tests,tests}/**", + "**/.history/**", + "**/vendor/**/vendor/**", + "**/.direnv/**" + ], + "intelephense.format.braces": "k&r", +} From da704bbf822a9a5dbb00fcaf973a4347da83f585 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 31 May 2024 11:40:43 -0300 Subject: [PATCH 076/404] email: add aliases --- hosts/phantom/email.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/hosts/phantom/email.nix b/hosts/phantom/email.nix index e0a135e..a34780a 100644 --- a/hosts/phantom/email.nix +++ b/hosts/phantom/email.nix @@ -22,11 +22,7 @@ loginAccounts = { "lelgenio@lelgenio.com" = { hashedPassword = "$2y$05$z5s7QCXcs5uTFsfyYpwNJeWzb3RmzgWxNgcPCr0zjSytkLFF/qZmS"; - aliases = [ "postmaster@lelgenio.com" ]; - }; - "lelgenio@lelgenio.xyz" = { - hashedPassword = "$2y$05$z5s7QCXcs5uTFsfyYpwNJeWzb3RmzgWxNgcPCr0zjSytkLFF/qZmS"; - aliases = [ "postmaster@lelgenio.xyz" ]; + aliases = [ "postmaster@lelgenio.com" "lelgenio@lelgenio.xyz" "lelgenio@lelgenio.xyz" ]; }; "noreply@git.lelgenio.com" = { hashedPassword = "$2b$05$TmR1R7ZwXfec7yrOfeBL7u3ZtyXf0up5dEO6uMWSvb/O7LPEm.j0."; From 2523e5814aabd647144ba2c125a7700989b4091a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 9 Dec 2023 12:10:14 -0300 Subject: [PATCH 077/404] switch to nixpkgs unstable --- flake.lock | 387 ++++-------------- flake.nix | 4 +- ...m-generation-after-generation-switch.patch | 27 -- system/configuration.nix | 2 + 4 files changed, 83 insertions(+), 337 deletions(-) delete mode 100644 patches/nixpkgs/fix-steam-generation-after-generation-switch.patch diff --git a/flake.lock b/flake.lock index f25a618..ca0d863 100644 --- a/flake.lock +++ b/flake.lock @@ -38,15 +38,14 @@ "home-manager": "home-manager", "nixpkgs": [ "nixpkgs" - ], - "systems": "systems" + ] }, "locked": { - "lastModified": 1707830867, - "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=", + "lastModified": 1701216516, + "narHash": "sha256-jKSeJn+7hZ1dZdiH1L+NWUGT2i/BGomKAJ54B9kT06Q=", "owner": "ryantm", "repo": "agenix", - "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6", + "rev": "13ac9ac6d68b9a0896e3d43a082947233189e247", "type": "github" }, "original": { @@ -55,22 +54,6 @@ "type": "github" } }, - "blobs": { - "flake": false, - "locked": { - "lastModified": 1604995301, - "narHash": "sha256-wcLzgLec6SGJA8fx1OEN1yV/Py5b+U5iyYpksUY/yLw=", - "owner": "simple-nixos-mailserver", - "repo": "blobs", - "rev": "2cccdf1ca48316f2cfd1c9a0017e8de5a7156265", - "type": "gitlab" - }, - "original": { - "owner": "simple-nixos-mailserver", - "repo": "blobs", - "type": "gitlab" - } - }, "crane": { "inputs": { "flake-compat": "flake-compat", @@ -127,11 +110,11 @@ ] }, "locked": { - "lastModified": 1700795494, - "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", + "lastModified": 1673295039, + "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", + "rev": "87b9d090ad39b25b2400029c64825fc2a8868943", "type": "github" }, "original": { @@ -205,7 +188,9 @@ "dzgui-nix": { "inputs": { "dzgui": "dzgui", - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1702850463, @@ -305,25 +290,9 @@ "type": "github" } }, - "flake-compat_5": { - "flake": false, - "locked": { - "lastModified": 1668681692, - "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "009399224d5e398d03b22badca40a37ac85412a1", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1681202837, @@ -359,7 +328,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1681202837, @@ -392,7 +361,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_6" + "systems": "systems_4" }, "locked": { "lastModified": 1681202837, @@ -410,7 +379,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_7" + "systems": "systems_5" }, "locked": { "lastModified": 1681202837, @@ -428,7 +397,7 @@ }, "flake-utils_6": { "inputs": { - "systems": "systems_9" + "systems": "systems_7" }, "locked": { "lastModified": 1694529238, @@ -446,7 +415,7 @@ }, "flake-utils_7": { "inputs": { - "systems": "systems_10" + "systems": "systems_8" }, "locked": { "lastModified": 1681202837, @@ -464,7 +433,7 @@ }, "flake-utils_8": { "inputs": { - "systems": "systems_11" + "systems": "systems_9" }, "locked": { "lastModified": 1681202837, @@ -488,11 +457,11 @@ ] }, "locked": { - "lastModified": 1703113217, - "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", + "lastModified": 1682203081, + "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=", "owner": "nix-community", "repo": "home-manager", - "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", + "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1", "type": "github" }, "original": { @@ -508,64 +477,35 @@ ] }, "locked": { - "lastModified": 1706981411, - "narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=", + "lastModified": 1703026685, + "narHash": "sha256-AkualfMbc40HkDR2AZc6u71pcap50wDQOXFCY1ULDUA=", "owner": "nix-community", "repo": "home-manager", - "rev": "652fda4ca6dafeb090943422c34ae9145787af37", + "rev": "efc177c15f2a8bb063aeb250fe3c7c21e1de265e", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.11", "repo": "home-manager", "type": "github" } }, - "hyprcursor": { - "inputs": { - "hyprlang": "hyprlang", - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1710257359, - "narHash": "sha256-43re5pzE/cswFAgw92/ugsB3+d5ufDaCcLtl9ztKfBo=", - "owner": "hyprwm", - "repo": "hyprcursor", - "rev": "1761f6cefd77f4fcd2039d930c88d6716ddc4974", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprcursor", - "type": "github" - } - }, "hyprland": { "inputs": { - "hyprcursor": "hyprcursor", "hyprland-protocols": "hyprland-protocols", - "hyprlang": "hyprlang_2", "nixpkgs": [ "nixpkgs" ], - "systems": "systems_5", + "systems": "systems_3", "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1710864211, - "narHash": "sha256-Uve1/UBnwD4M/9xD0E3XATnLrF8B5vL6MTBhX6Is+TE=", + "lastModified": 1702986956, + "narHash": "sha256-HSXyJxXKqDqaAVoJhvbA+u8iDLS/TuCD6+w4eDqMIeI=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "bcba3951f45f11245d424274130eb3a0ac790d93", + "rev": "d9b74ff96b3e3f0341a386451b9a3375b6f05503", "type": "github" }, "original": { @@ -599,54 +539,6 @@ "type": "github" } }, - "hyprlang": { - "inputs": { - "nixpkgs": [ - "hyprland", - "hyprcursor", - "nixpkgs" - ], - "systems": "systems_4" - }, - "locked": { - "lastModified": 1709914708, - "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprlang_2": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1709914708, - "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, "lipsum": { "flake": false, "locked": { @@ -689,11 +581,11 @@ "material-wifi-icons": { "flake": false, "locked": { - "lastModified": 1703850449, - "narHash": "sha256-KykU5J7SdpBDG+6rkD//XeHd+6pK3qabe+88RduhwKc=", + "lastModified": 1537083724, + "narHash": "sha256-neh+keoYyKum2K1lutE4HKVscA+TeWccikB85osbX/8=", "owner": "dcousens", "repo": "material-wifi-icons", - "rev": "2daf6b3d96d65beb2a3e37a9a53556aab3826d97", + "rev": "d56927c95ca17aa3e0dda15b23840ba3ad3f44cb", "type": "github" }, "original": { @@ -709,11 +601,11 @@ ] }, "locked": { - "lastModified": 1710644923, - "narHash": "sha256-0fjbN5GYYDKPyPay0l8gYoH+tFfNqPPwP5sxxBreeA4=", + "lastModified": 1702864432, + "narHash": "sha256-xR5Igg2hnm979W3YgMDrSjErHFhHo4rbMboF6DC0mbc=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "e25efda85e39fcdc845e371971ac4384989c4295", + "rev": "4605ccd764fac78b9e4b5b058698cb9f04430b91", "type": "github" }, "original": { @@ -724,15 +616,15 @@ }, "nix-software-center": { "inputs": { - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "utils": "utils" }, "locked": { - "lastModified": 1703105285, - "narHash": "sha256-BHoW1RQMc2Auz8paBvTBriKv0F6FI99+3nnz/ELLawg=", + "lastModified": 1693158194, + "narHash": "sha256-jDTKAmei9UgwoVHAskalRilTunWYlWOESNGY4BKscuU=", "owner": "vlinkz", "repo": "nix-software-center", - "rev": "68e87fb6e24fb3e6fe65449918d0cbda96622b65", + "rev": "8faa762f9b710520f8b7f81f4892a6e0aba749dc", "type": "github" }, "original": { @@ -744,15 +636,15 @@ "nixos-conf-editor": { "inputs": { "flake-compat": "flake-compat_3", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "snowfall-lib": "snowfall-lib" }, "locked": { - "lastModified": 1707338010, - "narHash": "sha256-UtLeZzDdk96sLTRcWsGrkWCslNUDytrGe0VmOTB/iig=", + "lastModified": 1698685411, + "narHash": "sha256-N93S17LLkckv25qB/aMdFyfV+sNvhiGyHfFVMczoBs8=", "owner": "vlinkz", "repo": "nixos-conf-editor", - "rev": "27b5e92f580f794c690093503869aab242f075ab", + "rev": "f79009587708571f79b3299898723c131473e2b4", "type": "github" }, "original": { @@ -761,78 +653,7 @@ "type": "github" } }, - "nixos-mailserver": { - "inputs": { - "blobs": "blobs", - "flake-compat": "flake-compat_5", - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-23_05": "nixpkgs-23_05", - "nixpkgs-23_11": "nixpkgs-23_11", - "utils": "utils_2" - }, - "locked": { - "lastModified": 1706219574, - "narHash": "sha256-qO+8UErk+bXCq2ybHU4GzXG4Ejk4Tk0rnnTPNyypW4g=", - "owner": "simple-nixos-mailserver", - "repo": "nixos-mailserver", - "rev": "e47f3719f1db3e0961a4358d4cb234a0acaa7baf", - "type": "gitlab" - }, - "original": { - "owner": "simple-nixos-mailserver", - "ref": "nixos-23.11", - "repo": "nixos-mailserver", - "type": "gitlab" - } - }, "nixpkgs": { - "locked": { - "lastModified": 1702539185, - "narHash": "sha256-KnIRG5NMdLIpEkZTnN5zovNYc0hhXjAgv6pfd5Z4c7U=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "aa9d4729cbc99dabacb50e3994dcefb3ea0f7447", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixpkgs-unstable", - "type": "indirect" - } - }, - "nixpkgs-23_05": { - "locked": { - "lastModified": 1704290814, - "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-23.05", - "type": "indirect" - } - }, - "nixpkgs-23_11": { - "locked": { - "lastModified": 1706098335, - "narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a77ab169a83a4175169d78684ddd2e54486ac651", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-23.11", - "type": "indirect" - } - }, - "nixpkgs_2": { "locked": { "lastModified": 1692638711, "narHash": "sha256-J0LgSFgJVGCC1+j5R2QndadWI1oumusg6hCtYAzLID4=", @@ -848,7 +669,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_2": { "locked": { "lastModified": 1698318101, "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=", @@ -864,18 +685,18 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { - "lastModified": 1710695816, - "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", + "lastModified": 1702830618, + "narHash": "sha256-lvhwIvRwhOLgzbRuYkqHy4M5cQHYs4ktL6/hyuBS6II=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "614b4613980a522ba49f0d194531beddbb7220d3", + "rev": "91a00709aebb3602f172a0bf47ba1ef013e34835", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-23.11", + "ref": "nixos-unstable", "type": "indirect" } }, @@ -898,11 +719,11 @@ "ranger-icons": { "flake": false, "locked": { - "lastModified": 1709209315, - "narHash": "sha256-ETE13REDIVuoFIbvWqWvQLj/2fGST+1koowmmuBzGmo=", + "lastModified": 1691165140, + "narHash": "sha256-6JEhyU08QEkGdRW2L00ynRaoaaR5PaiVUccEUbtTQuU=", "owner": "alexanderjeurissen", "repo": "ranger_devicons", - "rev": "ed718dd6a6d5d2c0f53cba8474c5ad96185057e9", + "rev": "de64ab26fb581c00a803381d522c6b3e48b79415", "type": "github" }, "original": { @@ -925,8 +746,7 @@ "nix-index-database": "nix-index-database", "nix-software-center": "nix-software-center", "nixos-conf-editor": "nixos-conf-editor", - "nixos-mailserver": "nixos-mailserver", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "plymouth-themes": "plymouth-themes", "ranger-icons": "ranger-icons", "tlauncher": "tlauncher", @@ -1042,36 +862,6 @@ "type": "github" } }, - "systems_10": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_11": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -1088,6 +878,21 @@ } }, "systems_3": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_4": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1102,33 +907,18 @@ "type": "github" } }, - "systems_4": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, "systems_5": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -1215,7 +1005,7 @@ }, "utils": { "inputs": { - "systems": "systems_8" + "systems": "systems_6" }, "locked": { "lastModified": 1689068808, @@ -1231,21 +1021,6 @@ "type": "github" } }, - "utils_2": { - "locked": { - "lastModified": 1605370193, - "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5021eac20303a61fafe17224c087f5519baed54d", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "wl-crosshair": { "inputs": { "flake-utils": "flake-utils_8", @@ -1271,18 +1046,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1709983277, - "narHash": "sha256-wXWIJLd4F2JZeMaihWVDW/yYXCLEC8OpeNJZg9a9ly8=", + "lastModified": 1701368958, + "narHash": "sha256-7kvyoA91etzVEl9mkA/EJfB6z/PltxX7Xc4gcr7/xlo=", "owner": "wlroots", "repo": "wlroots", - "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b", + "rev": "5d639394f3e83b01596dcd166a44a9a1a2583350", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b", + "rev": "5d639394f3e83b01596dcd166a44a9a1a2583350", "type": "gitlab" } }, @@ -1292,10 +1067,6 @@ "hyprland", "hyprland-protocols" ], - "hyprlang": [ - "hyprland", - "hyprlang" - ], "nixpkgs": [ "hyprland", "nixpkgs" @@ -1306,11 +1077,11 @@ ] }, "locked": { - "lastModified": 1709299639, - "narHash": "sha256-jYqJM5khksLIbqSxCLUUcqEgI+O2LdlSlcMEBs39CAU=", + "lastModified": 1702334919, + "narHash": "sha256-ibOZ3TLjqndGMcj2f+07NFwDWoum4IbzF58byZuJJNg=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "2d2fb547178ec025da643db57d40a971507b82fe", + "rev": "f5c3576c3b6cb1c31a8dfa3e4113f59bfe40cd71", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2b64fb4..06e915f 100644 --- a/flake.nix +++ b/flake.nix @@ -1,8 +1,8 @@ { description = "My system config"; inputs = { - nixpkgs.url = "nixpkgs/nixos-23.11"; - home-manager.url = "github:nix-community/home-manager/release-23.11"; + nixpkgs.url = "nixpkgs/nixos-unstable"; + home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; nix-index-database = { diff --git a/patches/nixpkgs/fix-steam-generation-after-generation-switch.patch b/patches/nixpkgs/fix-steam-generation-after-generation-switch.patch deleted file mode 100644 index 7c2b37f..0000000 --- a/patches/nixpkgs/fix-steam-generation-after-generation-switch.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ac4d51306af54a088e29e2e5efcfac5dfe87d95c Mon Sep 17 00:00:00 2001 -From: lelgenio -Date: Fri, 4 Aug 2023 01:25:04 -0300 -Subject: [PATCH] HACK: fix steam after generation switch - ---- - pkgs/build-support/build-fhsenv-bubblewrap/default.nix | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix -index 3500e5e9216f..4d7ac0aa7618 100644 ---- a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix -+++ b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix -@@ -152,6 +152,10 @@ let - fi - if [[ -L $i ]]; then - symlinks+=(--symlink "$(${coreutils}/bin/readlink "$i")" "$i") -+ elif [[ -f $i && -r $i ]]; then -+ SNAPSHOT=$(mktemp --dry-run) -+ cp "$i" "$SNAPSHOT" -+ ro_mounts+=(--ro-bind-try "$SNAPSHOT" "$i") - else - ro_mounts+=(--ro-bind-try "$i" "$i") - fi --- -2.42.0 - diff --git a/system/configuration.nix b/system/configuration.nix index 3c146b1..76e64c0 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -11,6 +11,8 @@ ./nix.nix ]; + boot.kernelPackages = pkgs.linuxPackages_latest; + zramSwap.enable = true; programs.adb.enable = true; From a87adcb7a66f9a924ede539830d39d5746ce99cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 22 Dec 2023 22:46:34 -0300 Subject: [PATCH 078/404] update --- flake.lock | 36 ++++++++++++++++++------------------ flake.nix | 10 +--------- 2 files changed, 19 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index ca0d863..63013d3 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1701216516, - "narHash": "sha256-jKSeJn+7hZ1dZdiH1L+NWUGT2i/BGomKAJ54B9kT06Q=", + "lastModified": 1703260116, + "narHash": "sha256-ipqShkBmHKC9ft1ZAsA6aeKps32k7+XZSPwfxeHLsAU=", "owner": "ryantm", "repo": "agenix", - "rev": "13ac9ac6d68b9a0896e3d43a082947233189e247", + "rev": "d0d4ad5be611da43da04321f49684ad72d705c7e", "type": "github" }, "original": { @@ -477,11 +477,11 @@ ] }, "locked": { - "lastModified": 1703026685, - "narHash": "sha256-AkualfMbc40HkDR2AZc6u71pcap50wDQOXFCY1ULDUA=", + "lastModified": 1703265279, + "narHash": "sha256-5jVtOwyMH1FzclxHrsFWzBdB+VyjUUSu1wyZhZlR6WU=", "owner": "nix-community", "repo": "home-manager", - "rev": "efc177c15f2a8bb063aeb250fe3c7c21e1de265e", + "rev": "07c322a7cff03267fd881adae1afe63367c5d608", "type": "github" }, "original": { @@ -501,11 +501,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1702986956, - "narHash": "sha256-HSXyJxXKqDqaAVoJhvbA+u8iDLS/TuCD6+w4eDqMIeI=", + "lastModified": 1703271271, + "narHash": "sha256-q6bb5S6l/fEIpO4QRmxACgNfVdTvWktEvKVKWtygzx8=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "d9b74ff96b3e3f0341a386451b9a3375b6f05503", + "rev": "c416880cf96aee783b6a00f356512e5d758e6056", "type": "github" }, "original": { @@ -620,11 +620,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1693158194, - "narHash": "sha256-jDTKAmei9UgwoVHAskalRilTunWYlWOESNGY4BKscuU=", + "lastModified": 1703105285, + "narHash": "sha256-BHoW1RQMc2Auz8paBvTBriKv0F6FI99+3nnz/ELLawg=", "owner": "vlinkz", "repo": "nix-software-center", - "rev": "8faa762f9b710520f8b7f81f4892a6e0aba749dc", + "rev": "68e87fb6e24fb3e6fe65449918d0cbda96622b65", "type": "github" }, "original": { @@ -640,11 +640,11 @@ "snowfall-lib": "snowfall-lib" }, "locked": { - "lastModified": 1698685411, - "narHash": "sha256-N93S17LLkckv25qB/aMdFyfV+sNvhiGyHfFVMczoBs8=", + "lastModified": 1703104726, + "narHash": "sha256-9wD01mLe7tQCzTtLIRzUaAvOKzfPuWPfpCfYkeCsQD0=", "owner": "vlinkz", "repo": "nixos-conf-editor", - "rev": "f79009587708571f79b3299898723c131473e2b4", + "rev": "18dc1d25b2025dc437490c71653429a05f9e0bf2", "type": "github" }, "original": { @@ -687,11 +687,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1702830618, - "narHash": "sha256-lvhwIvRwhOLgzbRuYkqHy4M5cQHYs4ktL6/hyuBS6II=", + "lastModified": 1703013332, + "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "91a00709aebb3602f172a0bf47ba1ef013e34835", + "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 06e915f..3bff3c6 100644 --- a/flake.nix +++ b/flake.nix @@ -76,17 +76,9 @@ overlays = old_overlays.all; }; - bootstrapPkgs = import inputs.nixpkgs nixpkgsConfig; - nixpkgs = bootstrapPkgs.applyPatches { - name = "patched-nixpkgs"; - src = inputs.nixpkgs; - patches = lib.mapAttrsToList (k: v: ./patches/nixpkgs/${k}) - (builtins.readDir ./patches/nixpkgs); - }; - inherit (import ./user/variables.nix) desktop; system = "x86_64-linux"; - pkgs = import nixpkgs nixpkgsConfig; + pkgs = import inputs.nixpkgs nixpkgsConfig; lib = inputs.nixpkgs.lib; packages = import ./pkgs { inherit pkgs inputs; }; From b778fed9345736a009cae8dc6105c71834b3d9f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Tue, 26 Dec 2023 02:41:54 -0300 Subject: [PATCH 079/404] update --- flake.lock | 114 +++++++++++++++++++++++++++++---------------------- user/gpg.nix | 2 +- 2 files changed, 66 insertions(+), 50 deletions(-) diff --git a/flake.lock b/flake.lock index 63013d3..fa629df 100644 --- a/flake.lock +++ b/flake.lock @@ -38,14 +38,15 @@ "home-manager": "home-manager", "nixpkgs": [ "nixpkgs" - ] + ], + "systems": "systems" }, "locked": { - "lastModified": 1703260116, - "narHash": "sha256-ipqShkBmHKC9ft1ZAsA6aeKps32k7+XZSPwfxeHLsAU=", + "lastModified": 1703433843, + "narHash": "sha256-nmtA4KqFboWxxoOAA6Y1okHbZh+HsXaMPFkYHsoDRDw=", "owner": "ryantm", "repo": "agenix", - "rev": "d0d4ad5be611da43da04321f49684ad72d705c7e", + "rev": "417caa847f9383e111d1397039c9d4337d024bf0", "type": "github" }, "original": { @@ -110,11 +111,11 @@ ] }, "locked": { - "lastModified": 1673295039, - "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=", + "lastModified": 1700795494, + "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "87b9d090ad39b25b2400029c64825fc2a8868943", + "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", "type": "github" }, "original": { @@ -292,7 +293,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1681202837, @@ -328,7 +329,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1681202837, @@ -361,7 +362,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1681202837, @@ -379,7 +380,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1681202837, @@ -397,7 +398,7 @@ }, "flake-utils_6": { "inputs": { - "systems": "systems_7" + "systems": "systems_8" }, "locked": { "lastModified": 1694529238, @@ -415,7 +416,7 @@ }, "flake-utils_7": { "inputs": { - "systems": "systems_8" + "systems": "systems_9" }, "locked": { "lastModified": 1681202837, @@ -433,7 +434,7 @@ }, "flake-utils_8": { "inputs": { - "systems": "systems_9" + "systems": "systems_10" }, "locked": { "lastModified": 1681202837, @@ -457,11 +458,11 @@ ] }, "locked": { - "lastModified": 1682203081, - "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=", + "lastModified": 1703113217, + "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", "owner": "nix-community", "repo": "home-manager", - "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1", + "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", "type": "github" }, "original": { @@ -477,11 +478,11 @@ ] }, "locked": { - "lastModified": 1703265279, - "narHash": "sha256-5jVtOwyMH1FzclxHrsFWzBdB+VyjUUSu1wyZhZlR6WU=", + "lastModified": 1703527373, + "narHash": "sha256-AjypRssRtS6F3xkf7rE3/bXkIF2WJOZLbTIspjcE1zM=", "owner": "nix-community", "repo": "home-manager", - "rev": "07c322a7cff03267fd881adae1afe63367c5d608", + "rev": "80679ea5074ab7190c4cce478c600057cfb5edae", "type": "github" }, "original": { @@ -496,16 +497,16 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_3", + "systems": "systems_4", "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1703271271, - "narHash": "sha256-q6bb5S6l/fEIpO4QRmxACgNfVdTvWktEvKVKWtygzx8=", + "lastModified": 1703525245, + "narHash": "sha256-uDkNQgMmmVtTDKvRjO2TmUwlKSV4gwMLGj5pGr3xDIM=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "c416880cf96aee783b6a00f356512e5d758e6056", + "rev": "4f99e805b900b72f5e2bed54a1a44d10c8d54771", "type": "github" }, "original": { @@ -601,11 +602,11 @@ ] }, "locked": { - "lastModified": 1702864432, - "narHash": "sha256-xR5Igg2hnm979W3YgMDrSjErHFhHo4rbMboF6DC0mbc=", + "lastModified": 1703387252, + "narHash": "sha256-XKJqGj0BaEn/zyctEnkgVIh6Ba1rgTRc+UBi9EU8Y54=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "4605ccd764fac78b9e4b5b058698cb9f04430b91", + "rev": "f4340c1a42c38d79293ba69bfd839fbd6268a538", "type": "github" }, "original": { @@ -687,11 +688,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1703013332, - "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", + "lastModified": 1703255338, + "narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", + "rev": "6df37dc6a77654682fe9f071c62b4242b5342e04", "type": "github" }, "original": { @@ -862,6 +863,21 @@ "type": "github" } }, + "systems_10": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -878,21 +894,6 @@ } }, "systems_3": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_4": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -907,6 +908,21 @@ "type": "github" } }, + "systems_4": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, "systems_5": { "locked": { "lastModified": 1681028828, @@ -1005,7 +1021,7 @@ }, "utils": { "inputs": { - "systems": "systems_6" + "systems": "systems_7" }, "locked": { "lastModified": 1689068808, @@ -1077,11 +1093,11 @@ ] }, "locked": { - "lastModified": 1702334919, - "narHash": "sha256-ibOZ3TLjqndGMcj2f+07NFwDWoum4IbzF58byZuJJNg=", + "lastModified": 1703514399, + "narHash": "sha256-VRr5Xc4S/VPr/gU3fiOD3vSIL2+GJ+LUrmFTWTwnTz4=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "f5c3576c3b6cb1c31a8dfa3e4113f59bfe40cd71", + "rev": "0a318a7a217a6402b0b705837cd5b50b0e94b31b", "type": "github" }, "original": { diff --git a/user/gpg.nix b/user/gpg.nix index e215440..a56529e 100644 --- a/user/gpg.nix +++ b/user/gpg.nix @@ -4,7 +4,7 @@ enable = true; defaultCacheTtl = 604800; maxCacheTtl = 604800; - pinentryFlavor = "gtk2"; + pinentryFlavor = "qt"; extraConfig = '' allow-preset-passphrase ''; From fd583431a940fd097ffd5c11ad15d3c415ab14a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Tue, 26 Dec 2023 21:10:32 -0300 Subject: [PATCH 080/404] sway: disable adaptive sync --- user/sway/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/sway/default.nix b/user/sway/default.nix index 96790be..84e3b6e 100644 --- a/user/sway/default.nix +++ b/user/sway/default.nix @@ -52,7 +52,7 @@ in }; output = { "*" = { - adaptive_sync = "on"; + adaptive_sync = "off"; bg = "${theme.background} fill"; mode = "1920x1080@144.000Hz"; }; From 768350038c118375af07a2756555c85acad96371 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sun, 7 Jan 2024 18:40:39 -0300 Subject: [PATCH 081/404] update --- flake.lock | 108 ++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 78 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index fa629df..d1af186 100644 --- a/flake.lock +++ b/flake.lock @@ -189,9 +189,7 @@ "dzgui-nix": { "inputs": { "dzgui": "dzgui", - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1702850463, @@ -478,11 +476,11 @@ ] }, "locked": { - "lastModified": 1703527373, - "narHash": "sha256-AjypRssRtS6F3xkf7rE3/bXkIF2WJOZLbTIspjcE1zM=", + "lastModified": 1704498488, + "narHash": "sha256-yINKdShHrtjdiJhov+q0s3Y3B830ujRoSbHduUNyKag=", "owner": "nix-community", "repo": "home-manager", - "rev": "80679ea5074ab7190c4cce478c600057cfb5edae", + "rev": "51e44a13acea71b36245e8bd8c7db53e0a3e61ee", "type": "github" }, "original": { @@ -502,11 +500,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1703525245, - "narHash": "sha256-uDkNQgMmmVtTDKvRjO2TmUwlKSV4gwMLGj5pGr3xDIM=", + "lastModified": 1704632672, + "narHash": "sha256-roOtCL13u9/UBMyA3DJtSfRD7bn89iKoqPWrZzXQxWM=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "4f99e805b900b72f5e2bed54a1a44d10c8d54771", + "rev": "7904188de9ca631436484cde733ef871f518d962", "type": "github" }, "original": { @@ -540,6 +538,24 @@ "type": "github" } }, + "hyprlang": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1704287638, + "narHash": "sha256-TuRXJGwtK440AXQNl5eiqmQqY4LZ/9+z/R7xC0ie3iA=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "6624f2bb66d4d27975766e81f77174adbe58ec97", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, "lipsum": { "flake": false, "locked": { @@ -582,11 +598,11 @@ "material-wifi-icons": { "flake": false, "locked": { - "lastModified": 1537083724, - "narHash": "sha256-neh+keoYyKum2K1lutE4HKVscA+TeWccikB85osbX/8=", + "lastModified": 1703850449, + "narHash": "sha256-KykU5J7SdpBDG+6rkD//XeHd+6pK3qabe+88RduhwKc=", "owner": "dcousens", "repo": "material-wifi-icons", - "rev": "d56927c95ca17aa3e0dda15b23840ba3ad3f44cb", + "rev": "2daf6b3d96d65beb2a3e37a9a53556aab3826d97", "type": "github" }, "original": { @@ -602,11 +618,11 @@ ] }, "locked": { - "lastModified": 1703387252, - "narHash": "sha256-XKJqGj0BaEn/zyctEnkgVIh6Ba1rgTRc+UBi9EU8Y54=", + "lastModified": 1704596958, + "narHash": "sha256-BK3Ohsz7m8X6qVKFxDtr8KVcHipfr5hYE9PDIJevHbQ=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "f4340c1a42c38d79293ba69bfd839fbd6268a538", + "rev": "f46800ac5a6e9f892fe36e50821c5d85794ecc62", "type": "github" }, "original": { @@ -617,7 +633,7 @@ }, "nix-software-center": { "inputs": { - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_3", "utils": "utils" }, "locked": { @@ -637,7 +653,7 @@ "nixos-conf-editor": { "inputs": { "flake-compat": "flake-compat_3", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_4", "snowfall-lib": "snowfall-lib" }, "locked": { @@ -655,6 +671,37 @@ } }, "nixpkgs": { + "locked": { + "lastModified": 1702539185, + "narHash": "sha256-KnIRG5NMdLIpEkZTnN5zovNYc0hhXjAgv6pfd5Z4c7U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "aa9d4729cbc99dabacb50e3994dcefb3ea0f7447", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixpkgs-unstable", + "type": "indirect" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1702645756, + "narHash": "sha256-qKI6OR3TYJYQB3Q8mAZ+DG4o/BR9ptcv9UnRV2hzljc=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "40c3c94c241286dd2243ea34d3aef8a488f9e4d0", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1692638711, "narHash": "sha256-J0LgSFgJVGCC1+j5R2QndadWI1oumusg6hCtYAzLID4=", @@ -670,7 +717,7 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs_4": { "locked": { "lastModified": 1698318101, "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=", @@ -686,13 +733,13 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_5": { "locked": { - "lastModified": 1703255338, - "narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=", + "lastModified": 1704194953, + "narHash": "sha256-RtDKd8Mynhe5CFnVT8s0/0yqtWFMM9LmCzXv/YKxnq4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6df37dc6a77654682fe9f071c62b4242b5342e04", + "rev": "bd645e8668ec6612439a9ee7e71f7eac4099d4f6", "type": "github" }, "original": { @@ -747,7 +794,7 @@ "nix-index-database": "nix-index-database", "nix-software-center": "nix-software-center", "nixos-conf-editor": "nixos-conf-editor", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_5", "plymouth-themes": "plymouth-themes", "ranger-icons": "ranger-icons", "tlauncher": "tlauncher", @@ -1062,18 +1109,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1701368958, - "narHash": "sha256-7kvyoA91etzVEl9mkA/EJfB6z/PltxX7Xc4gcr7/xlo=", + "lastModified": 1703963193, + "narHash": "sha256-ke8drv6PTrdQDruWbajrRJffP9A9PU6FRyjJGNZRTs4=", "owner": "wlroots", "repo": "wlroots", - "rev": "5d639394f3e83b01596dcd166a44a9a1a2583350", + "rev": "f81c3d93cd6f61b20ae784297679283438def8df", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "5d639394f3e83b01596dcd166a44a9a1a2583350", + "rev": "f81c3d93cd6f61b20ae784297679283438def8df", "type": "gitlab" } }, @@ -1083,6 +1130,7 @@ "hyprland", "hyprland-protocols" ], + "hyprlang": "hyprlang", "nixpkgs": [ "hyprland", "nixpkgs" @@ -1093,11 +1141,11 @@ ] }, "locked": { - "lastModified": 1703514399, - "narHash": "sha256-VRr5Xc4S/VPr/gU3fiOD3vSIL2+GJ+LUrmFTWTwnTz4=", + "lastModified": 1704400467, + "narHash": "sha256-IsEAKBCorRlN53FwFAMbyGLRsPVu/ZrWEJtCwykPds8=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "0a318a7a217a6402b0b705837cd5b50b0e94b31b", + "rev": "1c802128f6cc3db29a8ef01552b1a22f894eeefd", "type": "github" }, "original": { From 4a4b603a39ac56ea5290758b710006365a4b015c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 31 Jan 2024 17:35:26 -0300 Subject: [PATCH 082/404] update --- flake.lock | 70 ++++++++++++++++++++++-------------------------------- 1 file changed, 29 insertions(+), 41 deletions(-) diff --git a/flake.lock b/flake.lock index d1af186..be15b30 100644 --- a/flake.lock +++ b/flake.lock @@ -476,11 +476,11 @@ ] }, "locked": { - "lastModified": 1704498488, - "narHash": "sha256-yINKdShHrtjdiJhov+q0s3Y3B830ujRoSbHduUNyKag=", + "lastModified": 1706473109, + "narHash": "sha256-iyuAvpKTsq2u23Cr07RcV5XlfKExrG8gRpF75hf1uVc=", "owner": "nix-community", "repo": "home-manager", - "rev": "51e44a13acea71b36245e8bd8c7db53e0a3e61ee", + "rev": "d634c3abafa454551f2083b054cd95c3f287be61", "type": "github" }, "original": { @@ -500,11 +500,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1704632672, - "narHash": "sha256-roOtCL13u9/UBMyA3DJtSfRD7bn89iKoqPWrZzXQxWM=", + "lastModified": 1706571425, + "narHash": "sha256-VwVUPb5vuy4GGUx1XMhDMaKk9n8Gs5xUTG9CItoHL04=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "7904188de9ca631436484cde733ef871f518d962", + "rev": "3ff59e7e1d859daa503b88ef125d087bc100abfe", "type": "github" }, "original": { @@ -540,7 +540,11 @@ }, "hyprlang": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "hyprland", + "xdph", + "nixpkgs" + ] }, "locked": { "lastModified": 1704287638, @@ -618,11 +622,11 @@ ] }, "locked": { - "lastModified": 1704596958, - "narHash": "sha256-BK3Ohsz7m8X6qVKFxDtr8KVcHipfr5hYE9PDIJevHbQ=", + "lastModified": 1706411424, + "narHash": "sha256-BzziJYucEZvdCE985vjPoo3ztWcmUiSQ1wJ2CoT6jCc=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "f46800ac5a6e9f892fe36e50821c5d85794ecc62", + "rev": "c782f2a4f6fc94311ab5ef31df2f1149a1856181", "type": "github" }, "original": { @@ -633,7 +637,7 @@ }, "nix-software-center": { "inputs": { - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "utils": "utils" }, "locked": { @@ -653,7 +657,7 @@ "nixos-conf-editor": { "inputs": { "flake-compat": "flake-compat_3", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "snowfall-lib": "snowfall-lib" }, "locked": { @@ -686,22 +690,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1702645756, - "narHash": "sha256-qKI6OR3TYJYQB3Q8mAZ+DG4o/BR9ptcv9UnRV2hzljc=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "40c3c94c241286dd2243ea34d3aef8a488f9e4d0", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1692638711, "narHash": "sha256-J0LgSFgJVGCC1+j5R2QndadWI1oumusg6hCtYAzLID4=", @@ -717,7 +705,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1698318101, "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=", @@ -733,13 +721,13 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { - "lastModified": 1704194953, - "narHash": "sha256-RtDKd8Mynhe5CFnVT8s0/0yqtWFMM9LmCzXv/YKxnq4=", + "lastModified": 1706371002, + "narHash": "sha256-dwuorKimqSYgyu8Cw6ncKhyQjUDOyuXoxDTVmAXq88s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bd645e8668ec6612439a9ee7e71f7eac4099d4f6", + "rev": "c002c6aa977ad22c60398daaa9be52f2203d0006", "type": "github" }, "original": { @@ -794,7 +782,7 @@ "nix-index-database": "nix-index-database", "nix-software-center": "nix-software-center", "nixos-conf-editor": "nixos-conf-editor", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "plymouth-themes": "plymouth-themes", "ranger-icons": "ranger-icons", "tlauncher": "tlauncher", @@ -1109,18 +1097,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1703963193, - "narHash": "sha256-ke8drv6PTrdQDruWbajrRJffP9A9PU6FRyjJGNZRTs4=", + "lastModified": 1706359063, + "narHash": "sha256-5HUTG0p+nCJv3cn73AmFHRZdfRV5AD5N43g8xAePSKM=", "owner": "wlroots", "repo": "wlroots", - "rev": "f81c3d93cd6f61b20ae784297679283438def8df", + "rev": "00b869c1a96f300a8f25da95d624524895e0ddf2", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "f81c3d93cd6f61b20ae784297679283438def8df", + "rev": "00b869c1a96f300a8f25da95d624524895e0ddf2", "type": "gitlab" } }, @@ -1141,11 +1129,11 @@ ] }, "locked": { - "lastModified": 1704400467, - "narHash": "sha256-IsEAKBCorRlN53FwFAMbyGLRsPVu/ZrWEJtCwykPds8=", + "lastModified": 1706145785, + "narHash": "sha256-j9MP4fv2U/vdRKAXXc2gyMTmYwVnHP6kHx1/y6jprrU=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "1c802128f6cc3db29a8ef01552b1a22f894eeefd", + "rev": "5a592647587cd20b9692a347df6939b6d371b3bb", "type": "github" }, "original": { From 048a48343c53df565c1f8d169504f076a742355a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 8 Feb 2024 23:54:47 -0300 Subject: [PATCH 083/404] update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index be15b30..e7be22f 100644 --- a/flake.lock +++ b/flake.lock @@ -476,11 +476,11 @@ ] }, "locked": { - "lastModified": 1706473109, - "narHash": "sha256-iyuAvpKTsq2u23Cr07RcV5XlfKExrG8gRpF75hf1uVc=", + "lastModified": 1707175763, + "narHash": "sha256-0MKHC6tQ4KEuM5rui6DjKZ/VNiSANB4E+DJ/+wPS1PU=", "owner": "nix-community", "repo": "home-manager", - "rev": "d634c3abafa454551f2083b054cd95c3f287be61", + "rev": "f99eace7c167b8a6a0871849493b1c613d0f1b80", "type": "github" }, "original": { @@ -500,11 +500,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1706571425, - "narHash": "sha256-VwVUPb5vuy4GGUx1XMhDMaKk9n8Gs5xUTG9CItoHL04=", + "lastModified": 1707431350, + "narHash": "sha256-fCt2EOgBdpS4DslBsFJBhmQCvkV97tFxS6KWFaAd7SQ=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "3ff59e7e1d859daa503b88ef125d087bc100abfe", + "rev": "289d4241bea72ebd891e037996ec4ffd356aadc8", "type": "github" }, "original": { @@ -622,11 +622,11 @@ ] }, "locked": { - "lastModified": 1706411424, - "narHash": "sha256-BzziJYucEZvdCE985vjPoo3ztWcmUiSQ1wJ2CoT6jCc=", + "lastModified": 1707016097, + "narHash": "sha256-V4lHr6hFQ3rK650dh64Xffxsf4kse9vUYWsM+ldjkco=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "c782f2a4f6fc94311ab5ef31df2f1149a1856181", + "rev": "3e3dad2808379c522138e2e8b0eb73500721a237", "type": "github" }, "original": { @@ -661,11 +661,11 @@ "snowfall-lib": "snowfall-lib" }, "locked": { - "lastModified": 1703104726, - "narHash": "sha256-9wD01mLe7tQCzTtLIRzUaAvOKzfPuWPfpCfYkeCsQD0=", + "lastModified": 1707338010, + "narHash": "sha256-UtLeZzDdk96sLTRcWsGrkWCslNUDytrGe0VmOTB/iig=", "owner": "vlinkz", "repo": "nixos-conf-editor", - "rev": "18dc1d25b2025dc437490c71653429a05f9e0bf2", + "rev": "27b5e92f580f794c690093503869aab242f075ab", "type": "github" }, "original": { @@ -723,11 +723,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1706371002, - "narHash": "sha256-dwuorKimqSYgyu8Cw6ncKhyQjUDOyuXoxDTVmAXq88s=", + "lastModified": 1707268954, + "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c002c6aa977ad22c60398daaa9be52f2203d0006", + "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1", "type": "github" }, "original": { @@ -755,11 +755,11 @@ "ranger-icons": { "flake": false, "locked": { - "lastModified": 1691165140, - "narHash": "sha256-6JEhyU08QEkGdRW2L00ynRaoaaR5PaiVUccEUbtTQuU=", + "lastModified": 1707118400, + "narHash": "sha256-HLeiV3c+8fl3kiht01s3H/HGPABPC2033rMB/uXKwLM=", "owner": "alexanderjeurissen", "repo": "ranger_devicons", - "rev": "de64ab26fb581c00a803381d522c6b3e48b79415", + "rev": "2c3c19dffb4238d01c74515c9eed5088066db243", "type": "github" }, "original": { From 62db10857ae6e38d53d3f54e6f70b9cb4508e2f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 9 Feb 2024 00:24:20 -0300 Subject: [PATCH 084/404] update renamed xkb config --- system/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/configuration.nix b/system/configuration.nix index 76e64c0..189fa1c 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -40,9 +40,9 @@ # services.xserver.displayManager.autologin.user = "lelgenio"; # Configure keymap in X11 - services.xserver = { + services.xserver.xkb = { layout = "us"; - xkbVariant = "colemak"; + variant = "colemak"; }; console.keyMap = "colemak"; # Enable CUPS to print documents. From 788365cc26a20cc4f1fbc36fdd955343997f0786 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 10 Feb 2024 17:50:58 -0300 Subject: [PATCH 085/404] alacritty: update config --- user/alacritty.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user/alacritty.nix b/user/alacritty.nix index 313b573..8c7ec22 100644 --- a/user/alacritty.nix +++ b/user/alacritty.nix @@ -31,8 +31,8 @@ in cyan = "${color.normal.cyan}"; white = "${color.normal.white}"; }; + draw_bold_text_with_bright_colors = false; }; - draw_bold_text_with_bright_colors = false; window = { opacity = theme.opacity / 100.0; dynamic_padding = true; @@ -65,7 +65,7 @@ in }]; }; mouse = { hide_when_typing = true; }; - key_bindings = [ + keyboard.bindings = [ { key = lib.toUpper key.up; mode = "Vi|~Search"; From 97784fb20b0e917222c260e9705b5f8267cc3d27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 16 Feb 2024 01:17:58 -0300 Subject: [PATCH 086/404] kak-lsp: update config to new format --- user/kakoune/kak-lsp.toml | 263 +++++++++----------------------------- 1 file changed, 57 insertions(+), 206 deletions(-) diff --git a/user/kakoune/kak-lsp.toml b/user/kakoune/kak-lsp.toml index 413de9e..ef96bc4 100644 --- a/user/kakoune/kak-lsp.toml +++ b/user/kakoune/kak-lsp.toml @@ -7,7 +7,7 @@ verbosity = 2 # set to 0 to disable timeout = 1800 # seconds = 30 minutes -[language.angular] +[language_server.angular] filetypes = ["angular"] roots = [".angular", ".git"] command = "node" @@ -20,134 +20,80 @@ args = [ "--stdio", ] -[language.bash] +[language_server.bash-language-server] filetypes = ["sh"] roots = [".git", ".hg"] command = "bash-language-server" args = ["start"] -[language.c_cpp] +[language_server.clangd] filetypes = ["c", "cpp"] -roots = [ "compile_commands.json", ".clangd", ".git" ] +roots = ["compile_commands.json", ".clangd", ".git", ".hg"] command = "clangd" -[language.crystal] -filetypes = ["crystal"] -roots = ["shard.yml"] -command = "scry" - -[language.css] +[language_server.css-language-server] filetypes = ["css"] -roots = ["package.json"] +roots = ["package.json", ".git", ".hg"] command = "vscode-css-languageserver" args = ["--stdio"] -[language.less] +[language_server.less-language-server] filetypes = ["less"] -roots = ["package.json", ".git"] +roots = ["package.json", ".git", ".hg"] command = "vscode-css-languageserver" args = ["--stdio"] -[language.d] -filetypes = ["d", "di"] -roots = [".git", "dub.sdl", "dub.json"] -command = "dls" - -[language.dart] -# start shell to find path to dart analysis server source -filetypes = ["dart"] -roots = ["pubspec.yaml", ".git"] -command = "sh" -args = ["-c", "dart $(dirname $(which dart))/snapshots/analysis_server.dart.snapshot --lsp"] - -[language.elm] -filetypes = ["elm"] -roots = ["elm.json"] -command = "elm-language-server" -args = ["--stdio"] - -# [language.elm.initialization_options] -# runtime = "node" -# elmPath = "elm" -# elmFormatPath = "elm-format" -# elmTestPath = "elm-test" - -[language.go] -filetypes = ["go"] -roots = ["Gopkg.toml", "go.mod", ".git", ".hg"] -command = "gopls" -offset_encoding = "utf-8" - -[language.haskell] -filetypes = ["haskell"] -roots = ["Setup.hs", "stack.yaml", "*.cabal"] -command = "haskell-language-server-wrapper" -args = ["--lsp"] - -[language.html] +[language_server.html-language-server] filetypes = ["html"] roots = ["package.json"] command = "vscode-html-languageserver" args = ["--stdio"] +settings_section = "_" +[language_server.html-language-server.settings._] +# quotePreference = "single" +# javascript.format.semicolons = "insert" -[language.javascript] -filetypes = ["javascript"] -roots = [".flowconfig"] -command = "flow" -args = ["lsp"] - -[language.typescript] -filetypes = ["typescript"] -roots = ["package.json"] +[language_server.typescript-language-server] +filetypes = ["javascript", "typescript"] +roots = ["package.json", "tsconfig.json", "jsconfig.json", ".git", ".hg"] command = "typescript-language-server" args = ["--stdio"] +settings_section = "_" +[language_server.typescript-language-server.settings._] +# quotePreference = "double" +# typescript.format.semicolons = "insert" -[language.json] +[language_server.json-language-server] filetypes = ["json"] roots = ["package.json"] command = "vscode-json-languageserver" args = ["--stdio"] -[language.latex] -filetypes = ["latex"] -roots = [".git"] -command = "texlab" - -[language.nim] -filetypes = ["nim"] -roots = ["*.nimble", ".git"] -command = "nimlsp" - -[language.nix] +[language_server.rnix-lsp] filetypes = ["nix"] command = "nil" roots = ["flake.nix", "shell.nix", ".git"] [language.nix.settings.nil] formatting.command = [ "nixpkgs-fmt" ] -[language.ocaml] -filetypes = ["ocaml"] -roots = ["Makefile", "opam", "*.opam", "dune"] -command = "ocaml-language-server" -args = ["--stdio"] - -[language.php] +[language_server.intelephense] filetypes = ["php"] roots = [".htaccess", "composer.json"] command = "intelephense" args = ["--stdio"] settings_section = "intelephense" -[language.php.settings] -intelephense.format.braces = "k&r" -intelephense.storagePath = "/tmp/intelephense" -intelephense.environment.includePaths = [ +[language_server.intelephense.settings.intelephense] +storagePath = "/tmp/intelephense" + +format.braces = "k&r" +environment.includePaths = [ "./vendor", "./vendor/autoload", "./vendor/laravel/framework/", "./vendor/laravel/framework/src/", "./vendor/laravel/framework/src/Illuminate/" ] -intelephense.files.exclude = [ +files.exclude = [ "**/.git/**", "**/.svn/**", "**/.hg/**", @@ -159,42 +105,9 @@ intelephense.files.exclude = [ "**/resources/views/**" ] -[language.python] -filetypes = ["python"] -roots = ["requirements.txt", "setup.py", ".git", ".hg"] -command = "pyls" -offset_encoding = "utf-8" - -[language.reason] -filetypes = ["reason"] -roots = ["package.json", "Makefile", ".git", ".hg"] -command = "ocaml-language-server" -args = ["--stdio"] - -[language.ruby] -filetypes = ["ruby"] -roots = ["Gemfile"] -command = "solargraph" -args = ["stdio"] - -# [language.rust] -# filetypes = ["rust"] -# roots = ["Cargo.toml"] -# command = "sh" -# args = [ -# "-c", -# """ -# if path=$(rustup which rls 2>/dev/null); then -# "$path" -# else -# rls -# fi -# """, -# ] - -[language.rust] +[language_server.rust-analyzer] filetypes = ["rust"] -roots = ["rust-toolchain.toml", "rust-toolchain", "Cargo.toml"] +roots = ["Cargo.toml"] command = "sh" args = [ "-c", @@ -206,99 +119,37 @@ args = [ fi """, ] -[language.rust.settings.rust-analyzer] -## this can use too much space and processing power -# checkOnSave.extraArgs = ["--target-dir", "./target/check"] +[language_server.rust-analyzer.settings.rust-analyzer] +# See https://rust-analyzer.github.io/manual.html#configuration +# cargo.features = [] checkOnSave.command = "clippy" hoverActions.enable = false # kak-lsp doesn't support this at the moment -# procMacro.enable = true -# cargo.loadOutDirsFromCheck = true -# rustfmt.rangeFormatting.enable = true -# rustfmt.extraArgs = ["+nightly"] -[language.terraform] -filetypes = ["terraform"] -roots = ["*.tf"] -command = "terraform-ls" -args = ["serve"] - -[language.godot] +[language_server.godot] filetypes = ["gd", "gdscript", "gdscript3"] roots = ["project.godot", ".git/"] command = "nc" args = [ "localhost", "6008"] -[language.clojure] -filetypes = ["clojure"] -roots = ["project.clj", ".git/"] -command = "clojure-lsp" -args = [] - - - - -[semantic_scopes] -# Map textmate scopes to kakoune faces for semantic highlighting -# the underscores are translated to dots, and indicate nesting. -# That is, if variable_other_field is omitted, it will try the face for -# variable_other and then variable -# -# To see a list of available scopes in the debug buffer, run lsp-semantic-available-scopes -variable = "variable" -entity_name_function = "function" -entity_name_type = "type" -variable_other_enummember = "variable" -entity_name_namespace = "module" - -[semantic_modifiers] -documentation = "documentation" -readonly = "default+d" - - - -[[semantic_tokens]] -token = "comment" -face = "documentation" -modifiers = ["documentation"] - -[[semantic_tokens]] -token = "comment" -face = "comment" - -[[semantic_tokens]] -token = "function" -face = "function" - -[[semantic_tokens]] -token = "keyword" -face = "keyword" - -[[semantic_tokens]] -token = "namespace" -face = "module" - -[[semantic_tokens]] -token = "operator" -face = "operator" - -[[semantic_tokens]] -token = "string" -face = "string" - -[[semantic_tokens]] -token = "type" -face = "type" - -[[semantic_tokens]] -token = "variable" -face = "default+d" -modifiers = ["readonly"] - -[[semantic_tokens]] -token = "variable" -face = "default+d" -modifiers = ["constant"] - -[[semantic_tokens]] -token = "variable" -face = "variable" +# Semantic tokens support +# See https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_semanticTokens +# for the default list of tokens and modifiers. +# However, many language servers implement their own values. +# Make sure to check the output of `lsp-capabilities` and each server's documentation and source code as well. +# Examples: +# - TypeScript: https://github.com/microsoft/vscode-languageserver-node/blob/main/client/src/common/semanticTokens.ts +# - Rust Analyzer: https://github.com/rust-analyzer/rust-analyzer/blob/master/crates/ide/src/syntax_highlighting.rs +[semantic_tokens] +faces = [ + {face="documentation", token="comment", modifiers=["documentation"]}, + {face="comment", token="comment"}, + {face="function", token="function"}, + {face="keyword", token="keyword"}, + {face="module", token="namespace"}, + {face="operator", token="operator"}, + {face="string", token="string"}, + {face="type", token="type"}, + {face="default+d", token="variable", modifiers=["readonly"]}, + {face="default+d", token="variable", modifiers=["constant"]}, + {face="variable", token="variable"}, +] From d238826866d186014667054c1f81d25ee5129078 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 17 Feb 2024 20:06:09 -0300 Subject: [PATCH 087/404] update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index e7be22f..01252a1 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1703433843, - "narHash": "sha256-nmtA4KqFboWxxoOAA6Y1okHbZh+HsXaMPFkYHsoDRDw=", + "lastModified": 1707830867, + "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=", "owner": "ryantm", "repo": "agenix", - "rev": "417caa847f9383e111d1397039c9d4337d024bf0", + "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6", "type": "github" }, "original": { @@ -476,11 +476,11 @@ ] }, "locked": { - "lastModified": 1707175763, - "narHash": "sha256-0MKHC6tQ4KEuM5rui6DjKZ/VNiSANB4E+DJ/+wPS1PU=", + "lastModified": 1708031129, + "narHash": "sha256-EH20hJfNnc1/ODdDVat9B7aKm0B95L3YtkIRwKLvQG8=", "owner": "nix-community", "repo": "home-manager", - "rev": "f99eace7c167b8a6a0871849493b1c613d0f1b80", + "rev": "3d6791b3897b526c82920a2ab5f61d71985b3cf8", "type": "github" }, "original": { @@ -500,11 +500,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1707431350, - "narHash": "sha256-fCt2EOgBdpS4DslBsFJBhmQCvkV97tFxS6KWFaAd7SQ=", + "lastModified": 1708186866, + "narHash": "sha256-xkTtBVu9uJvTet0IRVD/FYosB1LrFQhL37qVM+P1Hq0=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "289d4241bea72ebd891e037996ec4ffd356aadc8", + "rev": "289d952a6ee02f6d54a0899870bbec52ff9a53df", "type": "github" }, "original": { @@ -622,11 +622,11 @@ ] }, "locked": { - "lastModified": 1707016097, - "narHash": "sha256-V4lHr6hFQ3rK650dh64Xffxsf4kse9vUYWsM+ldjkco=", + "lastModified": 1707620986, + "narHash": "sha256-XE0tCSkSVBeJDWhjFwusNInwAhrnp+TloUNUpvnTiLw=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "3e3dad2808379c522138e2e8b0eb73500721a237", + "rev": "0cb4345704123492e6d1f1068629069413c80de0", "type": "github" }, "original": { @@ -723,11 +723,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1707268954, - "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=", + "lastModified": 1708118438, + "narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1", + "rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80", "type": "github" }, "original": { @@ -1129,11 +1129,11 @@ ] }, "locked": { - "lastModified": 1706145785, - "narHash": "sha256-j9MP4fv2U/vdRKAXXc2gyMTmYwVnHP6kHx1/y6jprrU=", + "lastModified": 1706521509, + "narHash": "sha256-AInZ50acOJ3wzUwGzNr1TmxGTMx+8j6oSTzz4E7Vbp8=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "5a592647587cd20b9692a347df6939b6d371b3bb", + "rev": "c06fd88b3da492b8f9067be021b9184f7012b5a8", "type": "github" }, "original": { From a7438c3d6e5d0d35caaf330a374f422ef79d3230 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 28 Feb 2024 01:00:29 -0300 Subject: [PATCH 088/404] btop: enable gpu monitoring --- hosts/monolith.nix | 1 + user/home.nix | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hosts/monolith.nix b/hosts/monolith.nix index 451a6e7..0ab6229 100644 --- a/hosts/monolith.nix +++ b/hosts/monolith.nix @@ -43,6 +43,7 @@ in vaapiVdpau rocm-opencl-icd rocm-opencl-runtime + rocmPackages.rocm-smi ]; programs.corectrl.enable = true; diff --git a/user/home.nix b/user/home.nix index d55c77b..d7a00a3 100644 --- a/user/home.nix +++ b/user/home.nix @@ -70,7 +70,9 @@ comma # System monitors - btop + (btop.override { + cudaSupport = true; + }) amdgpu_top inxi dmidecode From f73919fce5ba85f4c4ed580a605b4c03f9af4d99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 15 Mar 2024 19:33:18 -0300 Subject: [PATCH 089/404] update --- flake.lock | 61 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 34 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 01252a1..652a398 100644 --- a/flake.lock +++ b/flake.lock @@ -476,11 +476,11 @@ ] }, "locked": { - "lastModified": 1708031129, - "narHash": "sha256-EH20hJfNnc1/ODdDVat9B7aKm0B95L3YtkIRwKLvQG8=", + "lastModified": 1709764752, + "narHash": "sha256-+lM4J4JoJeiN8V+3WSWndPHj1pJ9Jc1UMikGbXLqCTk=", "owner": "nix-community", "repo": "home-manager", - "rev": "3d6791b3897b526c82920a2ab5f61d71985b3cf8", + "rev": "cf111d1a849ddfc38e9155be029519b0e2329615", "type": "github" }, "original": { @@ -492,6 +492,7 @@ "hyprland": { "inputs": { "hyprland-protocols": "hyprland-protocols", + "hyprlang": "hyprlang", "nixpkgs": [ "nixpkgs" ], @@ -500,11 +501,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1708186866, - "narHash": "sha256-xkTtBVu9uJvTet0IRVD/FYosB1LrFQhL37qVM+P1Hq0=", + "lastModified": 1709818078, + "narHash": "sha256-U/o8d5E+0GlTUFNkAzt56wHlUHfoIg3sZPer+GywDFQ=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "289d952a6ee02f6d54a0899870bbec52ff9a53df", + "rev": "6c4e2489a0a153ac2a92744ecb2985280c97fc89", "type": "github" }, "original": { @@ -542,16 +543,19 @@ "inputs": { "nixpkgs": [ "hyprland", - "xdph", "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" ] }, "locked": { - "lastModified": 1704287638, - "narHash": "sha256-TuRXJGwtK440AXQNl5eiqmQqY4LZ/9+z/R7xC0ie3iA=", + "lastModified": 1709775675, + "narHash": "sha256-G+gIMUQBtfbbrnsM/OPJzebdqKFP6typplNCE7X8Szw=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "6624f2bb66d4d27975766e81f77174adbe58ec97", + "rev": "f1db1a7e1faee2a5c67d03b6bd283da82eed3730", "type": "github" }, "original": { @@ -622,11 +626,11 @@ ] }, "locked": { - "lastModified": 1707620986, - "narHash": "sha256-XE0tCSkSVBeJDWhjFwusNInwAhrnp+TloUNUpvnTiLw=", + "lastModified": 1709708644, + "narHash": "sha256-XAFOkZ6yexsqeJrCXWoHxopq0i+7ZqbwATXomMnGmr4=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "0cb4345704123492e6d1f1068629069413c80de0", + "rev": "94a1e46434736a40f976a454f8bd3ea2144f349b", "type": "github" }, "original": { @@ -723,11 +727,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1708118438, - "narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=", + "lastModified": 1709703039, + "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80", + "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", "type": "github" }, "original": { @@ -755,11 +759,11 @@ "ranger-icons": { "flake": false, "locked": { - "lastModified": 1707118400, - "narHash": "sha256-HLeiV3c+8fl3kiht01s3H/HGPABPC2033rMB/uXKwLM=", + "lastModified": 1709209315, + "narHash": "sha256-ETE13REDIVuoFIbvWqWvQLj/2fGST+1koowmmuBzGmo=", "owner": "alexanderjeurissen", "repo": "ranger_devicons", - "rev": "2c3c19dffb4238d01c74515c9eed5088066db243", + "rev": "ed718dd6a6d5d2c0f53cba8474c5ad96185057e9", "type": "github" }, "original": { @@ -1097,18 +1101,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1706359063, - "narHash": "sha256-5HUTG0p+nCJv3cn73AmFHRZdfRV5AD5N43g8xAePSKM=", + "lastModified": 1708558866, + "narHash": "sha256-Mz6hCtommq7RQfcPnxLINigO4RYSNt23HeJHC6mVmWI=", "owner": "wlroots", "repo": "wlroots", - "rev": "00b869c1a96f300a8f25da95d624524895e0ddf2", + "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "00b869c1a96f300a8f25da95d624524895e0ddf2", + "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5", "type": "gitlab" } }, @@ -1118,7 +1122,10 @@ "hyprland", "hyprland-protocols" ], - "hyprlang": "hyprlang", + "hyprlang": [ + "hyprland", + "hyprlang" + ], "nixpkgs": [ "hyprland", "nixpkgs" @@ -1129,11 +1136,11 @@ ] }, "locked": { - "lastModified": 1706521509, - "narHash": "sha256-AInZ50acOJ3wzUwGzNr1TmxGTMx+8j6oSTzz4E7Vbp8=", + "lastModified": 1709299639, + "narHash": "sha256-jYqJM5khksLIbqSxCLUUcqEgI+O2LdlSlcMEBs39CAU=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "c06fd88b3da492b8f9067be021b9184f7012b5a8", + "rev": "2d2fb547178ec025da643db57d40a971507b82fe", "type": "github" }, "original": { From b661f8d314e4416ec85e69faa056c95fb460a158 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 15 Mar 2024 23:08:35 -0300 Subject: [PATCH 090/404] lsp: replace rnix-lsp with nil --- user/kakoune/kak-lsp.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user/kakoune/kak-lsp.toml b/user/kakoune/kak-lsp.toml index ef96bc4..3a62a08 100644 --- a/user/kakoune/kak-lsp.toml +++ b/user/kakoune/kak-lsp.toml @@ -69,11 +69,11 @@ roots = ["package.json"] command = "vscode-json-languageserver" args = ["--stdio"] -[language_server.rnix-lsp] +[language_server.nil] filetypes = ["nix"] command = "nil" roots = ["flake.nix", "shell.nix", ".git"] -[language.nix.settings.nil] +[language_server.nil.settings.nil] formatting.command = [ "nixpkgs-fmt" ] [language_server.intelephense] From 4ddcf16ac04d344a42477291079fdc6c827a10bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 15 Mar 2024 23:08:57 -0300 Subject: [PATCH 091/404] update --- flake.lock | 129 +++++++++++++++++++++++++++++++----------- user/fish/default.nix | 1 - 2 files changed, 97 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index 652a398..e551703 100644 --- a/flake.lock +++ b/flake.lock @@ -360,7 +360,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1681202837, @@ -378,7 +378,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_6" + "systems": "systems_7" }, "locked": { "lastModified": 1681202837, @@ -396,7 +396,7 @@ }, "flake-utils_6": { "inputs": { - "systems": "systems_8" + "systems": "systems_9" }, "locked": { "lastModified": 1694529238, @@ -414,7 +414,7 @@ }, "flake-utils_7": { "inputs": { - "systems": "systems_9" + "systems": "systems_10" }, "locked": { "lastModified": 1681202837, @@ -432,7 +432,7 @@ }, "flake-utils_8": { "inputs": { - "systems": "systems_10" + "systems": "systems_11" }, "locked": { "lastModified": 1681202837, @@ -476,11 +476,11 @@ ] }, "locked": { - "lastModified": 1709764752, - "narHash": "sha256-+lM4J4JoJeiN8V+3WSWndPHj1pJ9Jc1UMikGbXLqCTk=", + "lastModified": 1710532761, + "narHash": "sha256-SUXGZNrXX05YA9G6EmgupxhOr3swI1gcxLUeDMUhrEY=", "owner": "nix-community", "repo": "home-manager", - "rev": "cf111d1a849ddfc38e9155be029519b0e2329615", + "rev": "206f457fffdb9a73596a4cb2211a471bd305243d", "type": "github" }, "original": { @@ -489,23 +489,50 @@ "type": "github" } }, + "hyprcursor": { + "inputs": { + "hyprlang": "hyprlang", + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1710257359, + "narHash": "sha256-43re5pzE/cswFAgw92/ugsB3+d5ufDaCcLtl9ztKfBo=", + "owner": "hyprwm", + "repo": "hyprcursor", + "rev": "1761f6cefd77f4fcd2039d930c88d6716ddc4974", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprcursor", + "type": "github" + } + }, "hyprland": { "inputs": { + "hyprcursor": "hyprcursor", "hyprland-protocols": "hyprland-protocols", - "hyprlang": "hyprlang", + "hyprlang": "hyprlang_2", "nixpkgs": [ "nixpkgs" ], - "systems": "systems_4", + "systems": "systems_5", "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1709818078, - "narHash": "sha256-U/o8d5E+0GlTUFNkAzt56wHlUHfoIg3sZPer+GywDFQ=", + "lastModified": 1710538160, + "narHash": "sha256-p5Wkl2rXjFftd+Nugiq71BgGAl4E9byYxKV0ahLTo+U=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "6c4e2489a0a153ac2a92744ecb2985280c97fc89", + "rev": "2a2da6082e5f1501731004b755d35a8dbb605fde", "type": "github" }, "original": { @@ -540,6 +567,29 @@ } }, "hyprlang": { + "inputs": { + "nixpkgs": [ + "hyprland", + "hyprcursor", + "nixpkgs" + ], + "systems": "systems_4" + }, + "locked": { + "lastModified": 1709914708, + "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprlang_2": { "inputs": { "nixpkgs": [ "hyprland", @@ -551,11 +601,11 @@ ] }, "locked": { - "lastModified": 1709775675, - "narHash": "sha256-G+gIMUQBtfbbrnsM/OPJzebdqKFP6typplNCE7X8Szw=", + "lastModified": 1709914708, + "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "f1db1a7e1faee2a5c67d03b6bd283da82eed3730", + "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2", "type": "github" }, "original": { @@ -626,11 +676,11 @@ ] }, "locked": { - "lastModified": 1709708644, - "narHash": "sha256-XAFOkZ6yexsqeJrCXWoHxopq0i+7ZqbwATXomMnGmr4=", + "lastModified": 1710120787, + "narHash": "sha256-tlLuB73OCOKtU2j83bQzSYFyzjJo3rjpITZE5MoofG8=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "94a1e46434736a40f976a454f8bd3ea2144f349b", + "rev": "e76ff2df6bfd2abe06abd8e7b9f217df941c1b07", "type": "github" }, "original": { @@ -727,11 +777,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1709703039, - "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", + "lastModified": 1710451336, + "narHash": "sha256-pP86Pcfu3BrAvRO7R64x7hs+GaQrjFes+mEPowCfkxY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", + "rev": "d691274a972b3165335d261cc4671335f5c67de9", "type": "github" }, "original": { @@ -917,6 +967,21 @@ "type": "github" } }, + "systems_11": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -964,16 +1029,16 @@ }, "systems_5": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -1060,7 +1125,7 @@ }, "utils": { "inputs": { - "systems": "systems_7" + "systems": "systems_8" }, "locked": { "lastModified": 1689068808, @@ -1101,18 +1166,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1708558866, - "narHash": "sha256-Mz6hCtommq7RQfcPnxLINigO4RYSNt23HeJHC6mVmWI=", + "lastModified": 1709983277, + "narHash": "sha256-wXWIJLd4F2JZeMaihWVDW/yYXCLEC8OpeNJZg9a9ly8=", "owner": "wlroots", "repo": "wlroots", - "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5", + "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5", + "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b", "type": "gitlab" } }, diff --git a/user/fish/default.nix b/user/fish/default.nix index 344207e..913e514 100644 --- a/user/fish/default.nix +++ b/user/fish/default.nix @@ -69,7 +69,6 @@ in { programs = { zoxide.enable = true; eza.enable = true; - eza.enableAliases = true; direnv.enable = true; direnv.nix-direnv.enable = true; }; From 0dd001f2b28fa1944d442e32e3171c28274948c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 15 Mar 2024 23:10:43 -0300 Subject: [PATCH 092/404] gpg: simplify config --- user/gpg.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/gpg.nix b/user/gpg.nix index a56529e..5dc20d0 100644 --- a/user/gpg.nix +++ b/user/gpg.nix @@ -4,7 +4,7 @@ enable = true; defaultCacheTtl = 604800; maxCacheTtl = 604800; - pinentryFlavor = "qt"; + pinentryPackage = pkgs.pinentry-curses; extraConfig = '' allow-preset-passphrase ''; From e6f20117ceaee70e6319550f603a7d274b816cf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 16 Mar 2024 00:23:11 -0300 Subject: [PATCH 093/404] mangohud: install patch to fix keybind crash --- overlays/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/overlays/default.nix b/overlays/default.nix index 6782ca4..b34ed17 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -52,6 +52,14 @@ patches = old.patches ++ [ ../patches/sway/fix-hide_cursor-clearing-focus.patch ]; }); + mangohud = prev.mangohud.overrideAttrs (o: { + patches = o.patches ++ [ + (prev.fetchpatch { + url = "https://github.com/flightlessmango/MangoHud/commit/95141de657e02577f1d3fab0ca12122bfb68bc56.patch"; + hash = "sha256-a2tESliGBkfF7uYQn8TDgeFt07A9FOioI4VcTT7DC7A="; + }) + ]; + }); }); variables = (final: prev: { From 312ea4a18eee908306089256e8b65b5507fb7369 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sun, 17 Mar 2024 00:07:13 -0300 Subject: [PATCH 094/404] syncthing: enable tray icon --- user/syncthing.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/user/syncthing.nix b/user/syncthing.nix index ff2d4db..7177ff7 100644 --- a/user/syncthing.nix +++ b/user/syncthing.nix @@ -1,8 +1,6 @@ -{ config, pkgs, lib, inputs, ... }: -let inherit (pkgs.uservars) key theme color accent font; -in { +{ ... }: { services.syncthing = { enable = true; - # tray.enable = true; + tray.enable = true; }; } From 1e89a79f1eb088c69979aa20fb5e806c4302e10c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sun, 17 Mar 2024 00:07:26 -0300 Subject: [PATCH 095/404] theme: improve qt theming --- user/sway/theme.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/user/sway/theme.nix b/user/sway/theme.nix index 74b6157..414a588 100644 --- a/user/sway/theme.nix +++ b/user/sway/theme.nix @@ -33,12 +33,10 @@ lib.mkIf (desktop == "sway") in { gtk4 = shared; gtk3 = shared; } ); - # qt = { - # enable = true; - # platformTheme = "gtk"; - # # style.package = pkgs.libsForQt5.qtstyleplugins; - # # style.name = "gtk2"; - # }; + qt = { + enable = true; + platformTheme = "qtct"; + }; dconf.settings = { "org/gnome/desktop/interface" = { @@ -79,10 +77,11 @@ lib.mkIf (desktop == "sway") }; }; - home.sessionVariables = { QT_QPA_PLATFORMTHEME = "gtk3"; }; home.packages = with pkgs; [ libsForQt5.qt5ct libsForQt5.qtstyleplugin-kvantum + qt6Packages.qt6ct + qt6Packages.qtstyleplugin-kvantum pkgs.bibata-cursors pkgs.orchis_theme_compact From 8ad194e925a9b9144a72646f0a91e4386d623abd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 20 Mar 2024 16:11:45 -0300 Subject: [PATCH 096/404] kdenlive: fix theme --- system/media-packages.nix | 2 +- user/gnome.nix | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/system/media-packages.nix b/system/media-packages.nix index 95675be..e72ea0a 100644 --- a/system/media-packages.nix +++ b/system/media-packages.nix @@ -16,7 +16,7 @@ in { gimp inkscape krita - kdenlive + kdePackages.kdenlive pitivi blender-hip libreoffice diff --git a/user/gnome.nix b/user/gnome.nix index 956c1cd..70438c3 100644 --- a/user/gnome.nix +++ b/user/gnome.nix @@ -36,6 +36,8 @@ libsForQt5.qt5ct libsForQt5.qtstyleplugin-kvantum + qt6Packages.qt6ct + qt6Packages.qtstyleplugin-kvantum ]; home.sessionVariables = { QT_QPA_PLATFORMTHEME = "qt5ct"; }; From cce92c735aa76104e8686919a15625fb99256410 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sun, 24 Mar 2024 12:30:09 -0300 Subject: [PATCH 097/404] syncthing: way for tray --- user/syncthing.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/user/syncthing.nix b/user/syncthing.nix index 7177ff7..8f36eeb 100644 --- a/user/syncthing.nix +++ b/user/syncthing.nix @@ -1,6 +1,9 @@ { ... }: { services.syncthing = { enable = true; - tray.enable = true; + tray = { + enable = true; + command = "syncthingtray --wait"; + }; }; } From d6d91fc7a909da2499706168ef70b953e29491b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 27 Mar 2024 16:46:04 -0300 Subject: [PATCH 098/404] flake: update lockfile --- flake.lock | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/flake.lock b/flake.lock index e551703..9984cc7 100644 --- a/flake.lock +++ b/flake.lock @@ -55,6 +55,22 @@ "type": "github" } }, + "blobs": { + "flake": false, + "locked": { + "lastModified": 1604995301, + "narHash": "sha256-wcLzgLec6SGJA8fx1OEN1yV/Py5b+U5iyYpksUY/yLw=", + "owner": "simple-nixos-mailserver", + "repo": "blobs", + "rev": "2cccdf1ca48316f2cfd1c9a0017e8de5a7156265", + "type": "gitlab" + }, + "original": { + "owner": "simple-nixos-mailserver", + "repo": "blobs", + "type": "gitlab" + } + }, "crane": { "inputs": { "flake-compat": "flake-compat", @@ -289,6 +305,22 @@ "type": "github" } }, + "flake-compat_5": { + "flake": false, + "locked": { + "lastModified": 1668681692, + "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "009399224d5e398d03b22badca40a37ac85412a1", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems_2" @@ -728,6 +760,32 @@ "type": "github" } }, + "nixos-mailserver": { + "inputs": { + "blobs": "blobs", + "flake-compat": "flake-compat_5", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-23_05": "nixpkgs-23_05", + "nixpkgs-23_11": "nixpkgs-23_11", + "utils": "utils_2" + }, + "locked": { + "lastModified": 1706219574, + "narHash": "sha256-qO+8UErk+bXCq2ybHU4GzXG4Ejk4Tk0rnnTPNyypW4g=", + "owner": "simple-nixos-mailserver", + "repo": "nixos-mailserver", + "rev": "e47f3719f1db3e0961a4358d4cb234a0acaa7baf", + "type": "gitlab" + }, + "original": { + "owner": "simple-nixos-mailserver", + "ref": "nixos-23.11", + "repo": "nixos-mailserver", + "type": "gitlab" + } + }, "nixpkgs": { "locked": { "lastModified": 1702539185, @@ -743,6 +801,36 @@ "type": "indirect" } }, + "nixpkgs-23_05": { + "locked": { + "lastModified": 1704290814, + "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-23.05", + "type": "indirect" + } + }, + "nixpkgs-23_11": { + "locked": { + "lastModified": 1706098335, + "narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a77ab169a83a4175169d78684ddd2e54486ac651", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-23.11", + "type": "indirect" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1692638711, @@ -836,6 +924,7 @@ "nix-index-database": "nix-index-database", "nix-software-center": "nix-software-center", "nixos-conf-editor": "nixos-conf-editor", + "nixos-mailserver": "nixos-mailserver", "nixpkgs": "nixpkgs_4", "plymouth-themes": "plymouth-themes", "ranger-icons": "ranger-icons", @@ -1141,6 +1230,21 @@ "type": "github" } }, + "utils_2": { + "locked": { + "lastModified": 1605370193, + "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5021eac20303a61fafe17224c087f5519baed54d", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "wl-crosshair": { "inputs": { "flake-utils": "flake-utils_8", From 39707b0a30d01c5de00c1dc654efe8ee3ad0bddb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 6 Apr 2024 20:45:03 -0300 Subject: [PATCH 099/404] sway: add more env vars to dbus activation --- overlays/sway.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overlays/sway.nix b/overlays/sway.nix index 4de4395..c6d8d5e 100644 --- a/overlays/sway.nix +++ b/overlays/sway.nix @@ -11,7 +11,7 @@ executable = true; text = '' systemctl --user import-environment - dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway + dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway SWAYSOCK # systemctl --user stop pipewire wireplumber xdg-desktop-portal xdg-desktop-portal-wlr # systemctl --user start pipewire wireplumber xdg-desktop-portal xdg-desktop-portal-wlr ''; From 53291508c3335753dd74690668d01a488f649a52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 6 Apr 2024 20:45:30 -0300 Subject: [PATCH 100/404] sshd: disable until xz is secure --- system/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/configuration.nix b/system/configuration.nix index 189fa1c..93d828c 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -59,7 +59,7 @@ security.rtkit.enable = true; services.openssh = { - enable = true; + enable = false; ports = [ 9022 ]; settings = { PermitRootLogin = "no"; From 26c6596beb8858e122b82a3ef523b1fa17b57cee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 6 Apr 2024 20:51:48 -0300 Subject: [PATCH 101/404] monolith: add forgejo runner --- flake.nix | 1 + secrets/monolith-forgejo-runner-token.age | Bin 0 -> 682 bytes secrets/secrets.nix | 1 + system/monolith-forgejo-runner.nix | 19 +++++++++++++++++++ system/secrets.nix | 2 ++ 5 files changed, 23 insertions(+) create mode 100644 secrets/monolith-forgejo-runner-token.age create mode 100644 system/monolith-forgejo-runner.nix diff --git a/flake.nix b/flake.nix index 3bff3c6..f3a4532 100644 --- a/flake.nix +++ b/flake.nix @@ -123,6 +123,7 @@ modules = [ ./hosts/monolith.nix ./system/monolith-gitlab-runner.nix + ./system/monolith-forgejo-runner.nix ./system/nix-serve.nix ./system/steam.nix ] ++ common_modules; diff --git a/secrets/monolith-forgejo-runner-token.age b/secrets/monolith-forgejo-runner-token.age new file mode 100644 index 0000000000000000000000000000000000000000..aa3deb8968d525267e9c1267b5d556cc19a70f39 GIT binary patch literal 682 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!*`Do#{zDlf0_Nasp73NNfOP6|n} zNDQ$EOUmv%k*^f4KoRG^b4+ZDy;Bz%k}pNPY(+;F%L_0O$*jfukgurHO{m! zEXpWy%lGv3_b*DzEA%(yN{vXW(l<3K&T%v}a82_sPp%3#4^1sg@y{_buWtZ+*8EG|uV^zt_j$}Dv8ObUnyEVaxC$_NSa$}_Y`EDkcUOicEg-r zSAW_6O^oT4 Date: Wed, 1 May 2024 15:53:07 -0300 Subject: [PATCH 102/404] monolith: enable all features of corectrl --- hosts/monolith.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/hosts/monolith.nix b/hosts/monolith.nix index 0ab6229..c5dcece 100644 --- a/hosts/monolith.nix +++ b/hosts/monolith.nix @@ -46,7 +46,14 @@ in rocmPackages.rocm-smi ]; - programs.corectrl.enable = true; + programs.corectrl = { + enable = true; + gpuOverclock = { + enable = true; + ppfeaturemask = "0xffffffff"; + }; + }; + virtualisation.virtualbox.host.enable = true; fileSystems."/" = { From 997b162da42e66f3a824f1a0ef626d3c6587e666 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 10 May 2024 17:29:11 -0300 Subject: [PATCH 103/404] firefox: add substitoot extension --- user/firefox.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/user/firefox.nix b/user/firefox.nix index 9c29b25..49314e4 100644 --- a/user/firefox.nix +++ b/user/firefox.nix @@ -43,6 +43,11 @@ in url = "https://addons.mozilla.org/firefox/downloads/file/4215691/mastodon_simplified_federation-2.2.xpi"; hash = "sha256-4iU25chpjsdsMTPaa0yQOTWc9V9q1qFz6YV0lYtNjLA="; }) + (pkgs.fetchFirefoxAddon { + name = "substitoot"; + url = "https://addons.mozilla.org/firefox/downloads/file/4236602/substitoot-0.7.2.0.xpi"; + hash = "sha256-1auSqEjkebwRSbmAVUsYwy77dl7TQCOnqgozpoVnqgI="; + }) # Locale (pkgs.fetchFirefoxAddon { From ae86236e78ae80196847b3b2ac0d94213f16d10e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 10 May 2024 19:48:35 -0300 Subject: [PATCH 104/404] update --- flake.lock | 221 ++++++++++------------- overlays/default.nix | 4 - patches/webcord/fix-reading-config.patch | 14 -- system/configuration.nix | 2 +- user/sway/kanshi.nix | 50 ++--- user/sway/swaylock.nix | 2 +- user/sway/theme.nix | 2 +- user/variables.nix | 4 +- 8 files changed, 133 insertions(+), 166 deletions(-) delete mode 100644 patches/webcord/fix-reading-config.patch diff --git a/flake.lock b/flake.lock index 9984cc7..7dc918c 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1707830867, - "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=", + "lastModified": 1715290355, + "narHash": "sha256-2T7CHTqBXJJ3ZC6R/4TXTcKoXWHcvubKNj9SfomURnw=", "owner": "ryantm", "repo": "agenix", - "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6", + "rev": "8d37c5bdeade12b6479c85acd133063ab53187a0", "type": "github" }, "original": { @@ -186,33 +186,16 @@ "type": "github" } }, - "dzgui": { - "flake": false, - "locked": { - "lastModified": 1702780245, - "narHash": "sha256-cdW5LN2Q7eYW8xIqKPQfeYPd7e6VdJGaoA9NMHesCrE=", - "owner": "aclist", - "repo": "dztui", - "rev": "28323f3edb8fa747dc559d1939ccdd7729e4e3a1", - "type": "github" - }, - "original": { - "owner": "aclist", - "repo": "dztui", - "type": "github" - } - }, "dzgui-nix": { "inputs": { - "dzgui": "dzgui", "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1702850463, - "narHash": "sha256-qR/c/GjsLUzrCyHN/Q9nnClduf6OqTg26S1AFYKPzxA=", + "lastModified": 1715128199, + "narHash": "sha256-mj23cBtiDKy3pgg+J26UA8giZgmJApO8IQlC6+XTAx8=", "owner": "lelgenio", "repo": "dzgui-nix", - "rev": "2ed6515b27d8186b9fedfe1dcaf861f07e796a0d", + "rev": "03968bade43d23c47e8b4f102c711c171c446645", "type": "github" }, "original": { @@ -392,7 +375,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1681202837, @@ -410,7 +393,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_7" + "systems": "systems_6" }, "locked": { "lastModified": 1681202837, @@ -428,7 +411,7 @@ }, "flake-utils_6": { "inputs": { - "systems": "systems_9" + "systems": "systems_8" }, "locked": { "lastModified": 1694529238, @@ -446,7 +429,7 @@ }, "flake-utils_7": { "inputs": { - "systems": "systems_10" + "systems": "systems_9" }, "locked": { "lastModified": 1681202837, @@ -464,14 +447,14 @@ }, "flake-utils_8": { "inputs": { - "systems": "systems_11" + "systems": "systems_10" }, "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -508,11 +491,11 @@ ] }, "locked": { - "lastModified": 1710532761, - "narHash": "sha256-SUXGZNrXX05YA9G6EmgupxhOr3swI1gcxLUeDMUhrEY=", + "lastModified": 1715359697, + "narHash": "sha256-FJYyXqulIbCdsUCTFBTu/bIH4aN+7jzjQAn52Qc6qPg=", "owner": "nix-community", "repo": "home-manager", - "rev": "206f457fffdb9a73596a4cb2211a471bd305243d", + "rev": "f2c5ba5e720fd584d83f2f97399dac0d26ae60b9", "type": "github" }, "original": { @@ -523,7 +506,10 @@ }, "hyprcursor": { "inputs": { - "hyprlang": "hyprlang", + "hyprlang": [ + "hyprland", + "hyprlang" + ], "nixpkgs": [ "hyprland", "nixpkgs" @@ -534,11 +520,11 @@ ] }, "locked": { - "lastModified": 1710257359, - "narHash": "sha256-43re5pzE/cswFAgw92/ugsB3+d5ufDaCcLtl9ztKfBo=", + "lastModified": 1713612213, + "narHash": "sha256-zJboXgWNpNhKyNF8H/3UYzWkx7w00TOCGKi3cwi+tsw=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "1761f6cefd77f4fcd2039d930c88d6716ddc4974", + "rev": "cab4746180f210a3c1dd3d53e45c510e309e90e1", "type": "github" }, "original": { @@ -550,21 +536,20 @@ "hyprland": { "inputs": { "hyprcursor": "hyprcursor", - "hyprland-protocols": "hyprland-protocols", - "hyprlang": "hyprlang_2", + "hyprlang": "hyprlang", + "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": [ "nixpkgs" ], - "systems": "systems_5", - "wlroots": "wlroots", + "systems": "systems_4", "xdph": "xdph" }, "locked": { - "lastModified": 1710538160, - "narHash": "sha256-p5Wkl2rXjFftd+Nugiq71BgGAl4E9byYxKV0ahLTo+U=", + "lastModified": 1715342341, + "narHash": "sha256-jHCjAwaukNCI7yVsbB8oppl1dUujvFAfRiXaecqWGI0=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "2a2da6082e5f1501731004b755d35a8dbb605fde", + "rev": "38911d6df4977b6b00557cc887eb151d032e505b", "type": "github" }, "original": { @@ -577,10 +562,12 @@ "inputs": { "nixpkgs": [ "hyprland", + "xdph", "nixpkgs" ], "systems": [ "hyprland", + "xdph", "systems" ] }, @@ -602,17 +589,19 @@ "inputs": { "nixpkgs": [ "hyprland", - "hyprcursor", "nixpkgs" ], - "systems": "systems_4" + "systems": [ + "hyprland", + "systems" + ] }, "locked": { - "lastModified": 1709914708, - "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=", + "lastModified": 1713121246, + "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2", + "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706", "type": "github" }, "original": { @@ -621,7 +610,7 @@ "type": "github" } }, - "hyprlang_2": { + "hyprwayland-scanner": { "inputs": { "nixpkgs": [ "hyprland", @@ -633,16 +622,16 @@ ] }, "locked": { - "lastModified": 1709914708, - "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=", + "lastModified": 1715287423, + "narHash": "sha256-B7AJIjOyWgVMKhu7DlOnWa0VprdhywUVHuB/j+EwSxM=", "owner": "hyprwm", - "repo": "hyprlang", - "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2", + "repo": "hyprwayland-scanner", + "rev": "e2fc1c0eb8b392110588f478cce644348ead7271", "type": "github" }, "original": { "owner": "hyprwm", - "repo": "hyprlang", + "repo": "hyprwayland-scanner", "type": "github" } }, @@ -708,11 +697,11 @@ ] }, "locked": { - "lastModified": 1710120787, - "narHash": "sha256-tlLuB73OCOKtU2j83bQzSYFyzjJo3rjpITZE5MoofG8=", + "lastModified": 1714878592, + "narHash": "sha256-E68C03sYRsYFsK7wiGHUIJm8IsyPRALOrFoTL0glXnI=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "e76ff2df6bfd2abe06abd8e7b9f217df941c1b07", + "rev": "a362555e9dbd4ecff3bb98969bbdb8f79fe87f10", "type": "github" }, "original": { @@ -723,15 +712,16 @@ }, "nix-software-center": { "inputs": { + "nixos-appstream-data": "nixos-appstream-data", "nixpkgs": "nixpkgs_2", "utils": "utils" }, "locked": { - "lastModified": 1703105285, - "narHash": "sha256-BHoW1RQMc2Auz8paBvTBriKv0F6FI99+3nnz/ELLawg=", + "lastModified": 1714856183, + "narHash": "sha256-Ue7xV+rZqImux4DDj3VMla4LIH2g8VeXbTJwgvX7wOo=", "owner": "vlinkz", "repo": "nix-software-center", - "rev": "68e87fb6e24fb3e6fe65449918d0cbda96622b65", + "rev": "b9e0f53536e1e94e7d8c3cda3c6866b3f9d01386", "type": "github" }, "original": { @@ -740,6 +730,32 @@ "type": "github" } }, + "nixos-appstream-data": { + "inputs": { + "flake-utils": [ + "nix-software-center", + "utils" + ], + "nixpkgs": [ + "nix-software-center", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1712858390, + "narHash": "sha256-XE7gr+zU3N4SHPAhsgk8cVAFp1iBg+Lxxp3y4dUF1vE=", + "owner": "korfuri", + "repo": "nixos-appstream-data", + "rev": "0465d42a4433faa63b7a5eb0b8d397937c9fc13a", + "type": "github" + }, + "original": { + "owner": "korfuri", + "ref": "flake", + "repo": "nixos-appstream-data", + "type": "github" + } + }, "nixos-conf-editor": { "inputs": { "flake-compat": "flake-compat_3", @@ -788,11 +804,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1702539185, - "narHash": "sha256-KnIRG5NMdLIpEkZTnN5zovNYc0hhXjAgv6pfd5Z4c7U=", + "lastModified": 1714562304, + "narHash": "sha256-Mr3U37Rh6tH0FbaDFu0aZDwk9mPAe7ASaqDOGgLqqLU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "aa9d4729cbc99dabacb50e3994dcefb3ea0f7447", + "rev": "bcd44e224fd68ce7d269b4f44d24c2220fd821e7", "type": "github" }, "original": { @@ -865,11 +881,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1710451336, - "narHash": "sha256-pP86Pcfu3BrAvRO7R64x7hs+GaQrjFes+mEPowCfkxY=", + "lastModified": 1715266358, + "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d691274a972b3165335d261cc4671335f5c67de9", + "rev": "f1010e0469db743d14519a1efd37e23f8513d714", "type": "github" }, "original": { @@ -897,11 +913,11 @@ "ranger-icons": { "flake": false, "locked": { - "lastModified": 1709209315, - "narHash": "sha256-ETE13REDIVuoFIbvWqWvQLj/2fGST+1koowmmuBzGmo=", + "lastModified": 1713564482, + "narHash": "sha256-sijO9leDXgnjgcVlh5fKYalhjOupwFMRyH0xh2g/rEQ=", "owner": "alexanderjeurissen", "repo": "ranger_devicons", - "rev": "ed718dd6a6d5d2c0f53cba8474c5ad96185057e9", + "rev": "a8d626485ca83719e1d8d5e32289cd96a097c861", "type": "github" }, "original": { @@ -1056,21 +1072,6 @@ "type": "github" } }, - "systems_11": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -1118,16 +1119,16 @@ }, "systems_5": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -1214,7 +1215,7 @@ }, "utils": { "inputs": { - "systems": "systems_8" + "systems": "systems_7" }, "locked": { "lastModified": 1689068808, @@ -1253,11 +1254,11 @@ ] }, "locked": { - "lastModified": 1685576039, - "narHash": "sha256-WMkWurJsZZG7YkWzW/k2SNquYLsAZjzFs7CFswSjDew=", + "lastModified": 1715216838, + "narHash": "sha256-q5key9BWJjJQqECrhflso9ZTzULBeScvromo0S4fjqE=", "owner": "lelgenio", "repo": "wl-crosshair", - "rev": "57d0908e10d9f58fc37fe866404cc8b66be1f0d9", + "rev": "39b716cf410a1b45006f50f32f8d63de5c43aedb", "type": "github" }, "original": { @@ -1266,31 +1267,9 @@ "type": "github" } }, - "wlroots": { - "flake": false, - "locked": { - "host": "gitlab.freedesktop.org", - "lastModified": 1709983277, - "narHash": "sha256-wXWIJLd4F2JZeMaihWVDW/yYXCLEC8OpeNJZg9a9ly8=", - "owner": "wlroots", - "repo": "wlroots", - "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b", - "type": "gitlab" - }, - "original": { - "host": "gitlab.freedesktop.org", - "owner": "wlroots", - "repo": "wlroots", - "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b", - "type": "gitlab" - } - }, "xdph": { "inputs": { - "hyprland-protocols": [ - "hyprland", - "hyprland-protocols" - ], + "hyprland-protocols": "hyprland-protocols", "hyprlang": [ "hyprland", "hyprlang" @@ -1305,11 +1284,11 @@ ] }, "locked": { - "lastModified": 1709299639, - "narHash": "sha256-jYqJM5khksLIbqSxCLUUcqEgI+O2LdlSlcMEBs39CAU=", + "lastModified": 1714662532, + "narHash": "sha256-Pj2xGSYhapYbXL7sk7TTlOtCZcTfPQoL3fPbZeg7L4Y=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "2d2fb547178ec025da643db57d40a971507b82fe", + "rev": "1f228ba2f1f254195c0b571302b37482861abee3", "type": "github" }, "original": { diff --git a/overlays/default.nix b/overlays/default.nix index b34ed17..c5d145d 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -35,10 +35,6 @@ tlauncher = inputs.tlauncher.packages.${prev.system}.tlauncher; maildir-notify-daemon = inputs.maildir-notify-daemon.packages.${prev.system}.default; wl-crosshair = inputs.wl-crosshair.packages.${prev.system}.default; - - webcord = (prev.webcord.overrideAttrs (old: { - patches = (old.patches or [ ]) ++ [ ../patches/webcord/fix-reading-config.patch ]; - })); }); patches = (final: prev: { diff --git a/patches/webcord/fix-reading-config.patch b/patches/webcord/fix-reading-config.patch deleted file mode 100644 index 92e89ca..0000000 --- a/patches/webcord/fix-reading-config.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/sources/code/main/modules/config.ts b/sources/code/main/modules/config.ts -index caf51df..41faabe 100644 ---- a/sources/code/main/modules/config.ts -+++ b/sources/code/main/modules/config.ts -@@ -158,6 +158,9 @@ class Config { - #read(): unknown { - const encodedData = readFileSync(this.#path+this.#pathExtension); - let decodedData = encodedData.toString(); -+ if (decodedData === "") -+ return {}; -+ - if(this.#pathExtension === FileExt.Encrypted) - decodedData = safeStorage.decryptString(encodedData); - return JSON.parse(decodedData); diff --git a/system/configuration.nix b/system/configuration.nix index 93d828c..7c6bbb3 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -99,7 +99,7 @@ }; # Enable touchpad support (enabled default in most desktopManager). - services.xserver.libinput.enable = true; + services.libinput.enable = true; # Define a user account. Don't forget to set a password with ‘passwd’. users.mutableUsers = false; diff --git a/user/sway/kanshi.nix b/user/sway/kanshi.nix index edc2e3f..22d9550 100644 --- a/user/sway/kanshi.nix +++ b/user/sway/kanshi.nix @@ -5,29 +5,35 @@ let in { services.kanshi = { - profiles = { - sedetary = { - outputs = [ - { + settings = [ + { + profile = { + name = "sedetary"; + outputs = [ + { + criteria = "eDP-1"; + status = "disable"; + position = "1920,312"; + } + { + criteria = "HDMI-A-1"; + position = "0,0"; + } + ]; + exec = [ "xrdb .Xresources" ]; + }; + } + { + profile = { + name = "nomad"; + outputs = [{ criteria = "eDP-1"; - status = "disable"; + status = "enable"; position = "1920,312"; - } - { - criteria = "HDMI-A-1"; - position = "0,0"; - } - ]; - exec = [ "xrdb .Xresources" ]; - }; - nomad = { - outputs = [{ - criteria = "eDP-1"; - status = "enable"; - position = "1920,312"; - }]; - exec = [ "xrdb .Xresources" ]; - }; - }; + }]; + exec = [ "xrdb .Xresources" ]; + }; + } + ]; }; } diff --git a/user/sway/swaylock.nix b/user/sway/swaylock.nix index dfd99bc..f9f06eb 100644 --- a/user/sway/swaylock.nix +++ b/user/sway/swaylock.nix @@ -5,7 +5,7 @@ let in { programs.swaylock.settings = { - image = theme.background; + image = toString theme.background; font = font.interface; font-size = font.size.medium; indicator-thickness = 20; diff --git a/user/sway/theme.nix b/user/sway/theme.nix index 414a588..2fc1fc1 100644 --- a/user/sway/theme.nix +++ b/user/sway/theme.nix @@ -35,7 +35,7 @@ lib.mkIf (desktop == "sway") ); qt = { enable = true; - platformTheme = "qtct"; + platformTheme.name = "qtct"; }; dconf.settings = { diff --git a/user/variables.nix b/user/variables.nix index 1103e8b..80ac8ba 100644 --- a/user/variables.nix +++ b/user/variables.nix @@ -27,7 +27,7 @@ let icon_theme = "Papirus-Dark"; cursor_theme = "Bibata-Modern-Classic"; - background = "~/.local/share/backgrounds/nixos-dark-pattern.png"; + background = ./backgrounds/nixos-dark-pattern.png; opacity = 95; opacityHex = "ee"; color = { @@ -58,7 +58,7 @@ let icon_theme = "Papirus-Light"; cursor_theme = "Bibata-Modern-Classic"; - background = "~/.local/share/backgrounds/nixos-light-pattern.png"; + background = ./backgrounds/nixos-light-pattern.png; opacity = 95; opacityHex = "ee"; color = { From f4b83a82e2061b29f0770e1f2fce9bee00b2e3bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 11 May 2024 18:45:55 -0300 Subject: [PATCH 105/404] sway: make gaming windows floating by default --- user/sway/sway-assigns.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/user/sway/sway-assigns.nix b/user/sway/sway-assigns.nix index 3731222..1ec8cf5 100644 --- a/user/sway/sway-assigns.nix +++ b/user/sway/sway-assigns.nix @@ -59,6 +59,7 @@ in { app_id = "wdisplays"; } { app_id = "pavucontrol"; } { app_id = ".*[Hh]elvum.*"; } + { workspace = "9"; } ]; }; }; From 9184709d1fd1c93bf5c744f8b6d0338c1b69d52d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 15 May 2024 12:46:38 -0300 Subject: [PATCH 106/404] ssh: update hostnames --- user/ssh.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user/ssh.nix b/user/ssh.nix index a29dded..8230dc1 100644 --- a/user/ssh.nix +++ b/user/ssh.nix @@ -6,12 +6,12 @@ in { programs.ssh.matchBlocks = { monolith = { user = "lelgenio"; - hostname = "lelgenio.1337.cx"; + hostname = "monolith.lelgenio.com"; port = 9022; }; phantom = { user = "root"; - hostname = "phantom.lelgenio.xyz"; + hostname = "phantom.lelgenio.com"; port = 9022; }; }; From d6387cce8acfb6c6f243d067bd5458140e88b8a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 15 May 2024 12:46:54 -0300 Subject: [PATCH 107/404] firefox: add i dont care about cookies --- user/firefox.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/user/firefox.nix b/user/firefox.nix index 49314e4..b60f808 100644 --- a/user/firefox.nix +++ b/user/firefox.nix @@ -28,6 +28,12 @@ in url = "https://addons.mozilla.org/firefox/downloads/file/4198829/ublock_origin-1.54.0.xpi"; hash = "sha256-l5cWCQgZFxD/CFhTa6bcKeytmSPDCyrW0+XjcddZ5E0="; }) + (pkgs.fetchFirefoxAddon { + name = "i-still-dont-care-about-cookies"; + url = "https://github.com/OhMyGuus/I-Still-Dont-Care-About-Cookies/releases/download/v1.1.4/istilldontcareaboutcookies-1.1.4.xpi"; + hash = "sha256-yt6yRiLTuaK4K/QwgkL9gCVGsSa7ndFOHqZvKqIGZ5U="; + }) + (pkgs.fetchFirefoxAddon { name = "vimium_ff"; url = "https://addons.mozilla.org/firefox/downloads/file/4191523/vimium_ff-2.0.6.xpi"; From 4f4dd8a217d5b00cbdf6de92d592a421bc444d20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 16 May 2024 01:17:57 -0300 Subject: [PATCH 108/404] forgejo-runner: update runner token and url --- secrets/monolith-forgejo-runner-token.age | Bin 682 -> 688 bytes system/monolith-forgejo-runner.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/secrets/monolith-forgejo-runner-token.age b/secrets/monolith-forgejo-runner-token.age index aa3deb8968d525267e9c1267b5d556cc19a70f39..fff63ca77be3834049d16ab0bbac97efd8e6b8a8 100644 GIT binary patch delta 660 zcmZ3*x`B0qMtz2xc0s6#dy-FRezu=wxMfQv6vulofrl(t;sk^D8 zcYtANfw!x3M3KHxd6ctziJxa$nxT1?d6i39S&>PSM}0*VS4nz?c|f5>R6w4SYoLXD zx@Tm1X-KGNsE4t)S#gejuCaD*rLmEruaT*FNI-hJYj|Erl8cvLRJfCezE?qIDVLK| zSaPL%ii@RhkatB{kZ-tCh*MZ%PD+7ma7u2ze{fl%XS%yzkg1njVPr^oMpQ;_S)ONr zcZO?~NqxSzlYt*sZgOHygi%JJS-xdyenh!@mT_*Go2g}{Pf@yis&}?=lu4wyVOmak zLAigirG9#Oo{O=Mak686aj;QXYPhx`m!n~%yT4_Xr>S;eKvbG(aGq19satt^Xi9NX zUXXK`qj9FCr$L^NQ+B3zPOf`qj#)@XWng5ac73^HMx?J-KmeDIU!_N2h?kjRaJZps zX0Ur|v0;EquB*0pW{7E$W0YHBKvHmWMWlITXlb^iUy_+$VTD-ge%- delta 654 zcmdnMx{7szMt!wLVu(dpQl7taXpnJAR#;Amg;&0JnL)NeL1d}7zkXn8 zu5o~`S6Qlyab}TQP?%?dQFv;$zbTh*T4lOhh_i=Vrl*^4m`RAEUvQ;UVTG?-uD?fk zdRU-|d03)rTCje4g-@=lai)b~QAUwlzNe?Ze^FXqVZFa0S87C3mAw_}L2k-58Nj)zB1k+;4}Rews^FsCG%JM`VRls%LR&x}%rBaZqNVi)T_mL}009Mo>mb zkXN3eMPhM~iDhb1P)SjxQMyHCsjpEnSCCVpkBM<^xwmI(R*-9kTX0pHNos{hQdV$g zNnl8Ma!#&Uj$=uFWqGEzrMrPyvSqfjc93JaNqw$%v5}>*PZ?K=hp&sJae-fUdSsM| zORzra9C!bt3gqrNoIPIpHEalQbB~DkymhtrKxdpuB(~1hqix4m1B}?a(F~(rM9D? zaeYv*rBP*;t8tdQJ{Om+uC9W6gkhpVVMJ=0ca(l9&ka2lLkYSojWT1(cQ+j?x zS$IZHsdiC_Q7G4Z4~Bks<9laI7f+tQ`pf=rVoa|r&-z~ZeL4Tyac>prm?W08WtkE3 pYaB(=vW#xCy*4Uq4%f?-TO!iavNcxy@lyH4>|zmav$ySR0RTA7-q!#C diff --git a/system/monolith-forgejo-runner.nix b/system/monolith-forgejo-runner.nix index 2fa82b4..ee07410 100644 --- a/system/monolith-forgejo-runner.nix +++ b/system/monolith-forgejo-runner.nix @@ -4,7 +4,7 @@ instances.default = { enable = true; name = "monolith"; - url = "https://git.lelgenio.xyz"; + url = "https://git.lelgenio.com"; tokenFile = config.age.secrets.monolith-forgejo-runner-token.path; labels = [ # provide a debian base with nodejs for actions From 4aadd199965582e538b2b7e6b6827d791f2f3f24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sun, 19 May 2024 01:10:21 -0300 Subject: [PATCH 109/404] sway: enable adaptive sync --- user/sway/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/sway/default.nix b/user/sway/default.nix index 84e3b6e..72a34be 100644 --- a/user/sway/default.nix +++ b/user/sway/default.nix @@ -52,7 +52,7 @@ in }; output = { "*" = { - adaptive_sync = "off"; + adaptive_sync = "enabled"; bg = "${theme.background} fill"; mode = "1920x1080@144.000Hz"; }; From 29c0525b055ed1f7b15dd7e42a1139c30168dceb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sun, 19 May 2024 01:10:31 -0300 Subject: [PATCH 110/404] monolith: add gpu crash work-around --- hosts/monolith.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/monolith.nix b/hosts/monolith.nix index c5dcece..39ba16f 100644 --- a/hosts/monolith.nix +++ b/hosts/monolith.nix @@ -23,6 +23,7 @@ in "zenpower" ]; boot.kernelParams = [ + "amdgpu.dcdebugmask=0x10" # amdgpu undervolting bug "video=DP-1:1920x1080@144" # hibernation "resume=LABEL=BTRFS_ROOT" # findmnt -o LABEL --noheadings /swap/ From f8bf53cbb7702777ba0bd40d1cb921ab46611cae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sun, 19 May 2024 15:58:51 -0300 Subject: [PATCH 111/404] update: pass arguments to ./switch --- update | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update b/update index 89694e6..59bd11a 100755 --- a/update +++ b/update @@ -1,4 +1,4 @@ #!/bin/sh nix flake update --verbose --print-build-logs -./switch +exec ./switch "$@" From bc600a84b0954e7507419a3dfa13531e56a87899 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 25 May 2024 01:03:51 -0300 Subject: [PATCH 112/404] git: enable lfs --- user/git.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/user/git.nix b/user/git.nix index 09be75c..f5392df 100644 --- a/user/git.nix +++ b/user/git.nix @@ -4,6 +4,7 @@ in { config = { programs.git = { enable = true; + lfs.enable = true; extraConfig = { user = { name = username; From 713aa8059cc0ba2c3c20ab99c7201899dbaa1587 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 25 May 2024 01:04:09 -0300 Subject: [PATCH 113/404] sway: autostart corectrl --- user/sway/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/user/sway/default.nix b/user/sway/default.nix index 72a34be..f832aaa 100644 --- a/user/sway/default.nix +++ b/user/sway/default.nix @@ -89,6 +89,7 @@ in exec ${pkgs.dbus-sway-environment}/bin/dbus-sway-environment exec swaymsg workspace 2 exec_always systemctl --user restart waybar.service + exec corectrl --minimize-systray ''; }; services.gammastep = { From 9c5bdde50f1f060163771840bfb6e15af99b91b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 25 May 2024 01:04:19 -0300 Subject: [PATCH 114/404] sway: set godot windows to floating --- user/sway/sway-assigns.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/user/sway/sway-assigns.nix b/user/sway/sway-assigns.nix index 1ec8cf5..ff46238 100644 --- a/user/sway/sway-assigns.nix +++ b/user/sway/sway-assigns.nix @@ -54,6 +54,7 @@ in }; floating = { criteria = [ + { class = "Godot"; } { class = "file_picker"; } { app_id = "file_picker"; } { app_id = "wdisplays"; } From 2f307ea3792a9fea1f7b4d1f3c877cabb1334c98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 25 May 2024 13:38:40 -0300 Subject: [PATCH 115/404] sway: don't require rebuilding sway dependencies --- overlays/default.nix | 10 ++++++---- system/greetd.nix | 3 ++- user/sway/default.nix | 3 ++- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/overlays/default.nix b/overlays/default.nix index c5d145d..060a0c0 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -44,10 +44,12 @@ --replace ZWLR_LAYER_SHELL_V1_LAYER_TOP ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY ''; }); - sway-unwrapped = prev.sway-unwrapped.overrideAttrs (old: { - patches = old.patches - ++ [ ../patches/sway/fix-hide_cursor-clearing-focus.patch ]; - }); + mySway = prev.sway.override { + sway-unwrapped = prev.sway-unwrapped.overrideAttrs (old: { + patches = old.patches + ++ [ ../patches/sway/fix-hide_cursor-clearing-focus.patch ]; + }); + }; mangohud = prev.mangohud.overrideAttrs (o: { patches = o.patches ++ [ (prev.fetchpatch { diff --git a/system/greetd.nix b/system/greetd.nix index 72b82c1..4c6e31a 100644 --- a/system/greetd.nix +++ b/system/greetd.nix @@ -17,6 +17,7 @@ in # enable sway window manager programs.sway = { enable = true; + package = pkgs.mySway; wrapperFeatures.gtk = true; }; @@ -59,7 +60,7 @@ in enable = true; settings = { initial_session = { - command = "${pkgs.sway}/bin/sway"; + command = desktop; user = "lelgenio"; }; default_session = { diff --git a/user/sway/default.nix b/user/sway/default.nix index f832aaa..7719370 100644 --- a/user/sway/default.nix +++ b/user/sway/default.nix @@ -21,6 +21,7 @@ in wayland.windowManager.sway = { enable = true; + package = pkgs.mySway; config = { bars = [ ]; @@ -105,7 +106,7 @@ in xdg.configFile."OpenTabletDriver/settings.json".source = ./open-tablet-driver.json; home.packages = with pkgs; [ - sway + mySway swaybg swaylock wdisplays From fd302946b7ac662eb5ca405883f3eecef1f4c416 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 25 May 2024 18:58:28 -0300 Subject: [PATCH 116/404] Revert "sshd: disable until xz is secure" This reverts commit b0d1b2fbff9bc8392da8a5210ca06e3f5fc061fe. --- system/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/configuration.nix b/system/configuration.nix index 7c6bbb3..fbcd724 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -59,7 +59,7 @@ security.rtkit.enable = true; services.openssh = { - enable = false; + enable = true; ports = [ 9022 ]; settings = { PermitRootLogin = "no"; From eec3d83e0f175f83efc6485b0966727063a37a51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 25 May 2024 19:43:34 -0300 Subject: [PATCH 117/404] flake: update to 24.05 --- flake.lock | 15 ++++++++------- flake.nix | 4 ++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 7dc918c..76a2850 100644 --- a/flake.lock +++ b/flake.lock @@ -491,15 +491,16 @@ ] }, "locked": { - "lastModified": 1715359697, - "narHash": "sha256-FJYyXqulIbCdsUCTFBTu/bIH4aN+7jzjQAn52Qc6qPg=", + "lastModified": 1716563886, + "narHash": "sha256-MKSVKxP50gEbdP60G0M5LampyVSIGT8FGGB88nKPmi8=", "owner": "nix-community", "repo": "home-manager", - "rev": "f2c5ba5e720fd584d83f2f97399dac0d26ae60b9", + "rev": "00a86e4f7a6455ad58b7090a931f1c6097e4fcd7", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } @@ -881,16 +882,16 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1715266358, - "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", + "lastModified": 1716408587, + "narHash": "sha256-el71IUaQdEmntmd51GBpkJs/Hqh6S4dmfmUGP8GQaME=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f1010e0469db743d14519a1efd37e23f8513d714", + "rev": "1a7abfa62e8a36f7f2dbe463722ed9ea31be5e43", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-unstable", + "ref": "nixos-24.05", "type": "indirect" } }, diff --git a/flake.nix b/flake.nix index f3a4532..7b042c9 100644 --- a/flake.nix +++ b/flake.nix @@ -1,8 +1,8 @@ { description = "My system config"; inputs = { - nixpkgs.url = "nixpkgs/nixos-unstable"; - home-manager.url = "github:nix-community/home-manager"; + nixpkgs.url = "nixpkgs/nixos-24.05"; + home-manager.url = "github:nix-community/home-manager/release-24.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; nix-index-database = { From f20a6be6c1243b0c5de668f50a1908aba7875aac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 25 May 2024 19:43:52 -0300 Subject: [PATCH 118/404] monolith: disable virtualbox while it's borked --- hosts/monolith.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/hosts/monolith.nix b/hosts/monolith.nix index 39ba16f..c447c45 100644 --- a/hosts/monolith.nix +++ b/hosts/monolith.nix @@ -55,8 +55,6 @@ in }; }; - virtualisation.virtualbox.host.enable = true; - fileSystems."/" = { device = "/dev/disk/by-label/BTRFS_ROOT"; fsType = "btrfs"; From 66eb08c21faa910a4ed2cbdc6bbaa5aa239c0194 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 25 May 2024 19:44:10 -0300 Subject: [PATCH 119/404] qutebrowser: don't install if not the default browser --- user/qutebrowser/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/qutebrowser/default.nix b/user/qutebrowser/default.nix index 467340b..0f2914a 100644 --- a/user/qutebrowser/default.nix +++ b/user/qutebrowser/default.nix @@ -10,7 +10,7 @@ in ]; config = { - programs.qutebrowser = { + programs.qutebrowser = lib.mkIf (browser == "qutebrowser") { enable = true; # enableDefaultBindings = false; keyBindings = { From d4bd1366b4e486f31cf0863a4ac0929675034446 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 27 May 2024 00:10:11 -0300 Subject: [PATCH 120/404] scripts: add pass export script --- scripts/default.nix | 1 + scripts/pass-export | 10 ++++++++++ 2 files changed, 11 insertions(+) create mode 100755 scripts/pass-export diff --git a/scripts/default.nix b/scripts/default.nix index 54ee0a2..bc2ac3d 100644 --- a/scripts/default.nix +++ b/scripts/default.nix @@ -42,6 +42,7 @@ create_scripts [ ]; # This will not work unless programs.wshowkeys is enabled systemwide terminal = [ alacritty ]; playerctl-status = [ playerctl ]; + pass-export = [ pass2csv gnupg ]; wpass = [ final.wdmenu fd pass sd wl-clipboard wtype ]; screenshotsh = [ capitaine-cursors grim slurp jq sway wl-clipboard xdg-user-dirs ]; diff --git a/scripts/pass-export b/scripts/pass-export new file mode 100755 index 0000000..658f803 --- /dev/null +++ b/scripts/pass-export @@ -0,0 +1,10 @@ +#!/bin/sh + +if test -z "$PASSWORD_STORE_DIR"; then + PASSWORD_STORE_DIR="$HOME/.password-store" +fi + +pass2csv "$PASSWORD_STORE_DIR" "$HOME/passwords.csv" \ + -f User '(user|login)(:\s*)?' \ + -f TOTP 'otpauth(:)?' \ + -f URL 'url(:\s*)?' From b055fddfe116c05fb0a9083a693306bea76de610 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 27 May 2024 09:44:01 -0300 Subject: [PATCH 121/404] gnome: update autologin config --- system/gnome.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/gnome.nix b/system/gnome.nix index 855f5d5..5af171c 100644 --- a/system/gnome.nix +++ b/system/gnome.nix @@ -8,7 +8,7 @@ services.xserver.displayManager.gdm.enable = true; services.xserver.desktopManager.gnome.enable = true; - services.xserver.displayManager.autoLogin = { + services.displayManager.autoLogin = { enable = true; user = "lelgenio"; }; From 8e2781a59d7e30ea01ba7f8eeeaf99b72aa129ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 27 May 2024 11:52:17 -0300 Subject: [PATCH 122/404] kdeconect: update config --- system/configuration.nix | 1 - system/gnome.nix | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/system/configuration.nix b/system/configuration.nix index fbcd724..e72bcff 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -26,7 +26,6 @@ networking.networkmanager.enable = true; # Open kde connect ports programs.kdeconnect.enable = true; - networking.firewall.allowedTCPPorts = [ 55201 ]; # Set your time zone. time.timeZone = "America/Sao_Paulo"; diff --git a/system/gnome.nix b/system/gnome.nix index 5af171c..cb8c106 100644 --- a/system/gnome.nix +++ b/system/gnome.nix @@ -13,13 +13,17 @@ user = "lelgenio"; }; + programs.kdeconnect = { + enable = true; + package = pkgs.gnomeExtensions.gsconnect; + }; + # services.xserver.displayManager.autologin.user = "lelgenio"; environment.systemPackages = with pkgs; with gnome; [ gnome-tweaks dconf-editor chrome-gnome-shell - gnomeExtensions.gsconnect gnomeExtensions.quick-settings-audio-devices-hider ]; } From 212d65408aae70d95aef5ed0df9d80f1d4fdb5c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 27 May 2024 12:29:42 -0300 Subject: [PATCH 123/404] configuration: extract nixos config into more files --- system/bluetooth.nix | 14 +++++ system/configuration.nix | 120 +++------------------------------------ system/containers.nix | 11 ++++ system/fonts.nix | 9 +++ system/locale.nix | 12 ++++ system/network.nix | 24 ++++++++ system/sound.nix | 11 ++++ system/steam.nix | 3 + system/users.nix | 20 +++++++ 9 files changed, 111 insertions(+), 113 deletions(-) create mode 100644 system/bluetooth.nix create mode 100644 system/containers.nix create mode 100644 system/fonts.nix create mode 100644 system/locale.nix create mode 100644 system/network.nix create mode 100644 system/sound.nix create mode 100644 system/users.nix diff --git a/system/bluetooth.nix b/system/bluetooth.nix new file mode 100644 index 0000000..20eb72e --- /dev/null +++ b/system/bluetooth.nix @@ -0,0 +1,14 @@ +{ pkgs, ... }: { + services.blueman.enable = true; + hardware.bluetooth = { + enable = true; + settings = { + General = { + DiscoverableTimeout = 0; + # Discoverable = true; + AlwaysPairable = true; + }; + Policy = { AutoEnable = true; }; + }; + }; +} diff --git a/system/configuration.nix b/system/configuration.nix index e72bcff..130ca7d 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -9,6 +9,13 @@ ./boot.nix ./thunar.nix ./nix.nix + ./fonts.nix + ./sound.nix + ./bluetooth.nix + ./locale.nix + ./users.nix + ./containers.nix + ./network.nix ]; boot.kernelPackages = pkgs.linuxPackages_latest; @@ -18,108 +25,9 @@ programs.adb.enable = true; services.udev.packages = [ pkgs.android-udev-rules ]; - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - # Enable networking - networking.networkmanager.enable = true; - # Open kde connect ports - programs.kdeconnect.enable = true; - - # Set your time zone. - time.timeZone = "America/Sao_Paulo"; - environment.variables.TZ = config.time.timeZone; - # Select internationalisation properties. - i18n.defaultLocale = "pt_BR.utf8"; - - # Enable the GNOME Desktop Environment. - # services.xserver.displayManager.gdm.enable = true; - # services.xserver.desktopManager.gnome.enable = true; - # services.xserver.displayManager.autologin.user = "lelgenio"; - - # Configure keymap in X11 - services.xserver.xkb = { - layout = "us"; - variant = "colemak"; - }; - console.keyMap = "colemak"; - # Enable CUPS to print documents. - # services.printing.enable = true; - services.flatpak.enable = true; - virtualisation.docker.enable = true; - virtualisation.docker.autoPrune.enable = true; - virtualisation.docker.autoPrune.dates = "monthly"; - virtualisation.docker.autoPrune.flags = [ "--all --volumes" ]; - - programs.extra-container.enable = true; - - programs.firejail.enable = true; - - security.rtkit.enable = true; - services.openssh = { - enable = true; - ports = [ 9022 ]; - settings = { - PermitRootLogin = "no"; - PasswordAuthentication = false; - KbdInteractiveAuthentication = false; - }; - }; - # programs.ssh = { - # startAgent = true; - # extraConfig = '' - # AddKeysToAgent yes - # ''; - # }; - - ## Enable sound with pipewire. - sound.enable = true; - hardware.pulseaudio.enable = false; - services.pipewire = { - enable = true; - wireplumber.enable = true; - pulse.enable = true; - alsa.enable = true; - jack.enable = true; - }; - - services.blueman.enable = true; - hardware.bluetooth = { - enable = true; - settings = { - General = { - DiscoverableTimeout = 0; - # Discoverable = true; - AlwaysPairable = true; - }; - Policy = { AutoEnable = true; }; - }; - }; - # Enable touchpad support (enabled default in most desktopManager). services.libinput.enable = true; - # Define a user account. Don't forget to set a password with ‘passwd’. - users.mutableUsers = false; - users.users.lelgenio = { - isNormalUser = true; - description = "Leonardo Eugênio"; - hashedPassword = "$y$j9T$0e/rczjOVCy7PuwC3pG0V/$gTHZhfO4wQSlFvbDyfghbCnGI2uDI0a52zSrQ/yOA5A"; - extraGroups = [ "networkmanager" "wheel" "docker" "adbusers" "bluetooth" "corectrl" "vboxusers" ]; - shell = pkgs.fish; - openssh.authorizedKeys.keys = [ - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxR/w+38b2lX90yNBqhq3mUmkn1WGu6GAPhN1tVp2ZjYRJNV/+5gWCnTtOWYtDx35HmK/spQ2Qy8X9ttkzORa24fysNx1Iqn/TiXhD7eIJjbGPnrOpIKTkW5/uB3SD/P5NBSa06//BaqJU4sBlG79hoXRpod052hQtdpTVDiMCIV+iboWPKqopmJJfWdBtVnHXs9rep0htPRExxGslImFk7Z6xjcaHyCpIQZPlOGf+sGsmUU7jRqzvZFV8ucIdbnAlMHrU4pepNFhuraESyZVTa/bi9sw0iozXp5Q5+5thMebEslmT1Z771kI4sieDy+O4r8c0Sx2/VY1UAzcpq1faggc3YB01MTh+tiEC6xdMvZLrQGL1NBWjHleMyL53GU5ERluC0vXJF3Hv3BGGBDfXWbrEm5n06DHr2apRVJGC0LwiQ7Woud1X4V4X1pKSusxCVMjT2lmcOwV6YhKhB2sowJc1OdMx4+tL0UWE+YKSZgBHfolwk6ml0F4EO9nnUHc= lelgenio@i15" - ]; - }; - users.users.root.initialHashedPassword = "$y$j9T$E3aBBSSq0Gma8hZD9L7ov0$iCGDW4fqrXWfHO0qodBYYgMFA9CpIraoklHcPbJJrM3"; - - # services.getty.autologinUser = "lelgenio"; - programs.fish.enable = true; - - programs.dzgui.enable = true; - programs.dzgui.package = inputs.dzgui-nix.packages.${pkgs.system}.default; - packages.media-packages.enable = true; environment.systemPackages = with pkgs; [ pavucontrol @@ -130,21 +38,7 @@ gnome3.adwaita-icon-theme # default gnome cursors ]; - fonts.enableDefaultPackages = true; - fonts.packages = with pkgs; [ - noto-fonts - noto-fonts-cjk - noto-fonts-emoji - nerdfonts_fira_hack - ]; - services.geoclue2.enable = true; - # programs.qt5ct.enable = true; - # Some programs need SUID wrappers, can be configured further or are - # started in user sessions. - # programs.mtr.enable = true; - services.pcscd.enable = true; - security.sudo.wheelNeedsPassword = false; systemd.extraConfig = '' DefaultTimeoutStopSec=10s diff --git a/system/containers.nix b/system/containers.nix new file mode 100644 index 0000000..c2c2941 --- /dev/null +++ b/system/containers.nix @@ -0,0 +1,11 @@ +{ pkgs, ... }: { + services.flatpak.enable = true; + virtualisation.docker.enable = true; + virtualisation.docker.autoPrune.enable = true; + virtualisation.docker.autoPrune.dates = "monthly"; + virtualisation.docker.autoPrune.flags = [ "--all --volumes" ]; + + programs.extra-container.enable = true; + + programs.firejail.enable = true; +} diff --git a/system/fonts.nix b/system/fonts.nix new file mode 100644 index 0000000..e6d4ccd --- /dev/null +++ b/system/fonts.nix @@ -0,0 +1,9 @@ +{ pkgs, ... }: { + fonts.enableDefaultPackages = true; + fonts.packages = with pkgs; [ + noto-fonts + noto-fonts-cjk + noto-fonts-emoji + nerdfonts_fira_hack + ]; +} diff --git a/system/locale.nix b/system/locale.nix new file mode 100644 index 0000000..bb344c7 --- /dev/null +++ b/system/locale.nix @@ -0,0 +1,12 @@ +{ pkgs, config, ... }: { + time.timeZone = "America/Sao_Paulo"; + environment.variables.TZ = config.time.timeZone; + i18n.defaultLocale = "pt_BR.utf8"; + + # Configure keymap in X11 + services.xserver.xkb = { + layout = "us"; + variant = "colemak"; + }; + console.keyMap = "colemak"; +} diff --git a/system/network.nix b/system/network.nix new file mode 100644 index 0000000..c8ebdd9 --- /dev/null +++ b/system/network.nix @@ -0,0 +1,24 @@ +{ pkgs, ... }: { + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + # Configure network proxy if necessary + # networking.proxy.default = "http://user:password@proxy:port/"; + # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + # Enable networking + networking.networkmanager.enable = true; + # Open kde connect ports + programs.kdeconnect.enable = true; + + # Enable CUPS to print documents. + # services.printing.enable = true; + + security.rtkit.enable = true; + services.openssh = { + enable = true; + ports = [ 9022 ]; + settings = { + PermitRootLogin = "no"; + PasswordAuthentication = false; + KbdInteractiveAuthentication = false; + }; + }; +} diff --git a/system/sound.nix b/system/sound.nix new file mode 100644 index 0000000..3cdbf58 --- /dev/null +++ b/system/sound.nix @@ -0,0 +1,11 @@ +{ pkgs, ... }: { + sound.enable = true; + hardware.pulseaudio.enable = false; + services.pipewire = { + enable = true; + wireplumber.enable = true; + pulse.enable = true; + alsa.enable = true; + jack.enable = true; + }; +} diff --git a/system/steam.nix b/system/steam.nix index 3a60930..ce94c3d 100644 --- a/system/steam.nix +++ b/system/steam.nix @@ -17,4 +17,7 @@ protontricks bottles ]; + + programs.dzgui.enable = true; + programs.dzgui.package = inputs.dzgui-nix.packages.${pkgs.system}.default; } diff --git a/system/users.nix b/system/users.nix new file mode 100644 index 0000000..2334897 --- /dev/null +++ b/system/users.nix @@ -0,0 +1,20 @@ +{ pkgs, ... }: { + security.sudo.wheelNeedsPassword = false; + + # services.getty.autologinUser = "lelgenio"; + programs.fish.enable = true; + + # Define a user account. Don't forget to set a password with ‘passwd’. + users.mutableUsers = false; + users.users.lelgenio = { + isNormalUser = true; + description = "Leonardo Eugênio"; + hashedPassword = "$y$j9T$0e/rczjOVCy7PuwC3pG0V/$gTHZhfO4wQSlFvbDyfghbCnGI2uDI0a52zSrQ/yOA5A"; + extraGroups = [ "networkmanager" "wheel" "docker" "adbusers" "bluetooth" "corectrl" "vboxusers" ]; + shell = pkgs.fish; + openssh.authorizedKeys.keys = [ + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxR/w+38b2lX90yNBqhq3mUmkn1WGu6GAPhN1tVp2ZjYRJNV/+5gWCnTtOWYtDx35HmK/spQ2Qy8X9ttkzORa24fysNx1Iqn/TiXhD7eIJjbGPnrOpIKTkW5/uB3SD/P5NBSa06//BaqJU4sBlG79hoXRpod052hQtdpTVDiMCIV+iboWPKqopmJJfWdBtVnHXs9rep0htPRExxGslImFk7Z6xjcaHyCpIQZPlOGf+sGsmUU7jRqzvZFV8ucIdbnAlMHrU4pepNFhuraESyZVTa/bi9sw0iozXp5Q5+5thMebEslmT1Z771kI4sieDy+O4r8c0Sx2/VY1UAzcpq1faggc3YB01MTh+tiEC6xdMvZLrQGL1NBWjHleMyL53GU5ERluC0vXJF3Hv3BGGBDfXWbrEm5n06DHr2apRVJGC0LwiQ7Woud1X4V4X1pKSusxCVMjT2lmcOwV6YhKhB2sowJc1OdMx4+tL0UWE+YKSZgBHfolwk6ml0F4EO9nnUHc= lelgenio@i15" + ]; + }; + users.users.root.initialHashedPassword = "$y$j9T$E3aBBSSq0Gma8hZD9L7ov0$iCGDW4fqrXWfHO0qodBYYgMFA9CpIraoklHcPbJJrM3"; +} From 965b1cf51416e1091d26c304469de2e6b0c532cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 30 May 2024 16:53:51 -0300 Subject: [PATCH 124/404] monolith: add docker subvolume --- hosts/monolith.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hosts/monolith.nix b/hosts/monolith.nix index c447c45..22144c3 100644 --- a/hosts/monolith.nix +++ b/hosts/monolith.nix @@ -115,6 +115,12 @@ in fsType = "btrfs"; options = [ "subvol=@projects" "nofail" ] ++ btrfs_options ++ btrfs_ssd; }; + fileSystems."/var/lib/docker" = { + device = "/dev/disk/by-label/BTRFS_BIGBOY"; + fsType = "btrfs"; + options = [ "subvol=@docker" "nofail" ] ++ btrfs_options ++ btrfs_ssd; + }; + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's # still possible to use this option, but it's recommended to use it in conjunction From 52cb6d3301c9311f8a1659a265cd3d23791876e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 30 May 2024 16:54:06 -0300 Subject: [PATCH 125/404] nix: lower frequency of gc --- system/nix.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/nix.nix b/system/nix.nix index f9b0a82..38b2eb9 100644 --- a/system/nix.nix +++ b/system/nix.nix @@ -11,8 +11,8 @@ in nixPath = [ "nixpkgs=${inputs.nixpkgs}" ]; gc = { automatic = true; - dates = "daily"; - options = "--delete-older-than 3d"; + dates = "weekly"; + options = "--delete-older-than 7d"; }; optimise.automatic = true; settings = { From dba047b845fcdf142481904f64405ff24228ed60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 30 May 2024 16:54:23 -0300 Subject: [PATCH 126/404] kakoune: use rfc-style nixfmt --- user/home.nix | 2 +- user/kakoune/filetypes.kak | 2 +- user/kakoune/kak-lsp.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/user/home.nix b/user/home.nix index d7a00a3..39a9ba2 100644 --- a/user/home.nix +++ b/user/home.nix @@ -128,7 +128,7 @@ rust-analyzer # rust analyzer blade-formatter - nixpkgs-fmt + nixfmt-rfc-style ]; fonts.fontconfig.enable = true; diff --git a/user/kakoune/filetypes.kak b/user/kakoune/filetypes.kak index cd93b49..b384bfe 100644 --- a/user/kakoune/filetypes.kak +++ b/user/kakoune/filetypes.kak @@ -12,7 +12,7 @@ hook global WinSetOption filetype=c %{ } hook global WinSetOption filetype=nix %{ - set buffer formatcmd 'nixpkgs-fmt' + set buffer formatcmd 'nixfmt' } hook global BufCreate .*\.html %{ diff --git a/user/kakoune/kak-lsp.toml b/user/kakoune/kak-lsp.toml index 3a62a08..b3a6c8e 100644 --- a/user/kakoune/kak-lsp.toml +++ b/user/kakoune/kak-lsp.toml @@ -74,7 +74,7 @@ filetypes = ["nix"] command = "nil" roots = ["flake.nix", "shell.nix", ".git"] [language_server.nil.settings.nil] -formatting.command = [ "nixpkgs-fmt" ] +formatting.command = [ "nixfmt" ] [language_server.intelephense] filetypes = ["php"] From 399eafe9edf44eb98621ebb86d00c06b480c85df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 30 May 2024 16:54:58 -0300 Subject: [PATCH 127/404] treewide: format using nixfmt-rfc-style --- flake.nix | 77 +++--- hosts/double-rainbow.nix | 35 ++- hosts/i15.nix | 36 ++- hosts/monolith.nix | 76 ++++-- hosts/phantom/default.nix | 16 +- hosts/phantom/email.nix | 19 +- hosts/phantom/forgejo.nix | 7 +- hosts/phantom/hardware-config.nix | 19 +- hosts/phantom/mastodon.nix | 8 +- hosts/phantom/nextcloud.nix | 10 +- hosts/phantom/nginx.nix | 42 ++- hosts/phantom/syncthing.nix | 17 +- hosts/phantom/users.nix | 22 +- hosts/phantom/vpsadminos.nix | 18 +- hosts/phantom/writefreely.nix | 9 +- hosts/pixie.nix | 24 +- hosts/rainbow.nix | 41 ++- overlays/default.nix | 138 +++++----- pkgs/blade-formatter/default.nix | 35 +-- pkgs/cargo-checkmate.nix | 21 +- pkgs/default.nix | 3 +- pkgs/emmet-cli.nix | 7 +- pkgs/lipsum.nix | 5 +- scripts/default.nix | 175 +++++++++---- secrets/secrets.nix | 8 +- system/bluetooth.nix | 7 +- system/boot.nix | 13 +- system/cachix.nix | 8 +- system/configuration.nix | 8 +- system/containers.nix | 3 +- system/fonts.nix | 3 +- system/gamemode.nix | 12 +- system/gitlab-runner.nix | 84 +++--- system/gnome.nix | 18 +- system/greetd.nix | 15 +- system/kde.nix | 3 +- system/locale.nix | 3 +- system/media-packages.nix | 13 +- system/monolith-forgejo-runner.nix | 3 +- system/monolith-gitlab-runner.nix | 10 +- system/network.nix | 3 +- system/nix-serve.nix | 8 +- system/nix.nix | 17 +- system/rainbow-gitlab-runner.nix | 10 +- system/secrets.nix | 21 +- system/sound.nix | 3 +- system/specialisation.nix | 9 +- system/steam.nix | 32 ++- system/thunar.nix | 30 ++- system/users.nix | 13 +- user/alacritty.nix | 73 ++++-- user/bmenu.nix | 15 +- user/chat.nix | 9 +- user/controller.nix | 9 +- user/desktop-entries.nix | 22 +- user/firefox.nix | 16 +- user/fish/default.nix | 56 ++-- user/fzf.nix | 30 ++- user/git.nix | 13 +- user/gnome.nix | 16 +- user/gpg.nix | 17 +- user/helix.nix | 37 ++- user/home.nix | 46 ++-- user/hyprland.nix | 13 +- user/kakoune/colors.nix | 17 +- user/kakoune/default.nix | 61 +++-- user/lf/default.nix | 9 +- user/man.nix | 19 +- user/mangohud.nix | 20 +- user/mimeapps.nix | 29 ++- user/mpd.nix | 8 +- user/mpv.nix | 6 +- user/pass.nix | 13 +- user/pipewire.nix | 8 +- user/pqiv.nix | 35 ++- user/qutebrowser/colors.nix | 80 ++++-- user/qutebrowser/dark-theme.nix | 105 ++++---- user/qutebrowser/default.nix | 17 +- user/qutebrowser/fonts.nix | 1 - user/ranger/default.nix | 9 +- user/rofi.nix | 24 +- user/ssh.nix | 13 +- user/sway/default.nix | 31 ++- user/sway/kanshi.nix | 26 +- user/sway/mako.nix | 18 +- user/sway/sway-assigns.nix | 26 +- user/sway/sway-binds.nix | 99 +++++--- user/sway/sway-modes.nix | 99 +++++--- user/sway/swayidle.nix | 14 +- user/sway/swaylock.nix | 14 +- user/sway/theme.nix | 65 +++-- user/syncthing.nix | 3 +- user/thunar.nix | 8 +- user/vdir.nix | 32 +-- user/vscode/default.nix | 3 +- user/waybar/default.nix | 396 ++++++++++++++++------------- user/xdg-dirs.nix | 8 +- user/zathura.nix | 15 +- 98 files changed, 1930 insertions(+), 990 deletions(-) diff --git a/flake.nix b/flake.nix index 7b042c9..daecf26 100644 --- a/flake.nix +++ b/flake.nix @@ -68,11 +68,14 @@ nixos-conf-editor.url = "github:vlinkz/nixos-conf-editor"; nix-software-center.url = "github:vlinkz/nix-software-center"; }; - outputs = inputs: + outputs = + inputs: let nixpkgsConfig = { inherit system; - config = { allowUnfree = true; }; + config = { + allowUnfree = true; + }; overlays = old_overlays.all; }; @@ -85,32 +88,37 @@ old_overlays = (import ./overlays { inherit packages inputs; }); - specialArgs = { inherit inputs; }; - common_modules = [ - { nixpkgs.pkgs = pkgs; } - ./system/configuration.nix - ./system/secrets.nix - ./system/specialisation.nix - ./system/greetd.nix - { login-manager.greetd.enable = desktop == "sway" || desktop == "hyprland"; } + specialArgs = { + inherit inputs; + }; + common_modules = + [ + { nixpkgs.pkgs = pkgs; } + ./system/configuration.nix + ./system/secrets.nix + ./system/specialisation.nix + ./system/greetd.nix + { login-manager.greetd.enable = desktop == "sway" || desktop == "hyprland"; } - inputs.agenix.nixosModules.default - inputs.hyprland.nixosModules.default - inputs.dzgui-nix.nixosModules.default - { programs.hyprland.enable = (desktop == "hyprland"); } - inputs.home-manager.nixosModules.home-manager - { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users.lelgenio = import ./user/home.nix; - home-manager.backupFileExtension = "bkp"; - # Optionally, use home-manager.extraSpecialArgs to pass - # arguments to home.nix - home-manager.extraSpecialArgs = { inherit inputs; }; - } - ] - ++ lib.optional (desktop == "gnome") ./system/gnome.nix - ++ lib.optional (desktop == "kde") ./system/kde.nix; + inputs.agenix.nixosModules.default + inputs.hyprland.nixosModules.default + inputs.dzgui-nix.nixosModules.default + { programs.hyprland.enable = (desktop == "hyprland"); } + inputs.home-manager.nixosModules.home-manager + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.lelgenio = import ./user/home.nix; + home-manager.backupFileExtension = "bkp"; + # Optionally, use home-manager.extraSpecialArgs to pass + # arguments to home.nix + home-manager.extraSpecialArgs = { + inherit inputs; + }; + } + ] + ++ lib.optional (desktop == "gnome") ./system/gnome.nix + ++ lib.optional (desktop == "kde") ./system/kde.nix; in { nixosConfigurations = { @@ -144,11 +152,16 @@ }; pixie = lib.nixosSystem { inherit system specialArgs; - modules = [ ./hosts/pixie.nix ] ++ common_modules ++ [{ - packages.media-packages.enable = lib.mkOverride 0 false; - programs.steam.enable = lib.mkOverride 0 false; - services.flatpak.enable = lib.mkOverride 0 false; - }]; + modules = + [ ./hosts/pixie.nix ] + ++ common_modules + ++ [ + { + packages.media-packages.enable = lib.mkOverride 0 false; + programs.steam.enable = lib.mkOverride 0 false; + services.flatpak.enable = lib.mkOverride 0 false; + } + ]; }; phantom = lib.nixosSystem { inherit system specialArgs; diff --git a/hosts/double-rainbow.nix b/hosts/double-rainbow.nix index 7725898..be5dd48 100644 --- a/hosts/double-rainbow.nix +++ b/hosts/double-rainbow.nix @@ -1,13 +1,32 @@ -{ config, lib, pkgs, modulesPath, ... }: +{ + config, + lib, + pkgs, + modulesPath, + ... +}: let - btrfs_options = [ "compress=zstd:3" "noatime" "x-systemd.device-timeout=0" ]; - btrfs_ssd = [ "ssd" "discard=async" ]; + btrfs_options = [ + "compress=zstd:3" + "noatime" + "x-systemd.device-timeout=0" + ]; + btrfs_ssd = [ + "ssd" + "discard=async" + ]; in { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = - [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ]; + boot.initrd.availableKernelModules = [ + "xhci_pci" + "ahci" + "nvme" + "usb_storage" + "usbhid" + "sd_mod" + ]; boot.initrd.kernelModules = [ "i915" ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; @@ -18,8 +37,7 @@ in options = [ "subvol=@" ] ++ btrfs_options ++ btrfs_ssd; }; - boot.initrd.luks.devices."luks-d6573cf8-25f0-4ffc-8046-ac3a4db1e964".device = - "/dev/disk/by-uuid/d6573cf8-25f0-4ffc-8046-ac3a4db1e964"; + boot.initrd.luks.devices."luks-d6573cf8-25f0-4ffc-8046-ac3a4db1e964".device = "/dev/disk/by-uuid/d6573cf8-25f0-4ffc-8046-ac3a4db1e964"; fileSystems."/boot" = { device = "/dev/disk/by-uuid/97EB-7DB5"; @@ -37,8 +55,7 @@ in nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand"; - hardware.cpu.intel.updateMicrocode = - lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; networking.hostName = "double-rainbow"; # Define your hostname. } diff --git a/hosts/i15.nix b/hosts/i15.nix index e6f0e75..c318665 100644 --- a/hosts/i15.nix +++ b/hosts/i15.nix @@ -1,15 +1,30 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: +{ + config, + lib, + pkgs, + modulesPath, + ... +}: let - btrfs_options = [ "compress=zstd:3" "noatime" "x-systemd.device-timeout=0" ]; + btrfs_options = [ + "compress=zstd:3" + "noatime" + "x-systemd.device-timeout=0" + ]; in { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = - [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_usb_sdmmc" ]; + boot.initrd.availableKernelModules = [ + "xhci_pci" + "ahci" + "usb_storage" + "sd_mod" + "rtsx_usb_sdmmc" + ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; @@ -45,10 +60,12 @@ in options = [ "subvol=@swap" ] ++ btrfs_options; }; - swapDevices = [{ - device = "/swap/swapfile"; - size = (1024 * 8) + (1024 * 2); # RAM size + 2 GB - }]; + swapDevices = [ + { + device = "/swap/swapfile"; + size = (1024 * 8) + (1024 * 2); # RAM size + 2 GB + } + ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's @@ -59,7 +76,6 @@ in # networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true; powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand"; - hardware.cpu.intel.updateMicrocode = - lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; networking.hostName = "i15"; # Define your hostname. } diff --git a/hosts/monolith.nix b/hosts/monolith.nix index 22144c3..213765b 100644 --- a/hosts/monolith.nix +++ b/hosts/monolith.nix @@ -1,21 +1,38 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: +{ + config, + lib, + pkgs, + modulesPath, + ... +}: let - btrfs_options = [ "compress=zstd:3" "noatime" "x-systemd.device-timeout=0" ]; - btrfs_ssd = [ "ssd" "discard=async" ]; + btrfs_options = [ + "compress=zstd:3" + "noatime" + "x-systemd.device-timeout=0" + ]; + btrfs_ssd = [ + "ssd" + "discard=async" + ]; in { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = - [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; + boot.initrd.availableKernelModules = [ + "nvme" + "xhci_pci" + "ahci" + "usb_storage" + "usbhid" + "sd_mod" + ]; hardware.opentabletdriver.enable = true; - boot.extraModulePackages = with config.boot.kernelPackages; [ - zenpower - ]; + boot.extraModulePackages = with config.boot.kernelPackages; [ zenpower ]; boot.initrd.kernelModules = [ "amdgpu" ]; boot.kernelModules = [ "kvm-amd" @@ -88,22 +105,34 @@ in fileSystems."/home/lelgenio/Games" = { device = "/dev/disk/by-label/BTRFS_DATA"; fsType = "btrfs"; - options = [ "subvol=@games" "nofail" ] ++ btrfs_options; + options = [ + "subvol=@games" + "nofail" + ] ++ btrfs_options; }; fileSystems."/home/lelgenio/Downloads/Torrents" = { device = "/dev/disk/by-label/BTRFS_DATA"; fsType = "btrfs"; - options = [ "subvol=@torrents" "nofail" ] ++ btrfs_options; + options = [ + "subvol=@torrents" + "nofail" + ] ++ btrfs_options; }; fileSystems."/home/lelgenio/Música" = { device = "/dev/disk/by-label/BTRFS_DATA"; fsType = "btrfs"; - options = [ "subvol=@music" "nofail" ] ++ btrfs_options; + options = [ + "subvol=@music" + "nofail" + ] ++ btrfs_options; }; fileSystems."/home/lelgenio/.local/mount/data" = { device = "/dev/disk/by-label/BTRFS_DATA"; fsType = "btrfs"; - options = [ "subvol=@data" "nofail" ] ++ btrfs_options; + options = [ + "subvol=@data" + "nofail" + ] ++ btrfs_options; }; fileSystems."/home/lelgenio/.local/mount/bigboy" = { device = "/dev/disk/by-label/BTRFS_BIGBOY"; @@ -113,12 +142,18 @@ in fileSystems."/home/lelgenio/projects" = { device = "/dev/disk/by-label/BTRFS_BIGBOY"; fsType = "btrfs"; - options = [ "subvol=@projects" "nofail" ] ++ btrfs_options ++ btrfs_ssd; + options = [ + "subvol=@projects" + "nofail" + ] ++ btrfs_options ++ btrfs_ssd; }; fileSystems."/var/lib/docker" = { device = "/dev/disk/by-label/BTRFS_BIGBOY"; fsType = "btrfs"; - options = [ "subvol=@docker" "nofail" ] ++ btrfs_options ++ btrfs_ssd; + options = [ + "subvol=@docker" + "nofail" + ] ++ btrfs_options ++ btrfs_ssd; }; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking @@ -128,8 +163,7 @@ in networking.useDHCP = lib.mkDefault true; # networking.interfaces.enp4s0.useDHCP = lib.mkDefault true; powerManagement.cpuFreqGovernor = "ondemand"; - hardware.cpu.amd.updateMicrocode = - lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; networking.hostName = "monolith"; # Define your hostname. # Fix broken suspend with Logitech USB dongle @@ -146,8 +180,10 @@ in # with the exception of `"subvol=swap"`, the other options are repeated in my other `fileSystem` mounts options = [ "subvol=swap" ] ++ btrfs_options ++ btrfs_ssd; }; - swapDevices = [{ - device = "/swap/swapfile"; - size = (1024 * 16) + (1024 * 2); # RAM size + 2 GB - }]; + swapDevices = [ + { + device = "/swap/swapfile"; + size = (1024 * 16) + (1024 * 2); # RAM size + 2 GB + } + ]; } diff --git a/hosts/phantom/default.nix b/hosts/phantom/default.nix index 32d5544..462e070 100644 --- a/hosts/phantom/default.nix +++ b/hosts/phantom/default.nix @@ -1,4 +1,10 @@ -{ config, pkgs, inputs, ... }: { +{ + config, + pkgs, + inputs, + ... +}: +{ imports = [ ./vpsadminos.nix inputs.agenix.nixosModules.default @@ -49,7 +55,12 @@ enable = true; dates = "04:40"; operation = "switch"; - flags = [ "--update-input" "nixpkgs" "--no-write-lock-file" "-L" ]; + flags = [ + "--update-input" + "nixpkgs" + "--no-write-lock-file" + "-L" + ]; flake = "git+https://git.lelgenio.com/lelgenio/nixos-config#phantom"; }; @@ -57,4 +68,3 @@ system.stateVersion = "23.05"; # Never change this } - diff --git a/hosts/phantom/email.nix b/hosts/phantom/email.nix index a34780a..c218977 100644 --- a/hosts/phantom/email.nix +++ b/hosts/phantom/email.nix @@ -1,10 +1,14 @@ -{ pkgs, inputs, config, ... }: { +{ + pkgs, + inputs, + config, + ... +}: +{ # It's important to let Digital Ocean set the hostname so we get rDNS to work networking.hostName = ""; - imports = [ - inputs.nixos-mailserver.nixosModules.mailserver - ]; + imports = [ inputs.nixos-mailserver.nixosModules.mailserver ]; mailserver = { enable = true; @@ -22,7 +26,11 @@ loginAccounts = { "lelgenio@lelgenio.com" = { hashedPassword = "$2y$05$z5s7QCXcs5uTFsfyYpwNJeWzb3RmzgWxNgcPCr0zjSytkLFF/qZmS"; - aliases = [ "postmaster@lelgenio.com" "lelgenio@lelgenio.xyz" "lelgenio@lelgenio.xyz" ]; + aliases = [ + "postmaster@lelgenio.com" + "lelgenio@lelgenio.xyz" + "lelgenio@lelgenio.xyz" + ]; }; "noreply@git.lelgenio.com" = { hashedPassword = "$2b$05$TmR1R7ZwXfec7yrOfeBL7u3ZtyXf0up5dEO6uMWSvb/O7LPEm.j0."; @@ -50,5 +58,4 @@ $config['plugins'] = [ "carddav", "archive" ]; ''; }; - } diff --git a/hosts/phantom/forgejo.nix b/hosts/phantom/forgejo.nix index 61f0a51..eefb003 100644 --- a/hosts/phantom/forgejo.nix +++ b/hosts/phantom/forgejo.nix @@ -1,4 +1,9 @@ -{ lib, pkgs, config, ... }: +{ + lib, + pkgs, + config, + ... +}: let cfg = config.services.forgejo; srv = cfg.settings.server; diff --git a/hosts/phantom/hardware-config.nix b/hosts/phantom/hardware-config.nix index 1a89a15..683a684 100644 --- a/hosts/phantom/hardware-config.nix +++ b/hosts/phantom/hardware-config.nix @@ -1,7 +1,14 @@ -{ config, pkgs, inputs, ... }: { - swapDevices = [{ - device = "/swap/swapfile"; - size = (1024 * 2); # 2 GB - }]; +{ + config, + pkgs, + inputs, + ... +}: +{ + swapDevices = [ + { + device = "/swap/swapfile"; + size = (1024 * 2); # 2 GB + } + ]; } - diff --git a/hosts/phantom/mastodon.nix b/hosts/phantom/mastodon.nix index 9d15d6b..f984c65 100644 --- a/hosts/phantom/mastodon.nix +++ b/hosts/phantom/mastodon.nix @@ -1,4 +1,10 @@ -{ config, pkgs, inputs, ... }: { +{ + config, + pkgs, + inputs, + ... +}: +{ services.mastodon = { enable = true; configureNginx = true; diff --git a/hosts/phantom/nextcloud.nix b/hosts/phantom/nextcloud.nix index 20c7173..de1bd6d 100644 --- a/hosts/phantom/nextcloud.nix +++ b/hosts/phantom/nextcloud.nix @@ -1,4 +1,10 @@ -{ config, pkgs, inputs, ... }: { +{ + config, + pkgs, + inputs, + ... +}: +{ services.nextcloud = { enable = true; package = pkgs.nextcloud27; @@ -22,6 +28,4 @@ group = "nextcloud"; }; }; - } - diff --git a/hosts/phantom/nginx.nix b/hosts/phantom/nginx.nix index 8692134..0153fa6 100644 --- a/hosts/phantom/nginx.nix +++ b/hosts/phantom/nginx.nix @@ -1,4 +1,10 @@ -{ config, pkgs, lib, ... }: { +{ + config, + pkgs, + lib, + ... +}: +{ services.nginx = { enable = true; recommendedProxySettings = true; @@ -8,21 +14,33 @@ }; # Redirect *lelgenio.xyz -> *lelgenio.com - services.nginx.virtualHosts = lib.mapAttrs' - (key: value: lib.nameValuePair "${key}lelgenio.xyz" value) - ( - lib.genAttrs [ "" "social." "blog." "cloud." "mail." "git." "syncthing." ] (name: { - enableACME = true; - forceSSL = true; - locations."/".return = "301 $scheme://${name}lelgenio.com$request_uri"; - }) - ); + services.nginx.virtualHosts = + lib.mapAttrs' (key: value: lib.nameValuePair "${key}lelgenio.xyz" value) + ( + lib.genAttrs + [ + "" + "social." + "blog." + "cloud." + "mail." + "git." + "syncthing." + ] + (name: { + enableACME = true; + forceSSL = true; + locations."/".return = "301 $scheme://${name}lelgenio.com$request_uri"; + }) + ); security.acme = { acceptTerms = true; defaults.email = "lelgenio@disroot.org"; }; - networking.firewall.allowedTCPPorts = [ 80 443 ]; + networking.firewall.allowedTCPPorts = [ + 80 + 443 + ]; } - diff --git a/hosts/phantom/syncthing.nix b/hosts/phantom/syncthing.nix index 55e4cbc..abbda7d 100644 --- a/hosts/phantom/syncthing.nix +++ b/hosts/phantom/syncthing.nix @@ -1,4 +1,10 @@ -{ config, pkgs, inputs, ... }: { +{ + config, + pkgs, + inputs, + ... +}: +{ services.syncthing = { enable = true; @@ -14,11 +20,10 @@ proxyPass = "http://127.0.0.1:8384"; extraConfig = # required when the target is also TLS server with multiple hosts - "proxy_ssl_server_name on;" + - # required when the server wants to use HTTP Authentication - "proxy_pass_header Authorization;" - ; + "proxy_ssl_server_name on;" + + + # required when the server wants to use HTTP Authentication + "proxy_pass_header Authorization;"; }; }; } - diff --git a/hosts/phantom/users.nix b/hosts/phantom/users.nix index 75aee27..6291321 100644 --- a/hosts/phantom/users.nix +++ b/hosts/phantom/users.nix @@ -1,8 +1,12 @@ -{ pkgs, ... }: { +{ pkgs, ... }: +{ security.rtkit.enable = true; services.openssh = { enable = true; - ports = [ 9022 22 ]; + ports = [ + 9022 + 22 + ]; settings = { PasswordAuthentication = false; KbdInteractiveAuthentication = false; @@ -15,7 +19,15 @@ isNormalUser = true; description = "Leonardo Eugênio"; hashedPassword = "$y$j9T$0e/rczjOVCy7PuwC3pG0V/$gTHZhfO4wQSlFvbDyfghbCnGI2uDI0a52zSrQ/yOA5A"; - extraGroups = [ "networkmanager" "wheel" "docker" "adbusers" "bluetooth" "corectrl" "vboxusers" ]; + extraGroups = [ + "networkmanager" + "wheel" + "docker" + "adbusers" + "bluetooth" + "corectrl" + "vboxusers" + ]; shell = pkgs.fish; openssh.authorizedKeys.keys = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxR/w+38b2lX90yNBqhq3mUmkn1WGu6GAPhN1tVp2ZjYRJNV/+5gWCnTtOWYtDx35HmK/spQ2Qy8X9ttkzORa24fysNx1Iqn/TiXhD7eIJjbGPnrOpIKTkW5/uB3SD/P5NBSa06//BaqJU4sBlG79hoXRpod052hQtdpTVDiMCIV+iboWPKqopmJJfWdBtVnHXs9rep0htPRExxGslImFk7Z6xjcaHyCpIQZPlOGf+sGsmUU7jRqzvZFV8ucIdbnAlMHrU4pepNFhuraESyZVTa/bi9sw0iozXp5Q5+5thMebEslmT1Z771kI4sieDy+O4r8c0Sx2/VY1UAzcpq1faggc3YB01MTh+tiEC6xdMvZLrQGL1NBWjHleMyL53GU5ERluC0vXJF3Hv3BGGBDfXWbrEm5n06DHr2apRVJGC0LwiQ7Woud1X4V4X1pKSusxCVMjT2lmcOwV6YhKhB2sowJc1OdMx4+tL0UWE+YKSZgBHfolwk6ml0F4EO9nnUHc= lelgenio@i15" @@ -32,7 +44,5 @@ programs.fish.enable = true; - environment.systemPackages = with pkgs; [ - git - ]; + environment.systemPackages = with pkgs; [ git ]; } diff --git a/hosts/phantom/vpsadminos.nix b/hosts/phantom/vpsadminos.nix index 40401cd..8102fbb 100644 --- a/hosts/phantom/vpsadminos.nix +++ b/hosts/phantom/vpsadminos.nix @@ -6,7 +6,12 @@ # # https://github.com/vpsfreecz/vpsadminos/blob/staging/os/lib/nixos-container/vpsadminos.nix -{ config, pkgs, lib, ... }: +{ + config, + pkgs, + lib, + ... +}: with lib; let nameservers = [ @@ -22,16 +27,19 @@ in systemd.services.systemd-sysctl.enable = false; systemd.services.systemd-oomd.enable = false; systemd.sockets."systemd-journald-audit".enable = false; - systemd.mounts = [{ where = "/sys/kernel/debug"; enable = false; }]; + systemd.mounts = [ + { + where = "/sys/kernel/debug"; + enable = false; + } + ]; systemd.services.rpc-gssd.enable = false; # Due to our restrictions in /sys, the default systemd-udev-trigger fails # on accessing PCI devices, etc. Override it to match only network devices. # In addition, boot.isContainer prevents systemd-udev-trigger.service from # being enabled at all, so add it explicitly. - systemd.additionalUpstreamSystemUnits = [ - "systemd-udev-trigger.service" - ]; + systemd.additionalUpstreamSystemUnits = [ "systemd-udev-trigger.service" ]; systemd.services.systemd-udev-trigger.serviceConfig.ExecStart = [ "" "-udevadm trigger --subsystem-match=net --action=add" diff --git a/hosts/phantom/writefreely.nix b/hosts/phantom/writefreely.nix index 3530e06..5608c0f 100644 --- a/hosts/phantom/writefreely.nix +++ b/hosts/phantom/writefreely.nix @@ -1,4 +1,10 @@ -{ config, pkgs, inputs, ... }: { +{ + config, + pkgs, + inputs, + ... +}: +{ services.writefreely = { enable = true; acme.enable = true; @@ -22,4 +28,3 @@ }; }; } - diff --git a/hosts/pixie.nix b/hosts/pixie.nix index 5f8ce66..9aa5a1e 100644 --- a/hosts/pixie.nix +++ b/hosts/pixie.nix @@ -1,13 +1,25 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: +{ + config, + lib, + pkgs, + modulesPath, + ... +}: { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = - [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; + boot.initrd.availableKernelModules = [ + "nvme" + "xhci_pci" + "ahci" + "usb_storage" + "usbhid" + "sd_mod" + ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; @@ -18,8 +30,7 @@ options = [ "subvol=nixos" ]; }; - boot.initrd.luks.devices."pixie".device = - "/dev/disk/by-uuid/f4ae5858-d2d6-4cd1-a054-bf5147a9a928"; + boot.initrd.luks.devices."pixie".device = "/dev/disk/by-uuid/f4ae5858-d2d6-4cd1-a054-bf5147a9a928"; fileSystems."/home" = { device = "/dev/mapper/pixie"; @@ -46,8 +57,7 @@ # networking.interfaces.enp4s0.useDHCP = lib.mkDefault true; # networking.interfaces.veth74f3ffc.useDHCP = lib.mkDefault true; - hardware.cpu.amd.updateMicrocode = - lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; networking.hostName = "pixie"; # Define your hostname. } diff --git a/hosts/rainbow.nix b/hosts/rainbow.nix index 776ebec..b977ee6 100644 --- a/hosts/rainbow.nix +++ b/hosts/rainbow.nix @@ -1,16 +1,34 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: +{ + config, + lib, + pkgs, + modulesPath, + ... +}: let - btrfs_options = [ "compress=zstd:3" "noatime" "x-systemd.device-timeout=0" ]; - btrfs_ssd = [ "ssd" "discard=async" ]; + btrfs_options = [ + "compress=zstd:3" + "noatime" + "x-systemd.device-timeout=0" + ]; + btrfs_ssd = [ + "ssd" + "discard=async" + ]; in { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = - [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; + boot.initrd.availableKernelModules = [ + "xhci_pci" + "ahci" + "usb_storage" + "usbhid" + "sd_mod" + ]; boot.initrd.kernelModules = [ "i915" ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; @@ -46,10 +64,12 @@ in options = [ "subvol=@swap" ] ++ btrfs_ssd; }; - swapDevices = [{ - device = "/swap/swapfile"; - size = (1024 * 8); - }]; + swapDevices = [ + { + device = "/swap/swapfile"; + size = (1024 * 8); + } + ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's @@ -59,8 +79,7 @@ in # networking.interfaces.enp1s0.useDHCP = lib.mkDefault true; powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand"; - hardware.cpu.intel.updateMicrocode = - lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; networking.hostName = "rainbow"; # Define your hostname. } diff --git a/overlays/default.nix b/overlays/default.nix index 060a0c0..14257ba 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,4 +1,5 @@ -{ inputs, packages, ... }: rec { +{ inputs, packages, ... }: +rec { all = [ scripts sway @@ -13,68 +14,87 @@ sway = (import ./sway.nix); - themes = (final: prev: { - material-wifi-icons = final.stdenv.mkDerivation rec { - name = "material-wifi-icons"; - src = inputs.material-wifi-icons; - installPhase = '' - install -D material-wifi.ttf $out/share/fonts/${name} - ''; - }; - papirus_red = (final.papirus-icon-theme.override { color = "red"; }); - orchis_theme_compact = (final.orchis-theme.override { - border-radius = 0; - tweaks = [ "compact" "solid" ]; - }); - nerdfonts_fira_hack = (final.nerdfonts.override { fonts = [ "FiraCode" "Hack" ]; }); - }); + themes = ( + final: prev: { + material-wifi-icons = final.stdenv.mkDerivation rec { + name = "material-wifi-icons"; + src = inputs.material-wifi-icons; + installPhase = '' + install -D material-wifi.ttf $out/share/fonts/${name} + ''; + }; + papirus_red = (final.papirus-icon-theme.override { color = "red"; }); + orchis_theme_compact = ( + final.orchis-theme.override { + border-radius = 0; + tweaks = [ + "compact" + "solid" + ]; + } + ); + nerdfonts_fira_hack = ( + final.nerdfonts.override { + fonts = [ + "FiraCode" + "Hack" + ]; + } + ); + } + ); - new-packages = (final: prev: packages // { - dhist = inputs.dhist.packages.${prev.system}.dhist; - demoji = inputs.demoji.packages.${prev.system}.default; - tlauncher = inputs.tlauncher.packages.${prev.system}.tlauncher; - maildir-notify-daemon = inputs.maildir-notify-daemon.packages.${prev.system}.default; - wl-crosshair = inputs.wl-crosshair.packages.${prev.system}.default; - }); + new-packages = ( + final: prev: + packages + // { + dhist = inputs.dhist.packages.${prev.system}.dhist; + demoji = inputs.demoji.packages.${prev.system}.default; + tlauncher = inputs.tlauncher.packages.${prev.system}.tlauncher; + maildir-notify-daemon = inputs.maildir-notify-daemon.packages.${prev.system}.default; + wl-crosshair = inputs.wl-crosshair.packages.${prev.system}.default; + } + ); - patches = (final: prev: { - bemenu = prev.bemenu.overrideAttrs (o: { - postPatch = '' - substituteInPlace lib/renderers/wayland/window.c \ - --replace ZWLR_LAYER_SHELL_V1_LAYER_TOP ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY - ''; - }); - mySway = prev.sway.override { - sway-unwrapped = prev.sway-unwrapped.overrideAttrs (old: { - patches = old.patches - ++ [ ../patches/sway/fix-hide_cursor-clearing-focus.patch ]; + patches = ( + final: prev: { + bemenu = prev.bemenu.overrideAttrs (o: { + postPatch = '' + substituteInPlace lib/renderers/wayland/window.c \ + --replace ZWLR_LAYER_SHELL_V1_LAYER_TOP ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY + ''; }); - }; - mangohud = prev.mangohud.overrideAttrs (o: { - patches = o.patches ++ [ - (prev.fetchpatch { - url = "https://github.com/flightlessmango/MangoHud/commit/95141de657e02577f1d3fab0ca12122bfb68bc56.patch"; - hash = "sha256-a2tESliGBkfF7uYQn8TDgeFt07A9FOioI4VcTT7DC7A="; - }) - ]; - }); - }); + mySway = prev.sway.override { + sway-unwrapped = prev.sway-unwrapped.overrideAttrs (old: { + patches = old.patches ++ [ ../patches/sway/fix-hide_cursor-clearing-focus.patch ]; + }); + }; + mangohud = prev.mangohud.overrideAttrs (o: { + patches = o.patches ++ [ + (prev.fetchpatch { + url = "https://github.com/flightlessmango/MangoHud/commit/95141de657e02577f1d3fab0ca12122bfb68bc56.patch"; + hash = "sha256-a2tESliGBkfF7uYQn8TDgeFt07A9FOioI4VcTT7DC7A="; + }) + ]; + }); + } + ); - variables = (final: prev: { - uservars = import ../user/variables.nix; - }); + variables = (final: prev: { uservars = import ../user/variables.nix; }); - lib_extended = (final: prev: { - lib = prev.lib // rec { - # Utility function - # Input: [{v1=1;} {v2=2;}] - # Output: {v1=1;v2=2;} - mergeAttrsSet = prev.lib.foldAttrs (n: _: n) { }; + lib_extended = ( + final: prev: { + lib = prev.lib // rec { + # Utility function + # Input: [{v1=1;} {v2=2;}] + # Output: {v1=1;v2=2;} + mergeAttrsSet = prev.lib.foldAttrs (n: _: n) { }; - # Easily translate imperative templating code - # Input: [ 1 2 ] (num: { "v${num}" = num; }) - # Output: {v1=1;v2=2;} - forEachMerge = list: func: mergeAttrsSet (prev.lib.forEach list func); - }; - }); + # Easily translate imperative templating code + # Input: [ 1 2 ] (num: { "v${num}" = num; }) + # Output: {v1=1;v2=2;} + forEachMerge = list: func: mergeAttrsSet (prev.lib.forEach list func); + }; + } + ); } diff --git a/pkgs/blade-formatter/default.nix b/pkgs/blade-formatter/default.nix index adf2d7f..f824066 100644 --- a/pkgs/blade-formatter/default.nix +++ b/pkgs/blade-formatter/default.nix @@ -1,11 +1,12 @@ -{ lib -, mkYarnPackage -, fetchFromGitHub -, fetchYarnDeps -, testers -, writeText -, runCommand -, blade-formatter +{ + lib, + mkYarnPackage, + fetchFromGitHub, + fetchYarnDeps, + testers, + writeText, + runCommand, + blade-formatter, }: mkYarnPackage rec { @@ -40,15 +41,17 @@ mkYarnPackage rec { Hello world! @endif ''; - actual = runCommand "actual" - { - nativeBuildInputs = [ blade-formatter ]; - base = writeText "base" '' - @if( true ) Hello world! @endif + actual = + runCommand "actual" + { + nativeBuildInputs = [ blade-formatter ]; + base = writeText "base" '' + @if( true ) Hello world! @endif + ''; + } + '' + blade-formatter $base > $out ''; - } '' - blade-formatter $base > $out - ''; }; }; diff --git a/pkgs/cargo-checkmate.nix b/pkgs/cargo-checkmate.nix index 0620667..a85ff80 100644 --- a/pkgs/cargo-checkmate.nix +++ b/pkgs/cargo-checkmate.nix @@ -1,11 +1,12 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, openssl -, zlib -, stdenv -, Security ? null +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + openssl, + zlib, + stdenv, + Security ? null, }: rustPlatform.buildRustPackage rec { @@ -22,9 +23,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-hOB84u55ishahIFSqBnqccqH3OlC9J8mCYzsd23jTyA="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ - Security - ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; meta = with lib; { description = "Check all the things."; diff --git a/pkgs/default.nix b/pkgs/default.nix index 0fdc3eb..00600fc 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,7 +1,8 @@ # Custom packages, that can be defined similarly to ones from nixpkgs # You can build them using 'nix build .#example' or (legacy) 'nix-build -A example' -{ pkgs, inputs }: { +{ pkgs, inputs }: +{ blade-formatter = pkgs.callPackage ./blade-formatter { }; cargo-checkmate = pkgs.callPackage ./cargo-checkmate.nix { }; lipsum = pkgs.callPackage ./lipsum.nix { inherit inputs; }; diff --git a/pkgs/emmet-cli.nix b/pkgs/emmet-cli.nix index c7fce2e..043aff6 100644 --- a/pkgs/emmet-cli.nix +++ b/pkgs/emmet-cli.nix @@ -1,6 +1,7 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub +{ + lib, + buildNpmPackage, + fetchFromGitHub, }: buildNpmPackage rec { diff --git a/pkgs/lipsum.nix b/pkgs/lipsum.nix index e1dabe5..427f04e 100644 --- a/pkgs/lipsum.nix +++ b/pkgs/lipsum.nix @@ -11,9 +11,7 @@ pkgs.stdenv.mkDerivation rec { wrapGAppsHook ]; - makeFlags = [ - "PRG=${pname}" - ]; + makeFlags = [ "PRG=${pname}" ]; installPhase = '' install -Dm 755 "$pname" "$out/bin/$pname" @@ -21,4 +19,3 @@ pkgs.stdenv.mkDerivation rec { glib-compile-schemas "$out/share/glib-2.0/schemas/" ''; } - diff --git a/scripts/default.nix b/scripts/default.nix index bc2ac3d..f509e37 100644 --- a/scripts/default.nix +++ b/scripts/default.nix @@ -1,59 +1,134 @@ -(final: prev: -with prev; -let - import_script = (_: path: import (path) { inherit pkgs lib; }); - create_script = (name: text: runtimeInputs: - let - script_body = pkgs.writeTextFile { - inherit name; - executable = true; - text = '' - ${builtins.readFile text} - ''; - }; - in - (pkgs.writeShellApplication { - inherit name runtimeInputs; - text = ''exec ${script_body} "$@"''; - checkPhase = ""; - })); - create_scripts = - lib.mapAttrs (name: deps: create_script name ./${name} deps); +( + final: prev: + with prev; + let + import_script = (_: path: import (path) { inherit pkgs lib; }); + create_script = ( + name: text: runtimeInputs: + let + script_body = pkgs.writeTextFile { + inherit name; + executable = true; + text = '' + ${builtins.readFile text} + ''; + }; + in + (pkgs.writeShellApplication { + inherit name runtimeInputs; + text = ''exec ${script_body} "$@"''; + checkPhase = ""; + }) + ); + create_scripts = lib.mapAttrs (name: deps: create_script name ./${name} deps); - pass = pkgs.pass.withExtensions (ex: with ex; [ - pass-otp - ]); -in -create_scripts - { + pass = pkgs.pass.withExtensions (ex: with ex; [ pass-otp ]); + in + create_scripts { br = [ ]; - bmenu = [ final.bemenu final.dhist fish j4-dmenu-desktop jq sway ]; - down_meme = [ wl-clipboard yt-dlp libnotify ]; - wl-copy-file = [ wl-clipboard fish ]; + bmenu = [ + final.bemenu + final.dhist + fish + j4-dmenu-desktop + jq + sway + ]; + down_meme = [ + wl-clipboard + yt-dlp + libnotify + ]; + wl-copy-file = [ + wl-clipboard + fish + ]; _diffr = [ diffr ]; _thunar-terminal = [ final.terminal ]; _sway_idle_toggle = [ final.swayidle ]; - kak-pager = [ fish final._diffr ]; + kak-pager = [ + fish + final._diffr + ]; kak-man-pager = [ final.kak-pager ]; - helix-pager = [ fish final._diffr ]; + helix-pager = [ + fish + final._diffr + ]; helix-man-pager = [ final.helix-pager ]; - musmenu = [ mpc-cli final.wdmenu trash-cli xdg-user-dirs libnotify sd wl-clipboard ]; - showkeys = - [ ]; # This will not work unless programs.wshowkeys is enabled systemwide + musmenu = [ + mpc-cli + final.wdmenu + trash-cli + xdg-user-dirs + libnotify + sd + wl-clipboard + ]; + showkeys = [ ]; # This will not work unless programs.wshowkeys is enabled systemwide terminal = [ alacritty ]; playerctl-status = [ playerctl ]; - pass-export = [ pass2csv gnupg ]; - wpass = [ final.wdmenu fd pass sd wl-clipboard wtype ]; - screenshotsh = - [ capitaine-cursors grim slurp jq sway wl-clipboard xdg-user-dirs ]; - volumesh = [ pulseaudio libnotify ]; - pulse_sink = [ pulseaudio pamixer final.wdmenu ]; - color_picker = [ grim slurp wl-clipboard libnotify imagemagick ]; - dzadd = [ procps libnotify final.wdmenu jq mpv pqiv python3Packages.deemix mpc-cli final.mpdDup ]; - mpdDup = [ mpc-cli perl ]; - readQrCode = [ grim zbar wl-clipboard ]; - } // lib.mapAttrs import_script { - wdmenu = ./wdmenu.nix; - wlauncher = ./wlauncher.nix; - _gpg-unlock = ./_gpg-unlock.nix; -}) + pass-export = [ + pass2csv + gnupg + ]; + wpass = [ + final.wdmenu + fd + pass + sd + wl-clipboard + wtype + ]; + screenshotsh = [ + capitaine-cursors + grim + slurp + jq + sway + wl-clipboard + xdg-user-dirs + ]; + volumesh = [ + pulseaudio + libnotify + ]; + pulse_sink = [ + pulseaudio + pamixer + final.wdmenu + ]; + color_picker = [ + grim + slurp + wl-clipboard + libnotify + imagemagick + ]; + dzadd = [ + procps + libnotify + final.wdmenu + jq + mpv + pqiv + python3Packages.deemix + mpc-cli + final.mpdDup + ]; + mpdDup = [ + mpc-cli + perl + ]; + readQrCode = [ + grim + zbar + wl-clipboard + ]; + } + // lib.mapAttrs import_script { + wdmenu = ./wdmenu.nix; + wlauncher = ./wlauncher.nix; + _gpg-unlock = ./_gpg-unlock.nix; + } +) diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 90de405..368b837 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -2,8 +2,12 @@ let main_ssh_public_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxR/w+38b2lX90yNBqhq3mUmkn1WGu6GAPhN1tVp2ZjYRJNV/+5gWCnTtOWYtDx35HmK/spQ2Qy8X9ttkzORa24fysNx1Iqn/TiXhD7eIJjbGPnrOpIKTkW5/uB3SD/P5NBSa06//BaqJU4sBlG79hoXRpod052hQtdpTVDiMCIV+iboWPKqopmJJfWdBtVnHXs9rep0htPRExxGslImFk7Z6xjcaHyCpIQZPlOGf+sGsmUU7jRqzvZFV8ucIdbnAlMHrU4pepNFhuraESyZVTa/bi9sw0iozXp5Q5+5thMebEslmT1Z771kI4sieDy+O4r8c0Sx2/VY1UAzcpq1faggc3YB01MTh+tiEC6xdMvZLrQGL1NBWjHleMyL53GU5ERluC0vXJF3Hv3BGGBDfXWbrEm5n06DHr2apRVJGC0LwiQ7Woud1X4V4X1pKSusxCVMjT2lmcOwV6YhKhB2sowJc1OdMx4+tL0UWE+YKSZgBHfolwk6ml0F4EO9nnUHc= lelgenio@i15"; in { - "rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.age".publicKeys = [ main_ssh_public_key ]; - "monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.age".publicKeys = [ main_ssh_public_key ]; + "rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.age".publicKeys = [ + main_ssh_public_key + ]; + "monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.age".publicKeys = [ + main_ssh_public_key + ]; "gitlab-runner-thoreb-telemetria-registrationConfigFile.age".publicKeys = [ main_ssh_public_key ]; "monolith-forgejo-runner-token.age".publicKeys = [ main_ssh_public_key ]; "lelgenio-cachix.age".publicKeys = [ main_ssh_public_key ]; diff --git a/system/bluetooth.nix b/system/bluetooth.nix index 20eb72e..1bcea1f 100644 --- a/system/bluetooth.nix +++ b/system/bluetooth.nix @@ -1,4 +1,5 @@ -{ pkgs, ... }: { +{ pkgs, ... }: +{ services.blueman.enable = true; hardware.bluetooth = { enable = true; @@ -8,7 +9,9 @@ # Discoverable = true; AlwaysPairable = true; }; - Policy = { AutoEnable = true; }; + Policy = { + AutoEnable = true; + }; }; }; } diff --git a/system/boot.nix b/system/boot.nix index 25e9a11..81d838e 100644 --- a/system/boot.nix +++ b/system/boot.nix @@ -1,4 +1,11 @@ -{ config, pkgs, lib, inputs, ... }: { +{ + config, + pkgs, + lib, + inputs, + ... +}: +{ console = { font = "${pkgs.terminus_font}/share/consolefonts/ter-120n.psf.gz"; packages = [ pkgs.terminus_font ]; @@ -38,9 +45,7 @@ enable = true; theme = lib.mkIf (pkgs.uservars.desktop == "sway") "red_loader"; themePackages = with pkgs; [ - (adi1090x-plymouth-themes.override { - selected_themes = [ "red_loader" ]; - }) + (adi1090x-plymouth-themes.override { selected_themes = [ "red_loader" ]; }) ]; }; }; diff --git a/system/cachix.nix b/system/cachix.nix index 07af177..7ff9b29 100644 --- a/system/cachix.nix +++ b/system/cachix.nix @@ -1,4 +1,10 @@ -{ pkgs, lib, config, ... }: { +{ + pkgs, + lib, + config, + ... +}: +{ services.cachix-watch-store = { enable = true; cacheName = "lelgenio"; diff --git a/system/configuration.nix b/system/configuration.nix index 130ca7d..8054fa9 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -1,7 +1,13 @@ # Edit this configuration file to define what should be installed on # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, inputs, ... }: { +{ + config, + pkgs, + inputs, + ... +}: +{ imports = [ ./gamemode.nix ./cachix.nix diff --git a/system/containers.nix b/system/containers.nix index c2c2941..377647d 100644 --- a/system/containers.nix +++ b/system/containers.nix @@ -1,4 +1,5 @@ -{ pkgs, ... }: { +{ pkgs, ... }: +{ services.flatpak.enable = true; virtualisation.docker.enable = true; virtualisation.docker.autoPrune.enable = true; diff --git a/system/fonts.nix b/system/fonts.nix index e6d4ccd..d8bff5a 100644 --- a/system/fonts.nix +++ b/system/fonts.nix @@ -1,4 +1,5 @@ -{ pkgs, ... }: { +{ pkgs, ... }: +{ fonts.enableDefaultPackages = true; fonts.packages = with pkgs; [ noto-fonts diff --git a/system/gamemode.nix b/system/gamemode.nix index d9445ea..92207cd 100644 --- a/system/gamemode.nix +++ b/system/gamemode.nix @@ -1,8 +1,16 @@ -{ config, pkgs, inputs, ... }: { +{ + config, + pkgs, + inputs, + ... +}: +{ programs.gamemode.enable = true; programs.gamemode.enableRenice = true; programs.gamemode.settings = { - general = { renice = 10; }; + general = { + renice = 10; + }; # Warning: GPU optimisations have the potential to damage hardware gpu = { diff --git a/system/gitlab-runner.nix b/system/gitlab-runner.nix index 1cc46a7..335bc5a 100644 --- a/system/gitlab-runner.nix +++ b/system/gitlab-runner.nix @@ -1,40 +1,52 @@ -{ pkgs, lib, ... }: { - mkNixRunner = registrationConfigFile: with lib; rec { - # File should contain at least these two variables: - # `CI_SERVER_URL` - # `REGISTRATION_TOKEN` - inherit registrationConfigFile; # 2 - dockerImage = "alpine:3.18.2"; - dockerAllowedImages = [ dockerImage ]; - dockerVolumes = [ - "/etc/nix/nix.conf:/etc/nix/nix.conf:ro" - "/nix/store:/nix/store:ro" - "/nix/var/nix/db:/nix/var/nix/db:ro" - "/nix/var/nix/daemon-socket:/nix/var/nix/daemon-socket:ro" - ]; - dockerDisableCache = true; - preBuildScript = pkgs.writeScript "setup-container" '' - mkdir -p -m 0755 /nix/var/log/nix/drvs - mkdir -p -m 0755 /nix/var/nix/gcroots - mkdir -p -m 0755 /nix/var/nix/profiles - mkdir -p -m 0755 /nix/var/nix/temproots - mkdir -p -m 0755 /nix/var/nix/userpool - mkdir -p -m 1777 /nix/var/nix/gcroots/per-user - mkdir -p -m 1777 /nix/var/nix/profiles/per-user - mkdir -p -m 0755 /nix/var/nix/profiles/per-user/root - mkdir -p -m 0700 "$HOME/.nix-defexpr" +{ pkgs, lib, ... }: +{ + mkNixRunner = + registrationConfigFile: with lib; rec { + # File should contain at least these two variables: + # `CI_SERVER_URL` + # `REGISTRATION_TOKEN` + inherit registrationConfigFile; # 2 + dockerImage = "alpine:3.18.2"; + dockerAllowedImages = [ dockerImage ]; + dockerVolumes = [ + "/etc/nix/nix.conf:/etc/nix/nix.conf:ro" + "/nix/store:/nix/store:ro" + "/nix/var/nix/db:/nix/var/nix/db:ro" + "/nix/var/nix/daemon-socket:/nix/var/nix/daemon-socket:ro" + ]; + dockerDisableCache = true; + preBuildScript = pkgs.writeScript "setup-container" '' + mkdir -p -m 0755 /nix/var/log/nix/drvs + mkdir -p -m 0755 /nix/var/nix/gcroots + mkdir -p -m 0755 /nix/var/nix/profiles + mkdir -p -m 0755 /nix/var/nix/temproots + mkdir -p -m 0755 /nix/var/nix/userpool + mkdir -p -m 1777 /nix/var/nix/gcroots/per-user + mkdir -p -m 1777 /nix/var/nix/profiles/per-user + mkdir -p -m 0755 /nix/var/nix/profiles/per-user/root + mkdir -p -m 0700 "$HOME/.nix-defexpr" - . ${pkgs.nix}/etc/profile.d/nix.sh + . ${pkgs.nix}/etc/profile.d/nix.sh - ${pkgs.nix}/bin/nix-env -i ${concatStringsSep " " (with pkgs; [ nix cacert git openssh ])} - ''; - environmentVariables = { - ENV = "/etc/profile"; - USER = "root"; - NIX_REMOTE = "daemon"; - PATH = "/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/bin:/sbin:/usr/bin:/usr/sbin"; - NIX_SSL_CERT_FILE = "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt"; + ${pkgs.nix}/bin/nix-env -i ${ + concatStringsSep " " ( + with pkgs; + [ + nix + cacert + git + openssh + ] + ) + } + ''; + environmentVariables = { + ENV = "/etc/profile"; + USER = "root"; + NIX_REMOTE = "daemon"; + PATH = "/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/bin:/sbin:/usr/bin:/usr/sbin"; + NIX_SSL_CERT_FILE = "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt"; + }; + tagList = [ "nix" ]; }; - tagList = [ "nix" ]; - }; } diff --git a/system/gnome.nix b/system/gnome.nix index cb8c106..72b98c5 100644 --- a/system/gnome.nix +++ b/system/gnome.nix @@ -1,7 +1,8 @@ # Edit this configuration file to define what should be installed on # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, ... }: { +{ config, pkgs, ... }: +{ # Enable the X11 windowing system. services.xserver.enable = true; # Enable the GNOME Desktop Environment. @@ -19,11 +20,14 @@ }; # services.xserver.displayManager.autologin.user = "lelgenio"; - environment.systemPackages = with pkgs; with gnome; [ - gnome-tweaks - dconf-editor + environment.systemPackages = + with pkgs; + with gnome; + [ + gnome-tweaks + dconf-editor - chrome-gnome-shell - gnomeExtensions.quick-settings-audio-devices-hider - ]; + chrome-gnome-shell + gnomeExtensions.quick-settings-audio-devices-hider + ]; } diff --git a/system/greetd.nix b/system/greetd.nix index 4c6e31a..68f0cf8 100644 --- a/system/greetd.nix +++ b/system/greetd.nix @@ -1,6 +1,17 @@ -{ lib, pkgs, config, ... }: +{ + lib, + pkgs, + config, + ... +}: let - inherit (pkgs.uservars) key accent font theme desktop; + inherit (pkgs.uservars) + key + accent + font + theme + desktop + ; cfg = config.login-manager.greetd; in diff --git a/system/kde.nix b/system/kde.nix index 66aa2a2..c5ef277 100644 --- a/system/kde.nix +++ b/system/kde.nix @@ -1,4 +1,5 @@ -{ config, pkgs, ... }: { +{ config, pkgs, ... }: +{ # Enable the X11 windowing system. services.xserver.enable = true; # Enable the KDE Desktop Environment. diff --git a/system/locale.nix b/system/locale.nix index bb344c7..07e7175 100644 --- a/system/locale.nix +++ b/system/locale.nix @@ -1,4 +1,5 @@ -{ pkgs, config, ... }: { +{ pkgs, config, ... }: +{ time.timeZone = "America/Sao_Paulo"; environment.variables.TZ = config.time.timeZone; i18n.defaultLocale = "pt_BR.utf8"; diff --git a/system/media-packages.nix b/system/media-packages.nix index e72ea0a..818b78b 100644 --- a/system/media-packages.nix +++ b/system/media-packages.nix @@ -1,6 +1,13 @@ -{ config, pkgs, lib, ... }: -let cfg = config.packages.media-packages; -in { +{ + config, + pkgs, + lib, + ... +}: +let + cfg = config.packages.media-packages; +in +{ options.packages.media-packages = { enable = lib.mkEnableOption "media packages"; }; diff --git a/system/monolith-forgejo-runner.nix b/system/monolith-forgejo-runner.nix index ee07410..fa2b3c6 100644 --- a/system/monolith-forgejo-runner.nix +++ b/system/monolith-forgejo-runner.nix @@ -1,4 +1,5 @@ -{ pkgs, config, ... }: { +{ pkgs, config, ... }: +{ services.gitea-actions-runner = { package = pkgs.forgejo-actions-runner; instances.default = { diff --git a/system/monolith-gitlab-runner.nix b/system/monolith-gitlab-runner.nix index 37b16dd..8e419d1 100644 --- a/system/monolith-gitlab-runner.nix +++ b/system/monolith-gitlab-runner.nix @@ -1,4 +1,9 @@ -{ config, pkgs, lib, ... }: +{ + config, + pkgs, + lib, + ... +}: let inherit (pkgs.callPackage ./gitlab-runner.nix { }) mkNixRunner; in @@ -15,7 +20,8 @@ in # dockerPrivileged = true; # }; thoreb_builder = { - registrationConfigFile = config.age.secrets.monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.path; + registrationConfigFile = + config.age.secrets.monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.path; dockerImage = "debian"; dockerPrivileged = true; }; diff --git a/system/network.nix b/system/network.nix index c8ebdd9..aee7518 100644 --- a/system/network.nix +++ b/system/network.nix @@ -1,4 +1,5 @@ -{ pkgs, ... }: { +{ pkgs, ... }: +{ # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. # Configure network proxy if necessary # networking.proxy.default = "http://user:password@proxy:port/"; diff --git a/system/nix-serve.nix b/system/nix-serve.nix index 0bd49c2..6cc7161 100644 --- a/system/nix-serve.nix +++ b/system/nix-serve.nix @@ -1,4 +1,10 @@ -{ config, pkgs, lib, ... }: { +{ + config, + pkgs, + lib, + ... +}: +{ services.nix-serve = { enable = true; secretKeyFile = config.age.secrets.monolith-nix-serve-privkey.path; diff --git a/system/nix.nix b/system/nix.nix index 38b2eb9..18ac258 100644 --- a/system/nix.nix +++ b/system/nix.nix @@ -1,7 +1,13 @@ -{ lib, config, pkgs, inputs, ... }: +{ + lib, + config, + pkgs, + inputs, + ... +}: let - collectFlakeInputs = input: - [ input ] ++ lib.concatMap collectFlakeInputs (builtins.attrValues (input.inputs or { })); + collectFlakeInputs = + input: [ input ] ++ lib.concatMap collectFlakeInputs (builtins.attrValues (input.inputs or { })); in { system.extraDependencies = collectFlakeInputs inputs.self; @@ -17,7 +23,10 @@ in optimise.automatic = true; settings = { auto-optimise-store = true; - trusted-users = [ "root" "@wheel" ]; + trusted-users = [ + "root" + "@wheel" + ]; substituters = [ "https://cache.nixos.org" "https://nix-community.cachix.org" diff --git a/system/rainbow-gitlab-runner.nix b/system/rainbow-gitlab-runner.nix index 2cae621..aa177de 100644 --- a/system/rainbow-gitlab-runner.nix +++ b/system/rainbow-gitlab-runner.nix @@ -1,4 +1,9 @@ -{ config, pkgs, lib, ... }: +{ + config, + pkgs, + lib, + ... +}: let inherit (pkgs.callPackage ./gitlab-runner.nix { }) mkNixRunner; in @@ -15,7 +20,8 @@ in # dockerPrivileged = true; # }; thoreb_builder = { - registrationConfigFile = config.age.secrets.rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.path; + registrationConfigFile = + config.age.secrets.rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.path; dockerImage = "debian"; dockerPrivileged = true; }; diff --git a/system/secrets.nix b/system/secrets.nix index c94581c..ca11fb4 100644 --- a/system/secrets.nix +++ b/system/secrets.nix @@ -1,18 +1,13 @@ -{ pkgs, ... }: { +{ pkgs, ... }: +{ age = { identityPaths = [ "/root/.ssh/id_rsa" ]; secrets.lelgenio-cachix.file = ../secrets/lelgenio-cachix.age; - secrets.monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.file = - ../secrets/monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.age; - secrets.gitlab-runner-thoreb-telemetria-registrationConfigFile.file = - ../secrets/gitlab-runner-thoreb-telemetria-registrationConfigFile.age; - secrets.monolith-forgejo-runner-token.file = - ../secrets/monolith-forgejo-runner-token.age; - secrets.rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.file = - ../secrets/rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.age; - secrets.monolith-nix-serve-privkey.file = - ../secrets/monolith-nix-serve-privkey.age; - secrets.phantom-forgejo-mailer-password.file = - ../secrets/phantom-forgejo-mailer-password.age; + secrets.monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.file = ../secrets/monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.age; + secrets.gitlab-runner-thoreb-telemetria-registrationConfigFile.file = ../secrets/gitlab-runner-thoreb-telemetria-registrationConfigFile.age; + secrets.monolith-forgejo-runner-token.file = ../secrets/monolith-forgejo-runner-token.age; + secrets.rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.file = ../secrets/rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.age; + secrets.monolith-nix-serve-privkey.file = ../secrets/monolith-nix-serve-privkey.age; + secrets.phantom-forgejo-mailer-password.file = ../secrets/phantom-forgejo-mailer-password.age; }; } diff --git a/system/sound.nix b/system/sound.nix index 3cdbf58..8ef55ab 100644 --- a/system/sound.nix +++ b/system/sound.nix @@ -1,4 +1,5 @@ -{ pkgs, ... }: { +{ pkgs, ... }: +{ sound.enable = true; hardware.pulseaudio.enable = false; services.pipewire = { diff --git a/system/specialisation.nix b/system/specialisation.nix index c0e1498..23b410f 100644 --- a/system/specialisation.nix +++ b/system/specialisation.nix @@ -1,10 +1,7 @@ -{ pkgs, ... }: { +{ pkgs, ... }: +{ specialisation.dark-theme.configuration = { - nixpkgs.overlays = [ - (final: prev: { - uservars = prev.uservars; - }) - ]; + nixpkgs.overlays = [ (final: prev: { uservars = prev.uservars; }) ]; }; specialisation.light-theme.configuration = { nixpkgs.overlays = [ diff --git a/system/steam.nix b/system/steam.nix index ce94c3d..ddc33c8 100644 --- a/system/steam.nix +++ b/system/steam.nix @@ -1,17 +1,27 @@ -{ config, pkgs, inputs, ... }: { +{ + config, + pkgs, + inputs, + ... +}: +{ programs.steam.enable = true; programs.steam.package = pkgs.steam.override { - extraLibraries = pkgs: with config.hardware.opengl; - if pkgs.hostPlatform.is64bit - then [ package ] ++ extraPackages - else [ package32 ] ++ extraPackages32; + extraLibraries = + pkgs: + with config.hardware.opengl; + if pkgs.hostPlatform.is64bit then + [ package ] ++ extraPackages + else + [ package32 ] ++ extraPackages32; - extraPkgs = pkgs: with pkgs; [ - capitaine-cursors - bibata-cursors - mangohud - xdg-user-dirs - ]; + extraPkgs = + pkgs: with pkgs; [ + capitaine-cursors + bibata-cursors + mangohud + xdg-user-dirs + ]; }; environment.systemPackages = with pkgs; [ protontricks diff --git a/system/thunar.nix b/system/thunar.nix index 5a14448..fcb9e3b 100644 --- a/system/thunar.nix +++ b/system/thunar.nix @@ -1,4 +1,10 @@ -{ config, pkgs, inputs, ... }: { +{ + config, + pkgs, + inputs, + ... +}: +{ programs.thunar = { enable = true; plugins = with pkgs.xfce; [ @@ -12,17 +18,15 @@ services.tumbler.enable = true; environment.systemPackages = [ - ( - pkgs.writeTextFile { - name = "thumbs"; - text = '' - [Thumbnailer Entry] - TryExec=unzip - Exec=sh -c "${pkgs.unzip}/bin/unzip -p %i preview.png > %o" - MimeType=application/x-krita; - ''; - destination = "/share/thumbnailers/kra.thumbnailer"; - } - ) + (pkgs.writeTextFile { + name = "thumbs"; + text = '' + [Thumbnailer Entry] + TryExec=unzip + Exec=sh -c "${pkgs.unzip}/bin/unzip -p %i preview.png > %o" + MimeType=application/x-krita; + ''; + destination = "/share/thumbnailers/kra.thumbnailer"; + }) ]; } diff --git a/system/users.nix b/system/users.nix index 2334897..ead5528 100644 --- a/system/users.nix +++ b/system/users.nix @@ -1,4 +1,5 @@ -{ pkgs, ... }: { +{ pkgs, ... }: +{ security.sudo.wheelNeedsPassword = false; # services.getty.autologinUser = "lelgenio"; @@ -10,7 +11,15 @@ isNormalUser = true; description = "Leonardo Eugênio"; hashedPassword = "$y$j9T$0e/rczjOVCy7PuwC3pG0V/$gTHZhfO4wQSlFvbDyfghbCnGI2uDI0a52zSrQ/yOA5A"; - extraGroups = [ "networkmanager" "wheel" "docker" "adbusers" "bluetooth" "corectrl" "vboxusers" ]; + extraGroups = [ + "networkmanager" + "wheel" + "docker" + "adbusers" + "bluetooth" + "corectrl" + "vboxusers" + ]; shell = pkgs.fish; openssh.authorizedKeys.keys = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxR/w+38b2lX90yNBqhq3mUmkn1WGu6GAPhN1tVp2ZjYRJNV/+5gWCnTtOWYtDx35HmK/spQ2Qy8X9ttkzORa24fysNx1Iqn/TiXhD7eIJjbGPnrOpIKTkW5/uB3SD/P5NBSa06//BaqJU4sBlG79hoXRpod052hQtdpTVDiMCIV+iboWPKqopmJJfWdBtVnHXs9rep0htPRExxGslImFk7Z6xjcaHyCpIQZPlOGf+sGsmUU7jRqzvZFV8ucIdbnAlMHrU4pepNFhuraESyZVTa/bi9sw0iozXp5Q5+5thMebEslmT1Z771kI4sieDy+O4r8c0Sx2/VY1UAzcpq1faggc3YB01MTh+tiEC6xdMvZLrQGL1NBWjHleMyL53GU5ERluC0vXJF3Hv3BGGBDfXWbrEm5n06DHr2apRVJGC0LwiQ7Woud1X4V4X1pKSusxCVMjT2lmcOwV6YhKhB2sowJc1OdMx4+tL0UWE+YKSZgBHfolwk6ml0F4EO9nnUHc= lelgenio@i15" diff --git a/user/alacritty.nix b/user/alacritty.nix index 8c7ec22..ae2e2fb 100644 --- a/user/alacritty.nix +++ b/user/alacritty.nix @@ -1,6 +1,16 @@ -{ config, pkgs, lib, ... }: +{ + config, + pkgs, + lib, + ... +}: let - inherit (pkgs.uservars) key theme accent font; + inherit (pkgs.uservars) + key + theme + accent + font + ; inherit (theme) color; in { @@ -10,7 +20,9 @@ in settings = { font = { size = font.size.small; - normal = { family = font.mono; }; + normal = { + family = font.mono; + }; }; colors = { primary = { @@ -40,31 +52,34 @@ in hints = { alphabet = key.hints; - enabled = [{ - regex = - let - mimes = - "(mailto:|gemini:|gopher:|https:|http:|news:|file:|git:|ssh:|ftp:)"; - # I fucking hate regex, look at this bullshit - delimiters = ''^\\u0000-\\u001F\\u007F-\\u009F<>"\\s{-}\\^⟨⟩`''; - # Kakoune uses these characters to represent whitespace, - # but alacritty doesn't know about them - whitespace_characters = ''¬·→''; - in - "${mimes}[${delimiters}${whitespace_characters}]+"; - command = "xdg-open"; - post_processing = true; - mouse = { - enabled = true; - mods = "None"; - }; - binding = { - key = "U"; - mods = "Control|Shift"; - }; - }]; + enabled = [ + { + regex = + let + mimes = "(mailto:|gemini:|gopher:|https:|http:|news:|file:|git:|ssh:|ftp:)"; + # I fucking hate regex, look at this bullshit + delimiters = ''^\\u0000-\\u001F\\u007F-\\u009F<>"\\s{-}\\^⟨⟩`''; + # Kakoune uses these characters to represent whitespace, + # but alacritty doesn't know about them + whitespace_characters = ''¬·→''; + in + "${mimes}[${delimiters}${whitespace_characters}]+"; + command = "xdg-open"; + post_processing = true; + mouse = { + enabled = true; + mods = "None"; + }; + binding = { + key = "U"; + mods = "Control|Shift"; + }; + } + ]; + }; + mouse = { + hide_when_typing = true; }; - mouse = { hide_when_typing = true; }; keyboard.bindings = [ { key = lib.toUpper key.up; @@ -141,7 +156,9 @@ in }; }; - home.sessionVariables = { TERMINAL = "alacritty"; }; + home.sessionVariables = { + TERMINAL = "alacritty"; + }; # Look at this fucking bullshit: # https://gitlab.gnome.org/GNOME/glib/-/blob/20c4fcb2a7246a2b205649eae3ebda4296217afc/gio/gdesktopappinfo.c#L2702 diff --git a/user/bmenu.nix b/user/bmenu.nix index 047da54..38c36c6 100644 --- a/user/bmenu.nix +++ b/user/bmenu.nix @@ -1,6 +1,17 @@ -{ config, pkgs, lib, inputs, ... }: +{ + config, + pkgs, + lib, + inputs, + ... +}: let - inherit (pkgs.uservars) key theme accent font; + inherit (pkgs.uservars) + key + theme + accent + font + ; inherit (theme) color; in { diff --git a/user/chat.nix b/user/chat.nix index 34ddd84..f0987ed 100644 --- a/user/chat.nix +++ b/user/chat.nix @@ -1,4 +1,11 @@ -{ config, pkgs, lib, inputs, ... }: { +{ + config, + pkgs, + lib, + inputs, + ... +}: +{ wayland.windowManager.sway = { extraConfig = '' exec thunderbird diff --git a/user/controller.nix b/user/controller.nix index 73ab483..6a756df 100644 --- a/user/controller.nix +++ b/user/controller.nix @@ -1,4 +1,11 @@ -{ config, pkgs, lib, inputs, ... }: { +{ + config, + pkgs, + lib, + inputs, + ... +}: +{ xdg.desktopEntries = { connect-controller = { name = "Connect Controller"; diff --git a/user/desktop-entries.nix b/user/desktop-entries.nix index eaa4c93..1b809d3 100644 --- a/user/desktop-entries.nix +++ b/user/desktop-entries.nix @@ -1,4 +1,10 @@ -{ config, pkgs, lib, ... }: { +{ + config, + pkgs, + lib, + ... +}: +{ xdg.desktopEntries = { kak = { name = "Kakoune"; @@ -8,7 +14,10 @@ terminal = true; type = "Application"; icon = "kak.desktop"; - categories = [ "Utility" "TextEditor" ]; + categories = [ + "Utility" + "TextEditor" + ]; startupNotify = true; mimeType = [ "text/english" @@ -40,10 +49,15 @@ terminal = true; type = "Application"; icon = "mutt"; - categories = [ "Network" "Email" ]; + categories = [ + "Network" + "Email" + ]; startupNotify = false; mimeType = [ "x-scheme-handler/mailto" ]; - settings = { Keywords = "Mail;E-mail;"; }; + settings = { + Keywords = "Mail;E-mail;"; + }; }; down_meme = { name = "DownMeme"; diff --git a/user/firefox.nix b/user/firefox.nix index b60f808..4c442e3 100644 --- a/user/firefox.nix +++ b/user/firefox.nix @@ -1,6 +1,16 @@ -{ config, pkgs, lib, font, ... }: -let inherit (pkgs.uservars) desktop browser; - bugfixedFirefox = pkgs.firefox-esr-unwrapped // { requireSigning = false; allowAddonSideload = true; }; +{ + config, + pkgs, + lib, + font, + ... +}: +let + inherit (pkgs.uservars) desktop browser; + bugfixedFirefox = pkgs.firefox-esr-unwrapped // { + requireSigning = false; + allowAddonSideload = true; + }; in { config = { diff --git a/user/fish/default.nix b/user/fish/default.nix index 913e514..07ba4c2 100644 --- a/user/fish/default.nix +++ b/user/fish/default.nix @@ -1,6 +1,21 @@ -{ config, pkgs, lib, ... }: -let inherit (pkgs.uservars) key theme color accent font editor desktop; -in { +{ + config, + pkgs, + lib, + ... +}: +let + inherit (pkgs.uservars) + key + theme + color + accent + font + editor + desktop + ; +in +{ config = { programs.fish = { enable = true; @@ -34,10 +49,12 @@ in { }; shellAbbrs = { off = "shutdown now"; - v = { - "helix" = "hx"; - "kakoune" = "kak"; - }.${editor}; + v = + { + "helix" = "hx"; + "kakoune" = "kak"; + } + .${editor}; ns = "nix develop --command $SHELL"; wcf = "wl-copy-file"; c = "cargo"; @@ -64,7 +81,9 @@ in { gr = "cd (git root)"; gri = "git rebase --interactive FETCH_HEAD"; }; - functions = { fish_greeting = ""; }; + functions = { + fish_greeting = ""; + }; }; programs = { zoxide.enable = true; @@ -85,13 +104,18 @@ in { }; # programs.command-not-found.enable = true; programs.nix-index.enable = true; - home.packages = (with pkgs; with fishPlugins;[ - trash-cli - wl-copy-file - foreign-env - ] ++ (lib.optionals (desktop == "sway") [ - async-prompt - done - ])); + home.packages = ( + with pkgs; + with fishPlugins; + [ + trash-cli + wl-copy-file + foreign-env + ] + ++ (lib.optionals (desktop == "sway") [ + async-prompt + done + ]) + ); }; } diff --git a/user/fzf.nix b/user/fzf.nix index fc7856a..a4113fa 100644 --- a/user/fzf.nix +++ b/user/fzf.nix @@ -1,6 +1,17 @@ -{ config, pkgs, lib, inputs, ... }: +{ + config, + pkgs, + lib, + inputs, + ... +}: let - inherit (pkgs.uservars) key theme accent font; + inherit (pkgs.uservars) + key + theme + accent + font + ; inherit (theme) color; colors = { @@ -15,22 +26,21 @@ let makeOptList = lib.mapAttrsToList makeKeyValue colors; makeColorValue = lib.strings.concatStringsSep "," makeOptList; color_opts = "--color=${makeColorValue}"; - preview_opts = - "--preview '${pkgs.bat}/bin/bat --style=numbers --color=always {}'"; - + preview_opts = "--preview '${pkgs.bat}/bin/bat --style=numbers --color=always {}'"; in { programs.fzf = { enable = true; fileWidgetCommand = "${pkgs.fd}/bin/fd --type f"; - fileWidgetOptions = - [ "--preview '${pkgs.bat}/bin/bat --style=numbers --color=always {}'" ]; + fileWidgetOptions = [ "--preview '${pkgs.bat}/bin/bat --style=numbers --color=always {}'" ]; changeDirWidgetCommand = "${pkgs.fd}/bin/fd --type d"; - changeDirWidgetOptions = - [ "--preview '${pkgs.eza}/bin/eza -T L3 | head -200'" ]; + changeDirWidgetOptions = [ "--preview '${pkgs.eza}/bin/eza -T L3 | head -200'" ]; - defaultOptions = [ color_opts preview_opts ]; + defaultOptions = [ + color_opts + preview_opts + ]; }; } diff --git a/user/git.nix b/user/git.nix index f5392df..f50a249 100644 --- a/user/git.nix +++ b/user/git.nix @@ -1,6 +1,13 @@ -{ config, pkgs, lib, ... }: -let inherit (pkgs.uservars) username mail; -in { +{ + config, + pkgs, + lib, + ... +}: +let + inherit (pkgs.uservars) username mail; +in +{ config = { programs.git = { enable = true; diff --git a/user/gnome.nix b/user/gnome.nix index 70438c3..d1f692d 100644 --- a/user/gnome.nix +++ b/user/gnome.nix @@ -1,4 +1,10 @@ -{ pkgs, lib, inputs, ... }: lib.mkIf (pkgs.uservars.desktop == "gnome") { +{ + pkgs, + lib, + inputs, + ... +}: +lib.mkIf (pkgs.uservars.desktop == "gnome") { home.pointerCursor = { name = "Adwaita"; @@ -14,9 +20,7 @@ cursor-theme = "Adwaita"; # color-scheme = "default"; }; - "org/gnome/desktop/wm/preferences" = lib.mkForce { - button-layout = "appmenu:close"; - }; + "org/gnome/desktop/wm/preferences" = lib.mkForce { button-layout = "appmenu:close"; }; "org/gnome/desktop/input-sources" = { xkb-options = [ "lv3:lsgt_switch" ]; }; @@ -40,7 +44,9 @@ qt6Packages.qtstyleplugin-kvantum ]; - home.sessionVariables = { QT_QPA_PLATFORMTHEME = "qt5ct"; }; + home.sessionVariables = { + QT_QPA_PLATFORMTHEME = "qt5ct"; + }; xdg.defaultApplications = { enable = true; diff --git a/user/gpg.nix b/user/gpg.nix index 5dc20d0..dc39066 100644 --- a/user/gpg.nix +++ b/user/gpg.nix @@ -1,4 +1,10 @@ -{ config, pkgs, lib, ... }: { +{ + config, + pkgs, + lib, + ... +}: +{ config = { services.gpg-agent = { enable = true; @@ -16,7 +22,9 @@ PartOf = [ "graphical-session.target" ]; After = [ "graphical-session.target" ]; }; - Service = { ExecStart = "${pkgs._gpg-unlock}/bin/_gpg-unlock"; }; + Service = { + ExecStart = "${pkgs._gpg-unlock}/bin/_gpg-unlock"; + }; }; }; systemd.user.timers = { @@ -31,9 +39,10 @@ OnUnitActiveSec = "300"; Unit = "gpg_unlock.service"; }; - Install = { WantedBy = [ "sway-session.target" ]; }; + Install = { + WantedBy = [ "sway-session.target" ]; + }; }; }; - }; } diff --git a/user/helix.nix b/user/helix.nix index 3e430fc..292cfb0 100644 --- a/user/helix.nix +++ b/user/helix.nix @@ -74,7 +74,9 @@ in g.n = "goto_line_start"; g.o = "goto_line_end"; }; - keys.insert = { "A-k" = "normal_mode"; }; + keys.insert = { + "A-k" = "normal_mode"; + }; }; languages.language = [ { @@ -96,14 +98,29 @@ in my-theme = { "inherits" = "gruvbox"; "ui.menu" = "none"; - "ui.background" = { bg = "none"; }; + "ui.background" = { + bg = "none"; + }; "ui.virtual.whitespace" = color.nontxt; - "ui.cursor.primary" = { fg = accent.fg; bg = accent.color; }; - "ui.cursorline.primary" = { bg = color.bg_dark; }; - "ui.cursorcolumn.primary" = { modifiers = [ "bold" ]; }; - "ui.cursorline" = { bg = "none"; }; - "ui.cursorcolumn" = { bg = "none"; }; - "ui.linenr.selected" = { fg = color.txt; }; + "ui.cursor.primary" = { + fg = accent.fg; + bg = accent.color; + }; + "ui.cursorline.primary" = { + bg = color.bg_dark; + }; + "ui.cursorcolumn.primary" = { + modifiers = [ "bold" ]; + }; + "ui.cursorline" = { + bg = "none"; + }; + "ui.cursorcolumn" = { + bg = "none"; + }; + "ui.linenr.selected" = { + fg = color.txt; + }; function = color.normal.orange; module = color.normal.brown; @@ -124,8 +141,6 @@ in }; }; }; - home.sessionVariables = lib.mkIf (editor == "helix") { - EDITOR = "hx"; - }; + home.sessionVariables = lib.mkIf (editor == "helix") { EDITOR = "hx"; }; }; } diff --git a/user/home.nix b/user/home.nix index 39a9ba2..7ec6061 100644 --- a/user/home.nix +++ b/user/home.nix @@ -1,4 +1,12 @@ -{ config, pkgs, lib, inputs, osConfig, ... }: { +{ + config, + pkgs, + lib, + inputs, + osConfig, + ... +}: +{ imports = [ ./controller.nix ./waybar @@ -70,9 +78,7 @@ comma # System monitors - (btop.override { - cudaSupport = true; - }) + (btop.override { cudaSupport = true; }) amdgpu_top inxi dmidecode @@ -140,10 +146,11 @@ }; }; home.sessionVariables = { - VOLUME_CHANGE_SOUND = - "${pkgs.sound-theme-freedesktop}/share/sounds/freedesktop/stereo/audio-volume-change.oga"; + VOLUME_CHANGE_SOUND = "${pkgs.sound-theme-freedesktop}/share/sounds/freedesktop/stereo/audio-volume-change.oga"; + }; + programs.bash = { + enable = true; }; - programs.bash = { enable = true; }; xdg.defaultApplications = { enable = true; @@ -154,7 +161,8 @@ { firefox = lib.mkDefault "firefox.desktop"; qutebrowser = lib.mkDefault "org.qutebrowser.qutebrowser.desktop"; - }.${pkgs.uservars.browser} + } + .${pkgs.uservars.browser} ); document-viewer = lib.mkDefault "org.pwmt.zathura.desktop"; file-manager = lib.mkDefault "thunar.desktop"; @@ -163,12 +171,14 @@ torrent-client = lib.mkDefault "torrent.desktop"; }; - wayland.windowManager.sway.extraConfig = lib.optionalString (osConfig.networking.hostName or "" == "monolith") '' - exec steam - exec obs --startreplaybuffer --disable-shutdown-check - exec deluge-gtk - exec nicotine - ''; + wayland.windowManager.sway.extraConfig = + lib.optionalString (osConfig.networking.hostName or "" == "monolith") + '' + exec steam + exec obs --startreplaybuffer --disable-shutdown-check + exec deluge-gtk + exec nicotine + ''; systemd.user.services.rm-target = { Unit = { @@ -182,12 +192,16 @@ }; }; systemd.user.timers.rm-target = { - Unit = { Description = "Remove directories named 'target'"; }; + Unit = { + Description = "Remove directories named 'target'"; + }; Timer = { OnCalendar = "weekly"; Unit = "rm-target.service"; }; - Install = { WantedBy = [ "timers.target" ]; }; + Install = { + WantedBy = [ "timers.target" ]; + }; }; # This value determines the Home Manager release that your diff --git a/user/hyprland.nix b/user/hyprland.nix index 992964a..e1a632b 100644 --- a/user/hyprland.nix +++ b/user/hyprland.nix @@ -1,4 +1,10 @@ -{ config, pkgs, lib, ... }: { +{ + config, + pkgs, + lib, + ... +}: +{ config = lib.mkIf (pkgs.uservars.desktop == "hyprland") { wayland.windowManager.hyprland = { enable = false; @@ -122,6 +128,9 @@ ''; }; home.file.".config/eww".source = ./eww; - home.packages = with pkgs; [ eww-wayland jq ]; + home.packages = with pkgs; [ + eww-wayland + jq + ]; }; } diff --git a/user/kakoune/colors.nix b/user/kakoune/colors.nix index dbac3e3..e9b9d07 100644 --- a/user/kakoune/colors.nix +++ b/user/kakoune/colors.nix @@ -1,4 +1,9 @@ -{ pkgs, lib, color, accent }: +{ + pkgs, + lib, + color, + accent, +}: let colors = lib.mapAttrs (_: lib.replaceStrings [ "#" ] [ "rgb:" ]) { accent_fg = accent.fg; @@ -94,8 +99,9 @@ with colors; face global InlayHint ${bg_light}+buif # Lsp -'' + ( - lib.concatStringsSep "\n" (lib.mapAttrsToList +'' ++ (lib.concatStringsSep "\n" ( + lib.mapAttrsToList (name: color: '' face global HighlightDiagnostic${name} ${color},default+bu face global Diagnostic${name} ${color},default+bu @@ -106,6 +112,5 @@ with colors; Error = "red"; Warning = "yellow"; Hint = "blue"; - }) -) - + } +)) diff --git a/user/kakoune/default.nix b/user/kakoune/default.nix index c39b61b..091fe1b 100644 --- a/user/kakoune/default.nix +++ b/user/kakoune/default.nix @@ -1,6 +1,17 @@ -{ config, pkgs, lib, ... }: +{ + config, + pkgs, + lib, + ... +}: let - inherit (pkgs.uservars) key dmenu editor theme accent; + inherit (pkgs.uservars) + key + dmenu + editor + theme + accent + ; inherit (theme) color; inherit (pkgs) kakounePlugins; inherit (pkgs.kakouneUtils) buildKakounePlugin; @@ -74,26 +85,39 @@ in }) ]; extraConfig = - lib.concatStringsSep "\n" - (map (lib.readFile) ([ - ./filetypes.kak - ./hooks.kak - ./indent.kak - ./keys.kak - ./lsp-config.kak - ./usermode.kak - ./git-mode.kak - ] ++ lib.optional (dmenu == "rofi") ./rofi-commands.kak)) + '' + lib.concatStringsSep "\n" ( + map (lib.readFile) ( + [ + ./filetypes.kak + ./hooks.kak + ./indent.kak + ./keys.kak + ./lsp-config.kak + ./usermode.kak + ./git-mode.kak + ] + ++ lib.optional (dmenu == "rofi") ./rofi-commands.kak + ) + ) + + '' - set global scrolloff 10,20 - set global autoreload yes - set global startup_info_version 99999999 + set global scrolloff 10,20 + set global autoreload yes + set global startup_info_version 99999999 - '' + (import ./colors.nix { - inherit pkgs lib color accent; + '' + + (import ./colors.nix { + inherit + pkgs + lib + color + accent + ; }); }; - home.file = { ".config/kak-lsp/kak-lsp.toml".source = ./kak-lsp.toml; }; + home.file = { + ".config/kak-lsp/kak-lsp.toml".source = ./kak-lsp.toml; + }; home.packages = with pkgs; [ terminal ranger @@ -123,4 +147,3 @@ in }; }; } - diff --git a/user/lf/default.nix b/user/lf/default.nix index 5bc0759..8dc04a2 100644 --- a/user/lf/default.nix +++ b/user/lf/default.nix @@ -1,4 +1,11 @@ -{ config, pkgs, lib, inputs, ... }: { +{ + config, + pkgs, + lib, + inputs, + ... +}: +{ programs.lf = { enable = true; keybindings = { diff --git a/user/man.nix b/user/man.nix index 5b80a4e..c77607e 100644 --- a/user/man.nix +++ b/user/man.nix @@ -1,5 +1,20 @@ -{ config, pkgs, lib, inputs, ... }: -let inherit (pkgs.uservars) key theme color accent font desktop editor; +{ + config, + pkgs, + lib, + inputs, + ... +}: +let + inherit (pkgs.uservars) + key + theme + color + accent + font + desktop + editor + ; pagers = rec { kak = kakoune; kakoune = { diff --git a/user/mangohud.nix b/user/mangohud.nix index 5e54f46..f43564f 100644 --- a/user/mangohud.nix +++ b/user/mangohud.nix @@ -1,6 +1,20 @@ -{ config, pkgs, lib, font, ... }: -let inherit (pkgs.uservars) key theme color accent font; -in { +{ + config, + pkgs, + lib, + font, + ... +}: +let + inherit (pkgs.uservars) + key + theme + color + accent + font + ; +in +{ config = { programs.mangohud = { enable = true; diff --git a/user/mimeapps.nix b/user/mimeapps.nix index 533b00f..ff39ea4 100644 --- a/user/mimeapps.nix +++ b/user/mimeapps.nix @@ -1,4 +1,10 @@ -{ config, pkgs, lib, font, ... }: +{ + config, + pkgs, + lib, + font, + ... +}: let inherit (pkgs.uservars) browser; cfg = config.xdg.defaultApplications; @@ -26,20 +32,21 @@ in xdg.mimeApps = let - createMimeAssociation = (mime_prefix: application: mime_suffix: { - "${mime_prefix}/${mime_suffix}" = application; - }); + createMimeAssociation = ( + mime_prefix: application: mime_suffix: { "${mime_prefix}/${mime_suffix}" = application; } + ); - createMimeAssociations = (mime_prefix: application: mime_suffixes: - lib.foldAttrs (n: _: n) { } - (map (createMimeAssociation mime_prefix application) mime_suffixes)); + createMimeAssociations = ( + mime_prefix: application: mime_suffixes: + lib.foldAttrs (n: _: n) { } (map (createMimeAssociation mime_prefix application) mime_suffixes) + ); - mimes = simple + mimes = + simple // (createMimeAssociations "text" cfg.text-editor text_suffixes) // (createMimeAssociations "image" cfg.image-viewer image_suffixes) // (createMimeAssociations "video" cfg.video-player video_suffixes) - // (createMimeAssociations "application" cfg.archive-manager archive-suffixes) - ; + // (createMimeAssociations "application" cfg.archive-manager archive-suffixes); simple = { "inode/directory" = cfg.file-manager; @@ -421,7 +428,6 @@ in "x-theora+ogg" ]; - archive-suffixes = [ "bzip2" "gzip" @@ -487,6 +493,5 @@ in enable = true; defaultApplications = mimes; }; - }; } diff --git a/user/mpd.nix b/user/mpd.nix index c100000..8a4c155 100644 --- a/user/mpd.nix +++ b/user/mpd.nix @@ -1,4 +1,10 @@ -{ lib, pkgs, config, ... }: { +{ + lib, + pkgs, + config, + ... +}: +{ config = lib.mkIf (pkgs.uservars.desktop != "gnome") { services.mpd = { enable = true; diff --git a/user/mpv.nix b/user/mpv.nix index b66b2ca..851860f 100644 --- a/user/mpv.nix +++ b/user/mpv.nix @@ -1,4 +1,5 @@ -{ pkgs, ... }: { +{ pkgs, ... }: +{ config = { programs.mpv = { enable = true; @@ -6,8 +7,7 @@ # ytdl-format='best'; # ytdl_path = "yt-dlp"; ytdl-format = "bestvideo[height<=1080][vcodec!=vp9]+bestaudio/best"; - ytdl-raw-options = - "cookies=~/.cache/cookies-youtube-com.txt,mark-watched="; + ytdl-raw-options = "cookies=~/.cache/cookies-youtube-com.txt,mark-watched="; osd-fractions = true; save-position-on-quit = true; keep-open = true; diff --git a/user/pass.nix b/user/pass.nix index e17b62a..e1c5bb8 100644 --- a/user/pass.nix +++ b/user/pass.nix @@ -1,10 +1,15 @@ -{ config, pkgs, lib, inputs, ... }: { +{ + config, + pkgs, + lib, + inputs, + ... +}: +{ config = { programs.password-store = { enable = true; - package = pkgs.pass.withExtensions (ex: with ex; [ - pass-otp - ]); + package = pkgs.pass.withExtensions (ex: with ex; [ pass-otp ]); }; services = { pass-secret-service.enable = true; diff --git a/user/pipewire.nix b/user/pipewire.nix index 8fd5188..5e87618 100644 --- a/user/pipewire.nix +++ b/user/pipewire.nix @@ -1,4 +1,10 @@ -{ config, pkgs, lib, ... }: { +{ + config, + pkgs, + lib, + ... +}: +{ # RNNoise is a noise supperssion neural network # Here we use it as a plugin for pipewire to create a virtual microphone config = { diff --git a/user/pqiv.nix b/user/pqiv.nix index dc5e8de..10e6c3d 100644 --- a/user/pqiv.nix +++ b/user/pqiv.nix @@ -1,8 +1,21 @@ -{ config, pkgs, lib, inputs, ... }: +{ + config, + pkgs, + lib, + inputs, + ... +}: let - inherit (pkgs.uservars) key theme color accent font; + inherit (pkgs.uservars) + key + theme + color + accent + font + ; - make_direction_binds = lib.imap0 (idx: direction: + make_direction_binds = lib.imap0 ( + idx: direction: let sign = if (idx < 2) then 1 else -1; axis = if ((lib.mod idx 2) != 0) then "y" else "x"; @@ -15,8 +28,8 @@ let montage_mode_shift_${axis}(${toString (sign * -1)}) } } - ''); - + '' + ); in { # My bemenu wrapper @@ -45,7 +58,12 @@ in { goto_file_relative(-1) } { goto_file_relative(1); } - ${lib.concatStrings (make_direction_binds [ "left" "up" "right" "down" ])} + ${lib.concatStrings (make_direction_binds [ + "left" + "up" + "right" + "down" + ])} ${key.tabL} { goto_file_relative(-1) } ${key.tabR} { goto_file_relative(1); } @@ -54,10 +72,7 @@ in d { send_keys(6) } y { send_keys(8) } - ${if (key.layout == "colemak") then - "\n t { toggle_scale_mode(0) }\n " - else - ""} + ${if (key.layout == "colemak") then "\n t { toggle_scale_mode(0) }\n " else ""} # vim: ft=ini ''; diff --git a/user/qutebrowser/colors.nix b/user/qutebrowser/colors.nix index 3a90888..999cc28 100644 --- a/user/qutebrowser/colors.nix +++ b/user/qutebrowser/colors.nix @@ -1,6 +1,18 @@ -{ config, pkgs, lib, font, ... }: +{ + config, + pkgs, + lib, + font, + ... +}: let - inherit (pkgs.uservars) key theme accent font browser; + inherit (pkgs.uservars) + key + theme + accent + font + browser + ; inherit (theme) color; in { @@ -38,9 +50,12 @@ in }; in { - bar = { bg = color.bg; }; + bar = { + bg = color.bg; + }; pinned = tabs_defaults; - } // tabs_defaults; + } + // tabs_defaults; ######################################################## # Completion for urls and commands @@ -48,10 +63,18 @@ in completion = { fg = color.txt; - even = { bg = color.bg; }; - odd = { bg = color.bg; }; - scrollbar = { bg = color.bg_dark; }; - match = { fg = accent.color; }; + even = { + bg = color.bg; + }; + odd = { + bg = color.bg; + }; + scrollbar = { + bg = color.bg_dark; + }; + match = { + fg = accent.color; + }; category = { fg = color.txt; bg = color.bg_dark; @@ -68,7 +91,9 @@ in top = color.bg_dark; bottom = color.bg_dark; }; - match = { fg = color.txt; }; + match = { + fg = color.txt; + }; }; }; }; @@ -102,10 +127,16 @@ in }; url = { success = { - https = { fg = color.txt; }; - http = { fg = color.normal.red; }; + https = { + fg = color.txt; + }; + http = { + fg = color.normal.red; + }; + }; + hover = { + fg = color.normal.cyan; }; - hover = { fg = color.normal.cyan; }; }; }; ######################################################## @@ -113,9 +144,15 @@ in ######################################################## downloads = { - start = { bg = color.normal.blue; }; - stop = { bg = color.normal.green; }; - bar = { bg = color.bg; }; + start = { + bg = color.normal.blue; + }; + stop = { + bg = color.normal.green; + }; + bar = { + bg = color.bg; + }; }; ######################################################## @@ -125,7 +162,9 @@ in hints = { fg = color.txt; bg = color.bg; - match = { fg = accent.color; }; + match = { + fg = accent.color; + }; }; ######################################################## @@ -135,7 +174,9 @@ in keyhint = { fg = color.txt; bg = color.bg; - suffix = { fg = accent.color; }; + suffix = { + fg = accent.color; + }; }; ######################################################## @@ -151,7 +192,9 @@ in fg = accent.fg; bg = accent.color; }; - disabled = { fg = color.bg_light; }; + disabled = { + fg = color.bg_light; + }; }; ######################################################## @@ -216,4 +259,3 @@ in ''; }; } - diff --git a/user/qutebrowser/dark-theme.nix b/user/qutebrowser/dark-theme.nix index a596251..6acd813 100644 --- a/user/qutebrowser/dark-theme.nix +++ b/user/qutebrowser/dark-theme.nix @@ -1,63 +1,71 @@ -{ config, pkgs, lib, font, ... }: +{ + config, + pkgs, + lib, + font, + ... +}: let inherit (pkgs.uservars) theme; inherit (theme) color; # ".config/qutebrowser/greasemonkey/darkreader.js".text = - darkThemeUserscript = enabled: pkgs.writeText "darkreader.js" '' - // ==UserScript== - // @name Dark Reader (Unofficial) - // @icon https://darkreader.org/images/darkreader-icon-256x256.png - // @namespace DarkReader - // @description Inverts the brightness of pages to reduce eye strain - // @version 4.7.15 - // @author https://github.com/darkreader/darkreader#contributors - // @homepageURL https://darkreader.org/ | https://github.com/darkreader/darkreader - // @run-at document-end - // @grant none - // @include http* - // @require https://cdn.jsdelivr.net/npm/darkreader/darkreader.min.js - // @noframes - // ==/UserScript== + darkThemeUserscript = + enabled: + pkgs.writeText "darkreader.js" '' + // ==UserScript== + // @name Dark Reader (Unofficial) + // @icon https://darkreader.org/images/darkreader-icon-256x256.png + // @namespace DarkReader + // @description Inverts the brightness of pages to reduce eye strain + // @version 4.7.15 + // @author https://github.com/darkreader/darkreader#contributors + // @homepageURL https://darkreader.org/ | https://github.com/darkreader/darkreader + // @run-at document-end + // @grant none + // @include http* + // @require https://cdn.jsdelivr.net/npm/darkreader/darkreader.min.js + // @noframes + // ==/UserScript== - DarkReader.setFetchMethod(window.fetch) + DarkReader.setFetchMethod(window.fetch) - if (${if enabled then "false" else "true"}) { - DarkReader.disable(); - return; - } + if (${if enabled then "false" else "true"}) { + DarkReader.disable(); + return; + } - const ignore_list = [ - "askubuntu.com", - "mathoverflow.com", - "mathoverflow.net", - "serverfault.com", - "stackapps.com", - "stackexchange.com", - "stackoverflow.com", - "superuser.com", - "hub.docker.com", - ]; + const ignore_list = [ + "askubuntu.com", + "mathoverflow.com", + "mathoverflow.net", + "serverfault.com", + "stackapps.com", + "stackexchange.com", + "stackoverflow.com", + "superuser.com", + "hub.docker.com", + ]; - for (let item of ignore_list) { - if (window.location.origin.indexOf(item) >= 0) { - console.log("URL matched dark-mode ignore list"); - return; - } - } + for (let item of ignore_list) { + if (window.location.origin.indexOf(item) >= 0) { + console.log("URL matched dark-mode ignore list"); + return; + } + } - DarkReader.enable({ - brightness: 100, - contrast: 100, - sepia: 0, + DarkReader.enable({ + brightness: 100, + contrast: 100, + sepia: 0, - darkSchemeBackgroundColor: "${color.bg}", - darkSchemeTextColor: "${color.txt}", + darkSchemeBackgroundColor: "${color.bg}", + darkSchemeTextColor: "${color.txt}", - lightSchemeBackgroundColor: "${color.bg}", - lightSchemeTextColor: "${color.txt}", - }); - ''; + lightSchemeBackgroundColor: "${color.bg}", + lightSchemeTextColor: "${color.txt}", + }); + ''; in { programs.qutebrowser.keyBindings = { @@ -87,4 +95,3 @@ in ''; }; } - diff --git a/user/qutebrowser/default.nix b/user/qutebrowser/default.nix index 0f2914a..c115cca 100644 --- a/user/qutebrowser/default.nix +++ b/user/qutebrowser/default.nix @@ -1,4 +1,10 @@ -{ config, pkgs, lib, font, ... }: +{ + config, + pkgs, + lib, + font, + ... +}: let inherit (pkgs.uservars) key browser editor; in @@ -59,7 +65,6 @@ in "${key.insertMode}" = "mode-enter insert"; }; - }; settings = { tabs.tree_tabs = true; @@ -78,7 +83,8 @@ in { kakoune = "kak"; helix = "hx"; - }.${editor} + } + .${editor} "{file}" "+{line}" ]; @@ -112,7 +118,9 @@ in ExecStart = "${pkgs.qutebrowser}/bin/qutebrowser"; Restart = "on-failure"; }; - Install = { WantedBy = [ "sway-session.target" ]; }; + Install = { + WantedBy = [ "sway-session.target" ]; + }; }; }; home.file = { @@ -149,4 +157,3 @@ in }; }; } - diff --git a/user/qutebrowser/fonts.nix b/user/qutebrowser/fonts.nix index e6eee6b..6ab43de 100644 --- a/user/qutebrowser/fonts.nix +++ b/user/qutebrowser/fonts.nix @@ -33,4 +33,3 @@ in }; }; } - diff --git a/user/ranger/default.nix b/user/ranger/default.nix index ec09936..4b97170 100644 --- a/user/ranger/default.nix +++ b/user/ranger/default.nix @@ -1,4 +1,11 @@ -{ config, pkgs, lib, inputs, ... }: { +{ + config, + pkgs, + lib, + inputs, + ... +}: +{ xdg.configFile = { "ranger/rc.conf".source = ./rc.conf; "ranger/rifle.conf".source = ./rifle.conf; diff --git a/user/rofi.nix b/user/rofi.nix index d9026d2..79307eb 100644 --- a/user/rofi.nix +++ b/user/rofi.nix @@ -1,6 +1,17 @@ -{ config, pkgs, lib, font, ... }: +{ + config, + pkgs, + lib, + font, + ... +}: let - inherit (pkgs.uservars) key theme accent font; + inherit (pkgs.uservars) + key + theme + accent + font + ; inherit (theme) color; in { @@ -42,14 +53,15 @@ in }; "#window" = { - background-color = mkLiteral - "${color.bg}${lib.toHexString (theme.opacity * 255 / 100)}"; + background-color = mkLiteral "${color.bg}${lib.toHexString (theme.opacity * 255 / 100)}"; # children = map mkLiteral [ "prompt" "entry" ]; border = mkLiteral "2px solid"; border-color = mkLiteral accent.color; padding = 0; }; - "#inputbar" = { margin = mkLiteral "10px"; }; + "#inputbar" = { + margin = mkLiteral "10px"; + }; "#listview" = { # fixed-height=0; border = mkLiteral "2px solid 0px 0px"; @@ -78,9 +90,7 @@ in margin-right = mkLiteral "20px"; size = 24; }; - }; - }; }; } diff --git a/user/ssh.nix b/user/ssh.nix index 8230dc1..3193876 100644 --- a/user/ssh.nix +++ b/user/ssh.nix @@ -1,6 +1,13 @@ -{ config, pkgs, lib, ... }: -let inherit (pkgs.uservars) username mail; -in { +{ + config, + pkgs, + lib, + ... +}: +let + inherit (pkgs.uservars) username mail; +in +{ config = { programs.ssh.enable = true; programs.ssh.matchBlocks = { diff --git a/user/sway/default.nix b/user/sway/default.nix index 7719370..d7afafd 100644 --- a/user/sway/default.nix +++ b/user/sway/default.nix @@ -1,6 +1,16 @@ -{ config, pkgs, lib, ... }: +{ + config, + pkgs, + lib, + ... +}: let - inherit (pkgs.uservars) key accent font theme; + inherit (pkgs.uservars) + key + accent + font + theme + ; inherit (theme) color; in { @@ -42,7 +52,13 @@ in bg_color = color.bg_dark; alert = "#000000"; client = border: background: text: indicator: childBorder: { - inherit border background text indicator childBorder; + inherit + border + background + text + indicator + childBorder + ; }; in { @@ -79,9 +95,7 @@ in }; # setup cursor based on home.pointerCursor seat."*" = { - xcursor_theme = "${config.home.pointerCursor.name} ${ - toString config.home.pointerCursor.size - }"; + xcursor_theme = "${config.home.pointerCursor.name} ${toString config.home.pointerCursor.size}"; hide_cursor = "when-typing enable"; }; }; @@ -132,7 +146,10 @@ in grim swappy (tesseract5.override { - enableLanguages = [ "eng" "por" ]; + enableLanguages = [ + "eng" + "por" + ]; }) ]; }; diff --git a/user/sway/kanshi.nix b/user/sway/kanshi.nix index 22d9550..f35fd4f 100644 --- a/user/sway/kanshi.nix +++ b/user/sway/kanshi.nix @@ -1,6 +1,16 @@ -{ config, pkgs, lib, ... }: +{ + config, + pkgs, + lib, + ... +}: let - inherit (pkgs.uservars) key accent font theme; + inherit (pkgs.uservars) + key + accent + font + theme + ; inherit (theme) color; in { @@ -26,11 +36,13 @@ in { profile = { name = "nomad"; - outputs = [{ - criteria = "eDP-1"; - status = "enable"; - position = "1920,312"; - }]; + outputs = [ + { + criteria = "eDP-1"; + status = "enable"; + position = "1920,312"; + } + ]; exec = [ "xrdb .Xresources" ]; }; } diff --git a/user/sway/mako.nix b/user/sway/mako.nix index 637a2d5..c8575ab 100644 --- a/user/sway/mako.nix +++ b/user/sway/mako.nix @@ -1,6 +1,16 @@ -{ config, pkgs, lib, ... }: +{ + config, + pkgs, + lib, + ... +}: let - inherit (pkgs.uservars) key accent font theme; + inherit (pkgs.uservars) + key + accent + font + theme + ; inherit (theme) color; in { @@ -48,6 +58,8 @@ in ExecStart = "${pkgs.mako}/bin/mako"; Restart = "on-failure"; }; - Install = { WantedBy = [ "sway-session.target" ]; }; + Install = { + WantedBy = [ "sway-session.target" ]; + }; }; } diff --git a/user/sway/sway-assigns.nix b/user/sway/sway-assigns.nix index ff46238..0d1eefd 100644 --- a/user/sway/sway-assigns.nix +++ b/user/sway/sway-assigns.nix @@ -1,20 +1,18 @@ { config, pkgs, ... }: let - # inherit (pkgs.uservars) key accent font theme; - # inherit (theme) color; - # inherit (pkgs) lib; - - # mod = "Mod4"; - # menu = "wlauncher"; - # terminal = "alacritty"; - - # locked_binds = - # lib.mapAttrs' (k: v: lib.nameValuePair "--locked ${k}" v); - # code_binds = - # lib.mapAttrs' (k: v: lib.nameValuePair "--to-code ${k}" v); - # return_mode = lib.mapAttrs (k: v: "${v}; mode default"); - # playerctl = "exec ${pkgs.playerctl}/bin/playerctl"; in +# inherit (pkgs.uservars) key accent font theme; +# inherit (theme) color; +# inherit (pkgs) lib; +# mod = "Mod4"; +# menu = "wlauncher"; +# terminal = "alacritty"; +# locked_binds = +# lib.mapAttrs' (k: v: lib.nameValuePair "--locked ${k}" v); +# code_binds = +# lib.mapAttrs' (k: v: lib.nameValuePair "--to-code ${k}" v); +# return_mode = lib.mapAttrs (k: v: "${v}; mode default"); +# playerctl = "exec ${pkgs.playerctl}/bin/playerctl"; { wayland.windowManager.sway.config = { assigns = { diff --git a/user/sway/sway-binds.nix b/user/sway/sway-binds.nix index 360ccdc..fe22594 100644 --- a/user/sway/sway-binds.nix +++ b/user/sway/sway-binds.nix @@ -1,6 +1,11 @@ { config, pkgs, ... }: let - inherit (pkgs.uservars) key accent font theme; + inherit (pkgs.uservars) + key + accent + font + theme + ; inherit (theme) color; inherit (pkgs) lib; @@ -21,29 +26,27 @@ let # mod+1 to swich to workspace 1 # mod+shift+1 to move to workspace 1 - workspace_binds = lib.forEachMerge (lib.range 1 10) (i: + workspace_binds = lib.forEachMerge (lib.range 1 10) ( + i: let key = toString (lib.mod i 10); workspaceNumber = toString i; in { "${mod}+${key}" = "workspace number ${workspaceNumber}"; - "${mod}+Shift+${key}" = - "move container to workspace number ${workspaceNumber}"; - }); + "${mod}+Shift+${key}" = "move container to workspace number ${workspaceNumber}"; + } + ); prev_next_binds = let - maybe_window = key: - if (lib.strings.hasInfix "button" key) then - "--whole-window" - else - ""; - makePrevNextBindFunction = (prev_or_next: + maybe_window = key: if (lib.strings.hasInfix "button" key) then "--whole-window" else ""; + makePrevNextBindFunction = ( + prev_or_next: map (key: { - "${maybe_window key} ${mod}+${key}" = - "workspace ${prev_or_next}_on_output"; - })); + "${maybe_window key} ${mod}+${key}" = "workspace ${prev_or_next}_on_output"; + }) + ); prev_binds = makePrevNextBindFunction "prev" [ key.tabL "bracketleft" @@ -67,36 +70,51 @@ let # for every direction with both arrow keys and vim keys movement_binds = let - directions = [ "Left" "Up" "Right" "Down" ]; + directions = [ + "Left" + "Up" + "Right" + "Down" + ]; makeVimKeys = (k: key.${lib.toLower k}); makeArrowKeys = (k: k); - makeResizeCommand = direction: + makeResizeCommand = + direction: { Left = "shrink width 20px"; Up = "shrink height 20px"; Right = "grow width 20px"; Down = "grow height 20px"; - }.${direction}; + } + .${direction}; in - lib.forEachMerge [ makeVimKeys makeArrowKeys ] (prefixFun: - lib.forEachMerge directions (direction: - let - resize_cmd = makeResizeCommand direction; - keyBind = prefixFun direction; - in - { - # Move focus - "${mod}+${keyBind}" = "focus ${direction}"; - # Move window - "${mod}+Shift+${keyBind}" = "move ${direction}"; - # Resize window - "${mod}+Control+${keyBind}" = "resize ${resize_cmd}"; - # focus output - "${mod}+mod1+${keyBind}" = "focus output ${direction}"; - # Move workspace to output - "${mod}+mod1+Shift+${keyBind}" = - "move workspace output ${direction}"; - })); + lib.forEachMerge + [ + makeVimKeys + makeArrowKeys + ] + ( + prefixFun: + lib.forEachMerge directions ( + direction: + let + resize_cmd = makeResizeCommand direction; + keyBind = prefixFun direction; + in + { + # Move focus + "${mod}+${keyBind}" = "focus ${direction}"; + # Move window + "${mod}+Shift+${keyBind}" = "move ${direction}"; + # Resize window + "${mod}+Control+${keyBind}" = "resize ${resize_cmd}"; + # focus output + "${mod}+mod1+${keyBind}" = "focus output ${direction}"; + # Move workspace to output + "${mod}+mod1+Shift+${keyBind}" = "move workspace output ${direction}"; + } + ) + ); parenting_binds = { "${mod}+equal" = "focus parent"; @@ -116,8 +134,7 @@ let XF86AudioRaiseVolume = "exec volumesh -i 10"; XF86AudioLowerVolume = "exec volumesh -d 10"; XF86AudioMute = "exec volumesh -t"; - XF86AudioMicMute = - "exec pactl set-source-mute @DEFAULT_SOURCE@ toggle"; + XF86AudioMicMute = "exec pactl set-source-mute @DEFAULT_SOURCE@ toggle"; # Control media XF86AudioPlay = "exec playerctl play-pause"; XF86AudioPause = "exec playerctl play-pause"; @@ -136,8 +153,7 @@ let # Screen area to file "Shift+Print" = "exec ${pkgs.screenshotsh}/bin/screenshotsh area"; # Screen area to clipboard - "Control+Shift+Print" = - "exec ${pkgs.screenshotsh}/bin/screenshotsh area-clip"; + "Control+Shift+Print" = "exec ${pkgs.screenshotsh}/bin/screenshotsh area-clip"; # Focused monitor to clipboard "Control+Print" = "exec ${pkgs.screenshotsh}/bin/screenshotsh clip"; }; @@ -155,8 +171,7 @@ let "${mod}+Alt+x" = "exec pkill wl-crosshair || exec wl-crosshair"; "${mod}+x" = "kill"; "${mod}+m" = "mode audio"; - "${mod}+escape" = - "mode passthrough;exec notify-send 'Passthrough on'"; + "${mod}+escape" = "mode passthrough;exec notify-send 'Passthrough on'"; "${mod}+ctrl+k" = "exec swaymsg input type:pointer events disabled"; "${mod}+ctrl+shift+k" = "exec swaymsg input type:pointer events enabled"; "${mod}+f" = "fullscreen toggle"; diff --git a/user/sway/sway-modes.nix b/user/sway/sway-modes.nix index 7cb82bd..ea75ca8 100644 --- a/user/sway/sway-modes.nix +++ b/user/sway/sway-modes.nix @@ -1,6 +1,11 @@ { config, pkgs, ... }: let - inherit (pkgs.uservars) key accent font theme; + inherit (pkgs.uservars) + key + accent + font + theme + ; inherit (theme) color; inherit (pkgs) lib; @@ -8,10 +13,8 @@ let menu = "wlauncher"; terminal = "alacritty"; - locked = - lib.mapAttrs' (k: v: lib.nameValuePair "--locked ${k}" v); - to-code = - lib.mapAttrs' (k: v: lib.nameValuePair "--to-code ${k}" v); + locked = lib.mapAttrs' (k: v: lib.nameValuePair "--locked ${k}" v); + to-code = lib.mapAttrs' (k: v: lib.nameValuePair "--to-code ${k}" v); quit-mode = lib.mapAttrs (k: v: "${v}; mode default"); playerctl = "exec ${pkgs.playerctl}/bin/playerctl"; @@ -20,20 +23,32 @@ in { wayland.windowManager.sway.config.modes = { audio = - (bind_group [ to-code locked ] { - ${key.tabR} = "exec volumesh -i 10"; - ${key.tabL} = "exec volumesh -d 10"; - ${key.right} = "exec mpc next"; - ${key.left} = "exec mpc prev"; - ${key.up} = "exec volumesh --mpd -i 10"; - ${key.down} = "exec volumesh --mpd -d 10"; - }) // - (bind_group [ locked quit-mode ] { - "space" = "exec mpc toggle"; - "escape" = ""; - "q" = ""; - }) // - (bind_group [ quit-mode ] { + (bind_group + [ + to-code + locked + ] + { + ${key.tabR} = "exec volumesh -i 10"; + ${key.tabL} = "exec volumesh -d 10"; + ${key.right} = "exec mpc next"; + ${key.left} = "exec mpc prev"; + ${key.up} = "exec volumesh --mpd -i 10"; + ${key.down} = "exec volumesh --mpd -d 10"; + } + ) + // (bind_group + [ + locked + quit-mode + ] + { + "space" = "exec mpc toggle"; + "escape" = ""; + "q" = ""; + } + ) + // (bind_group [ quit-mode ] { "m" = "exec volumesh -t"; "s" = "exec ${pkgs.pulse_sink}/bin/pulse_sink"; @@ -47,28 +62,38 @@ in "Ctrl+s" = "exec ${pkgs.musmenu}/bin/musmenu psave"; "Ctrl+o" = "exec ${pkgs.musmenu}/bin/musmenu pload"; "Ctrl+d" = "exec ${pkgs.musmenu}/bin/musmenu pdelete"; - }) // - { + }) + // { "p" = "mode playerctl"; "Ctrl+c" = "exec musmenu pclear"; - } - ; + }; playerctl = - (bind_group [ to-code locked ] { - ${key.left} = "${playerctl} previous"; - ${key.right} = "${playerctl} next"; - ${key.up} = "${playerctl} volume 10+"; - ${key.down} = "${playerctl} volume 10-"; - ${key.tabR} = "${playerctl} volume 10+"; - ${key.tabL} = "${playerctl} volume 10-"; - }) // - (bind_group [ to-code quit-mode ] { - "space" = "${playerctl} play-pause"; - "escape" = ""; - "q" = ""; - }) - ; + (bind_group + [ + to-code + locked + ] + { + ${key.left} = "${playerctl} previous"; + ${key.right} = "${playerctl} next"; + ${key.up} = "${playerctl} volume 10+"; + ${key.down} = "${playerctl} volume 10-"; + ${key.tabR} = "${playerctl} volume 10+"; + ${key.tabL} = "${playerctl} volume 10-"; + } + ) + // (bind_group + [ + to-code + quit-mode + ] + { + "space" = "${playerctl} play-pause"; + "escape" = ""; + "q" = ""; + } + ); passthrough = { "${mod}+escape" = "mode default;exec notify-send 'Passthrough off'"; diff --git a/user/sway/swayidle.nix b/user/sway/swayidle.nix index 7b659ed..b0bd455 100644 --- a/user/sway/swayidle.nix +++ b/user/sway/swayidle.nix @@ -1,6 +1,16 @@ -{ config, pkgs, lib, ... }: +{ + config, + pkgs, + lib, + ... +}: let - inherit (pkgs.uservars) key accent font theme; + inherit (pkgs.uservars) + key + accent + font + theme + ; inherit (theme) color; asScript = filename: text: toString (pkgs.writeShellScript filename text); diff --git a/user/sway/swaylock.nix b/user/sway/swaylock.nix index f9f06eb..eb6104e 100644 --- a/user/sway/swaylock.nix +++ b/user/sway/swaylock.nix @@ -1,6 +1,16 @@ -{ config, pkgs, lib, ... }: +{ + config, + pkgs, + lib, + ... +}: let - inherit (pkgs.uservars) key accent font theme; + inherit (pkgs.uservars) + key + accent + font + theme + ; inherit (theme) color; in { diff --git a/user/sway/theme.nix b/user/sway/theme.nix index 2fc1fc1..202eaff 100644 --- a/user/sway/theme.nix +++ b/user/sway/theme.nix @@ -1,38 +1,53 @@ -{ config, pkgs, lib, inputs, ... }: +{ + config, + pkgs, + lib, + inputs, + ... +}: let inherit (pkgs.uservars) theme font desktop; - inherit (theme) color gtk_theme icon_theme cursor_theme; + inherit (theme) + color + gtk_theme + icon_theme + cursor_theme + ; in -lib.mkIf (desktop == "sway") -{ +lib.mkIf (desktop == "sway") { home.pointerCursor = { name = cursor_theme; size = 24; package = pkgs.bibata-cursors; gtk.enable = true; }; - gtk = { - enable = true; - font = { - name = font.interface; - size = font.size.small; - }; - theme = { - name = gtk_theme; - package = pkgs.orchis_theme_compact; - }; - iconTheme = { - name = icon_theme; - package = pkgs.papirus_red; - }; - } // ( - let - shared.extraConfig = { - gtk-decoration-layout = "menu:"; + gtk = + { + enable = true; + font = { + name = font.interface; + size = font.size.small; }; - in - { gtk4 = shared; gtk3 = shared; } - ); + theme = { + name = gtk_theme; + package = pkgs.orchis_theme_compact; + }; + iconTheme = { + name = icon_theme; + package = pkgs.papirus_red; + }; + } + // ( + let + shared.extraConfig = { + gtk-decoration-layout = "menu:"; + }; + in + { + gtk4 = shared; + gtk3 = shared; + } + ); qt = { enable = true; platformTheme.name = "qtct"; diff --git a/user/syncthing.nix b/user/syncthing.nix index 8f36eeb..76e3584 100644 --- a/user/syncthing.nix +++ b/user/syncthing.nix @@ -1,4 +1,5 @@ -{ ... }: { +{ ... }: +{ services.syncthing = { enable = true; tray = { diff --git a/user/thunar.nix b/user/thunar.nix index 3921eb5..2a9fe5b 100644 --- a/user/thunar.nix +++ b/user/thunar.nix @@ -1,8 +1,12 @@ -{ pkgs, ... }: { +{ pkgs, ... }: +{ home.packages = with pkgs; [ _thunar-terminal (xfce.thunar.override { - thunarPlugins = with pkgs.xfce; [ thunar-volman thunar-archive-plugin ]; + thunarPlugins = with pkgs.xfce; [ + thunar-volman + thunar-archive-plugin + ]; }) ]; diff --git a/user/vdir.nix b/user/vdir.nix index 61170df..80e6145 100644 --- a/user/vdir.nix +++ b/user/vdir.nix @@ -1,19 +1,23 @@ { pkgs, lib, ... }: let inherit (pkgs.uservars) nextcloud; - pass_cmd = (pkgs.writeShellScript "get_pass" '' - pass "${nextcloud.pass}" | head -n1 - ''); + pass_cmd = ( + pkgs.writeShellScript "get_pass" '' + pass "${nextcloud.pass}" | head -n1 + '' + ); in { systemd.user.services.vdirsyncer = { Unit.Description = "vdirsyncer calendar and contacts synchronization"; Service = { Type = "oneshot"; - ExecStart = toString (pkgs.writeShellScript "run-vdirsyncer" '' - ${pkgs.coreutils}/bin/yes | ${pkgs.vdirsyncer}/bin/vdirsyncer discover - ${pkgs.coreutils}/bin/yes | ${pkgs.vdirsyncer}/bin/vdirsyncer sync - ''); + ExecStart = toString ( + pkgs.writeShellScript "run-vdirsyncer" '' + ${pkgs.coreutils}/bin/yes | ${pkgs.vdirsyncer}/bin/vdirsyncer discover + ${pkgs.coreutils}/bin/yes | ${pkgs.vdirsyncer}/bin/vdirsyncer sync + '' + ); }; }; systemd.user.timers.vdirsyncer = { @@ -45,9 +49,9 @@ in [storage contacts_remote] type = "carddav" - url = "https://${ nextcloud.host }/remote.php/dav/addressbooks/users/${ nextcloud.user }/" - username = "${ nextcloud.user }" - password.fetch = [ "command", "${ pass_cmd }" ] + url = "https://${nextcloud.host}/remote.php/dav/addressbooks/users/${nextcloud.user}/" + username = "${nextcloud.user}" + password.fetch = [ "command", "${pass_cmd}" ] [pair calendar] a = "calendar_local" @@ -63,9 +67,9 @@ in [storage calendar_remote] type = "caldav" - url = "https://${ nextcloud.host }/remote.php/dav/calendars/${ nextcloud.user }/" - username = "${ nextcloud.user }" - password.fetch = [ "command", "${ pass_cmd }" ] + url = "https://${nextcloud.host}/remote.php/dav/calendars/${nextcloud.user}/" + username = "${nextcloud.user}" + password.fetch = [ "command", "${pass_cmd}" ] ''; "todoman/config.py".text = '' path = "~/.local/share/calendars/*" @@ -76,10 +80,8 @@ in ''; }; - home.packages = with pkgs; [ vdirsyncer todoman ]; - } diff --git a/user/vscode/default.nix b/user/vscode/default.nix index 48851a0..35d972b 100644 --- a/user/vscode/default.nix +++ b/user/vscode/default.nix @@ -1,4 +1,5 @@ -{ pkgs, config, ... }: { +{ pkgs, config, ... }: +{ programs.vscode = { enable = true; diff --git a/user/waybar/default.nix b/user/waybar/default.nix index 5e4f329..95615fa 100644 --- a/user/waybar/default.nix +++ b/user/waybar/default.nix @@ -1,6 +1,18 @@ -{ config, osConfig, pkgs, lib, font, ... }: +{ + config, + osConfig, + pkgs, + lib, + font, + ... +}: let - inherit (pkgs.uservars) key theme accent font; + inherit (pkgs.uservars) + key + theme + accent + font + ; inherit (theme) color; in { @@ -9,184 +21,226 @@ in enable = true; systemd.enable = true; systemd.target = "sway-session.target"; - settings = [{ - layer = "top"; - modules-left = [ "sway/workspaces" "sway/mode" "sway/window" ]; - modules-center = [ "clock" ]; - modules-right = lib.flatten [ - "sway/language" - "mpd" - "custom/playerctl" - "tray" - "custom/caffeine" - "pulseaudio" - (lib.optional (osConfig.services.vpn.enable or false) "custom/vpn") - "network" - "battery" - ]; - battery = { - tooltip = true; - states = { - full = 100; - good = 95; - warning = 25; - }; - format = "{icon} "; - format-charging = ""; - format-plugged = ""; - format-full = ""; - format-warning = "{icon} {time}"; - format-icons = [ "" "" "" "" "" "" ]; - }; - network = { - interval = 5; - tooltip = false; - on-click = "terminal -e iwd"; - format-wifi = "{icon}"; - format-icons = [ "" "" "" "" "" ]; - format-ethernet = "󰈀"; - format-linked = "󰈀"; - format-disconnected = ""; - }; - "sway/workspaces" = { - enable-bar-scroll = true; - format = "{icon}"; - format-icons = { - "1" = ""; - "2" = ""; - "3" = "󰅩"; - "4" = ""; - "5" = ""; - "6" = ""; - "7" = "󰇮"; - "8" = ""; - "9" = ""; - "10" = ""; - urgent = ""; - # focused = ""; - default = ""; - }; - }; - "sway/window" = { max-length = 40; }; - "tray" = { - "spacing" = 7; - "icon-size" = 19; - }; - clock = { - interval = 60; - format = "{:%H:%M %a %d/%m}"; - tooltip-format = "{calendar}"; - calendar = { - mode = "year"; - mode-mon-col = 3; - weeks-pos = "right"; - on-scroll = 1; - on-click-right = "mode"; - format = { - months = "{}"; - days = "{}"; - weeks = "W{}"; - weekdays = "{}"; - today = "{}"; + settings = [ + { + layer = "top"; + modules-left = [ + "sway/workspaces" + "sway/mode" + "sway/window" + ]; + modules-center = [ "clock" ]; + modules-right = lib.flatten [ + "sway/language" + "mpd" + "custom/playerctl" + "tray" + "custom/caffeine" + "pulseaudio" + (lib.optional (osConfig.services.vpn.enable or false) "custom/vpn") + "network" + "battery" + ]; + battery = { + tooltip = true; + states = { + full = 100; + good = 95; + warning = 25; }; + format = "{icon} "; + format-charging = ""; + format-plugged = ""; + format-full = ""; + format-warning = "{icon} {time}"; + format-icons = [ + "" + "" + "" + "" + "" + "" + ]; }; - actions = { - on-click-right = "mode"; - on-click-forward = "tz_up"; - on-click-backward = "tz_down"; - on-scroll-up = "shift_up"; - on-scroll-down = "shift_down"; - }; - }; - mpd = - let - mpc = "${pkgs.mpc-cli}/bin/mpc"; - in - { - format = "{stateIcon} {title} - {artist}"; - format-paused = "{stateIcon}"; - format-stopped = ""; - state-icons = { - stopped = ""; - paused = ""; - playing = ""; - }; + network = { + interval = 5; tooltip = false; - on-click = "${mpc} toggle"; - on-scroll-up = "${mpc} vol +10"; - on-scroll-down = "${mpc} vol -10"; + on-click = "terminal -e iwd"; + format-wifi = "{icon}"; + format-icons = [ + "" + "" + "" + "" + "" + ]; + format-ethernet = "󰈀"; + format-linked = "󰈀"; + format-disconnected = ""; }; - "custom/playerctl" = { - format = "{} "; - exec = "${pkgs.playerctl-status}/bin/playerctl-status"; - on-click = "${pkgs.playerctl}/bin/playerctl --ignore-player=mpd play-pause"; - interval = 1; - tooltip = false; - }; - "sway/language" = { format = "{short} {variant}"; }; - "custom/caffeine" = { - format = "{}"; - exec = "systemctl --user status swayidle > /dev/null && echo 󰒲 || echo 󰒳"; - on-click = "${pkgs._sway_idle_toggle}/bin/_sway_idle_toggle"; - interval = 1; - tooltip = false; - }; - "custom/vpn" = lib.mkIf (osConfig.services.vpn.enable or false) { - format = "{}"; - exec = '' - ${pkgs.mullvad}/bin/mullvad status | ${pkgs.gnugrep}/bin/grep "^Connected" > /dev/null \ - && echo "" \ - || echo "" - ''; - on-click = "mullvad connect"; - on-click-right = "mullvad disconnect"; - interval = 1; - tooltip = false; - }; - pulseaudio = { - interval = 5; - tooltip = false; - scroll-step = 10; - format = "{icon}"; - format-bluetooth = ""; - format-bluetooth-muted = "󰝟"; - format-muted = "󰝟"; - format-icons = { - "rtp-sink" = - [ "󰕿" "󰖀" "󰕾" ]; - "alsa_output.usb-C-Media_Electronics_Inc._USB_Audio_Device-00.analog-stereo" = - [ " 󰕿" " 󰖀" " 󰕾" ]; - "alsa_output.pci-0000_09_00.4.analog-stereo" = - [ " 󰕿" " 󰖀" " 󰕾" ]; - headphone = [ " 󰕿" " 󰖀" " 󰕾" ]; - handsfree = ""; - headset = ""; - phone = ""; - portable = ""; - car = ""; - default = [ "󰕿" "󰖀" "󰕾" ]; + "sway/workspaces" = { + enable-bar-scroll = true; + format = "{icon}"; + format-icons = { + "1" = ""; + "2" = ""; + "3" = "󰅩"; + "4" = ""; + "5" = ""; + "6" = ""; + "7" = "󰇮"; + "8" = ""; + "9" = ""; + "10" = ""; + urgent = ""; + # focused = ""; + default = ""; + }; }; - on-click = "pavucontrol"; - on-click-right = "${pkgs.pulse_sink}/bin/pulse_sink"; - on-scroll-up = "${pkgs.volumesh}/bin/volumesh -i 10"; - on-scroll-down = "${pkgs.volumesh}/bin/volumesh -d 10"; - }; - }]; - style = builtins.readFile (pkgs.substituteAll { - src = ./style.css; + "sway/window" = { + max-length = 40; + }; + "tray" = { + "spacing" = 7; + "icon-size" = 19; + }; + clock = { + interval = 60; + format = "{:%H:%M %a %d/%m}"; + tooltip-format = "{calendar}"; + calendar = { + mode = "year"; + mode-mon-col = 3; + weeks-pos = "right"; + on-scroll = 1; + on-click-right = "mode"; + format = { + months = "{}"; + days = "{}"; + weeks = "W{}"; + weekdays = "{}"; + today = "{}"; + }; + }; + actions = { + on-click-right = "mode"; + on-click-forward = "tz_up"; + on-click-backward = "tz_down"; + on-scroll-up = "shift_up"; + on-scroll-down = "shift_down"; + }; + }; + mpd = + let + mpc = "${pkgs.mpc-cli}/bin/mpc"; + in + { + format = "{stateIcon} {title} - {artist}"; + format-paused = "{stateIcon}"; + format-stopped = ""; + state-icons = { + stopped = ""; + paused = ""; + playing = ""; + }; + tooltip = false; + on-click = "${mpc} toggle"; + on-scroll-up = "${mpc} vol +10"; + on-scroll-down = "${mpc} vol -10"; + }; + "custom/playerctl" = { + format = "{} "; + exec = "${pkgs.playerctl-status}/bin/playerctl-status"; + on-click = "${pkgs.playerctl}/bin/playerctl --ignore-player=mpd play-pause"; + interval = 1; + tooltip = false; + }; + "sway/language" = { + format = "{short} {variant}"; + }; + "custom/caffeine" = { + format = "{}"; + exec = "systemctl --user status swayidle > /dev/null && echo 󰒲 || echo 󰒳"; + on-click = "${pkgs._sway_idle_toggle}/bin/_sway_idle_toggle"; + interval = 1; + tooltip = false; + }; + "custom/vpn" = lib.mkIf (osConfig.services.vpn.enable or false) { + format = "{}"; + exec = '' + ${pkgs.mullvad}/bin/mullvad status | ${pkgs.gnugrep}/bin/grep "^Connected" > /dev/null \ + && echo "" \ + || echo "" + ''; + on-click = "mullvad connect"; + on-click-right = "mullvad disconnect"; + interval = 1; + tooltip = false; + }; + pulseaudio = { + interval = 5; + tooltip = false; + scroll-step = 10; + format = "{icon}"; + format-bluetooth = ""; + format-bluetooth-muted = "󰝟"; + format-muted = "󰝟"; + format-icons = { + "rtp-sink" = [ + "󰕿" + "󰖀" + "󰕾" + ]; + "alsa_output.usb-C-Media_Electronics_Inc._USB_Audio_Device-00.analog-stereo" = [ + " 󰕿" + " 󰖀" + " 󰕾" + ]; + "alsa_output.pci-0000_09_00.4.analog-stereo" = [ + " 󰕿" + " 󰖀" + " 󰕾" + ]; + headphone = [ + " 󰕿" + " 󰖀" + " 󰕾" + ]; + handsfree = ""; + headset = ""; + phone = ""; + portable = ""; + car = ""; + default = [ + "󰕿" + "󰖀" + "󰕾" + ]; + }; + on-click = "pavucontrol"; + on-click-right = "${pkgs.pulse_sink}/bin/pulse_sink"; + on-scroll-up = "${pkgs.volumesh}/bin/volumesh -i 10"; + on-scroll-down = "${pkgs.volumesh}/bin/volumesh -d 10"; + }; + } + ]; + style = builtins.readFile ( + pkgs.substituteAll { + src = ./style.css; - accent_color = accent.color; + accent_color = accent.color; - color_bg = color.bg; - color_bg_dark = color.bg_dark; - color_bg_light = color.bg_light; - color_txt = color.txt; + color_bg = color.bg; + color_bg_dark = color.bg_dark; + color_bg_light = color.bg_light; + color_txt = color.txt; - font_interface = font.interface; + font_interface = font.interface; - font_size_big = "${toString font.size.big}px"; - font_size_medium = "${toString font.size.medium}px"; - }); + font_size_big = "${toString font.size.big}px"; + font_size_medium = "${toString font.size.medium}px"; + } + ); }; home.packages = with pkgs; [ waybar ]; }; diff --git a/user/xdg-dirs.nix b/user/xdg-dirs.nix index d95d6de..a9e1c9b 100644 --- a/user/xdg-dirs.nix +++ b/user/xdg-dirs.nix @@ -1,4 +1,10 @@ -{ config, pkgs, lib, inputs, ... }: +{ + config, + pkgs, + lib, + inputs, + ... +}: let HOME = config.home.homeDirectory; in diff --git a/user/zathura.nix b/user/zathura.nix index d3c9f5e..ccb4c42 100644 --- a/user/zathura.nix +++ b/user/zathura.nix @@ -1,6 +1,17 @@ -{ config, pkgs, lib, font, ... }: +{ + config, + pkgs, + lib, + font, + ... +}: let - inherit (pkgs.uservars) key accent font theme; + inherit (pkgs.uservars) + key + accent + font + theme + ; inherit (theme) color; in { From 628c1f0e11ea2ca70e55c0a4a0d9877c57af24a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 30 May 2024 16:55:40 -0300 Subject: [PATCH 128/404] flake: set formatter to nixfmt-rfc-style --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index daecf26..8f847b0 100644 --- a/flake.nix +++ b/flake.nix @@ -182,6 +182,6 @@ packages.${system} = pkgs // packages; - formatter.${system} = pkgs.nixpkgs-fmt; + formatter.${system} = pkgs.nixfmt-rfc-style; }; } From 5f12c128e4f6558eb39ec684a4a9bed64f9aaf65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 30 May 2024 21:48:43 -0300 Subject: [PATCH 129/404] controller: add auto-connect service --- scripts/auto_connect_gamepad | 26 ++++++++++++++++++++++++++ scripts/default.nix | 5 +++++ user/controller.nix | 29 +++++++++++++++++------------ 3 files changed, 48 insertions(+), 12 deletions(-) create mode 100755 scripts/auto_connect_gamepad diff --git a/scripts/auto_connect_gamepad b/scripts/auto_connect_gamepad new file mode 100755 index 0000000..9753966 --- /dev/null +++ b/scripts/auto_connect_gamepad @@ -0,0 +1,26 @@ +#!/bin/sh + +list_paired_controllers() { + bluetoothctl devices Paired | grep -i 'controller' | cut -d' ' -f2 +} + +count_connected_controllers() { + bluetoothctl devices Connected | grep -i 'controller' | wc -l +} + +try_to_connect_to_all_controllers() { + list_paired_controllers | while read paired_controller; do + echo "Trying to connect to controller $paired_controller" + bluetoothctl connect "$paired_controller" + done +} + +while true; do + echo "looping" + if test "$(count_connected_controllers)" -ne 0 ; then + echo "there is a controller connected, not attempting to connect to any other" + sleep 10s + continue + fi + try_to_connect_to_all_controllers +done diff --git a/scripts/default.nix b/scripts/default.nix index f509e37..01ce2b8 100644 --- a/scripts/default.nix +++ b/scripts/default.nix @@ -125,6 +125,11 @@ zbar wl-clipboard ]; + auto_connect_gamepad = [ + bluez + coreutils + gnugrep + ]; } // lib.mapAttrs import_script { wdmenu = ./wdmenu.nix; diff --git a/user/controller.nix b/user/controller.nix index 6a756df..fe08a98 100644 --- a/user/controller.nix +++ b/user/controller.nix @@ -1,17 +1,22 @@ +{ pkgs, lib, ... }: { - config, - pkgs, - lib, - inputs, - ... -}: -{ - xdg.desktopEntries = { - connect-controller = { - name = "Connect Controller"; - exec = "bluetoothctl connect 84:30:95:97:1A:79"; - terminal = false; + systemd.user.services = { + autoconnect-gamepad = { + Unit = { + Description = "Attempt to connect to game controllers"; + PartOf = [ "graphical-session.target" ]; + After = [ "graphical-session.target" ]; + }; + Service = { + ExecStart = lib.getExe pkgs.auto_connect_gamepad; + }; + Install = { + WantedBy = [ "sway-session.target" ]; + }; }; + }; + + xdg.desktopEntries = { disconnect-controller = { name = "Disconnect Controller"; exec = "bluetoothctl disconnect 84:30:95:97:1A:79"; From 1f05bee28db6746a4a8c3644d2652decb1f2107b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 31 May 2024 20:06:47 -0300 Subject: [PATCH 130/404] gnome: add workaround for autologin bug --- system/gnome.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/system/gnome.nix b/system/gnome.nix index 72b98c5..175909e 100644 --- a/system/gnome.nix +++ b/system/gnome.nix @@ -9,6 +9,10 @@ services.xserver.displayManager.gdm.enable = true; services.xserver.desktopManager.gnome.enable = true; + # Workaround for https://github.com/NixOS/nixpkgs/issues/103746 + systemd.services."getty@tty1".enable = false; + systemd.services."autovt@tty1".enable = false; + services.displayManager.autoLogin = { enable = true; user = "lelgenio"; From 797981eb2012e565fde64a9625fda2a746a66cca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 31 May 2024 21:45:12 -0300 Subject: [PATCH 131/404] nix: don't optimise on every build this makes builds slower --- system/nix.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/system/nix.nix b/system/nix.nix index 18ac258..ac8a8be 100644 --- a/system/nix.nix +++ b/system/nix.nix @@ -22,7 +22,6 @@ in }; optimise.automatic = true; settings = { - auto-optimise-store = true; trusted-users = [ "root" "@wheel" From 380add3752ec38e482f2b50cba09db41ff4f7085 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 31 May 2024 22:09:29 -0300 Subject: [PATCH 132/404] monolith: forced disks to use mq-deadline scheduler --- hosts/monolith.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hosts/monolith.nix b/hosts/monolith.nix index 213765b..b217f73 100644 --- a/hosts/monolith.nix +++ b/hosts/monolith.nix @@ -166,10 +166,13 @@ in hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; networking.hostName = "monolith"; # Define your hostname. - # Fix broken suspend with Logitech USB dongle - # `lsusb | grep Logitech` will return "vendor:product" services.udev.extraRules = '' + # Fix broken suspend with Logitech USB dongle + # `lsusb | grep Logitech` will return "vendor:product" ACTION=="add" SUBSYSTEM=="usb" ATTR{idVendor}=="046d" ATTR{idProduct}=="c547" ATTR{power/wakeup}="disabled" + # Force all disks to use mq-deadline scheduler + # For some reason "noop" is used by default which is kinda bad when io is saturated + ACTION=="add|change", KERNEL=="sd[a-z]*[0-9]*|mmcblk[0-9]*p[0-9]*|nvme[0-9]*n[0-9]*p[0-9]*", ATTR{../queue/scheduler}="mq-deadline" ''; # swap From dca5bba67e78248a0c405b05309a72bf0229eedd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 31 May 2024 23:10:41 -0300 Subject: [PATCH 133/404] gnome: enable variable refresh rate --- system/gnome.nix | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/system/gnome.nix b/system/gnome.nix index 175909e..e5bd708 100644 --- a/system/gnome.nix +++ b/system/gnome.nix @@ -1,13 +1,18 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, ... }: +{ pkgs, ... }: { - # Enable the X11 windowing system. - services.xserver.enable = true; - # Enable the GNOME Desktop Environment. - services.xserver.displayManager.gdm.enable = true; - services.xserver.desktopManager.gnome.enable = true; + services.xserver = { + enable = true; + desktopManager.gnome = { + enable = true; + # Enable VRR (Variable Refresh Rate) + extraGSettingsOverridePackages = with pkgs; [ gnome.mutter ]; + extraGSettingsOverrides = '' + [org.gnome.mutter] + experimental-features=['variable-refresh-rate', 'scale-monitor-framebuffer'] + ''; + }; + displayManager.gdm.enable = true; + }; # Workaround for https://github.com/NixOS/nixpkgs/issues/103746 systemd.services."getty@tty1".enable = false; From 706f628cd092caf04741de263a965319fb78dbb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 31 May 2024 23:32:41 -0300 Subject: [PATCH 134/404] gnome: don't manage mimeapps --- user/gnome.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/user/gnome.nix b/user/gnome.nix index d1f692d..d7282dc 100644 --- a/user/gnome.nix +++ b/user/gnome.nix @@ -49,15 +49,6 @@ lib.mkIf (pkgs.uservars.desktop == "gnome") { }; xdg.defaultApplications = { - enable = true; - text-editor = "codium.desktop"; - image-viewer = "org.gnome.eog.desktop"; - video-player = "org.gnome.Totem.desktop"; - web-browser = "firefox.desktop"; - document-viewer = "org.gnome.Evince.desktop"; - file-manager = "org.gnome.Nautilus.desktop"; - archive-manager = "org.gnome.FileRoller.desktop;"; - email-client = "thunderbird.desktop"; - torrent-client = "torrent.desktop"; + enable = lib.mkForce false; }; } From bf7bf80c939661be50c2c10f9dcc3bcad8b5dbf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 1 Jun 2024 19:22:47 -0300 Subject: [PATCH 135/404] gnome: disable open tablet driver --- system/gnome.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/system/gnome.nix b/system/gnome.nix index e5bd708..6a3509b 100644 --- a/system/gnome.nix +++ b/system/gnome.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, lib, ... }: { services.xserver = { enable = true; @@ -28,6 +28,8 @@ package = pkgs.gnomeExtensions.gsconnect; }; + hardware.opentabletdriver.enable = lib.mkForce false; + # services.xserver.displayManager.autologin.user = "lelgenio"; environment.systemPackages = with pkgs; From 8d47083127cd14f4b704231b4833fec18839a170 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 1 Jun 2024 20:06:55 -0300 Subject: [PATCH 136/404] qutebrowser: remove config, not used anymore --- patches/qutebrowser/tree-style-tabs.patch | 10282 -------------------- scripts/wpass | 4 - user/home.nix | 9 +- user/qutebrowser/colors.nix | 261 - user/qutebrowser/dark-theme.nix | 97 - user/qutebrowser/default.nix | 159 - user/qutebrowser/fonts.nix | 35 - user/sway/sway-assigns.nix | 2 - 8 files changed, 1 insertion(+), 10848 deletions(-) delete mode 100644 patches/qutebrowser/tree-style-tabs.patch delete mode 100644 user/qutebrowser/colors.nix delete mode 100644 user/qutebrowser/dark-theme.nix delete mode 100644 user/qutebrowser/default.nix delete mode 100644 user/qutebrowser/fonts.nix diff --git a/patches/qutebrowser/tree-style-tabs.patch b/patches/qutebrowser/tree-style-tabs.patch deleted file mode 100644 index f8dc6a0..0000000 --- a/patches/qutebrowser/tree-style-tabs.patch +++ /dev/null @@ -1,10282 +0,0 @@ -diff --git a/.coveragerc b/.coveragerc -index cb0619b80..7c4f7b218 100644 ---- a/.coveragerc -+++ b/.coveragerc -@@ -23,3 +23,6 @@ exclude_lines = - - [xml] - output=coverage.xml -+ -+[html] -+show_contexts = True -diff --git a/.flake8 b/.flake8 -index 9110dc54c..34a829a4b 100644 ---- a/.flake8 -+++ b/.flake8 -@@ -40,7 +40,7 @@ exclude = .*,__pycache__,resources.py - # A003: Builtin name for class attribute (needed for overridden methods) - # W503: like break before binary operator - # W504: line break after binary operator --# FI15: __future__ import "generator_stop" missing -+# FI18: __future__ import "annotations" missing - # PT004: fixture '{name}' does not return anything, add leading underscore - # PT011: pytest.raises(ValueError) is too broad, set the match parameter or use a more specific exception - # PT012: pytest.raises() block should contain a single simple statement -@@ -53,11 +53,11 @@ ignore = - D102,D103,D106,D107,D104,D105,D209,D211,D401,D402,D403,D412,D413, - A003, - W503, W504, -- FI15, -+ FI18, - PT004, - PT011, - PT012 --min-version = 3.6.1 -+min-version = 3.7.0 - max-complexity = 12 - per-file-ignores = - qutebrowser/api/hook.py : N801 -diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml -index 23d37f991..1fc5c0d5b 100644 ---- a/.github/workflows/ci.yml -+++ b/.github/workflows/ci.yml -@@ -105,10 +105,10 @@ jobs: - fail-fast: false - matrix: - include: -- ### PyQt 5.12 (Python 3.6) -- - testenv: py36-pyqt512 -+ ### PyQt 5.12 (Python 3.7) -+ - testenv: py37-pyqt512 - os: ubuntu-18.04 -- python: 3.6 -+ python: 3.7 - ### PyQt 5.13 (Python 3.7) - - testenv: py37-pyqt513 - os: ubuntu-20.04 -diff --git a/.mypy.ini b/.mypy.ini -index 501ab747e..b347323f5 100644 ---- a/.mypy.ini -+++ b/.mypy.ini -@@ -1,5 +1,5 @@ - [mypy] --python_version = 3.6 -+python_version = 3.7 - - ### --strict - warn_unused_configs = True -diff --git a/.pylintrc b/.pylintrc -index 4ff4f2080..c5a1289fb 100644 ---- a/.pylintrc -+++ b/.pylintrc -@@ -18,7 +18,7 @@ load-plugins=qute_pylint.config, - pylint.extensions.private_import, - - persistent=n --py-version=3.6 -+py-version=3.7 - - [MESSAGES CONTROL] - enable=all -diff --git a/MANIFEST.in b/MANIFEST.in -index ed4b5e5b1..81bf824b7 100644 ---- a/MANIFEST.in -+++ b/MANIFEST.in -@@ -4,7 +4,7 @@ recursive-include qutebrowser/javascript *.js - graft tests - graft qutebrowser/html - graft qutebrowser/3rdparty --graft icons -+graft qutebrowser/icons - graft doc/img - graft misc/apparmor - graft misc/userscripts -diff --git a/README.asciidoc b/README.asciidoc -index bb1f2562c..fe0c23f2d 100644 ---- a/README.asciidoc -+++ b/README.asciidoc -@@ -7,7 +7,7 @@ qutebrowser - =========== - - // QUTE_WEB_HIDE --image:icons/qutebrowser-64x64.png[qutebrowser logo] *A keyboard-driven, vim-like browser based on PyQt5 and Qt.* -+image:qutebrowser/icons/qutebrowser-64x64.png[qutebrowser logo] *A keyboard-driven, vim-like browser based on Python and Qt.* - - image:https://github.com/qutebrowser/qutebrowser/workflows/CI/badge.svg["Build Status", link="https://github.com/qutebrowser/qutebrowser/actions?query=workflow%3ACI"] - image:https://codecov.io/github/qutebrowser/qutebrowser/coverage.svg?branch=master["coverage badge",link="https://codecov.io/github/qutebrowser/qutebrowser?branch=master"] -@@ -16,7 +16,7 @@ link:https://www.qutebrowser.org[website] | link:https://blog.qutebrowser.org[bl - // QUTE_WEB_HIDE_END - - qutebrowser is a keyboard-focused browser with a minimal GUI. It's based --on Python and PyQt5 and free software, licensed under the GPL. -+on Python and Qt and free software, licensed under the GPL. - - It was inspired by other browsers/addons like dwb and Vimperator/Pentadactyl. - -@@ -74,7 +74,7 @@ Requirements - - The following software and libraries are required to run qutebrowser: - --* https://www.python.org/[Python] 3.6.1 or newer -+* https://www.python.org/[Python] 3.7 or newer - * https://www.qt.io/[Qt] 5.12.0 or newer (5.12 LTS or 5.15 recommended, Qt 6 is - not supported yet) with the following modules: - - QtCore / qtbase -@@ -96,10 +96,9 @@ websites and using it for transmission of sensitive data._ - * https://palletsprojects.com/p/jinja/[jinja2] - * https://github.com/yaml/pyyaml[PyYAML] - --On older Python versions (3.6/3.7/3.8), the following backports are also required: -+On older Python versions (3.7/3.8), the following backports are also required: - --* https://importlib-resources.readthedocs.io/[importlib_resources] (Python 3.8 or older) --* https://github.com/ericvsmith/dataclasses[dataclasses] (Python 3.6 only) -+* https://importlib-resources.readthedocs.io/[importlib_resources] - - The following libraries are optional: - -@@ -109,8 +108,8 @@ The following libraries are optional: - QtWebEngine backend. - * On Windows, https://pypi.python.org/pypi/colorama/[colorama] for colored log - output. --* https://importlib-metadata.readthedocs.io/[importlib_resources] on Python 3.7 -- or older, to improve QtWebEngine version detection when PyQtWebEngine is -+* https://importlib-metadata.readthedocs.io/[importlib_metadata] on Python 3.7, -+ to improve QtWebEngine version detection when PyQtWebEngine is - installed via pip (thus, this dependency usually isn't relevant for - packagers). - * https://asciidoc.org/[asciidoc] to generate the documentation for the `:help` -diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc -index 4e7afd159..236039f67 100644 ---- a/doc/changelog.asciidoc -+++ b/doc/changelog.asciidoc -@@ -15,38 +15,37 @@ breaking changes (such as renamed commands) can happen in minor releases. - // `Fixed` for any bug fixes. - // `Security` to invite users to upgrade in case of vulnerabilities. - --[[v2.5.2]] --v2.5.2 (2022-06-22) -+[[v3.0.0]] -+v3.0.0 (unreleased) - ------------------- - --Fixed --~~~~~ -+Removed -+~~~~~~~ -+ -+- Support for Python 3.6 is dropped, as it's been -+ https://discuss.python.org/t/python-3-6-rides-into-the-sunset/12964[end-of-life upstream] -+ since December 2021. Python 3.7.0 or newer is now required. -+- It's planned to drop support for various legacy platforms and libraries which -+ are unsupported upstream, such as: -+ * Qt before 5.15 LTS (plus adding support for Qt 6.2+) -+ * The QtWebKit backend -+ * macOS 10.14 (via Homebrew) -+ * 32-bit Windows (via Qt) -+ * Windows 8 (via Qt) -+ * Windows 10 before 1809 (via Qt) -+ * Possibly other more minor dependency changes - --- Packaging-related fixes: -- * The `install` and `stacktrace` help pages are now included in the docs -- shipped with qutebrowser when using the recommended packaging workflow. -- * The Windows installer now more consistently uses the configured Windows -- colors. -- * The Windows installer now bases the desktop/start menu icon choices on -- the existing install, if upgrading. -- * The macOS release hopefully doesn't cause macOS to (falsely) claim that it -- "is damaged and can't be opened" anymore. --- The notification fixes in v2.5.1 caused new notification crashes (probably -- more common than the ones being fixed...). Those are now fixed, along with a -- (rather involved) test case to prevent similar issues in the future. --- When a text was not found on a page, the associated message would be shown as -- rich text (e.g. after `/

`). With this release, this is fixed for search -- messages, while the 3.0.0 release will change the default for all messages to be -- plain-text. Note this is NOT a security issue, as only a small subset of HTML -- is interpreted as rich text by Qt, independently from the website. --- When a Greasemonkey script couldn't be loaded (e.g. due to an unreadable file), -- qutebrowser would crash. It now shows an error instead. --- Ever since the v1.2.0 release in 2018, the `content.default_encoding` setting -- was not applied on start properly (only when it was changed afterwards). This -- is now fixed. -+Changed -+~~~~~~~ -+ -+- The qutebrowser icons got moved from `icons/` to `qutebrowser/icons` in the -+ repository, so that it's possible for qutebrowser to load them using Python's -+ resource system (rather than compiling them into a Qt resource file). -+ Packagers are advised to use `misc/Makefile` if possible, which has been -+ updated with the new paths. - - [[v2.5.1]] --v2.5.1 (2022-05-26) -+v2.5.1 (unreleased) - ------------------- - - Fixed -@@ -54,25 +53,6 @@ Fixed - - - The `qute-pass` userscript is marked as executable again. - - PDF.js now works properly again with the macOS and Windows releases. --- The MathML workaround for darkmode (e.g. black on black Wikipedia formula) -- now also works for display (rather than inline) math. --- The `content.proxy` setting can now correctly be set to arbitrary values via -- the `qute://settings` page again. --- Fixed issues with Chromium version detection on Archlinux with -- qt5-webengine 5.15.9-3. --- Fixed a rare possible crash with invalid `Content-Disposition` headers. --- Fixes for various notification-related crashes: -- * With the `tiramisu` notification server (due to invalid behavior of the server, now a non-fatal error) -- * With the `budgie` notification server when closing a notification (due to invalid behavior of the server, now worked around) -- * When a server exits with an unsuccessful exit status (now a non-fatal error) -- * When a server couldn't be started successfully (now a non-fatal error) -- * With the `herbe` notification presenter, when the website tries to close -- the notification after the user accepting (right-clicking) it. --- Fixes in userscripts: -- * The `qute-bitwarden` userscript now correctly searches for entries for -- sites on a subdomain of an unrecognized TLD. subdomain names. Previously -- `my.site.local` would have searched in bitwarden for `my.sitelocal`, -- losing the rightmost dot. - - [[v2.5.0]] - v2.5.0 (2022-04-01) -diff --git a/doc/contributing.asciidoc b/doc/contributing.asciidoc -index 75c19045e..70447d8c5 100644 ---- a/doc/contributing.asciidoc -+++ b/doc/contributing.asciidoc -@@ -111,9 +111,9 @@ unittests and several linters/checkers. - Currently, the following tox environments are available: - - * Tests using https://www.pytest.org[pytest]: -- - `py36`, `py37`, ...: Run pytest for python 3.6/3.7/... with the system-wide PyQt. -- - `py36-pyqt512`, ..., `py36-pyqt515`: Run pytest with the given PyQt version (`py35-*` also works). -- - `py36-pyqt515-cov`: Run with coverage support (other Python/PyQt versions work too). -+ - `py37`, `py38`, ...: Run pytest for python 3.7/3.8/... with the system-wide PyQt. -+ - `py37-pyqt512`, ..., `py37-pyqt515`: Run pytest with the given PyQt version (`py37-*` also works). -+ - `py37-pyqt515-cov`: Run with coverage support (other Python/PyQt versions work too). - * `flake8`: Run various linting checks via https://pypi.python.org/pypi/flake8[flake8]. - * `vulture`: Run https://pypi.python.org/pypi/vulture[vulture] to find - unused code portions. -@@ -168,16 +168,16 @@ Examples: - - ---- - # run only pytest tests which failed in last run: --tox -e py35 -- --lf -+tox -e py37 -- --lf - - # run only the end2end feature tests: --tox -e py35 -- tests/end2end/features -+tox -e py37 -- tests/end2end/features - - # run everything with undo in the generated name, based on the scenario text --tox -e py35 -- tests/end2end/features/test_tabs_bdd.py -k undo -+tox -e py37 -- tests/end2end/features/test_tabs_bdd.py -k undo - - # run coverage test for specific file (updates htmlcov/index.html) --tox -e py35-cov -- tests/unit/browser/test_webelem.py -+tox -e py37-cov -- tests/unit/browser/test_webelem.py - ---- - - Profiling -@@ -544,11 +544,8 @@ ____ - Setting up a Windows Development Environment - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - --* Install https://www.python.org/downloads/release/python-362/[Python 3.6]. -+* Install https://www.python.org/downloads/release/python-3911/[Python 3.9]. - * Install PyQt via `pip install PyQt5`. --* Create a file at `C:\Windows\system32\python3.bat` with the following content (adjust the path as necessary): -- `@C:\Python36\python %*`. -- This will make the Python 3.6 interpreter available as `python3`, which is used by various development scripts. - * Install git from the https://git-scm.com/download/win[git-scm downloads page]. - Try not to enable `core.autocrlf`, since that will cause `flake8` to complain a lot. Use an editor that can deal with plain line feeds instead. - * Clone your favourite qutebrowser repository. -diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc -index 445d46d4b..ad9de2a71 100644 ---- a/doc/help/commands.asciidoc -+++ b/doc/help/commands.asciidoc -@@ -130,6 +130,12 @@ possible to run or bind multiple commands by separating them with `;;`. - |<>|Switch to the previous tab, or switch [count] tabs back. - |<>|Select tab by index or url/title best match. - |<>|Take a tab from another window. -+|<>|Wrapper around :open qute://treegroup/name. Correctly escapes names. -+|<>|Hides levels of descendents: children, grandchildren, and so on. -+|<>|Demote a tab making it children of its previous adjacent sibling. -+|<>|Promote a tab so it becomes next sibling of its parent. -+|<>|Suspends all descendent of a tab to reduce memory usage. -+|<>|If the current tab's children are shown hide them, and vice-versa. - |<>|Unbind a keychain. - |<>|Re-open the last closed tab(s) or window. - |<>|Show version information. -@@ -904,7 +910,7 @@ Do nothing. - - [[open]] - === open --Syntax: +:open [*--related*] [*--bg*] [*--tab*] [*--window*] [*--secure*] [*--private*] ['url']+ -+Syntax: +:open [*--related*] [*--sibling*] [*--bg*] [*--tab*] [*--window*] [*--secure*] [*--private*] ['url']+ - - Open a URL in the current/[count]th tab. - -@@ -916,6 +922,8 @@ If the URL contains newlines, each line gets opened in its own tab. - ==== optional arguments - * +*-r*+, +*--related*+: If opening a new tab, position the tab as related to the current one (like clicking on a link). - -+* +*-S*+, +*--sibling*+: If opening a new tab, position the as a sibling of the current one. -+ - * +*-b*+, +*--bg*+: Open in a new background tab. - * +*-t*+, +*--tab*+: Open in a new tab. - * +*-w*+, +*--window*+: Open in a new window. -@@ -1367,7 +1375,7 @@ Duplicate the current tab. - - [[tab-close]] - === tab-close --Syntax: +:tab-close [*--prev*] [*--next*] [*--opposite*] [*--force*]+ -+Syntax: +:tab-close [*--prev*] [*--next*] [*--opposite*] [*--force*] [*--recursive*]+ - - Close the current/[count]th tab. - -@@ -1377,6 +1385,7 @@ Close the current/[count]th tab. - * +*-o*+, +*--opposite*+: Force selecting the tab in the opposite direction of what's configured in 'tabs.select_on_remove'. - - * +*-f*+, +*--force*+: Avoid confirmation for pinned tabs. -+* +*-r*+, +*--recursive*+: Close all descendents (tree-tabs) as well as current tab - - ==== count - The tab index to close -@@ -1390,10 +1399,14 @@ Select the tab given as argument/[count]. - If neither count nor index are given, it behaves like tab-next. If both are given, use count. - - ==== positional arguments --* +'index'+: The tab index to focus, starting with 1. The special value `last` focuses the last focused tab (regardless of count), -- and `stack-prev`/`stack-next` traverse a stack of visited -- tabs. Negative indices count from the end, such that -1 is -- the last tab. -+* +'index'+: The tab index to focus, starting with 1. Negative indices count from the end, such that -1 is the last tab. Special -+ values are: -+ - `last` focuses the last focused tab (regardless of -+ count). -+ - `parent` focuses the parent tab in the tree hierarchy, -+ if `tabs.tree_tabs` is enabled. -+ - `stack-prev`/`stack-next` traverse a stack of visited -+ tabs. - - - ==== optional arguments -@@ -1404,7 +1417,7 @@ The tab index to focus, starting with 1. - - [[tab-give]] - === tab-give --Syntax: +:tab-give [*--keep*] [*--private*] ['win-id']+ -+Syntax: +:tab-give [*--keep*] [*--private*] [*--recursive*] ['win-id']+ - - Give the current tab to a new or existing window if win_id given. - -@@ -1416,6 +1429,7 @@ If no win_id is given, the tab will get detached into a new window. - ==== optional arguments - * +*-k*+, +*--keep*+: If given, keep the old tab around. - * +*-p*+, +*--private*+: If the tab should be detached into a private instance. -+* +*-r*+, +*--recursive*+: Whether to move the entire subtree starting at the tab. - - ==== count - Overrides win_id (index starts at 1 for win_id=0). -@@ -1448,8 +1462,13 @@ The tab index to mute or unmute - - [[tab-next]] - === tab-next -+Syntax: +:tab-next [*--sibling*]+ -+ - Switch to the next tab, or switch [count] tabs forward. - -+==== optional arguments -+* +*-s*+, +*--sibling*+: Whether to focus the next tree sibling. -+ - ==== count - How many tabs to switch forward. - -@@ -1477,8 +1496,13 @@ The tab index to pin or unpin - - [[tab-prev]] - === tab-prev -+Syntax: +:tab-prev [*--sibling*]+ -+ - Switch to the previous tab, or switch [count] tabs back. - -+==== optional arguments -+* +*-s*+, +*--sibling*+: Whether to focus the previous tree sibling. -+ - ==== count - How many tabs to switch back. - -@@ -1516,6 +1540,59 @@ Take a tab from another window. - ==== note - * This command does not split arguments after the last argument and handles quotes literally. - -+[[tree-tab-create-group]] -+=== tree-tab-create-group -+Syntax: +:tree-tab-create-group [*--related*] [*--background*] 'name' ['name' ...]+ -+ -+Wrapper around :open qute://treegroup/name. Correctly escapes names. -+ -+Example: `:tree-tab-create-group Foo Bar` calls `:open qute://treegroup/Foo%20Bar` -+ -+==== positional arguments -+* +'name'+: Name of the group to create -+ -+==== optional arguments -+* +*-r*+, +*--related*+: whether to open as a child of current tab or under root -+* +*-b*+, +*--background*+: whether to open in a background tab -+ -+[[tree-tab-cycle-hide]] -+=== tree-tab-cycle-hide -+Hides levels of descendents: children, grandchildren, and so on. -+ -+==== count -+How many levels to hide. -+ -+[[tree-tab-demote]] -+=== tree-tab-demote -+Demote a tab making it children of its previous adjacent sibling. -+ -+Observes tabs.new_position.tree.demote in positioning the tab among new siblings. -+ -+[[tree-tab-promote]] -+=== tree-tab-promote -+Promote a tab so it becomes next sibling of its parent. -+ -+Observes tabs.new_position.tree.promote in positioning the tab among new siblings. -+ -+==== count -+How many levels the tabs should be promoted to -+ -+[[tree-tab-suspend-children]] -+=== tree-tab-suspend-children -+Suspends all descendent of a tab to reduce memory usage. -+ -+==== count -+Target tab. -+ -+[[tree-tab-toggle-hide]] -+=== tree-tab-toggle-hide -+If the current tab's children are shown hide them, and vice-versa. -+ -+This toggles the current tab's node's `collapsed` attribute. -+ -+==== count -+Which tab to collapse -+ - [[unbind]] - === unbind - Syntax: +:unbind [*--mode* 'mode'] 'key'+ -diff --git a/doc/help/configuring.asciidoc b/doc/help/configuring.asciidoc -index b469118ed..3ecef8ecf 100644 ---- a/doc/help/configuring.asciidoc -+++ b/doc/help/configuring.asciidoc -@@ -391,8 +391,8 @@ import subprocess - - def read_xresources(prefix): - props = {} -- x = subprocess.run(['xrdb', '-query'], stdout=subprocess.PIPE) -- lines = x.stdout.decode().split('\n') -+ x = subprocess.run(['xrdb', '-query'], capture_output=True, check=True, text=True) -+ lines = x.stdout.split('\n') - for line in filter(lambda l : l.startswith(prefix), lines): - prop, _, value = line.partition(':\t') - props[prop] = value -@@ -447,7 +447,7 @@ Various emacs/conkeror-like keybinding configs exist: - - - https://gitlab.com/jgkamat/qutemacs/blob/master/qutemacs.py[jgkamat] - - https://gitlab.com/Kaligule/qutebrowser-emacs-config/blob/master/config.py[Kaligule] --- https://me0w.net/pit/1540882719[nm0i] -+- https://web.archive.org/web/20210512185023/https://me0w.net/pit/1540882719[nm0i] - - https://www.reddit.com/r/qutebrowser/comments/eh10i7/config_share_qute_with_emacs_keybindings/[jasonsun0310] - - It's also mostly possible to get rid of modal keybindings by setting -diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc -index 2f60525f4..20012b121 100644 ---- a/doc/help/settings.asciidoc -+++ b/doc/help/settings.asciidoc -@@ -325,6 +325,11 @@ - |<>|Switch between tabs using the mouse wheel. - |<>|Position of new tabs opened from another tab. - |<>|Stack related tabs on top of each other when opened consecutively. -+|<>|Position at which a tab is placed among its new siblings after being demoted with `:tree-tab-demote` -+|<>|Position of new children among siblings, e.g. after calling `:open --relative ...` or following a link. -+|<>|Position of siblings, e.g. after calling `:open --sibling ...`. -+|<>|Position of new top-level tabs related to the topmost ancestor of current tab, e.g. when calling `:open ...` without `--relative` or `--sibling`. -+|<>|Position at which a tab is placed among its new siblings after being promoted with `:tree-tab-promote` - |<>|Position of new tabs which are not opened from another tab. - |<>|Padding (in pixels) around text for tabs. - |<>|Force pinned tabs to stay at fixed URL. -@@ -364,7 +369,7 @@ The keys of the given dictionary are the aliases, while the values are the comma - - Type: <> - --Default: -+Default: - - - +pass:[q]+: +pass:[close]+ - - +pass:[qa]+: +pass:[quit]+ -@@ -471,7 +476,7 @@ This setting can only be set in config.py. - - Type: <> - --Default: -+Default: - - - +pass:[caret]+: - -@@ -740,6 +745,17 @@ Default: - * +pass:[yp]+: +pass:[yank pretty-url]+ - * +pass:[yt]+: +pass:[yank title]+ - * +pass:[yy]+: +pass:[yank]+ -+* +pass:[zG]+: +pass:[set-cmd-text -s :tree-tab-create-group]+ -+* +pass:[zH]+: +pass:[tree-tab-promote]+ -+* +pass:[zJ]+: +pass:[tab-next -s]+ -+* +pass:[zK]+: +pass:[tab-prev -s]+ -+* +pass:[zL]+: +pass:[tree-tab-demote]+ -+* +pass:[zO]+: +pass:[set-cmd-text --space :open -tS]+ -+* +pass:[za]+: +pass:[tree-tab-toggle-hide]+ -+* +pass:[zd]+: +pass:[tab-close -r]+ -+* +pass:[zg]+: +pass:[set-cmd-text -s :tree-tab-create-group -r]+ -+* +pass:[zo]+: +pass:[set-cmd-text --space :open -tr]+ -+* +pass:[zp]+: +pass:[tab-focus parent]+ - * +pass:[{{]+: +pass:[navigate prev -t]+ - * +pass:[}}]+: +pass:[navigate next -t]+ - - +pass:[passthrough]+: -@@ -796,7 +812,7 @@ Note that when a key is bound (via `bindings.default` or `bindings.commands`), t - - Type: <> - --Default: -+Default: - - - +pass:[<Ctrl-6>]+: +pass:[<Ctrl-^>]+ - - +pass:[<Ctrl-Enter>]+: +pass:[<Ctrl-Return>]+ -@@ -870,7 +886,7 @@ May be a single color to use for all columns or a list of three colors, one for - - Type: <> - --Default: -+Default: - - - +pass:[white]+ - - +pass:[white]+ -@@ -1850,7 +1866,7 @@ Valid values: - * +history+ - * +filesystem+ - --Default: -+Default: - - - +pass:[searchengines]+ - - +pass:[quickmarks]+ -@@ -1955,7 +1971,7 @@ Valid values: - * +downloads+: Show a confirmation if downloads are running - * +never+: Never show a confirmation. - --Default: -+Default: - - - +pass:[never]+ - -@@ -1986,7 +2002,7 @@ need to find the link to the raw `.txt` file (e.g. by extracting it from the - - Type: <> - --Default: -+Default: - - - +pass:[https://easylist.to/easylist/easylist.txt]+ - - +pass:[https://easylist.to/easylist/easyprivacy.txt]+ -@@ -2031,7 +2047,7 @@ The file `~/.config/qutebrowser/blocked-hosts` is always read if it exists. - - Type: <> - --Default: -+Default: - - - +pass:[https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts]+ - -@@ -2385,7 +2401,7 @@ The following levels are valid: `none`, `debug`, `info`, `warning`, `error`. - - Type: <> - --Default: -+Default: - - - +pass:[error]+: +pass:[debug]+ - - +pass:[info]+: +pass:[debug]+ -@@ -2928,7 +2944,7 @@ The following placeholders are defined: - - Type: <> - --Default: -+Default: - - - +pass:[gvim]+ - - +pass:[-f]+ -@@ -2990,7 +3006,7 @@ The following placeholders are defined: - - Type: <> - --Default: -+Default: - - - +pass:[xterm]+ - - +pass:[-e]+ -@@ -3006,7 +3022,7 @@ The following placeholders are defined: - - Type: <> - --Default: -+Default: - - - +pass:[xterm]+ - - +pass:[-e]+ -@@ -3352,7 +3368,7 @@ Comma-separated list of regular expressions to use for 'next' links. - - Type: <> - --Default: -+Default: - - - +pass:[\bnext\b]+ - - +pass:[\bmore\b]+ -@@ -3367,7 +3383,7 @@ Padding (in pixels) for hints. - - Type: <> - --Default: -+Default: - - - +pass:[bottom]+: +pass:[0]+ - - +pass:[left]+: +pass:[3]+ -@@ -3380,7 +3396,7 @@ Comma-separated list of regular expressions to use for 'prev' links. - - Type: <> - --Default: -+Default: - - - +pass:[\bprev(ious)?\b]+ - - +pass:[\bback\b]+ -@@ -3415,7 +3431,7 @@ This setting can only be set in config.py. - - Type: <> - --Default: -+Default: - - - +pass:[all]+: - -@@ -4074,7 +4090,7 @@ Padding (in pixels) for the statusbar. - - Type: <> - --Default: -+Default: - - - +pass:[bottom]+: +pass:[1]+ - - +pass:[left]+: +pass:[0]+ -@@ -4125,7 +4141,7 @@ Valid values: - * +progress+: Progress bar for the current page loading. - * +text:foo+: Display the static text after the colon, `foo` in the example. - --Default: -+Default: - - - +pass:[keypress]+ - - +pass:[url]+ -@@ -4209,7 +4225,7 @@ Padding (in pixels) for tab indicators. - - Type: <> - --Default: -+Default: - - - +pass:[bottom]+: +pass:[2]+ - - +pass:[left]+: +pass:[0]+ -@@ -4309,6 +4325,77 @@ Type: <> - - Default: +pass:[true]+ - -+[[tabs.new_position.tree.demote]] -+=== tabs.new_position.tree.demote -+Position at which a tab is placed among its new siblings after being demoted with `:tree-tab-demote` -+ -+Type: <> -+ -+Valid values: -+ -+ * +first+: At the beginning. -+ * +last+: At the end. -+ -+Default: +pass:[last]+ -+ -+[[tabs.new_position.tree.new_child]] -+=== tabs.new_position.tree.new_child -+Position of new children among siblings, e.g. after calling `:open --relative ...` or following a link. -+ -+Type: <> -+ -+Valid values: -+ -+ * +first+: At the beginning. -+ * +last+: At the end. -+ -+Default: +pass:[first]+ -+ -+[[tabs.new_position.tree.new_sibling]] -+=== tabs.new_position.tree.new_sibling -+Position of siblings, e.g. after calling `:open --sibling ...`. -+ -+Type: <> -+ -+Valid values: -+ -+ * +prev+: Before the current tab. -+ * +next+: After the current tab. -+ * +first+: At the beginning. -+ * +last+: At the end. -+ -+Default: +pass:[first]+ -+ -+[[tabs.new_position.tree.new_toplevel]] -+=== tabs.new_position.tree.new_toplevel -+Position of new top-level tabs related to the topmost ancestor of current tab, e.g. when calling `:open ...` without `--relative` or `--sibling`. -+ -+Type: <> -+ -+Valid values: -+ -+ * +prev+: Before the current tab. -+ * +next+: After the current tab. -+ * +first+: At the beginning. -+ * +last+: At the end. -+ -+Default: +pass:[last]+ -+ -+[[tabs.new_position.tree.promote]] -+=== tabs.new_position.tree.promote -+Position at which a tab is placed among its new siblings after being promoted with `:tree-tab-promote` -+ -+Type: <> -+ -+Valid values: -+ -+ * +prev+: Before the current tab. -+ * +next+: After the current tab. -+ * +first+: At the beginning. -+ * +last+: At the end. -+ -+Default: +pass:[next]+ -+ - [[tabs.new_position.unrelated]] - === tabs.new_position.unrelated - Position of new tabs which are not opened from another tab. -@@ -4331,7 +4418,7 @@ Padding (in pixels) around text for tabs. - - Type: <> - --Default: -+Default: - - - +pass:[bottom]+: +pass:[0]+ - - +pass:[left]+: +pass:[5]+ -@@ -4434,6 +4521,8 @@ Format to use for the tab title. - The following placeholders are defined: - - * `{perc}`: Percentage as a string like `[10%]`. -+* `{collapsed}`: If children tabs are hidden, the string `[...]`, empty otherwise -+* `{tree}`: The ASCII tree prefix of current tab. - * `{perc_raw}`: Raw percentage, e.g. `10`. - * `{current_title}`: Title of the current web page. - * `{title_sep}`: The string `" - "` if a title is set, empty otherwise. -@@ -4453,7 +4542,7 @@ The following placeholders are defined: - - Type: <> - --Default: +pass:[{audio}{index}: {current_title}]+ -+Default: +pass:[{tree}{collapsed}{audio}{index}: {current_title}]+ - - [[tabs.title.format_pinned]] - === tabs.title.format_pinned -@@ -4472,6 +4561,15 @@ Type: <> - - Default: +pass:[true]+ - -+[[tabs.tree_tabs]] -+=== tabs.tree_tabs -+Enable tree-tabs mode. -+This setting requires a restart. -+ -+Type: <> -+ -+Default: +pass:[false]+ -+ - [[tabs.undo_stack_size]] - === tabs.undo_stack_size - Number of closed tabs (per window) and closed windows to remember for :undo (-1 for no maximum). -@@ -4534,7 +4632,7 @@ Valid values: - * +query+ - * +anchor+ - --Default: -+Default: - - - +pass:[path]+ - - +pass:[query]+ -@@ -4576,7 +4674,7 @@ term, e.g. `:open google qutebrowser`. - - Type: <> - --Default: -+Default: - - - +pass:[DEFAULT]+: +pass:[https://duckduckgo.com/?q={}]+ - -@@ -4594,7 +4692,7 @@ URL parameters to strip with `:yank url`. - - Type: <> - --Default: -+Default: - - - +pass:[ref]+ - - +pass:[utm_source]+ -@@ -4654,7 +4752,7 @@ Available zoom levels. - - Type: <> - --Default: -+Default: - - - +pass:[25%]+ - - +pass:[33%]+ -@@ -4729,6 +4827,7 @@ Lists with duplicate flags are invalid. Each item is checked against the valid v - When setting from a string, pass a json-like list, e.g. `["one", "two"]`. - |ListOrValue|A list of values, or a single value. - |LogLevel|A logging level. -+|NewChildPosition|How new children are positioned. - |NewTabPosition|How new tabs are positioned. - |Padding|Setting for paddings around elements. - |Perc|A percentage. -diff --git a/doc/install.asciidoc b/doc/install.asciidoc -index dd284fb9a..bb4e08f5a 100644 ---- a/doc/install.asciidoc -+++ b/doc/install.asciidoc -@@ -38,7 +38,7 @@ version (Qt 5.7, based on a Chromium from March 2016). Furthermore, it packages - Ubuntu 16.04 doesn't come with an up-to-date engine (a new enough QtWebKit, or - QtWebEngine) and also comes with Python 3.5. - --You should be able to install a newer Python (3.6+) using the -+You should be able to install a newer Python (3.7+) using the - https://launchpad.net/~deadsnakes/+archive/ubuntu/ppa[deadsnakes PPA] or - https://github.com/pyenv/pyenv[pyenv], and then proceed to - <>. However, this is currently untested. If you -@@ -447,7 +447,7 @@ This installs all needed Python dependencies in a `.venv` subfolder - This comes with an up-to-date Qt/PyQt including a pre-compiled QtWebEngine - binary, but has a few caveats: - --- Make sure your `python3` is Python 3.6 or newer, otherwise you'll get a "No -+- Make sure your `python3` is Python 3.7 or newer, otherwise you'll get a "No - matching distribution found" error and/or qutebrowser will not run. - - It only works on 64-bit x86 systems, with other architectures you'll get the - same error. -diff --git a/doc/qutebrowser.1.asciidoc b/doc/qutebrowser.1.asciidoc -index a2b2bcec9..e83a4da0b 100644 ---- a/doc/qutebrowser.1.asciidoc -+++ b/doc/qutebrowser.1.asciidoc -@@ -10,14 +10,14 @@ - :homepage: https://www.qutebrowser.org/ - - == NAME --qutebrowser - a keyboard-driven, vim-like browser based on PyQt5. -+qutebrowser - a keyboard-driven, vim-like browser based on Python and Qt. - - == SYNOPSIS - *qutebrowser* ['-OPTION' ['...']] [':COMMAND' ['...']] ['URL' ['...']] - - == DESCRIPTION - qutebrowser is a keyboard-focused browser with a minimal GUI. It's based --on Python and Qt5 and is free software, licensed under the GPL. -+on Python and Qt and is free software, licensed under the GPL. - - It was inspired by other browsers/addons like dwb and Vimperator/Pentadactyl. - -diff --git a/misc/Makefile b/misc/Makefile -index b916a20d5..62294ba61 100644 ---- a/misc/Makefile -+++ b/misc/Makefile -@@ -24,9 +24,9 @@ install: man - "$(DESTDIR)$(MANDIR)/man1/qutebrowser.1" - install -Dm644 misc/org.qutebrowser.qutebrowser.desktop \ - "$(DESTDIR)$(DATADIR)/applications/org.qutebrowser.qutebrowser.desktop" -- $(foreach i,$(ICONSIZES),install -Dm644 "icons/qutebrowser-$(i)x$(i).png" \ -+ $(foreach i,$(ICONSIZES),install -Dm644 "qutebrowser/icons/qutebrowser-$(i)x$(i).png" \ - "$(DESTDIR)$(DATADIR)/icons/hicolor/$(i)x$(i)/apps/qutebrowser.png";) -- install -Dm644 icons/qutebrowser.svg \ -+ install -Dm644 qutebrowser/icons/qutebrowser.svg \ - "$(DESTDIR)$(DATADIR)/icons/hicolor/scalable/apps/qutebrowser.svg" - install -Dm755 -t "$(DESTDIR)$(DATADIR)/qutebrowser/userscripts/" \ - $(filter-out misc/userscripts/__pycache__,$(wildcard misc/userscripts/*)) -diff --git a/misc/nsis/qutebrowser.nsi b/misc/nsis/qutebrowser.nsi -index bfc9aa817..7623d8cb2 100755 ---- a/misc/nsis/qutebrowser.nsi -+++ b/misc/nsis/qutebrowser.nsi -@@ -60,7 +60,7 @@ ShowUninstDetails hide - !define URL_UPDATE "https://qutebrowser.org/doc/install.html" - !define HELP_LINK "https://qutebrowser.org/doc/help/" - !define CONTACT "mail@qutebrowser.org" --!define COMMENTS "A keyboard-driven, vim-like browser based on PyQt5." -+!define COMMENTS "A keyboard-driven, vim-like browser based on Python and Qt." - !define LANGID "1033" ; U.S. English - !define MIN_WIN_VER "8" - !define SETUP_MUTEX "${PRODUCT_NAME} Setup Mutex" ; do not change this between program versions! -diff --git a/misc/org.qutebrowser.qutebrowser.desktop b/misc/org.qutebrowser.qutebrowser.desktop -index d999496ee..741a00371 100644 ---- a/misc/org.qutebrowser.qutebrowser.desktop -+++ b/misc/org.qutebrowser.qutebrowser.desktop -@@ -39,9 +39,9 @@ GenericName[ta]=இணைய உலாவி - GenericName[th]=เว็บเบราว์เซอร์ - GenericName[tr]=Web Tarayıcı - GenericName[uk]=Навігатор Тенет瀏覽器 --Comment=A keyboard-driven, vim-like browser based on PyQt5 --Comment[de]=Ein Tastatur-gesteuerter, vim-ähnlicher Browser basierend auf PyQt5 --Comment[it]= Un browser web vim-like utilizzabile da tastiera basato su PyQt5 -+Comment=A keyboard-driven, vim-like browser based on Python and Qt -+Comment[de]=Ein Tastatur-gesteuerter, vim-ähnlicher Browser basierend auf Python und Qt -+Comment[it]= Un browser web vim-like utilizzabile da tastiera basato su Python e Qt - Icon=qutebrowser - Type=Application - Categories=Network;WebBrowser; -diff --git a/misc/qutebrowser.rcc b/misc/qutebrowser.rcc -deleted file mode 100644 -index ffe9e47f6..000000000 ---- a/misc/qutebrowser.rcc -+++ /dev/null -@@ -1,13 +0,0 @@ -- -- -- ../icons/qutebrowser-16x16.png -- ../icons/qutebrowser-24x24.png -- ../icons/qutebrowser-32x32.png -- ../icons/qutebrowser-48x48.png -- ../icons/qutebrowser-64x64.png -- ../icons/qutebrowser-96x96.png -- ../icons/qutebrowser-128x128.png -- ../icons/qutebrowser-256x256.png -- ../icons/qutebrowser-512x512.png -- -- -diff --git a/misc/qutebrowser.spec b/misc/qutebrowser.spec -index 5eefc82af..8ba435918 100644 ---- a/misc/qutebrowser.spec -+++ b/misc/qutebrowser.spec -@@ -2,6 +2,7 @@ - - import sys - import os -+import pathlib - - sys.path.insert(0, os.getcwd()) - from scripts import setupcommon -@@ -61,6 +62,7 @@ def get_data_files(): - data_files = [ - ('../qutebrowser/html', 'html'), - ('../qutebrowser/img', 'img'), -+ ('../qutebrowser/icons', 'icons'), - ('../qutebrowser/javascript', 'javascript'), - ('../qutebrowser/html/doc', 'html/doc'), - ('../qutebrowser/git-commit-id', '.'), -@@ -86,9 +88,12 @@ setupcommon.write_git_file() - - - if os.name == 'nt': -- icon = '../icons/qutebrowser.ico' -+ # WORKAROUND for PyInstaller 5.0 bug: -+ # https://github.com/pyinstaller/pyinstaller/issues/6759 -+ icons_path = pathlib.Path.cwd() / 'qutebrowser' / 'icons' -+ icon = str(icons_path / 'qutebrowser.ico') - elif sys.platform == 'darwin': -- icon = '../icons/qutebrowser.icns' -+ icon = '../qutebrowser/icons/qutebrowser.icns' - else: - icon = None - -diff --git a/misc/requirements/requirements-check-manifest.txt b/misc/requirements/requirements-check-manifest.txt -index 63f9eddc5..012a3dc05 100644 ---- a/misc/requirements/requirements-check-manifest.txt -+++ b/misc/requirements/requirements-check-manifest.txt -@@ -4,5 +4,5 @@ build==0.7.0 - check-manifest==0.48 - packaging==21.3 - pep517==0.12.0 --pyparsing==3.0.7 -+pyparsing==3.0.8 - tomli==2.0.1 -diff --git a/misc/requirements/requirements-dev.txt b/misc/requirements/requirements-dev.txt -index 9f7f5074b..f28969147 100644 ---- a/misc/requirements/requirements-dev.txt -+++ b/misc/requirements/requirements-dev.txt -@@ -1,43 +1,45 @@ - # This file is automatically generated by scripts/dev/recompile_requirements.py - --bleach==4.1.0 -+bleach==5.0.0 - build==0.7.0 - bump2version==1.0.1 - certifi==2021.10.8 - cffi==1.15.0 - charset-normalizer==2.0.12 --colorama==0.4.4 -+commonmark==0.9.1 - cryptography==36.0.2 - docutils==0.18.1 - github3.py==3.2.0 - hunter==3.4.3 - idna==3.3 - importlib-metadata==4.11.3 --jeepney==0.7.1 -+jeepney==0.8.0 - keyring==23.5.0 - manhole==1.8.0 - packaging==21.3 - pep517==0.12.0 - pkginfo==1.8.2 -+ply==3.11 - pycparser==2.21 - Pygments==2.11.2 - PyJWT==2.3.0 - Pympler==1.0.1 --pyparsing==3.0.7 -+pyparsing==3.0.8 - PyQt-builder==1.12.2 - python-dateutil==2.8.2 - readme-renderer==34.0 - requests==2.27.1 - requests-toolbelt==0.9.1 - rfc3986==2.0.0 -+rich==12.2.0 - SecretStorage==3.3.1 --sip==6.5.1 -+sip==6.6.1 - six==1.16.0 - toml==0.10.2 - tomli==2.0.1 --tqdm==4.63.1 --twine==3.8.0 -+twine==4.0.0 -+typing_extensions==4.2.0 - uritemplate==4.1.1 - # urllib3==1.26.9 - webencodings==0.5.1 --zipp==3.7.0 -+zipp==3.8.0 -diff --git a/misc/requirements/requirements-mypy.txt b/misc/requirements/requirements-mypy.txt -index d8fbba5ee..d5a266759 100644 ---- a/misc/requirements/requirements-mypy.txt -+++ b/misc/requirements/requirements-mypy.txt -@@ -1,9 +1,9 @@ - # This file is automatically generated by scripts/dev/recompile_requirements.py - - chardet==4.0.0 --diff-cover==6.4.5 -+diff-cover==6.5.0 - importlib-metadata==4.11.3 --importlib-resources==5.6.0 -+importlib-resources==5.7.1 - Jinja2==3.1.1 - lxml==4.8.0 - MarkupSafe==2.1.1 -@@ -13,7 +13,6 @@ pluggy==1.0.0 - Pygments==2.11.2 - PyQt5-stubs==5.15.2.0 - tomli==2.0.1 --types-dataclasses==0.6.4 --types-PyYAML==6.0.5 --typing_extensions==4.1.1 --zipp==3.7.0 -+types-PyYAML==6.0.6 -+typing_extensions==4.2.0 -+zipp==3.8.0 -diff --git a/misc/requirements/requirements-mypy.txt-raw b/misc/requirements/requirements-mypy.txt-raw -index 4baeec11f..dd00d3219 100644 ---- a/misc/requirements/requirements-mypy.txt-raw -+++ b/misc/requirements/requirements-mypy.txt-raw -@@ -3,7 +3,6 @@ lxml # For HTML reports - diff-cover - - PyQt5-stubs --types-dataclasses - types-PyYAML - - # So stubs are available even on newer Python versions -diff --git a/misc/requirements/requirements-pyinstaller.txt b/misc/requirements/requirements-pyinstaller.txt -index d7e46505c..00a767af7 100644 ---- a/misc/requirements/requirements-pyinstaller.txt -+++ b/misc/requirements/requirements-pyinstaller.txt -@@ -1,5 +1,5 @@ - # This file is automatically generated by scripts/dev/recompile_requirements.py - - altgraph==0.17.2 --pyinstaller==4.10 --pyinstaller-hooks-contrib==2022.3 -+pyinstaller==5.0 -+pyinstaller-hooks-contrib==2022.4 -diff --git a/misc/requirements/requirements-pylint.txt b/misc/requirements/requirements-pylint.txt -index 3e5ebea9e..d9fd359c7 100644 ---- a/misc/requirements/requirements-pylint.txt -+++ b/misc/requirements/requirements-pylint.txt -@@ -13,18 +13,17 @@ isort==5.10.1 - lazy-object-proxy==1.7.1 - mccabe==0.7.0 - pefile==2021.9.3 --platformdirs==2.5.1 ; python_version>="3.7" -+platformdirs==2.5.1 - pycparser==2.21 - PyJWT==2.3.0 --pylint==2.13.3 -+pylint==2.13.5 - python-dateutil==2.8.2 - ./scripts/dev/pylint_checkers - requests==2.27.1 - six==1.16.0 - tomli==2.0.1 --typed-ast==1.5.2 ; python_version<"3.8" --typing_extensions==4.1.1 -+typed-ast==1.5.3 ; python_version<"3.8" -+typing_extensions==4.2.0 - uritemplate==4.1.1 - # urllib3==1.26.9 - wrapt==1.14.0 --platformdirs==2.4.0 ; python_version=="3.6.*" -diff --git a/misc/requirements/requirements-pylint.txt-raw b/misc/requirements/requirements-pylint.txt-raw -index 52633ec1a..54e12a02a 100644 ---- a/misc/requirements/requirements-pylint.txt-raw -+++ b/misc/requirements/requirements-pylint.txt-raw -@@ -10,7 +10,3 @@ pefile - - # Already included via test requirements - #@ ignore: urllib3 -- --# Python 3.6 --#@ markers: platformdirs python_version>="3.7" --#@ add: platformdirs==2.4.0 ; python_version=="3.6.*" -diff --git a/misc/requirements/requirements-pyqt-5.12.txt b/misc/requirements/requirements-pyqt-5.12.txt -index c49484a2d..499f420e5 100644 ---- a/misc/requirements/requirements-pyqt-5.12.txt -+++ b/misc/requirements/requirements-pyqt-5.12.txt -@@ -1,5 +1,5 @@ - # This file is automatically generated by scripts/dev/recompile_requirements.py - - PyQt5==5.12.3 # rq.filter: < 5.13 --PyQt5-sip==12.9.1 -+PyQt5-sip==12.10.1 - PyQtWebEngine==5.12.1 # rq.filter: < 5.13 -diff --git a/misc/requirements/requirements-pyqt-5.13.txt b/misc/requirements/requirements-pyqt-5.13.txt -index 59d78862f..0fb28e312 100644 ---- a/misc/requirements/requirements-pyqt-5.13.txt -+++ b/misc/requirements/requirements-pyqt-5.13.txt -@@ -1,5 +1,5 @@ - # This file is automatically generated by scripts/dev/recompile_requirements.py - - PyQt5==5.13.2 # rq.filter: < 5.14 --PyQt5-sip==12.9.1 -+PyQt5-sip==12.10.1 - PyQtWebEngine==5.13.2 # rq.filter: < 5.14 -diff --git a/misc/requirements/requirements-pyqt-5.14.txt b/misc/requirements/requirements-pyqt-5.14.txt -index ac7c0a028..953b3ded6 100644 ---- a/misc/requirements/requirements-pyqt-5.14.txt -+++ b/misc/requirements/requirements-pyqt-5.14.txt -@@ -1,5 +1,5 @@ - # This file is automatically generated by scripts/dev/recompile_requirements.py - - PyQt5==5.14.2 # rq.filter: < 5.15 --PyQt5-sip==12.9.1 -+PyQt5-sip==12.10.1 - PyQtWebEngine==5.14.0 # rq.filter: < 5.15 -diff --git a/misc/requirements/requirements-pyqt-5.15.0.txt b/misc/requirements/requirements-pyqt-5.15.0.txt -index 6164b89ca..703a8b248 100644 ---- a/misc/requirements/requirements-pyqt-5.15.0.txt -+++ b/misc/requirements/requirements-pyqt-5.15.0.txt -@@ -1,5 +1,5 @@ - # This file is automatically generated by scripts/dev/recompile_requirements.py - - PyQt5==5.15.0 # rq.filter: == 5.15.0 --PyQt5-sip==12.9.1 -+PyQt5-sip==12.10.1 - PyQtWebEngine==5.15.0 # rq.filter: == 5.15.0 -diff --git a/misc/requirements/requirements-pyqt-5.15.txt b/misc/requirements/requirements-pyqt-5.15.txt -index 03f016177..daa7e7136 100644 ---- a/misc/requirements/requirements-pyqt-5.15.txt -+++ b/misc/requirements/requirements-pyqt-5.15.txt -@@ -2,6 +2,6 @@ - - PyQt5==5.15.6 # rq.filter: < 5.16 - PyQt5-Qt5==5.15.2 --PyQt5-sip==12.9.1 -+PyQt5-sip==12.10.1 - PyQtWebEngine==5.15.5 # rq.filter: < 5.16 - PyQtWebEngine-Qt5==5.15.2 -diff --git a/misc/requirements/requirements-pyqt.txt b/misc/requirements/requirements-pyqt.txt -index bf667ac97..1641b4fcd 100644 ---- a/misc/requirements/requirements-pyqt.txt -+++ b/misc/requirements/requirements-pyqt.txt -@@ -2,6 +2,6 @@ - - PyQt5==5.15.6 - PyQt5-Qt5==5.15.2 --PyQt5-sip==12.9.1 -+PyQt5-sip==12.10.1 - PyQtWebEngine==5.15.5 - PyQtWebEngine-Qt5==5.15.2 -diff --git a/misc/requirements/requirements-pyroma.txt b/misc/requirements/requirements-pyroma.txt -index a78ba8560..19fc7f50a 100644 ---- a/misc/requirements/requirements-pyroma.txt -+++ b/misc/requirements/requirements-pyroma.txt -@@ -1,10 +1,15 @@ - # This file is automatically generated by scripts/dev/recompile_requirements.py - -+build==0.7.0 - certifi==2021.10.8 - charset-normalizer==2.0.12 - docutils==0.18.1 - idna==3.3 -+packaging==21.3 -+pep517==0.12.0 - Pygments==2.11.2 --pyroma==3.3 -+pyparsing==3.0.8 -+pyroma==4.0 - requests==2.27.1 -+tomli==2.0.1 - urllib3==1.26.9 -diff --git a/misc/requirements/requirements-qutebrowser.txt-raw b/misc/requirements/requirements-qutebrowser.txt-raw -index b260fa16c..2025280fc 100644 ---- a/misc/requirements/requirements-qutebrowser.txt-raw -+++ b/misc/requirements/requirements-qutebrowser.txt-raw -@@ -3,7 +3,6 @@ PyYAML - - ## stdlib backports - importlib-resources --dataclasses - - ## Optional dependencies - Pygments # For :view-source --pygments or on QtWebKit -@@ -17,15 +16,3 @@ typing_extensions # from importlib-metadata - #@ markers: importlib-resources python_version=="3.7.*" or python_version=="3.8.*" - #@ markers: importlib-metadata python_version=="3.7.*" - #@ markers: typing_extensions python_version<"3.8" --#@ markers: dataclasses python_version<"3.7" -- --# Python 3.6 --#@ add: importlib-resources<5.6.0 ; python_version=="3.6.*" --#@ add: importlib-metadata<4.9 ; python_version=="3.6.*" --# --#@ markers: zipp python_version>="3.7" --#@ add: zipp<3.7 ; python_version=="3.6.*" --#@ markers: MarkupSafe python_version>="3.7" --#@ add: MarkupSafe<2.1.0 ; python_version=="3.6.*" --#@ markers: Jinja2 python_version>="3.7" --#@ add: Jinja2<3.1.0 ; python_version=="3.6.*" -diff --git a/misc/requirements/requirements-sphinx.txt b/misc/requirements/requirements-sphinx.txt -index bec429e04..be8662be6 100644 ---- a/misc/requirements/requirements-sphinx.txt -+++ b/misc/requirements/requirements-sphinx.txt -@@ -12,7 +12,7 @@ Jinja2==3.1.1 - MarkupSafe==2.1.1 - packaging==21.3 - Pygments==2.11.2 --pyparsing==3.0.7 -+pyparsing==3.0.8 - pytz==2022.1 - requests==2.27.1 - snowballstemmer==2.2.0 -@@ -24,4 +24,4 @@ sphinxcontrib-jsmath==1.0.1 - sphinxcontrib-qthelp==1.0.3 - sphinxcontrib-serializinghtml==1.1.5 - urllib3==1.26.9 --zipp==3.7.0 -+zipp==3.8.0 -diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt -index 787d2791b..990b4c236 100644 ---- a/misc/requirements/requirements-tests.txt -+++ b/misc/requirements/requirements-tests.txt -@@ -1,26 +1,26 @@ - # This file is automatically generated by scripts/dev/recompile_requirements.py - - attrs==21.4.0 --beautifulsoup4==4.10.0 -+beautifulsoup4==4.11.1 - certifi==2021.10.8 - charset-normalizer==2.0.12 - cheroot==8.6.0 --click==8.1.0 ; python_version>="3.7" --coverage==6.3.2 ; python_version>="3.7" -+click==8.1.2 -+coverage==6.3.2 - execnet==1.9.0 --filelock==3.6.0 ; python_version>="3.7" --Flask==2.1.0 ; python_version>="3.7" -+filelock==3.6.0 -+Flask==2.1.1 - glob2==0.7 - hunter==3.4.3 --hypothesis==6.40.0 ; python_version>="3.7" --icdiff==2.0.4 -+hypothesis==6.43.3 -+icdiff==2.0.5 - idna==3.3 --importlib-metadata==4.11.3 ; python_version=="3.7.*" -+importlib-metadata==4.11.3 - iniconfig==1.1.1 --itsdangerous==2.1.2 ; python_version>="3.7" --jaraco.functools==3.5.0 ; python_version>="3.7" -+itsdangerous==2.1.2 -+jaraco.functools==3.5.0 - # Jinja2==3.1.1 --Mako==1.2.0 ; python_version>="3.7" -+Mako==1.2.0 - manhole==1.8.0 - # MarkupSafe==2.1.1 - more-itertools==8.12.0 -@@ -32,15 +32,15 @@ pprintpp==0.4.0 - py==1.11.0 - py-cpuinfo==8.0.0 - Pygments==2.11.2 --pyparsing==3.0.7 --pytest==7.1.1 ; python_version>="3.7" -+pyparsing==3.0.8 -+pytest==7.1.1 - pytest-bdd==4.1.0 - pytest-benchmark==3.4.1 - pytest-cov==3.0.0 - pytest-forked==1.4.0 - pytest-icdiff==0.5 - pytest-instafail==0.4.2 --pytest-mock==3.7.0 ; python_version>="3.7" -+pytest-mock==3.7.0 - pytest-qt==4.0.2 - pytest-repeat==0.9.1 - pytest-rerunfailures==10.2 -@@ -51,26 +51,11 @@ requests==2.27.1 - requests-file==1.5.1 - six==1.16.0 - sortedcontainers==2.4.0 --soupsieve==2.3.1 --tldextract==3.2.0 ; python_version>="3.7" -+soupsieve==2.3.2.post1 -+tldextract==3.2.1 - toml==0.10.2 --tomli==2.0.1 ; python_version>="3.7" -+tomli==2.0.1 - urllib3==1.26.9 - vulture==2.3 --Werkzeug==2.1.0 ; python_version>="3.7" --zipp==3.7.0 ; python_version>="3.7" --jaraco.functools<3.5 ; python_version=="3.6.*" --tomli<2 ; python_version=="3.6.*" --filelock==3.4.1 ; python_version=="3.6.*" --hypothesis<6.32 ; python_version=="3.6.*" --coverage<6.3 ; python_version=="3.6.*" --pytest-mock<3.7 ; python_version=="3.6.*" --itsdangerous<2.1.0 ; python_version=="3.6.*" --tldextract<3.2.0 ; python_version=="3.6.*" --Mako<1.2.0 ; python_version=="3.6.*" --pytest<7.1.0 ; python_version=="3.6.*" --click<8.1.0 ; python_version=="3.6.*" --Flask<2.1.0 ; python_version=="3.6.*" --Werkzeug<2.1.0 ; python_version=="3.6.*" --zipp<3.7 ; python_version=="3.6.*" --importlib-metadata<4.9 ; python_version=="3.6.*" -+Werkzeug==2.1.1 -+zipp==3.8.0 -diff --git a/misc/requirements/requirements-tests.txt-raw b/misc/requirements/requirements-tests.txt-raw -index 6338a1a97..5586a86ef 100644 ---- a/misc/requirements/requirements-tests.txt-raw -+++ b/misc/requirements/requirements-tests.txt-raw -@@ -35,35 +35,3 @@ pytest-icdiff - tldextract - - #@ ignore: Jinja2, MarkupSafe, colorama -- --# Python 3.6 --#@ markers: jaraco.functools python_version>="3.7" --#@ add: jaraco.functools<3.5 ; python_version=="3.6.*" --#@ markers: tomli python_version>="3.7" --#@ add: tomli<2 ; python_version=="3.6.*" --#@ markers: filelock python_version>="3.7" --#@ add: filelock==3.4.1 ; python_version=="3.6.*" --#@ markers: hypothesis python_version>="3.7" --#@ add: hypothesis<6.32 ; python_version=="3.6.*" --#@ markers: coverage python_version>="3.7" --#@ add: coverage<6.3 ; python_version=="3.6.*" --#@ markers: pytest-mock python_version>="3.7" --#@ add: pytest-mock<3.7 ; python_version=="3.6.*" --#@ markers: itsdangerous python_version>="3.7" --#@ add: itsdangerous<2.1.0 ; python_version=="3.6.*" --#@ markers: tldextract python_version>="3.7" --#@ add: tldextract<3.2.0 ; python_version=="3.6.*" --#@ markers: Mako python_version>="3.7" --#@ add: Mako<1.2.0 ; python_version=="3.6.*" --#@ markers: pytest python_version>="3.7" --#@ add: pytest<7.1.0 ; python_version=="3.6.*" --#@ markers: click python_version>="3.7" --#@ add: click<8.1.0 ; python_version=="3.6.*" --#@ markers: Flask python_version>="3.7" --#@ add: Flask<2.1.0 ; python_version=="3.6.*" --#@ markers: Werkzeug python_version>="3.7" --#@ add: Werkzeug<2.1.0 ; python_version=="3.6.*" --#@ markers: zipp python_version>="3.7" --#@ add: zipp<3.7 ; python_version=="3.6.*" --#@ markers: importlib-metadata python_version=="3.7.*" --#@ add: importlib-metadata<4.9 ; python_version=="3.6.*" -diff --git a/misc/requirements/requirements-tox.txt b/misc/requirements/requirements-tox.txt -index a87519740..57b098d01 100644 ---- a/misc/requirements/requirements-tox.txt -+++ b/misc/requirements/requirements-tox.txt -@@ -1,20 +1,16 @@ - # This file is automatically generated by scripts/dev/recompile_requirements.py - - distlib==0.3.4 --filelock==3.6.0 ; python_version>="3.7" -+filelock==3.6.0 - packaging==21.3 --pip==22.0.4 ; python_version>="3.7" --platformdirs==2.5.1 ; python_version>="3.7" -+pip==22.0.4 -+platformdirs==2.5.1 - pluggy==1.0.0 - py==1.11.0 --pyparsing==3.0.7 --setuptools==61.2.0 ; python_version>="3.7" -+pyparsing==3.0.8 -+setuptools==62.1.0 - six==1.16.0 - toml==0.10.2 --tox==3.24.5 --virtualenv==20.14.0 -+tox==3.25.0 -+virtualenv==20.14.1 - wheel==0.37.1 --setuptools<60 ; python_version=="3.6.*" --filelock==3.4.1 ; python_version=="3.6.*" --platformdirs==2.4.0 ; python_version=="3.6.*" --pip==21.3.1 ; python_version=="3.6.*" -diff --git a/misc/requirements/requirements-tox.txt-raw b/misc/requirements/requirements-tox.txt-raw -index 2a9f30c5a..27d58e1f4 100644 ---- a/misc/requirements/requirements-tox.txt-raw -+++ b/misc/requirements/requirements-tox.txt-raw -@@ -1,12 +1,2 @@ - tox - wheel -- --# Python 3.6 --#@ markers: setuptools python_version>="3.7" --#@ add: setuptools<60 ; python_version=="3.6.*" --#@ markers: filelock python_version>="3.7" --#@ add: filelock==3.4.1 ; python_version=="3.6.*" --#@ markers: platformdirs python_version>="3.7" --#@ add: platformdirs==2.4.0 ; python_version=="3.6.*" --#@ markers: pip python_version>="3.7" --#@ add: pip==21.3.1 ; python_version=="3.6.*" -diff --git a/misc/userscripts/qute-bitwarden b/misc/userscripts/qute-bitwarden -index a0eedeae3..a30f734f2 100755 ---- a/misc/userscripts/qute-bitwarden -+++ b/misc/userscripts/qute-bitwarden -@@ -103,7 +103,7 @@ def qute_command(command): - def ask_password(password_prompt_invocation): - process = subprocess.run( - shlex.split(password_prompt_invocation), -- universal_newlines=True, -+ text=True, - stdout=subprocess.PIPE, - ) - if process.returncode > 0: -@@ -111,7 +111,7 @@ def ask_password(password_prompt_invocation): - master_pass = process.stdout.strip() - return subprocess.check_output( - ['bw', 'unlock', '--raw', master_pass], -- universal_newlines=True, -+ text=True, - ).strip() - - -@@ -122,7 +122,7 @@ def get_session_key(auto_lock, password_prompt_invocation): - else: - process = subprocess.run( - ['keyctl', 'request', 'user', 'bw_session'], -- universal_newlines=True, -+ text=True, - stdout=subprocess.PIPE, - ) - key_id = process.stdout.strip() -@@ -132,14 +132,14 @@ def get_session_key(auto_lock, password_prompt_invocation): - raise Exception('Could not unlock vault') - key_id = subprocess.check_output( - ['keyctl', 'add', 'user', 'bw_session', session, '@u'], -- universal_newlines=True, -+ text=True, - ).strip() - - if auto_lock > 0: - subprocess.call(['keyctl', 'timeout', str(key_id), str(auto_lock)]) - return subprocess.check_output( - ['keyctl', 'pipe', str(key_id)], -- universal_newlines=True, -+ text=True, - ).strip() - - -@@ -147,8 +147,7 @@ def pass_(domain, encoding, auto_lock, password_prompt_invocation): - session_key = get_session_key(auto_lock, password_prompt_invocation) - process = subprocess.run( - ['bw', 'list', 'items', '--session', session_key, '--url', domain], -- stdout=subprocess.PIPE, -- stderr=subprocess.PIPE, -+ capture_output=True, - ) - - err = process.stderr.decode(encoding).strip() -@@ -168,8 +167,7 @@ def get_totp_code(selection_id, domain_name, encoding, auto_lock, password_promp - session_key = get_session_key(auto_lock, password_prompt_invocation) - process = subprocess.run( - ['bw', 'get', 'totp', '--session', session_key, selection_id], -- stdout=subprocess.PIPE, -- stderr=subprocess.PIPE, -+ capture_output=True, - ) - - err = process.stderr.decode(encoding).strip() -@@ -196,7 +194,7 @@ def dmenu(items, invocation, encoding): - def fake_key_raw(text): - for character in text: - # Escape all characters by default, space requires special handling -- sequence = '" "' if character == ' ' else '\{}'.format(character) -+ sequence = '" "' if character == ' ' else r'\{}'.format(character) - qute_command('fake-key {}'.format(sequence)) - - -diff --git a/misc/userscripts/qute-lastpass b/misc/userscripts/qute-lastpass -index edb48dfdc..e99a51a0f 100755 ---- a/misc/userscripts/qute-lastpass -+++ b/misc/userscripts/qute-lastpass -@@ -86,7 +86,7 @@ def qute_command(command): - def pass_(domain, encoding): - domain = re.escape(domain) - args = ['lpass', 'show', '-x', '-j', '-G', '\\b{:s}'.format(domain)] -- process = subprocess.run(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE) -+ process = subprocess.run(args, capture_output=True) - - candidates = json.loads(process.stdout.decode(encoding).strip() or '[]') - err = process.stderr.decode(encoding).strip() -diff --git a/misc/userscripts/qute-pass b/misc/userscripts/qute-pass -index f410802c8..573644dc4 100755 ---- a/misc/userscripts/qute-pass -+++ b/misc/userscripts/qute-pass -@@ -188,7 +188,7 @@ def dmenu(items, invocation): - def fake_key_raw(text): - for character in text: - # Escape all characters by default, space requires special handling -- sequence = '" "' if character == ' ' else '\{}'.format(character) -+ sequence = '" "' if character == ' ' else r'\{}'.format(character) - qute_command('fake-key {}'.format(sequence)) - - -diff --git a/misc/userscripts/readability b/misc/userscripts/readability -index a6a6f2d52..19b687939 100755 ---- a/misc/userscripts/readability -+++ b/misc/userscripts/readability -@@ -10,7 +10,6 @@ - # Usage: - # :spawn --userscript readability - # --from __future__ import absolute_import - import codecs, os - - tmpfile = os.path.join( -diff --git a/qutebrowser/__init__.py b/qutebrowser/__init__.py -index 94cadc7eb..df320f996 100644 ---- a/qutebrowser/__init__.py -+++ b/qutebrowser/__init__.py -@@ -17,7 +17,7 @@ - # You should have received a copy of the GNU General Public License - # along with qutebrowser. If not, see . - --"""A keyboard-driven, vim-like browser based on PyQt5.""" -+"""A keyboard-driven, vim-like browser based on Python and Qt.""" - - import os.path - -@@ -28,6 +28,6 @@ __maintainer__ = __author__ - __email__ = "mail@qutebrowser.org" - __version__ = "2.5.2" - __version_info__ = tuple(int(part) for part in __version__.split('.')) --__description__ = "A keyboard-driven, vim-like browser based on PyQt5." -+__description__ = "A keyboard-driven, vim-like browser based on Python and Qt." - - basedir = os.path.dirname(os.path.realpath(__file__)) -diff --git a/qutebrowser/app.py b/qutebrowser/app.py -index 1ab28e8d0..c046475b5 100644 ---- a/qutebrowser/app.py -+++ b/qutebrowser/app.py -@@ -51,7 +51,6 @@ from PyQt5.QtGui import QDesktopServices, QPixmap, QIcon - from PyQt5.QtCore import pyqtSlot, QUrl, QObject, QEvent, pyqtSignal, Qt - - import qutebrowser --import qutebrowser.resources - from qutebrowser.commands import runners - from qutebrowser.config import (config, websettings, configfiles, configinit, - qtargs) -@@ -182,8 +181,9 @@ def _init_icon(): - """Initialize the icon of qutebrowser.""" - fallback_icon = QIcon() - for size in [16, 24, 32, 48, 64, 96, 128, 256, 512]: -- filename = ':/icons/qutebrowser-{size}x{size}.png'.format(size=size) -- pixmap = QPixmap(filename) -+ filename = 'icons/qutebrowser-{size}x{size}.png'.format(size=size) -+ pixmap = QPixmap() -+ pixmap.loadFromData(resources.read_file_binary(filename)) - if pixmap.isNull(): - log.init.warning("Failed to load {}".format(filename)) - else: -diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py -index 661c5f68b..3d3a2ed27 100644 ---- a/qutebrowser/browser/browsertab.py -+++ b/qutebrowser/browser/browsertab.py -@@ -51,6 +51,8 @@ if TYPE_CHECKING: - from qutebrowser.browser import webelem - from qutebrowser.browser.inspector import AbstractWebInspector - -+from qutebrowser.mainwindow.treetabwidget import TreeTabWidget -+from qutebrowser.misc.notree import Node - - tab_id_gen = itertools.count(0) - -@@ -969,6 +971,11 @@ class AbstractTab(QWidget): - self, parent=self) - self.backend: Optional[usertypes.Backend] = None - -+ if parent and isinstance(parent, TreeTabWidget): -+ self.node: AbstractTab = Node(self, parent=parent.tree_root) -+ else: -+ self.node: AbstractTab = Node(self, parent=None) -+ - # If true, this tab has been requested to be removed (or is removed). - self.pending_removal = False - self.shutting_down.connect(functools.partial( -diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py -index 5e1c67224..399ec5714 100644 ---- a/qutebrowser/browser/commands.py -+++ b/qutebrowser/browser/commands.py -@@ -23,6 +23,7 @@ import html - import os.path - import shlex - import functools -+import urllib.parse - from typing import cast, Callable, Dict, Union - - from PyQt5.QtWidgets import QApplication, QTabBar -@@ -37,7 +38,7 @@ from qutebrowser.keyinput import modeman, keyutils - from qutebrowser.utils import (message, usertypes, log, qtutils, urlutils, - objreg, utils, standarddir, debug) - from qutebrowser.utils.usertypes import KeyMode --from qutebrowser.misc import editor, guiprocess, objects -+from qutebrowser.misc import editor, guiprocess, objects, notree - from qutebrowser.completion.models import urlmodel, miscmodels - from qutebrowser.mainwindow import mainwindow, windowundo - -@@ -111,7 +112,7 @@ class CommandDispatcher: - return widget - - def _open(self, url, tab=False, background=False, window=False, -- related=False, private=None): -+ related=False, sibling=False, private=None): - """Helper function to open a page. - - Args: -@@ -121,6 +122,7 @@ class CommandDispatcher: - window: Whether to open in a new window - private: If opening a new window, open it in private browsing mode. - If not given, inherit the current window's mode. -+ sibling: Open tab in a sibling node of the currently focused tab. - """ - urlutils.raise_cmdexc_if_invalid(url) - tabbed_browser = self._tabbed_browser -@@ -131,10 +133,16 @@ class CommandDispatcher: - if window or private: - tabbed_browser = self._new_tabbed_browser(private) - tabbed_browser.tabopen(url) -- elif tab: -- tabbed_browser.tabopen(url, background=False, related=related) -- elif background: -- tabbed_browser.tabopen(url, background=True, related=related) -+ elif tab or background: -+ if tabbed_browser.is_treetabbedbrowser: -+ tabbed_browser.tabopen(url, background=background, -+ related=related, sibling=sibling) -+ elif sibling: -+ raise cmdutils.CommandError("--sibling flag only works with \ -+ tree-tab enabled") -+ else: -+ tabbed_browser.tabopen(url, background=background, -+ related=related) - else: - widget = self._current_widget() - widget.load_url(url) -@@ -216,7 +224,8 @@ class CommandDispatcher: - "{!r}!".format(conf_selection)) - return None - -- def _tab_close(self, tab, prev=False, next_=False, opposite=False): -+ def _tab_close(self, tab, prev=False, next_=False, -+ opposite=False, new_undo=True): - """Helper function for tab_close be able to handle message.async. - - Args: -@@ -232,17 +241,17 @@ class CommandDispatcher: - opposite) - - if selection_override is None: -- self._tabbed_browser.close_tab(tab) -+ self._tabbed_browser.close_tab(tab, new_undo=new_undo) - else: - old_selection_behavior = tabbar.selectionBehaviorOnRemove() - tabbar.setSelectionBehaviorOnRemove(selection_override) -- self._tabbed_browser.close_tab(tab) -+ self._tabbed_browser.close_tab(tab, new_undo=new_undo) - tabbar.setSelectionBehaviorOnRemove(old_selection_behavior) - - @cmdutils.register(instance='command-dispatcher', scope='window') - @cmdutils.argument('count', value=cmdutils.Value.count) - def tab_close(self, prev=False, next_=False, opposite=False, -- force=False, count=None): -+ force=False, count=None, recursive=False): - """Close the current/[count]th tab. - - Args: -@@ -251,15 +260,37 @@ class CommandDispatcher: - opposite: Force selecting the tab in the opposite direction of - what's configured in 'tabs.select_on_remove'. - force: Avoid confirmation for pinned tabs. -+ recursive: Close all descendents (tree-tabs) as well as current tab - count: The tab index to close, or None - """ - tab = self._cntwidget(count) -+ tabbed_browser = self._tabbed_browser - if tab is None: - return -- close = functools.partial(self._tab_close, tab, prev, -- next_, opposite) -- -- self._tabbed_browser.tab_close_prompt_if_pinned(tab, force, close) -+ if (tabbed_browser.is_treetabbedbrowser and recursive and not -+ tab.node.collapsed): -+ # if collapsed, recursive is the same as normal close -+ new_undo = True # only for first one -+ for descendent in tab.node.traverse(notree.TraverseOrder.POST_R, -+ True): -+ if self._tabbed_browser.widget.indexOf(descendent.value) > -1: -+ close = functools.partial(self._tab_close, -+ descendent.value, prev, next_, -+ opposite, new_undo) -+ tabbed_browser.tab_close_prompt_if_pinned(tab, force, -+ close) -+ new_undo = False -+ else: -+ tab = descendent.value -+ tab.private_api.shutdown() -+ tab.deleteLater() -+ tab.layout().unwrap() -+ else: -+ # this also applied to closing collapsed tabs -+ # logic for that is in TreeTabbedBrowser -+ close = functools.partial(self._tab_close, tab, prev, -+ next_, opposite) -+ tabbed_browser.tab_close_prompt_if_pinned(tab, force, close) - - @cmdutils.register(instance='command-dispatcher', scope='window', - name='tab-pin') -@@ -284,8 +315,9 @@ class CommandDispatcher: - @cmdutils.register(instance='command-dispatcher', name='open', - maxsplit=0, scope='window') - @cmdutils.argument('url', completion=urlmodel.url) -+ @cmdutils.argument('sibling', flag='S') - @cmdutils.argument('count', value=cmdutils.Value.count) -- def openurl(self, url=None, related=False, -+ def openurl(self, url=None, related=False, sibling=False, - bg=False, tab=False, window=False, count=None, secure=False, - private=False): - """Open a URL in the current/[count]th tab. -@@ -299,6 +331,8 @@ class CommandDispatcher: - window: Open in a new window. - related: If opening a new tab, position the tab as related to the - current one (like clicking on a link). -+ sibling: If opening a new tab, position the as a sibling of the -+ current one. - count: The tab index to open the URL in, or None. - secure: Force HTTPS. - private: Open a new window in private browsing mode. -@@ -317,8 +351,8 @@ class CommandDispatcher: - bg = True - - if tab or bg or window or private: -- self._open(cur_url, tab, bg, window, related=related, -- private=private) -+ self._open(cur_url, tab, bg, window, private=private, -+ related=related, sibling=sibling) - else: - curtab = self._cntwidget(count) - if curtab is None: -@@ -454,11 +488,40 @@ class CommandDispatcher: - if not keep: - tabbed_browser.close_tab(tab, add_undo=False, transfer=True) - -+ def _tree_tab_give(self, tabbed_browser, keep): -+ """Helper function to simplify tab-give.""" -+ uid_map = {1: 1} -+ traversed = list(self._current_widget().node.traverse()) -+ # first pass: open tabs -+ for node in traversed: -+ tab = tabbed_browser.tabopen(node.value.url()) -+ -+ uid_map[node.uid] = tab.node.uid -+ -+ # second pass: copy tree structure over -+ newroot = tabbed_browser.widget.tree_root -+ oldroot = self._tabbed_browser.widget.tree_root -+ for node in traversed: -+ if node.parent is not oldroot: -+ uid = uid_map[node.uid] -+ new_node = newroot.get_descendent_by_uid(uid) -+ parent_uid = uid_map[node.parent.uid] -+ new_parent = newroot.get_descendent_by_uid(parent_uid) -+ new_node.parent = new_parent -+ -+ # third pass: remove tabs from old window -+ if not keep: -+ for _node in traversed: -+ self._tabbed_browser.close_tab(self._current_widget(), -+ add_undo=False, -+ transfer=True) -+ - @cmdutils.register(instance='command-dispatcher', scope='window') - @cmdutils.argument('win_id', completion=miscmodels.window) - @cmdutils.argument('count', value=cmdutils.Value.count) - def tab_give(self, win_id: int = None, keep: bool = False, -- count: int = None, private: bool = False) -> None: -+ count: int = None, private: bool = False, -+ recursive: bool = False) -> None: - """Give the current tab to a new or existing window if win_id given. - - If no win_id is given, the tab will get detached into a new window. -@@ -467,6 +530,7 @@ class CommandDispatcher: - win_id: The window ID of the window to give the current tab to. - keep: If given, keep the old tab around. - count: Overrides win_id (index starts at 1 for win_id=0). -+ recursive: Whether to move the entire subtree starting at the tab. - private: If the tab should be detached into a private instance. - """ - if config.val.tabs.tabs_are_windows: -@@ -498,11 +562,14 @@ class CommandDispatcher: - raise cmdutils.CommandError( - "The window with id {} is not private".format(win_id)) - -- tabbed_browser.tabopen(self._current_url()) -- if not keep: -- self._tabbed_browser.close_tab(self._current_widget(), -- add_undo=False, -- transfer=True) -+ if recursive and tabbed_browser.is_treetabbedbrowser: -+ self._tree_tab_give(tabbed_browser, keep) -+ else: -+ tabbed_browser.tabopen(self._current_url()) -+ if not keep: -+ self._tabbed_browser.close_tab(self._current_widget(), -+ add_undo=False, -+ transfer=True) - - def _back_forward(self, tab, bg, window, count, forward, index=None): - """Helper function for :back/:forward.""" -@@ -844,43 +911,79 @@ class CommandDispatcher: - - @cmdutils.register(instance='command-dispatcher', scope='window') - @cmdutils.argument('count', value=cmdutils.Value.count) -- def tab_prev(self, count=1): -+ def tab_prev(self, count=1, sibling=False): - """Switch to the previous tab, or switch [count] tabs back. - - Args: - count: How many tabs to switch back. -+ sibling: Whether to focus the previous tree sibling. - """ - if self._count() == 0: - # Running :tab-prev after last tab was closed - # See https://github.com/qutebrowser/qutebrowser/issues/1448 - return -- newidx = self._current_index() - count -- if newidx >= 0: -- self._set_current_index(newidx) -- elif config.val.tabs.wrap: -- self._set_current_index(newidx % self._count()) -+ if sibling and self._tabbed_browser.is_treetabbedbrowser: -+ cur_node = self._current_widget().node -+ siblings = list(cur_node.parent.children) -+ -+ if siblings and len(siblings) > 1: -+ node_idx = siblings.index(cur_node) -+ new_idx = node_idx - count -+ if new_idx >= 0 or config.val.tabs.wrap: -+ target_node = siblings[(node_idx-count) % len(siblings)] -+ idx = self._tabbed_browser.widget.indexOf( -+ target_node.value) -+ self._set_current_index(idx) -+ else: -+ log.webview.debug("First sibling") -+ else: -+ log.webview.debug("No siblings") - else: -- log.webview.debug("First tab") -+ newidx = self._current_index() - count -+ if newidx >= 0: -+ self._set_current_index(newidx) -+ elif config.val.tabs.wrap: -+ self._set_current_index(newidx % self._count()) -+ else: -+ log.webview.debug("First tab") - - @cmdutils.register(instance='command-dispatcher', scope='window') - @cmdutils.argument('count', value=cmdutils.Value.count) -- def tab_next(self, count=1): -+ def tab_next(self, count=1, sibling=False): - """Switch to the next tab, or switch [count] tabs forward. - - Args: - count: How many tabs to switch forward. -+ sibling: Whether to focus the next tree sibling. - """ - if self._count() == 0: - # Running :tab-next after last tab was closed - # See https://github.com/qutebrowser/qutebrowser/issues/1448 - return -- newidx = self._current_index() + count -- if newidx < self._count(): -- self._set_current_index(newidx) -- elif config.val.tabs.wrap: -- self._set_current_index(newidx % self._count()) -+ if sibling and self._tabbed_browser.is_treetabbedbrowser: -+ cur_node = self._current_widget().node -+ siblings = list(cur_node.parent.children) -+ -+ if siblings and len(siblings) > 1: -+ node_idx = siblings.index(cur_node) -+ new_idx = node_idx + count -+ if new_idx < len(siblings) or config.val.tabs.wrap: -+ target_node = siblings[new_idx % len(siblings)] -+ idx = self._tabbed_browser.widget.indexOf( -+ target_node.value) -+ self._set_current_index(idx) -+ else: -+ log.webview.debug("Last sibling") -+ else: -+ log.webview.debug("No siblings") - else: -- log.webview.debug("Last tab") -+ newidx = self._current_index() + count -+ if newidx < self._count(): -+ self._set_current_index(newidx) -+ elif config.val.tabs.wrap: -+ self._set_current_index(newidx % self._count()) -+ else: -+ log.webview.debug("Last tab") - - def _resolve_tab_index(self, index): - """Resolve a tab index to the tabbedbrowser and tab. -@@ -959,7 +1062,8 @@ class CommandDispatcher: - tabbed_browser.widget.setCurrentWidget(tab) - - @cmdutils.register(instance='command-dispatcher', scope='window') -- @cmdutils.argument('index', choices=['last', 'stack-next', 'stack-prev'], -+ @cmdutils.argument('index', choices=['last', 'parent', -+ 'stack-next', 'stack-prev'], - completion=miscmodels.tab_focus) - @cmdutils.argument('count', value=cmdutils.Value.count) - def tab_focus(self, index: Union[str, int] = None, -@@ -970,11 +1074,15 @@ class CommandDispatcher: - If both are given, use count. - - Args: -- index: The tab index to focus, starting with 1. The special value -- `last` focuses the last focused tab (regardless of count), -- and `stack-prev`/`stack-next` traverse a stack of visited -- tabs. Negative indices count from the end, such that -1 is -- the last tab. -+ index: The tab index to focus, starting with 1. Negative indices -+ count from the end, such that -1 is the last tab. Special -+ values are: -+ - `last` focuses the last focused tab (regardless of -+ count). -+ - `parent` focuses the parent tab in the tree hierarchy, -+ if `tabs.tree_tabs` is enabled. -+ - `stack-prev`/`stack-next` traverse a stack of visited -+ tabs. - count: The tab index to focus, starting with 1. - no_last: Whether to avoid focusing last tab if already focused. - """ -@@ -984,6 +1092,22 @@ class CommandDispatcher: - assert isinstance(index, str) - self._tab_focus_stack(index) - return -+ elif index == 'parent' and self._tabbed_browser.is_treetabbedbrowser: -+ node = self._current_widget().node -+ path = node.path -+ if count: -+ if count < len(path): -+ path_idx = 0 - count - 1 # path[-1] is node, so shift by 1 -+ else: -+ path_idx = 1 # first non-root node -+ else: -+ path_idx = -2 # immediate parent (path[-1] is node) -+ -+ target_node = path[path_idx] -+ if node is target_node or target_node.value is None: -+ raise cmdutils.CommandError("Tab has no parent! ") -+ target_tab = target_node.value -+ index = self._tabbed_browser.widget.indexOf(target_tab) + 1 - elif index is None: - message.warning( - "Using :tab-focus without count is deprecated, " -@@ -1023,17 +1147,31 @@ class CommandDispatcher: - If moving absolutely: New position (default: 0). This - overrides the index argument, if given. - """ -+ # pylint: disable=invalid-unary-operand-type -+ # https://github.com/PyCQA/pylint/issues/1472 - if index in ["+", "-"]: - # relative moving - new_idx = self._current_index() - delta = 1 if count is None else count -- if index == "-": -- new_idx -= delta -- elif index == "+": # pragma: no branch -- new_idx += delta - -- if config.val.tabs.wrap: -- new_idx %= self._count() -+ if self._tabbed_browser.is_treetabbedbrowser: -+ node = self._current_widget().node -+ parent = node.parent -+ siblings = list(parent.children) -+ -+ if len(siblings) <= 1: -+ return -+ rel_idx = siblings.index(node) -+ rel_idx += delta if index == '+' else - delta -+ rel_idx %= len(siblings) -+ new_idx = self._tabbed_browser.widget.indexOf( -+ siblings[rel_idx].value) -+ -+ else: -+ new_idx += delta if index == '+' else - delta -+ -+ if config.val.tabs.wrap: -+ new_idx %= self._count() - else: - # pylint: disable=else-if-used - # absolute moving -@@ -1056,7 +1194,34 @@ class CommandDispatcher: - cur_idx = self._current_index() - cmdutils.check_overflow(cur_idx, 'int') - cmdutils.check_overflow(new_idx, 'int') -- self._tabbed_browser.widget.tabBar().moveTab(cur_idx, new_idx) -+ -+ if self._tabbed_browser.is_treetabbedbrowser: -+ # self._tree_tab_move(new_idx) -+ new_idx += 1 # tree-tabs indexes start at 1 (0 is hidden root tab) -+ tab = self._current_widget() -+ -+ # traverse order is the same as display order -+ # so indexing works correctly -+ tree_root = self._tabbed_browser.widget.tree_root -+ tabs = list(tree_root.traverse(render_collapsed=False)) -+ target_node = tabs[new_idx] -+ if tab.node in target_node.path: -+ raise cmdutils.CommandError("Can't move tab to a descendent" -+ " of itself") -+ -+ new_parent = target_node.parent -+ # we need index relative to parent for correct placement -+ dest_tab = tabs[new_idx] -+ new_idx_relative = new_parent.children.index(dest_tab) -+ -+ tab.node.parent = None # avoid duplicate errors -+ siblings = list(new_parent.children) -+ siblings.insert(new_idx_relative, tab.node) -+ new_parent.children = siblings -+ -+ self._tabbed_browser.widget.tree_tab_update() -+ else: -+ self._tabbed_browser.widget.tabBar().moveTab(cur_idx, new_idx) - - @cmdutils.register(instance='command-dispatcher', scope='window', - maxsplit=0, no_replace_variables=True) -@@ -1874,3 +2039,123 @@ class CommandDispatcher: - - log.misc.debug('state before fullscreen: {}'.format( - debug.qflags_key(Qt, window.state_before_fullscreen))) -+ -+ @cmdutils.register(instance='command-dispatcher', scope='window', -+ tree_tab=True) -+ @cmdutils.argument('count', value=cmdutils.Value.count) -+ def tree_tab_promote(self, count=1): -+ """Promote a tab so it becomes next sibling of its parent. -+ -+ Observes tabs.new_position.tree.promote in positioning the tab among -+ new siblings. -+ -+ Args: -+ count: How many levels the tabs should be promoted to -+ """ -+ if not self._tabbed_browser.is_treetabbedbrowser: -+ raise cmdutils.CommandError('Tree-tabs are disabled') -+ config_position = config.val.tabs.new_position.tree.promote -+ try: -+ self._current_widget().node.promote(count, config_position) -+ except notree.TreeError: -+ raise cmdutils.CommandError('Tab has no parent!') -+ finally: -+ self._tabbed_browser.widget.tree_tab_update() -+ -+ @cmdutils.register(instance='command-dispatcher', scope='window', -+ tree_tab=True) -+ def tree_tab_demote(self): -+ """Demote a tab making it children of its previous adjacent sibling. -+ -+ Observes tabs.new_position.tree.demote in positioning the tab among new -+ siblings. -+ """ -+ if not self._tabbed_browser.is_treetabbedbrowser: -+ raise cmdutils.CommandError('Tree-tabs are disabled') -+ cur_node = self._current_widget().node -+ -+ config_position = config.val.tabs.new_position.tree.demote -+ try: -+ cur_node.demote(config_position) -+ except notree.TreeError: -+ raise cmdutils.CommandError('Tab has no previous sibling!') -+ finally: -+ self._tabbed_browser.widget.tree_tab_update() -+ -+ @cmdutils.register(instance='command-dispatcher', scope='window', -+ tree_tab=True) -+ @cmdutils.argument('count', value=cmdutils.Value.count) -+ def tree_tab_toggle_hide(self, count=None): -+ """If the current tab's children are shown hide them, and vice-versa. -+ -+ This toggles the current tab's node's `collapsed` attribute. -+ -+ Args: -+ count: Which tab to collapse -+ """ -+ if not self._tabbed_browser.is_treetabbedbrowser: -+ raise cmdutils.CommandError('Tree-tabs are disabled') -+ tab = self._cntwidget(count) -+ if not tab.node.children: -+ return -+ tab.node.collapsed = not tab.node.collapsed -+ -+ self._tabbed_browser.widget.tree_tab_update() -+ -+ @cmdutils.register(instance='command-dispatcher', scope='window', -+ tree_tab=True) -+ @cmdutils.argument('count', value=cmdutils.Value.count) -+ def tree_tab_cycle_hide(self, count=1): -+ """Hides levels of descendents: children, grandchildren, and so on. -+ -+ Args: -+ count: How many levels to hide. -+ """ -+ if not self._tabbed_browser.is_treetabbedbrowser: -+ raise cmdutils.CommandError('Tree-tabs are disabled') -+ while count > 0: -+ tab = self._current_widget() -+ self._tabbed_browser.cycle_hide_tab(tab.node) -+ count -= 1 -+ -+ self._tabbed_browser.widget.tree_tab_update() -+ -+ @cmdutils.register(instance='command-dispatcher', scope='window', -+ tree_tab=True) -+ def tree_tab_create_group(self, *name, related=False, -+ background=False): -+ """Wrapper around :open qute://treegroup/name. Correctly escapes names. -+ -+ Example: `:tree-tab-create-group Foo Bar` calls -+ `:open qute://treegroup/Foo%20Bar` -+ -+ Args: -+ name: Name of the group to create -+ related: whether to open as a child of current tab or under root -+ background: whether to open in a background tab -+ """ -+ title = ' '.join(name) -+ path = urllib.parse.quote(title) -+ if background: -+ self.openurl('qute://treegroup/' + path, related=related, bg=True) -+ else: -+ self.openurl('qute://treegroup/' + path, related=related, tab=True) -+ -+ @cmdutils.register(instance='command-dispatcher', scope='window', -+ tree_tab=True) -+ @cmdutils.argument('count', value=cmdutils.Value.count) -+ def tree_tab_suspend_children(self, count=None): -+ """Suspends all descendent of a tab to reduce memory usage. -+ -+ Args: -+ count: Target tab. -+ """ -+ tab = self._cntwidget(count) -+ for descendent in tab.node.traverse(): -+ cur_tab = descendent.value -+ if cur_tab and cur_tab is not tab: -+ cur_url = cur_tab.url().url() -+ if not cur_url.startswith("qute://"): -+ new_url = self._parse_url( -+ "qute://back/#" + cur_tab.title()) -+ cur_tab.load_url(new_url) -diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py -index 68e36d249..6bc8cfef0 100644 ---- a/qutebrowser/browser/qutescheme.py -+++ b/qutebrowser/browser/qutescheme.py -@@ -587,6 +587,18 @@ def qute_warning(url: QUrl) -> _HandlerRet: - return 'text/html', src - - -+@add_handler('treegroup') -+def qute_treegroup(url): -+ """Handler for qute://treegroup/x. -+ -+ Makes an empty tab with a title, for use with tree-tabs as a grouping -+ feature. -+ """ -+ src = jinja.render('tree_group.html', -+ title=url.path()[1:]) -+ return 'text/html', src -+ -+ - @add_handler('resource') - def qute_resource(url: QUrl) -> _HandlerRet: - """Handler for qute://resource.""" -diff --git a/qutebrowser/browser/webengine/notification.py b/qutebrowser/browser/webengine/notification.py -index 9607e3eab..92c532db8 100644 ---- a/qutebrowser/browser/webengine/notification.py -+++ b/qutebrowser/browser/webengine/notification.py -@@ -65,7 +65,9 @@ if TYPE_CHECKING: - - from qutebrowser.config import config - from qutebrowser.misc import objects --from qutebrowser.utils import qtutils, log, utils, debug, message, version, objreg -+from qutebrowser.utils import ( -+ qtutils, log, utils, debug, message, version, objreg, resources, -+) - from qutebrowser.qt import sip - - -@@ -992,8 +994,8 @@ class DBusNotificationAdapter(AbstractNotificationAdapter): - - icon = qt_notification.icon() - if icon.isNull(): -- filename = ':/icons/qutebrowser-64x64.png' -- icon = QImage(filename) -+ filename = 'icons/qutebrowser-64x64.png' -+ icon = QImage.fromData(resources.read_file_binary(filename)) - - key = self._quirks.icon_key or "image-data" - data = self._convert_image(icon) -diff --git a/qutebrowser/browser/webkit/http.py b/qutebrowser/browser/webkit/http.py -index f36ca14ec..a38cd358a 100644 ---- a/qutebrowser/browser/webkit/http.py -+++ b/qutebrowser/browser/webkit/http.py -@@ -91,6 +91,7 @@ class ContentDisposition: - except IndexError: # pragma: no cover - # WORKAROUND for https://github.com/python/cpython/issues/81672 - # Fixed in Python 3.7.5 and 3.8.0. -+ # Still getting failures on 3.10 on CI though - raise ContentDispositionError("Missing closing quote character") - except ValueError: # pragma: no cover - # WORKAROUND for https://github.com/python/cpython/issues/87112 -@@ -153,7 +154,7 @@ def parse_content_disposition(reply): - """ - is_inline = True - filename = None -- content_disposition_header = 'Content-Disposition'.encode('iso-8859-1') -+ content_disposition_header = b'Content-Disposition' - # First check if the Content-Disposition header has a filename - # attribute. - if reply.hasRawHeader(content_disposition_header): -diff --git a/qutebrowser/browser/webkit/network/networkmanager.py b/qutebrowser/browser/webkit/network/networkmanager.py -index c97c91d66..83eaabda7 100644 ---- a/qutebrowser/browser/webkit/network/networkmanager.py -+++ b/qutebrowser/browser/webkit/network/networkmanager.py -@@ -25,7 +25,7 @@ import dataclasses - from typing import TYPE_CHECKING, Dict, MutableMapping, Optional, Set - - from PyQt5.QtCore import pyqtSlot, pyqtSignal, QUrl, QByteArray --from PyQt5.QtNetwork import (QNetworkAccessManager, QNetworkReply, QSslSocket, -+from PyQt5.QtNetwork import (QNetworkAccessManager, QNetworkReply, QSslConfiguration, - QNetworkProxy) - - from qutebrowser.config import config -@@ -103,7 +103,8 @@ def _is_secure_cipher(cipher): - - def init(): - """Disable insecure SSL ciphers on old Qt versions.""" -- default_ciphers = QSslSocket.defaultCiphers() -+ sslconfig = QSslConfiguration.defaultConfiguration() -+ default_ciphers = sslconfig.ciphers() - log.init.vdebug( # type: ignore[attr-defined] - "Default Qt ciphers: {}".format( - ', '.join(c.name() for c in default_ciphers))) -@@ -119,7 +120,7 @@ def init(): - if bad_ciphers: - log.init.debug("Disabling bad ciphers: {}".format( - ', '.join(c.name() for c in bad_ciphers))) -- QSslSocket.setDefaultCiphers(good_ciphers) -+ sslconfig.setCiphers(good_ciphers) - - - _SavedErrorsType = MutableMapping[ -@@ -379,10 +380,10 @@ class NetworkManager(QNetworkAccessManager): - if referer_header_conf == 'never': - # Note: using ''.encode('ascii') sends a header with no value, - # instead of no header at all -- req.setRawHeader('Referer'.encode('ascii'), QByteArray()) -+ req.setRawHeader(b'Referer', QByteArray()) - elif (referer_header_conf == 'same-domain' and - not urlutils.same_domain(req.url(), current_url)): -- req.setRawHeader('Referer'.encode('ascii'), QByteArray()) -+ req.setRawHeader(b'Referer', QByteArray()) - # If refer_header_conf is set to 'always', we leave the header - # alone as QtWebKit did set it. - except urlutils.InvalidUrlError: -diff --git a/qutebrowser/commands/command.py b/qutebrowser/commands/command.py -index eee5b7cde..8d3b486fc 100644 ---- a/qutebrowser/commands/command.py -+++ b/qutebrowser/commands/command.py -@@ -67,6 +67,7 @@ class Command: - both) - no_replace_variables: Don't replace variables like {url} - modes: The modes the command can be executed in. -+ tree_tab: Whether the command is a tree-tabs command - _qute_args: The saved data from @cmdutils.argument - _count: The count set for the command. - _instance: The object to bind 'self' to. -@@ -80,7 +81,7 @@ class Command: - def __init__(self, *, handler, name, instance=None, maxsplit=None, - modes=None, not_modes=None, debug=False, deprecated=False, - no_cmd_split=False, star_args_optional=False, scope='global', -- backend=None, no_replace_variables=False): -+ backend=None, no_replace_variables=False, tree_tab=False): - if modes is not None and not_modes is not None: - raise ValueError("Only modes or not_modes can be given!") - if modes is not None: -@@ -109,6 +110,7 @@ class Command: - self.handler = handler - self.no_cmd_split = no_cmd_split - self.backend = backend -+ self.tree_tab = tree_tab - self.no_replace_variables = no_replace_variables - - self.docparser = docutils.DocstringParser(handler) -diff --git a/qutebrowser/completion/models/filepathcategory.py b/qutebrowser/completion/models/filepathcategory.py -index b7d74f57a..fd2cb58ce 100644 ---- a/qutebrowser/completion/models/filepathcategory.py -+++ b/qutebrowser/completion/models/filepathcategory.py -@@ -65,7 +65,7 @@ class FilePathCategory(QAbstractListModel): - try: - return glob.glob(glob.escape(val) + '*') - except ValueError as e: # pragma: no cover -- # e.g. "embedded null byte" with \x00 on Python 3.6 and 3.7 -+ # e.g. "embedded null byte" with \x00 on Python 3.7 - log.completion.debug(f"Failed to glob: {e}") - return [] - -diff --git a/qutebrowser/completion/models/util.py b/qutebrowser/completion/models/util.py -index 21dcf2e9f..67df93c2c 100644 ---- a/qutebrowser/completion/models/util.py -+++ b/qutebrowser/completion/models/util.py -@@ -23,6 +23,7 @@ from typing import Callable, Sequence - - from qutebrowser.utils import usertypes - from qutebrowser.misc import objects -+from qutebrowser.config import config - - - DeleteFuncType = Callable[[Sequence[str]], None] -@@ -46,8 +47,9 @@ def get_cmd_completions(info, include_hidden, include_aliases, prefix=''): - hide_debug = obj.debug and not objects.args.debug - hide_mode = (usertypes.KeyMode.normal not in obj.modes and - not include_hidden) -+ hide_tree = obj.tree_tab and not config.cache['tabs.tree_tabs'] - hide_ni = obj.name == 'Ni!' -- if not (hide_debug or hide_mode or obj.deprecated or hide_ni): -+ if not (hide_tree or hide_debug or hide_mode or obj.deprecated or hide_ni): - bindings = ', '.join(cmd_to_keys.get(obj.name, [])) - cmdlist.append((prefix + obj.name, obj.desc, bindings)) - -diff --git a/qutebrowser/components/braveadblock.py b/qutebrowser/components/braveadblock.py -index b1e5b8a29..977aa3ef2 100644 ---- a/qutebrowser/components/braveadblock.py -+++ b/qutebrowser/components/braveadblock.py -@@ -175,11 +175,12 @@ class BraveAdBlocker: - hasattr(adblock, "__file__")): - proc = subprocess.run( - ['pacman', '-Qo', adblock.__file__], -- stdout=subprocess.PIPE, -- universal_newlines=True, -+ capture_output=True, -+ text=True, - check=False, - ) - logger.debug(proc.stdout) -+ logger.debug(proc.stderr) - raise - - def _is_blocked( -diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml -index 771cf0493..e368ae7e6 100644 ---- a/qutebrowser/config/configdata.yml -+++ b/qutebrowser/config/configdata.yml -@@ -2159,6 +2159,40 @@ tabs.new_position.stacking: - Only applies for `next` and `prev` values of `tabs.new_position.related` - and `tabs.new_position.unrelated`. - -+tabs.new_position.tree.new_child: -+ default: first -+ type: NewChildPosition -+ desc: >- -+ Position of new children among siblings, e.g. after calling `:open -+ --relative ...` or following a link. -+ -+tabs.new_position.tree.new_sibling: -+ default: first -+ type: NewTabPosition -+ desc: >- -+ Position of siblings, e.g. after calling `:open --sibling ...`. -+ -+tabs.new_position.tree.new_toplevel: -+ default: last -+ type: NewTabPosition -+ desc: >- -+ Position of new top-level tabs related to the topmost ancestor of current -+ tab, e.g. when calling `:open ...` without `--relative` or `--sibling`. -+ -+tabs.new_position.tree.promote: -+ default: next -+ type: NewTabPosition -+ desc: >- -+ Position at which a tab is placed among its new siblings after being -+ promoted with `:tree-tab-promote` -+ -+tabs.new_position.tree.demote: -+ default: last -+ type: NewChildPosition -+ desc: >- -+ Position at which a tab is placed among its new siblings after being -+ demoted with `:tree-tab-demote` -+ - tabs.padding: - default: - top: 0 -@@ -2219,7 +2253,7 @@ tabs.title.alignment: - desc: Alignment of the text inside of tabs. - - tabs.title.format: -- default: '{audio}{index}: {current_title}' -+ default: '{tree}{collapsed}{audio}{index}: {current_title}' - type: - name: FormatString - fields: -@@ -2237,12 +2271,16 @@ tabs.title.format: - - current_url - - protocol - - audio -+ - collapsed -+ - tree - none_ok: true - desc: | - Format to use for the tab title. - The following placeholders are defined: - - * `{perc}`: Percentage as a string like `[10%]`. -+ * `{collapsed}`: If children tabs are hidden, the string `[...]`, empty otherwise -+ * `{tree}`: The ASCII tree prefix of current tab. - * `{perc_raw}`: Raw percentage, e.g. `10`. - * `{current_title}`: Title of the current web page. - * `{title_sep}`: The string `" - "` if a title is set, empty otherwise. -@@ -2278,6 +2316,8 @@ tabs.title.format_pinned: - - current_url - - protocol - - audio -+ - collapsed -+ - tree - none_ok: true - desc: Format to use for the tab title for pinned tabs. The same placeholders - like for `tabs.title.format` are defined. -@@ -2376,6 +2416,12 @@ tabs.wrap: - type: Bool - desc: Wrap when changing tabs. - -+tabs.tree_tabs: -+ default: false -+ type: Bool -+ desc: Enable tree-tabs mode. -+ restart: true -+ - tabs.focus_stack_size: - default: 10 - type: -@@ -3727,6 +3773,17 @@ bindings.default: - all no-3rdparty never ;; reload - tCu: config-cycle -p -u {url} content.cookies.accept - all no-3rdparty never ;; reload -+ zH: tree-tab-promote -+ zL: tree-tab-demote -+ zJ: tab-next -s -+ zK: tab-prev -s -+ zd: tab-close -r -+ zg: set-cmd-text -s :tree-tab-create-group -r -+ zG: set-cmd-text -s :tree-tab-create-group -+ za: tree-tab-toggle-hide -+ zp: tab-focus parent -+ zo: set-cmd-text --space :open -tr -+ zO: set-cmd-text --space :open -tS - insert: - : edit-text - : insert-text -- {primary} -diff --git a/qutebrowser/config/configtypes.py b/qutebrowser/config/configtypes.py -index 97011b7cf..89969ccfd 100644 ---- a/qutebrowser/config/configtypes.py -+++ b/qutebrowser/config/configtypes.py -@@ -1945,6 +1945,21 @@ class NewTabPosition(String): - ('last', "At the end.")) - - -+class NewChildPosition(String): -+ -+ """How new children are positioned.""" -+ -+ def __init__( -+ self, *, -+ none_ok: bool = False, -+ completions: _Completions = None, -+ ) -> None: -+ super().__init__(none_ok=none_ok, completions=completions) -+ self.valid_values = ValidValues( -+ ('first', "At the beginning."), -+ ('last', "At the end.")) -+ -+ - class LogLevel(String): - - """A logging level.""" -diff --git a/qutebrowser/html/tree_group.html b/qutebrowser/html/tree_group.html -new file mode 100644 -index 000000000..b3717e52b ---- /dev/null -+++ b/qutebrowser/html/tree_group.html -@@ -0,0 +1,65 @@ -+{% extends "base.html" %} -+{% block style %} -+h1, p { -+ margin-left: 3rem; -+} -+ -+pre { -+ margin-left: 6em; -+} -+{% endblock %} -+{% block content %} -+

-+ {{ title }} -+

-+

-+ Group for tree tabs -+

-+
-+{% raw %}
-+                       _.
-+                _~.:'^%^ >@~.
-+             ,-~              ? =*=
-+           $^_`  `  , '   ,    +   -.,
-+        (*-^. , *            ;'       >
-+      >.      ,>    .     ' .,.,.      %-.,_ ,.-,
-+      #    ' ` " - "     *    .,.      *   .^    `
-+     *@!    ., *    ' '    ,    ;'   '         .  %!
-+      &       "  .`      :'              `   '   . `~,
-+     &    '        .`  '   '  .     '":   :          +.
-+     ^      .",  ,       `      '   `   * , '   `      |
-+      ]     *   .   , ""]   ..    ` . , `  , "  . . '  ,;,
-+      %  '         ::,  ,   /    ,            '   ,     ;
-+    .* ,*    /       *%     \  .  .  *'  `    ,    '     '.
-+   ?     > .   ,      ::. :;^^.     %`      '        `     @
-+  /   '   `/      `    &#@%^^      `&``   `     %;;       %
-+ ;:       :%   *  *  :$%)\      '  `@%$        @%^      ,).
-+ .    #    %&^     (!*^ .\,.   `      ^@%^  $#%%^  `   >
-+ \           :#$%  #^&#   :   `  *      %###$%@!       &
-+  |  '  *     %$#@)$*}]           `     `#@#%%^      *^
-+   :     *'  *  @%&&^:$   `  '   `%%.  #$$$^^-,     7
-+    &;            @#$~~   '   `     @#$%&      $,*.-
-+     *...*^  .._   %$$#@!   @ .,  *&&#@
-+         :..^   -   !%&@}{#&     @#$@%
-+                 --_..%#%%$#&% #&%$#;:
-+                        $%#^%#@@%%*&;;
-+                         a%##@%%@% ;:;
-+                           %####j#:::;
-+                            &#%Rj;%;;:
-+                            &#%%#;::;
-+                            $#%##:%::
-+                            "#%%#;:;
-+                           ."$###:::
-+                           #&$%%#:;:
-+                           %&#%%#::;
-+                           %&%###;::
-+                           &&#%%#:;;
-+                          *@&#%#};:;
-+                          $#%#%%^:::
-+                         *@#$#%#;::;:
-+                        %%@#$####@$:;:
-+                    ...%###pinusc@$%%:._____
-+{% endraw %}
-+
-+
-+{% endblock %} -diff --git a/icons/qutebrowser-128x128.png b/qutebrowser/icons/qutebrowser-128x128.png -similarity index 100% -rename from icons/qutebrowser-128x128.png -rename to qutebrowser/icons/qutebrowser-128x128.png -diff --git a/icons/qutebrowser-16x16.png b/qutebrowser/icons/qutebrowser-16x16.png -similarity index 100% -rename from icons/qutebrowser-16x16.png -rename to qutebrowser/icons/qutebrowser-16x16.png -diff --git a/icons/qutebrowser-24x24.png b/qutebrowser/icons/qutebrowser-24x24.png -similarity index 100% -rename from icons/qutebrowser-24x24.png -rename to qutebrowser/icons/qutebrowser-24x24.png -diff --git a/icons/qutebrowser-256x256.png b/qutebrowser/icons/qutebrowser-256x256.png -similarity index 100% -rename from icons/qutebrowser-256x256.png -rename to qutebrowser/icons/qutebrowser-256x256.png -diff --git a/icons/qutebrowser-32x32.png b/qutebrowser/icons/qutebrowser-32x32.png -similarity index 100% -rename from icons/qutebrowser-32x32.png -rename to qutebrowser/icons/qutebrowser-32x32.png -diff --git a/icons/qutebrowser-48x48.png b/qutebrowser/icons/qutebrowser-48x48.png -similarity index 100% -rename from icons/qutebrowser-48x48.png -rename to qutebrowser/icons/qutebrowser-48x48.png -diff --git a/icons/qutebrowser-512x512.png b/qutebrowser/icons/qutebrowser-512x512.png -similarity index 100% -rename from icons/qutebrowser-512x512.png -rename to qutebrowser/icons/qutebrowser-512x512.png -diff --git a/icons/qutebrowser-64x64.png b/qutebrowser/icons/qutebrowser-64x64.png -similarity index 100% -rename from icons/qutebrowser-64x64.png -rename to qutebrowser/icons/qutebrowser-64x64.png -diff --git a/icons/qutebrowser-96x96.png b/qutebrowser/icons/qutebrowser-96x96.png -similarity index 100% -rename from icons/qutebrowser-96x96.png -rename to qutebrowser/icons/qutebrowser-96x96.png -diff --git a/icons/qutebrowser-all.svg b/qutebrowser/icons/qutebrowser-all.svg -similarity index 100% -rename from icons/qutebrowser-all.svg -rename to qutebrowser/icons/qutebrowser-all.svg -diff --git a/icons/qutebrowser-favicon.svg b/qutebrowser/icons/qutebrowser-favicon.svg -similarity index 100% -rename from icons/qutebrowser-favicon.svg -rename to qutebrowser/icons/qutebrowser-favicon.svg -diff --git a/icons/qutebrowser.icns b/qutebrowser/icons/qutebrowser.icns -similarity index 100% -rename from icons/qutebrowser.icns -rename to qutebrowser/icons/qutebrowser.icns -diff --git a/icons/qutebrowser.ico b/qutebrowser/icons/qutebrowser.ico -similarity index 100% -rename from icons/qutebrowser.ico -rename to qutebrowser/icons/qutebrowser.ico -diff --git a/icons/qutebrowser.svg b/qutebrowser/icons/qutebrowser.svg -similarity index 100% -rename from icons/qutebrowser.svg -rename to qutebrowser/icons/qutebrowser.svg -diff --git a/icons/qutebrowser.xpm b/qutebrowser/icons/qutebrowser.xpm -similarity index 100% -rename from icons/qutebrowser.xpm -rename to qutebrowser/icons/qutebrowser.xpm -diff --git a/qutebrowser/mainwindow/mainwindow.py b/qutebrowser/mainwindow/mainwindow.py -index 7f62c2dc4..c99f0b0f1 100644 ---- a/qutebrowser/mainwindow/mainwindow.py -+++ b/qutebrowser/mainwindow/mainwindow.py -@@ -23,7 +23,7 @@ import binascii - import base64 - import itertools - import functools --from typing import List, MutableSequence, Optional, Tuple, cast -+from typing import List, MutableSequence, Optional, Tuple, cast, Union - - from PyQt5.QtCore import (pyqtBoundSignal, pyqtSlot, QRect, QPoint, QTimer, Qt, - QCoreApplication, QEventLoop, QByteArray) -@@ -199,7 +199,7 @@ class MainWindow(QWidget): - super().__init__(parent) - # Late import to avoid a circular dependency - # - browsertab -> hints -> webelem -> mainwindow -> bar -> browsertab -- from qutebrowser.mainwindow import tabbedbrowser -+ from qutebrowser.mainwindow import treetabbedbrowser, tabbedbrowser - from qutebrowser.mainwindow.statusbar import bar - - self.setAttribute(Qt.WA_DeleteOnClose) -@@ -228,8 +228,14 @@ class MainWindow(QWidget): - - self.is_private = config.val.content.private_browsing or private - -- self.tabbed_browser: tabbedbrowser.TabbedBrowser = tabbedbrowser.TabbedBrowser( -- win_id=self.win_id, private=self.is_private, parent=self) -+ self.tabbed_browser: Union[tabbedbrowser.TabbedBrowser, -+ treetabbedbrowser.TreeTabbedBrowser] -+ if config.val.tabs.tree_tabs: -+ self.tabbed_browser = treetabbedbrowser.TreeTabbedBrowser( -+ win_id=self.win_id, private=self.is_private, parent=self) -+ else: -+ self.tabbed_browser = tabbedbrowser.TabbedBrowser( -+ win_id=self.win_id, private=self.is_private, parent=self) - objreg.register('tabbed-browser', self.tabbed_browser, scope='window', - window=self.win_id) - self._init_command_dispatcher() -@@ -499,8 +505,10 @@ class MainWindow(QWidget): - mode_manager.keystring_updated.connect( - self.status.keystring.on_keystring_updated) - self.status.cmd.got_cmd[str].connect(self._commandrunner.run_safely) -- self.status.cmd.got_cmd[str, int].connect(self._commandrunner.run_safely) -- self.status.cmd.returnPressed.connect(self.tabbed_browser.on_cmd_return_pressed) -+ self.status.cmd.got_cmd[str, int].connect( -+ self._commandrunner.run_safely) -+ self.status.cmd.returnPressed.connect( -+ self.tabbed_browser.on_cmd_return_pressed) - self.status.cmd.got_search.connect(self._command_dispatcher.search) - - # key hint popup -diff --git a/qutebrowser/mainwindow/statusbar/command.py b/qutebrowser/mainwindow/statusbar/command.py -index 92408d34f..199f0a103 100644 ---- a/qutebrowser/mainwindow/statusbar/command.py -+++ b/qutebrowser/mainwindow/statusbar/command.py -@@ -276,7 +276,7 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit): - text = self.text() - if not text: - text = 'x' -- width = self.fontMetrics().width(text) -+ width = self.fontMetrics().boundingRect(text).width() - return QSize(width, height) - - @pyqtSlot() -diff --git a/qutebrowser/mainwindow/tabbedbrowser.py b/qutebrowser/mainwindow/tabbedbrowser.py -index a96f6d583..4c17b378c 100644 ---- a/qutebrowser/mainwindow/tabbedbrowser.py -+++ b/qutebrowser/mainwindow/tabbedbrowser.py -@@ -24,8 +24,8 @@ import functools - import weakref - import datetime - import dataclasses --from typing import ( -- Any, Deque, List, Mapping, MutableMapping, MutableSequence, Optional, Tuple) -+from typing import (Any, Deque, List, Mapping, -+ MutableMapping, MutableSequence, Optional, Tuple) - - from PyQt5.QtWidgets import QSizePolicy, QWidget, QApplication - from PyQt5.QtCore import pyqtSignal, pyqtSlot, QTimer, QUrl -@@ -202,6 +202,7 @@ class TabbedBrowser(QWidget): - resized = pyqtSignal('QRect') - current_tab_changed = pyqtSignal(browsertab.AbstractTab) - new_tab = pyqtSignal(browsertab.AbstractTab, int) -+ is_treetabbedbrowser = False - shutting_down = pyqtSignal() - - def __init__(self, *, win_id, private, parent=None): -@@ -452,6 +453,7 @@ class TabbedBrowser(QWidget): - crashed: Whether we're closing a tab with crashed renderer process. - """ - idx = self.widget.indexOf(tab) -+ - if idx == -1: - if crashed: - return -@@ -518,15 +520,24 @@ class TabbedBrowser(QWidget): - entries = self.undo_stack[-depth] - del self.undo_stack[-depth] - -+ # we return the tab list because tree_tabs needs it in post_processing -+ new_tabs = [] - for entry in reversed(entries): - if use_current_tab: - newtab = self.widget.widget(0) - use_current_tab = False - else: -- newtab = self.tabopen(background=False, idx=entry.index) -+ # FIXME:typing mypy thinks this is None due to @pyqtSlot -+ newtab = self.tabopen( -+ background=False, -+ related=False, -+ idx=entry.index -+ ) - - newtab.history.private_api.deserialize(entry.history) - newtab.set_pinned(entry.pinned) -+ new_tabs.append(newtab) -+ return new_tabs - - @pyqtSlot('QUrl', bool) - def load_url(self, url, newtab): -@@ -615,7 +626,7 @@ class TabbedBrowser(QWidget): - - if idx is None: - idx = self._get_new_tab_idx(related) -- self.widget.insertTab(idx, tab, "") -+ idx = self.widget.insertTab(idx, tab, "") - - if url is not None: - tab.load_url(url) -diff --git a/qutebrowser/mainwindow/tabwidget.py b/qutebrowser/mainwindow/tabwidget.py -index 511c2c309..6b162c67e 100644 ---- a/qutebrowser/mainwindow/tabwidget.py -+++ b/qutebrowser/mainwindow/tabwidget.py -@@ -38,7 +38,6 @@ from qutebrowser.browser import browsertab - - - class TabWidget(QTabWidget): -- - """The tab widget used for TabbedBrowser. - - Signals: -@@ -61,8 +60,7 @@ class TabWidget(QTabWidget): - self.setStyle(TabBarStyle()) - self.setTabBar(bar) - bar.tabCloseRequested.connect(self.tabCloseRequested) -- bar.tabMoved.connect(functools.partial( -- QTimer.singleShot, 0, self.update_tab_titles)) -+ bar.tabMoved.connect(self.update_tab_titles) - bar.currentChanged.connect(self._on_current_changed) - bar.new_tab_requested.connect(self._on_new_tab_requested) - self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed) -@@ -70,6 +68,7 @@ class TabWidget(QTabWidget): - self.setElideMode(Qt.ElideRight) - self.setUsesScrollButtons(True) - bar.setDrawBase(False) -+ - self._init_config() - config.instance.changed.connect(self._init_config) - -@@ -178,6 +177,9 @@ class TabWidget(QTabWidget): - fields['perc_raw'] = tab.progress() - fields['backend'] = objects.backend.name - fields['private'] = ' [Private Mode] ' if tab.is_private else '' -+ fields['tree'] = '' -+ fields['collapsed'] = '' -+ - try: - if tab.audio.is_muted(): - fields['audio'] = TabWidget.MUTE_STRING -diff --git a/qutebrowser/mainwindow/treetabbedbrowser.py b/qutebrowser/mainwindow/treetabbedbrowser.py -new file mode 100644 -index 000000000..ae5dfb4dc ---- /dev/null -+++ b/qutebrowser/mainwindow/treetabbedbrowser.py -@@ -0,0 +1,350 @@ -+# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et: -+ -+# Copyright 2014-2018 Giuseppe Stelluto (pinusc) -+# -+# This file is part of qutebrowser. -+# -+# qutebrowser is free software: you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation, either version 3 of the License, or -+# (at your option) any later version. -+# -+# qutebrowser is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with qutebrowser. If not, see . -+ -+"""Subclass of TabbedBrowser to provide tree-tab functionality.""" -+ -+import collections -+import dataclasses -+import datetime -+from typing import List, Dict -+from PyQt5.QtWidgets import QSizePolicy -+from PyQt5.QtCore import pyqtSlot, QUrl -+ -+from qutebrowser.config import config -+from qutebrowser.mainwindow.tabbedbrowser import TabbedBrowser -+from qutebrowser.mainwindow.treetabwidget import TreeTabWidget -+from qutebrowser.browser import browsertab -+from qutebrowser.misc import notree -+from qutebrowser.utils import log -+ -+ -+@dataclasses.dataclass -+class _TreeUndoEntry(): -+ """Information needed for :undo.""" -+ -+ url: QUrl -+ history: bytes -+ index: int -+ pinned: bool -+ uid: int -+ parent_node_uid: int -+ children_node_uids: List[int] -+ local_index: int # index of the tab relative to its siblings -+ created_at: datetime.datetime = dataclasses.field( -+ default_factory=datetime.datetime.now) -+ -+ @staticmethod -+ def from_node(node, idx): -+ """Make a TreeUndoEntry from a Node.""" -+ url = node.value.url() -+ try: -+ history_data = node.value.history.private_api.serialize() -+ except browsertab.WebTabError: -+ history_data = [] -+ pinned = node.value.data.pinned -+ uid = node.uid -+ parent_uid = node.parent.uid -+ children = [n.uid for n in node.children] -+ local_idx = node.index -+ return _TreeUndoEntry(url=url, -+ history=history_data, -+ index=idx, -+ pinned=pinned, -+ uid=uid, -+ parent_node_uid=parent_uid, -+ children_node_uids=children, -+ local_index=local_idx) -+ -+ -+class TreeTabbedBrowser(TabbedBrowser): -+ """Subclass of TabbedBrowser to provide tree-tab functionality. -+ -+ Extends TabbedBrowser methods (mostly tabopen, undo, and _remove_tab) so -+ that the internal tree is updated after every action. -+ -+ Provides methods to hide and show subtrees, and to cycle visibility. -+ """ -+ -+ is_treetabbedbrowser = True -+ -+ def __init__(self, *, win_id, private, parent=None): -+ super().__init__(win_id=win_id, private=private, parent=parent) -+ self.is_treetabbedbrowser = True -+ self.widget = TreeTabWidget(win_id, parent=self) -+ self.widget.tabCloseRequested.connect(self.on_tab_close_requested) -+ self.widget.new_tab_requested.connect(self.tabopen) -+ self.widget.currentChanged.connect(self._on_current_changed) -+ self.cur_fullscreen_requested.connect(self.widget.tabBar().maybe_hide) -+ self.widget.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding) -+ self._reset_stack_counters() -+ -+ def _remove_tab(self, tab, *, add_undo=True, new_undo=True, crashed=False): -+ """Handle children positioning after a tab is removed.""" -+ node = tab.node -+ # FIXME after the fixme in _add_undo_entry is resolved, no need -+ # to save descendents -+ descendents = tuple(node.traverse(render_collapsed=True)) -+ -+ super()._remove_tab(tab, add_undo=False, new_undo=False, -+ crashed=crashed) -+ -+ if not tab.url().isEmpty() and tab.url().isValid() and add_undo: -+ idx = self.widget.indexOf(tab) -+ self._add_undo_entry(tab, idx, new_undo) -+ -+ parent = node.parent -+ -+ if node.collapsed: -+ # node will already be removed from tree -+ # but we need to manually close the tab processes -+ for descendent in descendents: -+ tab = descendent.value -+ tab.private_api.shutdown() -+ tab.deleteLater() -+ tab.layout().unwrap() -+ elif parent: -+ siblings = list(parent.children) -+ children = node.children -+ -+ if children: -+ next_node = children[0] -+ -+ for n in children[1:]: -+ n.parent = next_node -+ -+ # swap nodes -+ node_idx = siblings.index(node) -+ siblings[node_idx] = next_node -+ -+ parent.children = tuple(siblings) -+ node.children = () -+ -+ node.parent = None -+ self.widget.tree_tab_update() -+ -+ def _add_undo_entry(self, tab, idx, new_undo): -+ """Save undo entry with tree information. -+ -+ This function was removed in tabbedbrowser, but it is still useful here because -+ the mechanism is quite a bit more complex -+ """ -+ # TODO see if it's possible to remove duplicate code from -+ # super()._add_undo_entry -+ try: -+ history_data = tab.history.private_api.serialize() -+ except browsertab.WebTabError: -+ pass # special URL -+ else: -+ node = tab.node -+ uid = node.uid -+ parent_uid = node.parent.uid -+ if not node.collapsed: -+ children = [n.uid for n in node.children] -+ local_idx = node.index -+ entry = _TreeUndoEntry(url=tab.url(), -+ history=history_data, -+ index=idx, -+ pinned=tab.data.pinned, -+ uid=uid, -+ parent_node_uid=parent_uid, -+ children_node_uids=children, -+ local_index=local_idx) -+ if new_undo or not self.undo_stack: -+ self.undo_stack.append([entry]) -+ else: -+ self.undo_stack[-1].append(entry) -+ else: -+ entries = [] -+ for descendent in node.traverse(notree.TraverseOrder.POST_R): -+ entries.append(_TreeUndoEntry.from_node(descendent, 0)) -+ # ensure descendent is not later saved as child as well -+ descendent.parent = None # FIXME: Find a way not to change -+ # the tree -+ if new_undo: -+ self.undo_stack.append(entries) -+ else: -+ self.undo_stack[-1] += entries -+ -+ def undo(self, depth=1): -+ """Undo removing of a tab or tabs.""" -+ # TODO find a way to remove dupe code -+ # probably by getting entries from undo stack, THEN calling super -+ # then post-processing the entries -+ -+ # save entries before super().undo() pops them -+ entries = list(self.undo_stack[-depth]) -+ new_tabs = super().undo(depth) -+ -+ for entry, tab in zip(reversed(entries), new_tabs): -+ if not isinstance(entry, _TreeUndoEntry): -+ continue -+ root = self.widget.tree_root -+ uid = entry.uid -+ parent_uid = entry.parent_node_uid -+ parent_node = root.get_descendent_by_uid(parent_uid) -+ if not parent_node: -+ parent_node = root -+ -+ children = [] -+ for child_uid in entry.children_node_uids: -+ child_node = root.get_descendent_by_uid(child_uid) -+ children.append(child_node) -+ tab.node.parent = None # Remove the node from the tree -+ tab.node = notree.Node(tab, parent_node, -+ children, uid) -+ -+ # correctly reposition the tab -+ local_idx = entry.local_index -+ if tab.node.parent: # should always be true -+ new_siblings = list(tab.node.parent.children) -+ new_siblings.remove(tab.node) -+ new_siblings.insert(local_idx, tab.node) -+ tab.node.parent.children = new_siblings -+ -+ self.widget.tree_tab_update() -+ -+ @pyqtSlot('QUrl') -+ @pyqtSlot('QUrl', bool) -+ @pyqtSlot('QUrl', bool, bool) -+ def tabopen( -+ self, url: QUrl = None, -+ background: bool = None, -+ related: bool = True, -+ sibling: bool = False, -+ idx: int = None, -+ ) -> browsertab.AbstractTab: -+ """Open a new tab with a given url. -+ -+ Args: -+ related: Whether to set the tab as a child of the currently focused -+ tab. Follows `tabs.new_position.tree.related`. -+ sibling: Whether to set the tab as a sibling of the currently -+ focused tab. Follows `tabs.new_position.tree.sibling`. -+ -+ """ -+ # pylint: disable=arguments-differ -+ # we save this now because super.tabopen also resets the focus -+ cur_tab = self.widget.currentWidget() -+ tab = super().tabopen(url, background, related, idx) -+ -+ tab.node.parent = self.widget.tree_root -+ if cur_tab is None or tab is cur_tab: -+ self.widget.tree_tab_update() -+ return tab -+ -+ # get pos -+ if related: -+ pos = config.val.tabs.new_position.tree.new_child -+ parent = cur_tab.node -+ # pos can only be first, last -+ elif sibling: -+ pos = config.val.tabs.new_position.tree.new_sibling -+ parent = cur_tab.node.parent -+ # pos can be first, last, prev, next -+ else: -+ pos = config.val.tabs.new_position.tree.new_toplevel -+ parent = self.widget.tree_root -+ -+ self._position_tab(cur_tab, tab, pos, parent, sibling, related, background) -+ -+ return tab -+ -+ def _position_tab( -+ self, -+ cur_tab: browsertab.AbstractTab, -+ tab: browsertab.AbstractTab, -+ pos: str, -+ parent: notree.Node, -+ sibling: bool = False, -+ related: bool = True, -+ background: bool = None, -+ ) -> None: -+ toplevel = not sibling and not related -+ siblings = list(parent.children) -+ if tab.node in siblings: # true if parent is tree_root -+ # remove it and add it later in the right position -+ siblings.remove(tab.node) -+ -+ if pos == 'first': -+ rel_idx = 0 -+ if config.val.tabs.new_position.stacking and related: -+ rel_idx += self._tree_tab_child_rel_idx -+ self._tree_tab_child_rel_idx += 1 -+ siblings.insert(rel_idx, tab.node) -+ elif pos in ['prev', 'next'] and (sibling or toplevel): -+ # pivot is the tab relative to which 'prev' or 'next' apply -+ # it is always a member of 'siblings' -+ pivot = cur_tab.node if sibling else cur_tab.node.path[1] -+ direction = -1 if pos == 'prev' else 1 -+ rel_idx = 0 if pos == 'prev' else 1 -+ tgt_idx = siblings.index(pivot) + rel_idx -+ if config.val.tabs.new_position.stacking: -+ if sibling: -+ tgt_idx += self._tree_tab_sibling_rel_idx -+ self._tree_tab_sibling_rel_idx += direction -+ elif toplevel: -+ tgt_idx += self._tree_tab_toplevel_rel_idx -+ self._tree_tab_toplevel_rel_idx += direction -+ siblings.insert(tgt_idx, tab.node) -+ else: # position == 'last' -+ siblings.append(tab.node) -+ parent.children = siblings -+ self.widget.tree_tab_update() -+ if not background: -+ self._reset_stack_counters() -+ -+ def _reset_stack_counters(self): -+ self._tree_tab_child_rel_idx = 0 -+ self._tree_tab_sibling_rel_idx = 0 -+ self._tree_tab_toplevel_rel_idx = 0 -+ -+ @pyqtSlot(int) -+ def _on_current_changed(self, idx): -+ super()._on_current_changed(idx) -+ self._reset_stack_counters() -+ -+ def cycle_hide_tab(self, node): -+ """Utility function for tree_tab_cycle_hide command.""" -+ # height = node.height # height is always rel_height -+ if node.collapsed: -+ node.collapsed = False -+ for descendent in node.traverse(render_collapsed=True): -+ descendent.collapsed = False -+ return -+ -+ def rel_depth(n): -+ return n.depth - node.depth -+ -+ levels: Dict[int, list] = collections.defaultdict(list) -+ for d in node.traverse(render_collapsed=False): -+ r_depth = rel_depth(d) -+ levels[r_depth].append(d) -+ -+ # Remove highest level because it's leaves (or already collapsed) -+ del levels[max(levels.keys())] -+ -+ target = 0 -+ for level in sorted(levels, reverse=True): -+ nodes = levels[level] -+ if not all(n.collapsed or not n.children for n in nodes): -+ target = level -+ break -+ for n in levels[target]: -+ if not n.collapsed and n.children: -+ n.collapsed = True -diff --git a/qutebrowser/mainwindow/treetabwidget.py b/qutebrowser/mainwindow/treetabwidget.py -new file mode 100644 -index 000000000..12de178c2 ---- /dev/null -+++ b/qutebrowser/mainwindow/treetabwidget.py -@@ -0,0 +1,105 @@ -+# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et: -+ -+# Copyright 2014-2018 Giuseppe Stelluto (pinusc) -+# -+# This file is part of qutebrowser. -+# -+# qutebrowser is free software: you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation, either version 3 of the License, or -+# (at your option) any later version. -+# -+# qutebrowser is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with qutebrowser. If not, see . -+ -+"""Extension of TabWidget for tree-tab functionality.""" -+ -+from qutebrowser.mainwindow.tabwidget import TabWidget -+from qutebrowser.misc.notree import Node -+from qutebrowser.utils import log -+ -+ -+class TreeTabWidget(TabWidget): -+ """Tab widget used in TabbedBrowser, with tree-functionality. -+ -+ Handles correct rendering of the tree as a tab field, and correct -+ positioning of tabs according to tree structure. -+ """ -+ -+ def __init__(self, win_id, parent=None): -+ # root of the tab tree, common for all tabs in the window -+ self.tree_root = Node(None) -+ super().__init__(win_id, parent) -+ self.tabBar().tabMoved.disconnect(self.update_tab_titles) -+ -+ def _init_config(self): -+ super()._init_config() -+ # For tree-tabs -+ self.update_tab_titles() # Must also be called when deactivating -+ self.tree_tab_update() -+ -+ def get_tab_fields(self, idx): -+ """Add tree field data to normal tab field data.""" -+ fields = super().get_tab_fields(idx) -+ -+ tab = self.widget(idx) -+ fields['collapsed'] = '[...] ' if tab.node.collapsed else '' -+ -+ # we remove the first two chars because every tab is child of tree -+ # root and that gets rendered as well -+ rendered_tree = self.tree_root.render() -+ try: -+ pre, _ = rendered_tree[idx+1] -+ tree_prefix = pre[2:] -+ except IndexError: # window or first tab are not initialized yet -+ tree_prefix = "" -+ log.misc.error("tree_prefix is empty!") -+ -+ fields['tree'] = tree_prefix -+ return fields -+ -+ def update_tree_tab_positions(self): -+ """Update tab positions according to the tree structure.""" -+ nodes = self.tree_root.traverse(render_collapsed=False) -+ for idx, node in enumerate(nodes): -+ if idx > 0: -+ cur_idx = self.indexOf(node.value) -+ self.tabBar().moveTab(cur_idx, idx-1) -+ -+ def update_tree_tab_visibility(self): -+ """Hide collapsed tabs and show uncollapsed ones. -+ -+ Sync the internal tree to the tabs the user can actually see. -+ """ -+ for node in self.tree_root.traverse(): -+ if node.value is None: -+ continue -+ if any(ancestor.collapsed for ancestor in node.path[:-1]): -+ if self.indexOf(node.value) != -1: -+ # node should be hidden but is shown -+ cur_tab = node.value -+ idx = self.indexOf(cur_tab) -+ if idx != -1: -+ self.removeTab(idx) -+ else: -+ if self.indexOf(node.value) == -1: -+ # node should be shown but is hidden -+ parent = node.parent -+ tab = node.value -+ name = tab.title() -+ icon = tab.icon() -+ if node.parent is not None: -+ parent_idx = self.indexOf(node.parent.value) -+ self.insertTab(parent_idx + 1, tab, icon, name) -+ tab.node.parent = parent # insertTab resets node -+ -+ def tree_tab_update(self): -+ """Update titles and positions.""" -+ self.update_tree_tab_visibility() -+ self.update_tree_tab_positions() -+ self.update_tab_titles() -diff --git a/qutebrowser/misc/checkpyver.py b/qutebrowser/misc/checkpyver.py -index e9a7a1eef..7d6a524c3 100644 ---- a/qutebrowser/misc/checkpyver.py -+++ b/qutebrowser/misc/checkpyver.py -@@ -43,11 +43,11 @@ except ImportError: # pragma: no cover - # to stderr. - def check_python_version(): - """Check if correct python version is run.""" -- if sys.hexversion < 0x03060100: -+ if sys.hexversion < 0x03070000: - # We don't use .format() and print_function here just in case someone - # still has < 2.6 installed. - version_str = '.'.join(map(str, sys.version_info[:3])) -- text = ("At least Python 3.6.1 is required to run qutebrowser, but " + -+ text = ("At least Python 3.7 is required to run qutebrowser, but " + - "it's running with " + version_str + ".\n") - if Tk and '--no-err-windows' not in sys.argv: # pragma: no cover - root = Tk() -diff --git a/qutebrowser/misc/earlyinit.py b/qutebrowser/misc/earlyinit.py -index 034d7ff74..4b3df4db2 100644 ---- a/qutebrowser/misc/earlyinit.py -+++ b/qutebrowser/misc/earlyinit.py -@@ -19,7 +19,7 @@ - - """Things which need to be done really early (e.g. before importing Qt). - --At this point we can be sure we have all python 3.6.1 features available. -+At this point we can be sure we have all python 3.7 features available. - """ - - try: -@@ -235,7 +235,6 @@ def check_libraries(): - modules = { - 'jinja2': _missing_str("jinja2"), - 'yaml': _missing_str("PyYAML"), -- 'dataclasses': _missing_str("dataclasses"), - 'PyQt5.QtQml': _missing_str("PyQt5.QtQml"), - 'PyQt5.QtSql': _missing_str("PyQt5.QtSql"), - 'PyQt5.QtOpenGL': _missing_str("PyQt5.QtOpenGL"), -diff --git a/qutebrowser/misc/notree.py b/qutebrowser/misc/notree.py -new file mode 100644 -index 000000000..9d180ad4c ---- /dev/null -+++ b/qutebrowser/misc/notree.py -@@ -0,0 +1,354 @@ -+# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et: -+ -+# Copyright 2019 Giuseppe Stelluto (pinusc) -+# -+# This file is part of qutebrowser. -+# -+# qutebrowser is free software: you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation, either version 3 of the License, or -+# (at your option) any later version. -+# -+# qutebrowser is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with qutebrowser. If not, see . -+ -+"""Tree library for tree-tabs. -+ -+The fundamental unit is the Node class. -+ -+Create a tree with with Node(value, parent): -+root = Node('foo') -+child = Node('bar', root) -+child2 = Node('baz', root) -+child3 = Node('lorem', child) -+ -+You can also assign parent after instantiation, or even reassign it: -+child4 = Node('ipsum') -+child4.parent = root -+ -+Assign children: -+child.children = [] -+child2.children = [child4, child3] -+child3.parent -+> Node('foo/bar/baz') -+ -+Render a tree with render_tree(root_node): -+render_tree(root) -+ -+> ('', 'foo') -+> ('├─', 'bar') -+> ('│ ├─', 'lorem') -+> ('│ └─', 'ipsum') -+> ('└─', 'baz') -+""" -+import enum -+from typing import Optional, TypeVar, Sequence, List, Tuple, Iterable, Generic -+import itertools -+ -+# For Node.render -+CORNER = '└─' -+INTERSECTION = '├─' -+PIPE = '│' -+ -+ -+class TreeError(RuntimeError): -+ """Exception used for tree-related errors.""" -+ -+ -+class TraverseOrder(enum.Enum): -+ """To be used as argument to traverse(). -+ -+ Implemented orders are pre-order and post-order. -+ Attributes: -+ PRE: pre-order (parents before children). Same as in Node.render -+ POST: children of a node are always yield before their parent. -+ POST_R: Like POST, but children are yield in reverse order -+ """ -+ -+ PRE = 'pre-order' -+ POST = 'post-order' -+ POST_R = 'post-order-reverse' -+ -+ -+uid_gen = itertools.count(0) -+ -+# generic type of value held by Node -+T = TypeVar('T') # pylint: disable=invalid-name -+ -+ -+class Node(Generic[T]): -+ """Fundamental unit of notree library. -+ -+ Attributes: -+ value: The element (ususally a tab) the node represents -+ parent: Node's parent. -+ children: Node's children elements. -+ siblings: Children of parent node that are not self. -+ path: List of nodes from root of tree to self value, parent, and -+ children can all be set by user. Everything else will be updated -+ accordingly, so that if `node.parent = root_node`, then `node in -+ root_node.children` will be True. -+ """ -+ -+ sep: str = '/' -+ __parent: Optional['Node[T]'] = None -+ # this is a global 'static' class attribute -+ -+ def __init__(self, -+ value: T, -+ parent: Optional['Node[T]'] = None, -+ childs: Sequence['Node[T]'] = (), -+ uid: Optional[int] = None) -> None: -+ if uid is not None: -+ self.__uid = uid -+ else: -+ self.__uid = next(uid_gen) -+ -+ self.value = value -+ # set initial values so there's no need for AttributeError checks -+ self.__parent: Optional['Node[T]'] = None -+ self.__children: List['Node[T]'] = [] -+ -+ # For render memoization -+ self.__modified = False -+ self.__set_modified() # not the same as line above -+ self.__rendered: Optional[List[Tuple[str, 'Node[T]']]] = None -+ -+ if parent: -+ self.parent = parent # calls setter -+ if childs: -+ self.children = childs # this too -+ -+ self.__collapsed = False -+ -+ @property -+ def uid(self) -> int: -+ return self.__uid -+ -+ @property -+ def parent(self) -> Optional['Node[T]']: -+ return self.__parent -+ -+ @parent.setter -+ def parent(self, value: 'Node[T]') -> None: -+ """Set parent property. Also adds self to value.children.""" -+ # pylint: disable=protected-access -+ assert(value is None or isinstance(value, Node)) -+ if self.__parent: -+ self.__parent.__disown(self) -+ self.__parent = None -+ if value is not None: -+ value.__add_child(self) -+ self.__parent = value -+ self.__set_modified() -+ -+ @property -+ def children(self) -> Sequence['Node[T]']: -+ return tuple(self.__children) -+ -+ @children.setter -+ def children(self, value: Sequence['Node[T]']) -> None: -+ """Set children property, preserving order. -+ -+ Also sets n.parent = self for n in value. Does not allow duplicates. -+ """ -+ seen = set(value) -+ if len(seen) != len(value): -+ raise TreeError("A duplicate item is present in in %r" % value) -+ new_children = list(value) -+ for child in new_children: -+ if child.parent is not self: -+ child.parent = self -+ self.__children = new_children -+ self.__set_modified() -+ -+ @property -+ def path(self) -> List['Node[T]']: -+ """Get a list of all nodes from the root node to self.""" -+ if self.parent is None: -+ return [self] -+ else: -+ return self.parent.path + [self] -+ -+ @property -+ def depth(self) -> int: -+ """Get the number of nodes between self and the root node.""" -+ return len(self.path) - 1 -+ -+ @property -+ def index(self) -> int: -+ """Get self's position among its siblings (self.parent.children).""" -+ if self.parent is not None: -+ return self.parent.children.index(self) -+ else: -+ raise TreeError('Node has no parent.') -+ -+ @property -+ def collapsed(self) -> bool: -+ return self.__collapsed -+ -+ @collapsed.setter -+ def collapsed(self, val: bool) -> None: -+ self.__collapsed = val -+ self.__set_modified() -+ -+ def __set_modified(self) -> None: -+ """If self is modified, every ancestor is modified as well.""" -+ for node in self.path: -+ node.__modified = True # pylint: disable=protected-access -+ -+ def render(self) -> List[Tuple[str, 'Node[T]']]: -+ """Render a tree with ascii symbols. -+ -+ Tabs appear in the same order as in traverse() with TraverseOrder.PRE -+ Args: -+ node; the root of the tree to render -+ -+ Return: list of tuples where the first item is the symbol, -+ and the second is the node it refers to -+ """ -+ if not self.__modified and self.__rendered is not None: -+ return self.__rendered -+ -+ result = [('', self)] -+ for child in self.children: -+ if child.children: -+ subtree = child.render() -+ if child is not self.children[-1]: -+ subtree = [(PIPE + ' ' + c, n) for c, n in subtree] -+ char = INTERSECTION -+ else: -+ subtree = [(' ' + c, n) for c, n in subtree] -+ char = CORNER -+ subtree[0] = (char, subtree[0][1]) -+ if child.collapsed: -+ result += [subtree[0]] -+ else: -+ result += subtree -+ else: -+ if child is self.children[-1]: -+ result.append((CORNER, child)) -+ else: -+ result.append((INTERSECTION, child)) -+ self.__modified = False -+ self.__rendered = list(result) -+ return list(result) -+ -+ def traverse(self, order: TraverseOrder = TraverseOrder.PRE, -+ render_collapsed: bool = True) -> Iterable['Node']: -+ """Generator for all descendants of `self`. -+ -+ Args: -+ order: a TraverseOrder object. See TraverseOrder documentation. -+ render_collapsed: whether to yield children of collapsed nodes -+ Even if render_collapsed is False, collapsed nodes are be rendered. -+ It's their children that won't. -+ """ -+ if order == TraverseOrder.PRE: -+ yield self -+ -+ if self.collapsed and not render_collapsed: -+ if order != TraverseOrder.PRE: -+ yield self -+ return -+ -+ f = reversed if order is TraverseOrder.POST_R else lambda x: x -+ for child in f(self.children): -+ if render_collapsed or not child.collapsed: -+ yield from child.traverse(order, render_collapsed) -+ else: -+ yield child -+ if order in [TraverseOrder.POST, TraverseOrder.POST_R]: -+ yield self -+ -+ def __add_child(self, node: 'Node[T]') -> None: -+ if node not in self.__children: -+ self.__children.append(node) -+ -+ def __disown(self, value: 'Node[T]') -> None: -+ self.__set_modified() -+ if value in self.__children: -+ self.__children.remove(value) -+ -+ def get_descendent_by_uid(self, uid: int) -> Optional['Node[T]']: -+ """Return descendent identified by the provided uid. -+ -+ Returns None if there is no such descendent. -+ -+ Args: -+ uid: The uid of the node to return -+ """ -+ for descendent in self.traverse(): -+ if descendent.uid == uid: -+ return descendent -+ return None -+ -+ def promote(self, times: int = 1, to: str = 'first') -> None: -+ """Makes self a child of its grandparent, i.e. sibling of its parent. -+ -+ Args: -+ times: How many levels to promote the tab to. to: One of 'next', -+ 'prev', 'first', 'last'. Determines the position among siblings -+ after being promoted. 'next' and 'prev' are relative to the current -+ parent. -+ -+ """ -+ if to not in ['first', 'last', 'next', 'prev']: -+ raise Exception("Invalid value supplied for 'to': " + to) -+ position = {'first': 0, 'last': -1}.get(to, None) -+ diff = {'next': 1, 'prev': 0}.get(to, 1) -+ count = times -+ while count > 0: -+ if self.parent is None or self.parent.parent is None: -+ raise TreeError("Tab has no parent!") -+ grandparent = self.parent.parent -+ if position is not None: -+ idx = position -+ else: # diff is necessarily not none -+ idx = self.parent.index + diff -+ self.parent = None -+ -+ siblings = list(grandparent.children) -+ if idx != -1: -+ siblings.insert(idx, self) -+ else: -+ siblings.append(self) -+ grandparent.children = siblings -+ count -= 1 -+ -+ def demote(self, to: str = 'last') -> None: -+ """Demote a tab making it a child of its previous adjacent sibling.""" -+ if self.parent is None or self.parent.children is None: -+ raise TreeError("Tab has no siblings!") -+ siblings = list(self.parent.children) -+ -+ # we want previous node in the same subtree as current node -+ rel_idx = siblings.index(self) - 1 -+ -+ if rel_idx >= 0: -+ parent = siblings[rel_idx] -+ new_siblings = list(parent.children) -+ position = {'first': 0, 'last': -1}.get(to, -1) -+ if position == 0: -+ new_siblings.insert(0, self) -+ else: -+ new_siblings.append(self) -+ parent.children = new_siblings -+ else: -+ raise TreeError("Tab has no previous sibling!") -+ -+ def __repr__(self) -> str: -+ try: -+ value = str(self.value.url().url()) # type: ignore -+ except Exception: -+ value = str(self.value) -+ return "" % (self.__uid, value) -+ -+ def __str__(self) -> str: -+ # return "" % self.value -+ return str(self.value) -diff --git a/qutebrowser/misc/sessions.py b/qutebrowser/misc/sessions.py -index a28f3a848..faaa6897f 100644 ---- a/qutebrowser/misc/sessions.py -+++ b/qutebrowser/misc/sessions.py -@@ -249,6 +249,9 @@ class SessionManager(QObject): - tab: The WebView to save. - active: Whether the tab is currently active. - """ -+ # FIXME understand why this happens -+ if tab is None: -+ return {} - data: _JsonType = {'history': []} - if active: - data['active'] = True -@@ -290,12 +293,28 @@ class SessionManager(QObject): - if getattr(active_window, 'win_id', None) == win_id: - win_data['active'] = True - win_data['geometry'] = bytes(main_window.saveGeometry()) -- win_data['tabs'] = [] - if tabbed_browser.is_private: - win_data['private'] = True -- for i, tab in enumerate(tabbed_browser.widgets()): -- active = i == tabbed_browser.widget.currentIndex() -- win_data['tabs'].append(self._save_tab(tab, active)) -+ -+ if tabbed_browser.is_treetabbedbrowser: -+ # a dict where keys are node UIDs, and values are dicts -+ # with tab data (the result of _save_tab) and a list of -+ # children UIDs -+ tree_data = {} -+ root_node = tabbed_browser.widget.tree_root -+ for i, node in enumerate(root_node.traverse(), -1): -+ node_data = {} -+ active = i == tabbed_browser.widget.currentIndex() -+ node_data['tab'] = self._save_tab(node.value, active) -+ node_data['children'] = [c.uid for c in node.children] -+ node_data['collapsed'] = node.collapsed -+ tree_data[node.uid] = node_data -+ win_data['tree'] = tree_data -+ else: -+ win_data['tabs'] = [] -+ for i, tab in enumerate(tabbed_browser.widgets()): -+ active = i == tabbed_browser.widget.currentIndex() -+ win_data['tabs'].append(self._save_tab(tab, active)) - data['windows'].append(win_data) - return data - -@@ -461,6 +480,45 @@ class SessionManager(QObject): - except ValueError as e: - raise SessionError(e) - -+ def _load_tree(self, tabbed_browser, tree_data): -+ tree_keys = list(tree_data.keys()) -+ if not tree_keys: -+ return None -+ -+ root_data = tree_data.get(tree_keys[0]) -+ if root_data is None: -+ return None -+ -+ root_node = tabbed_browser.widget.tree_root -+ tab_to_focus = None -+ index = -1 -+ -+ def recursive_load_node(uid): -+ nonlocal tab_to_focus -+ nonlocal index -+ index += 1 -+ node_data = tree_data[uid] -+ children_uids = node_data['children'] -+ -+ if tree_data[uid]['tab'].get('active'): -+ tab_to_focus = index -+ -+ tab_data = node_data['tab'] -+ new_tab = tabbed_browser.tabopen(background=False) -+ self._load_tab(new_tab, tab_data) -+ -+ new_tab.node.parent = root_node -+ children = [recursive_load_node(uid) for uid in children_uids] -+ new_tab.node.children = children -+ new_tab.node.collapsed = node_data['collapsed'] -+ return new_tab.node -+ -+ for child_uid in root_data['children']: -+ child = recursive_load_node(child_uid) -+ child.parent = root_node -+ -+ return tab_to_focus -+ - def _load_window(self, win): - """Turn yaml data into windows.""" - window = mainwindow.MainWindow(geometry=win['geometry'], -@@ -469,15 +527,32 @@ class SessionManager(QObject): - tabbed_browser = objreg.get('tabbed-browser', scope='window', - window=window.win_id) - tab_to_focus = None -- for i, tab in enumerate(win['tabs']): -- new_tab = tabbed_browser.tabopen(background=False) -- self._load_tab(new_tab, tab) -- if tab.get('active', False): -- tab_to_focus = i -- if new_tab.data.pinned: -- new_tab.set_pinned(True) -+ -+ # plain_tabs is used in case the saved session contains a tree and -+ # tree-tabs is not enabled, or if the saved session contains normal -+ # tabs -+ plain_tabs = win.get('tabs', None) -+ if win.get('tree'): -+ if tabbed_browser.is_treetabbedbrowser: -+ tree_data = win.get('tree') -+ tab_to_focus = self._load_tree(tabbed_browser, tree_data) -+ tabbed_browser.widget.tree_tab_update() -+ else: -+ tree = win.get('tree') -+ plain_tabs = [tree[i]['tab'] for i in tree if -+ tree[i]['tab']] -+ if plain_tabs: -+ for i, tab in enumerate(plain_tabs): -+ new_tab = tabbed_browser.tabopen(background=False) -+ self._load_tab(new_tab, tab) -+ if tab.get('active', False): -+ tab_to_focus = i -+ if new_tab.data.pinned: -+ new_tab.set_pinned(True) -+ - if tab_to_focus is not None: - tabbed_browser.widget.setCurrentIndex(tab_to_focus) -+ - if win.get('active', False): - QTimer.singleShot(0, tabbed_browser.widget.activateWindow) - -diff --git a/qutebrowser/resources.py b/qutebrowser/resources.py -deleted file mode 100644 -index ebe256809..000000000 ---- a/qutebrowser/resources.py -+++ /dev/null -@@ -1,5474 +0,0 @@ --# -*- coding: utf-8 -*- -- --# Resource object code --# --# Created by: The Resource Compiler for PyQt5 (Qt v5.6.0) --# --# WARNING! All changes made in this file will be lost! -- --from PyQt5 import QtCore -- --qt_resource_data = b"\ --\x00\x00\x22\xfe\ --\x89\ --\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ --\x00\x00\x80\x00\x00\x00\x80\x08\x06\x00\x00\x00\xc3\x3e\x61\xcb\ --\x00\x00\x00\x04\x73\x42\x49\x54\x08\x08\x08\x08\x7c\x08\x64\x88\ --\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0d\xd7\x00\x00\x0d\xd7\ --\x01\x42\x28\x9b\x78\x00\x00\x00\x19\x74\x45\x58\x74\x53\x6f\x66\ --\x74\x77\x61\x72\x65\x00\x77\x77\x77\x2e\x69\x6e\x6b\x73\x63\x61\ --\x70\x65\x2e\x6f\x72\x67\x9b\xee\x3c\x1a\x00\x00\x20\x00\x49\x44\ --\x41\x54\x78\x9c\xed\x9d\x77\x7c\x5c\xd5\x95\xf8\xbf\xf7\xcd\x8c\ --\xa4\x51\xef\xdd\x72\xaf\x72\x93\x3b\xc6\x18\x1b\xdb\x31\xc5\x10\ --\x4c\xc0\x21\x64\x03\x84\xb0\xc9\x26\x6c\xd8\x90\x6c\x60\x7f\xd9\ --\x7c\x36\x24\xd9\x92\xfc\xb2\x69\x64\x61\x37\xc1\xa1\x98\xc0\x62\ --\x02\x36\x60\x83\x0d\xb8\x60\x83\xbb\x2d\xc9\xd8\x72\xc1\x45\xb6\ --\xac\x66\xd5\x51\x9d\xd1\x94\x77\xf6\x8f\xc1\x46\xb2\x66\x34\x33\ --\x7a\x33\x92\x9c\xf0\xfd\x7c\xfc\xb1\xf4\xde\xbb\x45\x73\xcf\xdc\ --\x7b\xde\xb9\xe7\x9c\xab\xf8\x0b\x43\x44\xd4\x8b\x1f\x31\x17\x97\ --\xbe\xc8\xa9\x33\xc5\xa9\xab\x31\x5d\xba\xca\xd5\x3d\x12\xef\x11\ --\x15\xed\x11\x2c\xba\x07\xcd\x03\xca\xe5\x41\x69\x80\xc9\x84\x98\ --\x35\x11\x4d\xa1\x6b\x0a\x97\xd5\xac\xda\xe6\x14\xc8\x4e\x93\x26\ --\x15\x08\xe7\x94\xc8\x59\xb7\xc5\x74\x7c\x56\x26\xe5\x4a\x29\x19\ --\xec\xbf\x31\x9c\xa8\xc1\xee\x80\x51\x36\x1e\x91\x89\x8d\x5d\xfa\ --\x7d\x0e\x8f\x5a\xd2\xde\xc5\xf8\x0e\xa7\x8a\x77\xeb\xc6\xff\xae\ --\x09\x19\xc2\x84\xcc\x9e\x63\x2d\xd0\xa6\x90\x23\x22\xea\x80\x86\ --\xec\x12\xdd\xb4\x6b\x46\x81\xaa\x36\xda\xd6\x60\x72\xd5\x09\xc0\ --\x9a\xc3\x12\x87\x47\xff\x76\x47\x97\x76\x77\x7b\x17\x13\xda\x5d\ --\x44\x4b\x84\xbe\x93\x37\x8c\xd1\x49\x8c\xee\xfb\x19\x81\x93\x9a\ --\xb0\x49\xd7\xf4\xcd\x89\x1d\xe6\xf7\xc7\x8e\x55\x5d\x91\xe9\x4d\ --\x64\xb8\x2a\x04\xe0\x95\xdd\x62\x75\x44\xeb\xdf\x6d\x77\x69\xf7\ --\x36\x77\x32\xb6\xcb\x1d\xf9\x7e\x47\x9b\x61\xd9\x58\x1d\xb3\x16\ --\x42\x21\x45\x0b\xf0\x86\xd2\xe5\x15\x4f\xad\xe9\xdd\x59\xb3\x94\ --\x2b\x52\xfd\x0b\x17\x43\x5a\x00\xb6\x9c\x95\xa9\x95\xcd\xf2\xcb\ --\x4a\x9b\xba\xc1\xe9\x21\x94\xa1\x30\xcc\xac\x7c\x21\x3f\xc9\xd0\ --\xd4\x72\x11\x58\xab\x69\xda\x1f\xa6\xe7\xa8\xb2\x30\x75\x2b\xec\ --\x0c\x39\x01\x78\xfc\x71\xd1\x72\x6f\xe4\xb1\x96\x2e\x1e\x6d\xef\ --\x22\x79\x20\x34\x2e\x93\x82\x11\xa9\xc2\xc8\x54\xa1\xa4\x5a\xc3\ --\x66\x87\xcf\x8d\xd5\x89\x36\x87\xab\x05\xd9\x25\xf0\xf3\x19\xb9\ --\xa6\x8d\x43\x4d\x89\x1c\x32\x02\xf0\x78\x99\x44\xe5\x74\xf0\x0b\ --\x5b\x27\x5f\xef\x70\x12\x13\x8e\x3a\x2d\x1a\xc4\x45\x83\x08\xb4\ --\x3b\xc1\xa3\x43\x42\x34\x98\xba\xcd\x25\x69\xb1\xc2\xa8\x34\x21\ --\xd6\x02\x27\xeb\x14\x27\x1b\x14\xf3\x0a\x84\xac\xf8\x88\x8c\x53\ --\xb1\x42\x7e\x32\x3d\xd7\xf4\xe6\x50\x11\x84\xc1\x17\x00\x11\xf5\ --\x3f\x7b\xf5\xff\x6c\xb2\xab\xbf\x77\xb8\x55\x54\xb8\xaa\xcd\x49\ --\x14\x66\xe5\xc9\xe5\xc1\x6e\xeb\x82\x03\x95\x1a\xf3\x86\xe9\xc4\ --\x5e\xd1\x8a\x08\x1c\xae\x55\x9c\x6b\xf2\x7e\x1c\x63\xd3\x84\xac\ --\x04\x21\x35\x16\xb4\x88\x7c\x42\x72\x50\x94\xfc\x70\x66\xae\xe5\ --\x9d\x48\xd4\x1e\x0a\x83\x2a\x00\xcf\xee\x97\x3b\x1a\xec\xac\x6e\ --\xeb\x22\x25\xdc\x75\x27\xc6\x40\x7c\x94\x20\xc0\xc4\x0c\x21\x31\ --\x06\x6a\x5a\x15\x26\x0d\x32\xbb\x7d\xbb\x05\x28\xa9\x52\x54\xd8\ --\x7a\x7f\x14\x23\x53\x84\x69\xb9\x91\xfc\xa2\xaa\x2d\x26\x93\x7a\ --\x64\x5a\xb6\x3a\x1a\xc1\x46\xfa\xee\xc1\x60\x34\xfa\xdb\x0f\xa5\ --\x40\x53\xb2\xb1\xa1\x53\x4d\x89\xd4\x2b\xdc\x25\xac\x16\x58\x34\ --\xca\xff\x7a\x7e\xa2\x5e\x71\xa2\xce\xf7\xc7\x30\x31\x53\x18\x9f\ --\x11\xe1\x0e\x2a\x5c\x4a\xf8\xb5\x5d\xd7\x1e\x9f\x3f\x4c\xd9\x23\ --\xdb\x58\x6f\x06\x54\xb3\x06\x28\xae\x72\x2d\xf5\x08\x27\xeb\x3b\ --\x22\x3f\xf8\x26\x05\xd7\x0c\xf7\x3f\xf8\x3a\xde\xe9\x3f\x3f\x49\ --\xc8\x49\x14\xaf\x7e\xd0\x4d\x16\xba\xdc\x91\xed\x1f\x00\x82\x45\ --\xe0\xd1\x18\x4d\xff\xe8\x50\xa5\xeb\x86\x01\x68\xb1\x07\x61\xd3\ --\x73\x03\xb1\xbd\x5c\x62\x92\xa2\xf4\xc7\x75\xe1\xfb\x6a\x80\x04\ --\x2f\x39\x96\x3e\x0d\x39\x1a\xde\x6f\xf9\xa7\x78\x97\x0c\x9b\x1d\ --\x8a\xab\xb4\x1e\xca\xe2\x00\x30\x46\x29\x6d\x4b\x49\xa5\xe7\x69\ --\x8f\xa6\x3d\x32\x2b\x57\x75\x0e\x44\xa3\x03\xb2\x04\xbc\x50\x2c\ --\xb7\x35\x77\xca\x8b\x0e\x8f\x8a\xb7\x3b\xc1\x23\x5e\xe5\x4a\x8f\ --\xf0\x0c\x60\x36\xc1\x92\xd1\x9f\xcc\x00\x0a\x3a\x9d\xb0\xaf\x42\ --\x63\x6a\x8e\x90\x11\x37\x24\x94\x70\xdf\x28\x8e\x68\x4a\xfb\xd2\ --\x40\xd8\x0f\x22\x2e\x00\xff\x7b\x58\xfe\x4d\x53\xf2\x8f\x29\x56\ --\x89\x2a\x6f\x52\x54\xb5\x28\xa6\x64\x7b\x5f\xbd\x5a\xed\xd0\xee\ --\x52\x34\x77\xc2\xe9\xc6\xc8\x74\xc5\xa2\x81\x28\x88\xb7\x40\xa7\ --\x0b\x32\xe2\x84\xe9\xb9\x82\xc5\x14\x91\xe6\xc2\x89\x5d\x89\x7c\ --\xb3\x28\xdf\xfc\x7c\x24\x1b\x89\xd8\x12\xf0\xc4\x29\x89\xb6\x34\ --\xb2\x2b\x25\x46\x66\x26\xc5\x08\xc7\x2e\x2a\xaa\x5b\xbd\x83\x2c\ --\x78\x25\x2f\xd1\x0a\x66\x93\x60\x56\x8a\xd3\x8d\xc6\xda\x53\x40\ --\x6a\x1c\xa4\xc6\x08\xe7\x6d\x0a\xa7\xc7\x7b\xdd\xa3\x43\x6a\xac\ --\x90\x99\x00\x79\x89\x42\x5c\xd8\x5e\x34\x23\x8e\x55\x94\x7a\xae\ --\xb8\xda\x33\xa5\x28\x47\x7b\x54\x29\xa5\x47\xa2\x91\x88\x7c\xed\ --\x9e\xfa\x40\x52\xba\x90\xb2\x9c\x44\x72\x86\x27\x0b\x3b\xce\x6a\ --\x74\x76\xb3\x8a\x5f\xda\x64\x29\xab\x55\x9c\x32\xf8\xcd\x8f\x36\ --\x7b\x07\x76\x44\x8a\xf7\x55\xef\x50\x95\xe2\x82\x4d\x91\x1e\x07\ --\xa3\x52\x85\xcc\x38\xc1\x1c\xe1\x6f\xbb\xae\x0b\x95\xb5\xf5\x14\ --\xe4\x66\x46\xa4\x7e\x85\x5a\x6f\x73\xaa\x7b\x16\x8f\x54\x8e\xf0\ --\xd7\x1d\x66\x9e\xde\x27\x23\x6d\x76\x4a\xd2\xe3\x24\x69\x5a\xae\ --\x50\x52\xa5\x38\x7f\xc5\x3b\x76\x51\xae\x60\xb5\xc0\x9e\xf3\x8a\ --\x4b\x2b\x71\x76\xbc\x30\x2e\x53\x88\x36\x43\x79\xa3\x0a\xb8\x24\ --\xe4\x26\x7a\x97\x91\x34\x2b\xa8\x6e\x8f\x96\x5d\x54\x24\x44\xc3\ --\xb0\x64\x19\x10\x05\xe7\xe3\xb3\x95\xfc\x6a\xf5\x6b\x4c\x1a\x5b\ --\xc0\xc3\x5f\x5d\x19\xb1\x76\x44\xa9\xed\xae\x68\x75\xfb\xbc\x34\ --\xd5\x1a\xce\x7a\xc3\xba\x04\x3c\xbb\x5f\x66\x5f\x6c\xe7\x03\xb7\ --\x10\x5d\x98\x25\xb8\x75\xa8\x6c\xe9\x3d\x0c\xa5\x35\x9f\x2e\x05\ --\x97\xa8\x6d\x57\x34\x74\x2a\x34\xc5\xe5\xe9\xdb\x1f\x33\xf3\x84\ --\x61\xdd\x76\x09\x3a\x3a\xed\xe8\x22\xb4\xb5\xdb\x49\x46\x70\xb7\ --\x7b\xa8\x75\x5a\x88\x8f\x8b\x21\x3a\x3a\x8a\x28\x73\xf8\x57\xba\ --\xd6\xb6\x0e\xfe\xe7\xa5\xb7\xd8\xb8\x75\x2f\xba\x2e\x4c\x1a\x5b\ --\x10\xf6\x36\xba\xa3\x44\x16\x47\x39\x64\xdb\xe1\x5a\xb9\x79\x5a\ --\xb6\xaa\x0b\x57\xbd\x61\xfb\x64\x5e\x3a\x28\x0b\xce\xb7\xca\x76\ --\xbb\x5b\x99\xf3\x92\xbc\x26\xd8\xe2\x6a\x85\xa7\xdb\x28\x9b\x14\ --\xa4\xc7\x0b\xf1\x51\x90\x1e\xeb\x1d\xe8\x23\xb5\x0a\xf7\x27\xab\ --\x9b\xfb\x8a\x55\x4e\x44\xc7\xd6\xdc\x44\x53\x7d\x2d\x4d\xf5\x17\ --\x69\x6a\xaa\xc7\xde\xd6\xc2\xfa\x2e\x1b\xcd\x2d\x6d\xb4\xb4\x75\ --\xe0\xf1\x04\x5e\x1a\x35\x4d\x11\x67\xb5\x92\x10\x6f\x25\x3b\x23\ --\x95\x9c\xcc\x54\xee\xbe\x75\x11\x23\x87\x65\x87\xfc\x77\xea\xba\ --\xf0\xe6\x96\x3d\xfc\xe1\xa5\xb7\x68\x6d\x1f\x90\x37\xb5\xee\xcc\ --\xf4\x78\xf4\x0f\x4b\x6a\xe4\x73\x45\x39\xea\x5c\x38\x2a\x0c\x8b\ --\x00\xac\x2e\x95\xa2\xf3\xcd\x6c\xb3\xbb\x95\x19\xa0\xae\x4d\xb1\ --\xfd\xac\xa2\xf5\x8a\x15\x2b\x3e\x06\x26\x65\x08\x2d\x5d\x8a\x33\ --\x4d\xd0\xd8\xa9\xe8\x6e\x0c\x72\xd8\x3b\xa9\x3c\x7f\x86\xea\xca\ --\x73\xd4\x5c\x38\x47\x6d\x75\x05\x2e\xa7\xd3\x70\xff\x74\x5d\x68\ --\xeb\xe8\xa4\xad\xa3\x93\xea\x8b\x5e\x6d\xf3\xda\x59\x93\x43\x16\ --\x80\xb2\x53\xe7\xf8\xe5\xd3\xaf\xf1\xf1\xd9\x4a\xc3\x7d\x32\xc0\ --\x58\x11\x7d\xcb\xfe\x3a\x59\x30\x27\x53\xd5\x1a\xad\xcc\xb0\x00\ --\x3c\x75\x40\xc6\xd7\x35\xc9\x5e\x87\x5b\x59\x2e\x5d\x73\xe9\xe0\ --\xf2\xa1\xae\xb4\xd8\x61\xfb\xd9\x9e\xd6\x95\xa6\x86\x8b\x9c\x39\ --\x79\x94\xb3\x27\xcb\xa8\xba\x50\x8e\xae\x47\x44\xd9\x35\x44\x73\ --\x4b\x1b\xff\xfd\xa7\x8d\x6c\x7a\xff\x00\x12\x69\xf3\x65\x30\x08\ --\xa3\xcd\x2e\xfd\x9d\x92\x72\xb9\xbe\x68\xa4\xb2\x19\xa9\xca\x90\ --\x00\xac\xde\x2d\xa9\x4d\x76\xf6\x87\xba\x8b\xe7\xec\x72\x70\xe2\ --\x68\x31\x65\xa5\x07\xa8\xaa\x38\x6b\xa4\x0b\x11\x45\xd7\x85\x77\ --\x3f\x38\xc4\xef\x9e\x7f\x9d\x96\xd6\x8e\xc1\xee\xce\x95\x4c\xd5\ --\xa3\x65\xdd\xa9\x53\x72\x93\x11\x37\xb4\x7e\x0b\xc0\xef\x0f\x8a\ --\xa5\xdd\x2e\x47\xda\x1d\x2a\x31\xd8\x32\xcd\x4d\x0d\xec\xdb\xf9\ --\x2e\x27\x8e\x16\xe3\x76\x0d\x6d\x6f\xa9\x8f\x8e\x9f\xe5\x57\xab\ --\xd7\x71\xfa\x7c\xd5\x60\x77\xc5\x2f\x4a\x64\x71\x6b\x2c\x2f\xbf\ --\x22\x72\xe7\x2a\xa5\x02\xa8\xce\xbe\xe9\xb7\x00\x78\xba\xe4\x40\ --\x93\x5d\xe5\x06\xf3\x6c\x8b\xad\x89\x7d\x3b\xdf\xe3\x68\xc9\xde\ --\x21\x39\xc5\x77\xa7\xa9\xb9\x95\x27\xff\xb4\x81\x77\x77\x1e\x1a\ --\x1a\xd3\x7d\x00\x14\x72\x7b\xeb\x01\xb6\x01\xd7\xf7\xa7\x7c\xbf\ --\x04\x60\xf5\x7e\xcf\x53\x15\x36\x35\x2d\xd0\x73\x2e\x97\x93\x5d\ --\xdb\xde\xa6\x78\xef\x8e\x21\x3f\xf0\x6e\x8f\x87\xd7\x36\x7d\xc8\ --\x1f\x5f\xd9\x4c\x67\x67\xd8\xed\x2d\x91\x45\x58\xf8\xcc\x41\xcf\ --\xbf\x3f\x30\xcb\xf4\x83\x50\x8b\x86\x2c\x00\x2f\x95\xc8\xed\xa7\ --\x1b\xe4\x9b\x81\x9e\x3b\x7f\xe6\x24\xef\x6d\x58\x8b\xad\xd9\xa0\ --\x8d\x77\x00\xb8\x50\x53\xcf\x0f\xfe\xff\x33\x94\x5f\x30\xac\x54\ --\x0f\x0a\x49\x56\x38\x51\xa7\xfd\xd3\x73\x25\xf2\xd6\xfd\x45\x6a\ --\x57\x28\x65\x43\x12\x80\xff\xda\x27\x69\x17\x6c\xf2\xb2\x5b\xfc\ --\xdb\xd8\x74\x8f\x87\x6d\x9b\xd7\x51\x7a\x60\x17\x5c\x05\x53\x28\ --\x40\xf9\x85\x8b\x57\xed\xe0\x03\x64\x27\x0a\x4e\x0f\x2a\xd9\x2a\ --\xab\x0f\x1e\x94\xa9\xa1\xb8\xa3\x87\x24\x00\xca\x23\xdb\x3b\x5c\ --\xca\xef\x0e\xbb\xa3\xb3\x83\x37\xd6\x3e\xcb\x85\x73\xa7\x42\xa9\ --\xf6\x33\x0c\x12\x67\xb9\xec\xd7\x30\x81\x04\xfd\xa7\xc0\x3f\x05\ --\x5b\x36\x68\x97\x87\xe7\x8b\x3d\xdf\xad\xeb\x50\x53\xfc\xdd\x6f\ --\xac\xaf\xe5\x4f\x7f\xf8\xe5\x67\x83\x3f\xf8\x3c\xba\xe5\x63\x59\ --\x11\xec\xc3\x41\x09\xc0\x4b\x07\x25\xbd\xa6\x55\xfb\x99\xbf\x19\ --\xbd\xb9\xb1\x9e\xb5\xcf\xfd\xd7\x55\xb1\xde\xff\xa5\xe3\xf2\xa0\ --\x0e\xd7\xf2\xca\x1f\x3f\x94\x84\x60\x9e\x0f\x4a\x00\x5a\xdc\xb2\ --\xa9\xd3\x89\xc5\xd7\xbd\xb6\x56\x1b\x7f\x5e\xf3\x14\x9d\xed\x6d\ --\xa1\xf4\xf3\x33\x22\xc4\xb1\x3a\x45\x8b\x03\xab\xd3\xc4\x6b\xc1\ --\x3c\x1f\x50\x00\x5e\x2c\x95\xe5\x17\xdb\xd4\x2c\x5f\xf7\xec\x9d\ --\xed\xbc\xf2\xdc\x93\xb4\xda\x9a\x42\xed\xe7\x67\x84\x19\x9b\x03\ --\xf6\x55\x28\xca\x3f\x89\x6d\xb8\xd8\xce\xb2\x67\x8a\x25\xa0\x6d\ --\x20\xa0\x12\xd8\xd8\x2e\x6b\x74\x1f\x5a\xbf\x88\xce\x9b\xaf\x3c\ --\x4b\x73\x63\xd8\x76\x26\x03\x92\x92\x94\x80\x35\x26\x8a\x96\xb6\ --\x4e\x3a\x3a\x07\xdc\x83\x7a\x48\x22\x02\xa5\xd5\xbd\x7d\x2e\x74\ --\x01\x5b\x3b\x2f\x03\x39\x7d\x95\xef\x53\x00\x9e\x2b\xf1\xfc\xbf\ --\xb3\xf5\xca\xa7\x9b\xcb\x9e\x1d\xef\x70\xa1\xfc\x74\xa8\xfd\x0d\ --\x9a\x28\x8b\x85\x59\x53\xc7\x32\xaf\x68\x22\x85\x63\x87\x33\x72\ --\x78\xce\xe5\x7d\xfd\x27\x9e\x5d\xcf\x2b\x6f\xed\x8c\x58\xdb\x57\ --\x13\x67\x9a\x7a\x0f\xfe\x25\x6c\x0e\xb2\xd7\x1c\x92\x47\xee\x9d\ --\xa9\x7e\xed\xaf\xbc\x5f\x01\x10\x11\xf5\xcb\x9d\xf2\xcf\xbe\xee\ --\xd5\xd7\x56\xb3\x77\xe7\x7b\x21\x77\x36\x18\x72\xb3\xd2\xb8\xfb\ --\xd6\x45\x2c\xbb\x6e\x06\x09\x71\xb1\x11\x69\xe3\x2f\x05\xa7\xc7\ --\x1b\xd8\xd2\x17\xf5\x1d\xf2\x63\x20\x74\x01\x78\xa1\x44\x7f\xbc\ --\xb5\x4b\x8b\xeb\x75\x43\x84\x77\x37\xbc\x8c\xee\xe9\xd7\xde\x83\ --\x5f\x92\x12\xe3\xf8\xc6\x3d\x2b\xb8\x65\xf1\x1c\x4c\x03\xec\x90\ --\x7f\xb5\x52\xde\xa4\x70\x07\x18\x86\x16\x87\x4a\x78\x7a\x9f\x7c\ --\xff\x6f\xe7\xaa\x5f\xf8\xba\xef\x57\x00\x1a\xda\xd5\xf7\x7c\x5d\ --\xff\xb8\xac\x98\x9a\xca\xf3\xa1\xf4\x33\x20\x4b\xae\x9d\xce\xf7\ --\x1e\xbc\x93\xc4\x84\xde\xf2\xf6\x19\xfe\xb1\x07\x69\xef\x6b\x76\ --\xf0\x43\xc0\xa7\x00\xf8\xfc\xaa\xbd\x75\xd4\xfd\x25\xab\x85\xb8\ --\x2b\x5d\xa8\x93\xa2\x75\x0e\xec\x78\x2b\xa4\x4e\xf6\x85\xa6\x69\ --\x3c\xfc\xd5\x95\xfc\xf8\x91\xfb\x3e\x1b\xfc\x10\xd1\x05\x9a\xec\ --\xc1\xb9\xbd\xb6\x77\x91\xf8\xdc\x01\xf9\xba\xaf\x7b\x3e\x67\x80\ --\x9c\x14\xed\xde\x9c\x14\x01\x84\x56\x07\xd4\xb4\x29\xa2\x4c\x70\ --\xaa\xac\x98\x9a\xba\xf0\x18\x7b\x2c\x66\x13\xff\xf2\x9d\xaf\xb0\ --\x78\x5e\xc0\x4d\xc5\xcf\xb8\x02\x11\x28\xad\xea\xed\x72\xd7\x17\ --\xad\x5d\xfc\x08\xf8\xc3\x95\xd7\x7b\xcd\x00\x25\x17\x64\x2c\xc8\ --\xf2\x4b\xbf\x27\xc6\xc0\xf8\x0c\x6f\xf6\x8c\x57\xc3\xa4\x79\x6b\ --\x9a\xe2\xc7\xdf\xbd\xff\xb3\xc1\xef\x07\xad\x0e\xd8\x75\x5e\xa3\ --\xc2\x87\xb7\x75\x5f\x34\xda\xc9\x7d\xb1\x58\x16\x5e\x79\xbd\xf7\ --\x0c\xa0\xe9\x0f\xe2\x23\x5e\xe0\x6c\x45\x0d\xc7\x4e\x87\x67\xed\ --\xff\xd6\x57\x6e\x63\xe1\x9c\xc9\x61\xa9\xeb\xaf\x85\xa6\x4e\xaf\ --\xc6\x5f\xdf\xa1\xfa\xb5\xc9\x2a\x02\xad\x4e\x7e\x06\xcc\xef\x7e\ --\xbd\x87\x00\x1c\x3c\x28\x16\x41\xbf\xd7\x57\x05\x9b\xde\x3f\x10\ --\x7a\xab\x3e\x98\x3f\x73\x12\x77\xdf\xba\x28\x2c\x75\x0d\x15\xd2\ --\x92\x13\x99\x57\x34\x29\xa4\x32\x9d\x8e\x2e\x6c\x2d\xed\xb4\x77\ --\xd8\x69\x6d\xef\xc4\x6a\x8d\x22\x3a\xca\x42\x7c\xac\x95\xcc\xb4\ --\x64\x34\xed\xd3\xc9\xd9\xe1\x86\xbd\x15\x5a\xc0\x78\x89\x40\x34\ --\x75\xc8\xdc\xb7\xdf\x96\xe8\x9b\x6f\xfe\xd4\x87\xb0\x87\x00\xa8\ --\x1c\xcf\x8d\xa0\x7c\xfa\x4a\xef\xdc\x77\xc4\x58\xeb\x40\x42\x5c\ --\x2c\x8f\xfe\xdd\x2a\xc3\xf5\x0c\x15\xcc\x26\x13\x77\xde\x7c\x1d\ --\x0f\xdc\xb5\x9c\xd8\x58\xff\x69\x8d\xda\x3a\x3a\x29\x3d\x76\x96\ --\xd2\xb2\xd3\x9c\xa9\xa8\xa1\xbc\xa2\x96\x46\x9b\xff\x00\x9f\xe8\ --\x28\x0b\xa3\x0b\x72\x19\x33\x32\x97\x59\xd3\x26\xa1\xa7\x14\x1a\ --\x1e\x7c\x80\x2e\x8f\xd2\xea\x33\xf5\xef\x00\x3f\xbf\xfc\x37\x74\ --\x7f\x40\x13\xb5\xca\x97\xaf\x47\x45\xd5\x45\xaa\x2e\x36\x18\xee\ --\xc0\x7d\x77\x2e\x23\x3d\x25\xc9\x70\x3d\x43\x81\x19\x85\x63\x78\ --\xe4\xc1\x2f\xf8\x8d\x2d\xa8\x6f\x6a\x61\xfb\xee\x52\xb6\xed\x2e\ --\xe5\xd8\xe9\xf3\xe8\x21\xc4\xc2\x77\x39\x5d\x1c\x3b\x7d\x9e\x63\ --\xa7\xcf\xf3\xe6\x7b\x7b\x88\xb1\xc6\x32\xbe\xb0\x88\x19\x73\x17\ --\x92\x96\x19\x7a\x30\x4b\x77\xda\x5d\xda\x03\xf8\x12\x80\xed\xe5\ --\x12\x23\x4a\xbf\xcd\x57\xa1\xfd\x87\x3f\x36\xd4\x28\x78\xa7\xc9\ --\x95\xcb\xaf\x35\x5c\xcf\x60\x93\x99\x96\xcc\x43\xf7\x7e\x9e\x25\ --\xd7\x4e\xf7\x79\xbf\xf8\xe8\x29\xfe\xfc\xd6\x4e\x76\x1d\x3a\x16\ --\x36\x3f\x48\x87\xbd\x93\xc3\x07\x77\xf1\xd1\xa1\x3d\x14\x4e\x9f\ --\xc3\xa2\xe5\x9f\x27\xc6\xda\x3f\x2b\x69\x73\x27\x63\x5f\xd9\x2e\ --\xf1\xab\x16\xab\x76\xe8\x26\x00\x89\xd1\xee\x45\x88\xe6\xd3\xc5\ --\xbb\xec\xe3\x73\xfd\x6a\xac\x3b\x77\xdd\xb2\x90\xe8\x28\x9f\x3b\ --\xca\x57\x05\x16\xb3\x89\x55\x2b\x16\x71\xdf\x9d\xcb\x88\x8d\xe9\ --\xed\x14\x75\xfc\x74\x05\x4f\xbd\xb0\x81\x92\xb2\xc8\xed\x8f\x88\ --\xe8\x1c\x2d\xd9\x4b\xf9\xe9\x63\xac\xb8\xf3\x5e\x86\x8d\x18\x1b\ --\x72\x1d\x4e\x0f\xaa\x23\x5e\x7f\x88\x4f\x66\x81\xcb\x02\xa0\x44\ --\xbb\xc9\x5f\xa1\xb2\x53\xc6\xb4\x7f\x93\x49\xe3\xc6\x45\x3e\x77\ --\x94\xaf\x0a\x66\x4f\x1b\xc7\x23\x5f\xfb\x82\xcf\xf0\xef\x96\xd6\ --\x0e\x7e\xff\xd2\x46\x36\x6e\xdb\x17\xd2\x34\x6f\x84\x8e\xb6\x56\ --\xfe\xfc\xfc\x53\x2c\x5d\xb1\x8a\xa9\x33\xaf\x09\xb9\xbc\x03\xed\ --\x0b\x5c\x29\x00\x80\x4f\x01\xe8\x74\x74\x51\x53\x67\x6c\xbf\x7f\ --\xce\xd4\xf1\x57\xe5\xda\x9f\x95\x9e\xc2\xb7\xef\xbf\x9d\x45\xf3\ --\xa6\xf6\xba\xa7\xeb\x3a\xaf\xbf\xb7\x87\xd5\xff\xfb\xf6\x60\x04\ --\x89\xa2\xeb\x3a\xef\x6e\x58\x8b\xee\xf1\x30\x7d\xce\x82\x90\xca\ --\xb6\x3b\xe4\xb2\x6b\x9f\x19\xa0\xf4\x82\xe4\xe9\xe8\x3e\xe7\x93\ --\xca\xea\x7a\xc3\x01\x12\x73\x8b\x26\x1a\x2a\x3f\xd0\x98\x4d\x26\ --\x56\x2e\xbf\x96\xbf\xbd\xe7\x66\xbf\xd3\xfd\xaf\x57\xaf\x0b\x9b\ --\x5d\xa4\xdf\x88\xb0\xf5\xed\x57\x49\x48\x4a\x66\xf4\xf8\xe0\xed\ --\x2a\xed\x4e\x15\xf3\x52\xa9\x14\xde\x33\x5d\x95\x99\x01\x3c\x9a\ --\x67\x81\xf2\x93\x4e\xe1\x42\x8d\x71\xed\x7f\xe6\x94\xd0\xd7\xaa\ --\xc1\xe2\x9a\xa2\x89\xfc\xc3\xd7\xee\x20\x3f\x3b\xbd\xd7\xbd\xa6\ --\xe6\x56\x9e\xfa\xd3\x06\xde\x19\x42\x51\x43\x22\xc2\x5b\xeb\xfe\ --\xc4\xfd\xdf\x7a\x8c\xc4\xa4\xe0\xf2\x6d\x8a\x80\xc3\xcd\x57\x81\ --\x7f\x34\x03\x28\xd4\x7c\x5f\x0f\x7a\x04\x4e\x56\xb5\x18\xea\x60\ --\x62\x7c\x2c\x23\xf2\xb3\x0c\xd5\x31\x10\xe4\x66\xa5\xf1\xf0\xfd\ --\x2b\x59\x30\xbb\xb0\xd7\xbd\xa1\x1e\x35\xe4\x74\xd8\xd9\xbc\xfe\ --\x25\x56\xdd\xf7\xad\x9e\xe9\x52\xfa\xa0\xcb\x25\x8b\xe0\xb2\x0e\ --\x20\xb3\x7d\x65\x8b\xd9\x57\xa1\x38\x5d\xd3\x6e\xa8\x73\x05\xb9\ --\x99\xa8\x20\x3b\x35\x58\x4c\x1e\x37\x9c\x17\x7e\xfd\x98\xcf\xb7\ --\x94\xe2\xb2\xd3\xfc\x7a\xf5\x6b\x43\x3e\x70\xa4\xa2\xfc\x63\x4e\ --\x96\x95\x32\x7e\x72\x51\x50\xcf\x3b\xdc\x6a\x34\x80\x59\x44\xb4\ --\x92\x6a\xbd\x97\xbf\x7f\x6d\xbb\xa2\xae\x5d\x61\xef\x34\x16\x16\ --\x9d\x9f\xd3\x7b\x2a\x1d\x6a\xa4\x26\xf7\xf6\xa0\xae\x6b\xb4\xf1\ --\xe4\x9a\x37\xd8\xba\xab\x74\x10\x7a\xd4\x3f\x3e\xd8\xb2\x81\xb1\ --\x13\xa7\xa2\x99\x02\x67\xc5\xea\x70\x92\x24\x22\xca\x5c\x5c\xc9\ --\x28\xa5\x11\xdf\xfd\xa6\x47\xf7\x66\xf0\x02\x0c\x87\x71\xe7\x66\ --\x0d\x7d\x01\xe8\x8e\xcb\xed\x61\xed\x86\xf7\x79\xfe\xb5\x77\xb1\ --\x3b\x8c\x67\x27\x19\x48\x6c\xcd\x8d\x9c\x2c\x2b\x61\xe2\xd4\xc0\ --\xaf\xdc\x4e\x0f\xea\xc5\x8f\x98\x6b\x46\xf3\x4c\x04\x45\x5b\x17\ --\xd8\xec\x8a\x76\x27\x54\xb7\x7a\x7f\x07\xd0\xdd\xc6\x12\xe6\xc6\ --\xf7\x61\x23\x1f\x2c\x8a\x0a\xc7\x30\x61\x54\x7e\xaf\xeb\xfb\x4b\ --\x4f\xf2\x9b\x67\xd6\x51\x51\x3d\x70\x9e\xce\xe1\xe6\xd0\x9e\x1d\ --\x41\x09\x00\x80\xcb\xa5\x2f\x33\x97\x56\xab\x7b\xaa\x5b\x34\x5c\ --\x7e\xac\x96\x1e\xdd\x98\x00\xc4\xf8\x78\x8d\x1a\x2c\xfc\x99\x71\ --\x6b\xea\x9a\xf8\xdd\x73\xeb\xd9\xb9\x7f\xd0\xb2\xb6\x87\x8d\xda\ --\xea\x0a\x1a\x2e\x56\x93\x9e\x15\x38\x75\x83\xee\x61\xa2\xd9\xad\ --\x6b\xa3\xfd\x0d\x3e\x80\xa6\x19\xcb\xb2\x68\x8d\x1e\xfc\xd4\x9c\ --\x51\x66\x33\x77\x7f\x7e\x11\x5f\x59\xb9\x0c\x6b\xcc\xa7\xfd\xe9\ --\x72\xba\x78\xf1\xf5\x6d\xbc\xf8\xfa\x56\xba\x9c\x91\xcb\x58\x12\ --\x17\x6b\x65\x46\xe1\x68\x46\x0f\xcf\x25\x2b\x3d\x85\xb8\x38\x2b\ --\x1d\x1d\x76\x6a\xea\x1b\x39\x72\xe2\x1c\x87\x8f\x9f\x09\xab\x15\ --\xf1\xf8\x91\x62\xae\x0b\x42\x00\x5c\xa2\x46\x9a\x9d\x6e\xc9\xee\ --\x2b\x5f\x64\xf7\x7d\xe9\xfe\x30\xd8\x89\x21\xe6\xcf\x9c\xc4\xc3\ --\x5f\x5d\xd9\xeb\xbd\xfe\xc3\x03\x65\x3c\xf1\xdc\xfa\xcb\x59\xc3\ --\xc2\x4d\x6c\x4c\x34\x8b\xae\x99\xc6\xe2\xf9\xd3\x99\x35\x65\x1c\ --\x96\x3e\xd2\x95\x56\x5f\x6c\xe4\xf7\x2f\x6d\x0c\x9b\xc2\x79\xea\ --\xf8\x47\x5c\xb7\x34\x70\x7c\xa8\x47\x57\xd9\xe6\xf4\x38\x1c\xcd\ --\x0e\xfc\xba\x17\x2b\x83\x33\x80\xbd\x6b\x70\x14\xa9\xfc\xec\x74\ --\x1e\x7e\x60\x25\xf3\x67\xf4\x74\xd4\xb8\x50\x53\xcf\x6f\x9f\x5d\ --\xcf\xde\xe2\xe3\x11\x69\x37\x36\x26\x9a\x95\x37\x2e\xe0\x4b\xb7\ --\x2d\x22\x39\x31\x3e\x70\x01\xbc\x36\x88\x1f\x3f\x72\x1f\xb3\xa7\ --\x4e\xe0\xe7\xbf\x5f\x8b\x18\x9c\x0d\x9a\x1a\x2e\xd2\xd6\x62\x23\ --\x21\x29\xb9\xcf\xe7\x9c\x3a\x49\xe6\xf1\x19\xe2\xcc\x4a\x10\x76\ --\x95\xfb\xd6\x03\x2c\x16\x63\x53\xb8\xdd\x31\xb0\xe7\x28\x5a\x63\ --\xa2\xb8\xf7\x8e\x65\x7c\xf1\xb6\x45\x3d\x32\x84\xda\x1d\x4e\xd6\ --\xac\x7b\x8f\xb5\x6f\xbe\x8f\xd3\xa0\x62\xeb\x0b\x4d\x53\xac\xb8\ --\x61\x2e\x5f\xbf\xe7\x96\xa0\x07\xfe\x4a\x96\x5e\x3f\x97\x92\x4a\ --\x37\xef\x6c\x78\xd5\x70\x7f\x2a\xce\x9e\xa4\xb0\x68\x6e\x9f\xcf\ --\x38\x3d\x58\xcd\x28\x52\x93\x63\x60\x6e\x81\xb0\xfb\xbc\xea\x95\ --\xc3\x3f\x26\xd6\x58\x74\x4e\x93\x6d\xe0\xa2\x86\x97\x5e\x5b\xc4\ --\xb7\xee\xbd\x8d\xcc\xb4\x9e\x92\xbf\x6d\xcf\x61\xfe\xeb\xf9\xd7\ --\xa9\x6b\x30\x94\x52\xcf\x2f\x93\xc6\x0c\xe7\x91\x07\xef\x60\xe2\ --\x18\x63\xe9\x62\x6b\x5b\x15\x53\x66\x2e\xe0\xd4\x89\x63\x9c\x3d\ --\x75\xcc\x50\x5d\x35\xd5\x15\x01\x05\x40\x74\xcc\x66\x20\x16\x20\ --\x3d\x4e\x58\x30\x52\x38\x5a\xab\xd1\x62\xe7\x72\x8a\x57\x6b\x3f\ --\x1d\x0f\x2e\x71\xa1\x26\xf2\xaf\x54\x05\x79\x59\x7c\xe7\x81\x95\ --\xcc\x99\x36\xbe\xc7\xf5\x8a\xea\x3a\x7e\xfb\xec\x7a\xf6\x95\x9c\ --\x88\x48\xbb\x89\xf1\xb1\xdc\x7f\xd7\x72\xee\xbc\x69\x81\x61\x5d\ --\x09\xbc\x87\x59\x29\xa5\xb1\xf8\xa6\x95\x94\x9f\x3e\x6e\x68\xbf\ --\xe1\x62\xf5\x85\x80\xcf\x78\x74\x34\x33\xc2\xe5\x39\x3e\xd5\x0a\ --\x0b\x47\xea\x78\xc4\x9b\xee\xb5\xb1\x13\xce\x25\xf7\x6f\x3a\xbb\ --\x44\x45\x55\xbd\xa1\xf2\x7d\x91\x10\x17\xcb\x83\x77\xdf\xc4\xed\ --\x9f\x9b\xdf\x23\x9c\xac\xb3\xd3\xc1\x33\x7f\x7e\x87\x57\xdf\xfe\ --\x00\x77\x98\x43\xd8\xc0\xab\x18\xaf\x5c\x3e\x9f\x07\xef\xbe\x29\ --\xac\xf1\x8b\xd6\x28\xef\x49\x2a\x29\x69\x99\x8c\x18\x33\x91\x72\ --\x03\xb3\x40\xc3\xc5\x1a\x44\xa4\x4f\x33\xbc\x0e\xca\x0c\xf4\x5a\ --\xe4\x4d\xca\x7b\xee\x5e\x4e\x22\xb8\x0a\x53\x30\xb2\x22\x5d\xa8\ --\xa9\xa7\xc9\xd6\xe6\xd3\xdc\xda\x6f\x94\xe2\xb6\xa5\xf3\x7a\xad\ --\xb7\x22\xc2\x7b\x1f\x14\xf3\xe4\x9a\x37\xfb\x74\xba\x34\xc2\xd4\ --\x89\xa3\xf8\xee\x83\x77\x30\x66\x78\x5e\x8f\xeb\x9d\x8e\x2e\x9f\ --\x5b\xc7\xa1\xa0\x8b\xf7\x20\x2b\x80\x09\x93\x8b\x0c\x09\x80\xcb\ --\xe5\xa4\xa3\xad\x95\xf8\x44\xff\x7e\x18\x1e\x8f\x57\x00\xfa\x24\ --\x27\x33\xb5\xdf\x9d\x00\xef\xa0\x1c\x38\x7c\x92\xe5\xd7\xfb\xb6\ --\x4e\x9d\x6b\x56\xd8\x5d\xde\x24\x47\x3a\xde\x17\xd2\x40\x5b\x47\ --\x0f\xde\x7d\x53\xaf\x0f\xfb\xf4\xf9\x2a\x7e\xb5\x7a\x1d\x1f\x1d\ --\x8f\x4c\xea\xd9\xb4\xe4\x44\x1e\xba\xf7\x36\x96\x5d\x37\xa3\xc7\ --\xb7\xca\xd6\xda\xce\x1f\x5e\x7a\x8b\x98\x98\x68\x1e\xbe\xff\x76\ --\x43\x6d\x98\x14\x8c\x4b\x17\x4e\xd6\x2b\x46\x8c\x9e\xe0\xdd\xd9\ --\x33\xb0\x0c\xd8\x6c\x0d\x7d\x0a\x00\x78\x77\x03\x9d\x80\xd5\xdf\ --\x03\x99\x69\xc9\x44\x99\xcd\x86\x34\xe7\xad\xbb\x4a\x7a\x08\x80\ --\xd3\x03\xcd\x9d\xde\x63\x62\xea\x3b\x14\xb3\xf3\x85\xd6\x2e\xaf\ --\xef\xbb\x49\x11\xf0\x50\xa7\xee\x83\xdf\xd6\xd1\xc9\xea\x97\x37\ --\xb1\xfe\x9d\xdd\x11\xb1\x39\xf8\x73\xfd\xf6\x78\x74\x5e\x7f\x77\ --\x37\xab\x5f\xde\x44\x5b\x47\x27\xab\x6e\xe9\x15\x74\xd3\x2f\x26\ --\x66\x0a\x9a\x82\x13\x24\x92\x9a\x96\x41\x53\x43\xff\x75\xa8\xd6\ --\xe6\x26\x28\x18\xed\xf7\xbe\xd9\x84\x98\x51\x38\x11\xff\x02\xa0\ --\x69\x1a\xa3\x86\xe7\x72\xe2\x4c\x45\xbf\x3b\xb2\xa7\xe4\x38\xe7\ --\x2e\xd4\x92\x9c\x9e\x4d\x71\xb5\xd6\x2b\xa6\xed\x70\x8d\xc2\xad\ --\x7f\xfa\x06\xb2\xfb\xbc\xa2\x30\x0b\xb2\x13\x04\xb7\x07\xe2\xa2\ --\xb8\x7c\xc8\x53\x5d\xbb\xa2\xc3\x05\xe9\xb1\x3a\xbb\xf6\x1e\xe2\ --\xc9\x35\x6f\xd2\xdc\x12\x99\x37\x8d\xa2\xc2\xd1\x3c\xf2\xb5\x2f\ --\x30\xaa\xa0\x67\x92\x8d\xd2\x63\x67\xf8\xf5\x1f\xd7\x71\xe6\x7c\ --\x75\x44\xda\x1d\x9f\x21\xc4\x46\xc1\x3a\x83\x02\xd0\xd9\xd1\xf7\ --\x56\xbe\x02\x31\x23\x74\x00\x7d\xce\x13\xe3\x46\xe5\x19\x12\x00\ --\x11\xe1\xc9\x17\x36\x70\xd3\xaa\x6f\xd0\x7a\x85\x59\x20\xca\x04\ --\xc9\x56\xa1\xae\x5d\x75\x7b\x1e\x8e\xd6\x2a\x8e\x7e\xb2\x23\x19\ --\x65\xc2\x7b\xca\x98\xc3\xbb\x51\x55\x5b\x55\xc1\xb6\xb7\x5f\xa5\ --\x3a\xcc\x61\xea\x97\xc8\x4c\x4f\xe6\xef\xef\xbb\x9d\x1b\xae\xe9\ --\x19\xbb\x58\xd7\x68\xe3\xa9\x35\x6f\xb2\x65\x57\x49\x44\xda\xed\ --\xce\xb0\x24\x61\xf2\xa8\x0c\xce\x9c\xec\x7f\x1d\x0e\x47\xdf\xbe\ --\x8a\x9a\x86\x6e\x16\xa1\x49\x29\xfa\x34\x1c\x4f\x1a\x33\x9c\x37\ --\xdf\xdb\xd3\xff\x9e\x00\x7b\x8a\x8f\x11\x97\xfb\x21\xd3\x67\xf7\ --\x74\x60\x8c\x36\x43\x8a\x15\xea\xfa\x10\x56\xa7\x07\x4e\xd4\x29\ --\xec\x9d\xed\x7c\xb0\x65\x23\x47\x8a\xf7\x46\xc4\x25\xcb\xdf\x9e\ --\x81\xd3\xed\x66\xed\x9b\xef\xb3\x66\xdd\x7b\x03\xba\x45\x9c\x97\ --\x6e\x4c\x71\x76\xd8\x03\x08\x80\xc2\x6d\x56\x9a\x34\xd0\x47\xea\ --\x57\x08\x9f\x4f\xdf\xd6\xb7\x5e\xc5\xa4\x99\x98\xd2\xcd\x95\xb9\ --\xad\x0b\x4e\x06\x48\x73\xd2\xd9\xd1\xc6\x81\x5d\xdb\x39\x7c\xe0\ --\x43\x9c\xce\xc8\x58\x16\xaf\x29\x9a\xc8\xc3\x0f\xac\x64\x58\x4e\ --\x46\x8f\xeb\xbb\x8b\x8f\xf1\xc4\x33\xeb\xa9\xac\x35\xee\x1b\x19\ --\x2a\x56\x83\x6f\x15\x81\x3e\x2b\xb3\x49\xec\x66\xd0\x1a\x7a\x1e\ --\xdf\xd4\x9b\x9c\xcc\x54\xf2\xb3\xd3\x0d\x7f\x08\x22\xc2\x3b\x6f\ --\xbe\xcc\xb9\x33\x27\x58\xb0\xf4\x56\x52\x52\xfd\x3b\x8b\x78\x3c\ --\x6e\xce\x9d\x3e\xc1\xc7\xc7\x0e\xf3\x71\x59\x29\x2e\x57\x64\xbe\ --\x79\xfe\x7c\x01\x2b\x6b\x1b\x78\xe2\xd9\xf5\xec\x3e\x64\xcc\x22\ --\x67\x04\xa3\x02\xa0\x07\xc8\x1f\x13\x63\x52\x2d\x66\x90\xa0\x16\ --\xf7\x85\x73\xa7\xf2\xd2\x1b\xdb\x0c\x75\xe8\x12\x27\xcb\x4a\x39\ --\x79\xec\x30\xf9\x05\x23\xc9\x1d\x36\x8a\xe4\xd4\x34\x2c\x51\xd1\ --\x74\x39\xec\xb4\xb5\xda\x68\xb8\x58\xc3\x85\x73\xa7\x71\x76\x45\ --\xce\x01\x33\x3a\xca\xc2\xdf\xac\x5c\xc2\x97\x6f\xbf\x81\x28\xcb\ --\xa7\xbe\x80\x76\x87\x93\x17\xd6\xbf\xc7\xcb\x6f\x44\x66\xcf\x20\ --\x14\x4c\x86\x77\x62\xfb\x16\x00\xb3\x46\x8d\x19\xe1\x5c\x30\x95\ --\x2d\x5d\x50\x14\x36\x01\x00\x40\x84\xca\xf3\x67\xa9\x3c\x3f\xf0\ --\x47\xc6\x2c\x9c\x3b\x85\x6f\xdf\x77\x7b\x2f\x1b\xc7\xd6\x5d\xa5\ --\x3c\xb9\xe6\x0d\xea\x1a\x23\xb3\x67\x10\x2a\x46\x37\xd2\x02\x0a\ --\x80\xd2\xcf\x99\x45\xa4\x3c\x18\xaf\xdd\x71\x23\xf3\x19\x37\x32\ --\x9f\x8f\xcb\x07\xf5\xc4\x2c\x43\x14\xe4\x66\xf2\x9d\x07\xee\x60\ --\xce\xf4\x9e\x7b\x06\x75\x0d\x36\x7e\xfa\xbb\x17\x23\x1a\xd7\xd7\ --\x1f\x3a\x0d\x0a\x80\xc9\xe4\xdf\xce\x17\x1f\x05\x09\xd1\xec\x36\ --\xeb\x16\xd3\x31\xd3\x95\x07\xf6\xf9\x61\xd5\x8a\xeb\xf9\xd7\xdf\ --\xbd\x68\xa8\x53\x83\x41\x54\x54\x34\xd7\x5c\xff\x39\x96\x2e\x5e\ --\xcc\xc8\x3c\x8d\x2b\x75\x9e\x13\x67\x2b\x87\xdc\xe0\x03\x74\x18\ --\x8c\x41\x30\x59\x7a\xba\xb9\x9b\x14\x0c\x4f\xf1\x1e\xba\x99\x62\ --\x05\x37\xda\x1b\xe6\x59\x99\x94\x97\x54\xd3\x0a\x04\x3c\xfc\x69\ --\xc9\xb5\x45\xfc\x71\xed\x26\xc3\xb1\x82\x03\xc9\x84\xc9\x33\x58\ --\xb4\xfc\x76\xe2\x13\x93\x68\x71\xc1\xee\xf3\x30\x3a\x15\x26\x66\ --\x09\xa6\xa1\x1d\xae\x60\x38\x27\xc3\x88\x34\x0b\xb3\x87\x09\x36\ --\x3b\xc4\x46\x41\x6e\x82\xf7\x68\x5e\x00\x14\x2d\xb3\x73\xa8\xd4\ --\x94\x52\x02\x12\x94\x37\xa4\xc5\x6c\xe2\xeb\xf7\xdc\x62\xa8\x53\ --\x03\x45\x7a\x66\x0e\x5f\xbc\xff\xdb\xac\xb8\xeb\xbe\x1e\xf6\x70\ --\x11\x38\x51\xeb\x66\xf3\x47\x1d\x01\x93\x2c\x0e\x36\x95\x06\xc3\ --\xf2\x32\x92\xe3\xc9\x4b\x14\x0a\xb3\x84\x91\x29\xdd\x06\x1f\x50\ --\x22\x47\x94\x52\xa2\x01\x88\xa8\xa0\x13\x00\x2d\xbd\xb6\x88\x19\ --\x85\x63\x0c\x75\x2c\x92\x44\xc5\x58\x59\x7c\xe3\x4a\xee\xfd\xe6\ --\xa3\x0c\x1b\xd9\xbb\x9f\xa7\x4f\x1c\xe5\xb9\x27\xff\x83\x63\xa7\ --\xcf\x19\x3e\xb9\x3c\x92\x88\x08\x15\x55\xc6\x7c\x29\xfa\xda\x81\ --\x15\xa5\xf6\xc1\x27\xa1\x61\x1a\xb2\x4b\x50\xff\x10\x4c\xa5\x4a\ --\x29\x7e\xf0\xf7\x5f\xe2\xde\xef\xfd\x62\x68\xc5\xc9\x29\x45\xe1\ --\xb4\xd9\x2c\x5c\x7a\x2b\x71\x09\xbd\x57\xb3\xe6\xa6\x06\xb6\xbf\ --\xfd\x5a\x0f\x4f\x1b\xdb\x10\xea\xfe\x95\x9c\xa9\xa8\xa6\xdd\x60\ --\x46\xf4\xb4\x14\xff\xab\xba\x20\xbb\xe0\x13\x01\x10\xdd\xb4\x0b\ --\x53\xf0\x3b\x69\xd9\x19\xa9\xfc\xf4\x91\xfb\xf8\xfe\x7f\x3c\x3d\ --\xe8\x5e\xbf\x00\x99\xd9\x79\xdc\x70\xf3\x9d\xe4\x0f\x1f\xd5\xeb\ --\x9e\xdb\xe5\x62\xff\xae\x2d\xec\xff\x60\x2b\x6e\x77\x4f\xd7\xef\ --\xba\x76\x45\x63\xc7\xd0\x88\xf2\xbd\x92\x83\x1f\x19\x3f\x7a\xa7\ --\x20\xb7\x0f\x43\x9b\xd9\xb4\x07\x3e\x11\x80\x19\x05\xaa\xba\xb8\ --\xca\xf3\x31\x30\x2e\xd8\xca\xe7\x16\x4d\xe0\x91\xaf\xdd\xc1\xaf\ --\x56\xbf\x36\x68\xa1\xd2\x31\xd6\x58\x16\xdc\x70\x0b\xd3\x66\xcf\ --\x47\xa9\xde\x46\x93\x8f\x8f\x1d\xe6\xfd\xcd\xeb\x69\x6d\x69\xf6\ --\x59\x5e\x04\x0e\x56\x69\x44\x0f\x41\x19\xd8\x57\x6a\xcc\x6b\x59\ --\xd3\x14\x79\xd9\x19\xfe\x6e\x97\x5d\x3a\x78\xfa\xb2\x5a\x20\xc2\ --\x26\xa5\x82\x17\x00\x80\x95\xcb\xaf\xc5\x6c\x32\xf1\x9f\x4f\xff\ --\x39\xa8\x63\xdc\xc3\x85\x52\x8a\x29\x33\xae\xe1\xba\x25\x2b\xb0\ --\xc6\xf5\xce\x31\xdc\xdc\x58\xc7\x96\xb7\x5e\xe5\x7c\x10\x5b\x69\ --\x76\x17\x98\x86\x98\x32\x58\xd7\x68\xe3\xd0\x11\x63\xaf\xa5\xf9\ --\xd9\x19\x7e\x73\x32\x09\x6c\xba\xf4\xf3\xa7\x7a\xa1\xa6\x6f\x42\ --\xb4\xa0\xf4\x80\xee\xdc\xba\x74\x1e\xf9\x39\xe9\xfc\xe8\x37\x2f\ --\xd0\xd4\x1c\x19\x37\xac\xee\x14\x8c\x1c\xc7\xc2\xcf\xdd\x4a\x76\ --\x6e\x6f\x0f\x5c\xa7\xb3\x8b\xbd\x3b\xde\xe5\xd0\x9e\xed\x78\x42\ --\xf0\x05\xec\x6b\x27\x72\x30\xd8\xfc\xfe\x01\xc3\x4b\xeb\xa4\xb1\ --\xfe\x3d\x94\x95\xe8\x9b\x2f\xfd\xfc\x69\x96\xb0\x0e\xf3\xfb\x6d\ --\x71\x7a\x0b\xd2\xb7\x6f\x80\x2f\x8a\x0a\xc7\xf0\xe2\x6f\x1e\xe3\ --\x5f\xff\x67\x23\xbb\xf7\xee\x43\x24\xbc\xb3\x81\xa6\x69\x8c\x9d\ --\x30\x95\xe9\xf3\x16\x32\x6c\xb8\x6f\x0f\x97\x13\x47\x4b\xd8\xf1\ --\xce\xeb\xb4\xb5\x86\x6e\xc6\xad\x6a\x1b\x3a\x6f\x03\x76\x87\x93\ --\x57\x37\x7d\x60\xb8\x9e\xc2\x71\x23\xfc\xdd\xb2\x45\xb7\x98\x2f\ --\x37\x70\x59\x00\xc6\x8e\x55\x5d\xc5\xd5\x9e\x37\x00\x9f\xa9\x62\ --\x03\x11\x15\x1d\xcb\xb5\x37\xdd\xcd\xf8\x59\x8b\x29\xd9\xf7\x01\ --\xc7\x8f\x16\xe3\x30\x90\x5b\x40\xd3\x34\xf2\x86\x8d\x64\x5c\x61\ --\x11\xe3\x26\x4d\xf3\xa9\xd9\x83\xf7\xbc\xc2\x2d\x1b\x5f\xfd\x8b\ --\x39\xaf\xf0\xd5\xb7\x77\x86\x25\x96\xe2\x4a\x73\x77\x37\xd6\x15\ --\x16\xaa\xcb\x5b\xab\x3d\x53\xc5\xea\xf2\x8a\x28\xd5\x2f\x01\xe8\ --\x74\x79\xbd\x5a\x53\xd3\xb3\x58\x72\xcb\x9d\x2c\xbe\xd1\xeb\xdb\ --\x7e\xf6\xd4\x31\xea\x6b\xaa\xa8\xaf\xab\xc6\xe5\xf4\xbf\xa5\x9b\ --\x98\x9c\x4a\x6a\x7a\x26\x19\xd9\x79\x0c\x1b\x3e\x9a\x61\x23\xc6\ --\x60\x89\xf2\xbf\x1d\xea\xec\x72\xb0\xfb\xfd\xcd\x14\xef\xdb\x19\ --\xf6\xd3\x4b\x06\x8b\x8b\x0d\xcd\xbc\xf0\xfa\x56\xc3\xf5\x14\xe4\ --\x65\x91\xe7\x27\x2f\x83\xa6\xf4\xb5\xdd\x7f\xef\x21\x00\xb6\x3c\ --\xd3\x3b\x49\x35\x7a\x0d\xd2\xf7\x49\x53\xbe\x48\x8a\xf1\x7a\xf6\ --\x34\x7f\xf2\xea\xaa\x99\x4c\x8c\x1e\x3f\xf9\x72\xf6\x2a\x11\xa1\ --\xad\xd5\x86\xdb\xe9\xc4\xe5\x72\xe2\xec\xea\x22\xc6\x1a\xeb\xfd\ --\x17\x1b\x1b\x52\x08\xda\xb9\xd3\x27\xd8\xb4\xfe\x45\x3a\xda\x23\ --\xaf\x73\x0c\x14\x22\xc2\xcf\xff\x7b\x6d\x58\x6c\x2b\x8b\xe6\xf9\ --\x3d\xe0\xb5\xd6\x5d\x6d\xde\xde\xfd\x42\x0f\x01\x58\xac\x94\xbb\ --\xb8\xca\xb3\x06\x78\x2c\xd4\x46\x35\x05\x85\x59\x3a\x1f\x9e\xf3\ --\xbd\x87\xad\x94\x0a\x3a\x8b\x55\x20\xca\x4f\x1d\xfb\x8b\x1a\x7c\ --\x80\x35\xeb\xde\x63\xff\x61\x03\x0e\x80\xdd\xb8\x71\xa1\x6f\x17\ --\x7c\xa5\xf8\xe3\x95\x07\x4b\xf7\x1a\x2d\xd1\xb5\xd5\x04\x72\x11\ --\xf2\x81\xcb\x03\xc7\xeb\xff\x7a\x0f\x7b\x0a\x72\x43\xd5\x27\x5b\ --\x77\x95\xb2\xfa\xe5\xcd\x81\x1f\x0c\x82\xa9\x13\x46\x51\x90\xe7\ --\x33\x2b\x9b\xb8\x4d\xda\x33\x57\x5e\xec\x35\x62\x33\x87\xa9\xd3\ --\x28\xb5\xe9\xca\xeb\x81\xf8\xa8\x56\xd1\x68\x2c\x9f\xd4\x55\x4d\ --\x55\x8b\xc2\xd6\x0f\xcb\xed\xd6\x5d\xa5\xfc\xf4\x89\x3f\x85\xcd\ --\x98\xe6\xff\x2c\x06\xb5\x71\x76\x96\xea\xe5\x7d\xe3\xd3\x63\x40\ --\x74\xcf\x2f\x95\xd2\x6e\x0e\xa5\xe1\x01\x4a\x93\x3b\x64\x71\xeb\ --\xb0\xa3\x5c\xa3\xe0\x93\xbd\xf6\xa4\x18\xef\xff\xfe\x10\x11\xd6\ --\x6e\xdc\xc1\x53\x2f\x6c\x08\x9b\x39\xbd\x20\x37\x93\x05\xb3\x7d\ --\x67\x0c\x15\x15\xc2\xb1\x71\x33\xf3\x2d\xdb\x8a\xab\x3c\xc5\xc0\ --\x8c\x60\x1b\xcf\x4d\x04\x83\x39\x25\xaf\x7a\x44\xe0\x7c\xb3\xe2\ --\x7c\xb3\x57\xe7\xb9\x7e\xa4\x4e\xb2\x0f\x21\x68\xb2\xb5\xf1\x9f\ --\x7f\x78\x25\xec\x39\x89\xbe\x7e\xcf\x2d\x68\x5a\x6f\x9b\x86\x52\ --\xb2\x6f\x46\xae\xf2\x69\x5c\xf0\xeb\x33\xa4\x90\x9f\x08\xea\xf5\ --\x60\x1b\xcf\x4e\x10\xd2\xe3\xa0\xa1\x63\xe8\x18\x55\x06\x13\x11\ --\x6f\xdc\xe3\x74\xeb\xa7\x53\xa3\xcb\xed\x61\xc3\xd6\xbd\x3c\xfd\ --\xd2\xdb\xb4\x75\x84\x37\xc1\xf4\xd4\x09\xa3\xb8\x7e\xae\x1f\xed\ --\xdf\xc3\x4f\xfc\x95\xf3\x2b\x00\x45\x79\xe6\x37\x8a\xab\xdd\xfb\ --\x11\x35\x27\x98\x0e\x98\x14\x5c\x3b\x5c\x38\x7a\x11\xce\x0c\xe1\ --\x7d\xf6\x81\xa4\xa9\x53\x01\x42\x6b\x5b\x07\x9b\x77\x1c\x64\xed\ --\xc6\x1d\x5c\x6c\xf0\xbd\x31\x65\x84\x28\xb3\x99\x47\xbf\x71\x97\ --\xef\x50\x70\x91\x03\xd3\xf3\x4d\x7e\x75\xba\x3e\xa3\x83\x05\xf9\ --\x17\x85\x0a\x5a\x3d\x55\x0a\x26\x67\x09\x4d\x9d\xea\xb2\x3d\xe0\ --\xaf\x11\xb7\xcb\x45\x7d\x5d\x35\x25\x95\xe7\xd8\xb4\xf6\x38\x87\ --\x8e\x9c\x8a\xa8\x8b\xf9\xd7\xee\xbe\x91\x11\x7e\x8e\xae\x11\xe4\ --\x9f\xbc\x5e\x5f\xbe\xe9\x53\x00\x66\xe6\x5a\xde\x29\xae\xd6\xdf\ --\x46\x24\x68\x85\x50\x29\x98\x9e\xab\xf3\xfe\x59\xcd\x48\x64\xf3\ --\x55\xc7\x91\xd2\xfd\x9c\x39\x79\x14\x87\xc3\x1e\x30\x24\x2b\x9c\ --\xcc\x99\x3e\x9e\x2f\xdd\x76\x83\xbf\xdb\x6b\x67\xe6\x5b\xfa\xf4\ --\xe5\x0f\xf8\xe2\x2e\x1e\xf5\x0f\x78\x43\xc8\x83\x26\x29\xc6\xeb\ --\x7d\xfa\xd7\x84\xd3\x61\xc7\xd6\xdc\x38\xa0\x83\x3f\x72\x58\x36\ --\x8f\x7f\xe7\x5e\x9f\x8a\x9f\x40\x9b\xa6\x6b\x3e\xcf\x7f\xee\x4e\ --\x40\x01\x98\x39\x4c\x9d\x56\xf0\x9b\x50\x3b\x37\x21\x43\xe8\x23\ --\x35\xde\x67\x18\x24\x33\x3d\x99\x5f\xfe\xf3\x37\x48\x8c\xf7\x9d\ --\xa2\x46\x09\x8f\x4f\x1f\xa6\xaa\x02\xd5\x13\x94\xe9\xce\xae\x6b\ --\x8f\x03\x21\x79\x28\xc4\x98\xbd\xd9\x2e\x3e\x23\xfc\x24\x27\xc6\ --\xf3\x9b\x7f\xf9\x26\x99\xe9\x7e\xf3\x00\x96\xe9\xb5\xda\xef\x82\ --\xa9\x2b\x28\x01\x98\x3f\x4c\xd9\x45\xf4\x6f\x10\xa2\x89\x78\x4c\ --\x9a\x10\x77\xf5\x1e\x14\x36\x24\x19\x96\x93\xc1\x53\xff\xfa\x6d\ --\x9f\x07\x58\x7d\x82\x2e\x4a\xfb\xe6\x95\x36\x7f\x7f\x04\x6d\xbc\ --\x9f\x99\x6f\xd9\x26\xc2\x13\xc1\x3e\x0f\xde\x0d\xa2\x49\x59\x9f\ --\xcd\x02\xe1\x62\xfa\xa4\xd1\xfc\xf7\xbf\x3d\xdc\xd7\xe0\x23\xc2\ --\xcf\x66\xfa\x31\xfa\xf8\x22\xa4\xdd\x9b\x44\xbb\xf6\x18\x70\x38\ --\x94\x32\x79\x49\x42\x5e\xd2\x67\x42\x60\x04\xa5\x14\xab\x6e\x59\ --\xc8\x6f\x7f\xf4\xad\x00\x59\x48\x65\xaf\xd4\x6a\x8f\x87\x52\x77\ --\xc0\x2c\x61\xdd\x19\x3b\x56\x75\x95\xd6\xc8\x97\x75\x5d\xdf\x07\ --\xf4\xf6\xc6\xf4\xc3\xf4\x5c\xa1\xb1\x43\xe1\x18\xdc\x68\xeb\xcb\ --\xa4\x65\x64\x93\x9e\x61\xec\x08\xd6\x81\x62\x58\x4e\x06\x8f\xfe\ --\xdd\x2a\x8a\x02\x07\xe3\x34\x98\xc4\x74\xd7\x8c\x20\xa7\xfe\x4b\ --\x84\x24\x00\x00\xd3\x73\x54\xd9\xa1\x6a\xf7\x57\x94\xa8\xd7\x08\ --\x9c\xd1\x0d\x00\x8b\x06\x63\xd3\x85\x23\xb5\x83\x6b\x21\x8c\x8a\ --\x8e\x61\xfe\xe2\x9b\x98\x31\xe7\xba\xa0\x8e\x55\x19\x4c\xcc\x26\ --\x13\x5f\xbc\x75\x11\x0f\xac\x5a\x1e\xcc\x89\xab\x02\xf2\xb5\x69\ --\xf9\x2a\xe4\xd0\xed\x90\x05\x00\x60\x66\xae\x79\x7d\x71\xb5\xe7\ --\x57\x08\x01\xdf\x33\x2f\x91\x95\x20\x94\xd5\x2a\x06\x2b\x8c\x64\ --\xf4\xb8\x42\x96\xae\x58\x15\x30\x83\xf6\x60\x63\x36\x99\x58\xb2\ --\xa0\x88\xaf\xde\xb5\xdc\xe7\xd1\x75\x3e\x11\x7e\x36\x23\xdf\xfc\ --\x66\xbf\xda\xeb\x4f\x21\x80\xa2\x1c\xed\xd1\x92\x6a\x3d\x1f\xf8\ --\x62\x30\xcf\xc7\x47\x79\xf3\xff\x1d\xae\x55\x03\x6a\x21\xcc\xc8\ --\xca\x63\xc9\x2d\xbe\xa3\x86\x86\x12\xb1\x31\xd1\x2c\xbb\x6e\x26\ --\x7f\xb3\x72\x49\xa8\xc9\x39\x5f\x2e\xca\xd3\x7e\xd8\xdf\x76\xfb\ --\x2d\x00\x4a\x29\xfd\xe0\x41\xf9\x8a\x96\x23\xc9\x20\xcb\x83\x29\ --\x33\x22\x55\x88\x8f\x86\xd2\x6a\xef\xd9\x44\x91\x24\x3a\xc6\xca\ --\xfc\xc5\x37\x51\x34\xe7\xba\xb0\x24\x72\x8e\x14\xe3\x47\x0f\xe3\ --\xf3\x4b\xaf\x61\xe9\x82\x19\xc4\x5a\x43\xcd\x09\xa4\xb6\x25\x74\ --\xaa\xfb\x95\x52\xfd\x9e\x58\xfb\x2d\x00\x00\xb3\x66\x29\xd7\x87\ --\xf5\x72\x57\xac\x53\xb6\x03\x33\x83\x29\x93\x1e\x27\xdc\x30\x46\ --\x28\x6f\x52\x9c\xac\x57\x38\xc3\xed\xd0\xab\x14\x93\xa7\xcf\x61\ --\xe1\xb2\x5b\x89\x8d\x0b\x63\x7e\xe2\x30\x61\x31\x9b\x98\x3a\x71\ --\x14\xd7\xce\x2c\x64\xfe\xac\xc2\xe0\xa7\xf9\x5e\xc8\xc1\x68\x8b\ --\xf6\xf9\xb1\x63\x95\xa1\x34\x22\x86\x04\x00\x60\x41\x86\x6a\x3b\ --\x58\x2d\x37\x2a\xd1\x3f\x54\xe0\xd7\x19\xbd\x3b\x9a\x82\xd1\x69\ --\xc2\x88\x14\xa1\xaa\x4d\x71\xba\x5e\xf5\x4a\x20\xd9\x1f\xb2\x72\ --\xf2\x59\xb2\xe2\x2e\x72\xf3\x47\x18\xaf\x2c\x4c\x58\xad\xd1\x4c\ --\x1a\x53\xc0\xe4\x71\x23\x99\x3c\x61\x04\xd3\xc6\x8f\xec\x91\x72\ --\xb6\x5f\x28\xce\x58\x4c\xa6\x15\x85\x99\xca\x70\x4c\x93\x61\x01\ --\x00\x98\x95\xab\x1a\x4a\x6a\xe4\x46\xd1\xf5\x77\x81\xa0\x93\x0a\ --\x9a\x34\x28\x48\x12\xf2\x13\x85\x13\xf5\x8a\x53\x0d\xfd\xd3\x0f\ --\x62\xac\xb1\x5c\xb7\x64\x05\x53\x67\xcd\xef\xd7\x29\xa5\xa9\x69\ --\x19\x4c\x2e\x9a\x47\xab\xad\x89\x56\x5b\x23\x76\xbb\x1d\x67\x97\ --\x23\xa8\x08\x27\xb3\xc5\x42\x74\xb4\x95\xec\x8c\x24\xb2\xd3\x12\ --\xc9\x4a\x4b\x26\x2f\x27\x83\x11\x79\x59\x0c\xcb\xcd\x20\x3b\x23\ --\xd5\xe7\x66\x8d\x01\x4e\x81\xb6\x6c\x4a\x96\xba\x18\x8e\xca\xc2\ --\xda\xb3\x7d\x95\x92\x66\x51\x9e\x8d\xa0\xe6\xf5\xa7\x7c\x65\x8b\ --\xe2\x50\x55\x60\x21\xd8\xbe\x69\x1d\x87\xf6\xee\xb8\x1c\x24\xba\ --\x70\xe9\x0a\x62\x62\x83\x36\x4b\x04\x8d\xc7\xe3\xc1\xed\xea\xc2\ --\xe1\x70\xe0\x71\xb9\xd0\xcc\x66\x34\xa5\x88\x8e\x89\x41\xd3\xcc\ --\x58\xa2\xbc\xb1\x0c\xf1\x51\xb0\x64\x8c\x1e\xec\xb1\xbd\x06\x90\ --\x83\x26\x93\xe9\x96\x69\xd9\x2a\x6c\xa7\x70\x84\x65\x06\xb8\xc4\ --\xdc\x7c\xd5\x58\x56\x27\xcb\xba\x5c\xf2\x6a\xb0\x8a\x61\x77\xf2\ --\x93\x84\xba\x76\xa8\xb0\x05\xfe\x24\x07\x62\xba\x37\x99\x4c\x98\ --\x4c\xb1\x44\xc7\xf4\x7d\x28\x44\x7a\x9c\x0c\xc0\xe0\xab\x6d\xce\ --\x18\x6d\xe5\xbc\x34\x15\xd6\x80\x88\x88\x74\xbb\xac\x4c\xa2\xba\ --\x92\xf5\xe7\x81\xbb\x43\x2d\x5b\xdb\xa6\xd8\x5b\xd1\x77\xb7\x9a\ --\x1a\xea\x48\x49\xcb\x18\x32\x87\x52\x8f\x48\x11\xa6\xe7\x46\xf0\ --\xdd\x56\xd4\xba\x16\x97\xfa\xf2\xe2\x91\x2a\xec\x39\x4d\xc2\x3a\ --\x03\x5c\xa2\xb0\x50\x39\x45\xe4\xcb\xa5\xd5\x7a\x85\xc0\xf7\x09\ --\x41\xd0\x52\xac\x12\xf0\xf1\xd4\x74\xff\x9b\x21\x03\x8d\x22\xa2\ --\xce\x2f\x82\xf0\xb3\xa2\x3c\xf5\x43\x23\xaf\x7a\x7d\x11\xb1\x17\ --\x64\xa5\x94\x5e\x94\x67\x7a\x0c\xf4\xcf\x01\x41\x2b\x2c\xd1\x66\ --\xaf\x2f\x8d\x61\x08\x64\x00\x00\x02\x6f\x49\x44\x41\x54\xc1\xd5\ --\x42\x4e\x62\xdf\xfe\xff\x06\x68\x50\xba\xac\x98\x91\x6f\xfa\x41\ --\xa4\x06\x1f\x22\x28\x00\x97\x98\x91\x67\xd9\x62\x12\x6d\x96\x42\ --\x3e\x0c\xb6\x4c\xd4\x55\x24\x00\x63\x23\xe1\xf4\xa2\x64\xbf\xd2\ --\xb4\xd9\x45\xc3\xcc\x6f\x87\xbf\xf2\x9e\x0c\x88\x89\x6c\x5a\xbe\ --\xaa\xb4\xe5\x9a\x16\x0b\xfc\x18\x02\x6f\x07\x0c\xf5\x04\x8e\x97\ --\xc8\x88\x0b\xfb\xb7\x5f\x80\x27\xf4\x6a\xd3\x82\xa2\x1c\x75\x2e\ --\xac\x35\xfb\x61\xc0\x3f\xea\xe2\x1a\xb9\x1e\x5d\x7f\x12\x28\xf4\ --\xf7\xcc\x8e\xb3\xda\x90\x76\x2b\x57\x0a\xd2\x63\x85\x19\x79\x82\ --\x35\x5c\x1e\x4f\x8a\x23\x82\xf6\x50\x28\xce\x1c\xe1\x69\x76\x10\ --\xd8\x2e\x62\x4e\xae\xd1\x1f\xd2\x85\x9f\x2a\xe8\x65\xaf\x1d\x8a\ --\x02\x90\x11\x27\x8c\x48\x85\x84\x28\x21\x2e\x3a\xac\xb3\x54\xa7\ --\xc0\x2f\x62\x6c\xda\xbf\x77\xcf\xdc\x31\x50\x0c\xea\x64\x5b\x5c\ --\x21\xb9\x68\xfa\xcf\x50\x7c\xa5\xfb\xf5\x7d\x17\x14\x35\xad\x43\ --\x63\x1d\x48\xb1\x7a\xdd\xda\xfa\x3a\xc5\xac\xbf\x28\xd4\x46\x8f\ --\x52\x0f\xcd\xca\x55\xfd\x3f\x90\xc9\x70\x1f\x86\x00\xc5\x95\xae\ --\x25\x28\xf5\x23\x50\xd7\x01\x1c\xa9\x55\x83\x1e\x5e\x66\x36\x41\ --\x51\x4e\xa4\xdc\xd9\x64\xaf\x88\xfc\x73\xa0\xa0\x8d\x81\x60\x48\ --\x08\xc0\x25\x8a\xab\x65\x21\x22\x3f\x28\xab\x65\xf9\x60\xe7\xf1\ --\xbd\xa6\x40\xc8\x4a\x08\xf3\xe0\x2b\xd9\xaf\x3c\xfc\x78\x20\xb4\ --\xfb\x60\x19\x52\x02\x70\x89\x67\x0f\xca\x3d\x2d\x0e\xfe\xa3\xd9\ --\x4e\xc1\x60\x84\x97\x59\x2d\xb0\x7c\x5c\xd8\x5e\xbd\x05\xd4\x56\ --\x41\x7f\x62\x66\x9e\x79\x43\xb8\x2a\x0d\x17\x43\x52\x00\x2e\xf1\ --\xec\x61\x99\x67\xb7\xf3\xef\xb6\x4e\x59\xe8\x70\xab\x01\x73\xe2\ --\x8b\x31\xc3\x8d\xe3\x0d\x0a\x80\xa2\x06\x61\x8d\xee\xd1\x9e\x9e\ --\x55\xa0\xce\x84\xa7\x67\xe1\x67\x48\x0b\xc0\x25\x5e\x29\x93\x28\ --\x87\x53\xff\x5e\xab\x5d\x7b\xc0\x66\x67\xb4\xd3\x13\xf9\x7e\xdf\ --\x3c\x41\x27\x2a\x74\x91\x6b\x56\xf0\xba\xae\xf4\xb5\xad\x39\xe6\ --\xad\x8b\x95\x1a\x22\x7e\xd0\xfe\xb9\x2a\x04\xa0\x3b\x1b\x0e\x4a\ --\xac\x4d\xe9\x0f\xb5\x3b\xd5\xdd\xad\x0e\x55\xd8\xe9\x8a\x4c\xae\ --\xe7\x25\x63\x74\x12\x82\xf3\xd0\x2a\x43\xb1\x19\xd1\x37\x47\xdb\ --\xcc\x3b\x07\xe3\x55\xce\x08\x57\x9d\x00\x5c\xc9\x9a\xc3\x32\xd9\ --\xe9\xd2\xbf\xea\x74\xa9\xc5\x76\x37\xa3\x3b\x9d\x2a\xc1\x65\x70\ --\x86\x48\xb1\xc2\x75\xa3\xf4\xde\x66\x52\x45\x8b\x12\x39\x82\x52\ --\x07\x74\xe4\xc3\x28\x93\x69\x57\xb8\x1c\x33\x06\x8b\xab\x5e\x00\ --\x7a\x21\xa2\x9e\x29\x61\xa1\x86\x7e\x9d\xcb\xc5\x14\xa7\x68\xa3\ --\x3c\x3a\x99\x2e\xb7\x24\xba\x45\xc5\xb8\xdd\x58\x04\x34\x5d\xc0\ --\xad\x7b\x77\x94\x2d\x1a\xa2\x29\x44\x53\xe8\x9a\x26\xee\x59\xf9\ --\x1c\x4e\x8e\x91\x72\x81\x0b\x4a\x28\x17\x4d\x2f\x57\x98\x8f\xcf\ --\xc8\x55\x91\x39\xac\x78\x10\xf9\x3f\x06\x8e\x97\x48\x80\x7c\xb0\ --\xcc\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\ --\x00\x00\x9a\xb3\ --\x89\ --\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ --\x00\x02\x00\x00\x00\x02\x00\x08\x06\x00\x00\x00\xf4\x78\xd4\xfa\ --\x00\x00\x00\x04\x73\x42\x49\x54\x08\x08\x08\x08\x7c\x08\x64\x88\ --\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0d\xd7\x00\x00\x0d\xd7\ --\x01\x42\x28\x9b\x78\x00\x00\x00\x19\x74\x45\x58\x74\x53\x6f\x66\ --\x74\x77\x61\x72\x65\x00\x77\x77\x77\x2e\x69\x6e\x6b\x73\x63\x61\ --\x70\x65\x2e\x6f\x72\x67\x9b\xee\x3c\x1a\x00\x00\x20\x00\x49\x44\ --\x41\x54\x78\x9c\xec\xdd\x77\x78\x5c\xe5\x95\x3f\xf0\xef\x7b\x67\ --\xd4\xbb\x2c\xc9\x2a\x96\xdc\x3b\x6e\xb2\xc1\xc6\xa6\x98\xde\xc1\ --\x18\x30\xa1\xf7\x40\x1a\x09\xd9\xdd\xb4\xcd\x66\xbd\xc9\x66\xb3\ --\xbf\x4d\x02\x29\xd4\xd8\xc6\x14\x63\xc0\x60\x63\xc0\x31\xee\x06\ --\xf7\x22\xc9\x72\x91\x9b\x24\xcb\xb2\x7a\xd7\xf4\x76\xef\x3d\xbf\ --\x3f\x06\x83\x8b\xca\x48\x9a\xb9\x77\xca\xf9\x3c\x4f\x9e\x80\x34\ --\xba\xef\x41\x65\xde\x73\xdf\x7b\xde\xf3\x0a\x30\xc6\x82\xda\xda\ --\xb5\x14\x63\xce\xc3\x68\x08\x8c\x54\x14\x75\x98\x42\xc8\x96\x15\ --\x0c\x56\x49\xca\x50\x55\x4a\x57\x48\xa4\xc8\x2a\x25\x79\x54\x11\ --\x07\xc0\x08\xc0\xa8\x10\x19\x05\xc1\xa0\x02\x92\x4a\x30\x00\x80\ --\xa2\x08\x10\x20\x08\x10\xb2\x0a\x10\x01\x42\x00\x51\x12\x40\x00\ --\x24\x40\x35\x18\x08\x00\x60\x14\x82\x84\x80\x4c\x44\x30\x1a\x84\ --\x8b\x54\x22\x49\x12\xee\x28\x03\x39\x8d\x06\x61\x33\x08\x32\x1b\ --\x25\x74\x18\x04\xb5\x19\x0d\x52\xb3\x41\xa8\x8d\x31\x46\xaa\x8f\ --\x8d\x36\x9c\xca\x88\x46\x95\x29\x1f\xcd\xd7\x08\x21\xeb\xf7\x5d\ --\x63\x8c\xf5\x46\xe8\x1d\x00\x63\x91\x6c\x75\x05\xe5\xbb\xad\x98\ --\xe1\x94\xd5\x49\xb2\x8a\xb1\xb2\x2a\x0d\x75\xab\xc8\x71\x2b\x94\ --\xee\xf6\x20\xde\xa3\x8a\x28\x8f\x1a\x5a\x7f\xa7\x42\x00\x31\x06\ --\xe0\x8a\x61\x6a\x7b\x62\x0c\x1a\x20\xa8\x45\xa8\xa2\x96\x04\xea\ --\x08\xa8\x05\xa8\x5a\x22\x43\x8d\x22\xa1\x76\x46\xae\x68\xd5\x3b\ --\x5e\xc6\x22\x55\x48\xbd\xb1\x30\x16\x6a\x56\x10\x19\x94\x43\x98\ --\xe1\xf6\xa8\x73\x5d\x0a\x0a\x3d\xaa\x34\x4a\x56\x28\xc7\xa3\x8a\ --\x54\x97\x8c\x58\x97\x1c\xbe\x7f\x83\x39\xc9\x84\x99\xf9\xd4\xdb\ --\xcb\x1c\x10\xa8\x20\x12\x95\x00\x55\x80\x50\x21\x84\x5a\x29\x24\ --\x63\xc5\xd4\x6c\x9c\x11\x42\xa8\x5a\xc4\xca\x58\x24\x0a\xdb\x37\ --\x1f\xc6\xb4\xf6\xee\x41\x2a\x94\x9d\xea\x0d\x1e\x21\xcd\x74\x7b\ --\x68\xbc\x5b\x15\xb9\x76\x0f\x92\xdc\x61\x3c\xc9\xf7\x44\x08\xe0\ --\xba\x51\x2a\x12\xa3\xfb\x7d\x09\x37\x80\x0a\x08\x51\x46\x44\x47\ --\x25\xa2\x32\x61\x30\x1c\x3d\x99\x8d\xe3\x0b\x84\x50\xfc\x17\x29\ --\x63\x91\x29\x22\xdf\x98\x18\x1b\x88\x37\x8a\x28\x3e\x5a\xc1\x6d\ --\x32\x70\x9b\x4b\xa6\x19\x4e\x19\x05\x0e\x59\x24\x7a\x14\xfe\x7b\ --\xba\xd0\xd0\x54\xc2\xb4\xbc\x5e\x57\x01\xfa\x46\xc0\x03\x42\x39\ --\x08\xc5\x42\x42\xb1\x02\xa9\x18\x40\xc9\x8c\x5c\x61\xf7\xef\x40\ --\x8c\x85\x37\x7e\xc3\x62\xac\x07\x2b\x88\x0c\x9e\xc3\xb8\x49\xf6\ --\xa8\xf3\x1c\x2e\x31\xdb\xae\x60\xb8\xc5\x29\xe2\x15\x3f\xcf\x69\ --\xe1\x4a\x08\xe0\xb2\x21\x84\x9c\xe4\x80\x7f\xc3\x64\x00\x47\x01\ --\xec\x03\x68\x8f\xc1\x60\xd8\x3b\x79\x30\x8e\xf2\x23\x04\xc6\xba\ --\xc7\x09\x00\x63\xe7\x78\xa3\x88\x0a\x62\x49\x7d\xc2\xa1\x48\xd7\ --\x39\x15\x4c\xb0\x3a\x91\xee\xe6\x3b\xfb\x01\x91\x04\x70\xa9\x36\ --\x49\xc0\x85\xcc\x80\xd8\x2f\x04\xed\x21\x41\x3b\xed\x46\xc3\x8e\ --\x2b\x32\x85\x45\xeb\x20\x18\x0b\x56\xfc\xc6\xc6\x22\xda\xf2\xc3\ --\x34\xd8\xe5\x52\x9f\x70\x79\xc4\x3c\xab\x5b\x4c\xb4\xb8\x91\x48\ --\x7c\x77\xef\x77\x02\xc0\x98\x4c\xc2\xf8\x2c\x5d\xbf\xb9\x0a\x80\ --\x13\x82\xb0\x03\xa0\x4d\x8a\x64\xd8\xca\xbb\x10\x58\x24\xe3\x04\ --\x80\x45\x94\x65\xe5\x94\x2c\xcc\xea\x53\x76\x45\xba\xc7\xe2\xa4\ --\xa9\x66\x97\x48\x50\x79\xc2\xd7\xcc\xc4\xc1\x84\xd1\x19\x41\xf3\ --\x0d\x57\x09\x38\x28\x01\x1b\x09\xea\x46\x93\xdb\xb8\xe3\x9a\xe1\ --\xc2\xa9\x77\x50\x8c\x69\x85\x13\x00\x16\xf6\xde\x2d\xa6\x05\x0e\ --\x0f\x3d\x66\x77\x8b\x99\x66\x37\x06\xc9\xfc\x54\x58\x37\x71\x51\ --\xc0\x4d\x63\x82\xf6\x07\xe0\x20\x88\xed\x12\x68\xa3\xa2\x4a\xeb\ --\x67\xe4\x8b\xc3\x7a\x07\xc4\x58\x20\x71\x02\xc0\xc2\xce\x3b\x07\ --\x29\x41\x52\xd5\x67\x6c\x2e\xf1\x70\x87\x03\x53\xec\x1e\x61\xd4\ --\x3b\x26\xe6\x65\x94\x80\xdb\xc7\x07\x6d\x02\x70\xa1\x6a\x41\x58\ --\xaf\x0a\x5a\x63\x76\x1b\x36\xf2\xea\x00\x0b\x37\x9c\x00\xb0\xb0\ --\xf0\xce\x41\x1a\xae\xb8\xd5\x9f\xdb\x3c\xd2\x6d\x1d\x0e\xe4\xf1\ --\x96\xbc\xe0\x14\x6d\x00\x6e\x1d\x17\x32\x09\xc0\xb9\x6c\x02\x62\ --\x03\x48\xfd\x2c\x9a\x0c\x9f\x4d\xcc\x17\xed\x7a\x07\xc4\xd8\x40\ --\xf1\x9b\x24\x0b\x59\xcb\x8b\x68\x9c\x83\xf0\x82\xc5\x8d\xbb\x4c\ --\x76\x0c\xe6\xad\x79\xc1\xcf\xc7\xee\x80\xc1\x4e\x01\x68\x8f\x10\ --\xe2\x23\xc5\x2d\xad\x98\x31\x4c\x34\xe8\x1d\x10\x63\xfd\xc1\x09\ --\x00\x0b\x29\xcb\x0e\xd1\x24\x9b\x13\x0b\x2d\x76\xba\xd1\xec\x16\ --\x89\x7a\xc7\xc3\xfa\xe6\xf2\x02\xc2\xe0\xa4\x90\x4f\x00\xce\xa5\ --\x00\xb4\x93\x20\x56\x08\x49\x5a\x51\x98\x23\x5a\xf4\x0e\x88\x31\ --\x5f\x71\x02\xc0\x82\xde\x6b\x3b\x29\xcb\x18\xa5\xfe\xc6\xea\x92\ --\x16\x74\x3a\x91\xc9\xdb\xf4\x42\x53\x4e\x12\x61\x66\x41\x58\xff\ --\xf0\x14\x80\xf6\x90\x10\xef\x38\xa2\xa4\xf7\xb9\xe7\x00\x0b\x76\ --\x9c\x00\xb0\xa0\xf4\x46\x11\xc5\x47\xab\xea\x2f\xac\x1e\xf1\x78\ --\xbb\x5d\xe4\xf3\xf2\x7e\x68\x8b\x8f\x02\xe6\x8e\x54\x11\x6d\xd0\ --\x3b\x12\xcd\xd8\x01\x7c\x26\x88\x96\x95\xe7\x19\xd6\xf1\xd9\x05\ --\x2c\x18\x71\x02\xc0\x82\xca\xd2\x7d\x34\xdf\xa6\xe0\x67\x26\x3b\ --\x66\xb8\x14\x44\xce\x74\x11\xc6\x24\x00\x57\x0c\x57\x91\x1e\xaf\ --\x77\x24\x3a\x11\x68\x00\xe1\x23\x52\xa5\x25\xd3\xf3\xc5\x21\xbd\ --\xc3\x61\xec\x2c\x4e\x00\x98\xee\x76\xb4\x50\x12\xd9\xd5\x27\x0e\ --\xd4\x88\x85\xad\x76\x91\xa6\x77\x3c\xcc\xbf\xc6\xea\xdf\x01\x30\ --\x88\xd0\x4e\x00\x4b\x63\xa2\x0c\x1f\x4e\xcc\x12\x56\xbd\xa3\x61\ --\x91\x8d\x13\x00\xa6\x9b\xa2\x7a\x1a\x27\x91\xfa\x78\xb3\x4d\x7c\ --\xff\x50\xbd\x48\xb2\xba\xf5\x8e\x88\xf9\x5b\x94\x04\xdc\x34\x56\ --\x85\x51\xd2\x3b\x92\xe0\x42\x80\x45\x22\xbc\x4f\x90\x5e\x2d\x1c\ --\x22\x0e\xea\x1d\x0f\x8b\x4c\x9c\x00\x30\xcd\xdc\xb7\x82\x0c\x57\ --\x66\x23\xfd\xca\x11\xca\x5c\x59\x48\xcf\xb6\x5a\x70\x5d\x55\x07\ --\xd0\x68\xe1\x5f\xc3\x70\x35\x24\x85\x30\x63\x08\xdf\xfd\xf7\xa2\ --\x98\x04\xfe\xe1\x52\xa4\x77\x67\xe7\x0b\x87\xde\xc1\xb0\xc8\xc1\ --\xef\xbc\x2c\xe0\x7e\xf6\x29\x25\xa5\x27\xe1\x05\x99\xf0\x82\x42\ --\x48\x89\x96\x20\x5c\x32\x10\x92\xed\x60\x22\x5c\x7c\x34\x30\x24\ --\x99\x90\x12\x0b\x78\x14\xa0\xde\x02\x34\x5b\xbb\x7f\x1b\x99\x94\ --\x4d\x18\x39\x88\x13\x00\x1f\x35\x43\xe0\x1f\xaa\x5b\x7a\x95\x7b\ --\x0b\x30\x2d\x70\x02\xc0\x02\x66\xe1\x46\x2a\x88\x33\xe0\xbf\x9d\ --\x0a\xee\x57\x08\xd1\x7a\xc7\xc3\xfa\x2f\x29\x06\x18\x93\x41\x18\ --\x92\x42\x10\x17\xbc\x6b\x1c\x6a\x10\x38\xd5\xde\xf5\x5b\xc9\x94\ --\x5c\xc2\xf0\x34\x4e\x00\xfa\xc8\x0d\x21\x3e\x85\x2a\x5e\x2a\x1c\ --\x22\x76\xeb\x1d\x0c\x0b\x5f\x9c\x00\x30\xbf\xfb\xed\x16\x9a\x19\ --\x6b\xc0\x9f\xad\x6e\xcc\x06\xf1\xef\x58\x28\x33\x1a\x80\x71\x99\ --\x84\x11\x83\x08\xdd\x3d\xc6\x3f\xde\x22\x70\xbc\xf9\xe2\x1f\xb3\ --\x80\xb7\xfa\x7f\x50\xa4\x56\xff\xfb\x81\x00\xed\x50\x05\x5e\x2a\ --\xcc\x31\xac\x16\x42\xf0\xa2\x19\xf3\x2b\x7e\x73\x66\x7e\xb1\x70\ --\x21\x49\x62\x36\xee\x89\x8e\xc2\xef\x1c\x1e\x8c\xd5\x3b\x1e\x36\ --\x30\x42\x00\x43\xd3\x08\xe3\x32\x09\xb1\x3d\x1c\xa5\xe4\x56\x80\ --\x2f\x4f\x49\xb0\x5f\x50\xc0\x29\x00\x4c\x08\xae\xa3\x7f\x43\x9a\ --\x20\x9c\x82\x84\xbf\x75\xba\xa4\x37\xf8\x50\x22\xe6\x2f\x9c\x00\ --\xb0\x01\x59\xb8\x82\xa2\xa5\x41\xf8\xbe\x00\xfe\xdd\xa3\x20\x43\ --\xef\x78\xd8\xc0\x65\x25\x12\x2e\xc9\x26\x24\xc7\xf4\xfc\x3a\xb3\ --\x13\x28\xaa\x95\x60\x76\x9d\xff\xf1\x28\x09\x98\x3e\x84\x90\x1d\ --\x5e\x2d\x7f\x83\x45\x13\x01\xaf\x4b\x6e\xe9\x2f\xd3\x86\x8b\x4e\ --\xbd\x83\x61\xa1\x8d\x13\x00\xd6\x2f\x0b\x57\x50\x74\x54\x06\x7e\ --\xa0\x12\xfe\xd3\xa3\x20\x45\xef\x78\xd8\xc0\xa5\xc5\x01\xe3\xb2\ --\x08\x83\x13\x7b\x9e\xb8\x89\x80\x8a\x76\x81\xe3\x4d\x02\x17\x76\ --\x68\x34\x08\xe0\xaa\x11\x2a\x52\x62\x03\x18\x28\x03\x80\x4e\x00\ --\x7f\x33\xca\xd2\x5f\x26\x0f\x15\x1d\x7a\x07\xc3\x42\x13\x27\x00\ --\xac\x4f\xbe\x5b\x44\x51\x05\x26\xfc\x80\x80\xff\xf4\x28\x48\xd5\ --\x3b\x1e\x36\x30\xb1\x46\xef\x1d\xff\xd0\x34\xf2\xe9\x59\xbd\xac\ --\x02\xfb\x6b\x04\x9a\xba\xa9\xfc\x1f\x9a\x46\x98\x96\xcb\x77\xfe\ --\x1a\xb2\x02\x78\x25\x46\x95\xfe\x8f\x8f\x28\x66\x7d\xc5\x09\x00\ --\xf3\xc9\x77\x8b\x28\x6a\x98\x19\xdf\x53\x88\xfe\xcb\xa3\x08\x9e\ --\xf8\x07\xc0\x28\x01\x83\x12\x08\x83\x13\x81\xd4\x38\x42\x8c\x01\ --\x88\x36\x7a\xef\xac\x01\x40\x56\x00\x97\x02\x98\x9d\x02\x56\x37\ --\xd0\x6a\x13\xe8\xe8\x62\x77\x78\xac\x11\xc8\x4b\x21\xa4\xc7\x01\ --\x49\x31\x84\x18\x23\xce\xab\xd0\x97\x15\xc0\xad\x7a\xff\x5f\x56\ --\xcf\xbf\x5b\x8f\x92\x80\xb8\x28\x42\x52\x2f\xcb\xfc\xe7\x72\x2b\ --\xc0\xee\x6a\xa9\xcb\x58\xce\x9a\x30\x98\x30\x86\x9f\xfb\xeb\xc1\ --\x0a\xe0\xcd\x28\xa3\xf4\x3f\x93\x06\x8b\x26\xbd\x83\x61\xa1\x81\ --\x13\x00\xd6\xa3\x85\x5b\xc9\x68\x00\x9e\x82\x82\xff\xf1\xa8\x48\ --\xd7\x3b\x9e\x50\x66\x10\xc0\xa8\x0c\xc2\xa8\x0c\x42\x54\x1f\x3b\ --\xe3\xb5\x3b\x80\xbd\x67\x24\xb8\x64\xef\xbf\x8f\x1c\x44\x98\x30\ --\x98\x60\xd0\xe8\x2f\xd8\xe1\x01\x76\x55\x4b\xb0\xb8\x7a\x7e\xdd\ --\x88\x74\xc2\xe4\x1c\x4e\x00\x74\x64\x05\xf0\x8a\xea\x94\xfe\x30\ --\x63\xa4\x30\xe9\x1d\x0c\x0b\x6e\xdc\xa0\x93\x75\x8d\x48\xfc\xd7\ --\x7a\x7a\xcc\xa0\xa2\xce\xe3\xc1\xeb\x3c\xf9\x0f\x4c\x8c\x11\xb8\ --\x72\xb8\x8a\xf1\x59\x7d\x9f\xfc\x01\x20\x3d\xce\xdb\x55\xef\x2c\ --\x01\x68\x36\xf9\x5b\x5c\xc0\xb6\xaa\xde\x27\x7f\x00\xa8\x35\x09\ --\x38\x3c\x81\x8f\x89\x75\x2b\x11\xc0\xcf\xa5\x58\xb5\xb2\xa4\x4e\ --\xf9\xf9\xd6\x2a\xe2\x6a\x0c\xd6\x2d\x5e\x01\x60\x17\xf9\xaf\x4d\ --\x74\x4d\x94\x84\x37\x9d\x32\x86\xe9\x1d\x4b\x38\x90\x04\x70\xd5\ --\x70\x15\xa9\x71\x03\xbb\x4e\x55\x87\xc0\xc1\xfa\x6f\xff\x64\x53\ --\xe3\x80\xb1\x19\x84\xec\xe4\xc0\x35\x5b\xb0\xb8\x80\x1d\xa7\xbf\ --\x5d\x79\xf0\x45\x8c\x11\xc8\x4f\x21\x64\x26\x02\xf1\x51\xde\x47\ --\x13\x11\x74\x0c\x70\xb0\x39\x43\xa0\x85\x95\xb9\x86\x77\xf8\x48\ --\x62\x76\x21\x4e\x00\xd8\x37\x7e\xbd\x81\x46\xc7\x1b\x69\xa9\x53\ --\x16\x73\xf4\x8e\x25\x9c\x0c\x4b\x23\x4c\xf5\x43\x61\x9c\xc9\x09\ --\x6c\xad\xbc\x78\xf9\x20\x23\x01\x98\x59\xa0\xf6\x6b\x65\xa1\x27\ --\x66\xa7\x77\xd9\xdf\xd9\x87\xc9\xbf\x3b\x06\x09\x48\x8e\xf1\xae\ --\x62\x0c\x4d\x23\x3e\x1c\x48\x7b\xc7\x49\xa8\x2f\x4c\xcf\x8d\x5a\ --\xa7\x77\x20\x2c\x78\x70\x02\xc0\xb0\x70\x1d\xa5\xc7\xc6\xe2\x25\ --\x87\x07\x0f\x53\xf7\x0d\xdf\x58\x3f\x4d\xcf\x23\xe4\xa7\xfa\xe7\ --\xb9\x78\x69\x83\xc0\xe9\x2e\xda\xee\xfa\xbb\xf8\xce\xec\x02\x76\ --\xf6\xf1\xce\xdf\x57\xa9\xb1\xc0\x95\x23\x54\xcd\x1e\x61\xb0\x6f\ --\x09\x88\x35\x8a\x22\x7e\x32\xa3\x40\x54\xea\x1d\x0b\xd3\x1f\xff\ --\x09\x46\xb0\x85\x2b\x28\x3a\x26\x13\xbf\xf4\x28\xf8\xa5\xac\xa2\ --\x0f\xf5\xe0\xac\xaf\x92\x63\x81\x84\x68\xef\x9d\xaf\xa2\x7a\x0f\ --\xd2\xf1\xa8\x02\x1e\x19\x20\x01\xc4\x18\x80\xb4\x38\xc2\xc8\x0c\ --\x42\x42\x54\xcf\xd7\xaa\x33\x79\x7b\xef\x77\x38\x00\x95\xbc\xcb\ --\xeb\xa3\x06\x11\xc6\x64\xfa\x27\x01\x30\x3b\xbd\xcb\xfe\xee\x00\ --\x2e\x18\xf3\x21\x41\xba\x72\x01\xf8\x8b\x3d\x5a\xfa\xfd\x15\x99\ --\xc2\xa2\x77\x30\x4c\x3f\x9c\x00\x44\xa8\xdf\x6d\xa2\x7b\x85\x84\ --\x57\xdd\x32\x32\xf5\x8e\x85\x7d\x2b\x4a\x02\xe6\x8e\x54\x91\xa0\ --\xd3\xd1\x49\x76\x0f\xb0\xfd\x94\x04\x47\x00\xee\xfc\xcf\x95\x9b\ --\x4c\xb8\x2c\x9f\x13\x00\x9d\xb5\x0a\x81\xff\x2e\xcf\x91\x5e\xe6\ --\xfa\x80\xc8\xc4\x09\x40\x84\xf9\xf5\x17\x34\x36\x36\x16\xef\xbb\ --\x3d\x98\xa6\x77\x2c\xac\x6b\xc3\xd2\x09\x53\x75\xd8\x4a\xe7\x92\ --\x81\xed\x55\x12\xac\xee\xde\x5f\x3b\x50\xfe\xaa\x8b\x60\x7e\x51\ --\x02\x21\xbd\x50\x98\x2b\xb6\xe9\x1d\x08\xd3\x16\x27\x00\x11\x62\ --\xe1\x56\x8a\x8d\x06\xfe\xe0\x91\xf1\x23\x85\xc0\x35\xd9\x41\x4a\ --\x08\xe0\x8a\xa1\x2a\x06\x25\x68\x3b\xae\xac\x00\xdb\xab\x25\x98\ --\x7a\x68\xf2\xe3\x4f\x53\x72\x08\xc3\xd3\x39\x01\x08\x26\x02\x62\ --\x8d\x64\x10\xcf\x4f\xc9\x16\x55\x7a\xc7\xc2\xb4\xc1\x05\x5f\x11\ --\xe0\x77\x1b\xe8\x56\xa3\x8a\x5a\xa7\x07\x3f\xe1\xc9\x3f\xb8\x8d\ --\xcb\x24\xcd\x27\x7f\x22\x60\x5f\xad\xd0\x6c\xf2\x17\x00\x1f\x14\ --\x14\x84\x08\x74\xbb\xa2\xa8\x47\x0e\xd4\x29\xff\xb6\x95\xa8\x87\ --\x33\x20\x59\xb8\xe0\x15\x80\x30\xf6\xab\x75\x94\x93\x18\x8d\x37\ --\x9d\x32\x6e\xd6\x3b\x16\xd6\xbb\xa1\xa9\x84\xa9\x79\x81\xdb\xd3\ --\xdf\x9d\xc3\x8d\x02\x95\x6d\xda\x8d\x9a\x16\x07\x5c\x3d\x82\x8f\ --\xb6\x0f\x72\x07\x85\x24\x3d\x33\x2d\x47\xec\xd7\x3b\x10\x16\x38\ --\x9c\x00\x84\xa1\x85\x0b\x49\xc2\x95\x78\x52\x22\xfc\x4d\x56\x31\ --\xc0\xf6\x33\x4c\x0b\x39\x49\xde\xa2\x38\xa1\xf1\x5f\x64\x4d\xa7\ --\x40\x71\x9d\xb6\x83\x4e\xc8\xf2\xdf\x8e\x05\x16\x50\x32\x80\x57\ --\x0d\x06\xe9\x57\x53\xb2\x85\x4d\xef\x60\x98\xff\xf1\x23\x80\x30\ --\xb3\x70\x03\x4d\x95\xae\xc0\x61\x55\xc1\x22\x9e\xfc\x43\x43\x66\ --\x02\xe1\x52\x1d\x26\x7f\x93\x03\x28\xad\xd7\xfe\x1e\xa0\xc3\xa9\ --\xf9\x90\xac\x7f\x8c\x00\x9e\x57\x65\xf5\x50\x49\x9d\xe7\x7a\xbd\ --\x83\x61\xfe\xc7\x09\x40\x18\x39\x50\x45\xa9\x83\x93\xe8\x5d\x59\ --\xc5\x04\xbd\x63\x61\xbe\x49\x8e\x05\x66\x16\x10\x24\x1d\xd6\xe2\ --\xa2\x0c\xde\x53\x09\xb5\xd6\x60\x16\x68\xb1\xf1\xe2\x63\xa8\x20\ --\x81\x11\x80\xb4\xa1\xa4\x56\x79\x67\x6f\x2d\x0d\xd2\x3b\x1e\xe6\ --\x3f\xfc\x57\x18\x26\x8a\xeb\xe4\x3b\x04\xc4\x6b\x0e\x0f\xf2\x36\ --\x96\x4b\x50\x79\x85\x35\xe8\x49\x02\xb8\x76\x94\x8a\x44\x9d\xf6\ --\xfc\x9f\x65\xf3\x00\x1d\x76\xef\x21\x3e\x17\x36\xff\x91\x55\x6f\ --\xb3\x21\xa7\x07\x30\xbb\xfc\x77\xd0\x4f\x4e\x32\x61\x26\xf7\x01\ --\x08\x45\x4d\x20\xfa\x59\xe1\x10\xe3\x3b\x7a\x07\xc2\x06\x8e\x13\ --\x80\x10\x57\x72\x86\x72\x61\xa0\xd7\x01\xba\xe3\xec\xc7\x76\x55\ --\x0b\x34\x5b\xf9\x47\x1b\xec\x46\x0f\x22\x4c\xcc\x0e\xad\x49\xd0\ --\xad\x00\x66\xa7\x80\xc9\xe9\x6d\x17\xec\xf0\x00\x4e\x59\xc0\xe1\ --\x06\x3c\x7d\xa8\xeb\x8b\x31\x02\xb7\x8c\xe5\x42\xc0\x50\x45\x10\ --\xab\xc9\x23\xbe\x3f\x63\x98\x68\xd0\x3b\x16\xd6\x7f\x3c\x4b\x84\ --\xb0\xe2\x7a\xf9\x6e\x41\x62\x11\x80\xf3\x96\xe5\x0e\x35\x78\x5b\ --\xc5\xb2\xe0\x76\xc3\x18\xb5\xd7\xb6\xbf\xa1\xc4\xad\x00\x76\x37\ --\xd0\x66\x17\xa8\x6c\x17\xb0\xf7\xd0\x50\xc8\x20\x80\x3b\x26\x70\ --\x02\x10\xe2\x5a\x05\xe8\xe9\x69\x79\xc6\x4f\xf5\x0e\x84\xf5\x0f\ --\xd7\x00\x84\xa0\x5d\x35\x14\x57\x52\xa7\xfc\x55\x90\x58\x85\x0b\ --\x26\x7f\x00\x01\x39\xc0\x85\xf9\x57\x7c\x34\xc2\x6a\xf2\x07\xbc\ --\x67\x12\xa4\xc6\x01\x23\x07\x11\xae\x1d\xa9\x62\x70\x0f\x7b\xfd\ --\xf5\x6a\x75\xcc\xfc\x2a\x83\x20\x56\x97\xd4\x2a\xef\x94\x35\x53\ --\xa2\xde\xc1\xb0\xbe\xe3\x04\x20\xc4\x94\xd4\xd3\x8c\x58\x49\x2d\ --\x05\xf0\x7c\x57\x9f\xb7\xb9\x81\x06\x0b\xdf\xfd\x07\x3b\x63\x98\ --\xff\x88\x8c\x12\x30\x2b\x9f\x30\xa2\x9b\x6e\x7f\x63\x79\x1b\x60\ --\xf8\x10\x78\xc4\xe9\x51\x8b\x8a\xeb\x69\xba\xde\xa1\xb0\xbe\x09\ --\xf3\xb7\xa1\xf0\x41\x44\xa2\xb4\x41\x7d\x9e\x08\xff\x07\xa0\xcb\ --\xfb\xa7\x56\x9b\x77\x4f\xb7\xbf\x0a\xb5\x58\xe0\x24\x46\x03\xd7\ --\x8f\xf6\xef\x12\xb8\x4a\x00\x44\xf0\x65\xf5\x75\x66\x81\x53\x6d\ --\x02\x2e\x19\x88\x8f\x26\x8c\x1c\x04\x0c\x4e\xe4\x04\x20\x0c\xc9\ --\x04\xfc\xbe\x32\x57\xfa\x1d\x1f\x2e\x14\x1a\x38\x01\x08\x01\xfb\ --\xea\x28\xdf\x48\xca\xbb\x10\xe2\x6a\x59\xf5\x56\x64\x3b\x65\x01\ --\xab\x0b\xb0\xb8\x01\x8b\x0b\xb0\xba\x7b\x7e\xe6\xca\x82\x8b\x10\ --\xc0\x8d\x63\x54\xc4\xf9\xa1\xe1\x6a\x93\x45\xe0\x58\x8b\x40\xa7\ --\x03\xc8\x4f\x25\x4c\xcf\xe3\xc9\x95\xe9\x87\x84\xd8\x6a\x54\xc5\ --\xa3\x53\x86\x88\x5a\xbd\x63\x61\x3d\xe3\x04\x20\xc8\x2d\xde\xa7\ --\xfc\xa5\xcd\x2e\xfd\x50\x56\x61\x50\x54\xef\xb6\x2c\x16\x1e\x06\ --\x7a\x22\x1e\x01\x38\xda\x28\x50\x7e\x4e\x1b\x5f\x01\xe0\x9a\x91\ --\x2a\x92\x63\x07\x1e\x1f\x63\xfd\x26\x60\x12\xa0\xef\x4f\xcb\x35\ --\x2e\xd7\x3b\x14\xd6\x3d\x4e\x00\x82\xd4\x3b\x15\x94\x65\x6d\xc5\ --\xf6\x46\x33\xc6\xe8\x1d\x0b\x0b\x9c\x59\x05\xd4\xaf\x83\x71\x88\ --\x80\xd2\x06\x81\xea\x8e\x8b\xff\x84\xa7\xe6\x12\x86\xa5\xf1\x2a\ --\x00\x0b\x0a\x6f\xc6\x44\x49\x3f\x9e\x98\x25\xac\x7a\x07\xc2\x2e\ --\x16\x6c\x8f\x0b\x19\x80\x77\x8a\xe9\xa6\xa6\x3a\x54\xfb\x63\xf2\ --\x8f\x36\x00\x19\x09\x84\xdc\x64\xc2\xa0\x78\x68\xde\x6e\x96\xf5\ --\x6c\x7f\xad\x40\x53\x17\x45\x9b\x66\x17\x50\xde\x26\x50\xd3\x29\ --\x40\x17\xcc\xe5\x44\xc0\x81\xfa\xae\x27\x7f\x00\x88\x0d\xb3\xdd\ --\x05\x2c\xa4\x3d\xe9\xf4\xa8\x45\x25\x0d\xc4\xdd\x49\x83\x10\x4f\ --\x07\x41\x66\xd1\x3e\xfa\x53\xa3\x05\x3f\xf5\x28\xdf\xfe\x6c\xa2\ --\x24\x20\x3e\x06\x88\x96\x08\x06\x01\x98\x7c\xe8\xc8\x96\x95\x48\ --\x18\x9b\x41\x48\xbf\x60\xd2\xb7\xb9\x81\xf2\x56\x81\x33\x9d\xe2\ --\xa2\x6e\x81\x67\x5f\x77\xe1\x84\xc3\x02\x4b\x08\x60\x64\x3a\x21\ --\x2f\x85\x20\xab\x02\xa7\xda\x81\x46\xb3\xc0\xd9\x1f\xc3\xf0\x74\ --\xc2\xe4\x1c\xef\x29\x81\x1e\x15\x28\xea\x26\x69\x00\xbc\xdb\xf0\ --\xae\x1e\xae\x72\xa2\xc7\x82\x0a\x01\x16\x41\xf4\x64\xe1\x10\xe3\ --\xc7\x7a\xc7\xc2\xbe\xc5\x6f\x13\x41\x62\x61\x19\x25\xa6\x77\xe2\ --\xab\x56\x1b\x0a\x25\xe1\x9d\xc0\x73\x92\x80\xf4\x78\x42\x62\xf4\ --\xf9\x93\x38\x11\xb0\xb5\x52\x82\xd9\x75\xf1\x75\x84\x00\xa6\xe6\ --\x10\x86\xf6\xb2\x04\xec\x94\x81\x3a\x93\x80\xd9\xe5\xed\xca\x96\ --\x1e\x0f\x0c\x8a\x23\x18\x25\xa0\xc6\x2c\x70\xa8\x5e\x70\xbd\x41\ --\x10\xc9\x49\x22\x24\xc7\x02\xa7\x3b\x44\xb7\x7d\x1e\xd2\xe2\x80\ --\xcb\x87\xaa\x88\x36\x68\x1b\x1b\x63\x3e\x22\x00\xff\x57\x91\x2b\ --\xfd\x3b\xef\x12\x08\x0e\x9c\x00\x04\x81\x37\x8a\xa8\xd0\x64\xc3\ --\x97\x1e\x05\x49\xa3\x06\x79\x9f\xdf\x46\xf5\xf0\x26\xee\x51\x81\ --\xf5\x27\xa4\x2e\x27\xe8\x58\x23\x70\xb3\x1f\x5a\xac\x36\x98\x05\ --\xf6\xd6\xf0\xaf\x47\x28\x30\x48\xc0\x98\x0c\xc2\xe8\x0c\x7d\x0e\ --\x15\x62\xac\x4f\x04\x7d\x69\x90\x0c\xf7\x4f\xc9\x16\xcd\x7a\x87\ --\x12\xe9\xb8\x06\x40\x67\xaf\xef\xa5\xe7\x9a\x3b\x69\xbf\x00\x92\ --\xae\x19\xa9\x62\x74\x46\xcf\x93\x3f\x00\x94\x35\x75\x7f\x77\xee\ --\x94\x81\x56\xfb\xc0\xe3\xca\x49\x26\x24\xc7\x0c\xfc\x3a\x2c\x70\ --\xa2\x24\x60\x74\x06\xe1\x86\xd1\x2a\xc6\x66\xf2\xe4\xcf\x42\x04\ --\x89\xb9\x8a\xa2\x16\x95\xd6\xd0\x65\x7a\x87\x12\xe9\xf8\x2d\x43\ --\x47\xaf\xed\x52\x96\x37\x5a\xa5\x07\x0c\x12\x70\xcd\xa8\xde\xfb\ --\xc2\x77\x38\x80\x63\xcd\xbd\x1f\xf4\x93\x12\x07\xcc\xf5\xc3\x73\ --\xe0\x9e\x0a\xcd\x98\x3e\x84\x00\x32\xe2\x09\x05\xa9\x40\x6e\x32\ --\xc1\xc0\x29\x3c\x0b\x5d\x2e\x21\xe8\x87\xd3\x72\x8d\x8b\xf5\x0e\ --\x24\x52\xf9\xa1\x0d\x09\xeb\xab\xa5\x07\x28\xd5\x62\xa7\xfd\x0d\ --\x56\x31\x0a\x00\x26\x66\x53\xb7\x93\x3f\x01\x68\xb6\x08\x9c\x68\ --\x15\x68\xf7\xf1\xce\xde\xe4\xf0\x36\x08\x1a\xe8\x1d\xbc\xca\x35\ --\x00\x3e\x33\x4a\xde\xa5\x78\xb7\xe2\xff\x22\x4a\x01\x6f\x71\x5f\ --\x4e\x12\x61\x48\x2a\x21\x9e\xab\xfc\x59\x78\x88\x21\x12\x8b\x4a\ --\x6a\x95\xab\x9c\x24\x3d\x3b\x3b\x5f\x38\xf4\x0e\x28\xd2\x70\x02\ --\xa0\xb1\xa5\xfb\xe8\xd2\x16\x33\x7d\x69\x75\x89\x78\x00\x18\x94\ --\x00\x0c\x4b\xed\x7a\xc6\x30\xbb\x80\x92\x3a\x09\x9d\x7d\xfc\xb3\ --\x48\x8e\xf5\xd6\x02\x0c\x84\xa2\x02\xcd\x36\xbe\xfb\xef\x4e\x72\ --\x0c\x90\x9b\x42\xc8\x48\x20\xa4\xc6\x7a\x13\x00\xc0\xfb\x7d\xdb\ --\x50\x2e\x0d\xf8\x40\x26\xa3\x01\xc8\x88\x23\x64\x27\x01\xd9\xc9\ --\x34\xe0\x9f\x27\x63\x41\x4b\xe0\x91\x58\xa1\x8c\xde\xd7\x4c\x77\ --\x5f\x96\x25\x1a\xf5\x0e\x27\x92\xf0\x3b\xbc\x86\x16\xef\xa7\x47\ --\x9a\x2c\x58\xea\x92\x61\x00\xbc\xcf\x70\xe7\x8e\x54\xbb\x3c\x19\ --\xad\xb2\x4d\xa0\xac\xe9\xe2\xad\x7a\xbe\xb8\x66\xa4\x8a\x14\x1f\ --\x3a\xc1\xc9\x2a\x70\xaa\x5d\xa0\xc9\x2a\x10\x25\x08\x83\x12\x80\ --\xac\x04\x6f\x0d\xc2\xb1\x16\xef\x1e\x74\xf6\x2d\x83\x00\x86\xa4\ --\x7a\x0f\xb8\xe9\xee\xfb\x7b\xb8\x51\xa0\xb2\xad\xef\xdf\x37\xa3\ --\xe4\xdd\xf1\x91\x11\x0f\x64\x26\x7a\x93\x0a\xde\xca\xc7\x22\x4c\ --\x1d\x48\xba\xad\x70\x88\x38\xa8\x77\x20\x91\x82\xdf\x62\x34\xf2\ --\xda\x5e\xfa\x7d\x93\x19\xbf\x3a\x3b\xa1\x0b\x01\xcc\xcc\xbf\xb8\ --\x0b\x1c\x01\x38\xd4\x20\x50\xd5\xde\xbf\x1f\x4d\x5a\x1c\x70\xf5\ --\x88\xde\xd7\xee\x9d\x32\xb0\xbb\x5a\x82\xc9\xd9\xaf\x61\x22\x4a\ --\x7c\x94\x77\x2f\xfe\xd0\x34\xea\x76\x8b\x9d\xc5\xe5\xfd\xb9\xb5\ --\xf8\xb8\x6a\x22\x09\xef\xd6\xcb\x8c\x04\x42\x56\x02\x21\x35\x0e\ --\x5c\xc4\xc7\x22\x1e\x01\x16\x08\x75\xc1\xf4\xdc\xa8\x75\x7a\xc7\ --\x12\x09\xf8\x2d\x27\xd0\x88\xc4\x2b\xbb\x69\x65\xb3\x55\xdc\x7d\ --\x76\xaa\x17\x02\x28\xcc\x23\xe4\xa7\x5c\x7c\x7b\xdf\xdf\x3b\xc8\ --\xb3\x86\xa5\x13\xa6\xe6\xf4\xbc\x6c\xe0\x51\x80\x6d\x55\x12\x2c\ --\x5d\xf4\x11\x60\xdf\xca\x88\xf7\x9e\x5c\x97\x9d\x44\xdd\xde\x8d\ --\x13\x80\x63\x4d\x02\x15\xad\x02\xbd\xa5\x5d\x42\x00\x99\x09\x84\ --\xbc\x64\xef\x2e\x0b\xde\xaf\xcf\x58\x97\x64\x12\xf8\xc1\xf4\x5c\ --\xc3\x3f\xf4\x0e\x24\xdc\xf1\x93\xc5\x00\xfa\xdb\x5a\x8a\xa1\x1d\ --\xd8\xdb\xe4\x10\x53\xce\x7e\x4c\x00\x98\x92\xdd\xf5\xe4\x5f\xd5\ --\x31\xb0\xc9\x1f\x80\x4f\x93\x4a\x69\x83\xe0\xc9\xbf\x0b\xdf\x14\ --\xdb\x25\x7b\x5b\x27\x27\x76\x79\xe8\xf2\xf9\xaa\xda\x05\x4e\xb6\ --\xf6\xfe\x33\x1b\x92\x42\x98\x98\x4d\x7e\x39\xfd\x8f\x69\xab\xe4\ --\x48\x39\x52\x93\x13\x31\xa2\x20\x47\xef\x50\x22\x85\x51\x10\xde\ --\x28\xa9\x53\x26\x4e\xcb\x95\x7e\x22\x84\xe0\xde\xa4\x01\xc2\x6f\ --\x47\x01\xf2\xca\x56\xca\x76\x4a\x28\x35\x39\x30\xf8\xdc\x8f\x4f\ --\xc8\x26\x0c\x4b\xbf\xf8\xf7\xd9\xec\x04\x0e\x37\x0c\x7c\x41\xc6\ --\xdd\x4b\xf1\x59\xbd\x59\xa0\xce\xc4\x0b\x3f\x67\x89\xaf\x97\xe2\ --\x73\x93\xbc\x93\x7e\x5c\x1f\x2b\xec\x9b\x7b\x39\xe2\x24\xda\x00\ --\x4c\xc9\x25\xe4\x25\xf3\x7b\x58\xa8\x69\xed\x30\xe1\xb5\x65\x6b\ --\xb0\x61\x5b\x31\x5e\xfc\xf5\x73\x9c\x00\x68\xef\xf9\xd2\x7a\x35\ --\x7b\x6b\x15\x3d\x76\xcd\x70\xc1\x0f\x2b\x03\x80\x13\x80\x00\x78\ --\x79\x37\x15\x5a\x5c\xd8\x6e\x77\x21\xfe\xdc\x8f\x8f\xcd\x24\x8c\ --\x1e\x74\xf1\x44\x40\x00\x0e\x36\x4a\xfd\x2a\xf8\xbb\x90\xc9\x29\ --\xbe\xbe\xe2\xc5\xdc\x0a\x70\x70\x80\x49\x86\x10\xde\x67\xe2\xb1\ --\x51\x40\xb4\x81\x10\x63\xf0\x16\xb0\x49\xc2\xfb\x3f\xa7\xec\x3d\ --\x6f\xa0\xdd\x2e\xa0\x04\xe9\x9c\x27\xce\x69\xb5\x9c\x93\x44\x88\ --\x19\xc0\x5f\x41\x4f\x4d\x9b\x06\x27\x11\xa6\xe5\x72\x05\x7f\xa8\ --\x91\x15\x05\xab\xd6\xed\xc4\xa2\x0f\xd6\xc2\xe1\xe0\xa5\x32\x3d\ --\x11\xb0\x20\x25\x5a\xc9\x2b\xaa\xa7\x79\x33\x72\x45\xab\xde\xf1\ --\x84\x1b\x7e\x6b\xf2\xb3\xc5\x7b\xe9\xb6\x46\x2b\x56\xbb\x95\xf3\ --\xbf\xb7\x79\x29\x84\xf1\x59\x5d\xcf\x88\x8d\x66\x81\x36\x9b\x7f\ --\xc6\xef\x74\x7a\x27\xe1\xae\x26\x9d\xb2\xa6\xee\xfb\xc8\xf7\x26\ --\x27\x99\x30\x22\xdd\x5b\xa9\x6e\xf0\x21\x87\x70\x78\x08\x1b\xcb\ --\xfd\x93\xd4\xf8\x4b\x52\x0c\x50\x90\xe6\x7d\xfc\xe2\xaf\x49\x39\ --\x33\x11\xa8\xe9\x3c\xff\x63\x71\x51\xc0\xe4\x6c\x42\x0e\xdf\xf5\ --\x87\x9c\x92\xb2\x0a\xbc\xb4\x78\x25\xaa\x6a\x78\x37\x5a\xf0\x10\ --\x73\x24\x52\x77\x1f\xa8\xa1\x5b\xa7\xe5\x8b\x72\xbd\xa3\x09\x27\ --\x9c\x00\xf8\xd1\x92\xbd\xf4\x5c\xbd\x05\xaf\x7a\xd4\xf3\x8b\x2b\ --\xe3\xa2\x80\x29\x3d\x14\xe6\xf9\xf2\x0c\xd9\x57\x44\x40\x45\xab\ --\xc0\x25\xd9\xe7\x8f\x57\x6f\xee\x7f\x57\xbf\x31\x19\x84\x09\x83\ --\xfb\x36\x99\x35\x5a\xfb\xb7\x85\x31\x10\x52\xe3\x80\x71\x99\x84\ --\xc1\x49\xe4\xf7\xaa\xd7\xfc\x64\x82\x65\x90\xf7\xbf\x37\x3e\x8a\ --\x90\x9f\xea\xed\x0f\xc0\x0d\xfa\x42\x4b\x4b\xbb\x09\xaf\xbf\xb7\ --\x06\xeb\xbf\x2a\xd2\x3b\x14\xd6\xb5\x51\x24\xa9\xdb\x8b\xea\xe9\ --\xd6\x19\xb9\xa2\x44\xef\x60\xc2\x05\x27\x00\x7e\xb2\x68\xaf\xf2\ --\xef\x35\x66\xfa\x6f\x95\x2e\x9e\x62\xa6\xe5\x76\x5f\xf1\xdd\xee\ --\xf0\xb6\xf8\xf5\xa7\x53\x6d\x02\x19\x09\xf8\x66\x8b\x61\xab\x4d\ --\xa0\xa4\xbe\xff\x53\x5f\xbd\x59\xc0\x68\xf0\xf6\x08\x48\xe9\x65\ --\x7f\xba\x43\xf6\x8e\x5f\x31\xc0\x62\x46\x7f\x88\x31\x7a\x4f\x46\ --\x0c\xe4\x9d\xb8\x10\xde\x4e\x8e\x13\xbb\x79\xec\xc2\x82\xdb\xd9\ --\xe5\xfe\xc5\xef\xaf\x85\xdd\xc9\xcb\xfd\x41\x6e\xb0\x04\x75\xcb\ --\x81\x3a\xba\x6d\x5a\x9e\xd8\xa9\x77\x30\xe1\x80\x13\x00\x3f\x78\ --\x6d\x37\xfd\xb5\xd6\x84\xe7\xbb\x9a\x02\xf2\x92\x09\x59\x89\xdd\ --\x4f\x0e\x35\x01\xe8\xb5\xaf\x02\xd8\x5b\x23\x90\x9d\xe4\x3d\xed\ --\xa9\xc1\xdc\xfb\x16\xb5\x9e\x58\xdd\xc0\xd1\x26\x81\xa3\x10\x30\ --\x4a\x40\x42\x0c\x90\x18\x45\x88\x32\x7a\x9b\x19\xa9\x04\xb8\x64\ --\xc0\xec\x14\x5d\x1e\x51\xac\x87\xac\x44\xc2\xf4\xbc\x81\x3d\xdf\ --\x67\xe1\xad\xf8\x70\x39\x5e\x5c\xb2\x12\xd5\xb5\x4d\x7a\x87\xc2\ --\x7c\x45\x48\x21\xa8\x1b\x0e\xd4\x79\xe6\x4d\xcb\x8b\xda\xa8\x77\ --\x38\xa1\x8e\xdf\x1e\x07\xe8\x95\xdd\xf4\x41\xa3\x05\xf7\x77\x35\ --\xc5\x4b\x02\x17\x2d\xc5\x9f\x8b\x08\xa8\x33\x07\xe6\x4e\x99\xc8\ --\x3b\xf1\xfb\x9b\xac\x7a\xcf\x1a\x30\x39\xf4\xbf\xc3\xef\x4e\x7e\ --\x2a\xa1\x30\xb7\xfb\xbd\xfb\x2c\xb2\x35\xb7\x75\xe2\x8d\xe5\xff\ --\xe4\xe5\xfe\xd0\x15\x4f\x90\x3e\x2f\xae\x97\x1f\x98\x9e\x6b\xfc\ --\x44\xef\x60\x42\x19\x27\x00\x03\xf0\xf2\x2e\x75\x53\x93\x05\xd7\ --\x75\xf7\xf9\x82\xd4\x9e\xb7\x95\x75\x3a\xbd\x95\xf9\xcc\x7f\xd2\ --\xe2\x80\x69\x79\xfe\x7f\xd6\xcf\x42\x9f\xcb\xed\xc1\x7b\xab\x37\ --\x63\xd9\x27\x5b\xe0\xf6\x78\xf4\x0e\x87\x0d\x4c\x8c\x80\xf8\xb0\ --\xb8\x56\x7e\x78\xfa\x10\xe3\x0a\xbd\x83\x09\x55\x9c\x00\xf4\x07\ --\x91\x78\x65\x17\xbe\x6a\xb2\xe2\xca\x9e\x5e\x36\x2a\xa3\xe7\xe7\ --\xc2\x81\xb8\x43\x8f\x64\x02\xc0\xd4\x5c\xd5\xa7\x02\x3c\x55\x25\ --\x58\x6d\x76\x98\x6d\x0e\x58\xac\x76\xd8\xec\x4e\xd8\x1d\x2e\xb8\ --\x3c\x1e\x38\x1c\x2e\xd8\x9d\x2e\xb8\xdd\x1e\xd8\xbe\xde\x06\xa6\ --\x28\xca\x45\xcf\x88\xdd\x6e\x0f\xdc\xee\xf3\x27\x12\xa7\xcb\x03\ --\x83\x41\x42\x94\xf1\xdb\xa2\x8f\xa8\xe8\x28\xc4\x44\x7b\x33\xc1\ --\x98\xa8\x28\x44\x47\x47\x21\x3e\x2e\x1a\x46\x83\x01\x49\x09\xf1\ --\x30\x18\x24\x24\xc4\xc7\x21\x39\x29\x1e\x49\x09\x71\x48\x4a\x88\ --\x43\x72\x62\x02\xe2\xe3\x06\x78\x9c\x23\xfb\xc6\xf6\xfd\x47\xf0\ --\xf7\xb7\x56\xa3\xbe\xa9\x4d\xef\x50\x98\xbf\x10\xa2\x84\x10\xcb\ --\x4b\xea\xe4\xc4\xc2\x3c\xe3\x9b\x7a\x87\x13\x8a\x38\x01\xe8\x2b\ --\x22\xf1\xb7\x5d\xd8\xd9\x64\xc3\xe5\x3d\xbd\x2c\x2d\x0e\x3d\x76\ --\x92\x73\x78\xd0\xef\x7e\xff\xfd\x21\x04\x90\x14\x0d\x24\xc6\x10\ --\x12\xa2\xbd\x8f\x27\x5c\x32\xd0\xe9\x14\x30\x39\xfd\x7f\x84\xad\ --\x1e\x12\x25\x3b\xda\x9a\x3b\x50\x61\xb2\xa2\xad\xc3\x8c\x4e\xb3\ --\x15\x6d\x9d\x16\xb4\x77\x9a\xd1\x69\xb2\xa2\xc3\x6c\x83\xd9\x6a\ --\x83\xd9\x62\x87\xd5\x1e\xfc\x27\x8f\x1a\x0c\x12\x92\x13\x13\xbe\ --\x4e\x0a\xe2\x91\x9c\x18\x87\xa4\xa4\x78\xa4\xa7\x24\x21\x2b\x23\ --\x0d\x99\x83\x52\x90\x91\x96\x8c\xec\xcc\x74\xa4\xa7\x24\xc1\x60\ --\xe0\xbd\x07\x17\xaa\x69\x68\xc1\x5f\x97\x7e\x82\x3d\x25\xc7\xf4\ --\x0e\x85\x05\x86\x01\x10\x8b\x8b\xeb\x95\xe4\xe9\xb9\x86\xbf\xe8\ --\x1d\x4c\xa8\xe1\x04\xa0\x0f\x16\x2e\x24\x29\x7d\x17\xed\x6f\xb5\ --\x89\xc2\xde\x5e\xdb\x53\xe5\xb9\x47\x05\xf6\xd4\x48\xf0\x0c\xa4\ --\x32\xcf\x07\xd1\x06\x6f\x33\x9a\xc1\x89\xde\xa2\xb8\xae\x76\x22\ --\xd4\x98\xbc\xcd\x81\xe4\x10\x78\x14\xe1\xb0\xd9\xd0\xd1\xde\x02\ --\x53\x47\x2b\x4c\x1d\xed\xb0\x58\x3a\x61\x31\x75\xc2\xd4\xd1\x06\ --\x8b\xb9\x13\x6e\x57\x78\x35\x0b\x53\x14\x15\x1d\x26\x0b\x3a\x4c\ --\x96\x5e\x5f\x2b\x49\xd2\xd7\x89\x41\x2a\x86\xe4\x64\x60\x58\x5e\ --\x36\x0a\xf2\xb2\x30\x2c\x2f\x0b\xf9\xb9\x59\x11\x97\x1c\x38\x5d\ --\x6e\xbc\xb3\x6a\x23\x3e\xf8\xf4\x4b\xb8\xe5\x01\x9e\xcd\xcc\x82\ --\x9d\x10\x84\x97\x4a\xea\x94\xe4\xc2\x3c\xc3\x6f\xf5\x0e\x26\x94\ --\x70\x02\xe0\xa3\xfb\x56\x90\x21\x3d\x17\xc5\xad\xb6\x6f\xfb\xfa\ --\xf7\xa4\xab\x23\x7e\x01\xef\x79\xf1\xbb\xab\x25\x98\xfc\x74\x03\ --\x2a\x7d\xdd\x99\x2f\xda\x08\x44\x49\x84\x68\x23\x90\x12\xeb\x6d\ --\xd8\x93\xd6\xc3\x96\x3d\xb7\x02\x1c\x69\x14\x38\x13\x64\x47\xfe\ --\x7a\x3c\x6e\xb4\xb5\x34\xa2\xbd\xa5\x09\x1d\x6d\x2d\xe8\x68\x6b\ --\x41\x67\x7b\x2b\x3a\xda\x5b\xe0\x72\x06\xff\x5d\xbb\x5e\x54\x55\ --\x45\x6b\x87\x09\xad\x1d\x26\x1c\x2d\xaf\x3e\xef\x73\x7f\xff\xaf\ --\x1f\x60\xda\xc4\x51\x3a\x45\xa6\xbd\xad\x7b\x0e\xe2\xe5\xb7\x3e\ --\x45\x53\x6b\x87\xde\xa1\x30\x6d\xfd\x57\x49\x9d\x12\x5f\x98\x67\ --\xf8\x85\xde\x81\x84\x0a\x4e\x00\x7c\xb0\x70\x2b\x19\x53\x8d\x28\ --\x6d\xb5\x63\xa2\xaf\x5f\xd3\x55\x71\x9f\x4b\x06\xf6\xd5\x48\x68\ --\xb7\x0f\x3c\x26\x21\xbc\xcd\x85\xf2\x53\x7d\xeb\xcc\x77\x96\x42\ --\x5f\x1f\x60\xd3\x22\x74\x2d\x40\x54\x55\x15\x1d\xad\xcd\x68\x6d\ --\x6e\x40\x4b\x53\x03\xda\x5a\x1a\xd0\xda\x54\x8f\xce\x8e\x36\x50\ --\x38\x3c\x8f\x60\x9a\x3b\x53\xd7\x84\x17\x97\xac\x42\xd1\xa1\x93\ --\x7a\x87\xc2\xf4\xf3\xf3\x92\x3a\xc5\x55\x98\x67\xf8\x4f\xbd\x03\ --\x09\x05\x9c\x00\xf4\x62\xe1\x42\x92\x52\xa2\x51\xd2\x6e\xf3\x7d\ --\xf2\x07\x80\xca\x36\x81\x9c\x24\x6f\xcb\x59\x22\xa0\xd6\x2c\x50\ --\xd6\x28\xe0\xf4\xd3\x6a\x64\x66\x02\x61\x58\x9a\xef\x13\xa5\x4b\ --\x06\xaa\x3b\x05\xaa\xda\x05\x1c\x1a\x17\x40\x13\xa9\x68\x6f\x6d\ --\x46\x53\x5d\x0d\x1a\xeb\x6b\xd0\xd4\x50\x83\xe6\x86\x5a\x78\x3c\ --\x6e\x6d\x03\x61\x61\xc9\xe9\x72\x63\xf9\xa7\x5b\xb0\x6c\xd5\x66\ --\x5e\xee\x67\x00\xf0\x9b\x92\x7a\xc5\x51\x98\x6b\xf8\x5f\xbd\x03\ --\x09\x76\x9c\x00\xf4\x84\x48\xa4\xed\xc4\xae\x36\x1b\x26\xf5\xf5\ --\x4b\xad\x2e\x60\x63\xb9\x84\xf4\x38\x82\xd5\x25\xe0\xf0\xf3\xfb\ --\x92\x2f\x8f\x74\x55\x00\x2d\x56\x81\x5a\x13\x50\x6f\xd2\xee\x70\ --\x1e\xbb\xd5\x82\xda\x33\xa7\x50\x7f\xe6\x14\x1a\xeb\x6a\xd0\xdc\ --\x58\x0b\xb7\x3b\x48\x3a\x04\xb1\xb0\xb2\x69\xe7\x01\xbc\xf2\xf6\ --\xa7\x68\x69\x37\xe9\x1d\x0a\x0b\x26\x84\x3f\x94\xd4\x2a\xee\xc2\ --\x21\x86\x17\xf5\x0e\x25\x98\x71\x02\xd0\x83\xbf\xed\xa4\xaf\x5a\ --\xed\x62\x66\x7f\xbf\x5e\x51\x81\x16\x5b\x60\x9e\xb1\xb7\x58\x05\ --\x2c\x2e\x42\xd2\x05\x3b\xc5\x3c\x8a\xf7\x24\xbe\x06\x8b\xb7\x85\ --\xaf\x16\xcb\xfc\x56\x8b\x09\x75\x67\xaa\x50\x57\x7d\x0a\x75\x35\ --\xa7\xd0\xd4\x50\x1b\x1e\xdb\x0a\x58\xd0\x3a\x53\xdf\x8c\xbf\x2c\ --\x59\x85\x7d\x07\x4f\xe8\x1d\x0a\x0b\x56\x02\x7f\x3a\x50\x2f\x5b\ --\xa6\xe5\x1a\x17\xe9\x1d\x4a\xb0\xe2\x04\xa0\x1b\xaf\xec\xa6\x8d\ --\x4d\x96\x9e\xf7\xf9\xeb\x49\x56\x81\x2f\x2b\x25\x64\x24\x7a\x9b\ --\x0d\x39\x3d\x80\xc3\xe3\x6d\xc5\x1b\xe8\xb9\xd7\x6e\xb5\xe0\x74\ --\xe5\x71\x54\x55\x1c\x47\xcd\xe9\x72\x58\xcd\x7c\xf7\xc5\xb4\x61\ --\xb7\x3b\xb1\x64\xc5\x3a\xac\xfc\x62\x07\x64\x25\x04\xb6\xae\x30\ --\x3d\x09\x22\xf1\x5a\x71\xad\x6c\xe2\x66\x41\x5d\xe3\x04\xa0\x0b\ --\xaf\xec\xa2\x8f\x9a\x2c\xb8\x5e\xef\x38\x7a\xa3\x10\xd0\x64\x09\ --\x7c\x15\xbf\xaa\xaa\x68\x69\xac\x43\xe5\xc9\x23\xa8\x3c\x51\x86\ --\xe6\x86\x5a\x2e\xd4\x63\x9a\xdb\x59\x54\x86\x3f\x2f\xfe\x18\xcd\ --\xad\x9d\xbd\xbf\x98\x31\x2f\x83\x90\xc4\xb2\xe2\x3a\xd9\x31\x3d\ --\xcf\xf8\xb9\xde\xc1\x04\x1b\x4e\x00\x2e\xf0\xf7\x5d\xca\xe2\x26\ --\x2b\xee\xd5\x3b\x0e\xbd\x39\xec\x56\x54\x1c\x3b\x8c\x8a\xe3\x87\ --\x71\xe6\x74\x39\x3c\x6e\x2e\xd8\x63\xfa\xa8\xa8\xae\xc3\x8b\x8b\ --\x57\xe1\xd0\xb1\x53\x7a\x87\xc2\x42\x11\x21\x4a\x40\x7c\x5c\x5c\ --\xef\xb9\x6b\x7a\x6e\xd4\x3a\xbd\xc3\x09\x26\x9c\x00\x9c\xe3\x95\ --\x3d\xca\x1f\x9a\xcd\xd2\x53\x7a\xc7\xa1\x17\xb3\xa9\x03\xa7\x2b\ --\x8e\xa1\xf2\xf8\x11\x54\x55\x1c\x83\xaa\x06\xb8\x53\x11\x63\x3d\ --\xb0\xda\x1d\x58\xf2\xc1\x3a\xac\x5a\xbf\x03\x8a\xc2\xbf\x8b\x6c\ --\x40\xa2\x05\x49\x2b\x4b\xea\xe9\x96\xc2\x5c\xb1\x4d\xef\x60\x82\ --\x05\x27\x00\x5f\x5b\xbc\x87\x7e\x5c\x6b\xc6\x2f\x22\x6d\x61\xbb\ --\xa3\xad\x05\x27\x8e\x1c\x40\xf9\xf1\x43\x68\xaa\xaf\xd1\x3b\x1c\ --\xc6\x40\x44\xf8\xe2\xcb\xfd\x78\x6d\xd9\x1a\x9f\xba\x20\x32\xe6\ --\xa3\x78\x40\xfd\xac\xa8\x9e\xae\x9d\x91\x2b\x4a\xf4\x0e\x26\x18\ --\x70\x02\x00\xe0\xf5\xfd\x74\x57\xbd\x09\x2f\x45\xca\x3d\x86\xcb\ --\x69\xc7\x89\xb2\x52\x94\x95\xee\x47\x5d\x4d\x15\x57\xec\xb3\xa0\ --\x71\xb2\xaa\x16\x2f\x2d\x5e\x85\xc3\x27\xaa\xf4\x0e\x85\x85\x23\ --\x42\x8a\x04\x75\x7d\x71\x0d\x5d\x3e\x3d\x5f\x54\xe8\x1d\x8e\xde\ --\x22\x3e\x01\x78\x7d\x2f\xcd\x68\x35\x63\xa5\xac\x86\xf7\x09\xb2\ --\x8a\x22\xe3\x74\xc5\x71\x1c\x3d\xb8\x1f\x15\xc7\x0f\x43\xe1\x0a\ --\x6a\x16\x44\x2c\x36\x3b\xde\xfc\x70\x3d\x56\xae\xdb\xc1\x8f\x9e\ --\x58\xa0\x65\x08\x49\xfd\xec\x50\x35\xcd\x99\x3c\x54\x44\x74\xbf\ --\xe8\x88\x4e\x00\x5e\xd9\x47\xf9\xed\x36\x6c\x73\x2b\xe8\xe2\x98\ --\x9c\xf0\xd0\xdc\x58\x87\x83\xfb\x77\xe2\xf8\x91\x12\xee\xa5\xcf\ --\x82\x8e\xaa\x12\xd6\x6c\xde\x83\xd7\x97\xff\x13\x66\x8b\x4d\xef\ --\x70\x58\xe4\x18\x2f\x1b\x95\xd5\xe5\xe5\x74\xe3\xe8\xd1\x22\x62\ --\xbb\x94\x45\x6c\x02\xb0\x70\x2d\x25\x5b\xed\x28\x75\x7a\x10\xa7\ --\x77\x2c\xfe\xa6\x28\x0a\x2a\x8e\x1f\xc6\xa1\xe2\x5d\xa8\xae\xe4\ --\x46\x29\x2c\x38\x9d\x3c\x55\x8b\x3f\x2f\x5a\x89\xb2\xf2\xd3\x7a\ --\x87\xc2\x22\x92\xb8\xca\x12\xaf\xbe\x45\x44\x0f\x0a\x21\x22\xf2\ --\x39\x68\x44\x26\x00\xf7\xad\x20\x43\x42\x22\x4a\x2c\x4e\xa4\xeb\ --\x1d\x8b\x3f\x59\xcd\x26\x1c\x2a\xd9\x85\x03\x7b\x77\xc0\x61\xb7\ --\xea\x1d\x0e\x63\x5d\x32\x5b\xed\x58\xba\x82\x97\xfb\x59\x50\xf8\ --\x4e\x49\xbd\x7a\x02\xc0\x42\xbd\x03\xd1\x43\x44\x26\x00\x73\x72\ --\x68\x7d\xbb\x43\x8c\xd4\x3b\x0e\x7f\xa9\xa9\xaa\x40\xd1\xae\x2d\ --\x38\x55\x7e\x94\x1b\xf4\xb0\xa0\xa5\xaa\x2a\x56\x6f\xdc\x8d\x45\ --\xcb\xd7\xc2\x62\xf3\xc3\x91\x98\x8c\xf9\x81\x00\x7e\x73\xa0\x56\ --\xae\x9a\x36\xc4\xf8\xb6\xde\xb1\x68\x2d\xe2\x12\x80\x57\x77\xd1\ --\xff\x35\x5a\x71\x9d\xde\x71\x0c\x18\x11\x2a\x4f\x96\x61\xdf\xf6\ --\x4d\xde\x4a\x7e\xc6\x82\xd8\xf1\xca\x33\x78\x71\xd1\x2a\x1c\xad\ --\xa8\xd6\x3b\x14\xc6\x2e\x24\x48\x12\x8b\x4a\xea\x3c\x75\x85\x79\ --\x51\x9b\xf4\x0e\x46\x4b\x11\x95\x00\xbc\xb6\x87\x9e\x6c\x32\xe3\ --\xdf\xf4\x8e\x63\x20\x54\x45\xc1\xf1\xc3\x25\xd8\xbb\x63\x13\xda\ --\x5a\x1a\xf5\x0e\x87\xb1\x1e\x99\x2d\x36\x2c\xfd\x68\x03\x56\xae\ --\xdb\x0e\x55\xe5\xd5\x29\x16\xa4\x08\x51\x80\xb4\x72\x4f\x0d\x5d\ --\x39\x2b\x5f\x1c\xd2\x3b\x1c\xad\x44\x4c\x02\xf0\xc6\x1e\xba\xa2\ --\xd9\x8a\x45\xa1\xfa\xc4\x51\xf6\x78\x70\xa8\x64\x17\x8a\x76\x6e\ --\x85\xd9\x14\xd1\x3b\x57\x58\x08\x50\x14\x15\x2b\xd7\xed\xc0\x92\ --\x0f\xd7\xc1\x66\xe7\xdd\x27\x2c\x24\x24\x1f\x6f\xa6\x6d\x6f\x14\ --\xd1\x4d\xcf\xce\x10\x7b\xf5\x0e\x46\x0b\x11\x91\x00\xbc\xb1\x8d\ --\x72\x3a\x1c\xd8\xe8\x51\x21\xe9\x1d\x4b\x5f\x11\x11\x4e\x1e\x3d\ --\x88\x6d\x1b\x3f\x83\xa9\xa3\x4d\xef\x70\x18\xeb\x55\xe9\xd1\x4a\ --\xbc\xb4\x64\x15\x2a\xab\xeb\xf5\x0e\x85\xb1\x3e\x69\x30\x8b\x14\ --\x83\x84\xcd\x4b\xb7\xd2\x90\x27\xae\x11\x61\x7f\xea\x54\xd8\x27\ --\x00\x0b\xb7\x92\xd1\x02\x2a\xb2\x7b\x44\xac\xde\xb1\xf4\x55\x75\ --\xe5\x09\x6c\x5d\xbf\x1a\xad\x4d\xfc\x46\xca\x82\x5f\x5b\xa7\x19\ --\xaf\xbe\xfb\x39\x36\x6c\x2b\xe6\x62\x54\x16\x72\x08\x80\x4b\x06\ --\x54\x42\x42\x5c\x02\xf6\x02\x18\xab\x77\x4c\x81\x16\xf6\x09\xc0\ --\xa0\x18\xac\x69\xb1\x8a\x5c\xbd\xe3\xe8\x8b\xba\x33\xa7\xb0\x7d\ --\xd3\xe7\xa8\xad\xe6\xd3\xcf\x58\xf0\x3b\xbb\xdc\xbf\xf8\xc3\x2f\ --\x60\xb7\x3b\xf5\x0e\x87\xb1\x7e\x11\x00\x06\xc5\x13\x5a\x6c\x02\ --\x2d\x36\x8c\x79\x63\x2f\xbd\xf7\xec\x4c\xf1\x90\xde\x71\x05\x52\ --\x58\x27\x00\xaf\xec\xa4\x9f\x35\x5b\x71\x93\xde\x71\xf8\xaa\xb5\ --\xa9\x1e\x5f\xae\xff\x14\xa7\x2b\x8f\xeb\x1d\x0a\x63\x3e\x29\x3e\ --\x5c\x8e\x97\xde\x5c\x85\xd3\x35\x5c\x90\xca\x42\xdf\x98\x4c\xa0\ --\xe5\xeb\x86\x94\x0d\x26\x3c\xf8\x66\x11\x6d\x7d\x72\x86\x58\xac\ --\x6f\x54\x81\x13\xb6\x09\xc0\x2b\xbb\x68\x76\xab\x0d\x7f\x08\x85\ --\x85\x48\x8f\xdb\x8d\xfd\xbb\x36\x63\xef\xb6\x8d\xdc\xa3\x9f\x85\ --\x84\xd6\x0e\x13\x5e\x5b\xb6\x86\x97\xfb\x59\x58\xc9\x4c\x20\x64\ --\x27\x01\x8d\x16\x01\x15\x40\xa3\x19\xaf\xff\x63\x1f\xed\xfe\xee\ --\x65\xa2\x4c\xef\xd8\x02\x21\x2c\x13\x80\x85\xbb\x28\xdd\xe2\xc2\ --\x06\x85\x82\xbf\xe8\xaf\xf2\xc4\x11\x6c\xfa\xe7\x47\xb0\x98\xc2\ --\xbe\xde\x84\x85\x01\x59\x51\xb0\x6a\xdd\x4e\x2c\xfa\x60\x2d\x1c\ --\x8e\x88\x6d\xa1\xce\xc2\xd8\xf8\x2c\x42\xa3\xc5\x7b\x36\x9c\x53\ --\x86\xc1\xe2\xc4\x8e\x85\x55\x94\xb3\x70\xb8\x08\xbb\xe7\x5b\xe1\ --\x97\x00\x10\x89\xa4\x6d\xb4\xd7\xe4\x11\x09\x7a\x87\xd2\x93\xf6\ --\xd6\x66\x6c\x59\xbb\x92\x97\xfb\x59\xc8\x28\x39\x52\x8e\x17\x97\ --\xf0\x72\x3f\x0b\x6f\x29\xb1\x40\x72\x2c\x60\xfe\x7a\xba\x37\x39\ --\x91\x9a\xd3\x84\x2d\x00\x66\xeb\x1a\x58\x00\x84\x5d\x02\xf0\xb7\ --\x5d\xea\xbb\xad\x2e\x69\x94\xde\x71\x74\xc7\xe3\x71\x63\xe7\x96\ --\xb5\x28\xd9\xbb\x0d\x2a\x2f\xf7\xb3\x10\xd0\xd8\xd2\x8e\xbf\xbd\ --\xb5\x1a\xdb\xf6\x1e\xd6\x3b\x14\xc6\x34\x91\x10\x4d\x30\x3b\xbf\ --\x3d\x21\xbe\xd1\x82\xcb\xdf\x2b\x51\x7e\xfb\x50\xa1\xe1\x37\x3a\ --\x86\xe5\x77\x61\x95\x00\xbc\xbe\x87\x1e\x6e\xb0\x20\x68\xab\x36\ --\x1b\x6a\xab\xb1\x76\xd5\x32\x74\xb4\x35\xeb\x1d\x0a\x63\xbd\x3a\ --\xbb\xdc\xbf\xf8\xfd\xb5\xb0\x3b\x79\xb9\x9f\x45\x0e\xf9\x82\x7b\ --\x33\x22\xa0\xba\x53\xfa\xf5\xea\x13\xb4\x71\xde\x58\xb1\x5d\x9f\ --\xa8\xfc\x2f\x6c\x12\x80\xd7\x0e\xd0\xb0\xb6\x0e\x5a\x4a\x24\x7a\ --\x7f\xb1\xc6\x14\x45\xc1\xae\xad\x5f\x60\xdf\x8e\xcd\x20\x0a\xd5\ --\x5e\x84\x25\xdb\xf2\xe7\x00\x00\x20\x00\x49\x44\x41\x54\x2c\x92\ --\xd4\x37\xb5\xe1\x85\xdf\xbe\x8e\xba\xa6\x56\xbd\x43\x61\x4c\x73\ --\x2e\xf9\xe2\x79\xc4\x29\x43\x9c\x6e\xa6\x2f\xf6\x94\x53\xee\xac\ --\xd1\xc2\xac\x43\x58\x7e\x17\x1e\x09\x00\x91\x70\xee\xa0\xed\x2e\ --\x59\x04\xdd\x7f\x4f\x6b\x73\x03\xd6\xae\x5a\x86\xe6\x86\x5a\xbd\ --\x43\x61\xcc\x67\x4d\xad\x1d\x3c\xf9\xb3\x88\xa5\x74\xb3\xb1\xa5\ --\xdd\x21\x12\x8e\x76\xd2\x66\x00\x97\x6a\x1a\x50\x80\x04\x7d\x95\ --\xbc\x2f\x5e\xdd\xa3\x2e\xe9\x70\x88\x21\x7a\xc7\x71\x2e\x22\x15\ --\xfb\x76\x6c\xc2\xbb\xaf\xff\x89\x27\x7f\xc6\x18\x0b\x21\xe9\xf1\ --\xdd\x6f\x6d\xad\xee\x14\x33\x3e\x2c\x55\xfe\x43\xc3\x70\x02\x26\ --\xe8\xee\x98\xfb\xea\xd5\x1d\x74\x4b\xb3\x95\x9e\xd0\x3b\x8e\x73\ --\x59\xcd\x26\x7c\xfe\xd1\x5b\xa8\x3b\xc3\x9d\xfc\x18\x63\x2c\xd4\ --\x4c\xca\x26\x38\x3d\x40\x8b\xed\xdb\x47\x01\x51\x12\x90\x18\xe3\ --\x2d\x10\x54\x20\x7e\x55\x54\x4f\x6f\xcf\xc8\x15\x67\x74\x0c\x73\ --\xc0\x42\x3a\x01\xf8\xdf\x8d\x94\x62\xf2\xd0\x4a\x35\x88\x9e\xfb\ --\xd7\x54\x57\x62\xcd\x47\x6f\xc1\x66\x09\x8b\x47\x44\x8c\x31\x16\ --\x71\xa2\x0d\xc0\x9c\x61\x04\x97\x4c\xf0\xa8\x80\x51\x02\x62\xcf\ --\x9f\x2d\x63\x41\xea\xbb\x2b\x88\xae\x5d\x20\x44\xc8\x6e\xe7\x0a\ --\xe9\x47\x00\xb1\x71\xd8\xea\xf0\x88\x38\xbd\xe3\x00\x00\x10\xa1\ --\x78\xcf\x57\xf8\xe8\xed\x57\x78\xf2\x67\x8c\xb1\x30\x10\x63\x04\ --\x12\xa3\x2f\x9a\xfc\xbf\x26\xae\x1a\x5d\xaf\xfe\x54\xeb\x98\xfc\ --\x29\x64\x13\x80\xd7\xf6\xd0\xbf\xb4\xdb\x31\x4d\xef\x38\x00\xc0\ --\xe3\x76\xe1\xf3\x15\x6f\x61\xeb\x17\xab\x78\x6f\x3f\x63\x8c\x45\ --\x08\x12\xf8\xfd\x81\x06\x0a\xd9\x82\xc0\x90\x4c\x00\xfe\xbe\x97\ --\x86\xb7\x59\xf1\xff\xf4\x8e\x03\x00\xda\x5b\x9a\xf0\xee\x3f\xfe\ --\x8c\x13\x47\x4b\xf5\x0e\x85\x31\xc6\x98\x96\x08\x51\xa4\xaa\x6f\ --\x17\xd5\x53\xbc\xde\xa1\xf4\x47\x48\x26\x00\xb2\x07\x5b\xdc\x2a\ --\x0c\x7a\xc7\x51\x7e\xfc\x30\xde\x7d\xe3\x4f\x68\x6f\x69\xd2\x3b\ --\x14\xc6\x18\x63\xfa\x18\x2f\x41\xfd\x93\xde\x41\xf4\x47\xc8\x25\ --\x00\x6f\xec\xa6\xbf\x77\xd8\x31\x4c\xef\x38\x0e\x17\xef\xc6\xe7\ --\x1f\xbe\x09\x8f\xc7\xad\x77\x28\x8c\x31\xc6\xf4\x44\xf8\x5e\x49\ --\x9d\x7c\xa7\xde\x61\xf4\x55\x48\x25\x00\x4b\xf7\xd0\xac\x26\x3b\ --\x7e\xa0\x6b\x10\x44\xd8\xf5\xe5\x17\x58\xff\xd9\x07\x50\x55\xee\ --\xea\xc7\x18\x63\x0c\x00\xc4\xe2\x7d\xcd\x94\xad\x77\x14\x7d\x11\ --\x32\x09\xc0\xc2\x85\x24\xb5\xbb\xf1\xb9\xac\x40\xb7\x3d\x7f\x8a\ --\xa2\x60\xcd\xaa\x77\xb1\x6b\xeb\x3a\xbd\x42\x60\x8c\x31\x16\x9c\ --\x32\xa3\x3c\xb4\x48\xef\x20\xfa\x22\x64\x12\x80\xc1\x37\x61\x89\ --\xc9\x89\x0c\xbd\xc6\xf7\xb8\x5d\xf8\xe4\xbd\x7f\xe0\xf8\xa1\x62\ --\xbd\x42\x60\x8c\x31\x16\xc4\x08\x74\xfb\xfa\x93\xca\x8f\xf4\x8e\ --\xc3\x57\x21\x91\x00\x2c\xda\x43\x93\x5b\xed\x78\x4c\xaf\xf1\xad\ --\x16\x13\xde\x5b\xf4\x12\x4e\x57\x1e\xd7\x2b\x04\xc6\x18\x63\x21\ --\xe0\x70\xbd\x78\xe9\xbd\x03\x34\x55\xef\x38\x7c\x11\x12\x09\x80\ --\xc5\x8d\x7f\x7a\x74\x5a\xfa\xb7\x5b\x2d\xf8\xe8\x9d\x57\xd1\xda\ --\xdc\xa0\xc7\xf0\x8c\x31\xc6\x42\x44\x87\x03\x30\xbb\x85\xa1\xc5\ --\x8e\x35\x7a\xc7\xe2\x8b\xa0\x4f\x00\x5e\xdf\xad\xfc\xae\xd3\x09\ --\x5d\x0e\xfa\xb1\xdb\x2c\xf8\xf0\xed\x97\xd1\xd6\xdc\xa8\xc7\xf0\ --\x8c\x31\xc6\x42\xc8\xa9\x76\xef\x7d\x6a\xbb\x0d\x79\x6f\x15\x29\ --\x7f\xd4\x39\x9c\x5e\x05\x75\x02\xf0\xda\x2e\xca\x6b\xb5\x4b\xbf\ --\xd4\x63\x6c\xbb\xcd\x82\x0f\x97\xf2\xe4\xcf\x18\x63\xac\x77\x76\ --\x37\x50\x67\xfa\x76\xa1\xba\xce\x24\x7e\xfa\xfe\x01\x1a\xa6\x5f\ --\x44\xbd\x0b\xea\x04\x40\x56\x69\xbd\x5b\xd1\xbe\xe1\xcf\x37\x93\ --\x7f\x0b\x4f\xfe\x8c\x31\xc6\x7a\x57\xd6\x24\xa0\x9e\x73\x8a\xb0\ --\x4b\x11\x52\x9b\x13\xff\xd4\x2f\xa2\xde\x05\x6d\x02\xb0\x78\x2f\ --\x3d\xdd\x6a\x17\x13\xb5\x1e\xd7\x61\xb7\x62\xc5\x5b\xaf\xf0\xe4\ --\xcf\x18\x63\xcc\x27\xed\x0e\xa0\xde\x7c\x71\x99\x5a\x8b\x05\x13\ --\x96\x16\x51\xd0\xee\x0a\x08\xca\x04\xe0\x8f\x07\x29\xa1\xc5\x8e\ --\x97\xa9\xf7\x97\xfa\x95\xcb\x69\xc7\x87\x4b\x5f\xe6\x82\x3f\xc6\ --\x18\x63\x3e\x21\x02\x0e\x37\x48\xe8\x6a\xbe\x22\x00\xcd\x56\xfc\ --\x71\xc9\x0e\x4a\xd2\x3a\x2e\x5f\x04\x65\x02\x90\xe2\xc2\x27\x0e\ --\x0f\x62\xb4\x1c\x53\x55\x14\x7c\xfa\xe1\x52\x9e\xfc\x19\x63\x8c\ --\xf9\xec\x68\xb3\x40\x87\xa3\xfb\xcf\xdb\xdc\x88\xf1\x18\xb1\x52\ --\xbb\x88\x7c\x17\x74\x09\xc0\xf2\x52\xba\xa2\xc1\x8c\x1b\x34\x1d\ --\x94\x08\xeb\x3e\x7b\x1f\x67\x4e\x9d\xd4\x74\x58\xc6\x18\x63\xa1\ --\xab\xbc\x4d\xa0\xa2\xb5\xf7\x1d\xea\x4d\x16\xdc\xf0\xee\x01\x9a\ --\xad\x41\x48\x7d\x12\x74\x09\x40\xab\x15\x2b\x14\x8d\x5b\xec\xef\ --\xfa\x6a\x1d\x8e\x96\xee\xd7\x76\x50\xc6\x18\x63\x21\x49\x56\x81\ --\xd2\x7a\x81\xb2\x46\xd1\xe5\xd2\xff\x85\x14\x02\xda\xec\x58\x11\ --\xf0\xc0\xfa\x28\xa8\x12\x80\xb7\x8b\x94\x9f\xb7\xda\x91\xa3\xe5\ --\x98\xc7\x8f\x94\x60\xd7\x97\xeb\xb5\x1c\x92\x31\xc6\x58\x08\x52\ --\x01\x54\x77\x0a\x6c\xae\x90\x70\xba\xa3\x6f\xbd\xe9\xda\x6d\xc8\ --\x7b\xa7\x44\xf9\x45\x60\x22\xeb\x9f\xa0\x49\x00\xde\x39\x48\x09\ --\x8d\x56\xf1\x5b\x2d\xc7\xac\xa9\xae\xc4\x17\xab\xde\xf3\x56\x71\ --\x30\xc6\x18\x63\x5d\x70\xc9\xc0\x89\x16\x81\x8d\x27\x24\x1c\xa8\ --\x13\x70\x78\xfa\x77\x9d\x46\xb3\xb4\xf0\x8d\x22\x8a\xf7\x6f\x74\ --\xfd\x67\xd4\x3b\x80\xb3\x5c\x6e\xac\xb0\xb9\x45\xb4\x56\xe3\xb5\ --\xb7\x34\x61\xf5\xf2\xc5\x50\x14\x59\xab\x21\x19\x63\x8c\x85\x10\ --\xbb\x07\x28\x6f\x15\x38\xd3\x21\xa0\xf8\xe1\x3e\xd1\xea\x46\x4c\ --\xaa\x82\xe5\x00\xe6\x0d\xfc\x6a\x03\x17\x14\x2b\x00\x2b\xca\x68\ --\x6a\xa3\x19\xb7\x68\x35\x9e\xdb\xed\xc2\xea\x0f\x97\xc0\xe5\xb4\ --\x6b\x35\x24\x63\x8c\xb1\x10\xe1\x92\x81\x92\x3a\x81\x4d\x27\x25\ --\x54\xb5\xfb\x67\xf2\x3f\xab\xc9\x8a\x3b\x97\x1d\xa2\x49\xfe\xbb\ --\x62\xff\x05\xc5\x0a\x40\xab\x05\x1f\x68\x76\xd8\x0f\x11\xd6\x7f\ --\xb2\x1c\xed\x2d\x4d\x9a\x0c\xc7\x18\x63\x2c\x74\xb4\xd8\x04\xf6\ --\xd7\x08\xb8\x95\xc0\x5c\xdf\xa3\x40\x74\x58\xf0\x31\x80\xb1\x81\ --\x19\xc1\x77\xba\xaf\x00\x2c\x3f\x40\xf3\x9a\x2c\xda\x7d\x23\xf6\ --\xef\xda\x82\x13\x47\x4b\xb5\x1a\x8e\x31\xc6\x58\x88\x68\xb6\x0a\ --\xec\x3e\x1d\xb8\xc9\xff\xac\x56\x1b\xc6\xbc\xb9\x8f\xee\x0f\xec\ --\x28\xbd\xd3\x7d\x05\xa0\xc5\x8e\x7f\x68\x55\x83\x57\x77\xe6\x14\ --\xb6\x6f\x0a\x89\x53\x1a\xd9\x05\x24\x49\x60\x50\x6a\x32\x72\xb2\ --\x06\x21\x2d\x35\x11\xc9\x89\xf1\x48\x4a\x8c\x47\x72\x42\x3c\x84\ --\x00\x0c\x06\x03\x14\xc5\xfb\x57\x5b\x79\xa6\x01\x1b\xb6\x15\xeb\ --\x1c\x31\x63\x2c\x94\x58\x5d\xc0\xfe\x1a\x01\x2d\x76\xa1\x13\x80\ --\x0e\x27\x5e\x05\xf0\xa1\x06\xc3\x75\x4b\xd7\x04\x60\x59\x89\xf2\ --\x8b\x93\xad\xc8\xd4\x62\x2c\xb7\xd3\x81\xb5\x2b\xdf\x85\xaa\x6a\ --\xdc\x64\x80\xf5\x89\x10\x02\xf9\x39\x99\x18\x3b\x72\x08\x46\xe4\ --\xe7\x60\x58\x7e\x36\x86\xe7\x67\x63\x70\x46\x1a\xa2\x8c\xbe\x9d\ --\x0b\xb5\xff\xe0\x49\x4e\x00\x18\x63\x3e\x53\x09\xd8\x73\x46\x82\ --\x47\xc3\xe9\xc1\xe4\x44\xfa\xd2\x62\xfa\xd5\x13\xd3\xc5\xff\x68\ --\x37\xea\xf9\x74\x4b\x00\x16\x12\x19\x1b\xb7\xe3\x37\x5a\x8d\xb7\ --\xe1\xf3\x15\x30\x75\xb6\x6b\x35\x1c\xf3\x91\xc1\x20\x61\xc2\xa8\ --\xa1\x28\xbc\x64\x34\xa6\x8c\x1f\x81\xf1\xa3\xf3\x91\x94\x10\x34\ --\xbb\x64\x18\x63\x11\xe0\x78\x8b\x80\xd5\xad\xfd\xb8\x2d\x16\xfc\ --\xc7\x8a\x32\xfa\xd3\x82\x89\x42\x87\xd1\x75\x4c\x00\x86\x15\xab\ --\xaf\x9d\x72\x4a\x71\x5a\x8c\x55\x56\xba\x0f\xc7\x8f\x94\x68\x31\ --\x14\xf3\x41\x5a\x4a\x12\xae\xb8\x74\x22\xe6\x4c\xbf\x04\x85\x97\ --\x8c\x42\x7c\x9c\xa6\xc7\x3e\x30\xc6\xd8\x37\xcc\x4e\xa0\xa2\x45\ --\x9b\x1a\xf4\x0b\x59\xdd\x88\xb5\x39\xd4\x97\x01\x7c\x57\x8f\xf1\ --\x75\x49\x00\x96\xed\xa1\xe4\x5a\x0b\x1e\xd7\x62\x2c\x8b\xb9\x13\ --\x9b\xbf\x58\xa5\xc5\x50\xac\x07\xe9\xa9\x49\xb8\x6e\xf6\x34\x5c\ --\x33\x7b\x0a\x2e\x19\x33\x1c\x92\xa4\xcf\x1f\x1c\x63\x8c\x9d\xeb\ --\x50\xa3\x36\xcf\xfd\xbb\xd3\x68\x91\x9e\x58\xb6\x87\xfe\xf5\xe1\ --\x59\xc2\xac\xf5\xd8\xba\x24\x00\x2e\x89\xde\xb2\x7b\x84\x26\x63\ --\x6f\xf8\xec\x43\xb8\x9d\x3d\x1c\xd5\xc4\x02\x26\xda\x68\xc4\xd5\ --\xb3\x26\xe3\xe6\xab\x2f\xc5\x8c\xc9\x63\x60\x30\xe8\xbe\xe9\x84\ --\x31\xc6\xbe\xd1\x60\x16\x68\xb5\xe9\x7b\x33\xe2\xf0\xc0\x68\x8f\ --\xc7\x5b\x00\xe6\x6b\x3d\xb6\xe6\x09\xc0\x8a\x72\xca\xac\xa8\xa1\ --\xbb\xb4\x18\xeb\x70\xc9\x1e\x54\x95\x1f\xd5\x62\x28\x76\x8e\xcc\ --\xf4\x14\xdc\x71\xfd\x2c\xdc\x7d\xd3\x1c\xa4\xa5\x04\xe5\x31\xd8\ --\x8c\xb1\x08\xa7\x10\x70\xa4\x29\x38\x56\x22\x9b\xad\x34\xef\x8d\ --\x22\x2a\x78\x76\x86\x38\xa3\xe5\xb8\x9a\x27\x00\x56\x13\xde\x75\ --\xca\x22\xe0\xb7\x82\x36\xab\x19\x5b\xd7\xaf\x0e\xf4\x30\xec\x1c\ --\x13\x47\x0f\xc3\x43\xf3\xae\xc5\x15\x97\x5e\xc2\x4b\xfc\x8c\xb1\ --\xa0\x56\xd9\x2a\x60\xd3\xa5\xf4\xee\x62\x6e\x45\x08\xd5\x43\x6f\ --\x03\xb8\x46\xcb\x71\x35\x4d\x00\x56\x1f\xa6\xfc\xb2\x66\xdc\xa8\ --\xc5\x58\x5b\xbf\xf8\x84\x97\xfe\x35\x32\xab\x70\x3c\x1e\x9e\x77\ --\x1d\xa6\x4e\x18\xa9\x77\x28\x8c\x31\xd6\x2b\x97\x0c\x9c\x6c\x0d\ --\xae\x9b\x94\x56\xbb\xb8\xfa\x9d\xbd\x34\xfc\xd1\x99\xa2\x4a\xab\ --\x31\x35\x4d\x00\xda\xec\x78\xdb\xa5\x41\xcb\xdf\xea\xca\x13\x5c\ --\xf5\xaf\x81\x4b\xc6\x0c\xc3\xb3\x0f\xdd\x86\x69\x13\x47\xe9\x1d\ --\x0a\x63\x8c\xf9\xec\x74\x87\x80\x1c\x64\x2d\x61\x3c\x0a\x84\x03\ --\x58\x0a\x60\xae\x56\x63\x6a\x96\x00\xbc\x7f\x98\xf2\x4f\xb5\x04\ --\xfe\x3f\x4c\x51\x64\x6c\xfa\xe7\x47\x81\x1e\x26\xa2\x8d\x28\xc8\ --\xc1\xf7\x1f\xbe\x03\xb3\x0a\xc7\xeb\x1d\x0a\x63\x8c\xf5\x09\x11\ --\x50\xdd\x11\x5c\x77\xff\x67\x35\x5b\x71\x95\x96\xab\x00\x9a\x25\ --\x00\x56\x07\xde\x71\xc9\x81\xbf\xfb\x2f\xda\xb9\x15\x1d\x6d\x2d\ --\x81\x1e\x26\x22\x25\x25\xc4\xe3\xa9\xfb\x6f\xc6\xdd\x37\xcd\xe1\ --\x8a\x7e\xc6\x58\x48\xea\x70\x7a\x8f\xf9\x0d\x46\x1e\x05\xc2\x29\ --\xf0\x26\x34\xaa\x05\xd0\x24\x01\x58\x79\x90\x86\x1c\x6f\xc5\xd5\ --\x81\x1e\xc7\x66\x35\x63\xcf\xf6\x8d\x81\x1e\x26\xe2\x08\x21\x70\ --\xfb\x75\x33\xf1\xdc\x83\xb7\x23\x25\x39\x41\xef\x70\x18\x63\xac\ --\xdf\x3a\x1d\xc1\x79\xf7\x7f\x56\x93\x05\x57\xbf\x57\x42\x43\x1f\ --\x2a\x14\xd5\x81\x1e\x4b\x93\x04\xa0\xd3\x83\x25\x5a\x3c\xfb\xdf\ --\xbe\x69\x0d\x3c\x6e\x57\xa0\x87\x89\x28\xb9\x83\x07\xe1\x67\xcf\ --\x2e\xc0\x8c\xc9\x63\xf4\x0e\x85\x31\xc6\x06\xcc\x25\xeb\x1d\x41\ --\xcf\x3c\x0a\x84\xd5\x83\xa5\x00\xae\x0d\xf4\x58\x01\x5f\xc7\x5d\ --\x55\x4b\x83\x9a\xcd\xb8\x3e\xd0\xe3\x34\x35\xd4\xa2\xac\x74\x5f\ --\xa0\x87\x89\x18\x42\x08\x2c\xb8\xed\x2a\xbc\xfd\xe7\x9f\xf1\xe4\ --\xcf\x18\x0b\x1b\x5a\x9d\x3e\x3b\x10\xcd\x56\xcc\x7d\xbb\x94\xf2\ --\x02\x3d\x4e\xc0\x57\x00\x2c\xcd\x78\xcd\x21\x07\x3e\xd1\xd8\xb6\ --\xf1\x33\x50\x28\xfc\x64\x43\x40\x5a\x4a\x12\xfe\xfd\x07\x0f\x70\ --\x91\x1f\x63\x2c\xec\x44\xf9\x76\xa8\xa8\xae\x3c\x0a\x84\xdd\x41\ --\xaf\x03\xb8\x23\x90\xe3\x04\x74\x62\xde\xb5\x8b\xe2\x9a\xcc\x74\ --\x77\x20\xc7\x00\x80\xda\xea\x53\xa8\xae\x3c\x11\xe8\x61\x22\xc2\ --\x8c\xc9\x63\xf0\xd6\x9f\xff\x95\x27\x7f\xc6\x58\x58\x8a\x8f\xd2\ --\x3b\x02\xdf\xb4\xdb\xc5\x2d\x0b\x8b\x28\xa0\x47\xa3\x06\x74\x05\ --\xa0\x32\x56\xfd\xb3\xd5\x2a\x05\x74\x0c\x49\x00\x25\xdb\x3f\x0f\ --\xe4\x10\x11\x41\x92\x04\x9e\xbe\xff\x56\x3c\x32\xff\x3a\x08\x11\ --\xdc\x45\x32\x8c\x31\xd6\x5f\xc1\xba\x03\xe0\x42\x2e\x05\x86\x3c\ --\x8f\xfa\x27\x00\xdf\x0f\xd4\x18\x01\x5b\x01\x58\x41\x64\x68\xb6\ --\x8a\x27\x02\x75\x7d\x00\x88\x35\x02\x71\xe6\x32\x9c\x2c\x3f\x15\ --\xc8\x61\xc2\x5e\x42\x7c\x1c\xfe\xf7\x17\x4f\xe3\xd1\x7b\xae\xe7\ --\xc9\x9f\x31\x16\xb6\x5c\x32\x70\x52\xa7\xa3\x7f\xfb\xa3\xd3\x2d\ --\x3d\x0e\xa2\x80\x05\x1c\xb0\x04\x20\xe1\x24\x9e\x4b\x8c\x41\xec\ --\x88\x74\xc2\xb0\x34\x42\x4e\x32\x21\x31\x1a\x7e\xdb\x0a\x90\x18\ --\x0d\x5c\x35\x5c\xc5\xc7\x9f\x6e\xf0\xd3\x15\x23\x53\x41\x6e\x16\ --\x16\xfd\xe1\xc7\x98\x5d\x38\x41\xef\x50\x18\x63\x2c\xa0\xca\x1a\ --\x05\x3c\x41\xd6\x01\xb0\x27\x36\x17\xe2\x16\xed\xc3\xbf\x06\xea\ --\xfa\x01\x5b\x9e\xcf\x49\x54\x1e\xca\x49\xbc\x70\xba\x27\xb8\x15\ --\xa0\xcd\x2e\xd0\x6a\x03\x5a\x6d\x02\x66\x27\xd0\xd7\xd2\xbd\xb4\ --\x38\x60\x56\x81\x8a\xb2\xe3\xe5\x28\x2b\x3f\xed\xa7\x88\x23\xcf\ --\x84\xd1\x43\xf1\xc7\x5f\x3e\xc3\x7b\xfb\x19\x63\x61\xaf\xde\x2c\ --\x70\xc6\x14\x3a\x77\xff\x67\x99\xdd\xf8\x37\x00\x7f\x0c\xc4\xb5\ --\x03\x92\x00\x14\xd7\xd3\x74\x90\x7a\x79\x57\x9f\x8b\x36\x00\x39\ --\x49\x84\x9c\x24\x00\x20\x38\x65\xa0\xc1\x22\x50\xdd\x2e\xd0\xe9\ --\xec\xfd\xda\xc3\xd3\x08\x97\xe4\x10\x0c\x02\x78\x67\xd5\x26\xff\ --\x06\x1e\x41\xae\xbc\xf4\x12\x2c\x7c\xe1\x51\xc4\x44\x87\x48\x45\ --\x0c\x63\x8c\xf5\x93\xc5\x05\x94\xd6\x87\xde\xe4\x0f\x00\x26\x07\ --\x32\x97\xee\xa3\xf9\x4f\x5c\x26\x56\xf9\xfb\xda\x01\x49\x00\x04\ --\xa9\x3f\xf5\xf5\xb5\xb1\x46\xef\xa4\x3e\x3c\x8d\xd0\x62\x13\xa8\ --\x6a\x07\x1a\xcd\x02\xe7\xae\xd2\x18\x04\x30\x28\x81\x30\x36\x93\ --\x30\xe8\xeb\x9a\xc8\xa3\x15\xd5\x28\x3a\x74\xd2\xcf\x91\x47\x86\ --\xbb\x6e\x98\x8d\x7f\x79\xe6\x1e\x48\x12\xb7\xf3\x65\x8c\x85\x37\ --\x97\x0c\xec\xa9\x96\xe0\x56\xf4\x8e\xa4\xff\xcc\x1e\xfa\x5f\x00\ --\xc1\x9f\x00\x94\x9c\xa1\x5c\x40\xbd\xb7\x3f\x5f\x9b\x99\x40\xc8\ --\x4c\x00\x14\x22\x98\x9c\x80\xa2\x0a\x44\x49\x84\xa4\x18\xe0\xc2\ --\xd6\xf3\x1f\x7c\xba\xd5\x1f\xe1\x46\x9c\xfb\x6e\xbd\x0a\xcf\x3f\ --\x31\x8f\x8b\xfd\x18\x63\x61\xcf\x25\x03\x3b\xab\x25\xd8\x42\xa4\ --\xf2\xbf\x3b\x1d\x36\x31\xfa\x1f\xfb\x68\xea\x77\x2f\x13\xa5\xfe\ --\xbc\xae\xdf\x13\x00\x61\x54\xbf\x4f\x84\xe8\x81\x5c\xc3\x20\x80\ --\xf4\x38\xa0\xbb\xea\x80\x96\x76\x13\xb6\xed\x3b\x32\x90\x21\x22\ --\xd2\x5d\x37\xcc\xe6\xc9\x9f\x31\x16\x11\xac\x6e\xef\x9d\xbf\xd5\ --\xad\x77\x24\x03\xa7\x02\x20\xc2\x5f\xe0\xe7\xa3\x82\xfd\xba\x06\ --\x5c\x5e\x4e\x31\x44\xf8\xae\x3f\xaf\xd9\x95\x95\x5f\x6c\x87\xac\ --\x84\xf0\x7a\x8e\x0e\xee\xbd\xf5\x4a\xfc\xeb\x77\xef\xe5\xc9\x9f\ --\x31\x16\xf6\x1a\x2d\x02\x5f\x55\x86\xc7\xe4\x7f\x56\xab\x15\x57\ --\xbe\x73\x90\xfc\x5a\xb1\xed\xd7\x04\xc0\x9c\xa0\xdc\x07\x20\xd3\ --\x9f\xd7\xbc\x90\xcb\xed\xc1\x67\x9b\xf6\x04\x72\x88\xb0\x73\xe3\ --\x55\xd3\xf1\xe3\x27\xee\xe6\xc9\x9f\x31\x16\xd6\x64\xc5\x5b\xec\ --\xb7\xf7\x4c\x68\x6d\xf7\xf3\x85\x4b\x81\x24\x7b\xf0\x7b\x7f\x5e\ --\xd3\xaf\x09\x80\x20\x3c\xe7\xcf\xeb\x75\x65\xd3\x8e\x12\x98\x2d\ --\xb6\x40\x0f\x13\x36\x66\x4e\x1b\x87\x5f\xfd\xe0\x01\x9e\xfc\x19\ --\x63\x61\x8b\x00\x9c\x31\x09\x6c\xae\x90\x70\xba\x43\xf4\x79\x6b\ --\x79\xa8\x30\x39\xe8\x31\x7f\x5e\xcf\x6f\x09\x40\x49\x03\x4d\x00\ --\xc4\x1c\x7f\x5d\xaf\x3b\x9f\x6d\xe4\xbb\x7f\x5f\x8d\x1b\x59\x80\ --\xdf\xfd\xcb\xe3\x30\x1a\x42\xe0\xf4\x0b\xc6\x18\xeb\x23\xc2\xd7\ --\xcb\xfd\xa7\x24\x94\xd4\x0a\x38\x82\xfc\xa8\xdf\x81\xea\x74\x88\ --\xd4\xe5\x07\xc9\x6f\x07\x04\xf9\xaf\x08\x90\xd4\x1f\xfa\xed\x5a\ --\xdd\xa8\xaa\x69\xe4\xc6\x3f\x3e\x1a\x9c\x91\x86\x3f\xfe\xea\x69\ --\xc4\xc7\xc6\xe8\x1d\x0a\x63\x8c\xf9\x95\xc3\xf3\x75\x63\x9f\x4e\ --\x01\x93\x0f\xfd\x63\xc2\x05\x01\xe8\xb4\xd1\x6f\x01\xf8\xe5\x00\ --\x1c\xbf\x24\x00\x65\xcd\x94\xe8\xf2\xa8\x0f\xf9\xe3\x5a\x3d\xf9\ --\x7c\x33\xdf\xfd\xfb\x22\x3a\x2a\x0a\xbf\xff\xb7\xc7\x91\x96\x92\ --\xa4\x77\x28\x8c\x31\xe6\x17\x6e\x05\xa8\x35\x09\xd4\x9a\x04\x3a\ --\xec\x7d\xef\x20\x1b\x2e\xda\x1d\x62\xca\x8a\x12\xca\x5c\x50\x28\ --\x5a\x06\x7a\x2d\xbf\x24\x00\x6e\x59\x79\x00\x10\xc9\xfe\xb8\x56\ --\xf7\x63\xc8\x58\xf7\x55\x51\x20\x87\x08\x1b\x3f\x7b\x6e\x01\xc6\ --\x8d\x2c\xd0\x3b\x0c\xc6\x18\xf3\x8b\x8a\x36\x81\xe3\x2d\x02\x32\ --\x6f\xfe\x82\x5b\x81\x30\x7b\xd4\xff\x05\xf0\xd4\x40\xaf\xe5\x97\ --\x1a\x00\x22\x3c\xe9\x8f\xeb\xf4\x64\x4f\xc9\x71\x2e\xfe\xf3\xc1\ --\x7d\xb7\x5e\x85\x9b\xaf\x9e\xa1\x77\x18\x8c\x31\xe6\x17\xe5\xad\ --\x02\x47\x1a\x79\xf2\x3f\x57\xa7\x4b\xea\x57\xb3\xbd\x0b\x0d\x38\ --\x01\x28\xad\xa5\x31\x80\x98\xe9\x8f\x60\x7a\xb2\x69\x3b\xdf\xfd\ --\xf7\x66\xcc\x88\x21\xf8\xfe\xa3\x77\xea\x1d\x06\x63\x8c\xf9\x85\ --\xc5\x05\x1c\x6f\xe6\x1d\x4c\x17\x32\x3b\x91\xfc\xee\x7e\xba\x61\ --\xa0\xd7\x19\x70\x02\x40\x42\x7d\x0a\xfe\x3b\xe5\xb7\x4b\x76\x87\ --\x0b\x3b\x8b\x8f\x06\x72\x88\x90\x17\x17\x1b\x8d\x85\x3f\x79\x04\ --\x51\x46\xae\xf8\x67\xcc\x9f\xa6\x4f\x1a\x8d\x91\x05\xd9\x7a\x87\ --\x11\x91\x0e\x35\x08\x28\x91\xfa\xb0\xbf\x17\x36\x05\xbf\x19\xe8\ --\x35\x06\x54\x03\xb0\x95\xc8\x48\x0d\xea\x23\x81\xae\xc6\xd8\xbe\ --\xef\x30\x5c\xee\x10\x6f\xe6\x1c\x60\x3f\x7a\xfc\x6e\x14\xe4\x66\ --\xe9\x1d\x06\x63\x61\x23\x2b\x23\x15\x3f\x7c\x6c\x1e\xae\xbd\x7c\ --\x8a\xde\xa1\x68\x4a\x55\x09\x36\x87\x03\x09\x71\x71\x90\x24\xfd\ --\xee\xbe\x6b\x4d\x02\x2d\x36\xbe\xfb\xef\x4e\x87\x9d\x2e\x7f\xa3\ --\x88\xa2\x9e\x9d\x21\xfa\x3d\x39\x0e\x28\x01\x48\xae\x53\x6e\x86\ --\x10\x39\x03\xb9\x86\x2f\x36\xef\x3c\x10\xe8\x21\x42\xda\x55\x33\ --\x27\xe1\xce\xeb\x67\xe9\x1d\x06\x63\x61\x21\xda\x68\xc4\xfd\x77\ --\xce\xc5\xa3\xf3\x6f\x40\x5c\xec\x80\x8e\x35\xd1\x9d\x5b\x96\xd1\ --\xd0\xd8\x86\xa6\xb6\x4e\x74\x74\x5a\xd0\xd6\x69\x46\x6b\x87\x19\ --\x1d\x26\x0b\x5a\xdb\x4d\xb0\x3b\xdd\xb0\x5a\x1d\xf0\xc8\x32\x1c\ --\x4e\x37\x1c\x4e\x57\xb7\x6d\xd6\xa3\x8c\x06\xc4\xc6\xc4\x20\x3e\ --\x2e\x06\xa9\x29\x89\x48\x4d\x4e\x40\x4a\x52\x02\x52\x93\x12\x90\ --\x92\x9c\x80\xec\x8c\x74\xe4\xe7\x66\x62\x48\x4e\x26\x92\x13\xe3\ --\x07\x14\xb7\xdd\x0d\x1c\x0c\xd1\xe3\x7b\xb5\xe2\x90\x85\x21\xd1\ --\x80\x1f\x03\xf8\x53\x7f\xaf\x31\xa0\x04\x40\x12\xe2\x91\x40\xaf\ --\xce\xd8\x1d\x2e\x3e\xf6\xb7\x07\x89\xf1\x71\xf8\x97\x67\xfc\x52\ --\x0f\xc2\x58\xc4\x9b\x39\x6d\x1c\x7e\xfc\x44\xe8\xad\xa6\xb5\x77\ --\x98\x51\x7e\xba\x1e\xa7\xeb\x9a\x50\xdb\xd0\x82\xda\xc6\x16\xd4\ --\x36\xb4\xa2\xa9\xb5\x13\xaa\xea\x9f\x9e\xb8\x1e\x59\x81\x47\xb6\ --\xc3\x62\xb3\xa3\xa9\xb5\xa3\xc7\xd7\x26\x27\x25\xa0\x20\x27\x13\ --\xf9\xb9\x99\x18\x9e\x9f\x8d\x89\x63\x86\x62\xdc\xc8\x02\xc4\x44\ --\x47\xf5\x3a\x8e\x53\x06\xf6\xd4\x48\x61\xd7\xca\x37\x10\x3a\x1c\ --\x78\x0e\x7a\x24\x00\x3b\x5a\x28\x89\xdc\xea\xed\xfd\xfd\x7a\x5f\ --\xed\x29\x3d\x0e\xb7\x1c\xe6\xed\x9d\x06\xe0\xb9\x87\x6f\xc7\xa0\ --\xd4\x80\xee\xc0\x64\x2c\xec\xe5\x64\xa5\xe3\x47\x8f\xdf\x8d\xab\ --\x2e\xbb\x44\xef\x50\x7a\xd5\xdc\xda\x89\x23\xe5\xd5\xa8\x38\x5d\ --\x8b\x93\x55\x75\x28\x3f\x55\x87\xb6\x4e\xb3\xde\x61\x9d\xc7\x6c\ --\xb1\xe1\x88\xc5\x86\x23\x27\x4f\x7f\xf3\x31\xa3\xc1\x80\x31\xc3\ --\x87\xe0\x92\xb1\x43\x31\x71\xcc\x70\x4c\x1e\x3f\x1c\x99\xe9\x29\ --\xe7\x7d\x9d\x43\x06\x76\x9e\x96\x60\x75\x69\x1c\x70\x88\xea\x70\ --\x60\xc4\x40\x7a\x02\xf4\x3b\x01\x48\x70\x29\xf3\x49\x88\x81\xad\ --\xf3\xf8\x60\xfb\xbe\x43\x81\x1e\x22\x64\x4d\x18\x3d\x14\x77\x5e\ --\x7f\xb9\xde\x61\x30\x16\xb2\xa2\x8c\x06\xcc\xbb\x71\x0e\x9e\x79\ --\xf0\xd6\xa0\xec\x9a\xa9\xaa\x2a\xaa\xeb\x9a\x71\xf8\x78\x15\x0e\ --\x1e\x3f\x85\xc3\xc7\xab\x50\xdf\xd4\xa6\x77\x58\xfd\x22\x2b\x0a\ --\x8e\x56\x54\xe3\x68\x45\x35\xf0\xcf\x6d\x00\x80\x61\xf9\xd9\x98\ --\x33\x7d\x22\xe6\x4c\x9f\x80\x21\x43\x87\x63\x7f\x8d\x21\xec\xdb\ --\xf9\xfa\x93\x47\x81\xb0\xc8\xea\x7f\x02\xe8\x57\x27\xde\x7e\x27\ --\x00\x24\xa4\x07\x02\xdd\x8b\x49\x56\x14\xec\x2e\x3e\x16\xd0\x31\ --\x42\x95\xd1\x60\xc0\x2f\xbe\x77\xbf\xae\x45\x3a\x8c\x85\xb2\xd9\ --\xd3\x27\xe0\xc7\x4f\xde\x8d\xbc\xc1\x19\x7a\x87\x72\x9e\x86\xe6\ --\x76\xec\x2b\x3d\x8e\x7d\x87\x4e\xa0\xe8\x50\x39\x6c\x76\x87\xde\ --\x21\x05\xcc\xe9\x9a\x46\x9c\xae\x69\xc4\x7b\xab\x37\x23\x39\x25\ --\x0d\xa3\xc6\x4f\xc2\xa8\xb1\x93\x90\x3f\x7c\x34\x1f\x60\xe6\x23\ --\xb3\x4b\x2c\x80\x96\x09\xc0\xc1\x46\xca\x52\x14\xf5\xba\xfe\x7c\ --\x6d\x5f\x1c\x3e\x5e\x05\x6b\x18\xff\xf2\x0f\xc4\x5d\x37\x5e\x8e\ --\x11\x05\x01\xaf\xbf\x64\x2c\xec\xe4\x0d\xce\xc0\x8f\x9f\xbc\x1b\ --\xb3\xa7\x4f\xd0\x3b\x14\x00\xde\x1b\x9d\x03\x47\x2a\xb1\xb3\xf8\ --\x08\xf6\x95\x9e\xc0\x99\xfa\x66\xbd\x43\xd2\x85\xd9\xd4\x81\x92\ --\x3d\xdb\x50\xb2\x67\x1b\x92\x53\xd3\x31\x65\xfa\x6c\x4c\x2a\x9c\ --\x85\xf8\x44\x6e\x69\xde\x93\x4e\xa7\xc8\x7c\xbb\x94\xc6\x3c\x36\ --\x55\xf4\xb9\x58\xae\x5f\x09\x80\xa2\xa8\xf7\xf7\xf7\x6b\xfb\x62\ --\xdf\xc1\x13\x81\x1e\x22\x24\xc5\xc5\xc5\xe0\xf1\x7b\x6f\xd4\x3b\ --\x0c\xc6\x42\x4a\x4c\x74\x14\x1e\x9a\x77\x2d\x1e\xbe\xfb\x3a\x44\ --\x47\xf5\x5e\x8c\x16\x48\x2e\xb7\x07\x45\x87\x4e\x62\x67\x71\x19\ --\xb6\xef\x3b\x82\x0e\x93\x45\xd7\x78\x82\x8d\xb9\xb3\x1d\xdb\x37\ --\xaf\xc1\xae\x2f\xbf\xc0\xa8\x71\x93\x30\x79\xfa\x6c\x0c\x1d\x31\ --\x06\xe0\x55\x81\x8b\x10\x01\x1e\x0f\xfe\x03\xc0\x23\x7d\xfd\xda\ --\x7e\x4e\xe2\x74\x7f\x80\x7b\xff\x00\xe0\x04\xa0\x3b\x8f\xdf\x73\ --\x03\x1f\xf4\xc3\x58\x1f\x5c\x35\x73\x12\x7e\xf4\xd8\x3c\xe4\x64\ --\xa5\xeb\x16\x83\xac\x28\xd8\x57\x7a\x02\x1b\xb6\x15\x61\xfb\xfe\ --\x23\xdc\xdb\xc4\x07\x8a\xa2\xe0\x44\x59\x29\x4e\x94\x95\x22\x3d\ --\x73\x30\x2e\x9d\x7d\x2d\x26\x4e\xb9\x14\x12\x1f\x71\x7e\x1e\xab\ --\x93\x6e\xed\xcf\xd7\xf5\x39\x01\x38\xdc\x44\x83\x3d\xb2\x1a\xf0\ --\xca\x33\x93\xd9\x86\xf2\xaa\xda\x40\x0f\x13\x72\x06\x67\xa4\xe1\ --\xde\x5b\xaf\xd2\x3b\x0c\xc6\x42\x42\x41\x6e\x16\x7e\xf2\xe4\x7c\ --\x5c\x36\x75\xac\x6e\x31\x1c\xad\xa8\xc6\xfa\xaf\x8a\xb0\x79\x67\ --\x29\x3a\xcd\x56\xdd\xe2\x08\x75\xed\x2d\x4d\x58\xff\xe9\xfb\xd8\ --\xfd\xd5\x7a\xcc\xbc\xe2\x7a\x5c\x52\x38\x0b\x06\x4e\x04\x00\x00\ --\x9d\x0e\x91\xfe\x41\x29\x8d\xf9\x4e\x1f\x1f\x03\xf4\x39\x01\xf0\ --\x78\xd4\xf9\x10\xfe\x39\x44\xa8\x27\xfb\x0f\x9f\x84\xaa\x72\x0f\ --\xc8\x0b\x3d\x7e\xef\x8d\x3e\xed\xa5\x65\x2c\x92\xc5\xc5\x46\xe3\ --\xb1\x7b\x6e\xc4\xfd\x77\xcc\xd5\xa5\x3d\xb6\xcd\xee\xc0\xfa\xed\ --\x25\xf8\x6c\xc3\x6e\x54\x54\xd7\x69\x3e\x7e\x38\x33\x77\xb6\x63\ --\xe3\x9a\x15\xd8\xbf\x6b\x0b\xae\xbc\xfe\x0e\x8c\x9d\x30\x25\xe2\ --\x1f\x0d\xa8\x00\x6c\x6e\xf5\x17\x40\xdf\x0e\xe6\xeb\xfb\x23\x00\ --\x21\xee\xd1\xe2\x24\xe6\x92\x23\xe5\x01\x1f\x23\xd4\x64\x0d\x4a\ --\xc5\xcd\x73\x2f\xd5\x3b\x0c\xc6\x82\xda\xb5\x97\x4f\xc1\x0f\x1f\ --\x9f\x87\xac\x41\xa9\x9a\x8f\x7d\xea\x4c\x3d\x3e\x5c\xb3\x0d\x5b\ --\x76\x1d\x80\xc3\xe9\xd6\x7c\xfc\x48\xd2\xd9\xde\x8a\xcf\x57\x2c\ --\x45\xf1\x90\x61\xb8\xf6\xb6\x7b\x90\x9d\x1b\xd9\x47\xa0\x5b\x5c\ --\xa2\xcf\x7d\x79\xfa\x94\x00\xec\xad\xa5\x41\x80\x7a\x75\x5f\x07\ --\xe9\x8f\xd2\xa3\xa7\xb4\x18\x26\xa4\x3c\x70\xd7\x35\x7c\xd8\x0f\ --\x63\xdd\x28\xc8\xcd\xc2\x8f\x9f\xb8\x1b\x33\xa7\x8d\xd3\x7c\xec\ --\x43\xc7\x4e\x61\xd9\xea\xcd\xd8\x5d\x72\x0c\x44\xbc\x72\xa9\xa5\ --\xfa\xda\xd3\x78\xef\x1f\x2f\x62\xfc\xe4\x19\xb8\xf6\xe6\xbb\x11\ --\x1b\x9f\xa0\x77\x48\xba\x30\x39\x45\xe6\x7b\x25\x34\xf4\xa1\x42\ --\x51\xed\xeb\xd7\xf4\x29\x01\x30\x0a\xe5\x4e\x40\x04\xbc\xfa\xbf\ --\xd3\x6c\x45\x4d\x84\x6e\x85\xe9\x4e\x5a\x4a\x12\xee\xb8\x8e\xfb\ --\xfd\x33\x76\xa1\xb8\xb8\x18\x3c\x79\xdf\x4d\xb8\xef\xb6\xab\x60\ --\xd4\xf0\x99\xb0\xaa\x12\xbe\xdc\x7b\x08\x6f\x7d\xb4\x01\xa7\xce\ --\xd4\x6b\x36\x2e\xbb\x18\x11\xe1\xe8\xc1\xfd\xa8\x3e\x75\x02\x37\ --\xde\x71\x3f\x46\x8e\x0d\xfe\x8e\x8e\xfe\xa6\x10\xe0\x54\xf1\x0b\ --\x00\xdf\xf3\xf5\x6b\xfa\x34\x99\x0b\x48\x77\x69\xb1\xfc\x7f\xe8\ --\x58\x15\x67\xd1\x17\xb8\xef\xd6\xab\x10\x1b\x13\xda\x07\x93\x30\ --\xe6\x4f\x42\x08\x5c\x7f\xc5\x34\xfc\xe0\xd1\x3b\x91\x91\x96\xd2\ --\xfb\x17\xf8\x09\x11\x61\xcb\xae\x83\x78\xeb\xe3\xf5\xa8\xaa\x69\ --\xd4\x6c\x5c\xd6\x3b\x9b\xc5\x8c\x4f\x96\x2f\xc2\x25\xd3\x66\xe2\ --\xda\x5b\xe6\x23\x3a\x26\x56\xef\x90\x34\x65\x71\xd2\x9d\x08\x44\ --\x02\x50\x5e\x4e\x31\x16\x04\xbe\xf9\x0f\x00\x1c\x3c\x56\xa9\xc5\ --\x30\x21\x23\x3a\x2a\x0a\x77\xdd\xc0\x2d\x7f\x19\x3b\x6b\x44\x41\ --\x2e\x5e\x78\xea\x6e\x4c\x9b\x38\x4a\xd3\x71\x0f\x1e\xab\xc4\xcb\ --\x6f\x7f\x86\x63\x15\x67\x34\x1d\x97\xf5\xcd\x91\x03\x7b\x51\x53\ --\x55\x8e\x3b\x16\x3c\x81\xec\xbc\xc8\xa9\x0d\x30\x3b\x45\xce\xb2\ --\x3d\x94\xfc\xf0\x2c\xe1\xd3\xe1\x10\x3e\x27\x00\xd6\x58\xe5\x3a\ --\x40\x24\xf6\x3f\x34\xdf\x95\x9d\xf4\xf9\x11\x46\x44\xb8\x66\xf6\ --\x14\xa4\x24\x47\xe6\x73\x2d\xc6\xce\x95\x10\x1f\x87\xa7\xee\xbf\ --\x19\xf7\xdc\x7c\x05\x0c\x86\x80\x6f\x46\xfa\x46\x63\x4b\x3b\x5e\ --\x7e\xfb\x53\x7c\xb9\x87\xcf\x26\x09\x15\xa6\xce\x76\xbc\xbf\xe4\ --\x2f\xb8\xfa\xc6\x79\x28\x9c\x15\x19\x5b\xa7\x65\x15\xc2\x23\xd4\ --\xef\x01\xf8\x7f\xbe\xbc\xde\xe7\x04\x40\x95\xc4\x6d\x5a\x6c\xb4\ --\x50\x14\x15\xe5\xa7\x79\xdb\xcc\xb9\xee\xbe\x69\x8e\xde\x21\x30\ --\xa6\x2b\x21\x04\x6e\xbe\x7a\x06\xbe\xf7\xf0\x1d\x48\x4f\xd5\xae\ --\x09\x96\xdb\xe3\xc1\x7b\xab\xb7\x60\xd9\x27\x9b\xb9\x71\x4f\x08\ --\x52\x14\x05\x5b\xbe\x58\x89\x86\xda\xd3\xb8\xe9\xae\x07\x60\xd4\ --\xb9\x03\xa4\x16\x9c\x24\x2d\x80\xbf\x13\x00\x01\xf4\xab\xd3\x50\ --\x5f\x9d\xaa\x69\xe0\x3f\xb4\x73\x8c\x1e\x96\x87\x4b\xc6\x0c\xd3\ --\x3b\x0c\xc6\x74\x33\x7a\x58\x1e\x5e\x78\x6a\x3e\x26\x8f\x1f\xa1\ --\xe9\xb8\x3b\x8b\xca\xf0\xd7\xa5\x9f\x84\xec\xe9\x7b\xec\x5b\xc7\ --\x0e\x17\xa3\xb3\xa3\x15\xf3\xbe\xf3\x34\x12\x92\xc2\xfb\xf8\x74\ --\xb3\x93\x26\xf9\xfa\x5a\x9f\x12\x80\xe2\x1a\x9a\x0c\xa8\xc3\xfa\ --\x1d\x51\x1f\x9c\xa8\xe4\xee\x7f\xe7\xe2\xbb\x7f\x16\xa9\x92\x12\ --\xe2\xf1\xcc\x03\xb7\x60\xde\x8d\xb3\x21\x49\xda\x2d\xf7\xd7\x34\ --\xb4\xe0\xaf\x4b\x3f\xc1\x9e\x12\x3e\x89\x34\x9c\x34\xd4\x56\xe3\ --\xbd\x45\x2f\x62\xfe\xc3\xcf\x22\x23\x2b\x7c\x0f\x52\xb3\xb9\x45\ --\xd4\x7b\x25\x74\xfd\x43\x85\x62\x53\x6f\xaf\xf5\x6d\x05\x40\x52\ --\x6f\x1e\x70\x54\x3e\x3a\x5e\xc9\xc5\x35\x67\x45\x19\x0d\x98\x7b\ --\xf9\x14\xbd\xc3\x60\x4c\x53\x42\x08\xdc\x78\xd5\x74\xfc\xf0\xd1\ --\x3b\x35\x3d\xf3\xc2\xe9\x72\x63\xf9\xa7\x5b\xb0\xec\x93\x2d\x70\ --\x7b\x78\x15\x32\x1c\x99\x4d\x1d\x78\x7f\xc9\xdf\x30\xff\xe1\xef\ --\x22\x2f\x7f\xb8\xde\xe1\x04\x8c\xd3\x43\xcf\x02\xf0\x4f\x02\x20\ --\x20\x6e\xd0\x62\xfb\x1f\x00\x9c\xac\xe2\xe7\xff\x67\xcd\x9c\x36\ --\x0e\xc9\x89\xf1\x7a\x87\xc1\x98\x66\xc6\x8d\x2c\xc0\x4f\x9f\x99\ --\x8f\x09\xa3\x86\x6a\x3a\xee\x96\x5d\xa5\x78\xf9\x9d\x4f\xd1\xdc\ --\xda\xa9\xe9\xb8\x4c\x7b\x2e\xa7\x1d\x2b\xdf\x79\x0d\x77\x7d\xe7\ --\x29\x0c\x1d\xa9\xdf\x19\x11\x81\x64\xf6\xc0\xa7\xaa\xc7\x5e\x13\ --\x80\xad\x55\x14\x0b\xa8\x9a\xac\x43\x13\x11\xaa\x6a\x79\x5f\xed\ --\x59\xd7\xcd\x29\xd4\x3b\x04\xc6\x34\x91\x9c\x94\x80\xe7\x1e\xbc\ --\x0d\xb7\x5f\x37\x0b\x92\xa4\x5d\x5f\xf7\xaa\x9a\x46\xbc\xb4\x64\ --\x15\xb7\x1e\x8f\x30\x6e\xb7\x0b\xab\xde\xfb\x07\xee\x7e\xf0\x19\ --\x0c\x1b\xa5\x7d\xe7\xc8\x40\x33\x3b\x91\xb5\xa2\x88\x52\x16\xcc\ --\x10\xa6\x9e\x5e\xd7\x6b\x02\x90\x1a\x2d\x5f\x49\x90\xe2\xfc\x17\ --\x5a\xf7\x1a\x5b\x3a\xe0\x70\xb8\xb4\x18\x2a\xe8\xc5\xc5\x46\xe3\ --\x8a\x19\x91\xd7\xcd\x8a\x45\x16\x49\x12\xb8\xe1\xca\xe9\xf8\xd1\ --\x63\x77\x21\x35\x59\x93\x5d\xc6\x00\x00\x87\xd3\x8d\xf7\x3f\xdb\ --\x82\x77\x57\x6d\x82\x47\x56\x34\x1b\x97\x05\x0f\x45\x91\xb1\xfa\ --\x83\xc5\x98\xff\xd0\x77\x51\x30\x7c\x8c\xde\xe1\xf8\x95\xa2\x0a\ --\xd8\x55\x3c\x03\xe0\x4f\x3d\xbd\xae\xd7\x04\x40\x85\x74\x83\x56\ --\xf9\x38\xdf\xfd\x7f\x6b\xce\xf4\x89\x88\x8b\xe5\xce\x7f\x2c\x7c\ --\x4d\x1c\x3d\x0c\x3f\x7d\x7a\x3e\xc6\x8e\xcc\xd7\x6c\x4c\x22\xc2\ --\xfa\x6d\xc5\x78\x75\xd9\xe7\x68\xef\xf0\xa9\x57\x0a\x0b\x63\xb2\ --\xc7\x83\x4f\x96\x2f\xc2\xbd\x8f\x7c\x0f\x79\x05\xda\xee\x32\x09\ --\x34\x87\x4c\xf3\x31\xd0\x04\x40\x00\x37\xf8\x2d\xa2\x5e\x54\x9d\ --\x69\xd0\x6a\xa8\xa0\x37\x87\xef\xfe\x59\x98\x4a\x4e\x8c\xc7\xe3\ --\xf7\xdd\x84\x7b\x6f\xb9\x52\xd3\xe5\xfe\xf2\xd3\x75\x78\x69\xf1\ --\x2a\x1c\x3a\xce\x07\x8d\xb1\x6f\x79\xdc\x6e\x7c\xb2\x7c\x11\x1e\ --\x7c\xfa\x27\x48\xcf\x18\xac\x77\x38\x7e\x63\x97\x45\xaf\xdb\x01\ --\x7b\x4c\x00\xca\x6a\x28\xdd\x05\x75\xb2\xff\x42\xea\x19\xf7\xd5\ --\xf6\x92\x24\x09\x97\x4d\x09\xcf\xe2\x14\x16\xb9\x24\x49\xc2\xdd\ --\x37\xcd\xc6\x33\x0f\xdc\x8a\xc4\x78\x4d\x9e\x2a\x02\x00\xcc\x56\ --\x3b\x16\xbd\xbf\x16\x9f\x6e\xdc\x0d\x55\x55\x35\x1b\x97\x85\x0e\ --\xa7\xc3\x8e\x95\xcb\xde\xc0\x83\x4f\xfd\x24\x6c\xfa\x04\x58\x9c\ --\x48\x5c\x51\x4a\x79\x0b\xa6\x8a\x6e\x2b\xeb\x7b\x4c\x00\xdc\x06\ --\xe5\x2a\x90\xd0\x6c\x03\x6e\x5d\x23\x37\xdc\x00\x80\xf1\x23\x0b\ --\xb8\xf5\x2f\x0b\x2b\x93\xc7\x8f\xc0\x4f\x9f\x9e\x8f\x51\x43\xf3\ --\x34\x1b\x53\x55\x09\x6b\x36\xef\xc1\xeb\xcb\xff\x09\xb3\xc5\xa6\ --\xd9\xb8\x2c\x34\x99\x3a\xda\xf0\xc9\xf2\x45\xb8\xff\xc9\x1f\x21\ --\x2a\x2a\xf4\x1f\xbf\xaa\x00\xec\xb2\xfa\x04\x80\xff\xee\xee\x35\ --\xbd\x3c\x02\x10\x9a\x36\x50\xae\x6b\x6a\xd5\x72\xb8\xa0\x75\xf9\ --\xf4\xf1\x7a\x87\xc0\x98\x5f\xa4\xa7\x25\xe3\xfb\x0f\xdf\x81\x9b\ --\xae\x9a\x0e\x21\xb4\x5b\xee\x3f\x51\x59\x83\x17\x17\xaf\x42\x59\ --\xf9\x69\xcd\xc6\x64\xa1\xaf\xb1\xfe\x0c\xd6\x7f\xf6\x01\x6e\xbf\ --\xe7\x51\xbd\x43\xf1\x0b\x97\x2c\xdd\x8a\xfe\x26\x00\x44\xb8\xda\ --\xef\x11\x75\xc3\xee\x74\xa1\xc3\x64\xd5\x6a\xb8\xa0\x36\x6b\x5a\ --\xf8\x6d\x4b\x61\x91\xc5\x60\x90\x30\xff\xa6\x2b\xf0\xf4\x77\x6e\ --\x46\x82\x96\xcb\xfd\x16\x1b\x96\x7e\xb4\x01\x2b\xd7\x6d\x87\xaa\ --\xf2\x91\xe2\xac\xef\x8e\x1f\x2a\x46\x4e\x6e\x01\xa6\x5f\x3e\x57\ --\xef\x50\x06\xcc\xea\x41\x8f\xc5\x64\xdd\x26\x00\x7b\xda\x28\x19\ --\x4e\x55\xb3\x36\x74\x0d\x4d\x6d\x20\xe2\x3f\xd8\xc4\xf8\x38\x8c\ --\x19\xae\x5d\x55\x34\x63\xfe\x36\x6d\xe2\x48\xbc\xf0\xd4\x3d\x18\ --\x51\xa0\x5d\xbb\x55\x45\x51\xb1\x6a\xfd\x0e\x2c\xf9\x60\x1d\xac\ --\x76\x87\x66\xe3\xb2\xf0\xf4\xd5\x86\x4f\x91\x95\x9b\x8f\xfc\xa1\ --\x23\xf5\x0e\x65\x40\x2c\x4e\x24\xad\xaa\xa0\xac\xf9\xa3\x44\x73\ --\x57\x9f\xef\x36\x01\x88\xb1\x2b\x57\x90\x24\x0c\x81\x0b\xed\x7c\ --\xfc\xfc\xdf\x6b\xd2\xd8\x61\x9a\x56\x46\x33\xe6\x2f\x83\x52\x93\ --\xf1\xbd\x47\xb4\x5f\xee\x2f\x3d\x5a\x89\x97\x96\xac\x42\x65\x75\ --\xbd\x66\x63\xb2\xf0\xa6\xaa\x2a\xfe\xf9\xf1\xdb\x78\xfc\x7b\x3f\ --\x47\x6c\x7c\xe8\xd6\x63\xa9\x04\x98\x4d\xea\xe3\x00\xfe\xaf\xab\ --\xcf\x77\x9b\x00\xa8\x42\xcc\xd1\x72\x1a\x6a\x68\x69\xd7\x70\xb4\ --\xe0\x35\x69\x5c\xf8\xf6\xa7\x66\xe1\xc9\x68\x30\xe0\xee\x9b\xe6\ --\xe0\x99\xef\xdc\x82\xf8\xf8\x58\xcd\xc6\x6d\xed\x30\xe1\xb5\x65\ --\x6b\xb0\x61\x5b\x31\xaf\x1e\x32\xbf\xb3\x9a\x4d\x58\xff\xd9\x07\ --\xb8\xeb\x3b\x4f\xe9\x1d\xca\x80\x38\x3d\xe2\x36\xf4\x35\x01\x80\ --\x24\x2e\x87\x86\x7f\x54\xad\xed\x3d\x76\x2c\x8c\x18\x97\x70\x02\ --\xc0\x42\xc8\x8c\xc9\x63\xf0\xd3\xa7\xe6\xa3\x20\x4f\xbb\xfd\xd3\ --\x1e\x59\xc1\x47\x6b\xbe\xc2\x5b\x1f\x6f\x80\xdd\xc9\x9d\x43\x59\ --\xe0\x94\x1f\x3b\x84\xc3\xc5\xbb\x31\x69\xfa\xe5\x7a\x87\xd2\x6f\ --\x0e\x59\x4c\xec\xee\x73\x5d\x26\x00\x44\x24\x1d\xa8\x57\xa7\x07\ --\x2e\xa4\x8b\x35\xb7\x75\x68\x39\x5c\x50\x32\x18\x24\x8c\xd3\xb0\ --\x2b\x1a\x63\xfd\x95\x99\x9e\x82\x67\x1f\xba\x1d\x37\x5f\x3d\x43\ --\xd3\x71\x4b\x8e\x94\xe3\xa5\x25\xab\xb8\x67\x08\xd3\xcc\x96\x75\ --\xab\x50\x30\x62\x0c\x52\xd2\x06\xe9\x1d\x4a\xbf\xd8\x5c\x48\x5f\ --\x41\x64\x58\x20\xc4\x45\x3d\xaf\xbb\x4c\x00\x4a\x6a\x71\x89\x90\ --\xa0\x69\x37\x84\x96\x36\x8b\x96\xc3\x05\xa5\x51\xc3\xf2\x10\x1f\ --\x1b\xa3\x77\x18\x8c\x75\x2b\xda\x68\xc4\x77\xee\x9a\x8b\x47\xe7\ --\xdf\x80\xd8\x18\xed\xf6\x4a\x37\x34\xb7\xe3\xef\x6f\xaf\xc6\xb6\ --\xbd\x87\x35\x1b\x93\x31\xc0\xdb\x29\x70\xd3\x3f\x3f\xc6\x3d\x0f\ --\x3f\xab\x77\x28\xfd\xe2\x56\x20\xdc\x07\x70\x23\x80\x2f\x2e\xfc\ --\x5c\x97\x09\x80\x64\x50\x66\x12\x69\x53\x01\xd0\xee\x00\xca\x5b\ --\x05\xaa\x1b\x79\x05\x60\xf4\xb0\x5c\xbd\x43\x60\xac\x5b\xd3\x27\ --\x8d\xc6\x4f\x9f\xba\x07\x43\x87\x68\xbb\xdc\xff\xc9\xfa\x9d\x58\ --\xfc\xfe\x5a\x5e\xee\x67\xba\xa9\x2a\x3f\x8a\x63\x87\x8a\x30\x7e\ --\xb2\xb6\x2b\x5e\xfe\xe2\x26\xcc\x83\xaf\x09\x00\x91\x98\x19\xe8\ --\x80\x14\x02\x0e\x35\x08\x54\x77\x08\x80\x08\x56\x0b\x1f\xcc\x31\ --\x22\x5f\xbb\x6d\x53\x8c\xf9\x2a\x77\xf0\x20\xfc\xe8\xf1\x79\xb8\ --\xf2\x52\x6d\xcf\xa7\xd8\xbe\xff\x08\xfe\xfe\xd6\x6a\xd4\x37\xf1\ --\x0e\x21\xa6\xbf\x2d\xeb\x56\x61\xf8\xe8\x09\x88\x8d\x8b\xd7\x3b\ --\x94\x3e\x73\xbb\xd1\x65\x11\x43\xd7\x45\x80\x02\x97\x21\x80\xf5\ --\x7f\xb2\x0a\xec\x3e\x23\xa1\xed\xeb\xee\x9c\x6e\x97\x13\x8a\x22\ --\x07\x6e\xc0\x10\x31\x8a\x57\x00\x58\x10\x89\x32\x1a\x30\xef\xc6\ --\x39\x78\xe6\xc1\x5b\x35\x7d\x34\x55\xdb\xd8\x8a\xbf\xbd\xf9\x09\ --\x76\x95\x1c\xd5\x6c\x4c\xc6\x7a\xe3\xb0\xd9\xb0\x73\xeb\x5a\x5c\ --\x77\xeb\xbd\x7a\x87\xd2\x67\x76\x0f\x75\x79\xd4\xe1\x45\x09\xc0\ --\xd6\x2a\x8a\x05\xd4\x80\xb6\xa2\x3b\x50\x27\xbe\x99\xfc\x01\xc0\ --\xe1\xb0\x07\x72\xb8\x90\x31\x3c\x3f\x5b\xef\x10\x18\x03\xe0\xbd\ --\xeb\x7f\xef\xaf\xbf\x44\xee\x60\xed\x0a\x9f\x1c\x4e\x37\xde\x5e\ --\xb9\x01\x1f\x7e\xfe\x25\x3c\xf2\x45\xf5\x4a\x8c\xe9\xee\xe0\xfe\ --\x9d\x98\x32\x7d\x36\x32\x06\x87\xd6\xcd\x9a\xc5\x2d\x12\x56\x94\ --\x51\xe2\x82\x89\xe2\xbc\x76\xbb\x17\x1d\xf4\x93\x66\xc4\x64\x10\ --\xa2\x02\x15\x48\x9d\x59\xa0\xce\x7c\x7e\x7d\x81\xc3\xc1\x07\x75\ --\xa4\xa5\x24\x21\x2d\x25\x49\xef\x30\x18\x03\x00\x0c\xce\x48\xd3\ --\x74\xf2\xdf\xb2\xab\x14\x0f\xfd\xf8\x0f\x58\xf6\xc9\x66\x9e\xfc\ --\x59\xd0\x52\x55\x15\x9b\xd7\xae\xd2\x3b\x8c\x3e\x53\x54\xc0\xe9\ --\xc2\xed\x17\x7e\xfc\xa2\x15\x00\x45\xa8\xd3\x02\x55\xfe\x27\xab\ --\xc0\x91\xc6\x8b\xaf\xee\xb4\xf3\x0a\x00\xdf\xfd\xb3\x48\x54\x5d\ --\xdb\x84\x17\x97\xac\x44\xf1\xe1\x72\xbd\x43\x61\xcc\x27\x35\xa7\ --\xcb\x51\x79\xb2\x0c\x23\xc7\x74\xbb\xbd\x3e\x28\xb9\x65\xdc\x0c\ --\xe0\x83\x73\x3f\x76\x51\x02\x20\x80\x69\x81\x0a\xe0\x54\x9b\x80\ --\xc3\x73\xf1\xc7\x1d\x76\x3e\x04\x28\x2f\x3b\x34\xf7\x98\x32\xd6\ --\x1f\x0e\xa7\x1b\xef\x7f\xb6\x05\xcb\x56\x6d\x86\x5b\xe6\xfa\x1f\ --\x16\x5a\xb6\x6f\x5a\x83\x11\xa3\x27\x68\xda\xf2\x7a\xa0\x5c\x32\ --\x2e\xea\xed\x73\x71\x11\xa0\x44\xd3\x10\x80\x2d\x80\x8a\x0a\x54\ --\xb6\x77\x7d\x5d\xa7\x83\x0f\xef\xc8\xce\x4c\xd3\x3b\x04\xc6\x34\ --\xb1\x71\x47\x09\x5e\x79\xfb\x33\xb4\x76\x70\xf7\x4f\x16\x9a\x5a\ --\x9b\xea\x71\xa2\xec\x00\xc6\x5d\x52\xa8\x77\x28\x3e\x73\x29\x54\ --\x70\xe1\xc7\xce\x4b\x00\x56\x10\x19\x50\xaf\x4e\x0a\xc4\xe0\xa7\ --\x3b\x04\x5c\xdd\x24\xfa\x6e\xb7\x33\x10\x43\x86\x94\xec\x8c\x74\ --\xbd\x43\x60\x2c\xa0\x4e\x9d\x69\xc0\x4b\x4b\x56\xe2\x40\x59\xa5\ --\xde\xa1\x30\x36\x60\x3b\xb7\xac\xc5\x98\x09\x53\x21\x49\x17\x95\ --\xd2\x05\x25\x87\x5b\x24\x11\x91\x24\x84\x50\xcf\x7e\xec\xbc\x04\ --\x60\x4c\x1d\x46\xaa\x02\x7e\x3f\xbc\x5b\x21\xa0\xa2\xb5\xfb\x55\ --\x05\x8f\xc7\xed\xef\x21\x43\x4e\x76\x16\xaf\x00\xb0\xf0\x74\x76\ --\xb9\xff\xdd\x55\x9b\xb8\xc0\x8f\x85\x8d\x8e\xb6\x16\x9c\x38\x52\ --\x12\x32\xcd\x81\x5c\x0a\xc4\x07\x87\x70\x29\x80\xbd\x67\x3f\x76\ --\x5e\x02\xa0\x48\xca\x44\x11\x80\xe5\xff\x33\x1d\x02\x8e\x1e\x1e\ --\xf3\x79\x5c\xdc\xe1\x2b\x3b\x93\x57\x00\x58\xf8\xd9\x59\x54\x86\ --\x3f\x2f\xfe\x18\xcd\xad\x9d\x7a\x87\xc2\x98\xdf\xed\xdd\xb1\x19\ --\xe3\x27\x4d\x07\x42\xa4\x16\xc0\xa3\xa8\x37\xa0\xbb\x04\x00\xaa\ --\x98\x00\x3f\xff\x77\x38\x65\xe0\x58\x73\xcf\x17\x75\xbb\x23\x3b\ --\x01\x30\x18\x24\x64\xa4\xa5\xe8\x1d\x06\x63\x7e\x53\x59\x5d\x8f\ --\x17\x17\xaf\xc2\xc1\x63\xbc\xdc\xcf\xc2\x57\x6b\x53\x3d\x2a\xcb\ --\x8f\x86\xcc\x8e\x00\x97\x2c\x5d\x76\xee\xbf\x9f\x97\x00\x08\x81\ --\x09\xfe\x1e\xf0\x70\x83\x80\xbb\x97\x55\x3f\x8f\x3b\xb2\x1f\x01\ --\xa4\x24\x25\xc0\x60\x08\x8d\xe7\x48\x8c\xf5\xc4\x6a\x77\x60\xc9\ --\x07\xeb\xb0\x6a\xfd\x0e\x28\x8a\xda\xfb\x17\x30\x16\xe2\xf6\xef\ --\xd8\x14\x32\x09\x80\x47\xa6\xf3\x9a\xfc\x5d\xb8\x0b\xc0\xaf\x09\ --\xc0\xb1\xe6\x8b\x9b\xfe\x74\x19\x54\x84\xd7\x00\x24\x25\x86\x5e\ --\x6f\x69\xc6\xce\x45\x44\xf8\xe2\xcb\xfd\x78\xfd\xbd\x35\x68\xef\ --\xe4\x93\x3d\x59\xe4\xa8\xad\x3e\x85\xc6\xfa\x33\xc8\xce\xbd\xa8\ --\xc8\x3e\xe8\x38\x3c\xe2\xbc\x03\x67\xbe\xb9\xed\x24\x22\x09\xc0\ --\x58\x7f\x0c\xe2\x56\x80\x92\x3a\x81\x13\x2d\xbe\x3d\x4f\x50\xd5\ --\xc8\x2e\x0c\x4a\x4d\x4a\xd4\x3b\x04\xc6\xfa\xad\xfc\x74\x1d\x7e\ --\xf0\x1f\x2f\xe3\x7f\x5e\x79\x9f\x27\x7f\x16\x91\x0e\xec\xdb\xa1\ --\x77\x08\x3e\xb1\xcb\x48\x58\xe8\x9d\xeb\x01\x9c\xb3\x02\x70\xa8\ --\x09\x43\x81\xfe\xef\x00\x90\x55\xa0\xd3\x21\xd0\x68\x01\xce\x74\ --\xf6\xbe\xec\x7f\x2e\x55\x8d\xec\xa5\xc2\xa4\xc4\x58\xbd\x43\x60\ --\x61\x28\xca\x68\xc0\x82\xdb\xe7\x62\xfc\xa8\xc0\xdc\x99\x58\x6c\ --\x76\x2c\x5a\xbe\x16\xab\x37\xee\x8e\xf8\xbf\x61\x16\xd9\x4e\x1c\ --\x2e\xc1\xdc\x1b\xee\x42\x5c\x42\x82\xde\xa1\xf4\xc8\xa3\x40\x8c\ --\x2c\xc2\x0c\x00\xfb\x80\x73\x12\x00\x55\x91\x47\x75\x71\x34\xc0\ --\xf9\x5f\xac\x02\x36\x17\x60\xf3\x08\xd8\xdd\x80\xdd\x0d\xd8\x3c\ --\x80\xcd\x25\x60\x97\x01\xea\xe7\x09\x82\xaa\x12\xd9\x2b\x00\xc9\ --\x89\xc1\xfd\x4b\xc3\x42\xcf\xf4\x49\xa3\xf1\xc2\x93\xf3\x31\x2c\ --\x00\x2d\xa6\x89\x08\xeb\xb7\x15\xe3\x95\x77\x3e\x43\x87\x2f\xeb\ --\x2f\xd6\x00\x00\x20\x00\x49\x44\x41\x54\x89\xef\xf8\x19\x93\x65\ --\x0f\x8e\x1c\xd8\x83\x4b\xaf\xb8\x4e\xef\x50\x7a\x27\xd4\xcb\x71\ --\x61\x02\x40\x24\x8d\xba\x70\x07\x80\x4a\x40\xbb\x5d\xa0\xc5\x06\ --\x34\x5b\x05\x3a\x9d\xfd\x9f\xe4\x7b\x12\xe9\x77\x0f\xc9\x5c\x03\ --\xc0\xfc\x24\x6f\x70\x06\x9e\x7f\x62\x1e\xe6\xcc\x08\x4c\x51\xd2\ --\xf1\xca\x33\x78\x71\xf1\x2a\x1c\x2d\xaf\x0e\xc8\xf5\x19\x0b\x55\ --\x07\x8b\x77\xe1\xd2\x39\xd7\x06\xfd\x96\x40\x19\x98\x7a\xf6\x9f\ --\xbf\x49\x00\x4a\x1b\xc5\x7d\x46\x01\x18\x0d\x80\x5b\x06\x3a\x9d\ --\x02\x26\x87\xb7\x89\x4f\xa0\x45\x7a\x0d\x40\x62\x82\xdf\x7b\x2f\ --\xb1\x08\x13\x17\x1b\x8d\x47\xee\xbe\x1e\xdf\xb9\x73\x2e\xa2\xa3\ --\xfc\x7f\x98\xa7\xd9\x62\xc3\x1b\xcb\xd7\xe2\xf3\xcd\xbb\xa1\xaa\ --\x1a\xbc\x29\x30\x16\x62\x3a\xdb\x5b\x51\x5b\x73\x0a\x43\x0a\x46\ --\xea\x1d\x4a\x8f\x64\x45\x8c\x39\xfb\xcf\xdf\x24\x00\x16\x27\xc6\ --\xb5\xd9\xf5\xc9\x5c\x22\x7d\x05\x20\xda\x78\xf1\x91\x0c\x8c\xf9\ --\xea\xda\xd9\x53\xf1\xc3\x47\xef\x42\x56\x46\xaa\xdf\xaf\xad\xaa\ --\x84\xcf\x37\xed\xc6\x1b\xef\xaf\x85\xd9\xc2\xc7\x76\x33\xd6\x93\ --\xb2\x03\xfb\x82\x3e\x01\x70\x2b\x62\xc8\xd9\x7f\xfe\x66\xe6\x71\ --\xc9\x82\x7b\xd1\xea\xc4\x68\x34\xe8\x1d\x02\x0b\x41\x05\xb9\x59\ --\xf8\xc9\x93\xf3\x71\xd9\x54\xbf\x6c\xde\xb9\xc8\x89\xca\x1a\xbc\ --\xb8\x78\x15\xca\xca\x4f\x07\xe4\xfa\x8c\x85\x9b\x13\x65\xa5\xb8\ --\xf6\xd6\x7b\x10\x15\x15\xad\x77\x28\xdd\x72\xcb\xf8\xe6\xe8\x59\ --\x23\x00\x2c\x24\x92\x9c\x9b\x28\x16\xfe\x6e\x03\xe8\xa3\x50\x3a\ --\x52\x31\x10\x38\x01\x60\x7d\x91\x18\x1f\x87\x27\xef\xbf\x19\xf7\ --\xdc\x7c\x45\x40\x1a\x48\x75\x9a\xad\x78\xfd\xbd\x35\x58\xbb\x75\ --\x1f\x2f\xf7\x33\xd6\x07\x6e\x97\x13\x15\xc7\x0f\x7b\xdb\x03\x07\ --\x29\xa7\x07\xdf\x14\x9d\x19\x01\x20\x7f\x1f\x26\x55\x07\xe0\x0c\ --\x00\x5f\x09\x9d\x12\x8f\x60\x61\xe4\x47\x00\xcc\x07\x42\x08\xdc\ --\x78\xd5\x74\xfc\xe0\x91\x3b\x91\x9e\x9a\xe4\xf7\xeb\xab\x2a\x61\ --\xc3\xf6\x62\xfc\xfd\xed\xd5\x30\x99\x79\xb9\x9f\xb1\xfe\x38\x71\ --\xe4\x40\x50\x27\x00\x6e\x05\x62\x65\x11\xe5\xdc\x33\x43\x34\x78\ --\x67\x1e\x23\x2e\xeb\xe5\x6b\x02\x4a\x48\x91\x9d\x00\x44\xf1\x0a\ --\x00\xeb\xc5\x84\x51\x43\xf1\x93\xa7\xef\xc6\x84\x51\x43\x03\x72\ --\xfd\xc3\x27\xaa\xf0\xd2\xe2\x55\x38\x59\x55\x1b\x90\xeb\x33\xff\ --\xca\x48\x4b\x41\x6e\xf6\x20\x0c\x1e\x94\x8a\x41\x69\xc9\x48\x4b\ --\x49\x44\x52\x42\x3c\x62\xa2\xa3\x10\x15\xfd\x6d\x11\xa8\xd3\xe9\ --\x82\xc5\xe6\x40\x87\xc9\x82\xf6\x4e\x0b\x1a\x9a\xdb\x71\xaa\xa6\ --\x81\x13\xbc\x00\x3a\x5d\x71\x1c\x1e\xb7\x0b\x51\xd1\x31\x7a\x87\ --\xd2\x25\x02\xe0\x10\x98\x05\xe0\x13\x23\x00\x78\x3c\xea\xd4\xde\ --\x7a\x00\x04\x52\xc4\xaf\x00\x18\x38\x01\x60\x5d\x4b\x4b\x49\xc2\ --\x73\x0f\xdd\x86\x5b\xe6\x5e\x06\x29\x00\x89\x72\x7b\xa7\x05\xaf\ --\xbf\xb7\x06\x5f\x7c\xb9\x1f\x14\x88\x3d\xbe\x6c\x40\x24\x49\xc2\ --\xb0\x21\xd9\x98\x30\x3a\x1f\x13\x46\x0d\xc5\xc8\x61\x39\x18\x96\ --\x37\x18\x09\xf1\x03\xdb\x39\x64\x32\xdb\x50\x56\x5e\x8d\x92\x23\ --\xe5\x28\x3d\x7a\x0a\x27\xab\x6a\xf8\x71\x8f\x9f\xc8\xb2\x07\x95\ --\x27\xcb\x30\xee\x92\x42\xbd\x43\xe9\x96\x4c\x98\x8a\xb3\x09\x80\ --\x42\x62\x84\x9e\xc1\x44\xfa\x0a\x80\x24\xf1\x41\x40\xec\x7c\x06\ --\x83\x84\x7b\x6e\xbe\x02\x4f\xde\x7f\x33\x12\x07\xf8\x66\xdf\x15\ --\x45\x51\xb1\x6a\xfd\x0e\x2c\xf9\x60\x1d\xac\x76\x87\xdf\xaf\xcf\ --\xfa\x2f\x6b\x50\x2a\x66\x4e\x1b\x87\x99\x53\xc7\xe3\xd2\xc9\xa3\ --\x07\x3c\xd9\x77\x25\x25\x39\x01\xb3\xa7\x4f\xc0\xec\xe9\xde\xe3\ --\x5f\x5a\xda\x4d\xd8\xba\xab\x14\x9b\x76\x1e\xe0\x1e\x0f\x7e\x70\ --\xb2\xac\x34\xb8\x13\x00\x55\x1d\x03\x7c\x5d\x03\xa0\xa8\x22\x4f\ --\xcf\x60\x22\x7d\x05\x40\x96\x65\xbd\x43\x60\x41\xa4\x70\xe2\x28\ --\xfc\xe4\xa9\xf9\x18\x51\x90\xd3\xfb\x8b\xfb\xe1\xe0\xb1\x4a\xbc\ --\xb4\xf8\x13\x54\x54\xd7\x05\xe4\xfa\xac\x6f\x24\x49\xc2\xd4\xf1\ --\x23\x30\xab\x70\x3c\x66\x4d\x1b\x87\x11\x05\xb9\x9a\xc7\x90\x99\ --\x9e\x82\x05\xb7\x5f\x8d\x05\xb7\x5f\x8d\xf2\xd3\x75\x78\xff\xb3\ --\xad\xd8\xb2\xb3\x14\x72\x84\x77\x69\xed\xaf\xaa\xf2\x63\xf0\x78\ --\xdc\x41\xbb\x1b\x40\x51\xa5\x21\xc0\xd7\x09\x80\xac\x22\x43\xcf\ --\x60\x44\x84\x2f\x81\xf3\x1f\x19\x03\x80\xac\x8c\x54\xfc\xf0\xd1\ --\xbb\x70\xed\xec\xa9\xbd\xbf\xb8\x1f\xda\x3a\xcd\x78\xf5\xdd\xcf\ --\xb1\x61\x5b\x31\x2f\xf7\x07\x81\x61\xf9\xd9\xb8\xf5\xea\x4b\x71\ --\xe3\xd5\xd3\x91\x91\x96\xa2\x77\x38\xdf\x18\x3d\x2c\x0f\xbf\x79\ --\xfe\x61\x3c\xfb\xe0\x6d\x58\xf4\xfe\x5a\xac\xe7\xdf\x97\x3e\xf3\ --\x78\xdc\xa8\x39\x5d\x81\x11\xa3\xfd\x7a\xc0\xae\xdf\xa8\x84\xc1\ --\xc0\xd7\x09\x80\x47\x81\xff\x4b\x8a\xfb\xc0\x68\xf4\x7f\xe7\xb2\ --\x50\x22\xcb\x9c\x00\x44\xb2\xe8\xa8\x28\x7c\xe7\xce\xb9\x78\x74\ --\xfe\xf5\x88\x8d\xf1\xff\x1d\x83\xac\x28\x58\xf9\xc5\x0e\x2c\x59\ --\xb1\x0e\x76\xbb\xd3\xef\xd7\x67\xbe\x4b\x4e\x8c\xc7\xf5\x73\xa6\ --\xe1\xe6\x6b\x2e\x0d\x58\x41\xa7\xbf\x0c\xce\x48\xc3\xaf\x7f\xf4\ --\x10\xe6\xdf\x72\x05\xfe\xb2\xf8\x13\x1c\xad\xe0\x47\x03\x7d\x51\ --\x55\x7e\x34\x68\x13\x00\x97\x42\x69\xc0\xd7\x09\x80\x4a\xd0\xb5\ --\x5c\x31\xd2\xb7\xc1\x79\x38\x01\x88\x58\x73\x66\x4c\xc4\xf3\x4f\ --\xcc\x43\xde\xe0\xc0\x2c\xc2\x95\x94\x55\xe0\xa5\xc5\x2b\x51\x55\ --\xd3\x18\x90\xeb\x33\xdf\x0c\xcb\xcf\xc6\x83\x77\x5e\x83\xeb\xaf\ --\x2c\x0c\xb9\xce\x9f\x13\x46\x0d\xc5\xeb\xff\xf3\x3c\xde\x5e\xb9\ --\x11\x6f\x7d\xbc\x01\x8a\x12\xd9\x9d\x5b\x7d\x55\x55\x7e\x4c\xef\ --\x10\xba\x25\xab\x48\x00\xbe\x5d\x01\xd0\xf5\x37\xd2\x10\xe9\x2b\ --\x00\xfc\x08\x20\xe2\x14\xe4\x66\xe1\xf9\xc7\xe7\x61\x56\xe1\xf8\ --\x80\x5c\xbf\xa5\xdd\x84\x57\xde\xfe\x14\x9b\x76\x1e\x08\xc8\xf5\ --\x99\x6f\xa6\x4d\x1c\x85\x07\xee\xba\x06\x97\x4f\x1b\x1f\xd2\x0d\ --\xcf\x24\x49\xc2\x13\xf7\xdd\x84\x19\x93\xc7\x60\xe1\x4b\xef\xa2\ --\xa9\xb5\x43\xef\x90\x82\x5e\x67\x7b\x2b\xda\x5b\x9b\x91\x9e\x91\ --\xa5\x77\x28\x17\xf1\x28\x22\x1a\x00\x8c\x2b\xca\x28\xba\xa6\x8d\ --\x84\xd9\x25\x02\x72\xd2\x9f\x2f\x8c\x01\x38\xbc\x24\x94\x28\x9c\ --\x00\x44\x8c\xf8\xd8\x18\x3c\x76\xef\x0d\x58\x70\xfb\xdc\x80\xf4\ --\x7f\xf0\xc8\x0a\x3e\x5a\xf3\x15\xde\xfa\x78\x03\xec\xff\x9f\xbd\ --\xfb\x8e\x8e\xb3\x3a\x13\x3f\xfe\xbd\xef\x14\xf5\x51\xb1\x7a\x97\ --\x6d\xc9\xb6\x64\xcb\x96\x2c\xdb\xe0\x8a\x0b\x60\x1b\x07\x5c\x08\ --\x09\x25\x05\x30\x21\x85\x24\x40\x36\xbb\xd9\x24\xfb\x4b\x76\xb3\ --\x9b\xb6\xd9\x40\x08\x29\x24\xb4\x84\x90\x50\x8d\xe9\x60\x70\x01\ --\x8c\x71\x95\x4d\x71\xc5\x4d\xdd\x92\x65\xf5\xae\x99\xf7\xfe\xfe\ --\x10\x26\x36\xc8\xb6\xca\xbc\x65\x34\xf7\x73\x4e\xce\xf1\x91\x67\ --\xee\x7d\x82\x47\x73\x9f\xf7\x96\xe7\x76\x75\xfb\xbd\x7d\xe5\xc2\ --\x84\x10\xcc\x9b\x31\x89\xeb\x97\x2f\x64\xc2\xd8\x4c\xab\xc3\xf1\ --\xab\x49\xe3\x72\xb8\xef\x67\xdf\xe6\xbb\xff\xf3\x67\x3e\x3c\xae\ --\x36\x91\x5e\xc8\xf1\x23\xfb\x6d\x99\x00\xf4\x78\x71\xdc\x27\xa5\ --\xcb\x99\xe7\x21\x61\x6c\x8c\xa4\xa3\x47\x72\xe8\x94\xa0\xac\x41\ --\x60\x76\x1e\x10\xec\x4b\x00\xed\x9d\xea\x8b\x7a\xa4\x13\x42\xb0\ --\x68\x76\x11\x5f\xff\xc2\x95\x24\xc4\x19\xb3\xe1\x6b\xc7\xbb\x87\ --\xb8\xeb\xc1\x35\x94\x57\xd5\x1a\xd2\xbe\x72\x61\x53\x27\xe5\xf2\ --\xf5\x1b\x3e\xc3\xb8\x31\x19\x56\x87\x62\x98\xf8\xd8\x68\x7e\xf7\ --\x93\x6f\xf2\x83\x5f\x3d\xc8\x8e\x77\x0f\x59\x1d\x8e\xad\x55\x1c\ --\xfd\x90\xe2\x19\xf3\xac\x0e\xe3\x53\x7c\x12\x92\x0f\x32\xda\x89\ --\x46\x22\x40\xb8\x1b\xa6\xa4\x48\xd2\x3d\x92\xd2\x6a\x8d\x8e\x1e\ --\xf3\x82\x09\xf6\x25\x80\xb6\xb6\x0e\xab\x43\x50\x0c\x34\x36\x2b\ --\x8d\x3b\x56\xaf\x60\xf2\x04\x63\x6e\x09\x3b\xd9\xd0\xcc\x1f\x1f\ --\x7d\x81\x57\xdf\xd8\x69\x48\xfb\xca\x85\xe5\x64\x24\x73\xe3\x35\ --\x8b\x59\x70\xf1\x64\xab\x43\x31\x45\x78\x58\x08\xbf\xfc\xf7\xaf\ --\xf0\x6f\x3f\xff\x33\xdb\xf7\x1c\xb4\x3a\x1c\xdb\xaa\x28\x3b\x82\ --\x94\xd2\x96\xcb\x3f\xed\x9d\x4c\x70\x22\xbc\x09\xc8\x7f\x16\xa2\ --\x89\x8f\x80\x79\x39\x3a\x5b\xca\x34\x9a\x4d\xda\x30\xec\x76\xdb\ --\xf3\xac\xa4\x59\x5a\x54\x02\x30\x22\x79\x22\xc3\x59\x7d\xed\x52\ --\x96\x5f\x7a\xb1\x21\xc5\x9e\x7a\xbc\x5e\x1e\x7b\x76\x23\x7f\x5d\ --\xf3\x3a\x5d\xdd\x26\x66\xec\xca\xc7\x12\xe3\x63\xf8\xea\x75\xcb\ --\x58\x34\xbb\xd8\x90\x4a\x8d\x76\xe6\x72\x3a\xf8\xaf\xef\xdc\xc8\ --\xea\xef\xff\x81\xca\x0a\x75\x42\xa0\x3f\x5d\x9d\x1d\xd4\xd7\x55\ --\x93\x90\x64\x69\xa9\x9d\x7e\xf5\xf8\xf4\x31\x4e\x9f\x14\xb1\x9f\ --\xfc\xd8\x86\x38\x61\x76\x8e\xce\xdb\xc7\x35\x9a\x4c\x28\x12\xe6\ --\x0e\xf1\x7f\xa5\xab\x40\xd2\xd2\xae\x12\x80\x91\x44\xd3\x04\xcb\ --\x16\x5e\xc4\xad\xd7\x5e\x41\xb4\x27\xc2\x90\x3e\xde\xd9\xbd\x9f\ --\xdf\x3c\xb0\x86\xca\x13\xf5\x86\xb4\xaf\x9c\xdf\xe9\xa3\x9b\x5f\ --\x58\xb1\x88\xb0\xd0\xe0\x7d\x80\x39\xd2\x18\xca\xf2\xeb\x6e\xe5\ --\xd1\x3f\xff\x9a\xc6\x06\xf5\x59\xec\x4f\xc5\xf1\xc3\xb6\x4c\x00\ --\xa4\x24\xc9\x89\x14\x31\xfd\x15\xe2\x73\x69\x70\x71\xa6\xce\x1b\ --\xc7\x8c\x5f\x0e\x08\x0d\x0d\x35\xb6\x03\x9b\x6b\x6d\x53\xa5\x58\ --\x47\x8a\x49\xe3\x72\xb8\xe3\xe6\x95\xe4\x8d\x4e\x37\xa4\xfd\xea\ --\xda\x53\xdc\xf3\xf0\x33\x6c\xde\xb1\xd7\x90\xf6\x95\x0b\x33\xfa\ --\xe8\x66\xa0\xa8\x6a\x16\x1c\x6b\x14\x84\x86\x47\xf0\x99\xcf\xdd\ --\xc4\xdf\xff\x7c\x17\x5e\x6f\xaf\xd5\x61\xd9\x4e\xe5\xf1\x23\xb6\ --\xdc\x07\x20\x25\xf1\x4e\xa1\x11\x7b\xae\x5d\x7f\x21\xce\xbe\x24\ --\xe0\xad\x63\x1a\x3d\x06\x6e\x54\x0f\xf6\x19\x80\x56\xb5\x04\x10\ --\xf0\xe2\x62\x3d\xac\xbe\x66\x31\xcb\x16\x5e\x64\xc8\x54\x70\x77\ --\x4f\x2f\x4f\xbd\xf4\x26\x0f\x3f\xb5\x8e\xce\x2e\x35\xdd\x6f\x85\ --\xf4\xe4\x78\xbe\x75\xe3\x8a\x8f\xeb\xe7\x07\xb3\x2e\x2f\xbc\x5b\ --\xf3\xcf\xcf\x79\x62\x72\x1a\x0b\x96\xae\x64\xdd\x73\x8f\x5b\x18\ --\x95\x3d\x55\x55\x1c\xb3\x3a\x84\x7e\x49\x4d\x8b\x75\x22\x39\xef\ --\x96\xe4\xa8\x10\x98\x91\xd1\xb7\x27\xc0\x67\xd0\xf1\x80\x90\x90\ --\xe0\x9e\x01\x38\xd5\xdc\x6a\x75\x08\xca\x10\x39\x1d\x0e\xae\x5e\ --\x3a\x87\x9b\x3e\x7b\x39\xe1\xe1\xc6\x7c\x8e\x37\xef\xd8\xcb\x3d\ --\x0f\x3f\x43\x75\xed\x29\x43\xda\x57\xce\x2f\x3c\x34\x84\x2f\xae\ --\xba\x94\xcf\x7d\xc6\x98\xa3\x9b\x81\xe8\xc3\x7a\xf1\xa9\x87\xc2\ --\xc2\xa9\x33\x29\x3b\x7a\x88\x83\x1f\xa8\xda\x13\x67\x6a\x6f\x6d\ --\xa1\xb5\xb9\x89\xa8\xe8\x18\xab\x43\x39\x8b\xae\xcb\x18\x27\x82\ --\x98\x0b\x9d\xfb\x1b\x15\x01\x85\x29\x92\xdd\xd5\xc6\x6c\x72\x71\ --\x07\xf9\x12\x40\x67\x67\x37\x6d\x1d\x9d\x86\xdc\xfa\xa6\x18\xc7\ --\xe8\x4b\x7b\xaa\x6a\xeb\xf9\xcd\x03\xcf\xb0\xa5\x74\x9f\x21\xed\ --\x2b\x17\x36\x73\x6a\x3e\x77\xae\x5e\x45\x72\x42\x9c\xd5\xa1\xd8\ --\x4a\x6d\x5b\xff\x63\xc1\xc2\x25\xab\x38\x7e\xf8\x20\xdd\x5d\x6a\ --\x56\xf3\x4c\x35\x55\x65\xb6\x4b\x00\x7c\x92\xe8\x0b\xce\x00\x9c\ --\x96\x15\x2b\x69\xeb\xe9\xcb\xfc\xfc\x2d\x34\x54\x0d\x7c\x35\x75\ --\x0d\xe4\x66\xdb\x6f\xa3\x88\xf2\x69\x29\x89\x71\x7c\xf3\x4b\xcb\ --\x99\x3b\x63\x92\x21\xed\x77\x75\xf7\xf0\xd7\x35\xaf\xf3\xd8\xb3\ --\x1b\xe9\x51\x37\x45\x5a\x62\x4c\x56\x2a\x77\xdc\xbc\x92\x29\xf9\ --\xc6\x1c\xdd\x0c\x74\xfa\x39\x1e\x1a\xc3\x23\xa3\x98\xb3\xf0\x0a\ --\x5e\x7f\xf1\x49\x73\x03\xb2\xb9\x9a\xaa\x32\xf2\xf2\xed\x75\x44\ --\x54\xd7\x45\xa4\x13\x44\x24\x03\x2c\xfd\x93\x9f\x28\xe9\xea\x85\ --\x8a\x66\xff\x26\x01\xa1\xa1\xc6\xec\x94\x0e\x24\x27\x4e\x36\xaa\ --\x04\xc0\xe6\x42\xdc\x2e\xae\x5f\xbe\x80\xeb\x97\x2f\x24\xc4\x6d\ --\x4c\xed\x8a\x4d\x5b\xdf\xe3\xb7\x0f\xaf\x55\xa5\x56\x2d\x12\x15\ --\x11\xce\x2d\xd7\x2e\x61\xf9\x65\x33\x0d\x39\xba\x39\x52\x24\x45\ --\x4a\x8e\x35\xf4\x3f\x0e\x4c\x9e\x36\x8b\xbd\x7b\xb6\x53\x53\xa5\ --\x8e\x06\x9e\x76\xa2\xb2\xdc\xea\x10\x3e\xc5\x27\x09\x73\x02\xe1\ --\x03\x7d\x83\x10\x50\x9c\x26\x71\x68\x70\xbc\xd1\x7f\x49\x40\x68\ --\x78\x38\x9a\xa6\xa1\xeb\xc1\x7b\xc9\xc4\x89\x93\x0d\x56\x87\xa0\ --\x9c\xc7\xbc\x8b\x0a\xb9\xed\x8b\x57\x91\x92\x68\xcc\x54\x70\x79\ --\x55\x2d\x77\x3d\xb8\x46\x55\x56\xb3\x88\x19\x47\x37\x47\x92\xdc\ --\x51\x92\xb2\x06\x41\x7f\xdf\xd8\x42\x08\xe6\x2c\x5a\xc6\x13\x7f\ --\xf9\x9d\xe9\x71\xd9\x55\x6d\x4d\x05\x48\xd9\x37\x88\xda\x84\xd7\ --\x27\x43\x9d\xa0\x87\xd1\xdf\x39\xc0\x73\x10\x02\x26\xa7\x4a\xa2\ --\x42\x60\x7f\x9d\xc0\xeb\x87\x31\x5b\x08\x41\x58\x44\x24\xed\xad\ --\x2d\xc3\x6f\x2c\x40\xd5\x9e\x54\x4f\x7c\x76\x94\x95\x9e\xc4\xed\ --\x37\xae\x64\xda\xe4\x3c\x43\xda\xef\xe8\xea\xe6\xe1\xa7\xd6\xf1\ --\xe4\x0b\x6f\xa8\x5b\x21\x2d\x32\x31\x2f\x9b\x3b\x6e\x5e\x39\xa2\ --\xcb\xf7\xfa\x5b\xb8\x1b\xd2\x63\x24\xe5\x4d\xfd\x8f\x1d\x99\xa3\ --\xf3\x48\xcf\x1c\x43\x65\xf9\x11\x93\x23\xb3\xa7\x9e\xee\x2e\x9a\ --\x9b\x1a\x88\x8e\x1d\x65\x75\x28\x1f\xd3\x25\x6e\x27\x88\x01\xcf\ --\x00\x9c\x26\x80\x31\xa3\x24\xc9\x51\x92\x7d\xb5\x82\x13\xad\x62\ --\xd8\x27\x04\xc2\x83\x3c\x01\x28\xaf\xae\xb3\x3a\x04\xe5\x0c\x61\ --\xa1\x6e\xae\xbd\x72\x3e\x37\xac\x5c\x64\xd8\xf5\xad\x6f\xef\xdc\ --\xcb\xaf\xef\x7f\x5a\x4d\xf7\x5b\xc4\x13\x15\xc1\x97\xaf\xbe\x8c\ --\xab\x97\xcc\x09\xba\x2a\x7e\xfe\x90\x17\x7f\xee\x04\x00\x60\xe6\ --\x82\xc5\x3c\xf1\xb0\x9a\x05\x38\xed\x64\x6d\x8d\xcd\x12\x00\xe1\ --\x1c\xd4\x12\xc0\x27\x45\xb8\x61\x5a\x86\xc4\xeb\x93\x34\x76\x09\ --\x9a\x3a\xa1\xa5\x1b\x5a\xbb\x04\x2d\xdd\xe7\xde\x28\xd2\x9f\xf0\ --\x88\xa8\xa1\x86\x31\x22\x1c\x29\xab\xb1\x3a\x04\x85\xbe\xd9\xa8\ --\xcb\xe7\x4e\xe5\xeb\x37\x7c\x86\xb8\x58\x8f\x21\x7d\x1c\xab\x38\ --\xc1\xaf\xef\x7f\x8a\xdd\x7b\xd5\xd3\x91\x15\xcc\x38\xba\x19\x0c\ --\x22\x43\xc0\x13\x0a\x2d\xe7\x28\x19\x9f\x99\x93\x47\x5a\x46\x8e\ --\x6d\xcf\xc1\x9b\xad\xbe\xb6\x9a\xb1\xe3\x27\x5a\x1d\xc6\xc7\xa4\ --\xc4\xe1\x04\x86\xbd\x05\xdf\xe9\x80\x84\x08\x49\xc2\xc7\x4b\x67\ --\x12\xaf\x0f\x6a\xda\x04\xd5\x2d\x50\xdb\x2a\x2e\x98\x0c\x04\x7b\ --\x02\x50\x5b\xdf\x48\x6b\x7b\x07\x51\x11\x43\xce\xc7\x94\x61\xca\ --\xcb\x49\xe7\xf6\x9b\x57\x50\x38\x7e\xb4\x21\xed\x77\x76\xf5\xf0\ --\x8f\xe7\x36\xf0\xc8\x9a\xd7\xd5\x74\xbf\x45\x8c\x3e\xba\x19\x6c\ --\x22\xdc\x92\x96\xae\x73\xcf\x02\x4c\x9e\x36\x4b\x25\x00\x1f\xa9\ --\xaf\xab\xb6\x3a\x84\xb3\x09\x34\x27\x60\x48\x0a\xec\x74\x40\x46\ --\xb4\x24\x23\x1a\xba\xbd\x92\x8a\x66\x41\x6d\x2b\x34\x74\xf4\xbf\ --\x5c\x10\x11\x11\x69\x44\x18\x01\xe5\x48\x59\x8d\x3a\x76\x64\x81\ --\x68\x4f\x04\xb7\x5e\x7b\x85\x61\x55\xfc\xa4\x94\xac\x7b\x73\x17\ --\xbf\xfb\xdb\xf3\x34\x34\x06\xef\x32\x97\x95\x92\x13\xe2\xb8\xed\ --\x4b\x57\x71\xc9\x45\x85\x56\x87\x32\xa2\xf4\x5e\x20\x8f\xcd\x2b\ --\x98\xc2\x86\x57\x9e\xa1\xab\xa3\xdd\x9c\x80\x6c\xec\x64\x9d\xbd\ --\x66\x79\x75\xbd\x2f\x01\x30\x66\x81\xf3\x0c\x21\x4e\x18\x3b\x4a\ --\x32\x76\x14\xf8\xa4\xa4\xa9\xb3\x6f\x99\xa0\xad\xa7\x6f\xc9\xa0\ --\xad\x5b\x10\xe9\xb1\x57\x91\x04\x2b\xa8\x04\xc0\x5c\x9a\xa6\xb1\ --\xfc\xb2\x99\xac\xfe\xfc\x12\x3c\x91\xc6\xcc\xbc\x1c\x2e\xab\xe2\ --\xd7\xf7\xaf\xe1\xbd\xfd\x47\x0d\x69\x5f\x39\xbf\x10\xb7\x8b\xeb\ --\xae\x5a\xc0\xf5\xcb\x17\x10\x1a\x12\xbc\x97\xf6\x18\xa5\xa3\xe7\ --\xfc\x09\xb3\xd3\xe9\x62\xe2\x94\xe9\xec\xdc\xb2\xd1\xa4\x88\xec\ --\xab\xf1\xd4\x49\x74\x9f\x0f\xcd\x61\x8f\x6a\x92\x52\x22\x9c\x12\ --\x9c\x66\x6e\x7f\x71\x08\x18\x15\x0e\xa3\xc2\xcf\x9c\x06\x90\x68\ --\x27\x63\xd8\xf4\xaa\x89\x81\xd8\xd0\xc1\xa3\x15\x56\x87\x10\x34\ --\x26\x4f\x18\xc3\x1d\xab\x57\x30\x36\xcb\x98\xda\x0b\x6d\x1d\x9d\ --\xfc\xf9\x1f\x2f\xf1\xcc\xab\x5b\x82\xfa\x78\xab\x95\xe6\x4e\x9f\ --\xc8\x6d\x5f\x5a\x4e\x6a\x92\x7d\x36\x5e\x8d\x24\x3d\x3e\xe8\x18\ --\xc0\xdd\x3f\x93\x8a\x2e\x52\x09\x00\xa0\xfb\x7c\x34\x37\x35\x10\ --\x3b\x2a\xc1\xea\x50\x80\xbe\x3d\x7a\x4e\x01\xb6\x48\x47\x52\x12\ --\x07\x54\x90\x70\x44\x7b\x77\x9f\x7a\x4a\x34\x5a\x42\x5c\x34\x5f\ --\xff\xc2\x95\x2c\x9a\x5d\x84\x30\xe0\x4c\xae\x94\x92\x97\x37\xed\ --\xe0\x0f\x7f\x7b\x81\x46\x75\xc7\x83\x25\x32\x53\x13\xb9\xfd\xe6\ --\x95\x4c\x9f\x3c\xce\xea\x50\x46\xb4\xd6\xee\x81\xbd\x6e\x54\x62\ --\x32\x71\x09\x49\x34\x9c\xac\x35\x36\xa0\x00\xd0\xd8\x70\xd2\x36\ --\x09\x00\x20\x9c\xd8\x24\x01\x48\x1c\x15\x6b\x75\x08\x96\xab\xaa\ --\xad\xa7\xae\xbe\x89\xc4\x78\xb5\x1c\xe2\x6f\x4e\x87\x83\x15\x97\ --\xcf\xe2\x96\xcf\x2f\x31\x6c\xe7\xf7\xa1\xa3\x95\xdc\xf5\xc0\x1a\ --\xde\x3f\xa8\x36\x3d\x59\xc1\x8c\xa3\x9b\xca\x3f\xf5\xf8\x06\x9e\ --\x40\xe7\xe5\x4f\x66\xeb\x1b\xeb\x0c\x8c\x26\x30\x34\x35\x9c\xb4\ --\x3a\x84\x8f\xf9\xa4\xb4\x4f\x02\x30\x2a\x26\x0a\xa7\xc3\x81\xd7\ --\x17\xdc\xbb\xa3\xdf\xdd\x7f\x94\x4b\xe7\x14\x5b\x1d\xc6\x88\x32\ --\x75\x52\x2e\x77\xdc\xb4\x92\xec\x8c\x64\x43\xda\x6f\x69\xeb\xe0\ --\xa1\x27\x5e\xe5\xe9\x57\x36\xab\xe9\x7e\x0b\x08\x21\x98\x7f\x51\ --\x21\xb7\x7d\x69\xb9\x4a\x9e\x4d\x14\xe2\x90\x0c\xb4\x88\x5c\xee\ --\xf8\x42\x95\x00\xd0\xb7\x0f\xc0\x2e\xa4\x14\xd8\x26\x01\xd0\x34\ --\x8d\xf8\xb8\xe8\xa0\x2f\x89\xbb\x7b\xdf\x61\x95\x00\xf8\x49\x5a\ --\x52\x3c\xdf\xba\x71\x39\xb3\x4a\x0a\x0c\x69\xdf\xe7\xd3\x59\xbb\ --\x6e\x0b\xf7\x3f\xf6\x32\xad\xed\xea\xf6\x33\x2b\x18\x7d\x74\xb3\ --\xa7\xb7\x97\xc7\x9e\xdb\xc4\x94\x82\x31\x86\xf5\x11\xa8\x62\xc3\ --\x20\xcc\x09\x9d\x03\xb8\xaf\x2a\x29\x25\x1d\x4f\x4c\x1c\x2d\x4d\ --\xc1\xfd\xfd\x6e\xa7\x04\x40\xc7\x84\x13\x00\x83\x91\x9a\x18\x17\ --\xf4\x09\xc0\xce\xf7\xac\xab\x05\xaf\x03\x75\xad\x82\x50\x97\x24\ --\x26\x80\xeb\xa3\x84\x84\x38\xf9\xca\xb5\x4b\xf9\xfc\x95\x97\xe0\ --\x76\x19\x73\x69\xcf\xee\xbd\x87\xb9\xfb\xc1\x67\x38\x52\x66\xb3\ --\xb3\xbd\x41\xc2\x13\x15\xc1\x57\xae\x5d\xca\x95\x8b\x2e\x32\xec\ --\xd2\x9e\xb7\x77\xee\xe5\x9e\x87\xd6\x52\x55\x5b\xcf\x5d\xff\xf1\ --\x35\x43\xfa\x08\x64\x42\x40\x7e\xb2\x64\x57\xe5\x00\x66\x01\x84\ --\x20\x6b\xcc\x38\xde\xdf\xf5\x8e\xf1\x81\xd9\x58\x73\x43\xbd\xd5\ --\x21\x9c\xc5\x09\xf8\xb0\x49\x22\x90\x9e\x9a\x40\xe9\xde\xc3\x56\ --\x87\x61\xa9\xea\xda\x53\x1c\x3a\x56\x49\x5e\x4e\xba\xa9\xfd\x76\ --\xf6\xc2\xd6\x72\x8d\xe6\xae\xbe\x29\xd5\x29\xa9\x92\xac\x98\x61\ --\xd6\x77\xb6\x48\xe1\xf8\xd1\x86\x3d\xad\xd5\x37\x36\xf3\x87\xbf\ --\xbd\xc0\xba\x37\x77\x21\x65\x60\xfe\xf7\x09\x64\x9a\x26\xb8\x74\ --\xce\x54\xbe\xf9\xa5\xab\x88\xf1\x18\x53\x3b\xa4\xf2\x44\x3d\xf7\ --\x3c\xf8\x0c\x5b\x4a\xf7\x19\xd2\xfe\x48\x92\x11\x2d\xa9\x6f\x83\ --\xb2\xf3\x94\x04\x3e\x2d\x33\x7b\x6c\xd0\x27\x00\x2d\xcd\x4d\xb6\ --\xb9\x14\x48\xc3\x66\x09\x40\x46\x8a\x6d\x76\x47\x5a\xea\xcd\x6d\ --\xef\x9b\x9a\x00\x34\x77\xc1\xd6\x32\xed\xe3\xa9\x3c\x29\xe1\x60\ --\x9d\x08\xd8\x04\xc0\x08\x5e\x9f\x8f\x35\xaf\xbc\xcd\x9f\x1f\x7b\ --\x89\xce\xce\x01\x6e\x7f\x56\xfc\x6a\xc2\xd8\x4c\xee\x58\xbd\x92\ --\xfc\xb1\x59\x86\xb4\xdf\xd5\xdd\xc3\xdf\x9f\xdd\xc0\xdf\xd6\xac\ --\xa7\xc7\x3b\x80\x79\x6d\x05\x80\xc9\x69\x92\x2e\x5f\x5f\xc5\xd7\ --\xf3\x49\xcf\x1e\x6b\x52\x44\xf6\xe5\xf3\x79\xe9\xe8\x68\xb3\x45\ --\xe5\x5b\x21\xe4\xc7\x09\x80\x2d\x64\xa4\x24\x5a\x1d\x82\x2d\xbc\ --\xb1\xed\x3d\x56\x7f\x7e\x89\x29\x7d\x55\x34\x09\xde\x3d\x21\xf8\ --\x64\x65\xda\xa8\xd0\xf3\x0f\xfe\x9d\x5e\x68\xec\x10\x44\x87\x4a\ --\x22\x46\x78\x7d\x95\x77\x76\xef\xe7\x9e\x07\x9f\xa1\xa2\xc6\x3e\ --\xeb\x77\xc1\x24\x2e\xd6\xc3\x37\x6e\xf8\x0c\x97\xcd\x9d\x6a\xd8\ --\xd1\xcd\xd7\x37\xef\xe6\xf7\x8f\x3c\xc7\xc9\x86\x66\xbf\xb7\x3f\ --\xd2\x69\xc0\xf4\x0c\xc9\xce\x0a\xa8\x39\x4f\x12\x10\xe5\x89\x21\ --\x3a\x76\x14\xcd\x8d\xa7\xcc\x0b\xce\x86\x5a\x9a\x1b\x6d\x91\x00\ --\x38\x84\x90\x4e\x09\x83\x38\xcc\x61\xac\xf4\x64\x55\xb0\x03\xfa\ --\x2e\x8b\x29\xab\xac\x25\x2b\x3d\xc9\xb0\x3e\xba\xbd\xb0\xa7\x5a\ --\xf4\xfb\x0b\xeb\x76\x40\x61\x72\xff\x09\x80\x94\x70\xb0\x5e\x70\ --\xa8\xae\xef\x2e\x70\x81\x20\x29\x4a\x32\x2e\x41\x12\x3b\xec\x5b\ --\x25\xec\xa5\xaa\xb6\x9e\x7b\x1e\x5a\xcb\xdb\x3b\xf7\x5a\x1d\x4a\ --\x50\x72\x38\x34\xae\x5e\x32\x87\x9b\xaf\x59\x6c\xd8\xd1\xcd\xc3\ --\x65\x55\xdc\x75\xff\x33\xbc\xbb\x5f\x5d\xcc\x34\x1c\x0e\xd1\x97\ --\x04\xbc\x5b\x03\xc7\x1b\xcf\x3d\xa2\xa4\x67\x8d\x09\xfa\x04\xa0\ --\xb5\xb9\x89\xe4\xd4\x4c\xab\xc3\x00\x90\x4e\x01\xb6\x99\xeb\x4a\ --\x4d\x89\x47\xd3\x34\x75\x94\x0a\x78\x7e\xfd\x56\x6e\xfb\xd2\x55\ --\x7e\x6f\x57\x07\x8e\x9d\x12\x1c\x3c\x29\xe8\x39\xc7\xdc\xcf\x94\ --\xd4\xfe\x9f\xea\xa5\x84\xd2\x6a\x41\xc5\x19\xeb\x7d\x12\x38\xd1\ --\x2a\xa8\x6d\x15\x64\x44\x4b\x0a\x92\x25\x21\xb6\x58\x50\x1a\xba\ --\xce\xae\x1e\x1e\x79\xe6\x75\x1e\x7b\x6e\x13\x3d\xbd\x03\x28\x75\ --\xa6\xf8\x5d\x51\xc1\x18\xee\x5c\x7d\x35\x39\x06\x1e\xdd\xbc\xff\ --\xb1\x97\x59\xbb\x4e\x55\x6a\xf4\x17\x21\xfa\xbe\x3b\x22\x43\x60\ --\x6f\xad\xa0\xbf\x2d\x32\x49\xa9\xe9\xec\xdd\xb3\xdd\xfc\xe0\x6c\ --\xa4\xa5\xd9\x1e\xd7\x7f\x6b\xa2\x6f\xed\xdf\x36\x09\x80\xdb\xe9\ --\x24\x3d\x39\x9e\xf2\xea\x3a\xab\x43\xb1\xdc\x4b\x9b\x76\xf0\x95\ --\xeb\x96\xfa\x6d\x17\x7b\x5b\x0f\x54\x35\x0b\x8e\x37\x88\xf3\x1e\ --\xdb\x09\x77\x43\xaa\xe7\xd3\xbf\xb9\xba\x84\xed\x15\x82\x13\xe7\ --\x98\xe2\x93\x40\x79\xb3\xa0\xba\x4d\x30\x3e\x41\x32\x7a\x94\xc4\ --\x98\xbd\xd9\xc6\xda\xf0\xce\xbb\xdc\xfb\x97\xb5\xd4\xd5\x37\x59\ --\x1d\x4a\x50\x4a\x88\x8b\xe6\x1b\x5f\xba\x8a\x45\xb3\x8a\x0c\x69\ --\x5f\xd7\x25\x2f\xac\xdf\xca\x7d\xff\x78\x91\xe6\x16\x75\x41\x8d\ --\x11\xc6\x8e\x92\x44\xb8\x60\x67\x95\xc0\xf7\x89\xdc\x2a\x21\xd1\ --\x98\xd2\xdb\x81\xa4\xb5\xc5\x1e\xdf\x2d\x42\x20\x9d\xc0\x39\x6e\ --\x73\xb6\xc6\xe8\xcc\x64\x95\x00\x00\x2d\xad\xed\x6c\x7a\xe7\x3d\ --\x2e\x9b\x3b\x75\x50\xef\xd3\x81\xf6\x8f\x2e\x58\x6a\xeb\xe9\x2b\ --\xd7\xd9\xd0\xd1\xf7\xe7\x81\xf0\xe9\xe0\x93\x7d\x53\x7a\xa7\x75\ --\xf4\xc2\xf6\x0a\x8d\xa6\xce\x0b\xbf\xdf\xeb\x83\x0f\x4e\xf4\x25\ --\x0a\xd3\xd2\xf5\x80\x99\x0d\x28\xaf\xae\xe3\xee\x07\xd7\xb0\x7d\ --\xcf\x41\xab\x43\x09\x4a\x66\x54\x6a\x3c\x70\xa4\x9c\xbb\xee\x7f\ --\x86\xbd\x1f\x1e\x37\xa4\x7d\xe5\x9f\x52\x3c\x92\xd9\x2e\xc9\xd6\ --\x72\x8d\xee\x33\x1e\x38\x12\x92\x53\xad\x0b\xca\x26\x3a\xda\xed\ --\x51\x22\x5c\xd3\xd0\x9d\xc0\x00\xbe\xd6\xcd\x33\x3a\x33\x85\x4d\ --\x5b\xdf\xb3\x3a\x0c\x5b\x58\xbb\x6e\xcb\x80\x12\x80\x86\x0e\xa8\ --\x6c\x16\xd4\x77\x08\xda\xba\xfa\x92\x80\xa1\xea\xf6\xc2\xd6\x32\ --\x41\x7a\x34\x38\xb4\xbe\xb6\x8f\x37\x0a\xf4\x41\x1e\x08\xa8\x6f\ --\x87\x37\x8e\x69\xcc\xce\xd2\x09\xb7\xf1\x26\xc1\xf6\x8e\x4e\x1e\ --\x78\xfc\x15\x9e\x7e\x65\x33\xbe\x4f\x3e\xae\x28\xa6\x28\x29\xcc\ --\xe3\xce\x9b\x57\x92\x99\x66\xcc\x9e\x97\x86\xc6\x16\x7e\xff\xb7\ --\xe7\x79\x55\x1d\xdd\x34\x55\x6c\x18\xcc\xcd\xd1\xd9\x52\xa6\xd1\ --\xfe\xd1\x03\x48\x68\x58\x38\x91\x9e\x68\xda\x5a\x82\x77\xb3\x65\ --\x47\x9b\x3d\x12\x00\x64\x5f\x02\x60\xab\x12\x66\x63\x32\x55\x86\ --\x78\xda\x7b\x07\x8e\xb2\x7b\xef\x61\x8a\x0a\xfa\x3f\x3e\xd3\xda\ --\x0d\x7b\x6a\x34\x4e\xf9\x79\x26\xf3\x64\xbb\xe0\xa4\x1f\xda\xec\ --\xe8\x81\xb7\x8e\x6b\xcc\xca\xd6\x89\xb4\x59\x12\x20\xa5\xe4\xd5\ --\x37\x77\xf1\xfb\x47\x9e\xa3\xa1\xc9\x26\xbf\x90\x41\x26\x21\x2e\ --\x9a\x5b\xaf\x5f\xc6\xe2\x79\x25\x86\xb4\x7f\xfa\xe8\xe6\x03\x8f\ --\xbf\x42\x7b\x87\xad\x9e\x73\x82\x46\x84\xbb\x2f\x09\x78\xa7\xfc\ --\x9f\x33\x88\x09\x49\x69\x41\x9d\x00\x74\xb6\xb7\x59\x1d\x02\x00\ --\x42\xe0\x73\x82\xec\x18\x68\x3d\x67\x33\x8c\xce\x4a\xb1\x3a\x04\ --\x5b\xb9\xff\xb1\x57\xf8\xdd\x4f\x6e\xfb\xd4\xcf\x4f\xb5\xc3\x3b\ --\x15\xda\xa7\x8e\xef\xd9\x4d\x67\x2f\xbc\x71\x44\x63\x6a\xba\x24\ --\x39\xca\x98\xa7\xaf\x2e\x6f\xdf\xfe\x86\x96\xee\xbe\xe5\x0f\xaf\ --\x14\x68\x02\x22\x5d\x92\x84\x48\x48\x8d\x96\x67\x2d\x69\xec\x3f\ --\x5c\xce\x5d\x0f\xac\x61\xdf\x87\x65\x86\xc4\xa3\x9c\x9f\xdb\xe9\ --\xe4\xf3\x57\x5d\xc2\x17\x56\x5c\x4a\x58\xa8\x31\x99\xe1\x8e\x77\ --\x0f\x71\xf7\x43\x6b\x28\xab\x54\x37\xd0\x59\x2d\xc4\x09\xb3\xb3\ --\x75\xb6\x57\x08\xea\xda\x04\x71\xf1\x89\x1c\xfb\x30\x78\x8b\x2c\ --\x75\xd8\x24\x01\x70\x38\xe8\x75\x82\xd6\xd9\xb7\x85\xcb\x1e\xd2\ --\x92\xe2\x09\x0b\x75\xd3\xd9\x35\xc0\x45\xeb\x11\xee\xdd\xfd\x47\ --\xd8\xf5\xfe\x87\x4c\x9d\x94\xfb\xf1\xcf\xba\xbd\xb0\xbd\xd2\xfe\ --\x83\xff\x69\xbd\x3a\x6c\x2d\x17\xc4\x86\x09\xe2\xc3\x25\x0e\xad\ --\xef\x67\x1d\x3d\xd0\xe9\x15\x74\xf6\xf6\xa5\xa0\x2e\x07\xc4\x84\ --\x49\x32\xa2\x21\x31\x72\x60\x9f\xc9\x63\x8d\x82\xbd\x27\x04\xde\ --\x7e\x66\xef\x1b\x10\x94\x37\xc3\xfe\x3a\x41\x51\x9a\xc4\xe5\x6b\ --\xe5\xbe\xbf\xbf\xc8\x8b\x1b\xb6\xa1\x0f\x76\x4d\x43\xf1\x8b\x8b\ --\x8a\x27\xf0\xed\x1b\x57\x18\x56\xf4\xab\xa6\xae\x81\x7b\xff\xfa\ --\x2c\x6f\xa8\x65\x44\x5b\x71\x6a\x70\x51\xa6\x64\x77\x35\x78\xa2\ --\x83\xfb\xe6\xd7\x8e\xf6\x56\x5b\x54\x03\xd4\xa0\xc7\x76\x4b\x00\ --\x9a\x26\xc8\xcb\xc9\x50\xe7\x72\xcf\x70\xdf\xa3\x2f\xf2\xc7\x9f\ --\x7e\x1b\x4d\xeb\xfb\xc0\x1c\x38\x29\xce\xda\x58\x13\x28\x1a\x3b\ --\xa1\xb1\xf3\xdc\x1f\xfa\x2e\x2f\xb4\x76\x0b\x2a\x9a\x20\x21\x02\ --\x0a\x53\x24\x51\x21\xfd\xbf\xd6\x27\xe1\xbd\x1a\x41\xd9\x79\xce\ --\x1c\x9f\xd6\xd6\xad\x73\xef\xe3\x9b\xd9\xba\xe9\x65\xda\x3b\x6c\ --\xf5\x71\x0f\x1a\xa9\x49\xa3\xf8\xe6\x97\x97\x33\x67\xda\x44\x43\ --\xda\xef\xee\xe9\xe5\xd1\xb5\xeb\x79\x74\xed\x06\xba\x7b\xd4\xd1\ --\x4d\x3b\xd2\x04\x14\xa7\x49\x0e\x66\xc6\xb2\xd1\xea\x60\x2c\xe4\ --\xf3\xf9\xe8\xee\xee\x22\x24\xd4\xda\xc2\x29\x4e\x21\xbb\x9d\x20\ --\xed\x31\x1f\x71\x86\x09\x63\x55\x02\x70\xa6\x7d\x87\xcb\x78\xf6\ --\xb5\x2d\xac\xb8\x7c\x16\x3d\x3e\x28\x1f\x40\xdd\xed\x40\x77\xb2\ --\x5d\xb0\xf1\xb0\x20\x67\x54\x5f\x91\x21\xf7\x19\x77\x56\x36\x75\ --\xc2\xae\x2a\x8d\xd6\x01\x54\xe4\xad\x38\x7e\x98\xf5\x2f\x3d\x4d\ --\x7d\xad\xba\xb4\xc7\x0a\x6e\x97\x8b\x1b\x56\x2c\xe0\xfa\xe5\x0b\ --\x09\x71\x1b\x73\x31\xd3\x9b\xdb\xde\xe7\xb7\x7f\x59\x4b\x4d\x5d\ --\x70\x5f\x24\x16\x08\x04\x50\x32\x36\xb8\x67\x00\x00\x3a\x3b\xda\ --\x2d\x4f\x00\x1c\x1a\x9d\x4e\x04\x4d\x36\x5a\x01\x00\x20\x3f\xd7\ --\x98\x5a\xdf\x81\xec\x0f\x8f\xbe\xc0\x9c\xe9\x13\x69\xf0\xc5\x7c\ --\xea\x6c\xad\xbf\x64\xc4\x48\x0a\x92\x24\x5e\x1d\xb6\x95\x0f\x6c\ --\x80\x35\x92\x0e\x1c\x39\x25\x28\x6b\x12\x24\x46\x48\x5c\x0e\x68\ --\xed\x12\x34\x0e\x60\xd1\xaa\xad\xb5\x99\x37\x5f\x7b\x9e\x7d\xef\ --\xed\xa4\xdf\x8a\x24\x8a\xe1\x66\x4e\xcd\xe7\xf6\x9b\x56\x92\x9a\ --\x64\x4c\x85\xcf\xf2\xea\x3a\xee\x79\x78\x2d\x5b\x4b\xf7\x1b\xd2\ --\xbe\x62\x8c\xe4\x04\x95\x00\x74\x77\x5b\x7f\xfa\x5e\x13\xa2\xc5\ --\x89\x4e\x93\x8d\xf6\x00\x02\x7d\x97\x7e\x28\x67\xeb\xe8\xe8\xe2\ --\x37\x0f\xad\x65\xe6\x15\x37\x1a\xd2\x7e\xa8\x13\x8a\x52\x25\x1f\ --\xad\x32\x50\x90\x24\xd9\x5a\x6e\x8f\x0f\x86\xd7\x07\xd5\x2d\x03\ --\x8b\xc5\xe7\xf3\xb2\x73\xcb\x46\xb6\xbe\xb9\x8e\xde\x1e\xb5\x8f\ --\xc4\x0a\xe9\xc9\xf1\x7c\xeb\xa6\x15\xcc\x2c\xce\x37\xa4\xfd\x8e\ --\x8e\x2e\x1e\x7c\xf2\x55\x9e\x7a\xe9\x2d\xbc\xbe\x00\xd9\x08\xa3\ --\x7c\xcc\x13\x15\x41\x78\x68\x08\x1d\x5d\xc1\x7b\xa9\x56\x4f\xb7\ --\xf5\xa7\x52\x84\x90\x2d\x4e\x29\xb0\xdd\x84\x72\x4a\x62\x1c\x71\ --\x31\x51\xea\x78\xd6\x27\x6c\xdc\xb2\x07\x57\xfc\x3b\x14\x4e\xbd\ --\xd8\xef\x6d\x87\xb9\xf8\x78\xf0\x07\x88\x0e\x95\xd8\xe9\x74\xc8\ --\x40\x94\x1d\x39\xc8\x86\x57\xd6\x70\xaa\xee\x84\xd5\xa1\x04\xa5\ --\x10\xb7\x8b\xeb\x97\x2f\xe0\x86\x15\x0b\xfd\x56\xc1\xf2\x4c\x52\ --\x4a\x36\x6e\x7d\x4f\x55\x6a\x1c\x01\x62\xa2\x23\x83\x3a\x01\xe8\ --\xea\xb2\x7e\x06\xc0\x21\x44\x93\x2d\x97\x00\x00\x26\xe6\x65\xf1\ --\xe6\xf6\x0f\xac\x0e\xc3\x76\x36\xbc\xf4\x34\xc9\x69\x99\x24\x26\ --\xfb\xb7\xa4\x66\x6b\x0f\x78\xf5\xbe\xdd\xba\xc0\x39\xef\x09\xb0\ --\xa3\xa6\x86\x7a\x36\xbe\xbc\x86\x23\x87\xd4\xa5\x3d\x56\x99\x77\ --\x51\x21\xdf\xfc\xd2\x55\x24\x27\xc4\x19\xd2\xfe\xa1\xa3\x95\xdc\ --\xf5\xc0\x1a\xde\x3f\x78\xcc\x90\xf6\x15\x73\x45\x45\x86\x43\x6d\ --\xf0\x5e\x0a\xd4\xd3\x65\xfd\x0c\x00\x9a\xde\xe0\x44\x97\x4d\x56\ --\x1f\x47\xe8\xcf\x94\xfc\xb1\x2a\x01\xe8\x87\xd7\xdb\xcb\xf3\x8f\ --\x3f\xc8\x75\xab\xef\x24\x2c\x22\xc2\x7f\xed\x7e\x54\xc2\xb7\x30\ --\x45\x22\x80\xc3\xa7\xec\xf7\x99\xf8\xa4\xde\x9e\x1e\xb6\x6d\x7e\ --\x8d\x1d\x9b\x37\xe0\xf3\x05\xe0\xb1\x88\x11\x20\x33\x35\x91\xdb\ --\x6f\x5e\xc9\xf4\xc9\xe3\x0c\x69\xbf\xb9\xa5\x9d\xfb\xfe\xf1\x22\ --\x2f\xac\xdf\xaa\x8e\x6e\x8e\x20\x9e\xc8\x11\x76\x75\xe8\x20\x75\ --\xdb\x60\x09\x40\x83\x7a\xa7\x26\x64\xa3\xb4\xe1\x54\xef\x94\x82\ --\x31\x56\x87\x60\x5b\x8d\x0d\xf5\x3c\xfd\xe8\x1f\xf9\xdc\x97\x6f\ --\xc3\xe5\x3e\xc7\x39\xb9\x21\x38\xde\x28\xa8\x6e\xe9\x2b\xa2\xd3\ --\x65\xe3\xf1\x54\x4a\xc9\x81\xf7\x77\xf1\xe6\xeb\xcf\xd3\xda\xac\ --\xa6\x82\xad\x10\x16\xea\xe6\xcb\x57\x5f\xc6\x35\xcb\x2e\xc1\xe5\ --\x74\x5c\xf8\x0d\x83\xa4\xeb\x3a\x6b\x5f\x7b\x87\xfb\xff\xf1\x12\ --\x2d\x6d\xea\xe8\xe6\x48\xe3\x89\x0c\xb7\x3a\x04\x4b\x75\xdb\x62\ --\x09\x40\xab\x75\x22\x9d\x27\x11\xf6\xab\x81\x3e\x36\x2b\x95\xc8\ --\xf0\x30\xda\x54\x09\xcf\x7e\x9d\xa8\x2a\x67\xcd\xa3\x7f\x66\xd5\ --\x17\x6e\xc5\xe9\xf4\xdf\x7a\xab\xdd\xa7\xfe\xcb\x8e\x1c\xe4\x8d\ --\xd7\x9e\xa3\xae\xa6\xd2\xea\x50\x82\xd6\xcc\xa9\xf9\xdc\xb9\x7a\ --\x95\x61\xd3\xfd\xfb\x0e\x97\x71\xf7\xfd\xcf\xb0\xef\xb0\xaa\xd4\ --\x38\x52\x45\x45\x04\x77\x02\xd0\xdb\x6b\xfd\x06\x65\xcd\xc1\x87\ --\x4e\x9f\x97\x5a\xcd\x98\xe3\xb9\xc3\xa2\x69\x1a\x85\x13\x72\xd8\ --\xb2\x2b\x78\x4b\x46\x5e\x48\xc5\xf1\x0f\x59\xf3\xb7\x3f\xb1\xfc\ --\xf3\x37\xe1\xb6\xf8\x4c\xa9\xd1\x4e\x54\x95\xf3\xe6\x6b\xcf\x53\ --\x7e\xec\x90\xd5\xa1\x04\xad\xcc\xd4\x44\x6e\xbf\x69\x25\xd3\xa7\ --\x18\x33\xdd\x7f\xaa\xa9\x85\xdf\x3f\xf2\x3c\xeb\xd4\xa5\x3d\x23\ --\x9e\x27\x2a\xb8\x13\x00\x9f\xd7\xfa\x29\x56\xb7\x8b\x03\xce\xd6\ --\x2c\x4e\x46\x57\xa3\x83\xfd\xae\x6f\x2f\x9e\x98\xab\x12\x80\x0b\ --\x28\x3f\x76\x88\x7f\x3c\xf8\x5b\x56\xdd\x70\x2b\x91\x9e\x68\xab\ --\xc3\xf1\xbb\xea\xca\xe3\xec\xd8\xbc\x9e\x0f\x0f\xbc\xaf\xce\xf3\ --\x5b\x24\x2c\x2c\x84\x9b\xaf\x59\xcc\xd5\x4b\xe7\xe0\x74\xf8\x7f\ --\xba\xbf\xd7\xeb\xe3\x89\x17\x36\xf1\x97\xa7\x5e\x0b\xea\x9d\xe1\ --\xc1\x24\x2c\xc4\x7f\x4b\x97\x81\xc8\xdb\x6b\x6d\xb5\x4a\x87\x00\ --\xf2\x39\xe6\x9c\x2f\x84\xb7\xb4\xca\xd7\x00\xc4\x5b\x1a\x51\x3f\ --\x2e\x9a\x32\x9e\x7b\xff\xf2\xac\xd5\x61\xd8\xde\xc9\xda\x2a\x1e\ --\xbd\xff\xd7\x5c\xb1\xea\x4b\xa4\x67\x8d\xb6\x3a\x9c\x61\x93\x52\ --\x72\xe4\xe0\x5e\x76\x6e\x59\x4f\x65\xd9\x51\xab\xc3\x09\x5a\x42\ --\x08\x2e\x9d\x53\xcc\xd7\xbf\xf0\x19\xe2\x63\x8d\x49\x2e\xb7\x96\ --\xee\xe7\x9e\x87\xd7\x52\x5e\x5d\x67\x48\xfb\x8a\x3d\xb9\x5c\x4e\ --\xab\x43\xb0\x94\xd7\x6b\x6d\x02\x10\xe2\xc4\x77\x8d\x10\xbe\xd3\ --\xff\x0a\x75\xd8\x30\x01\xc8\xce\x48\x26\x39\x21\x8e\x13\x27\x55\ --\x89\xcf\x0b\x69\x6d\x6e\xe2\xf1\x87\x7e\xcb\x45\xf3\x2e\xe3\xe2\ --\x79\x97\xa3\x69\xb6\x9b\xd0\xb9\x20\xaf\xb7\x97\xfd\xef\xee\x64\ --\xc7\x96\x8d\x34\xd4\xab\x5b\xdc\xac\x34\x3a\x33\x95\x3b\x57\xaf\ --\x64\x4a\xbe\x31\x9b\x71\xab\x6a\xeb\xb9\xe7\xa1\xb5\xbc\xbd\x53\ --\x1d\xdd\x0c\x46\x0e\x47\xe0\x7d\x3f\xf9\x93\xd5\x09\x80\xdb\x21\ --\xbb\x01\x9c\x00\x52\x88\x5a\x21\xa5\x31\x65\xbb\x86\xe9\xa2\xa2\ --\xf1\xac\x5d\xb7\xc5\xea\x30\x02\x82\x94\x3a\xef\x6c\x7a\x85\x63\ --\x87\xf6\xb1\x60\xe9\x2a\x52\x33\xb2\xad\x0e\x69\x40\xaa\x2a\x8e\ --\xb1\x6f\xcf\x0e\x0e\x7c\x50\x4a\xb7\x1d\xce\xc7\x06\xb1\x88\xf0\ --\x30\x6e\xfe\xdc\x62\x56\x2d\x9e\x6d\xc8\x97\x74\x57\x77\x0f\x7f\ --\x5d\xf3\x3a\x8f\x3d\xb7\x89\x1e\x8b\xa7\x41\x15\xeb\xb8\x9c\xc1\ --\x3d\x03\xe0\xb3\x38\x01\x70\x39\x44\x1b\x7c\x94\x00\x08\x29\x6b\ --\x2c\x8d\xe6\x3c\x2e\x2a\xca\x57\x09\xc0\x20\x9d\xa8\x2e\xe7\xef\ --\x0f\xdc\xcd\xf8\x49\xc5\xcc\x59\xb8\x8c\xe8\x18\x63\x76\x6b\x0f\ --\x47\x4b\x73\x23\xfb\xf6\xec\x60\xdf\x7b\x3b\x68\xa8\x57\xd3\xbf\ --\x56\x13\x42\xb0\x78\x5e\x09\x5f\xbb\xe1\x33\xc4\xc5\x44\x19\xd2\ --\xc7\x86\x2d\x7b\xb8\xf7\xaf\xcf\xaa\x2a\x7e\x8a\x21\x7b\x49\x02\ --\x89\xb7\xd7\xda\x4d\x80\x0e\x4d\x36\xc1\x47\x09\x00\x50\x61\x61\ --\x2c\xe7\x55\x3c\x69\x2c\x6e\x97\x4b\x3d\x2d\x0c\x96\x94\x1c\x78\ --\x6f\x17\x87\x3e\xd8\x4d\x5e\xfe\x14\x4a\x66\xcd\x27\x39\xd5\xc2\ --\x3b\x16\xa4\xa4\xee\x44\x15\xc7\x0e\xef\xe7\xd8\x87\xfb\xa8\x2a\ --\x3f\xa6\x76\x7a\xdb\x44\x5e\x4e\x3a\x77\xac\x5e\xc9\xa4\x71\x39\ --\x86\xb4\x7f\xb4\xbc\x86\xbb\x1f\x58\x43\xe9\xde\xc3\x86\xb4\xaf\ --\x04\x1e\x23\x6a\x47\x04\x12\x9f\xc5\x77\x58\x38\x34\x4e\xc0\xe9\ --\x25\x00\xa8\xb0\x5f\x29\xa0\x3e\xe1\xa1\x21\xcc\x98\x32\x8e\xb7\ --\x76\xa8\xaa\x80\x43\xa1\xeb\x3a\x07\x3e\x28\xe5\xc0\x07\xa5\x24\ --\xa7\x66\x32\x7e\x52\x31\xe3\x26\x16\x11\xe5\x89\x31\xbc\xef\xee\ --\xae\x0e\x8e\x1f\x3e\xd8\x37\xe8\x1f\xde\x4f\x7b\x6b\x8b\xe1\x7d\ --\x2a\x03\x17\x15\x11\xce\x2d\xd7\x2e\x61\xf9\x65\x33\x0d\xd9\x33\ --\xd2\xd6\xd1\xc9\x83\x8f\xbf\xc2\xd3\xaf\x6c\xc6\x67\xd4\x15\x96\ --\x4a\x40\x72\x06\xf9\x12\x00\xd2\xda\xdf\x07\x0d\x59\x01\xa7\x97\ --\x00\x90\x15\x76\xbe\xf8\x65\xfe\xc5\x53\x54\x02\xe0\x07\x27\xaa\ --\xcb\x39\x51\x5d\xce\x1b\xeb\x9e\x25\x21\x39\x8d\x8c\xec\xb1\x64\ --\x64\x8f\x25\x25\x3d\x8b\x88\x48\xcf\xb0\xda\xee\x6c\x6f\xa7\xbe\ --\xfe\x04\xf5\xb5\xd5\x9c\xa8\x2a\xa7\xa6\xaa\x8c\xc6\xfa\x3a\xf5\ --\x94\x6f\x43\x9a\x26\x58\x3a\x7f\x3a\x5f\xbd\x7e\x19\x31\x9e\x48\ --\xbf\xb7\xaf\xeb\x92\x97\x37\x6d\xe7\x8f\x8f\xbe\x48\x63\xb3\xba\ --\xd0\x4b\xf9\x34\x5d\x0f\xee\x84\x50\x5a\x7c\x01\x8f\xdb\xc1\x41\ --\xf8\x28\x01\xd0\x70\x54\xe8\xd8\xf7\x1f\x64\x56\x49\x3e\x6e\xa7\ --\x93\x1e\x1b\x14\x4f\x18\x09\xa4\x94\xd4\xd5\x54\x52\x57\x53\xc9\ --\xae\x77\x36\x01\x10\x12\x1a\xc6\xa8\x84\x24\x62\xe2\x12\x08\x8f\ --\x88\x24\x22\x32\x8a\x90\xd0\x30\x34\xcd\xf1\x71\xb9\xe1\x9e\xee\ --\x2e\x7a\x7b\xbb\xe9\xed\xee\xa1\xbd\xad\x95\xd6\x96\x46\xda\x5b\ --\x5b\x68\x6c\x3c\x49\x67\x7b\xbb\x85\xff\x8f\x94\x81\x1a\x37\x26\ --\x83\xef\xac\x5e\x45\x7e\x6e\x96\x21\xed\xab\x2a\x7e\xca\x40\xf4\ --\x06\xf9\x77\xb9\xb4\xf8\x5e\x0b\x87\x53\xdb\x0d\x1f\x25\x00\xdd\ --\x92\x72\x97\x7d\x27\x00\x88\x08\x0f\xa3\xa4\x30\x8f\x2d\xa5\xaa\ --\x28\x90\x51\xba\xbb\x3a\xa9\xae\x38\x4e\x75\xc5\x71\xab\x43\x51\ --\x0c\x10\x15\x11\xce\x8d\xd7\x5c\xce\xd5\x4b\x66\x1b\x32\xdd\xdf\ --\xd2\xd6\xc1\x43\x4f\xbc\xca\xd3\xaf\x6c\x0e\xfa\xa7\x3b\xe5\xc2\ --\x7a\x2d\xde\x04\x67\x35\x2b\x67\x00\x84\x80\x70\xc1\x76\xf8\x28\ --\x01\x98\x91\x2e\x4e\x95\x56\xf9\x3a\x00\xdb\xd6\x67\x5c\x38\xab\ --\x48\x25\x00\x8a\x32\x48\x9a\x26\x58\xb6\xf0\x22\xbe\x7a\xdd\x15\ --\x78\xa2\xfc\x77\x7b\xe4\x69\x3e\x9f\xce\xd3\xaf\x6c\xe6\xc1\xc7\ --\x5f\x51\xf7\x76\x28\x03\xe6\x0d\xf2\x3d\x21\x56\xce\x00\x84\xb8\ --\xd0\x57\x4e\x16\x75\xf0\xcf\x53\x00\x48\xc9\x51\x21\x98\x68\x59\ --\x54\x17\x30\x77\x46\x21\x61\xf7\x3f\x45\x67\xa7\x2a\x15\xaa\x28\ --\x03\x91\x37\x3a\x9d\xef\xdc\xb2\x8a\x82\xdc\x6c\x43\xda\xdf\xbd\ --\xf7\x30\x77\x3d\xf0\x0c\x47\xcb\xab\x0d\x69\x5f\x19\xb9\x82\x7e\ --\x09\xc0\xc2\xbd\x51\x61\x0e\x3e\xbe\x5e\xf3\x9f\x5b\x31\x85\x38\ --\x0c\xd2\xb6\x09\x40\x58\xa8\x9b\xf9\x17\x4d\xe6\xa5\x8d\xdb\xad\ --\x0e\x45\x51\x6c\x2d\xc6\x13\xc9\xad\xd7\x5d\xc1\x15\x0b\x66\xa0\ --\x69\xfe\x5f\xdb\xab\xab\x6f\xe2\xde\xbf\x3e\xcb\x86\x2d\x7b\xfc\ --\xde\xb6\x12\x1c\xbc\x5e\x9b\x5f\x3b\x6a\x30\x2b\x97\x00\x5c\x9a\ --\x3c\x75\xfa\xcf\x67\x9c\xc5\x90\xb6\x3f\xa4\xbb\xe4\x92\x69\x2a\ --\x01\x50\x94\x73\xd0\x34\x8d\xe5\x97\x5e\xcc\x2d\xd7\x2d\x35\xe4\ --\xba\xd5\x9e\xde\x5e\x1e\x7b\x6e\x13\x8f\x3c\xf3\x3a\x9d\x5d\xd6\ --\x5f\x67\xaa\x04\xae\x9e\x20\xdf\x03\x60\x65\xa9\x76\x97\xe3\x9f\ --\x75\x7f\x3e\x4e\x00\x84\xe4\x88\x8d\x4f\x02\x02\x30\x25\x7f\x0c\ --\xa9\x49\xa3\xa8\xae\x3d\x75\xe1\x17\x2b\x4a\x10\x99\x34\x2e\x87\ --\x3b\x56\xaf\x24\x2f\x27\xdd\x90\xf6\xdf\xde\xb9\x97\x7b\x1e\x5a\ --\x4b\x55\x6d\xbd\x21\xed\x2b\xc1\x25\xd8\xf7\x8b\x38\x2c\xac\x84\ --\xe8\x72\xc8\x8f\xef\x54\xff\x67\x02\x20\xf4\x23\xd2\x7e\x37\x02\ --\x9f\x45\x08\xc1\x95\x8b\x2e\xe6\x8f\x8f\xbe\x60\x75\x28\x8a\x62\ --\x0b\x9e\xa8\x08\xbe\x7c\xf5\x65\x5c\xbd\x64\x8e\x21\xd3\xfd\x95\ --\x27\xea\xb9\xe7\xc1\x67\xd4\x06\x5c\xc5\xaf\x9a\x5b\x83\xfb\xd8\ --\xb0\x10\xd6\x25\x00\x4e\xc9\xbb\x1f\xff\xf9\xf4\x1f\x34\x87\xf3\ --\x70\x20\x54\xeb\x5a\xb6\x70\x06\x0f\x3e\xf1\xaa\x2a\x0d\xac\x04\ --\x35\x87\x43\x63\xe5\xe5\xb3\xb9\xf9\xf3\x8b\x89\x0c\x0f\xf3\x7b\ --\xfb\x5d\xdd\x3d\x3c\xf4\xe4\x3a\x9e\x78\x61\x13\xbd\x41\xbe\x5e\ --\xab\xf8\x5f\x6b\x5b\xc7\x85\x5f\x34\x82\x99\x3d\x03\x20\x04\xc4\ --\x86\x41\x72\x94\x24\x42\x68\xeb\x4e\xff\xfc\xe3\x04\xa0\x30\x89\ --\xb2\xdd\xd5\x74\x02\xfe\xff\x36\xf1\xa3\x18\x4f\x24\x0b\x66\x4e\ --\xe6\x95\x37\x76\x5a\x1d\x8a\xa2\x58\x62\xf2\x84\x31\xdc\xb9\x7a\ --\x25\x63\xb2\x52\x0d\xeb\x63\xff\xe1\x72\x1e\x5d\xbb\xde\xb0\xf6\ --\x95\xe0\xd6\xdc\x12\xdc\x09\x80\x66\x42\x02\x20\x04\x24\x44\x48\ --\xd2\x3c\x90\xe2\x91\xb8\xfb\xba\x6c\x2b\x4a\x15\x07\x4f\xbf\xe6\ --\x8c\x25\x00\xa1\xef\xaa\xf2\x1d\x10\x50\x89\xce\xf1\xc3\x00\x00\ --\x20\x00\x49\x44\x41\x54\x64\x78\x64\xc3\xb4\x72\xf1\x6c\x95\x00\ --\x28\x41\x27\x32\xd2\xc3\x67\xae\xba\x92\x2b\x2e\x99\x4a\x46\xb4\ --\xd5\xd1\x28\xca\xd0\xb5\xb6\x07\x77\x02\xe0\x30\x70\x13\x60\x84\ --\x0b\xb2\xe3\x24\x19\x31\x92\xd0\x4f\x5e\xb9\x20\xe4\x3e\x21\xc4\ --\xc7\x47\x10\x3e\xf9\xd7\xfb\x08\x80\x04\x20\x3f\x37\x8b\x49\xe3\ --\x72\x78\xff\xe0\x31\xab\x43\x51\x14\xc3\x69\x9a\x46\xf1\x8c\xb9\ --\xcc\x9c\xbf\x04\x77\x48\x28\x7b\xaa\x61\xef\x09\x18\x3d\x4a\x32\ --\x36\x5e\xe2\xb2\xf7\xd6\x1d\x45\xf9\x94\x96\x20\x5f\x02\x70\x7e\ --\x54\x5e\xdd\x5f\x34\x20\xd9\x23\xc9\x8e\xed\x7b\xea\x17\xe7\xd8\ --\x0e\x24\xa5\x38\x6b\x33\xcf\x59\x09\x80\x26\xd8\x17\x28\x77\xb7\ --\x5c\xbf\x7c\x21\xdf\xfb\xc5\xfd\x56\x87\xa1\x28\x86\xca\xc8\x19\ --\xcb\xc2\xa5\x57\x13\x9f\x98\x72\xd6\xcf\x7b\x75\x38\x78\x52\x70\ --\xac\x41\x30\x21\x49\x92\x1d\x2b\xed\x7e\x88\x47\x51\x00\xf0\xfa\ --\x7c\x41\x9f\x00\xb8\x5c\x6e\xbf\xb4\xe3\x74\x40\x4e\x8c\x64\x4c\ --\x7c\x3f\x4f\xfb\xfd\xd0\xfa\x1e\xf2\xff\xf9\xfe\xb3\xff\x5a\xee\ --\xb3\xf3\xad\x80\x67\x9a\x55\x92\xcf\xe8\xcc\x14\x8e\x96\xd7\x58\ --\x1d\x8a\xa2\xf8\x5d\x44\xa4\x87\x79\x97\x5e\x49\xfe\xe4\x12\xce\ --\x99\xce\x03\x3d\x3e\x78\xb7\x5a\x50\xd1\x24\x28\x4a\xd5\x89\xf2\ --\xef\x83\x85\xa2\xf8\x5d\x5d\x7d\x53\xd0\xdf\x17\xe1\x0e\x19\xde\ --\x2f\xaa\xd3\x01\x39\xb1\x92\xdc\xf8\x8f\xd7\xf6\x07\x46\xca\xb3\ --\x12\x80\xb3\x26\x0f\x85\xee\x08\x98\xb3\x3e\x42\x08\xae\xbb\x6a\ --\x81\xd5\x61\x28\x8a\x5f\x69\x0e\x07\xc5\x33\xe6\x71\xf3\xb7\x7e\ --\x40\xfe\x94\x69\xe7\x1d\xfc\xcf\xd4\xd0\x01\x9b\x8e\x6a\x1c\x39\ --\x25\x2c\xbe\x68\x54\x51\xce\xef\x44\x7d\xa3\xd5\x21\x58\x2e\x35\ --\xd6\x4d\x8a\x47\x12\xe6\x1a\xdc\xfb\xc2\x9c\x50\x90\x2c\x59\x9c\ --\xa7\x53\x90\x34\xc8\xc1\x1f\xd0\x9c\x8e\x73\xcf\x00\x1c\x4a\xe3\ --\xc8\xd8\x6a\x6c\x7d\x29\xd0\x99\x16\xcd\x2e\xe2\xe1\x27\x5f\xa5\ --\xf2\x84\x2a\x4e\xa2\x04\xbe\xcc\xd1\x79\x2c\x5a\x7a\x35\x71\x09\ --\x49\x43\x7a\xbf\x4f\x87\xf7\x4f\x08\xea\xdb\xa1\x28\x6d\xf0\x5f\ --\x0e\x8a\x62\x86\x13\x75\x0d\x56\x87\x60\xb9\xf4\x38\x37\x33\x32\ --\x24\x20\x69\xe9\x82\x13\x6d\x82\xba\x56\x68\xec\x14\xf8\x3e\x91\ --\xc1\x6b\x40\x42\xa4\x24\x3b\x0e\x92\x23\xcf\xbd\xbe\x3f\x00\x6d\ --\x85\x49\x9c\x75\x4f\xf7\x59\x09\xc0\x35\x42\xf8\x76\x57\x7b\xdf\ --\x97\x52\xcc\x18\x72\x17\x26\x72\x3a\x1c\xdc\xfc\xb9\x25\xfc\xe7\ --\x6f\x1e\xb1\x3a\x14\x45\x19\xb2\xa8\xe8\x18\x2e\xb9\x7c\x05\xe3\ --\x0a\xa6\xf8\xa5\xbd\x9a\x56\x41\xcb\x51\xc1\xb4\x74\x9d\x18\x5b\ --\x1f\xea\x55\x82\xd1\x89\x93\x6a\x06\x20\x2c\xf4\x9f\x4b\x00\x9e\ --\x50\xf0\x84\x4a\xf2\xe2\xc1\xa7\x4b\x9a\xbb\xa0\xb5\x47\x80\x84\ --\x70\x37\xc4\x86\x49\x9c\x7e\xd8\xe8\x2b\x90\x7b\x84\x10\x67\xad\ --\xbd\x7c\xaa\x59\x89\xd8\x3d\xfc\xae\xcc\xb3\x70\x56\x11\x63\xb3\ --\xd2\xac\x0e\x43\x51\x06\xed\xf4\x74\xff\x4d\xb7\x7d\xdf\x6f\x83\ --\xff\x69\xed\x3d\xf0\xd6\x31\x8d\xa3\x0d\x81\xb1\xa7\x47\x09\x1e\ --\x27\x4e\xaa\x19\x80\xe8\x73\x5c\xcd\xed\xd0\x20\x2e\x1c\xb2\x62\ --\x24\x59\xb1\x92\x84\x08\xff\x0c\xfe\xd0\xff\xd8\xde\x4f\x02\x40\ --\x40\x25\x00\x9a\x26\x58\xfd\xf9\x25\x56\x87\xa1\x28\x83\x92\x3d\ --\x76\x3c\x5f\xfe\xfa\xf7\x58\xb0\x74\x25\x2e\x3f\x1f\x09\x3a\xcd\ --\x27\xe1\xbd\x1a\xc1\xae\x2a\x81\x37\xb8\xf7\x5c\x29\x36\x52\xa3\ --\x96\x00\xce\x99\x00\x18\x4b\x7e\xea\xfa\xce\x4f\x1d\x1c\x10\x68\ --\xa5\x10\x58\xdf\x16\xb3\xa7\x15\x50\x54\x30\x86\xdd\x7b\x8f\x58\ --\x1d\x8a\xa2\x9c\x57\xa4\x27\x9a\xb9\x0b\x3f\xd3\xb7\xc1\xcf\x24\ --\x15\x4d\x82\xa6\xce\xbe\x25\x01\x4f\xa8\x69\xdd\x2a\x4a\xbf\x8e\ --\xa8\x93\x5b\x44\x7b\xcc\xdf\x66\xa7\xe1\xb8\xf0\x0c\x40\x54\x3b\ --\xef\x23\x08\xb8\x42\xfb\xb7\xdf\xb4\xd2\xd2\x2b\x16\x15\xe5\x7c\ --\x9c\x4e\x17\x17\xcd\xbd\x9c\x9b\xbf\xf5\x43\x53\x07\xff\xa6\xc6\ --\x53\xb4\x34\x37\xd2\xda\xdd\xb7\x24\xd0\x14\xdc\x97\xb0\x29\x16\ --\xab\x6f\x6c\xa6\x25\xc8\x2f\x02\x02\xf0\x44\x9a\x3e\x03\xd0\x13\ --\xd1\xc1\xa7\x4e\xf9\x7d\x6a\xc4\xcc\xcd\x15\xdd\x48\xf6\x9b\x13\ --\x93\xff\x8c\xc9\x4a\x65\xf9\x65\x33\xad\x0e\x43\x51\x3e\x25\x6b\ --\xcc\x38\xbe\xf8\xb5\xef\x32\x7b\xe1\x52\xbf\x15\x00\xb9\x10\x6f\ --\x6f\x2f\x5b\x36\xbd\xcc\xc3\xf7\xfe\x8c\xe6\x86\xbe\xeb\xb3\x7b\ --\x75\xd8\x52\xa6\xd1\xd1\x63\x4a\x08\x8a\xf2\x29\x47\xcb\x4f\x58\ --\x1d\x82\x2d\x58\xb0\x04\xb0\x2f\x37\x57\x74\x7f\xf2\x87\xfd\xd6\ --\x0e\x92\xb0\x4d\x40\xa1\xf1\x31\xf9\xd7\xea\xcf\x2f\xe1\xf5\xb7\ --\x77\xab\x0c\x53\xb1\x85\xd8\xb8\x78\xe6\x2f\x59\xc9\xe8\xbc\x02\ --\x53\xfb\x3d\x7c\xe0\x7d\x36\xbe\xf2\x0c\xcd\x8d\xa7\x3e\xf5\x77\ --\x3d\x3e\x78\xef\x84\xe0\xa2\x4c\x55\x2d\x40\x31\x9f\x2a\xdc\x06\ --\xe1\xa1\x21\x84\xb8\x07\x59\x00\x60\xb8\x04\x5b\xfb\xfb\x71\xbf\ --\x09\x80\x40\x6e\x03\x71\x8b\xb1\x11\xf9\x9f\x27\x32\x9c\x6f\x7f\ --\x79\x39\x3f\xf9\xed\xa3\x56\x87\xa2\x04\x31\x97\xcb\xcd\xb4\xd9\ --\x0b\x98\x3e\x7b\x11\x4e\xa7\x79\xbf\xe8\x8d\x0d\xf5\x6c\x7c\x79\ --\x0d\x47\x0f\xed\x3d\xef\xeb\x6a\x5b\x05\x3d\x3e\x55\x27\x40\x31\ --\x9f\x4a\x00\x20\x3e\xce\xfc\x9b\xbc\x84\x2e\xb7\xf5\xf7\xf3\x7e\ --\x13\x00\x87\xc3\xb1\xcd\xe7\x0b\xac\x8d\x80\xa7\x5d\x3e\xaf\x84\ --\x75\x9b\x77\xb1\x6d\xf7\x01\xab\x43\x51\x82\xd0\xb8\xfc\x29\xcc\ --\x5b\xbc\x1c\x4f\x74\xac\x69\x7d\xf6\xf6\xf6\xb0\xf5\xcd\x75\xec\ --\x7c\x7b\x23\x3e\x9f\xf7\x82\xaf\x97\x40\x53\xa7\x20\x31\x52\xcd\ --\x02\x28\xe6\xfa\xf0\x58\x95\xd5\x21\x58\xce\x8a\x04\xc0\xa7\x39\ --\x06\x3e\x03\x50\x98\xc4\xbe\xdd\x35\x34\x23\x09\xc8\x4b\x47\xff\ --\xf5\xd6\x6b\xb8\xe1\x8e\x5f\xd0\xd9\xf9\xa9\x25\x0f\x45\x31\x44\ --\x5c\x7c\x22\xf3\x17\xaf\x24\x27\x77\x82\xa9\xfd\x1e\x39\xf8\x01\ --\x1b\x5e\x7a\x9a\xe6\xa6\xc1\x1d\xad\xea\x08\xb8\x6d\xbe\x4a\xa0\ --\xeb\xe8\xe8\x52\x27\x00\x80\x84\x51\xa6\x0f\xab\x4d\x53\x53\x38\ --\xd4\xdf\x5f\xf4\xbf\x04\x20\x84\x5e\x5a\xa5\xef\x04\xb9\xd0\xd8\ --\xb8\x8c\x91\x14\x1f\xcb\x37\xbf\x78\x15\xbf\xbc\xef\x09\xab\x43\ --\x51\x46\x38\x97\x3b\x84\x59\xf3\x97\x50\x3c\x63\x2e\x9a\xc3\xbc\ --\x39\xf5\x86\xfa\x5a\xd6\xbf\xf4\x34\x65\x47\x0e\x0e\xe9\xfd\x5d\ --\x17\x9e\x28\x50\x14\xbf\xda\xfb\x61\x79\xd0\x5f\x02\x04\x90\x60\ --\xfa\x0c\x80\xd8\xfa\xc9\x0a\x80\xa7\x9d\xf3\x02\x41\x21\xe4\x56\ --\x29\x09\xc8\x04\x00\xe0\xca\x4b\x2f\x66\xe7\xfb\x87\xd8\xb0\xe5\ --\x53\xb5\x0f\x14\xc5\x2f\xc6\xe4\x15\xb0\x68\xd9\x35\x44\x45\xc7\ --\x98\xd6\x67\x6f\x6f\x0f\x3b\xde\x5e\xcf\xb6\x37\x5f\x1f\xd0\x74\ --\xff\xb9\x74\xaa\x19\x00\xc5\x64\xef\x1d\x38\x6a\x75\x08\xb6\x90\ --\x38\xca\xbc\xef\x0b\x00\x49\xff\xeb\xff\x70\x9e\x04\x40\x0a\xf9\ --\x36\x32\xb0\xcb\x88\x7e\xf7\xd6\xcf\xb2\xf7\x50\x19\xb5\xea\xf6\ --\x29\xc5\x8f\x12\x92\xd2\x58\xb8\x6c\x15\xe9\x99\x63\x4c\xed\xf7\ --\xc8\xc1\x0f\x58\xff\xe2\x53\xb4\x34\x0f\xff\xf3\xdc\xd0\x21\x40\ --\xdd\x1b\xa8\x98\x48\x25\x00\x7d\x92\xe2\xcd\xdb\x1f\x04\x20\xd0\ --\x37\x9f\xeb\xef\xce\x99\x00\x74\x38\x1d\x9b\xc3\x7b\x74\xef\xf9\ --\x5e\x63\x77\x51\x11\xe1\xfc\xf0\x9b\xd7\x71\xfb\x7f\xfd\x81\x40\ --\xdd\xd4\xa8\xd8\x47\x48\x68\x38\xb3\x17\x2c\x65\xca\xf4\x59\x08\ --\x61\x5e\xd1\xa9\xfa\xba\x1a\xd6\xbf\xf4\x14\x15\xc7\x0e\xfb\xad\ --\xcd\xb6\x6e\x68\xee\x84\x68\x75\x59\x90\x62\x02\x5d\xd7\xd9\x77\ --\xb8\xdc\xea\x30\x6c\x21\x2d\x69\x94\x79\x9d\x09\x7a\x1d\x9a\xf3\ --\x9d\x73\xfd\xf5\x39\xbf\xc5\x66\x27\x88\xd6\xfe\x6a\x07\x07\x9a\ --\xa2\x82\xb1\x7c\xfd\x0b\x57\x5a\x1d\x86\x12\xc8\x84\x20\x7f\xf2\ --\x34\x6e\xfe\xd6\xf7\x29\x9a\x31\xc7\xb4\xc1\xbf\xb7\xa7\x87\x2d\ --\x9b\x5e\xe6\x91\x3f\xfe\xaf\x5f\x07\x7f\xe8\x7b\xf6\xdf\x5b\x27\ --\xd4\x1c\x80\x62\x8a\xbd\x1f\x96\xa9\x4d\xd9\x80\x10\x82\x14\x33\ --\x13\x00\x29\x77\x4e\x4e\x16\xe7\x2c\x8c\x73\xfe\xa7\x7b\x21\xde\ --\x44\x52\xe2\xf7\xa0\x4c\xf6\xb9\x65\xf3\x38\x52\x56\xcd\x4b\x1b\ --\xb7\x5b\x1d\x8a\x12\x60\x92\x52\xd2\x59\x78\xc5\x67\x49\xcd\xc8\ --\x36\xb5\xdf\x23\x07\x3f\xe0\xf5\x17\x9f\xa4\xb5\xb9\xc9\xb0\x3e\ --\xea\xda\x04\x47\x4e\xc1\xd8\x51\x2a\x0d\x50\x8c\xb5\xb5\x54\x1d\ --\xcb\x86\xbe\x13\x00\xe6\x16\x01\x12\x6f\x9e\xef\x6f\xcf\x9b\x00\ --\x08\x29\xdf\x94\x88\x3b\xfd\x1b\x90\x35\xee\x5c\xbd\x8a\x23\xe5\ --\x35\x1c\x3c\x52\x61\x75\x28\x4a\x00\x08\x0b\x8f\x64\xee\xa2\x65\ --\x4c\x2c\xbe\x08\x21\xcc\xdb\x0b\x73\xb2\xb6\x8a\xf5\x2f\x3e\x45\ --\x65\x99\x39\xeb\xa5\x7b\x6b\x05\x9e\x10\x54\x4d\x00\xc5\x50\x5b\ --\xf7\x04\x5c\x75\x79\x43\x98\x3a\xfd\x0f\x08\x5d\x0e\x3d\x01\x70\ --\xeb\x8e\xb7\xba\x35\x5d\xe7\x3c\x4b\x05\x81\x22\x34\xc4\xcd\xff\ --\x7e\x6f\x35\xb7\xfe\xe0\x37\xea\x3a\x4a\xe5\x9c\x84\xd0\x98\x32\ --\x6d\x16\xb3\x17\x2e\x25\x24\xd4\xbc\x1b\xbb\xba\xbb\x3a\xd9\xbc\ --\xe1\x45\xf6\x6c\x7f\x1b\x29\xcd\xdb\xaf\x22\x25\xec\xa8\x10\xcc\ --\x1d\x2d\x89\x32\xe6\x56\x62\x25\xc8\x35\x34\xb5\x72\xe8\x68\xa5\ --\xd5\x61\xd8\x42\x7a\x4a\x82\x99\xdd\xf9\xf0\x3a\xb6\x9c\xef\x05\ --\xe7\x1d\xd8\x0b\x32\x44\x83\x84\x77\xfd\x1b\x93\x75\xe2\x62\x3d\ --\xfc\xea\xfb\x5f\xc1\x13\x69\xfe\x55\x8c\x8a\xfd\x25\xa7\x65\x72\ --\xdd\x2d\xb7\xb3\xf0\x8a\xab\xcd\x1b\xfc\xa5\x64\xdf\x9e\x1d\x3c\ --\xf0\xdb\xff\x61\xf7\xb6\xb7\x4c\x1d\xfc\x4f\xeb\xd5\xe1\x9d\x72\ --\x0d\xaf\xcf\xf4\xae\x95\x20\xb0\x75\xf7\x7e\xa4\x54\x33\x4c\x00\ --\x39\xe9\xc9\xe6\x75\x26\xe4\xae\xa2\x1c\x71\xde\x35\xc4\x0b\xee\ --\xf0\xd7\xe0\x35\x09\x45\xfe\x8b\xca\x5a\x59\xe9\x49\xfc\xfc\x7b\ --\x37\xf3\x9d\xff\xbe\x8f\xce\x2e\x75\x2d\x9a\x02\x11\x91\x1e\xe6\ --\x5d\x76\x25\xf9\x85\x25\x60\xe2\x74\x7f\x6d\x75\x05\xeb\x5f\x7c\ --\x8a\xea\xca\xe3\xa6\xf5\x79\x2e\x1d\x3d\x7d\x9b\x02\x27\xa7\xa8\ --\x2f\x6a\xc5\xbf\xb6\xec\x3a\xff\xdd\x14\xc1\x24\x27\x23\xc5\xb4\ --\xbe\x04\xe2\xb5\x0b\xbd\xe6\x82\x53\xfb\x12\xfd\x82\x8d\x04\x9a\ --\xc2\xf1\xa3\xf9\xbf\x1f\xdc\x4a\x58\xa8\x39\x57\xb3\x2a\xf6\xa4\ --\x69\x1a\xc5\x33\xe6\x71\xf3\xb7\x7e\x40\xfe\xe4\x69\xa6\x0d\xfe\ --\xdd\x5d\x1d\x6c\x78\x69\x0d\x7f\xfb\xd3\xaf\x6d\x31\xf8\x9f\x76\ --\xbc\x51\xd0\xad\x2a\x04\x2a\x7e\xd4\xd1\xd1\xc5\x3b\xa5\x6a\xfd\ --\xff\xb4\xd1\x59\xe6\xcd\x00\x48\xa1\x5d\x70\xec\xbe\xe0\x0c\x40\ --\x73\x8f\x73\x73\xb4\x5b\xef\x04\x46\xd4\x89\xe1\xc2\x09\xa3\xf9\ --\x9f\x7f\xb9\x89\xef\xfd\xfc\x7e\x7a\xbc\xea\x5b\x2f\xd8\x64\x8e\ --\xce\x63\xe1\x92\x55\x8c\x4a\x34\xf1\x17\x52\x4a\xde\x2f\x7d\x87\ --\x37\x5f\x7f\x81\xae\x0e\xfb\x5d\x59\x2d\x25\x54\x36\x0b\xc6\xa8\ --\x53\x01\x8a\x9f\xbc\xb9\xe3\x03\xba\x7b\x54\xd9\x49\xe8\xab\x4b\ --\x33\x2a\xc6\x63\x56\x77\xed\x51\x6d\xfd\x5f\x01\x7c\xa6\x0b\x26\ --\x00\xf3\x73\x44\x57\x69\x95\xbe\x19\xe4\xa5\xfe\x89\xcb\x3e\xa6\ --\x4f\x19\xc7\x2f\xbf\x7f\x0b\xdf\xff\xe5\x83\x74\x74\xa9\x33\xaa\ --\xc1\x20\x2a\x3a\x86\x4b\x2e\x5f\xc1\xb8\x82\x29\xa6\xf6\x5b\x53\ --\x55\xc6\xfa\x17\x9e\xe2\x44\xb5\xbd\x8b\xa1\x34\x75\x59\x1d\x81\ --\x32\x92\xbc\xb6\x79\x97\xd5\x21\xd8\x46\x4e\xa6\x79\x0f\x1b\x02\ --\xb1\x31\x37\x57\x5c\x70\x50\x1b\x50\x95\x3f\x81\x7c\x4d\xc2\x88\ --\x4b\x00\x00\x4a\x0a\xf3\xf8\xcd\x8f\xbf\xce\xbf\xfc\xf4\x4f\x34\ --\xb7\xd8\xef\xa9\x4c\xf1\x0f\xcd\xe1\x60\x4a\xc9\x6c\xe6\x2c\xba\ --\x02\x97\xdb\xbc\xed\xee\x5d\x9d\x1d\x6c\xd9\xf8\x0a\xbb\xb7\x5b\ --\xb3\xc1\x6f\xb0\xbc\xf6\x0f\x51\x09\x10\x4d\x2d\x6d\xec\x7c\xaf\ --\xdf\x4b\xe8\x82\xd2\xf8\xd1\xe9\xa6\xf5\x25\x85\x1c\xd0\xd2\xfd\ --\x80\x12\x00\xcd\xa1\xbd\xec\xf3\xe9\xbf\x1c\x5e\x48\xf6\x35\x61\ --\x6c\x26\xbf\xfd\xf1\x37\xf8\xee\x4f\xff\xac\xee\x0d\x18\x81\x46\ --\xe7\xe6\x33\x7f\xc9\x4a\x62\x47\x99\x77\x04\x47\x4a\x9d\x3d\x3b\ --\xde\x66\xf3\xfa\x97\xe8\xee\xea\x30\xad\xdf\xe1\x0a\x31\xef\x42\ --\x43\x65\x84\x5b\xff\xf6\x1e\x55\x82\xfd\x0c\xe3\x46\x67\x98\xd6\ --\x97\x43\x6a\xaf\x0e\xe4\x75\x03\x4a\x00\x26\x27\x8b\x0f\x4a\xab\ --\x7c\xc7\x80\x9c\x61\x45\x65\x63\xa3\x33\x53\x78\xf0\x97\xdf\xe1\ --\xfb\xff\xfb\x10\xef\xee\x3f\x62\x75\x38\x8a\x1f\x44\x45\xc7\x30\ --\x67\xc1\x32\xf2\xa7\x4c\x33\xb5\xdf\x13\xd5\xe5\xac\x7f\xe1\x29\ --\x6a\xaa\xca\x4c\xed\xd7\x1f\xd4\xdd\x00\x8a\xbf\x3c\xfb\xda\x79\ --\x8f\xa0\x07\x9d\x09\x63\x4d\x4a\x00\x04\x47\x26\xa7\x8a\x01\xdd\ --\x13\x3e\x98\x8b\x7e\x5e\x04\x6e\x1b\x5a\x44\x81\x21\xda\x13\xc1\ --\xaf\xff\xe3\x56\x7e\xfe\xfb\xc7\x78\x6d\x73\xa9\xd5\xe1\x28\x43\ --\xe4\x72\xb9\x99\x3e\x67\x11\xd3\x66\x2d\xc0\xe9\x34\xaf\xec\x66\ --\x47\x5b\x2b\x6f\xbc\xf6\x1c\x7b\xdf\xdd\xd1\xb7\xa3\x2e\x00\xa9\ --\xeb\xda\x15\x7f\xd8\xb3\xef\x08\x47\xcb\x6b\xac\x0e\xc3\x36\xc2\ --\xc2\x42\x48\x4f\x49\x34\xab\xbb\x67\x07\xfa\xc2\x01\x27\x00\x52\ --\xe8\x2f\x0a\xa9\x8d\xe8\x04\x00\x20\xc4\xed\xe2\x47\xb7\x7f\x81\ --\x89\xe3\x72\xf8\xdd\x5f\x9e\x55\x27\x04\x02\x4c\x5e\xfe\x64\x2e\ --\xb9\x7c\x39\x9e\x98\x38\xd3\xfa\xd4\x75\x9d\xdd\xdb\xdf\xe2\xed\ --\x8d\x2f\xd3\xd3\xd5\x69\x5a\xbf\x46\xd8\x57\x27\xf0\x84\x5a\x1d\ --\x85\x12\xe8\x9e\x5d\xa7\x9e\xfe\xcf\x34\x2e\x27\x1d\x4d\x33\xe7\ --\x98\xb1\xd4\xf5\x17\x07\xfa\xda\x01\x27\x00\x9e\x76\xe7\xc6\x96\ --\x70\xbd\x55\x40\xd4\xd0\xc2\x0a\x2c\xab\x96\xcc\x26\x3f\x37\x93\ --\x1f\xdd\xf5\x57\xaa\x6b\x4f\x59\x1d\x8e\x72\x01\x29\xe9\x59\x5c\ --\x72\xf9\x72\xd2\x32\x47\x9b\xda\x6f\xc5\xf1\xc3\xac\x7f\xe9\x69\ --\xea\x6b\xab\x4d\xed\xd7\x28\x3e\x1d\xb6\x94\x09\xb4\x66\xf3\x0a\ --\x22\x29\x23\x4b\x63\x73\x2b\x9b\xb6\x8e\x98\x02\xb2\x7e\x51\x90\ --\x97\x6d\x56\x57\x2d\xa1\xcd\xce\xcd\x03\x7d\xf1\x80\x13\x80\xdc\ --\x5c\xd1\xbd\xbb\x4a\x7f\x5d\x22\x57\x0c\x2d\xae\xc0\x33\x61\x6c\ --\x26\x0f\xff\xea\xbb\xdc\xf3\xf0\x33\xbc\xb0\x7e\x9b\xd5\xe1\x28\ --\xfd\x48\x48\x4a\xe3\xe2\x4b\x2e\x27\x6f\x42\xa1\xa9\x55\xfc\xda\ --\x5a\x9b\xd9\xb4\xee\x59\x0e\xbc\x5f\x1a\xb0\xd3\xfd\xe7\x22\x25\ --\x1c\x6f\x50\x09\x80\x32\x34\x6b\xd7\x6d\xa1\x57\xd5\x95\x3e\xcb\ --\xe4\x09\xe6\x3c\x98\x08\x78\xa5\xa0\x40\x0c\xb8\xc4\xed\x60\xf6\ --\x00\x80\xd4\x9f\x43\x88\xa0\x49\x00\x00\xc2\xc3\x42\xf8\xde\xd7\ --\x3e\xcf\xdc\x19\x85\xfc\xe2\xf7\x8f\x73\xaa\xa9\xc5\xea\x90\x14\ --\x20\x31\x25\x9d\x8b\xe7\x5d\x4e\xee\xf8\x49\xa6\x0e\xfc\xba\xcf\ --\x47\xe9\xd6\x37\x78\x7b\xd3\x2b\xf4\xf6\xa8\xda\x11\x8a\x72\xa6\ --\x8e\xae\x6e\x9e\x7c\xe9\x2d\xab\xc3\xb0\x15\x4d\x13\x4c\x1a\x9f\ --\x6d\x4a\x5f\xba\x90\xcf\x0f\xe6\xf5\x83\x4b\x00\x7a\x1d\x6b\x71\ --\xeb\xf7\x01\x41\x57\x43\x77\x66\x71\x3e\x8f\xdd\xfb\x03\x1e\x7e\ --\x6a\x1d\xff\x78\x6e\x23\xba\xda\x2d\x65\x3e\x21\xc8\x1a\x9d\x47\ --\xf1\x8c\xb9\x8c\xc9\x2b\x30\x75\xe0\x07\xa8\x38\x76\x98\xf5\x2f\ --\x3d\x45\x7d\x9d\xda\xdc\xa4\x28\xfd\x59\xfb\xea\xdb\xb4\xb4\xaa\ --\x7a\x2a\x67\xca\xc9\x48\x21\x2a\xc2\x94\xcb\xc5\x7a\x5c\xbd\x8e\ --\x01\xaf\xff\xc3\x20\x13\x80\xa2\x1c\xd1\x54\x5a\xa5\xbf\x31\x12\ --\xab\x02\x0e\x44\x58\xa8\x9b\xaf\xdd\xb0\x8c\x84\xd1\x45\x3c\xf9\ --\xe4\xd3\x54\x55\x1c\xb3\x3a\xa4\xa0\xe0\x0e\x09\x25\x7f\x72\x09\ --\xc5\x33\xe6\x12\x17\x9f\x64\x7a\xff\xad\x2d\x4d\x6c\x7a\xe5\x19\ --\x0e\xee\xdd\x63\x7a\xdf\x8a\x12\x28\xba\x7b\x7a\x79\xec\x85\x37\ --\xac\x0e\xc3\x76\x26\x8f\x37\xe7\xf4\xbc\x14\xe2\xb5\xc2\x2c\x31\ --\xa8\x42\x36\x83\x9b\x01\x00\xa4\x94\x4f\x0b\x31\x32\xab\x02\x0e\ --\x44\x63\x27\x38\xa3\x33\xb8\xf6\xe6\x6f\x73\x68\xff\x7b\xbc\xf5\ --\xfa\xf3\x34\x9e\x3a\x69\x75\x58\x23\x52\x72\x6a\x26\x93\x4b\x66\ --\x32\x6e\x52\x31\x6e\x13\xab\xf7\x9d\xe6\xf3\xf9\xd8\xb5\x65\x23\ --\xef\xbc\xf9\x2a\xbd\x3d\xea\xe6\x48\x45\x39\x9f\x17\x37\x6c\xa3\ --\xa1\x51\x2d\x91\x7e\x52\xd1\xa4\x5c\x73\x3a\x92\xfa\xd3\x83\x7d\ --\xcb\xa0\x13\x00\xb7\x4b\x5b\xdb\xeb\xd5\x7f\x07\x04\x65\xcd\xb0\ --\x43\xf5\x1f\x4d\x3b\x0b\x41\x5e\xfe\x64\xc6\x8e\x9b\xc8\x07\x7b\ --\xb6\xb3\xed\xad\xd7\x68\x6e\x54\xa7\x05\x86\x2b\x22\xd2\xc3\xf8\ --\x49\xc5\x14\x4c\x9e\x46\x62\x8a\x79\xa5\x33\x3f\xe9\xf8\xe1\x03\ --\x6c\x78\xf9\x69\x1a\xea\xeb\x2c\x8b\x41\x51\x02\x45\x67\x57\x0f\ --\x7f\x79\x6a\xc4\x5d\x1c\x3b\x6c\x9a\xa6\x51\x62\x4e\x02\xe0\x95\ --\xc2\x31\xa8\xf5\x7f\x18\x42\x02\x30\x29\x49\xd4\x96\x56\x79\xdf\ --\x06\x31\x77\xb0\xef\x0d\x74\xad\xdd\x70\xa2\xf5\xec\x75\x67\xcd\ --\xe1\xa0\x70\xea\xc5\x4c\x9c\x32\x9d\xfd\xef\xed\x64\xdb\xdb\xeb\ --\x69\x38\x59\x6b\x51\x84\x81\xc9\x1d\x12\xca\xd8\x09\x93\xc8\x2f\ --\x2c\x21\x6b\x74\x1e\x42\x5c\xf0\x96\x6a\xc3\x34\x37\x35\xb0\xe9\ --\x95\x67\xf8\x70\xff\x7b\x96\xc5\xa0\x28\x81\xe6\x1f\xcf\x6d\x54\ --\x1b\xa4\xfb\x91\x3f\x36\xd3\xa4\xf5\x7f\xb1\xb1\x24\x55\xd4\x0f\ --\xf6\x5d\x83\x4e\x00\x00\x24\xe2\x49\x01\x41\x97\x00\x94\x35\x8a\ --\x73\x9e\xf8\xd2\x1c\x0e\x0a\x8a\x66\x50\x30\x65\x3a\xc7\x8f\x1e\ --\xa4\xf4\x9d\x37\x38\x76\x78\x3f\x72\x84\x1d\x11\xf3\x97\xb0\xf0\ --\x48\xc6\x8e\x9f\x48\xee\x84\x42\xb2\xc6\x8c\xc3\xe1\x18\xd2\x47\ --\xd1\x6f\xbc\xde\x5e\x76\xbc\xbd\x81\xed\x6f\xbd\x4e\x6f\xaf\x9a\ --\xee\x57\x94\x81\x3a\xd5\xd4\xc2\x63\xcf\x6d\xb4\x3a\x0c\x5b\x9a\ --\x3e\x65\x9c\x29\xfd\x48\x21\x9f\x1a\xca\xfb\x86\xf4\xad\x2b\x34\ --\xed\x71\x74\xfd\xae\xa1\xbe\x3f\x50\xd5\xb5\x0d\x60\xd7\xb9\x10\ --\x64\x8f\x19\x4f\xf6\x98\xf1\x34\x37\x9e\xe2\x83\x3d\xdb\xd9\xbb\ --\x7b\x1b\x2d\xcd\xea\x92\xa1\x51\x09\xc9\xe4\xe4\x4e\x60\x4c\xde\ --\x44\xd2\xb3\x47\x5b\xfa\xa4\x7f\xa6\x23\x87\xf6\xb2\xf1\xe5\x35\ --\x34\x35\x0c\x3a\x81\x56\x94\xa0\xf7\xc0\x63\x2f\xab\xeb\xd4\xcf\ --\x61\xda\x64\x53\x12\x80\x1e\xaf\xae\x0d\x7a\xfd\x1f\x86\x38\x80\ --\x17\xa7\x88\x93\xa5\x55\xfa\xeb\x20\x17\x0f\xe5\xfd\x81\x48\x02\ --\xed\x83\x7c\x30\x8c\x8e\x1d\xc5\xac\xf9\x4b\x98\x79\xc9\x62\x2a\ --\xcb\x8e\x70\xf8\xc0\xfb\x1c\x3e\xf0\x7e\xd0\xec\x15\x08\x8b\x88\ --\x20\x2b\x27\x8f\xec\xb1\x13\xc8\x1e\x33\x9e\x48\x4f\xb4\xd5\x21\ --\x9d\xa5\xa9\xa1\x9e\x8d\x2f\xaf\xe1\xc8\xa1\xbd\x56\x87\xa2\x28\ --\x01\xe9\xd0\xb1\x4a\x5e\xd8\xb0\xdd\xea\x30\x6c\x29\xc6\x13\x49\ --\x41\x6e\x96\x09\x3d\x89\x97\x67\xa4\x8b\x21\x0d\x2a\x43\x7f\x82\ --\x17\xfa\xdf\x91\x22\x68\x12\x00\x24\xe8\x43\x9c\xcd\x17\x42\x90\ --\x91\x3d\x96\x8c\xec\xb1\xcc\x5f\xbc\x82\x53\x27\x4f\x70\xe4\xe0\ --\x07\x1c\x39\xb8\xb7\xef\x28\xe1\x08\x59\x26\x88\x88\xf4\x90\x9e\ --\x35\x9a\xd4\xcc\xd1\xa4\x67\x8e\x26\x31\x25\x1d\x61\xf2\x59\xfd\ --\x81\xf0\xf6\xf6\xb2\xfd\xed\xd7\xd9\xfe\xd6\x7a\xbc\xde\x5e\xab\ --\xc3\x51\x94\x80\xa4\xeb\x92\xff\xfb\xd3\xd3\xaa\x26\xca\x39\xcc\ --\x9e\x56\x80\xa6\x19\x3f\xcb\x29\xd1\xff\x31\xd4\xf7\x0e\x39\x01\ --\x70\x68\x8e\x35\x3e\x9f\xfe\x07\x20\x62\xa8\x6d\x04\x12\x21\xc0\ --\xa9\x41\xaf\x1f\x3e\xeb\xa3\x12\x92\x19\x95\x90\xcc\xf4\xd9\x8b\ --\x68\x6b\x6d\xa6\xaa\xe2\x18\x35\xe5\xc7\xa8\xae\x3c\x4e\x6d\x75\ --\x05\x3e\x9f\xfd\xcb\x68\x46\x45\xc7\x90\x98\x9c\x4e\x62\x72\x1a\ --\x09\xc9\x69\xa4\xa6\x67\xdb\xee\x09\xbf\x3f\x1f\x1e\x78\x9f\x4d\ --\x2f\xaf\xa1\xb9\xa9\xc1\xea\x50\x14\x25\xa0\x3d\xf5\xd2\x9b\xec\ --\xfd\xf0\xb8\xd5\x61\xd8\xd6\xec\x92\x49\x66\x74\xd3\xee\x74\x38\ --\x5e\x18\xea\x9b\x87\x9c\x00\x4c\x4e\x16\xed\xa5\x55\xbe\x17\x80\ --\xcf\x0d\xb5\x8d\x40\x13\x13\x26\x39\xd9\xee\xdf\x27\xda\xc8\xa8\ --\x68\xc6\xe5\x4f\x61\x5c\xfe\x14\x00\x7c\x3e\x2f\x27\xaa\x2b\xa8\ --\xa9\x38\xce\xa9\x93\x27\x68\xac\x3f\x49\xc3\xa9\x3a\x3a\xda\x5b\ --\xfd\xda\xef\x40\x68\x0e\x07\xd1\x31\x71\xc4\xc4\x25\x10\x1b\x97\ --\x40\xec\xa8\x04\xe2\xe2\x13\x49\x4a\x49\x27\x34\x3c\xb0\xf2\xbe\ --\x86\xfa\x3a\x36\xbe\xb2\x86\x63\x1f\xee\xb7\x3a\x14\x45\x09\x78\ --\xb5\xf5\x8d\xdc\xff\xd8\xcb\x56\x87\x61\x5b\x61\xa1\x6e\xa6\x4d\ --\xce\x33\xbe\x23\xc9\x9a\xc9\xc9\x62\xc8\xa5\x17\x87\xb5\x89\x4f\ --\x48\xf9\x88\x14\x22\x68\x12\x80\xc4\x28\x38\x69\x70\x95\x4b\x87\ --\xc3\x49\x5a\x46\x0e\x69\x19\x67\x57\x8f\xea\xe9\xea\xa4\xa1\xe1\ --\x24\x8d\xa7\x4e\xd2\xda\xd4\x48\x47\x47\x1b\x9d\x1d\xed\x74\x75\ --\xb4\xd3\xd9\xd1\x4e\x67\x67\x3b\x1d\xed\x7d\xc1\xf9\xbc\xbd\xfd\ --\x4e\x6d\xbb\x5c\x6e\x1c\x4e\x27\xa1\xa1\x61\x38\x5c\x2e\x9c\x4e\ --\x17\x61\xe1\x11\x84\x47\x46\x11\x11\xe9\x21\x32\xd2\x43\x44\x44\ --\x14\x11\x9e\x68\x22\x3d\x31\x44\xc7\xc4\x99\x32\x85\x65\xa4\xde\ --\x9e\x1e\xb6\xbe\xb9\x8e\x9d\x5b\x36\xe2\xf3\xa9\xab\x9d\x15\x65\ --\xb8\xa4\x94\xfc\xf2\xbe\x27\xd4\xc6\xbf\xf3\x98\x3e\x65\x3c\x21\ --\x6e\x97\xe1\xfd\x08\xa1\x3f\x32\x9c\xf7\x0f\x2b\x01\xf8\x30\xcd\ --\xf1\xca\xd8\x6a\xbd\x12\xb0\xae\x62\x8b\x89\x72\x62\x25\x65\x8d\ --\x82\x36\x0b\x3e\xf7\xee\xd0\x30\x92\x53\x33\x49\x4e\xcd\x1c\xf4\ --\x7b\xa5\xd4\x6d\xb3\xe3\xde\x4c\x07\xf7\xee\x61\xd3\xab\xcf\xd0\ --\xda\xdc\x64\x75\x28\x8a\x32\x62\x3c\xf5\xf2\x5b\x6c\xdb\x7d\xc0\ --\xea\x30\x6c\x6d\xe1\xcc\x22\x33\xba\xa9\xfc\x30\xd5\xb9\x61\x38\ --\x0d\x0c\x6b\x54\xb8\x46\x08\x1f\xf0\xe8\x70\xda\x08\x24\x4e\x0d\ --\x66\x66\xe9\x84\x1b\x9f\xd8\xf9\x55\xb0\x0d\xfe\xed\xad\x2d\x3c\ --\xf1\x97\xdf\xf1\xfc\x13\x0f\xa9\xc1\x5f\x51\xfc\xe8\x68\x79\x0d\ --\x7f\x78\x64\xc8\x4b\xce\x41\x21\x2c\x2c\x84\x59\x25\x05\xc6\x77\ --\x24\x78\xe8\xa3\x31\x78\xc8\x86\x3d\x32\x68\x52\x7b\x90\xbe\x53\ --\x72\x41\x21\xdc\x05\xb3\xb2\x75\xdc\x41\x59\x08\x39\x30\xd4\xd7\ --\xd5\x50\x7e\xf4\x90\xd5\x61\x28\xca\x88\xd2\xe3\xf5\xf2\x5f\xbf\ --\x79\x94\x9e\x5e\x75\x72\xe6\x7c\x2e\x99\x51\x68\xc6\xf4\xbf\xd4\ --\xbd\xda\x5f\x86\xdb\xc8\xb0\x13\x80\x29\xe9\xe2\x10\xc8\x77\x86\ --\xdb\x4e\x20\x89\x70\xc3\xf4\x4c\x1d\xfb\x1d\x70\x53\x14\x45\x31\ --\xc6\x6f\x1e\x78\x86\xc3\x65\x55\x56\x87\x61\x7b\x8b\x66\x15\x1b\ --\xdf\x89\x90\x6f\x94\x64\x8a\x23\xc3\x6d\xc6\x5f\x73\xc3\x0f\xfa\ --\xa9\x9d\x80\x11\x1f\x0e\xf1\x11\x41\x33\xf1\xa1\x28\x4a\x10\x7b\ --\xee\xf5\xad\x3c\xfb\xda\x16\xab\xc3\xb0\xbd\x51\x31\x1e\x4a\x0a\ --\x4d\xd8\xfd\xaf\xf3\x90\x3f\x9a\xf1\x4b\x02\x10\xe2\x72\x3c\x0e\ --\x04\xdd\x4d\x10\x21\x41\x55\x08\x59\x51\x94\x60\xb4\xf7\xc3\xe3\ --\xdc\x7d\xff\x90\x2a\xcd\x06\x9d\xa5\x0b\xa6\xe3\x70\x18\xbe\xe7\ --\xaa\x49\xd7\x1c\x43\xaa\xfd\xff\x49\x7e\x89\xb4\x20\x51\xb4\x49\ --\xf8\x9b\x3f\xda\x0a\x14\xbd\x3a\x7e\xaf\x09\xa0\x28\x8a\x62\x27\ --\xf5\x8d\xcd\x7c\xff\x17\x0f\xd1\xe3\x55\x47\x68\x2f\x44\x08\xc1\ --\xd2\xf9\xd3\x0d\xef\x47\x4a\xfe\x52\x92\x2a\x3a\xfc\xd1\x96\xdf\ --\x52\x15\xa1\x69\xbf\x23\x48\x36\x03\x4a\x09\x7b\xaa\x04\xdd\xea\ --\x77\x42\x51\x94\x11\xaa\xa3\xa3\x8b\xef\xfe\xcf\x9f\xd5\x35\xbf\ --\x03\x34\x25\x7f\x34\x19\x29\x09\x86\xf7\xe3\x70\x68\x7f\xf6\x57\ --\x5b\x7e\x4b\x00\x8a\x53\xc4\x3e\x81\x7c\xdb\x5f\xed\xd9\x95\x94\ --\x50\x5a\x2d\xa8\x6a\x51\x4f\xff\x8a\xa2\x8c\x4c\x3d\x5e\x2f\xdf\ --\xfb\xe5\x83\x7c\x78\x5c\x6d\xfa\x1b\xa8\xcf\x2c\xbc\xd8\xf8\x4e\ --\x84\xdc\x34\x25\x45\xf8\xed\xf6\x32\xff\x2e\x56\x08\xfe\xe8\xd7\ --\xf6\x6c\xc6\x27\x61\x5b\x85\xa0\xa2\x49\x0d\xfe\x8a\xa2\x8c\x4c\ --\x52\x4a\x7e\xf1\x87\xc7\x29\xfd\xe0\x43\xab\x43\x09\x18\xb1\xd1\ --\x51\x5c\x72\x71\xa1\xe1\xfd\x48\xe9\xdf\x31\xd6\xaf\x09\x40\x64\ --\xbb\xe3\x29\xe0\xa4\x3f\xdb\xb4\x0b\x9f\x0e\xdb\xca\x05\x27\x5a\ --\xd5\xe0\xaf\x28\xca\xc8\x24\xa5\xe4\x57\x7f\x7a\x8a\x57\xdf\xd8\ --\x69\x75\x28\x01\x65\xc5\xe5\x33\x71\xbb\x0c\x3f\xfb\x5f\x1b\xda\ --\xe4\x78\xc6\x9f\x0d\xfa\x35\x01\xc8\xcd\x15\xdd\x23\x71\x16\xc0\ --\x27\x61\x4b\x99\x46\x5d\x9b\x1a\xfc\x15\x25\x18\x95\x35\x8e\xfc\ --\x0d\x4e\x52\x4a\xee\xba\xff\x69\x75\xdc\x6f\x90\x5c\x4e\x07\xcb\ --\x2f\x9d\x69\x78\x3f\x02\xfe\x50\x50\x20\x7a\xfc\xd9\xa6\xdf\xcf\ --\x2b\xe8\x3d\xda\x1f\x00\xbf\x06\x69\xb5\xbd\x27\x04\xa7\xfc\xb2\ --\xe7\x52\x51\x94\x40\x54\xd5\x22\xd8\x59\x29\xd0\x47\x68\x16\x70\ --\xfa\xc9\x7f\xcd\xab\x23\x7e\x1b\x97\xdf\x2d\x98\x55\x44\x5c\xac\ --\xc7\xe8\x6e\xba\x7b\x5d\xda\x7d\xfe\x6e\xd4\xef\x09\x40\x49\xb6\ --\xa8\x11\x92\x27\xfc\xdd\xae\x55\x7a\x7d\x50\xd6\xa8\x9e\xfc\x15\ --\x25\xd8\x55\x35\x0b\x36\x1f\xd7\x46\xdc\xe9\x1f\x9f\x4f\xe7\x67\ --\xbf\x7f\x4c\x3d\xf9\x0f\x81\x10\x82\xeb\xae\x9c\x6f\x7c\x3f\xf0\ --\xf7\xe9\x89\xe2\x84\xbf\xdb\x35\xa4\x62\x81\x4f\xd3\xee\x32\xa2\ --\x5d\x2b\x74\x7b\xfb\x96\x00\x14\x45\x51\x1a\x3a\x60\xe3\x11\x8d\ --\xda\x11\xb2\x17\xa8\xab\xbb\x87\x7f\xff\xe5\x03\xbc\xb4\x71\xbb\ --\xd5\xa1\x04\xa4\x99\x53\xf3\x19\x93\x95\x6a\x7c\x47\x52\xbb\xc7\ --\x88\x66\x0d\x49\x00\x4a\x52\x45\xa9\x40\x6e\x36\xa2\x6d\xb3\x85\ --\x3a\x51\x35\xff\x15\x45\xf9\x58\x97\x17\xb6\x96\x0b\xde\xad\x11\ --\xf4\xea\x56\x47\x33\x74\xad\xed\x1d\xdc\xf9\x93\xfb\xd8\xb2\x6b\ --\x9f\xd5\xa1\x04\xac\xeb\x97\x2f\x30\xa1\x17\xb1\xa1\x28\x5d\xec\ --\x31\xa2\x65\xc3\x6a\x16\xea\x82\x11\x31\x0b\xe0\x74\x40\x74\x98\ --\xd5\x51\x28\x8a\x62\x27\x12\x38\xd6\x20\x78\xed\x90\xc6\xa1\xfa\ --\xc0\x2b\x0a\x76\xbc\xe2\x04\x5f\xf9\xde\xdd\xbc\x77\xe0\xa8\xd5\ --\xa1\x04\xac\xa2\x82\xb1\x14\x8e\x1f\x6d\x78\x3f\x12\xfd\x6e\xa3\ --\xda\x36\xac\x9a\x7d\x71\x8a\x63\xed\xee\x6a\x7d\x1f\x90\x6f\x54\ --\x1f\x66\x49\x8e\x92\x34\x75\xaa\x79\x00\x45\x51\xce\xd6\xe3\x83\ --\x7d\xb5\x82\xfd\x75\x82\xa8\x10\x88\x09\x91\xb8\x9d\x7d\x0f\x0e\ --\x0e\x01\x2e\x0d\x22\x42\x20\x36\x4c\xe2\x34\xbc\x44\xfc\xc0\xbc\ --\xb9\xfd\x03\x7e\xf2\xdb\xbf\xd1\xd9\xd9\x6d\x75\x28\x01\xed\xc6\ --\xcf\x5e\x66\x46\x37\xfb\x8b\x53\x1d\x2f\x1a\xd5\xb8\x61\x09\x80\ --\x10\x42\x2f\xad\xf2\xfe\x1a\xc4\xfd\x46\xf5\x61\x96\x54\x8f\xe4\ --\x40\x9d\x4a\x00\x14\x45\xe9\x9f\x94\xd0\xd2\x05\x2d\x5d\xfd\x7f\ --\x4f\x84\x3a\x05\x33\x32\x75\x62\x2d\x9c\x4d\xd4\x75\xc9\xc3\x4f\ --\xbd\xca\x43\x4f\xae\x43\x4a\xb5\xb1\x69\x38\xa6\x4e\xca\xa5\x78\ --\x62\xae\xf1\x1d\x49\xf9\x73\x21\x84\x61\x0b\x4d\x86\xe6\xa4\x7a\ --\x8d\xe3\xaf\x40\x85\x91\x7d\x98\xc1\x13\x02\xd1\xa1\x56\x47\xa1\ --\x28\x4a\xa0\xea\xdb\x37\xa0\xd1\x65\xd1\x52\x41\x43\x53\x2b\xff\ --\xf2\xd3\xfb\x78\xf0\x89\x57\xd5\xe0\xef\x07\xb7\x5c\xbb\xd4\x8c\ --\x6e\x2a\x43\x9a\x1d\x8f\x19\xd9\x81\xa1\x09\x40\x49\x89\xe8\x15\ --\x60\xc8\xee\x45\xb3\x65\xc4\xa8\x5f\x1a\x45\x51\x86\xae\xdb\x0b\ --\x1f\x9c\x30\x7f\x26\x71\xfb\xbb\x07\xf9\xf2\x77\x7f\xc5\xf6\x3d\ --\x07\x4d\xef\x7b\x24\x9a\x55\x52\xc0\xc4\xbc\x6c\xc3\xfb\x11\x82\ --\x5f\xf9\xbb\xf0\xcf\x27\x19\xbe\x2a\xd5\xee\xd6\xee\x03\x1a\x8d\ --\xee\xc7\x68\x69\x1e\xa9\x4e\x03\x28\x8a\x32\x2c\x55\x2d\x82\x96\ --\x2e\x73\xfa\xea\xe8\xe8\xe2\x57\x7f\x7a\x92\xef\xfc\xf7\x7d\x34\ --\x34\xaa\x1b\xfd\xfc\x41\xd3\x34\x6e\xbd\xee\x0a\x33\xba\x6a\x70\ --\x3b\xb5\x07\x8c\xee\xc4\xf0\x04\x60\x76\x82\x68\x05\x7e\x6b\x74\ --\x3f\x46\x0b\x73\x41\x8c\x3a\x0d\xa0\x28\xca\x30\x48\x09\x47\x1b\ --\x8c\x7f\x94\xd8\xb6\xfb\x00\x5f\xb8\xf3\x97\xac\x5d\xb7\x45\x4d\ --\xf9\xfb\xd1\x55\x97\x5e\xcc\xe8\xcc\x14\xe3\x3b\x92\xdc\x5d\x90\ --\x28\xda\x8c\xee\xc6\xb0\x4d\x80\x67\xd2\xbb\xb4\x5f\x6b\xa1\xfa\ --\xb7\x80\x18\x33\xfa\x33\x4a\x5a\xb4\xa4\x51\x9d\x06\x50\x14\x65\ --\x18\x2a\x9b\x05\x05\x49\x12\x97\xc3\xff\x6d\x9f\x6a\x6a\xe1\x77\ --\x7f\x7d\x8e\x75\x6f\xee\xf2\x7f\xe3\x41\x2e\x22\x3c\x8c\x9b\xae\ --\xb9\xdc\xf8\x8e\x04\xcd\xa2\x47\x33\xe5\xa1\xd9\x94\x83\x29\x25\ --\x63\x44\x33\x82\x7b\xcd\xe8\xcb\x48\xd9\xb1\x12\x8f\xda\x0c\xa8\ --\x28\xca\x30\x78\x75\xfc\x7e\xb1\x58\xaf\xd7\xc7\xdf\x9f\xdd\xc0\ --\xb5\xdf\xfa\x99\x1a\xfc\x0d\xf2\xa5\x55\x8b\x88\x8d\x8e\x32\xbe\ --\x23\xc9\xaf\x8b\x72\x44\x93\xf1\x1d\x99\x34\x03\x00\x20\xba\xb5\ --\xff\x93\x6e\xfd\x36\x02\x78\x16\xc0\xa9\xc1\x9c\x1c\x9d\x3d\x55\ --\x82\xaa\x16\x35\x13\xa0\x28\xca\xd0\xd4\xb6\x41\x5a\xf4\xf0\xdb\ --\x91\x52\xb2\x79\xe7\x5e\xfe\xf0\xc8\xf3\x94\x57\xd7\x0d\xbf\x41\ --\xa5\x5f\x59\xe9\x49\x7c\xf6\x8a\x79\xc6\x77\x24\x68\x16\xdd\xc6\ --\x94\xfd\xed\x8f\x69\x09\x40\x51\x8e\x68\xda\x55\xe9\xfb\xbd\x10\ --\x7c\xdf\xac\x3e\x8d\xe0\xd2\xa0\x24\x43\x92\xd0\x00\xfb\xea\x04\ --\x3d\x3e\xab\x23\x52\x14\x25\xd0\xd4\xb5\x09\x24\xc3\xdb\x58\xfc\ --\xde\xfe\xa3\xdc\xf7\xf7\x97\x78\x77\xff\x11\xbf\xc5\xa5\x7c\x9a\ --\x10\x82\xef\xac\x5e\x85\xcb\x69\xc0\x9a\xcd\x27\xfb\x92\xdc\x65\ --\xd6\xd3\x3f\x98\x98\x00\x00\x78\xd1\x7e\xed\x42\xbf\x0d\x30\xfc\ --\xee\x44\x23\x09\x20\x3b\x4e\x92\xe2\x91\xec\xa9\x11\xd4\xa8\xd9\ --\x00\x45\x51\x06\xa1\xcb\xdb\x57\x38\x68\x28\xf5\x45\xb6\xbf\x7b\ --\x90\x47\xd6\xbc\xce\xee\xbd\x87\xfd\x1f\x98\xf2\x29\x8b\xe7\x95\ --\x98\x53\xf4\x07\x1a\xe9\xd1\x7e\x63\x46\x47\xa7\x99\x9a\x00\xcc\ --\x48\x17\xa7\x76\x57\xf9\x7e\x2d\xe1\xc7\x66\xf6\x6b\x94\x10\x27\ --\x4c\xcf\x90\x7c\x58\xdf\x57\x0e\x54\x51\x14\x65\xa0\xea\xdb\x05\ --\xd1\xa1\x03\xdb\xa1\xaf\xeb\x3a\x1b\xde\x79\x97\xbf\xaf\xdd\xc0\ --\xa1\x63\x95\x06\x47\xa6\x9c\xe6\x89\x8a\xe0\x1b\x5f\xbc\xd2\x94\ --\xbe\x84\xe0\x7f\xcd\x7c\xfa\x07\x93\x13\x00\x00\xb7\x4b\xfb\xbf\ --\xee\x5e\xfd\x6b\x40\x92\xd9\x7d\x1b\x41\x00\x79\xf1\x92\xce\x1e\ --\x38\xd6\xa8\x92\x00\x45\x51\x06\xa6\x75\x00\x25\x5e\x1a\x1a\x5b\ --\x78\xf9\x8d\x1d\xac\x5d\xb7\x85\x9a\xba\x06\xe3\x83\x52\xce\x72\ --\xe7\xea\x55\xc4\x78\x22\xcd\xe8\xaa\xae\xdd\xa5\x99\xbe\x51\xde\ --\xf4\x04\xa0\x20\x51\xb4\xed\xaa\xf6\xfd\x5c\xc8\x91\x71\x5b\xe0\ --\x69\x13\x53\x24\x4d\x5d\x82\xc6\x4e\xab\x23\x51\x14\x25\x10\xb4\ --\x75\x0b\xfa\xee\x15\x3c\x9b\xd7\xe7\x63\xdb\xee\x03\xbc\xbc\x69\ --\x3b\x9b\x77\xec\xc5\xeb\x53\x1b\x8d\xac\x30\x77\xc6\x24\x16\xcd\ --\x2a\x32\xa5\x2f\x09\xff\xf5\x51\xcd\x1c\x53\x99\x9e\x00\x00\x84\ --\x36\x6a\xbf\xef\x8e\xd1\xbf\x05\xe4\x58\xd1\xbf\x11\x1c\x02\x8a\ --\xd3\x74\x36\x1e\xd1\xd0\x55\xdd\x0d\x45\x51\x2e\xa0\xf5\x8c\xcb\ --\xf8\x74\x5d\xe7\xbd\x03\xc7\xd8\xb0\x65\x0f\xeb\xb7\xec\xa6\xb9\ --\xa5\xdd\xba\xc0\x14\xa2\x3d\x11\xfc\xcb\x2d\x9f\x35\xab\xbb\xe3\ --\x9e\x0e\xcd\x92\x4b\xf3\x2c\x49\x00\x0a\x0a\x44\x4f\x69\x95\xf7\ --\xbf\x41\x18\x5e\xea\xd0\x4c\x51\x21\x30\x3e\x51\xaa\xfd\x00\x8a\ --\xa2\x5c\x50\x6b\x7b\x27\x6f\x6c\x3d\xc8\xe6\x9d\x1f\xb0\xa5\x74\ --\x9f\x1a\xf4\x6d\xe4\x3b\xb7\x7c\x96\xb8\x18\x13\xce\xfc\x03\x48\ --\xf9\xa3\xdc\x5c\x61\xc9\xdd\xcc\x96\x24\x00\x00\x87\x53\x1d\x7f\ --\x19\x5b\xad\x7f\x1b\x28\xb4\x2a\x06\x23\x8c\x8d\x97\x54\x36\x9b\ --\x57\xef\x5b\x51\x94\xc0\xd0\xd9\xd1\x46\x4d\x65\x19\x95\x65\x47\ --\x29\x3f\x76\x88\xda\xea\x4a\xa4\x34\xec\xa6\x57\x65\x88\x96\x2d\ --\x9c\xc1\x82\x8b\x27\x9b\xd5\xdd\x9e\xc3\x69\x8e\x47\xcd\xea\xec\ --\x93\x2c\x4b\x00\xae\x11\xc2\xb7\xa7\xb2\xf7\x76\x5d\x68\x1b\xac\ --\x8a\xc1\x08\x1a\x30\x25\x45\xe7\xad\x63\x5a\x3f\xab\x7b\x8a\xa2\ --\x8c\x74\x5e\x6f\x2f\x2d\x4d\x0d\xd4\xd7\x9d\xe0\x54\x5d\x0d\xf5\ --\x75\x35\x9c\xa8\xae\xa0\xb9\xf1\x94\xd5\xa1\x29\x17\x90\x99\x9a\ --\xc8\xb7\x6f\x5c\x69\x5e\x87\x9a\x76\xfb\x35\x42\x58\xb6\xc9\xc3\ --\xb2\x04\x00\x60\x4a\xba\x6b\xe3\xae\x2a\x7d\xad\x40\x2e\xb7\x32\ --\x0e\x7f\x8b\x0b\x87\xcc\x18\x49\x59\x93\x5a\x0a\x50\x94\x91\xe0\ --\x83\x3d\xdb\xa9\xad\xa9\x38\xeb\x67\x5e\x6f\x2f\x3d\xdd\xdd\x74\ --\x76\x76\xd0\xdd\xd9\x4e\x7b\x5b\x2b\x2d\x4d\x8d\xb4\xb7\xa9\x9b\ --\xf7\x02\x91\xdb\xe9\xe4\xc7\xb7\x7f\x81\xb0\x50\xb7\x29\xfd\x09\ --\x78\xa2\x28\x45\xbc\x61\x4a\x67\xe7\x60\x69\x02\x00\xa0\x3b\xc5\ --\x77\x1c\x5e\xb9\x04\x08\xb1\x3a\x16\x7f\xca\x4f\x92\xd4\xb4\xaa\ --\x4a\x81\x8a\x32\x12\xec\x7f\x6f\x27\xfb\xad\x0e\x42\x31\xd4\xb7\ --\x6e\x5a\x41\xde\xe8\x74\xb3\xba\xeb\x42\xd3\xfe\xcd\xac\xce\xce\ --\xc5\x94\xcb\x80\xce\x67\x5a\x92\x38\x2a\xc0\xd4\xea\x47\x66\x08\ --\x71\x42\x7e\xa2\x5a\x04\x50\x14\x45\xb1\xbb\x4b\xe7\x14\xb3\xfc\ --\xb2\x99\xe6\x75\x28\xf8\x55\x51\x8a\x38\x6e\x5e\x87\xfd\xb3\x3c\ --\x01\x00\x68\x77\x6b\xff\x8d\xa0\xc6\xea\x38\xfc\x2d\x2b\x56\x12\ --\x1b\x66\x75\x14\x8a\xa2\x28\xca\xb9\x8c\xce\x4c\xe5\xdf\xbe\xfa\ --\x39\x33\xbb\xac\x0a\x71\x6a\xbf\x30\xb3\xc3\x73\xb1\x45\x02\x30\ --\x3b\x41\xb4\x22\xe5\x7f\x58\x1d\x87\xbf\x09\x01\x93\x53\x74\x84\ --\xda\x0a\xa0\x28\x8a\x62\x3b\x31\x9e\x48\x7e\xf6\x6f\x37\x12\x1a\ --\x62\xce\xba\x3f\x80\x14\xf2\x7b\x05\x89\xa2\xcd\xb4\x0e\xcf\xc3\ --\x16\x09\x00\x40\x51\xaa\xe3\x21\xa4\xdc\x61\x75\x1c\xfe\x16\x13\ --\xd6\x37\x13\xa0\x28\x8a\xa2\xd8\x87\xdb\xe5\xe2\x67\xff\x76\x13\ --\x69\x49\xf1\xa6\xf5\x29\x84\xdc\x56\x9c\x62\xdd\xb1\xbf\x4f\xb2\ --\x4d\x02\x20\x84\xd0\x85\x70\xdc\x4e\x7f\xb5\x31\x03\x5c\x7e\xa2\ --\xc4\x6d\xfc\x4d\x92\x8a\xa2\x28\xca\x00\x08\x21\xf8\xf7\xaf\x7f\ --\x9e\x49\xe3\x4c\x2d\x46\x2b\x7d\x38\xfe\x45\x08\x61\x9b\x31\xce\ --\x36\x09\x00\x40\x51\x9a\xd8\x22\xe0\x49\xab\xe3\xf0\x37\xb7\x03\ --\x26\x24\xd9\xe6\xdf\x5c\x51\x14\x25\xa8\x7d\xed\xfa\x65\x5c\x3a\ --\xa7\xd8\xdc\x4e\x25\x7f\x2b\x49\x15\x9b\xcd\xed\xf4\xfc\x6c\x95\ --\x00\x00\x48\xa1\xfd\x2b\x30\xe2\xae\xd4\xc9\x8e\x91\x78\x46\xd4\ --\x41\x47\x45\x51\x94\xc0\xb3\x6c\xe1\x0c\xae\x5b\xbe\xc0\xec\x6e\ --\xdb\x34\xa9\xfd\xbb\xd9\x9d\x5e\x88\xed\x12\x80\xe2\x54\x51\x06\ --\xfc\xa7\xd5\x71\xf8\x9b\x10\x50\xa0\x66\x01\x14\x45\x51\x2c\x33\ --\xa3\x68\x3c\xdf\xfd\xca\x35\xa6\xf7\x2b\x05\xff\x31\x25\x43\x54\ --\x99\xde\xf1\x05\xd8\x2e\x01\x00\x68\x4e\xd5\xfe\x0f\xd8\x65\x75\ --\x1c\xfe\x96\x14\x25\x89\x0b\xb7\x3a\x0a\x45\x51\x94\xe0\x33\x6e\ --\x4c\x06\x3f\xb9\xf3\xcb\x38\x1c\x26\x0f\x7b\x52\xee\x38\x92\xa2\ --\xfd\xd6\xdc\x4e\x07\xc6\x96\x09\xc0\x7c\x21\xbc\x48\xed\x66\x04\ --\xbd\x56\xc7\xe2\x6f\x93\x92\x75\xd4\xa9\x40\x45\x51\x14\xf3\xe4\ --\x66\xa7\x71\xd7\x0f\x6f\x25\x3c\xcc\xf4\x75\x58\xaf\x26\x1c\xb7\ --\x5a\x59\xef\xff\x7c\x6c\x99\x00\x00\x14\xa7\x8b\x77\x85\xe4\x2e\ --\xab\xe3\xf0\xb7\xd8\xb0\xbe\x99\x00\x45\x51\x14\xc5\x78\x63\xb3\ --\xd2\xf8\xcd\x8f\xbe\x86\x27\x2a\xc2\xfc\xce\x05\x3f\x9f\x92\x26\ --\x76\x9b\xdf\xf1\xc0\xd8\x36\x01\x00\xe8\xd4\xb5\x1f\x03\x87\xad\ --\x8e\xc3\xdf\xf2\x13\xa5\x2a\x0e\xa4\x28\x8a\x62\xb0\x31\x59\xa9\ --\xd6\x0d\xfe\x70\xa8\xb9\x5b\xfb\x1f\x2b\x3a\x1e\x28\x5b\x27\x00\ --\x33\x33\x44\xa7\xd0\xf5\x5b\x18\x61\xb5\x01\x3c\xa1\x90\xe1\x19\ --\x51\xff\x97\x14\x45\x51\x6c\x25\x33\x2d\x89\xbb\x7e\x78\x2b\xd1\ --\x1e\x4b\x06\x7f\x29\xa5\xfe\xb5\xf9\x39\xa2\xcb\x8a\xce\x07\xca\ --\xd6\x09\x00\x40\x51\x86\x6b\x13\xf0\x90\xd5\x71\xf8\xdb\xf8\x44\ --\x89\x43\xcd\x02\x28\x8a\xa2\xf8\x5d\x66\x5a\x12\xf7\xfe\xf8\xeb\ --\xc4\xc5\x7a\xac\x09\x40\x70\xdf\xd4\x74\xd7\x06\x6b\x3a\x1f\x38\ --\xdb\x27\x00\x00\x7a\x97\x76\x27\x60\xbb\x23\x14\xc3\x11\xee\x86\ --\xec\x38\x35\x0b\xa0\x28\x8a\xe2\x4f\x79\x39\xe9\xdc\xfb\x9f\xdf\ --\xb0\x72\xf0\xaf\x11\xdd\xf6\x3b\xf3\xdf\x9f\x80\x48\x00\x4a\xc6\ --\x88\x66\x21\xe5\x1d\x56\xc7\xe1\x6f\x79\xf1\x12\xa7\x2a\x11\xac\ --\x28\x8a\xe2\x17\x25\x85\x79\x7d\x83\x7f\x4c\x94\x65\x31\x48\xe4\ --\x37\x8a\x72\x44\x93\x65\x01\x0c\x42\x40\x24\x00\x00\x45\xe9\xce\ --\x27\x25\x62\xad\xd5\x71\xf8\x53\x88\x13\xc6\x8e\x52\xb3\x00\x8a\ --\xa2\x28\xc3\xb5\xe4\x92\x69\xfc\xea\x07\x5f\x21\x3c\x3c\xd4\xba\ --\x20\x84\x78\x6a\x6a\xaa\xf3\x19\xeb\x02\x18\x9c\x80\x49\x00\x00\ --\x64\xaf\xf8\x3a\x50\x6f\x75\x1c\xfe\x94\x1b\x2f\x89\x30\xef\x26\ --\x4a\x45\x51\x94\x11\xe7\xfa\xe5\x0b\xf9\xfe\x37\xae\xc5\xe9\xb0\ --\x74\x4a\xb5\xce\xe5\x10\xb7\x59\x19\xc0\x60\x05\x54\x02\x50\x92\ --\x2d\x6a\x04\x72\xb5\xd5\x71\xf8\x93\x43\xc0\xc4\x64\x35\x0b\xa0\ --\x28\x8a\x32\x58\x9a\xa6\xf1\xdd\xaf\x7c\x96\xaf\xdd\xb0\x0c\x61\ --\xed\xd9\x6a\x29\x91\xab\x27\x25\x89\x5a\x2b\x83\x18\xac\x80\x4a\ --\x00\x00\x8a\xd2\x9c\xcf\x0a\xc9\x9f\xac\x8e\xc3\x9f\x52\xa2\x24\ --\x49\x91\x2a\x09\x50\x14\x45\x19\xa8\xb0\xb0\x10\xfe\xf7\xdf\x6f\ --\xe1\xaa\xcb\x66\x5a\x1d\x0a\x02\x7e\x3f\x35\xcd\xf9\xbc\xd5\x71\ --\x0c\x56\xc0\x25\x00\x00\x3e\x4d\xbb\x03\x38\x60\x75\x1c\xfe\x34\ --\x29\x45\x1d\x0b\x54\x14\x45\x19\x88\xcc\xd4\x44\xfe\xf4\xd3\xdb\ --\x99\x51\x34\xde\xea\x50\x00\xf6\xfb\xfa\x6e\xb1\x0d\x38\x01\x99\ --\x00\x94\xa4\x8a\x0e\x5d\x68\xd7\x03\x3d\x56\xc7\xe2\x2f\x91\xee\ --\xbe\xfd\x00\x8a\xa2\x28\xca\xb9\xcd\x9d\x3e\x91\x3f\xff\xfc\x76\ --\x72\x32\x92\xad\x0e\x05\xa0\x5b\x48\xed\xba\x92\x54\xd1\x61\x75\ --\x20\x43\x11\x90\x09\x00\x40\x49\xaa\x28\x45\xf0\x23\xab\xe3\xf0\ --\xa7\x71\x09\xea\xb6\x40\x45\x51\x94\xfe\x38\x1c\x1a\x5f\xbb\x61\ --\x19\x3f\xfd\xd7\x9b\x89\x08\x0f\xb3\x3a\x9c\x3e\x92\xef\x17\xa5\ --\x8b\x3d\x56\x87\x31\x54\x01\x9b\x00\x00\x14\xa5\x68\xbf\x04\x61\ --\xfb\x6a\x4b\x03\x25\x04\x94\xa4\xe9\xb8\x02\xfa\x5f\x45\x51\x14\ --\xc5\xbf\xe2\x63\xa3\xf9\xed\x7f\x7e\x83\xeb\x97\x2f\xb4\x3a\x94\ --\x33\x88\xd7\x8a\xd2\xb4\xbb\xad\x8e\x62\x38\x02\x7a\xa8\x11\x42\ --\xe8\x9a\x2e\xbe\x08\x34\x58\x1d\x8b\xbf\x84\xbb\x61\x6a\xba\xba\ --\x2c\x48\x51\x14\x05\xa0\x78\x62\x2e\x0f\xfe\xef\x77\x28\x1c\x3f\ --\xda\xea\x50\xce\xd4\xe8\x45\xdc\x2c\x84\xd0\xad\x0e\x64\x38\x02\ --\x3a\x01\x00\x98\x92\x21\xaa\xa4\x90\xb7\x58\x1d\x87\x3f\x25\x47\ --\x49\x72\x55\x81\x20\x45\x51\x82\x98\xdb\xe5\xe2\x6b\x37\x2c\xe3\ --\xee\xff\xf7\x55\x4b\x2b\xaa\xe2\xe9\xdb\x00\x00\x1a\x00\x49\x44\ --\x41\x54\xfb\xf5\x47\x48\x79\xeb\xf4\x34\x51\x61\x75\x1c\xc3\x15\ --\xf0\x09\x00\xc0\xd4\x54\xe7\x1a\x09\x0f\x5b\x1d\x87\x3f\x4d\x48\ --\x94\x24\x44\xa8\x24\x40\x51\x94\xe0\x33\x26\x2b\x95\x3f\xfd\xfc\ --\xdb\x5c\xbf\x7c\x21\x9a\x66\xaf\x61\x4a\x48\xfe\x54\x94\xee\x7c\ --\xd2\xea\x38\xfc\xc1\x69\x75\x00\xfe\x12\xea\xd2\xbe\xd9\xdd\xab\ --\x4f\x07\xf2\xad\x8e\xc5\x1f\x84\x80\xe2\x74\xc9\xc6\xc3\x82\x1e\ --\x9f\xd5\xd1\x28\x81\x2a\x26\x2e\x1e\x4f\x4c\xac\xd5\x61\x28\xca\ --\x80\x38\x1d\x0e\xbe\xb8\xea\x52\xbe\xb4\xea\x52\x1c\x0e\x7b\x0d\ --\xfc\x00\x08\xde\xd7\x1c\xda\x9d\x56\x87\xe1\x2f\x23\x26\x01\x28\ --\x48\x14\x6d\x7b\x2a\xe5\x0a\x5d\xd3\xb7\x23\x89\xb6\x3a\x1e\x7f\ --\x08\x73\xc2\xe4\x54\xc9\x8e\x0a\xb5\x21\x40\x19\x1c\xa7\xcb\xc5\ --\xf4\xd9\x0b\x99\x3e\x7b\x11\x4e\xa7\xcb\xea\x70\x14\xe5\x82\xb2\ --\x33\x92\xf9\xe1\x6d\xd7\x32\x7e\x4c\xa6\xd5\xa1\x9c\x4b\x93\xf4\ --\x69\x2b\x27\xa7\x8a\x76\xab\x03\xf1\x97\x11\x93\x00\x00\x4c\x49\ --\x17\x87\x4a\xab\xbc\x5f\xa4\xef\xd2\xa0\x11\x31\x6a\xa6\x79\x24\ --\x47\x23\x04\xa7\x46\xcc\x47\x4e\x31\x5a\xee\x84\x42\xe6\x2f\x5e\ --\x81\x27\x26\xce\xea\x50\x14\xe5\x82\xdc\x4e\x27\x9f\xbf\x6a\x3e\ --\x5f\xbe\xfa\x52\xdc\x2e\xdb\x26\xab\x52\x0a\x79\xd3\xd4\x0c\x71\ --\xd8\xea\x40\xfc\x69\x44\x25\x00\x00\xc5\x69\xce\xe7\x4a\x2b\x7d\ --\x3f\x47\x10\x10\xf7\x31\x0f\xc4\xc4\x24\x9d\x37\x8f\x6a\xa8\x1d\ --\x01\xca\xf9\xc4\xc6\xc5\x33\x7f\xe9\x2a\x46\xe7\x8e\x88\x55\x30\ --\x25\x08\x14\x17\x8c\xe5\xce\xd5\xab\xc8\xb6\x47\x51\x9f\xf3\xf9\ --\x49\x20\xdd\xf2\x37\x50\x23\x2e\x01\x00\x28\x4a\xd3\x7e\xb8\xbb\ --\x5a\x16\x81\x5c\x6c\x75\x2c\xfe\x10\x1b\x06\x31\x61\xd0\xd8\x69\ --\x75\x24\x8a\x1d\xb9\x5c\x6e\xa6\xcd\x5e\xc0\x8c\x39\x97\xe2\x70\ --\x8c\xc8\x5f\x69\x65\x84\x89\x8f\x8d\xe6\xab\x37\x2c\x63\xf1\xbc\ --\x12\xab\x43\x19\x00\xf1\xda\xe1\x54\xf1\x5f\x56\x47\x61\x84\x11\ --\xf9\x6d\x21\x84\xd0\xf7\x56\xc8\xeb\xbb\x35\xb9\x13\xc8\xb1\x3a\ --\x1e\x7f\x48\x8a\x92\x34\x76\x8e\x88\x55\x0d\xc5\x8f\xc6\xe4\x15\ --\xb0\xf0\x8a\xab\xd5\x74\xbf\x12\x10\x1c\x0e\x8d\x95\x97\xcf\xe6\ --\x96\x6b\x97\x12\x1e\x16\x62\x75\x38\x03\x51\xa6\x0b\x71\xdd\x35\ --\x42\x8c\xc8\xad\xd8\x23\x32\x01\x00\x28\xc8\x10\x0d\xbb\x2b\xe5\ --\x4a\x29\xf4\x2d\x80\x4d\xea\x46\x0e\x5d\x6c\xa8\xd5\x11\x28\x76\ --\x32\x2a\x31\x99\x85\x4b\x56\x91\x39\x3a\xcf\xea\x50\x14\x65\x40\ --\x2e\x2a\x9e\xc0\x6d\x5f\xb8\x32\x10\xa6\xfb\x4f\xeb\x92\x42\x5b\ --\x55\x92\x2a\xea\xad\x0e\xc4\x28\x23\x36\x01\x00\x28\x4a\x17\x7b\ --\x4a\xab\xbd\xb7\x22\xc5\x5f\xad\x8e\x65\xb8\x3c\xa1\x92\x11\xb2\ --\xaf\x51\x19\x06\x97\xdb\xcd\xb4\x59\x6a\xba\x5f\x09\x1c\xf9\xb9\ --\x59\x7c\xf5\x86\x65\x14\x17\x8c\xb5\x3a\x94\x41\x91\xc8\xaf\x4f\ --\x4d\x15\xbb\xac\x8e\xc3\x48\x23\xfe\x1b\xa4\x38\xd5\xf9\x48\x69\ --\xa5\x6f\x16\x82\x5b\xad\x8e\x65\x38\xc2\x5c\x10\xe1\x86\xf6\x11\ --\x73\xff\xa1\x32\x58\x63\xf2\x0a\x58\xb8\xec\xb3\x78\xa2\xd5\xb9\ --\x7e\xc5\xfe\xb2\xd2\x93\xb8\xf9\x73\x4b\x98\x7f\x51\x21\x22\xf0\ --\x6a\x9b\xdf\x3b\x35\xcd\xf9\x90\xd5\x41\x18\x6d\xc4\x27\x00\x00\ --\x51\x9d\xda\xb7\xdb\x22\x7c\x53\xa4\x14\x33\xac\x8e\x65\x38\xb2\ --\x62\x24\xfb\xea\x02\xee\x17\x49\x19\xa6\xd8\x51\x89\x2c\xba\xe2\ --\x6a\xb2\xc6\x8c\xb3\x3a\x14\x45\xb9\xa0\xa4\xf8\x58\xbe\xb4\xea\ --\x52\x96\x2d\x9c\x61\xbb\x2a\x7e\x03\x23\xb7\x84\x34\x39\xbe\x63\ --\x75\x14\x66\x08\x8a\x04\x20\x37\x57\x74\x6f\xaf\x93\xcb\x9d\xbd\ --\xfa\x56\x20\xcb\xea\x78\x86\x6a\x6c\xbc\xa4\xa2\x59\xd0\xda\x6d\ --\x75\x24\x8a\x19\xdc\xa1\x61\xcc\x9a\xbf\x84\xa2\xe9\x73\x02\xf4\ --\x8b\x54\x09\x26\x69\x49\xf1\x5c\x77\xd5\x7c\x96\x2e\x98\x81\xcb\ --\xe9\xb0\x3a\x9c\xa1\x3a\xe6\x72\x3a\x56\x16\x14\x88\xa0\x98\x6b\ --\x0d\x8a\x04\x00\x60\x7a\xa2\x38\xb1\xab\x5a\x2e\x11\x52\x7f\x1b\ --\x08\xc8\x39\x54\x4d\x40\x71\x9a\xce\xdb\xc7\x35\xbc\x01\x7d\x07\ --\x95\x72\x5e\x42\x90\x5f\x58\xc2\x25\x97\x5d\x45\x78\xa4\xbd\x2e\ --\x41\x51\x94\x4f\x1a\x93\x95\xca\xb5\x57\xce\xe7\xd2\xd9\xc5\xf6\ --\x2c\xdf\x3b\x50\x82\x66\x87\xa6\x5d\x39\x29\x49\xd4\x5a\x1d\x8a\ --\x59\x82\x26\x01\x00\x98\x9a\x2a\xf6\x97\xd6\xc8\x15\xe8\xfa\xab\ --\x40\x40\x9c\x41\xf9\xa4\xd8\x30\x98\x9e\x21\xd9\x56\x2e\xf0\xa9\ --\xca\x40\x23\x4e\x62\x72\x1a\x0b\x96\x5e\x4d\x7a\x96\xad\xae\x3e\ --\x55\x94\x4f\x29\x1c\x3f\x9a\xeb\x97\x2f\x60\xe6\xd4\xfc\x40\x5c\ --\xe3\x3f\x9b\xa0\x17\x5d\x5f\x35\x39\xd5\xf1\x81\xd5\xa1\x98\x29\ --\xa8\x12\x00\x80\xe2\x14\xf1\x46\x69\x95\xf7\x46\x10\x8f\x12\xa0\ --\xdb\xea\x13\x23\x25\xd3\x33\x61\x47\xa5\xc0\x3b\x22\x4f\xa7\x06\ --\x9f\x90\xd0\x70\xe6\x2c\xba\x82\xc9\x25\x33\x11\x22\x80\x9f\xa2\ --\x94\x11\xcd\xe1\xd0\x98\x3d\x6d\x22\xd7\x5e\x39\x9f\x89\x79\xd9\ --\x56\x87\xe3\x2f\x12\x5d\xae\x2e\x4e\x77\xad\xb7\x3a\x10\xb3\x05\ --\x5d\x02\x00\x50\x9c\xe6\xfc\x47\x69\x95\x6f\x3c\xf0\xff\xac\x8e\ --\x65\xa8\x92\x22\x25\x73\x73\x24\xef\x94\x69\x74\xf6\x5a\x1d\x8d\ --\x32\x64\xa7\xa7\xfb\x2f\xbf\x8a\xf0\x08\x35\xdd\xaf\xd8\x53\x5c\ --\xac\x87\x25\xf3\xa6\xb1\xe2\xf2\x99\x24\x27\x8c\xb0\xa2\x53\x92\ --\x1f\x15\xa7\x3b\x03\xfe\xa8\xf8\x50\x04\x65\x02\x00\x50\x94\xaa\ --\xfd\x78\x77\x8d\x9e\x8d\xe4\x8b\x56\xc7\x32\x54\x9e\x10\x98\x37\ --\x5a\xa7\xb4\x4a\x50\xd7\x16\x90\x93\x19\x41\x2d\x29\x25\x9d\x85\ --\x57\x7c\x96\xd4\x8c\x6c\xab\x43\x51\x94\x7e\x8d\x1b\x93\xc1\x67\ --\x97\xce\x65\xd1\xec\x22\x9c\x8e\x80\xdd\xd8\x77\x3e\xff\x28\x4a\ --\xd3\xfe\xdb\xea\x20\xac\x12\xb4\x09\x80\x10\x42\xee\xdc\x29\x57\ --\x6b\x29\x32\x0d\xe4\x42\xab\xe3\x19\xaa\x50\x27\x5c\x9c\x25\x29\ --\x6b\x80\xf7\x6b\x05\x3e\xb5\x39\xd0\xf6\x42\xc3\x23\x98\xbb\x68\ --\x19\x93\x8a\x2f\x0e\xfc\xb5\x53\x65\xc4\x89\xf1\x44\x72\xd9\x9c\ --\x62\xae\xba\x74\x26\x59\xe9\x49\x56\x87\x63\x1c\x29\xdf\x88\xea\ --\x74\xdc\x28\x84\x08\xda\xdd\x54\x41\x9b\x00\x00\x94\x94\x88\xde\ --\x9d\x47\xe4\x2a\x11\x22\x37\x0b\xc1\x44\xab\xe3\x19\x2a\x01\x64\ --\xc7\x49\xe2\x23\x24\xbb\x6b\x34\x75\x75\xb0\x4d\x09\x21\x98\x50\ --\x58\xc2\xfc\xc5\xcb\x09\x0b\x8f\xb4\x3a\x1c\x45\xf9\x98\xdb\xe9\ --\xa4\x64\x72\x1e\x8b\x2f\x99\xce\x9c\x69\x13\x03\xf9\x18\xdf\x40\ --\xed\x73\xfa\x1c\x2b\x72\x73\x45\x50\x1f\xaa\x0e\xea\x04\x00\xa0\ --\x64\x8c\x68\xde\x5d\x23\x3f\x23\x75\x7d\x2b\x10\xd0\xe9\x6e\x64\ --\x08\xcc\xce\xd6\x29\x6b\x14\xec\xab\x15\xf4\xa8\x0d\x82\xb6\x91\ --\x94\x9a\xc1\xa2\x2b\x3e\x4b\x4a\x7a\xc0\x96\xa1\x50\x46\xa0\x71\ --\x63\x32\xb8\x7c\x6e\x09\x97\xcf\x99\x4a\xb4\x27\xc2\xea\x70\xcc\ --\x72\x02\xa1\x2d\x2d\xcc\x12\x8d\x56\x07\x62\xb5\xa0\x4f\x00\x00\ --\x8a\x52\xc4\xf1\x5d\xd5\xf2\x0a\x81\xbe\x1e\x49\xb4\xd5\xf1\x0c\ --\x87\x00\xb2\x63\x25\xa9\x1e\xc9\xc1\x93\x82\x63\xa7\x04\x6a\x55\ --\xc0\x3a\xe1\x11\x51\xcc\xbd\xf4\x33\x4c\x9c\x32\x1d\xd4\x74\xbf\ --\x62\x31\x4d\x13\x4c\x18\x93\xc5\xbc\x19\x93\x98\x3f\x73\x0a\x29\ --\x89\x23\x6c\x43\xdf\x85\x35\x09\xa9\x2d\x29\x4a\x13\x65\x56\x07\ --\x62\x07\x2a\x01\xf8\xc8\xd4\x54\xb1\xab\xb4\x52\x2e\x41\xe8\xeb\ --\x80\x80\x9f\x9f\x75\x3b\x60\x52\xb2\x24\x27\xb6\xaf\x7c\x70\x4d\ --\x8b\x20\x68\x17\xba\x2c\xf0\xf1\x74\xff\xe5\x2b\x08\x8b\x08\x9a\ --\x27\x2b\xc5\x86\x34\x4d\x63\x62\x5e\x36\x97\x5c\x3c\x99\xf9\x17\ --\x4f\x26\x21\x2e\xa0\x9f\x71\x86\xa3\x43\x0a\xed\xca\xe2\x34\xb1\ --\xc7\xea\x40\xec\x42\x25\x00\x67\x28\x4e\x17\xef\x94\x56\xf6\x2e\ --\x47\x68\x2f\x00\x23\xe2\x02\xde\xc8\x90\xbe\xc2\x41\x2d\x5d\x7d\ --\x33\x02\xd5\x2a\x11\x30\x5c\x7a\xd6\x68\x16\x5e\x71\x35\x09\x49\ --\x69\x56\x87\xa2\x04\xa9\x88\xf0\x30\x4a\x0a\x73\x99\x33\x6d\x12\ --\xb3\x4a\xf2\x89\x8a\x08\xb7\x3a\x24\xab\x75\x6a\x52\x5f\x36\x25\ --\xcd\xf1\x96\xd5\x81\xd8\x89\x4a\x00\x3e\xa1\x38\xdd\xb5\x7e\x57\ --\x75\xef\x72\x21\xb5\x67\x09\xd0\x6a\x81\xfd\xf1\x84\xc2\xb4\x0c\ --\x49\x43\x87\xe4\xc0\x49\xc1\xc9\x36\x95\x08\xf8\x5b\x44\x94\x87\ --\x79\x8b\xae\x24\x7f\x72\x89\x9a\xee\x57\x4c\xa5\x69\x82\xdc\x9c\ --\x74\x4a\x26\xe5\x31\xad\x30\x8f\xc9\xf9\x63\x82\x61\x23\xdf\xc0\ --\x08\x7a\xa5\x2e\xaf\x99\x92\xee\xda\x68\x75\x28\x76\xa3\x12\x80\ --\x7e\x4c\x4d\x75\xbd\xba\xab\xda\x7b\x9d\x90\xe2\x71\x46\xd8\x7f\ --\xa3\xb8\x70\x98\x99\x25\x69\xed\x96\x94\x37\x0a\xaa\x5a\x04\x1d\ --\xaa\x90\xd0\xb0\x68\x0e\x07\xc5\xd3\xe7\x30\x73\xfe\x12\xdc\x21\ --\x23\x62\xe2\x48\x09\x00\x29\x89\x71\x14\x15\x8c\x65\xc6\x94\x09\ --\x4c\x2b\xcc\xc5\x13\xa5\x96\x9a\xfa\xe1\x43\xca\x2f\x4e\x4d\x77\ --\xbe\x60\x75\x20\x76\x34\xa2\x06\x37\x7f\x9a\x9a\xea\x5c\xb3\xbb\ --\xd2\xbb\x5a\x0a\xf1\x20\x30\xe2\x6a\xb3\x46\x85\x40\x41\xb2\x24\ --\x3f\x59\xd2\xd4\x09\x95\xcd\x82\xca\x66\x41\xb7\xd7\xea\xc8\x02\ --\x4b\x46\xf6\x58\x16\x2e\x5d\x45\x7c\x52\xaa\xd5\xa1\x28\x23\x5c\ --\x6a\xd2\x28\x26\x8d\xcf\x61\xf2\xf8\xd1\x94\x14\xe6\x91\x9a\x34\ --\xca\xea\x90\xec\x4e\x0a\x21\xbf\x5a\x94\xea\x7c\xcc\xea\x40\xec\ --\x4a\x25\x00\xe7\x51\x94\xee\xfc\xcb\xae\x2a\x5f\xa4\x80\x7b\xad\ --\x8e\xc5\x28\x82\xbe\x0b\x86\x62\xc3\x24\x05\x49\x7d\xb3\x02\x07\ --\xeb\x85\x2a\x2f\x7c\x01\x91\x9e\x68\x2e\xb9\x7c\x39\xe3\x27\x16\ --\x5b\x1d\x8a\x32\x02\x85\x87\x87\x32\x3e\x27\x9d\xf1\xb9\x99\x14\ --\x8e\x1b\x4d\xe1\x84\x1c\x3c\x91\x41\xbf\x8e\x3f\x18\x52\xc0\x6d\ --\x45\xa9\xce\xfb\xad\x0e\xc4\xce\x54\x02\x70\x01\x53\xd3\x1c\xbf\ --\xdb\x55\xed\x73\x09\xc9\x5d\x56\xc7\x62\x34\x4d\xf4\x15\x14\xca\ --\x88\xe9\xdb\x27\x70\xf8\x94\x40\xaa\x8d\x02\x67\xd1\x1c\x0e\xa6\ --\x94\xcc\x66\xf6\xc2\xa5\x6a\xba\x5f\xf1\x0b\xa7\xc3\xc1\x98\xec\ --\x54\x0a\xc7\xe5\x30\x6e\x4c\x06\xe3\x46\xa7\x93\x95\x96\x84\xa6\ --\xa9\x7d\x24\xc3\xf0\xef\x45\x69\x8e\xdf\x5b\x1d\x84\xdd\xa9\x04\ --\x60\x00\xa6\xa6\x3a\xee\x2e\xad\xf6\x8d\x42\xf2\x43\xab\x63\x31\ --\x83\x43\x83\x82\xa4\xbe\x5a\x02\xa5\x55\x1a\xad\x41\x5d\x2b\xeb\ --\x9f\x32\xb2\x73\x59\xb4\xec\x6a\x46\x25\x24\x5b\x1d\x8a\x12\x80\ --\x1c\x0e\x8d\xa4\xf8\x58\xb2\xd3\x93\xc8\xc9\x48\x21\x27\x23\x99\ --\x9c\xf4\x24\x72\xb2\x52\x70\x3b\xd5\x57\xb1\xbf\x48\xf8\xcf\xa9\ --\x69\x8e\x5f\x58\x1d\x47\x20\x50\x9f\xba\x01\x2a\x4e\x75\xfc\x47\ --\x69\x95\xaf\x0d\xf8\xb9\xd5\xb1\x98\x25\x36\x0c\x2e\x19\xa3\xf3\ --\x7e\x8d\xe0\x78\x63\xf0\x3e\x8d\x78\xa2\x63\x99\xb7\x78\x39\xe3\ --\xf2\xa7\x58\x1d\x8a\x12\x00\xa2\x3d\x11\xa4\x27\x25\x90\x9e\x1a\ --\x4f\x46\x4a\x02\x69\xc9\xf1\x64\xa5\x25\x92\x9d\x91\xac\x06\x7a\ --\xe3\xfd\x62\x6a\x9a\xe3\xc7\x56\x07\x11\x28\x82\xf7\x5b\x7d\x88\ --\x76\x55\xf9\xfe\x55\x40\xd0\x65\x97\xe5\x4d\x82\x77\x6b\x02\xe3\ --\xb2\xa1\xb2\x23\x07\x79\xf2\xaf\xc3\x9f\xfd\x73\x38\x9c\x94\xcc\ --\x9a\xcf\x45\x73\x2f\xc3\xe5\x72\xfb\x21\xb2\xc0\xa1\xeb\x3a\x4d\ --\xa7\x4e\x72\xaa\xbe\x96\xc6\xfa\x3a\x4e\xd5\xd7\xd2\x74\xea\x24\ --\x2d\xcd\x8d\xb4\xb7\xb5\xa0\xeb\x01\xf0\x41\x30\x48\xb4\x27\x82\ --\xa4\x51\xb1\x24\xc6\x47\x93\x9c\x10\x47\xe2\xa8\x18\x12\xe3\x63\ --\x49\x4b\x1a\x45\x46\x6a\x02\x91\xe1\x61\x56\x87\x18\x9c\x24\xff\ --\xaf\x38\xdd\xf1\x13\xab\xc3\x08\x24\x2a\x1d\x1d\xa4\xa9\x69\x8e\ --\x5f\x96\x56\xfa\x5a\x10\xfc\x8e\x11\x78\x3a\xe0\x5c\x32\x63\x24\ --\x31\x61\x92\x77\xca\xb4\xa0\xd8\x20\x98\x93\x9b\xcf\x82\x25\x2b\ --\x89\x1d\x95\x60\x75\x28\x96\xd0\x34\x8d\xb8\x84\x24\xe2\x12\x3e\ --\x7d\x3d\x86\x94\x92\xf6\xb6\x16\x5a\x9b\x9b\x68\x6b\x6d\xa6\xb5\ --\xa5\x91\xd6\xe6\x66\xda\xdb\x5a\xe8\xee\xec\xa0\xab\xb3\x83\xce\ --\xae\x0e\xba\xbb\x3a\xe9\xea\xe8\xc0\xe7\xb3\xf7\xd1\x12\x21\x34\ --\x42\xc3\xc3\x08\x0d\x0d\x27\x34\x2c\x9c\xf0\xf0\x48\xc2\x23\xa3\ --\x88\x88\x8c\x26\x35\x3e\x82\x29\xd9\x51\xc4\xc5\xf4\xfd\x2f\x29\ --\x3e\x96\x10\xb7\xcb\xea\x90\x95\xb3\x49\x21\xb8\xa3\x28\xcd\xf1\ --\x1b\xab\x03\x09\x34\x2a\x01\x18\x82\xe2\x74\xc7\x1f\x77\x57\x7b\ --\x5b\xa5\x14\x0f\x13\x44\xff\x0d\x3d\x21\x30\x6f\xb4\xce\x3b\x65\ --\x1a\xcd\x5d\x56\x47\x63\x8c\xe8\xd8\x51\xcc\x5f\xbc\x82\xb1\xe3\ --\x27\x59\x1d\x8a\x6d\x09\x21\x88\x8c\x8a\x26\x32\x6a\x60\x25\x65\ --\x7b\x7b\x7a\xe8\xea\xea\xa0\xbb\xb3\x83\xce\xce\x0e\xba\xba\x3a\ --\xe9\xed\xee\xc2\xeb\xed\xa5\xa7\xbb\x1b\x5d\xf7\xd1\xd5\xd9\x89\ --\xae\xfb\xe8\xe9\x3e\xbd\xe1\x44\xd2\xdd\xd5\xf9\x71\x1b\xba\xcf\ --\x87\x4f\xd7\x71\xb9\xce\x1e\x7c\xdd\xa1\x61\x88\x33\x26\x32\x1d\ --\x4e\x07\x2e\xd7\x47\xf5\xbb\x04\x84\x86\x86\xe1\x74\xba\x71\xb9\ --\x5c\xb8\x43\xc3\x70\xb9\xfb\xfe\x1c\x12\x1a\x4e\x68\x68\x18\xa1\ --\x61\xe1\xe7\xdc\xcc\x29\x80\x39\xa3\x75\xe2\xd4\x03\xbd\x9d\xf9\ --\x24\xf2\x96\xe2\x54\xe7\x43\x56\x07\x12\x88\x82\x66\xf0\xf2\xb7\ --\xa2\x54\xe7\xa3\xbb\x2a\xbd\xbd\x42\x13\x7f\x43\x12\x34\x8f\x04\ --\xa1\x4e\x98\x93\xad\xb3\xad\x42\x70\xb2\x7d\xe4\xac\x20\x39\x1c\ --\x0e\x26\x97\xcc\x66\xf6\xa2\x2b\x70\xbb\x47\x4c\x01\x48\x5b\x70\ --\xb9\xdd\xb8\xdc\x6e\xa2\x3c\x31\x56\x87\x32\x28\x29\x1e\xa9\x06\ --\x7f\x7b\xeb\x41\xca\xeb\xa7\xa6\x3b\x9f\xb2\x3a\x90\x40\xa5\x12\ --\x80\x61\x98\x9a\xee\x7c\x62\x77\xa5\xb7\x5d\x0a\xf1\x24\x10\x34\ --\x5f\x15\x4e\x07\x5c\x9c\x25\xd9\x5e\x01\x27\x5a\x03\x3f\x09\x18\ --\x93\x57\xc0\xfc\xa5\xab\x88\x89\x55\x85\x55\x94\x3e\x1a\x90\x9f\ --\xa4\xce\xc0\xda\x58\xb7\xf8\xff\xed\xdd\x6d\x70\x5c\xd5\x79\x07\ --\xf0\xff\x73\xee\xae\x24\xdb\xb2\x5e\x2d\x59\xda\xd5\xe2\x37\x6c\ --\x6c\x64\x90\x57\xf2\x2b\xd8\x99\x18\x28\xae\x71\x9a\x74\x02\x69\ --\x9b\x69\x93\x69\x87\xbc\x4d\x69\x53\x32\xd3\x4e\x68\x3f\x04\xdb\ --\x9d\x29\xc3\x4c\x98\x14\xe7\xa5\x81\xa4\x69\x52\xd3\x21\x75\x20\ --\x0d\x31\x34\x38\x09\x38\x30\x40\xec\xc1\x92\x4d\x8c\x0c\x06\x1b\ --\xc7\xb5\x91\x8d\x85\x25\x59\x96\xb4\xd2\xee\xde\xf3\xf4\x83\x70\ --\x6b\xc2\x9b\x25\xed\xee\xd9\x7b\xf7\xff\x9b\xf1\x17\x8d\xb4\xfa\ --\x5b\x7b\xf6\x9c\xe7\x9e\x7b\xee\x39\xd0\x3f\x4e\xb6\x44\x1e\x71\ --\x1d\x24\xc8\x58\x00\x4c\x51\xb2\x25\xf2\x58\xd7\x29\xdd\xa8\xd6\ --\xee\x14\x60\xa6\xeb\x3c\x85\x62\x64\xfc\x6c\x81\x67\x8f\x09\xfa\ --\x52\x1f\xfc\xfd\xc5\xa8\xa6\x6e\x16\xd6\x6f\xfc\x38\x16\x2c\x6a\ --\x75\x1d\x85\x8a\x4c\x73\x95\xa2\xb2\xb4\xd6\x7d\x06\xc9\x30\x60\ --\xff\x30\x19\x8f\xfe\xd2\x75\x90\xa0\x63\x01\x90\x03\xed\xcd\xf2\ --\xd4\xfe\x53\x7a\xbd\x5a\xfb\x38\x80\x92\x39\x60\xdb\x13\x60\x45\ --\xc2\xe2\xc9\x23\x06\x99\x00\x2d\x0a\x8f\x44\xa3\x58\xb9\xf6\x7a\ --\xac\x5c\x7b\x03\x22\x91\x92\xb9\x7b\x43\x13\x30\xbb\x64\x4a\xf9\ --\xc0\x19\x10\x98\x4d\xc9\xb8\xf7\x9c\xeb\x20\x61\xc0\x02\x20\x47\ --\x92\xcd\xf2\x7c\x67\x8f\xde\x28\x6a\x1f\x03\xf0\xce\xa5\xd3\x21\ --\x35\x2d\x0a\x2c\xa8\x1f\xdf\x39\x30\x08\x16\x2c\x6a\xc5\x75\x9b\ --\x6e\x41\x75\x4d\xc9\xd4\x69\x34\x09\x65\xec\x19\x8b\xd1\x69\x03\ --\x73\xd3\xb2\xb8\xec\x77\x1d\x24\x2c\xd8\xcc\x73\xa8\x23\x26\x9d\ --\x2f\x9c\xd6\x35\xbe\x6f\x1f\x03\xb0\xc4\x75\x9e\x42\x99\x5b\xa7\ --\x38\xfc\x66\x71\x6f\x1b\x5c\x5b\xdf\x80\xeb\x36\x7e\x1c\xf3\x16\ --\x5e\xe9\x3a\x0a\x05\x40\xd6\x77\x9d\x80\x7e\x47\x37\xc4\x6c\x5a\ --\x16\x93\xe3\xae\x83\x84\x09\x0b\x80\x1c\x6b\x6b\x92\x63\xbf\x39\ --\xae\xd7\x66\xa2\xfa\xb0\xa8\xae\x77\x9d\xa7\x10\x2a\x22\xe3\xc7\ --\x0c\x9f\x1d\x76\x9d\xe4\x9d\xa2\xd1\x32\xac\x58\x7b\x1d\x56\xad\ --\xfb\x3d\x78\x1e\x9b\x3b\x5d\x9a\xa1\xb4\xeb\x04\xf4\xff\xe4\x49\ --\x49\xcb\xcd\xc9\x79\x32\xe0\x3a\x49\xd8\xb0\x47\xcc\x83\xab\xe7\ --\x48\x7f\x77\xb7\xfe\xfe\x58\xad\x7e\x07\x8a\x4f\xbb\xce\x53\x08\ --\x0d\xd3\x15\x67\x8b\xec\xb1\xc0\x05\x8b\x5a\x71\xfd\xa6\x5b\x50\ --\xc5\xe9\x7e\x9a\xa0\x61\x16\x00\x45\x41\x81\xef\x57\x0c\xc8\xe7\ --\x5b\x5b\x85\xef\x48\x1e\x14\x57\x8f\x1d\x32\xaa\x2a\x5d\x3d\xf6\ --\x4e\x01\xbe\x82\x90\xff\xad\x7b\x87\x05\xcf\xfe\xb6\x38\xfe\x8b\ --\x6f\x9e\x39\x85\x91\xe1\xf3\xb8\x6c\xde\x22\xd7\x51\x28\xa0\xe2\ --\x55\x8a\x15\x89\x22\xbe\xa7\x15\x7e\xaa\xc0\xd6\xf6\x98\xd9\x22\ --\x22\x7c\x23\xf2\x84\x33\x00\x79\xf4\x56\xc3\xdd\xbc\xff\x64\xf6\ --\x98\x8a\xdc\x0f\x20\xb4\x0f\x16\xd5\x4f\x57\x18\x11\xd8\x22\xf8\ --\xa8\xce\x6a\x6c\x06\xd0\xec\x3a\x06\x05\x58\x75\xc9\xec\xea\x51\ --\x94\xd2\x10\xfd\x4c\x47\x2c\xb2\xdd\x75\x90\xb0\x2b\x99\xbd\xec\ --\x5d\x4a\xb6\x44\x7e\xa0\x6a\x37\x02\x08\xed\x3d\x2c\x23\x40\xf5\ --\xbb\xef\xa8\x4a\x14\x28\x22\x40\xac\xaa\x08\x2a\xd9\xd2\xd4\x2f\ --\xd6\x6e\x68\xe7\xe0\x5f\x10\x2c\x00\x0a\xa4\xa3\x25\xfa\x24\x8c\ --\xb9\x16\xc0\x6f\x5d\x67\xc9\x97\xea\x0a\x76\x9a\x14\x7c\x31\x6e\ --\x02\xe4\xca\x31\x15\x73\x6d\x32\x11\xfd\x95\xeb\x20\xa5\x82\x05\ --\x40\x01\xb5\x37\xcb\xa1\x6c\xd4\xac\x01\x74\x8f\xeb\x2c\xf9\x50\ --\xc5\x19\x00\x0a\x38\x03\x60\x49\x03\x0b\xd9\xc2\xd3\xe7\x3c\xcf\ --\xac\xee\x88\xc9\x4b\xae\x93\x94\x12\x16\x00\x05\xb6\xb2\x51\x4e\ --\x9f\x8b\x79\xeb\x00\xdc\xed\x3a\x4b\xae\x55\x97\xb3\xe3\xa4\x60\ --\x9b\x57\xaf\xa8\xe4\x59\x50\x05\x25\x8a\xfb\xcb\x07\xbc\xf5\x6d\ --\x4d\x72\xc6\x75\x96\x52\xc3\x45\x80\x0e\xac\x17\xc9\x02\xb8\xa3\ --\xb3\x27\xfb\xa2\xa8\xdc\x07\x60\xba\xeb\x4c\xb9\x50\x35\x6d\xfc\ --\x51\x07\x96\x01\x14\x44\x65\x1e\x70\x05\xaf\xfe\x0b\x69\x14\xd0\ --\xdb\x92\x2d\x91\xef\xb9\x0e\x52\xaa\x38\x03\xe0\x50\x47\x2c\xf2\ --\x80\xa8\xb9\x16\xc0\x31\xd7\x59\x72\x21\x6a\xc6\xb7\x06\x26\x0a\ --\xa2\x25\xb3\x15\x65\x9e\xeb\x14\x25\xe3\x7f\xc4\x98\x0f\xb5\xc7\ --\x39\xf8\xbb\xc4\x02\xc0\xb1\x64\x8b\x1c\xc8\xa8\x59\x01\xc8\x2e\ --\xd7\x59\x72\xa1\x8a\x0b\x01\x29\x80\x66\x94\x01\x73\x6b\xd8\x76\ --\x0b\x42\xe5\x67\xe5\xd6\x24\x93\xcd\xf2\xbc\xeb\x28\xa5\x8e\x05\ --\x40\x11\x58\xd5\x22\x67\x93\x31\xd9\x08\xe0\x0e\x00\x01\x3a\x57\ --\xef\x9d\xf8\x28\x20\x05\xd1\xa2\x59\x0a\x29\x8e\x7d\xac\xc2\x4c\ --\x01\xdc\x9d\x8c\xcb\x47\x5a\x13\xd2\xe7\x3a\x0c\xb1\x00\x28\x1a\ --\x22\xa2\xed\x71\xef\x6e\x55\xfd\x18\x02\xbc\x5f\xc0\x74\x3e\x3e\ --\x45\x01\x33\x2d\x02\x24\x6a\x79\xf5\x9f\x67\x83\x2a\x7a\x73\x7b\ --\xdc\xbb\x43\x44\x02\x7d\x91\x13\x26\x2c\x00\x8a\x4c\x47\x4b\xe4\ --\x51\xb1\x66\xa5\x2a\x5e\x74\x9d\x65\x32\x2a\xa3\xec\x48\x29\x58\ --\xe6\xd6\x29\x3b\xc2\xfc\x7a\x59\xc5\xac\xee\x88\x45\xfe\xcb\x75\ --\x10\x7a\x3b\xb6\xfb\x22\x94\x4c\xc8\xab\x15\x65\x66\x0d\x80\xc0\ --\x2d\x90\xe1\x39\xea\x14\x24\x46\x80\xb9\xbc\xfa\xcf\x1b\x05\xbe\ --\xe3\x79\x66\x39\x9f\xef\x2f\x4e\x2c\x00\x8a\x54\x6b\xa3\x0c\xb5\ --\xc7\xbd\x5b\x55\xf4\x66\x00\x67\x5d\xe7\xb9\x54\x5c\x45\x4d\x41\ --\x12\xaf\x56\x94\xb3\x68\xcd\x87\x01\x40\x3f\xd9\x11\xf7\x3e\xd7\ --\xd6\x24\x45\x78\x50\x38\x01\x2c\x00\x8a\x5e\x47\x2c\xf2\xe3\x6c\ --\xd4\x2c\x05\xe4\x71\xd7\x59\x2e\x05\x17\x52\x51\x90\xcc\xaf\xe3\ --\xd5\x7f\xee\xc9\x13\xc6\x9a\xa5\xed\xf1\xc8\x0f\x5d\x27\xa1\xf7\ --\xc7\x02\x20\x00\x56\x36\xca\xe9\x64\x4c\x6e\x12\xc1\xed\x00\xc6\ --\x5c\xe7\x21\x0a\x83\xba\xe9\x40\x2d\x4f\xfd\xcb\x1d\x41\x46\x81\ --\x2d\xc9\x98\xdc\xb8\x2c\x21\xaf\xbb\x8e\x43\x1f\x8c\x05\x40\x40\ --\x88\x88\x26\x63\xde\xbd\x9e\x67\x96\x43\x70\xd0\x75\x1e\xa2\xa0\ --\x5b\x50\xcf\xab\xff\x1c\x7a\xc9\xa8\x59\xd5\x11\xf7\x36\x73\x95\ --\x7f\x70\xb0\x00\x08\x98\xb6\x26\x79\x71\xd4\x37\xab\x00\x6c\x03\ --\x77\xdd\x25\x9a\x94\xda\x69\x3c\xf2\x37\x67\x14\xdb\x3d\xcf\xac\ --\x58\x16\x97\xfd\xae\xa3\xd0\xc4\xf0\x8e\x6d\x80\x75\xf6\x64\x36\ --\x88\x9a\xef\x03\x68\x72\x9d\xe5\x82\xd1\x2c\xf0\xf8\x61\xd6\x95\ --\x54\xbc\x0c\x80\x75\xf3\x2d\xa7\xff\xa7\xae\x57\xa1\xb7\x76\xc4\ --\x23\x3b\x5d\x07\xa1\xc9\x61\x4f\x1d\x60\x1d\xb1\xe8\x2e\x9b\x31\ --\xed\x80\xfc\xd4\x75\x96\x0b\x7c\x5e\x54\x51\x91\x5b\xda\xac\x1c\ --\xfc\xa7\x4a\xe5\xe1\x68\xc4\x5c\xc5\xc1\x3f\xd8\x38\x03\x10\x12\ --\xfb\x4f\x66\x3f\xa1\x22\xdf\x02\x30\xcb\x65\x8e\xc1\x51\xe0\xc9\ --\xa3\xac\x2b\xa9\xf8\x08\xc6\x4f\xfb\x5b\xdc\xc8\x2a\x75\x0a\x4e\ --\x43\xf5\xaf\xdb\x5b\x22\x0f\xb9\x0e\x42\x53\xc7\x9e\x3a\x24\x92\ --\x2d\x91\x1f\x79\x9e\x69\x85\x62\xbb\xcb\x1c\x9c\x01\xa0\x62\x34\ --\x2d\x02\x2c\x4f\x70\xf0\x9f\x02\x85\x62\x7b\xb9\x35\xad\x1c\xfc\ --\xc3\x83\x33\x00\x21\xd4\x75\x32\x7b\x0b\x44\xbe\x0e\x07\x6b\x03\ --\xfa\x53\xc0\x53\xaf\xb1\xae\x24\xf7\x44\x80\xda\x0a\xa0\xa5\x46\ --\x31\xb7\x56\x61\xd8\xdb\x4d\x8a\x02\x87\x45\xcc\xe7\xda\x63\xf2\ --\xb4\xeb\x2c\x94\x5b\xfc\x48\x84\xd4\xbe\xa3\x5a\x6d\x2a\xec\x56\ --\x00\xb7\x01\x28\xd8\xfe\x7c\xe7\x52\xc0\x6e\x16\x00\x94\x67\x82\ --\xf1\x83\xa7\x2a\xa2\x40\x85\x37\xbe\x9b\xdf\x85\x7f\x15\x11\xa0\ --\x22\xa2\x98\x59\x01\x78\xec\xe1\xa6\x22\x0b\xe0\x9e\x73\x69\xb3\ --\x79\xfd\x3c\x19\x75\x1d\x86\x72\x8f\x1f\x8f\x90\xdb\xd7\xa3\xed\ --\x46\xed\xfd\x00\x3a\x0a\xf1\xfb\xce\x8d\x02\xbb\xb9\x06\x80\xf2\ --\xc0\x08\x90\xa8\x51\x34\x57\x01\xf5\xd3\x14\x51\x6e\x3b\x9d\x37\ --\x0a\xec\x87\x98\xcf\x76\xc4\xa4\xd3\x75\x16\xca\x1f\xf6\xd4\x21\ --\xb7\x3c\x26\x5d\xf6\x94\x59\x03\xe0\x0e\x00\x23\xf9\xfe\x7d\xdc\ --\x0a\x98\x72\x4d\x64\xfc\xc4\xbe\x0d\x8b\x2c\x92\x31\x45\x53\x25\ --\x07\xff\x3c\x1a\x56\xc1\x97\x8e\xc6\xcc\x0a\x0e\xfe\xe1\xc7\xee\ --\xba\x84\x1c\x38\xa1\x71\x2b\xf6\x2e\x08\x3e\x95\xaf\xdf\x31\x92\ --\x01\x7e\xfe\x0a\xeb\x4a\xca\x8d\xa6\x4a\xc5\x95\xb3\x15\x55\x15\ --\xae\x93\x84\x9e\x42\xe4\x21\x40\xfe\xae\x3d\x26\xc7\x5d\x87\xa1\ --\xc2\x60\x01\x50\x82\x0e\x9c\xcc\xac\xf7\x61\xb6\x89\x60\x69\xae\ --\x5f\xdb\x02\xd8\x79\xc8\x40\xb9\xd8\x9a\xa6\xa0\x7e\x06\xb0\xb8\ --\x41\xd1\x30\x83\x0d\x29\xff\x74\x9f\xc0\xbb\x3d\x19\x97\x67\x5d\ --\x27\xa1\xc2\x62\x01\x50\xa2\x76\xab\x46\x6a\x4e\xd9\xdb\x14\xd8\ --\x02\x45\x75\x2e\x5f\x7b\xd7\x2b\x06\xa9\x4c\x2e\x5f\x91\x4a\x81\ --\x00\x98\x5d\xa9\x58\xd4\xa0\xa8\x9b\xee\x3a\x4d\x49\xe8\x51\xc1\ --\x96\xf6\x66\xf3\x5d\xee\xdf\x5f\x9a\x58\x00\x94\xb8\x83\x6f\xe8\ --\xec\x6c\xc6\x6e\x55\xc1\xad\xc8\xd1\xd3\x02\xcf\x1d\x17\x9c\x19\ --\x62\xd3\xa2\x4b\x23\x18\xdf\x97\x7f\x51\x83\xa2\x9a\x53\xfd\x85\ --\x30\x2a\x82\x7b\x8c\x31\x77\xb5\x35\xc9\xb0\xeb\x30\xe4\x0e\x7b\ --\x69\x02\x00\xec\xeb\xd1\xc5\x06\xba\x15\xaa\x9f\x98\xea\x6b\x1d\ --\x3c\x2d\x38\x7a\x96\x4d\x8b\x3e\x58\xe3\x5b\xf7\xf8\x6b\x38\xf0\ --\x17\x84\x40\x1e\x35\x9e\x7c\xb1\xad\x49\x8e\xb9\xce\x42\xee\xb1\ --\x97\xa6\xb7\xe9\x7a\x3d\x73\x03\x60\xbe\x0a\xa0\x6d\xb2\xaf\x71\ --\xbc\x5f\xb0\xbf\x87\x4d\x8b\xde\xdb\xf4\x32\xa0\xad\x49\x31\x7b\ --\x26\xef\xf1\x17\x82\x02\xfb\x45\xcc\xed\xdc\xcc\x87\x2e\xc6\x5e\ --\x9a\xde\x61\x87\xaa\xb7\xa0\xc7\xff\xb4\x40\xee\x04\x30\x67\xa2\ --\x3f\xdf\x37\x02\x3c\x7d\x8c\x4f\x02\xd0\x3b\x09\x80\xf9\xf5\x8a\ --\x2b\x1b\x15\x1e\x9b\x48\x21\x1c\x83\xea\xe6\x64\xdc\x7b\x80\xf7\ --\xf9\xe9\x77\xb1\x00\xa0\xf7\xd4\xdd\xad\x65\xa3\xb5\xf6\xcf\x45\ --\xb1\x05\x13\xd8\x56\x38\xed\x03\xff\xfd\x32\x7b\x77\x7a\xbb\x32\ --\x0f\x68\x8f\x2b\x9a\x78\xd5\x5f\x08\x6f\x02\xf8\xea\xb9\xb4\xb9\ --\x97\xbb\xf8\xd1\x7b\x61\x01\x40\x1f\xe8\x85\xd3\x3a\xc3\xf7\xed\ --\x5f\x61\x7c\x33\xa1\x9a\x4b\xf9\x99\x9d\x87\x0c\x0f\x06\xa2\xff\ --\x53\x11\x01\xae\x99\x6b\x51\x55\xee\x3a\x49\xb8\x29\x70\x5e\x80\ --\x6f\xa5\x2b\xcc\x3f\xad\xae\x97\x41\xd7\x79\xa8\xb8\xb1\x00\xa0\ --\x4b\xf6\x4c\xaf\xce\x9c\x9e\xb6\x7f\x89\x4b\x28\x04\x76\x1d\x36\ --\x48\x65\x0b\x93\x8b\x8a\x5b\x45\x04\x58\x3b\xcf\xa2\xb2\xcc\x75\ --\x92\xf0\xba\x30\xf0\x47\xb2\xe6\xee\xab\xe7\x48\xbf\xeb\x3c\x14\ --\x0c\x2c\x00\x68\xc2\x2e\x2a\x04\xbe\x0c\xa0\xf6\xdd\xbe\xe7\xf1\ --\xc3\x06\xa3\x2c\x00\x4a\x9e\x08\xb0\xe6\x32\x45\x63\x25\xa7\x83\ --\xf2\x81\x03\x3f\x4d\x05\x0b\x00\x9a\xb4\xfd\xc7\xb4\x06\x65\xf6\ --\x6f\x14\xf8\x22\x80\xba\x0b\x5f\x3f\x33\x24\x78\xee\x38\x9b\x16\ --\x01\x0b\xea\x15\x57\x35\x71\xf0\xcf\x83\xb3\x50\xdc\x6b\xc7\xcc\ --\xb6\xe5\x0b\xe4\x9c\xeb\x30\x14\x4c\xec\xa5\x69\xca\x76\x1f\xd3\ --\x8a\xea\xa8\xff\x47\x2a\xf2\x0f\x02\x5c\xf1\x9b\x53\x82\xd7\xfa\ --\xd8\xb4\x4a\x9d\x27\xc0\x8d\x8b\x2c\xca\x23\xae\x93\x84\xca\x69\ --\x05\xee\xd3\x51\xf3\x35\x0e\xfc\x34\x55\xec\xa5\x29\x67\x54\xd5\ --\x74\xf5\xf8\x9b\x0e\x9d\x31\x5f\x7f\xb5\x57\x26\xfc\xf8\x20\x85\ --\x4b\x53\xa5\x62\xf5\x1c\x5e\xfd\xe7\xc8\x11\x11\x7c\xa3\x72\xd8\ --\x7c\x7b\xe1\x42\x19\x73\x1d\x86\xc2\x81\x05\x00\xe5\xc5\xbf\x77\ --\xe9\xad\x83\x29\xbd\xb3\x77\x44\x12\x3c\x18\xa8\x34\x2d\x6e\x54\ --\x2c\x6e\xe0\x9b\x3f\x15\x2a\xb2\x1b\x6a\xbf\xd6\x1e\xf3\x1e\x15\ --\x11\xfe\x31\x29\xa7\x58\x00\x50\x5e\xfd\xdb\x41\xfd\x70\x6a\x08\ --\xff\xdc\x3b\xa4\x6d\xbe\xb2\xb9\x95\x92\xe5\x2d\x8a\x96\x6a\x8e\ --\x59\x93\x90\x86\xc8\x23\xd6\x97\x7b\x96\x27\x64\xaf\xeb\x30\x14\ --\x5e\xec\x91\xa9\x20\x76\x74\xeb\xe5\x83\x43\xf8\xe6\x9b\x23\xb8\ --\x7e\x24\x93\x9b\x43\x87\xa8\xb8\xad\x4c\x28\x62\x55\x2c\x00\x26\ --\xe0\x0d\x05\xbe\x5d\x16\x31\xff\x72\xd5\x6c\x79\xc3\x75\x18\x0a\ --\x3f\x16\x00\x54\x50\xbb\x77\x6b\xc5\x89\x99\xf6\x2b\x7d\xa3\xf2\ --\xd9\xfe\x94\xcc\xe2\xed\x81\xf0\xea\x88\x2b\x12\x35\x7c\x83\x2f\ --\x41\xa7\x0a\xee\x1f\xf3\xcd\xf6\x6b\x12\x92\x72\x1d\x86\x4a\x07\ --\x0b\x00\x72\xe6\x27\x2f\xe8\xba\x33\x29\xbd\xeb\xcc\xb0\xac\x49\ --\xfb\xe0\xde\xc1\x21\xb3\xa4\x51\x71\x05\xd7\x00\xbc\x3b\xc1\x39\ --\xb1\xf8\x4f\x5f\xcd\x37\x96\x27\xe4\xa0\xeb\x38\x54\x9a\x58\x00\ --\x90\x73\x3b\xba\xb5\x2e\x95\xb2\xff\x38\x30\x2a\x9f\xec\x4b\x49\ --\x2d\x67\x05\xc2\x21\x51\xad\xe8\x68\xe1\x9b\x79\x11\x85\xea\xd3\ --\x00\xbe\x67\x8d\xf7\xd0\xf2\x98\x8c\xb8\x0e\x44\xa5\x8d\x05\x00\ --\x15\x95\x07\xbb\x74\xf9\xf9\x2c\xb6\xf6\x8f\xe0\x86\xe1\x34\xa2\ --\xae\xf3\xd0\xe4\x55\x96\x01\x37\x2c\xe4\x01\x74\x00\x5e\x07\xf0\ --\x80\x5a\xf3\xdd\x8e\x84\x1c\x71\x1d\x86\xe8\x02\x16\x00\x54\x94\ --\x76\xa8\x7a\x63\x9d\xf6\x4b\xe7\xd2\xf2\x85\xfe\x94\xcc\xcf\xf8\ --\x6c\xab\x41\x23\x00\x6e\x5a\x62\x11\x2d\xc1\x9b\x3b\x0a\x9c\x17\ --\xc5\x4f\x44\xec\xf6\x65\xb1\xc8\x13\x3c\x8a\x97\x8a\x11\x3b\x55\ --\x2a\x7a\xf7\xed\xd3\xea\xa8\xb5\x7f\x3b\x92\x35\x9f\xea\x1b\xc1\ --\x9c\x2c\xbb\xd2\xc0\x58\x37\xd7\xa2\x7e\x86\xeb\x14\x05\xe3\x03\ --\xb2\x1b\x6a\xb7\x97\x97\x79\x3f\x6e\x6d\x94\x21\xd7\x81\x88\xde\ --\x0f\x0b\x00\x0a\x94\x07\xf7\xeb\xdc\x54\xc6\x6e\x1e\x4c\x9b\x8f\ --\x0c\x8c\xa0\x9e\xb5\x40\x71\xbb\xba\x59\x31\xbf\x2e\xd4\xeb\x00\ --\xb2\x80\xfc\x4a\xc4\xee\x28\xf3\xbd\x87\x5b\x13\xd2\xe7\x3a\x10\ --\xd1\xa5\x62\x01\x40\x81\xf5\x1f\xcf\xeb\xfc\x51\xb5\x5f\x1e\x4e\ --\x9b\x8f\xf6\xa7\xd0\xe4\x87\x7a\x9c\x09\xa6\x39\xb5\x8a\x64\x2c\ --\x74\x6f\x8c\x0f\xe8\x1e\x11\xf9\x51\xc4\x33\x3f\xe4\x33\xfb\x14\ --\x54\x2c\x00\x28\x14\x1e\xec\xd2\xd8\x98\xda\xbf\x1f\x1a\x35\x1f\ --\xeb\x1f\x45\x0b\xd7\x0c\x14\x87\xc6\x4a\xc5\x35\xe1\x38\x0f\x60\ --\x10\x22\xbb\x14\xf6\xa7\x9a\xf2\x76\xf2\x20\x1e\x0a\x03\x76\x92\ --\x14\x3a\xdb\x5e\xd5\xf2\xca\x7e\x7c\x7e\x2c\xab\x7f\x7a\x2e\x8d\ --\x65\x23\x69\x29\x73\x9d\xa9\x54\xd5\x4d\x03\x3e\x34\x3f\x98\x37\ --\x6a\x44\xf1\x1a\x80\x5f\x5a\xd1\x47\x2b\x06\xbc\x5d\xad\xad\x92\ --\x76\x9d\x89\x28\x97\x58\x00\x50\xe8\x3d\x70\x40\x6f\x1c\x19\xd3\ --\x2f\x0c\xa7\x65\xed\xe0\x98\x36\xf8\x96\xcd\xbe\x50\x66\xcd\x00\ --\xd6\xce\x0d\x4c\x01\x30\xa4\x22\x4f\x19\xe8\x2f\xc4\x9a\x9f\x2d\ --\x6b\x91\x57\x5c\x07\x22\xca\x27\xf6\x84\x54\x52\x76\xee\xd3\xe9\ --\xc3\x11\xfb\x67\xc3\x19\xf3\x27\xe7\xc7\xd0\x31\x90\x42\x95\x0d\ --\xc5\x0c\x75\x71\x8a\x57\x29\x56\x24\x8a\xf6\x0f\xec\x43\xb5\x4b\ --\x8c\xfc\x5c\xc5\xfc\xa2\xbc\x0f\xbf\xe6\x55\x3e\x95\x12\x16\x00\ --\x54\xd2\xfe\xb5\x4b\x63\x9a\xb5\x9f\x19\xf3\x65\xe3\x48\x5a\xae\ --\x1c\x4a\xa3\x8a\x3b\x11\xe6\xce\x8a\x84\x22\x5e\x3c\x07\x02\xf9\ --\x00\x0e\x00\x78\x56\x54\x9f\x29\x53\xef\x09\xae\xda\xa7\x52\xc6\ --\x02\x80\xe8\x22\x8f\x1c\xd4\xd9\xe7\xc6\xec\x5f\xa4\x7c\xb3\x71\ --\x38\x8d\xa5\x43\x63\xa8\xcd\x5a\x7e\x4e\x26\x23\x56\xa5\x58\xe9\ --\xf6\xea\x7f\x00\x90\xbd\x0a\xdd\x23\xb0\xcf\x78\x5e\xe4\xd7\x6d\ --\x4d\x32\xec\x32\x10\x51\x31\x61\xc7\x46\xf4\x3e\x76\x74\x6b\x59\ --\x6a\x14\x9b\xc6\x7c\xfb\xd1\x74\x46\x56\xa7\xb2\x32\x67\x28\x8d\ --\x69\x9c\x25\x78\x7f\x65\x1e\x70\xdd\xe5\x16\x15\x91\x02\xfd\x42\ --\x41\x06\x8a\x6e\x28\xf6\x0a\x74\x8f\x35\xde\xde\xf6\x66\xbc\x2c\ --\x22\x7c\xa7\x88\xde\x03\x0b\x00\xa2\x09\xda\xb6\x47\xab\x66\x18\ --\xfc\x41\xd6\xda\x0d\x59\x6b\x92\xa9\x2c\xe6\x8c\xa4\x51\xc9\x99\ --\x82\x71\x02\x60\xd5\x1c\x45\x53\x65\xde\xc6\xde\x21\x00\x87\xa1\ --\x38\x24\x06\x9d\x3e\x4c\x67\xda\x47\x27\x8f\xd2\x25\x9a\x18\x76\ --\x58\x44\x39\xb0\x79\xb3\x9a\xcb\x6e\xc2\xea\x2c\xec\x86\x6c\x56\ --\x56\xa5\xad\x2c\x4c\x67\x31\x3b\x95\xd1\x19\xbe\x96\xd6\xc7\x6c\ --\xe1\x2c\x45\xeb\xec\x9c\x0c\xfe\x63\x00\x8e\x42\xa4\x5b\x55\x0f\ --\x19\xd5\x6e\xf1\xbc\x43\x6d\x4d\x78\x89\x7b\xeb\x13\x4d\x5d\x69\ --\xf5\x4c\x44\x05\xb6\x63\x87\x7a\xa9\xcb\xb1\xd2\xfa\x76\x6d\x06\ --\x26\x99\xce\xe0\x8a\x6c\x56\x63\x63\x56\x6a\xc6\x7c\x94\x67\x43\ --\xb6\x61\x51\xed\x34\x60\xdd\x7c\x8b\x09\x9c\xff\x33\x08\xe0\x35\ --\x88\x1c\x81\xea\x11\x11\x3d\x0a\x5f\x8f\x18\x89\x1c\xb9\x3a\x8e\ --\xd7\x39\x85\x4f\x94\x3f\xa1\xea\x7c\x88\x82\xe6\x07\x7b\x75\x91\ --\x6f\xd0\x61\xad\x6d\xf3\x55\x16\x66\x14\x2d\xea\x4b\x43\x56\x51\ --\x93\xce\x62\xfa\x98\x8f\xb2\xa0\xdc\x5a\x10\x01\x3e\x3c\xcf\xa2\ --\x7a\x1a\x00\xc0\x02\xe8\x55\x45\xaf\x88\xbc\x01\xd5\x1e\x05\x4e\ --\x08\x70\x42\xa1\x27\x55\xbd\xe3\x5e\x16\x27\x92\xf3\x64\xc0\x6d\ --\x6a\xa2\xd2\x15\x88\x8e\x85\xa8\x94\x6d\xee\xd6\xca\xc4\x18\x16\ --\x4b\x16\x0b\x44\xec\x65\x6a\x4d\xb3\x2f\x68\xb0\x16\xf5\x59\xd5\ --\x3a\xa8\x54\x66\xad\xce\x54\x48\xd4\x2a\xca\xad\x22\x6a\x15\x9e\ --\x6f\x35\xaa\x16\xc6\x42\xde\x76\x41\x9e\xb1\x90\x8b\x17\x31\x46\ --\x0c\x60\x0c\x14\x6f\x7d\x2d\xe2\xa9\x42\x45\x01\x58\x23\xb0\x62\ --\xd4\x37\x40\xd6\x33\x92\x8e\x18\x8c\x1a\xd1\x51\x4f\x64\xd0\x18\ --\x1d\x14\xc1\x80\x81\xf6\x89\x67\x7a\x23\x6a\x4f\x2e\x69\x34\x4f\ --\xd9\x72\xf4\xae\x68\xc0\x19\x4e\xd3\x13\x15\xb7\xff\x05\x82\x22\ --\xaa\x2f\x56\xbc\x39\x1a\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\ --\x60\x82\ --\x00\x00\x07\xda\ --\x89\ --\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ --\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\ --\x00\x00\x00\x04\x73\x42\x49\x54\x08\x08\x08\x08\x7c\x08\x64\x88\ --\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0d\xd7\x00\x00\x0d\xd7\ --\x01\x42\x28\x9b\x78\x00\x00\x00\x19\x74\x45\x58\x74\x53\x6f\x66\ --\x74\x77\x61\x72\x65\x00\x77\x77\x77\x2e\x69\x6e\x6b\x73\x63\x61\ --\x70\x65\x2e\x6f\x72\x67\x9b\xee\x3c\x1a\x00\x00\x07\x57\x49\x44\ --\x41\x54\x58\x85\x9d\x97\x6b\x50\x54\xe7\x19\xc7\x7f\xef\xd9\x0b\ --\xec\x72\x0f\x77\x64\xb9\x09\x2a\xa0\x46\x44\xb4\x01\x43\x84\x18\ --\x31\xd5\x54\x21\xd3\x66\xd2\xcc\x34\x56\x33\xd3\x69\xcd\x4c\x6a\ --\x9c\xd6\x74\x3a\xcd\x74\xfc\xd0\xd4\xde\x92\x69\xda\xa9\xe9\x34\ --\x37\xe3\x2d\x35\xa3\x24\xc6\x4b\xea\x2d\x4a\x0c\x04\x04\x2d\xa0\ --\x48\x50\x50\x58\x40\x60\x57\xb9\x2e\xcb\x5e\xce\xdb\x0f\xe8\xba\ --\xcb\x6e\x84\xf4\xf9\xf4\x9e\xe7\xfd\x3f\xcf\xff\x7f\xce\x79\xce\ --\xf3\x3e\x47\x30\x43\xfb\xb8\x49\xc6\x0f\x3b\xd4\xad\x23\x0e\x65\ --\x8d\xdd\x29\x53\x9c\x6e\x61\xb0\xbb\xd1\x48\x09\xb3\x22\xa4\x3d\ --\x3f\x49\x6d\x92\x42\x5c\x12\xc8\xd3\x36\xbd\xe6\xc8\xf2\x58\x31\ --\x32\x93\xbc\x62\x3a\xc0\xbe\x26\xb9\xc2\x3a\xca\x5b\xd6\x51\xe6\ --\xb8\xe5\xa4\x4f\xaf\x01\x83\x0e\x0c\x3a\x89\x51\x37\xb9\xce\x8a\ --\x91\xde\x61\x36\x60\x9f\x50\x95\x1d\x79\x26\xd1\xf6\x7f\x09\xf8\ --\xb2\x4b\x1a\x5a\x7a\xe5\x71\xf3\x90\x28\x76\x4b\xdf\x3d\x8d\x80\ --\xd2\x4c\x15\xa3\x0e\xae\xf4\x0b\x86\xec\x50\x98\x2a\xfd\x93\x08\ --\x9c\x52\xf2\xc6\xb0\x43\x79\xb5\x24\x5d\xd8\x67\x2c\xe0\x40\x93\ --\x2c\x1c\x9b\x90\x95\x42\x10\xdb\x3f\x2a\x18\x99\xb8\xbf\x17\x16\ --\x04\x2e\x15\xe6\xc4\x4a\x12\xc3\x24\xc1\x5a\xff\x78\x55\x95\x28\ --\x8a\x77\x6a\x59\xa3\x3a\x35\x15\x4b\xd2\x44\xef\xb4\x02\x76\xd7\ --\xcb\x67\x1c\x2a\xef\x76\x0d\x61\x88\x36\x4a\xcc\x7d\x23\xdc\xea\ --\xed\x62\xc0\x62\x21\x42\x19\x21\x44\xa7\x62\x34\x04\x93\x9e\x1c\ --\x4f\xf1\xb2\x05\x3e\xb1\x36\x9b\x9d\x77\x0e\x7c\xc6\xac\x84\x18\ --\xca\xcb\x8a\xa6\xa6\x36\x4b\x55\x59\x93\x6f\x12\x8d\xde\x4e\x1f\ --\xfd\x7b\xea\xe4\xca\x1b\x83\xec\x1d\x19\x9f\x50\x9a\x2f\xd6\xd0\ --\x78\xa1\x1a\x4b\xbf\x9f\x68\x00\x72\x32\x53\x3d\x02\xa4\x94\x9c\ --\xa8\x6a\xe0\xef\xbb\x3e\xc1\x3a\x38\xcc\x4b\x1b\xcb\x03\x85\x24\ --\x0b\x45\x3d\x72\xa4\x5d\x2e\x5f\x93\x21\x6e\xfa\x09\x78\xeb\x82\ --\x8c\x30\x8f\xca\xc3\xad\x5f\xb7\x2a\x47\x0f\xee\xc6\x36\x3a\xa3\ --\x22\x06\x60\xfb\x5f\x77\x73\xa2\xaa\x61\x26\xd0\xe4\x20\x97\x7a\ --\xec\xcb\x2e\x99\x5f\x68\x12\xe3\x3e\x02\x54\x87\x3c\x59\x75\xae\ --\x2a\xf8\xf4\xf1\x83\x20\x03\x14\xd4\x03\xac\xbb\xd7\x3a\x63\x6c\ --\x98\x81\xec\xd6\x01\xb9\x0f\x58\x0f\xa0\x00\x7c\x78\x49\x96\xd4\ --\x5d\xbe\xbe\xe4\xcc\x14\x72\x45\x11\xac\x2c\xca\x63\xfb\xd6\x0d\ --\x3c\xb3\xf6\xb1\x6f\x25\x2a\x90\xb9\x25\x7c\x7e\x5d\xa1\xdd\x2a\ --\xd6\xfd\xab\x4e\x2e\x85\xbb\x4f\x20\x54\xe7\xde\x72\xfe\x3f\x87\ --\x90\x5e\xe4\xc6\xe0\x20\x5e\xdb\xb6\x89\xfc\x05\x59\x00\x58\xef\ --\x0c\xcd\x88\x24\x3b\x33\x85\xa5\x0b\xe7\x06\xdc\x33\x0f\x0a\xc6\ --\x1c\x93\x6b\xbb\x4b\xbe\x0b\xe4\x6a\x6b\xac\x32\xfc\x7a\x73\xc7\ --\x13\x5d\x66\xb3\x0f\xf8\x95\xcd\xcf\x7a\xc8\x67\x62\x11\xe1\x21\ --\xfc\xe4\x87\x6b\x59\x5b\xba\x0c\x97\xea\xa6\xa1\xb9\x8d\xb6\x1b\ --\x3d\x58\x07\x87\x09\x35\x18\x50\x43\xe2\x08\x49\xc8\x41\xa7\xd3\ --\x03\x70\xc7\x26\xb2\xf7\x36\xc9\x78\xad\xde\xee\x5e\xd3\xd0\x7c\ --\x2d\xd8\x3b\xd9\xdc\xd9\x26\x4a\x1f\x79\x78\xc6\xe4\xab\x4b\x0a\ --\x58\x59\x94\x47\x70\xb0\x9e\xbd\x1f\x9f\x66\xdf\xe1\x33\x0c\x0d\ --\x8f\xf9\xe1\x8c\xa1\x61\xac\x5e\xf7\x2c\x19\x73\x72\x71\xba\x11\ --\xb6\x09\xf5\x57\x0a\x88\xd2\x76\x73\x9f\x0f\xf0\xd1\x82\xf9\xd3\ --\x92\xce\x9f\x9b\xea\x59\x57\x94\x15\x71\xe5\xeb\x9b\x3c\xbf\xe5\ --\x0f\xec\xdc\xf3\x69\x40\x72\x00\xdb\xe8\x08\x95\xfb\xdf\xc6\xdc\ --\x79\x1d\x00\xa7\x53\x79\x5c\xdb\x37\xc2\xf2\x6e\xcb\xb8\x0f\x30\ --\x29\x2e\xfa\x1b\x89\x33\x52\x92\xd8\xb2\xa9\x9c\xbc\xdc\x4c\x00\ --\x7a\xfa\xac\xbc\xf9\x5e\x25\x55\x75\xcd\xd3\x8a\x06\x50\xdd\x6e\ --\x4e\x1e\x3e\xc0\x86\x9f\x6d\xc3\xe6\x24\x4d\x7b\xb9\x5f\xc9\x9c\ --\x70\xf9\x36\x44\xad\xce\xbf\xbf\x86\x87\x18\xf9\xf9\xc6\x0a\xca\ --\xcb\x8a\xd0\x68\x14\x26\x1c\x4e\xf6\x54\x9e\x62\x4f\xe5\x69\x26\ --\x1c\x4e\x0f\x4e\xa7\xd5\xf0\xc4\xa3\xf9\xac\x5e\x51\x80\x29\x31\ --\x96\x7e\xeb\x20\x7f\xd9\x75\x92\xd6\x96\xfb\x02\x2d\xfd\xbd\xf4\ --\x76\x77\x62\x48\x4f\x35\x68\x8b\xd2\xa4\x7a\x2c\xd2\x80\xf7\x91\ --\x75\xab\xdf\xff\xbb\x2e\x7b\x6c\x89\x67\x7d\xae\xb6\x99\xbf\xbd\ --\x5f\x49\x4f\x9f\x2f\x6e\x59\xde\x3c\x5e\xfa\x71\x39\x29\x49\x71\ --\x1e\x5f\x74\x54\x04\x6b\x7f\xb0\x09\xeb\xce\x3f\x62\xe9\xeb\xf1\ --\xf8\xcd\x37\xae\x91\x9c\x92\xaa\xd1\x06\x69\x24\x0b\x33\x62\xa9\ --\xae\xb9\x9f\xe8\xf8\xd9\x7a\x2a\xbe\xbb\x82\x6b\x56\x0d\x63\x4e\ --\x88\x0c\x86\xb8\x50\xc9\xcd\x9e\x01\x3e\xd8\x77\x90\xaf\x2e\x5d\ --\xf5\x21\x4e\x8a\x8f\xe6\xc5\xe7\xd7\x53\xbc\xd4\xbf\x76\x14\x01\ --\x39\x09\x82\xdc\x85\x4b\x38\x7b\xe2\x13\x8f\xdf\x6a\xe9\x07\x26\ --\xfb\xc0\x70\xde\xfc\xcc\x18\xef\xa0\xf6\xce\x1e\x5e\xdc\xfe\x0e\ --\x8b\x8b\x56\x11\x16\x1e\x8e\xd5\xd2\x4f\x4b\x63\x3d\x57\x9b\xea\ --\x71\xbb\xdd\x1e\x5c\x90\x5e\xc7\x73\xeb\x4b\x79\x6e\xfd\xe3\x04\ --\xe9\x75\xb8\xdd\x2a\x87\x3e\x3b\x4f\x58\x88\xc1\xe7\x89\xcd\x8d\ --\x95\xa4\x25\x45\x71\xd6\x8b\xc3\x31\x31\x8e\x5e\x83\x5b\x8b\x94\ --\x1d\xb9\x59\xa9\x31\xe9\xa6\x04\x3a\xba\x6e\x79\x00\x57\x5b\x2e\ --\x73\xb5\xe5\xb2\xdf\x1d\xdd\xb3\x45\x0b\x17\xb0\x75\xd3\x3a\xd2\ --\x67\x4d\x16\xec\xc5\xcb\xd7\x78\xfd\xed\x43\xb4\x77\xf6\x04\x3c\ --\x8c\x92\xc3\x5d\x3e\xd7\x1a\x54\x52\x22\xa5\x59\x3b\x39\x46\x51\ --\xf0\xf2\x0b\x4f\xb3\x65\xfb\x4e\x5c\x5e\x77\x18\xc8\xa2\xa2\x63\ --\x29\x7d\xb2\x82\xf4\xac\x1c\xae\xd9\x20\x4d\xaa\xbc\xf9\xde\x21\ --\xfe\x7d\xe4\xdc\x03\xe3\x7a\xfb\x2c\x3e\xd7\x19\x09\x46\xb2\x63\ --\xe5\x71\x45\x20\x4f\x03\xe4\xe5\x66\xf2\xbb\x6d\x1b\x79\x28\x32\ --\x3c\x60\x02\x83\x31\x94\xe2\x95\x4f\xb1\x61\xf3\x2b\x24\x26\xa7\ --\x71\xa9\xee\x0b\xc6\x1c\xd0\x71\x47\xd0\xdc\x7a\x33\x60\x8c\xb7\ --\x55\xd5\xfa\x7e\xa6\x69\xc9\xf1\x08\xe4\x29\x6d\x90\x4e\xf3\xe9\ --\x84\x53\x1d\x03\x42\x0a\x17\xe7\xf0\xcf\x3f\xfd\x9a\x5d\x27\x5a\ --\x19\xb4\x0e\x60\x9f\x18\x27\x24\x34\x9c\xb8\x84\x59\xcc\x32\xa5\ --\x23\x14\x85\xa6\x86\x1a\xaa\x4e\x1d\x26\x32\x32\x86\x45\x05\xcb\ --\x69\xec\x15\x0c\x06\x1c\xb6\xee\xdb\xc9\xf3\x17\x69\xbb\xd1\xed\ --\xe3\xcb\x5f\x90\x35\xae\xd7\x6b\x8e\x69\x73\xe3\xc4\x68\x43\xb7\ --\x7b\x3f\xb0\x09\x40\x55\x82\x98\x93\xe3\xdf\x86\x6f\x0f\xf4\x71\ --\xf4\xd0\x6e\x6e\x75\x77\x02\x10\x19\x79\xbf\x6e\xa7\x9e\xde\xa3\ --\x5e\x23\x5c\xed\x7f\x5b\xd9\xf1\x8f\xfd\x3e\xfb\x39\x99\xa9\x64\ --\xa5\x27\xef\xce\x8d\x13\xa3\x5a\x00\xa1\x2a\x3b\xa4\x46\xfd\x11\ --\x12\x5d\x7c\xa8\x24\xca\x20\xb8\xe3\xdb\x1c\xb9\xd1\x7e\xd5\x43\ --\x3e\x9d\x35\xb6\xdf\xe6\xe4\xf9\x8b\x9c\xa9\xbe\xc4\xb9\xaf\x9a\ --\x7c\x4e\x59\x45\x51\xd8\xbc\xe1\x7b\x4e\x55\xab\xfc\x1e\xee\x1e\ --\xc7\x79\x26\xd1\x56\xdf\xed\x7e\x43\xc0\x2f\x34\x0a\x2c\x4a\x54\ --\xf9\xbc\x43\xf9\xb6\x73\x89\xc7\xea\xaa\xcf\x52\x57\xed\xef\x57\ --\x14\xc1\xcb\x2f\x3c\xcd\xc3\xf3\x32\xfe\xbc\x38\x5e\xb4\xc3\xdd\ --\x81\x04\x60\xd8\xa1\xbc\x0a\xb2\x06\x20\xc2\x00\x69\x91\x0f\x66\ --\x8f\x88\x8e\x79\xe0\xfe\x54\x8b\x8e\x0c\xe7\xf5\xdf\xfc\x94\xf5\ --\xab\x1e\xa9\x0e\xb3\x29\xbf\xbd\xe7\xf7\x34\xfd\x92\x74\x61\xaf\ --\xed\x97\xe5\x5a\xa7\x5a\x0b\x98\xe6\xc5\x49\x86\xec\x82\xdb\x53\ --\x5e\x45\x48\x68\x38\x2b\xca\xd6\x91\xbd\x20\x7f\x5a\x52\x21\x04\ --\xb3\x53\x92\x78\x6a\xe5\x77\x78\xb2\xa4\x00\x63\x70\x50\x8f\xa2\ --\x2a\xdf\xcf\xca\x12\x9e\x2a\xf1\x1b\xcb\xeb\xbb\xe4\x42\xa1\xa8\ --\x47\x80\x64\x09\xf4\x0c\x09\xea\xcd\x82\x86\xda\x2f\x18\xbc\x63\ --\xa1\x70\xc5\x6a\xf4\x41\x3e\xe3\x03\x6d\x2d\x8d\xdc\xb6\xf4\x31\ --\x61\xb7\x13\x1f\xae\x65\x76\x82\x91\xa4\x84\x68\xb2\x67\x9b\x88\ --\x8a\x08\xbb\x07\xeb\x52\x55\x65\xcd\x12\x93\x68\xf2\x11\x19\x48\ --\x79\x43\xaf\x8c\x45\x75\x7f\x04\xa2\x18\xe0\x5c\x87\x82\x75\x4c\ --\x22\xc4\xb4\x7f\x72\x14\xa7\xab\x3c\x64\x9c\xea\x95\xd5\x2e\x9d\ --\xa6\x62\x69\x9c\xb8\x35\x75\x47\x99\xea\x00\x58\x9c\x28\x06\xc2\ --\x6c\x9a\x55\xc0\x76\x60\x4c\xaf\x99\x9e\x3c\x3a\x04\x16\x25\xca\ --\xa9\xe4\x0e\x24\xaf\x85\xd9\x34\x25\x81\xc8\x61\x06\x3f\xa7\xb5\ --\xfd\x32\xe1\x4a\xa7\xfc\xa8\x73\x50\x14\xba\xd4\xc0\xf8\xb4\x28\ --\xc9\xa2\x24\x9f\xa2\x1d\x13\x92\x3d\x2e\x9d\xb2\xa3\xe0\x6e\xb5\ --\x7f\x93\x4d\xff\x4c\xef\xda\x07\x17\x64\xa2\x4b\xaa\xbf\xb4\x39\ --\x45\x99\xdd\x25\x4c\xe3\x4e\x8c\x6e\x15\x45\x05\xe6\x27\xc8\x91\ --\xcc\x68\xf5\x8a\x44\x5c\x94\xaa\x3c\x13\xac\xd7\x1c\xcd\x8d\x13\ --\xa3\x33\xc9\xfb\x3f\xd5\x8a\xed\x13\x27\x02\xa0\xfb\x00\x00\x00\ --\x00\x49\x45\x4e\x44\xae\x42\x60\x82\ --\x00\x00\x10\xb6\ --\x89\ --\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ --\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\ --\x00\x00\x00\x04\x73\x42\x49\x54\x08\x08\x08\x08\x7c\x08\x64\x88\ --\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0d\xd7\x00\x00\x0d\xd7\ --\x01\x42\x28\x9b\x78\x00\x00\x00\x19\x74\x45\x58\x74\x53\x6f\x66\ --\x74\x77\x61\x72\x65\x00\x77\x77\x77\x2e\x69\x6e\x6b\x73\x63\x61\ --\x70\x65\x2e\x6f\x72\x67\x9b\xee\x3c\x1a\x00\x00\x10\x33\x49\x44\ --\x41\x54\x78\x9c\xcd\x9b\x79\x7c\x55\x45\x96\xc7\xbf\x75\xef\xcd\ --\xcb\xbe\xef\x8f\x40\xd8\x95\x1d\x42\x02\x88\x0e\x04\x11\x05\x45\ --\x11\x5a\x47\xe4\x23\xbb\x1f\x46\xdb\x71\x9b\xd6\x19\x9d\xed\xe3\ --\xa7\xfb\xd3\xfd\x69\x5b\xc7\xb5\x6d\x07\x51\x36\x31\x2a\x22\x88\ --\x8d\xf4\x20\x9b\x18\x10\x24\x31\x21\x40\x80\x84\x26\x10\x42\xf6\ --\x7d\x7b\xc9\x5b\xee\xad\xf9\x23\x24\x64\x79\xb9\x79\x59\xb0\xfb\ --\xf7\xd7\xab\x3a\x55\xa7\x4e\x9d\x5b\x75\xea\xd4\x39\xf5\x04\x37\ --\x19\x9b\x4f\xc9\x71\x86\xcb\x58\xed\x70\x29\x49\x0e\x9d\xa1\x76\ --\x9d\x08\xa7\x0b\x8b\x21\x51\x9d\x06\x42\x00\x9a\x82\xf4\x52\x71\ --\xcd\x1c\x22\x73\xfc\xbd\xe5\x19\xe0\x02\x42\x66\xab\x8a\x9a\x3a\ --\x29\x46\x94\xdd\x4c\xf9\xc4\x80\x73\x94\x52\x6c\xce\x60\x55\x93\ --\x93\xa7\x6a\x9b\x18\x6f\x73\xe2\xed\x69\xd7\xd1\x91\x92\xb1\x51\ --\xb2\x23\x37\x49\xb6\x50\xf8\x16\x94\x4f\x13\xac\x22\x7d\xa0\xc5\ --\x1d\x30\x05\x6c\xc8\x92\xc3\xa4\x9d\x77\x6a\x6c\xcc\x6b\x70\x78\ --\x3e\x69\x21\x20\x36\x50\x52\xd1\x28\x98\x33\xd2\xc0\x57\x33\x6d\ --\x7e\x4e\xc0\xa6\x46\x8b\xb2\xfe\x8e\x48\x51\xdf\x6f\xa1\x19\x00\ --\x05\x6c\x3d\x2e\xc7\xd4\x49\x36\x55\xd9\x98\xe6\x32\xcc\xf9\xc5\ --\x04\x4a\xa2\x03\xa1\xb0\x16\x62\x03\x41\x15\x10\xe6\x27\x29\xaa\ --\x13\x54\x35\x41\x62\x9c\xc4\xa2\x7a\x34\x6c\xb5\x84\x77\xbc\x5c\ --\xca\xdb\x13\xe3\x45\x75\x7f\xe4\xef\xb3\x02\x5e\xc9\x96\x96\xe8\ --\x3a\x63\x4b\xb9\x4d\x79\xc4\xa5\x7b\xc6\xc7\xd7\x0b\x46\x86\x4b\ --\xe2\x82\x25\x42\x80\x45\x85\x9c\x72\xc1\xf9\xb2\x96\xee\xe1\xfe\ --\xf0\x0f\x43\x8d\xde\x88\x51\x25\x04\xbf\x9e\x1c\xab\xbc\x2b\x84\ --\xe8\x55\xc7\x56\xf4\x49\x01\x3f\x15\xc8\x91\xb9\x55\xc6\xbe\xf3\ --\xa5\xca\xf0\xde\xf4\xb3\xa8\x70\xf7\x68\x03\x4d\x69\x29\x4b\xa0\ --\xbc\x41\xd0\xec\x82\xba\x66\xa8\x77\xc0\x6d\x43\xa4\x29\x0f\xf7\ --\x90\xc7\x0c\x5d\x5d\x99\x38\x44\x5c\xea\x6d\xcf\x5e\x2b\x60\xc7\ --\x59\xfd\xf9\x9a\x26\xf1\xfb\xaa\x46\x61\x89\x0d\x92\x54\x37\x41\ --\x45\xa3\x67\x6c\x84\x80\xd1\x11\x12\x45\x80\x97\x0a\xc3\xc3\xfa\ --\x32\x59\xf7\x90\x50\x2f\x90\xeb\x12\x06\x69\x9f\xf5\xa6\x9f\xb9\ --\xc9\x69\x87\xed\x52\xaa\xae\x2c\xf6\xf8\x6a\x72\x7e\x4e\xbd\x20\ --\xd2\x5f\x32\x2c\x54\xe2\xd4\x05\x15\x8d\xdd\xf7\xf3\xb7\xc0\x90\ --\x10\x49\x49\xbd\x40\x08\xd0\xd4\x16\xa3\x17\x60\xf1\x5c\x48\xbb\ --\xc3\x89\xb7\xc5\xcb\xb4\x8d\x80\x40\x10\x9f\x66\x14\xe9\x49\x53\ --\x62\x95\x17\x3d\xdd\x12\x1e\x7d\xba\x6d\x27\x64\x50\xb5\x2e\x4f\ --\x4f\x88\x95\xf1\x27\xae\x2a\xd8\x1c\x10\xe0\x0d\x0a\x50\x67\x87\ --\x48\x7f\x89\xa6\x42\x71\xdd\x0d\x76\x01\x16\x48\x18\x64\x10\xe6\ --\x07\xf5\x8d\x36\x6a\x9a\x20\xdc\x4f\xc1\xcf\xcf\xc7\x93\x21\x01\ --\xb8\x5c\x50\xc2\x9b\x1f\x7e\xc9\xb2\x45\x77\x32\x23\x61\x8c\xc7\ --\xfd\x80\x14\xa3\x58\x59\x95\x98\x28\x9c\x3d\x35\xec\x71\x05\xfc\ --\x39\x5d\xfa\xe5\xd9\xc9\x6d\xb4\x8b\xe8\x8b\x15\x60\x73\x80\x97\ --\x02\xf1\x21\x92\x06\x07\xd4\x3b\x04\xe5\x8d\x82\xaa\xf2\x52\xf2\ --\x2f\xe7\x52\x51\x56\x4c\x6d\x55\x25\xcd\x0d\x95\x54\x56\x56\xe1\ --\x74\xe9\x5d\x78\xfa\xf9\x78\x13\x15\x19\xca\xff\xfc\xc7\x3a\xa2\ --\x23\x42\xbb\xd0\x6d\xb6\x66\x36\x7e\xb1\x8f\x1d\x7b\x53\x71\xe9\ --\x3a\xcb\x16\xdd\xe9\xe9\xc4\x5b\xb1\x4c\x58\x65\x70\x7a\xba\x5c\ --\xdc\x93\x12\x4c\x15\xf0\x8a\x94\x4a\xfe\x0f\x9c\xae\x6c\x24\x1a\ --\xa0\xa0\xa6\xe5\x0b\x3b\x0d\x38\x53\x2c\xc9\xcb\x3d\x47\x4e\x76\ --\x26\x57\xf3\x72\x69\x6c\xa8\xf3\x58\x3a\x5b\xb3\x9d\x2b\x05\x25\ --\xd8\xed\x8e\x0e\xf5\x52\x4a\xf6\xa7\x66\xf0\xde\xd6\xaf\xa9\xac\ --\xf1\x9c\x9f\x3b\x08\x29\xef\x13\xb1\x72\x8b\x94\xf2\x31\xb3\xed\ --\x60\xaa\x80\xe8\x1f\x49\x2b\x6e\x64\x44\xfb\x3a\x97\xd3\x49\x56\ --\xfa\x31\xd2\x8e\x1d\xa2\xa1\xbe\xb6\x5f\x42\xb6\xc7\xa5\xfc\x22\ --\xde\xf8\x70\x27\x59\xe7\x7b\x6d\xc8\xcd\xf0\xe8\xe1\x4b\x46\x3d\ --\xf0\x4f\xdd\x35\xe8\x56\x01\x1b\xd3\xe4\x1b\x57\xaa\x49\x68\x5f\ --\x97\x97\x9b\xcd\x81\x3d\x5f\x50\x57\xdb\x2f\xdf\xa3\x03\xec\x0e\ --\x27\xef\x6f\xfb\x33\xbb\xf6\x1d\x43\xd7\xfb\x74\x94\x9b\xc2\x69\ --\x88\x75\x1f\xa5\x49\xfb\xda\x24\xf1\x8c\x3b\xba\x5b\x05\xa4\xa4\ --\xcb\x3b\xf2\x6a\x79\xae\xb5\x6c\xe8\x3a\x07\xf7\x7e\x49\x56\xfa\ --\xb1\x01\x17\xb0\xb4\xbc\x8a\x1d\x7b\x53\x07\x9c\x6f\x2b\xc2\xfc\ --\x24\x5e\x8a\x5c\x9d\x56\x2a\xdf\x4a\x8a\x16\x79\x9d\xe9\x4a\xe7\ --\x8a\xed\xdb\xa5\x5a\x62\x63\x8f\xe3\xba\x77\xe7\x74\x3a\xf8\x62\ --\xeb\xfb\x37\x65\xf2\x3f\x07\x54\x01\x21\xbe\x04\x94\x57\xcb\x5d\ --\xdb\xb7\xcb\x2e\x8e\x76\x17\x05\xd4\x0e\x35\x36\xd7\x34\x13\x0c\ --\x2d\x5f\xfe\xeb\xcf\x37\x51\x70\xe5\xe2\xcf\x21\xeb\x4d\x43\x95\ --\x0d\x32\x8b\xc4\xc4\xda\x78\xe3\xa3\xce\xb4\x0e\x0a\xd8\x7d\x41\ --\x5a\xcb\x1a\x94\x65\xad\xe5\xd4\x83\xdf\x70\xf9\xe2\x39\x8f\x07\ --\x0a\x09\x0a\x20\x79\xc6\x44\x1e\x5f\xba\x80\x7b\xe7\x4c\xeb\x97\ --\xd0\x03\x85\xf3\x65\x82\xef\x2f\x2b\xd8\x5d\x50\xd2\xa0\x2c\xff\ --\x24\x43\xc6\xb7\xa7\x77\xb0\x01\xe5\x75\x6c\xb5\xbb\x5a\x94\x72\ --\x2d\x3f\x8f\xf4\x1f\x0e\x79\x34\xc8\xd0\xc1\x31\xac\x5c\x32\x8f\ --\x39\x33\x27\xa1\xa9\x2d\xab\xec\x44\xc6\x79\xf6\x1e\x3e\x39\x30\ --\xb3\xe8\x23\x1a\x9d\x90\x5b\x71\xc3\x39\x73\xea\x28\x0d\x4e\xb6\ --\x00\xc9\xad\x75\x6d\x0a\xd8\x7e\x51\x46\xe6\x17\xb5\x10\x34\x05\ --\xd2\xbf\xdb\x8d\x94\xe6\xbe\xba\x10\x82\x47\x16\xce\x66\xdd\xb2\ --\x7b\xb1\x78\x99\xbb\xaa\x7f\x0b\x54\xda\x04\x9d\xa7\x50\xd6\xc0\ --\xac\xf7\x4f\xc9\x41\x4f\x4e\x16\x85\xd0\x4e\x01\xa3\xfc\x8c\x95\ --\x23\x47\xa2\xd6\xdb\x21\x2b\x3b\x87\xbf\xe6\x5d\xe9\x71\x80\xa7\ --\x56\x3c\xc0\xd2\xfb\x93\x07\x54\xe8\x81\x42\x79\xa3\xe0\x6c\x71\ --\x57\x4f\xdf\xa9\x23\x34\x3b\xef\x01\x0f\x42\x3b\x05\x18\x92\x95\ --\x42\x40\xa0\x37\xec\x3f\x72\xa2\xc7\x01\x96\xde\x9f\xfc\xb3\x4c\ --\xde\x4b\x53\x09\x0a\xf2\x73\x4b\xb3\x35\xd9\xa9\x6f\xb4\xa1\xaa\ --\x0a\x81\xfe\x7e\x78\x5b\xbc\x30\x24\xfc\x78\x55\x50\xd6\x20\xe8\ --\x6e\xfd\x56\x36\xb1\xa0\xf5\xb7\x06\x90\x59\x2c\x93\xa4\x61\x8c\ --\x87\x16\xc7\xe4\xf8\x4f\xe7\x4d\x85\x8a\x8a\x08\xe1\xf1\xa5\x0b\ --\x4c\xdb\x0c\x04\xa6\x4d\xba\x85\xe7\xd6\x2e\x61\x88\x35\x0a\x80\ --\xe2\xb2\x2a\x8e\x67\x9e\xe7\x44\xc6\x39\x2e\x5c\x2a\xa0\xaa\xe6\ --\x46\x54\x4c\x51\x04\x71\x31\x91\x0c\x1d\x39\x86\x61\xe3\xa7\x13\ --\x19\x3d\xa8\x5b\xbe\x36\x07\x96\xad\x69\x72\xf9\x8a\x24\xf1\x71\ --\xcb\x0a\x90\xc6\xa3\xad\xc4\xb3\x39\x57\xb0\x35\xdb\x4d\x05\x7b\ --\x62\xd9\x42\x7c\xbc\x7b\x71\x9f\xed\x25\x62\x22\xc3\x78\x7a\xe5\ --\x22\x66\xcf\x98\x08\xc0\x99\x9c\xcb\x6c\xdd\xb1\x9f\x13\xa7\x2e\ --\x74\x6b\x97\x0c\x43\x72\xb5\xa8\x8c\xab\x45\x65\xa4\xa6\x7e\xcf\ --\xb8\xc9\xd3\xb8\x73\xc1\x12\x2c\xde\xee\x6f\x9f\x8d\x3a\xcf\x00\ --\x2d\x0a\x90\x92\xbb\x5b\x09\x17\xaf\x14\x9a\x0a\x17\x1c\xe4\xcf\ --\x9c\x99\x93\xfb\x34\xb1\x9e\x60\xd1\x34\x1e\x5d\x74\x27\xcb\x97\ --\xcc\xc5\xc7\xdb\x42\x79\x55\x2d\x7f\xda\xfa\x35\xfb\x8f\x66\xf4\ --\x8a\x8f\x94\x92\xb3\x99\x3f\x52\x5a\x74\x8d\x87\x56\x3c\x81\x7f\ --\x40\x50\x97\x36\x75\xcd\x8c\x07\xd0\xb2\x4a\x64\x94\xae\x1b\x63\ --\x5b\x09\x97\xf2\x8b\x4c\x99\x4f\x9f\x7c\x2b\x5e\x9a\x67\x91\xcb\ --\xde\x60\x66\xc2\x58\x9e\x59\xb3\x98\xb8\x98\x08\x9c\x2e\x9d\x94\ --\xaf\x0e\xb1\x79\xc7\xb7\x3d\xae\x46\x33\x94\x97\x16\xf2\xf5\x67\ --\x1b\x79\x64\xf5\xd3\x28\x6a\x47\x99\x1b\x1d\xf8\x7c\x98\x26\xc7\ --\x6b\xba\x4b\x9f\x85\x10\x02\x5a\x82\x1b\x7f\x2d\x32\x8f\x36\x8f\ --\x1b\x35\xb4\xcf\x02\xb9\x83\x9f\x9f\x0f\xaf\xbe\xf4\x38\xb7\x27\ --\x8e\x03\xe0\x64\x56\x0e\x6f\x7d\xb4\x93\xab\x45\x03\x93\x0f\x29\ --\x2c\xb8\xcc\x89\xd4\x6f\x99\x99\xdc\xd5\x66\x29\x18\xcb\x35\x29\ --\xc4\x78\x01\x48\x09\x99\x85\x0a\x8d\xb6\x66\x53\x86\x83\x63\x23\ --\x07\x44\xb0\x56\x44\x84\x06\x13\x91\x18\x4c\x49\x79\x15\xef\x6e\ --\xd9\xcd\x91\x13\xa7\x07\x94\x3f\x40\xda\xb1\xc3\x24\x4c\x9f\x8d\ --\x8f\x6f\xc7\xd3\xc4\xe1\x12\xd3\xb4\xbc\x4a\x31\xaf\xa6\x19\xaa\ --\x6d\x82\x06\x07\xd8\x1d\xe6\x0a\x08\x0c\xf0\xed\xb7\x40\x16\x4d\ --\xe3\x91\x07\x92\x89\x89\x0e\xc7\xe1\x74\x92\xb2\xfb\x30\xdb\x76\ --\x1d\xa4\xb9\x53\x80\x64\xa0\xe0\x74\xd8\x39\x75\xf2\x28\x33\x66\ --\xdf\xdd\xa1\xbe\x59\x17\xc3\xb5\x2b\xd5\x4c\xae\xb7\xdf\x70\x18\ --\xbc\x54\xf3\xfd\x6d\xf1\xf2\x38\x8e\xea\x16\xed\xf7\xfa\xb1\xf4\ --\x6c\xde\xde\xb4\x8b\xa2\xd2\x4a\x8f\xfa\x46\x85\x87\x90\x7c\xdb\ --\x24\x26\x8f\x19\x41\x54\x44\x30\x0d\x8d\xcd\x5c\xb8\x54\xc0\xe7\ --\x7b\x8e\x50\x5d\x6b\xbe\x75\x2f\x9e\xcf\xea\xa2\x00\x97\x2e\xc3\ --\xb5\x61\x61\x34\x9d\x29\xc1\xaf\xf5\x74\xb1\x58\xcc\x8f\x37\xbb\ --\xb3\xc7\x38\xa3\x5b\xc4\xc5\x44\xf0\xcc\x9a\xc5\xcc\x4c\x18\xcb\ --\xb5\x92\x0a\x5e\xfc\xed\x07\x1c\xcf\x34\xf7\x37\x5a\x11\x1e\x12\ --\xc4\xe3\x4b\x17\xb0\x60\x4e\x52\xdb\x5d\xa3\x15\x89\x13\x47\x33\ --\x3f\x39\x89\xb5\x2f\xff\x91\xca\x8a\xf2\x6e\x79\x94\x96\x14\x52\ --\x5f\x5b\x43\x60\x70\x48\x5b\x9d\xc3\x10\xde\xda\xf0\x30\x29\xbc\ --\x14\x38\x53\x22\x70\xe8\x20\x34\x73\x05\x54\x55\x37\x78\x24\x74\ --\x2b\x7c\x7d\x2c\xac\x58\x32\x8f\x47\x1e\x48\xc6\xd0\x0d\x3e\xf8\ --\x74\x2f\x9f\xed\x3e\x8c\xc3\xe5\xea\xb1\xaf\xa6\xaa\x3c\x7c\xdf\ --\x2c\x56\x3f\x7c\x0f\x7e\xbe\xdd\xa7\x1b\x7d\xfd\x83\xb8\x67\xf1\ --\x63\xa4\x6c\x78\xb3\x7b\x66\x52\x52\x5c\x98\xdf\x41\x01\xba\x8e\ --\xaa\x01\x01\x83\x43\x5a\xd2\x55\x35\xcd\x90\x1a\x16\x40\xbe\x49\ --\x58\x2e\xef\x6a\x31\x77\x24\x8d\xeb\x51\x78\x21\x04\x77\xdd\x3e\ --\x85\x5f\xae\x78\x80\xa8\xf0\x10\x0e\x9f\xc8\xe2\x8f\x9b\x77\x53\ --\x5a\xe1\x59\x38\x2d\x71\xe2\x68\x9e\x5f\xb3\x84\xf8\xb8\x68\x0c\ --\xc3\x3c\x54\xe6\xe7\x05\x71\x71\x43\x19\x34\x78\x18\x85\x05\x97\ --\xbb\x6d\x57\x55\x5e\xda\xa1\xac\x1b\x88\xb6\x78\x80\x10\x10\xea\ --\x0b\x13\x46\x44\x99\x0e\x76\xe2\x54\xcb\xb2\x35\x68\xb9\x70\x9c\ --\x29\x69\xf1\xbb\x3b\x67\x87\x92\x26\x8d\xe6\x95\xe7\x57\xd0\xd4\ --\x64\xe7\xb9\x5f\xbf\xcf\x7f\xbd\xbe\xd9\xa3\xc9\x47\x47\x84\xf2\ --\x9b\x17\x56\xf1\xd6\x7f\x3f\x89\xaf\xaf\x37\xaf\xbc\xb9\x95\xb4\ --\xac\x5c\xd3\x3e\x42\xc0\xad\xd1\x92\x61\xa3\xcd\x73\x07\x95\x15\ --\xa5\x5d\xea\x34\xa0\x01\x08\x6b\xad\x88\x8f\x8b\x36\x65\x72\xfa\ --\x7c\x1e\xc7\x4f\xe7\x53\x69\x19\x86\x4b\x07\x1f\x0d\xf2\xae\xdb\ --\xb0\xd8\xa0\x96\x4c\x50\x98\x1f\x5c\x2e\x77\x71\xe4\xe0\x3e\xf6\ --\x1d\x38\x82\x4b\xef\x9a\x1b\xe8\x0c\x8b\xa6\xb1\x74\xd1\x1c\x56\ --\x2c\xb9\x0b\x45\x55\xf8\x78\xe7\x01\xb6\xee\xdc\x4f\x53\xb3\x83\ --\xf9\xb3\x93\x7a\xec\x3f\x3a\x42\x92\x78\x4b\x2c\x47\x0f\x76\xdf\ --\xa6\xa9\xb1\xe3\xf6\x55\x15\xa4\x06\xd4\xd3\x4e\x01\x63\x47\x0e\ --\x41\x08\x61\x1a\x0b\x78\xf5\xfd\x14\x1e\x5e\xf5\x34\xfe\x01\x41\ --\x68\x2a\x34\x5f\xdf\xce\x45\x75\x02\x5d\xd7\xc9\x3e\x75\x92\x63\ --\x87\xf6\x7a\x9c\x2b\xb8\x6d\xca\x18\x9e\x5d\xbb\x84\xb8\x98\x08\ --\x7e\xc8\x38\xc7\x3b\x1b\x77\x71\xad\xa4\xc2\xa3\xbe\xed\x31\x66\ --\x70\x80\x29\xdd\xe9\xec\x78\xcc\xaa\x2a\xba\x06\x54\x00\x6d\x61\ --\xa2\xe8\x88\x50\x46\xc6\x5b\x4d\xef\x04\x15\xe5\x65\x6c\x7e\xef\ --\x55\x12\x67\x26\x13\x6d\x1d\x8c\xb7\xb7\x2f\x75\x75\xd5\x14\xe6\ --\x5f\x22\xe7\xec\x29\x8f\x27\x6e\x8d\x0e\xe7\xd9\xd5\x8b\xb9\x3d\ --\x71\x1c\xd7\x4a\x2a\xf8\xd7\xdf\x6d\xe0\x87\x0c\xcf\x43\x70\x9d\ --\xe1\xd3\xc3\x09\xe6\xb0\x77\x74\xab\x2d\x8a\xb4\x6b\x40\x2e\x30\ --\xb5\x3d\x61\xf6\x8c\x89\x3d\x5e\x8a\x9a\x6c\x0d\xa4\x1e\xd8\xd3\ --\x37\x41\xbd\x2d\x3c\xb6\x78\x2e\xcb\x16\xcd\x01\x21\x58\x9f\xf2\ --\x0d\x9f\x7f\xfd\x9d\x47\x27\x83\x19\x7a\x3a\xa2\x0d\xd9\x71\x2b\ --\xfa\x5a\x44\xb1\x26\x20\xa7\xf3\x62\x5f\x72\xcf\xed\x7c\xb2\xfb\ --\x10\x4d\x4d\x7d\xbf\x88\x74\x87\xd1\x63\x27\x71\xf7\x7d\x0f\x92\ --\x38\x32\x14\x2f\x2f\x49\x41\x61\x29\x1f\xef\x3c\x30\x20\xbc\x6b\ --\xeb\x6d\xa6\xf4\x60\x7f\x1f\x62\x02\x24\xde\x5e\x30\x2c\x54\x12\ --\xe2\xc3\x16\x4d\x0a\x79\x16\xd9\xd1\x82\x07\x05\xfa\xb3\x74\x61\ --\x32\x9b\xbe\xd8\x37\x20\x82\x01\x84\x86\x47\x31\xf7\xbe\x5f\x30\ --\x74\xc4\xad\x00\xec\x3e\x72\x96\xa4\x31\x71\x0c\xed\x7a\x53\xed\ --\x33\x0a\x8a\xba\x77\x84\x00\xa2\x42\x7d\x99\x11\x7f\xe3\x73\x4b\ --\x21\xb3\x35\x55\x51\x53\x75\xdd\x90\x74\x4a\x95\xaf\x7c\x68\x1e\ --\x69\x59\x39\x9c\xcd\xbd\xd2\x2f\xa1\x2c\x16\x6f\x6e\x9b\x7d\x0f\ --\x09\xb7\x25\xa3\xaa\x2a\xd5\x55\x15\x1c\xfe\xcb\x4e\xf2\x72\xb3\ --\x89\x7a\xf6\xdf\x19\x64\x6e\xb7\x7a\x85\xec\xdc\xee\x7d\x00\x68\ --\xf1\x28\xdb\xc1\x90\xa8\xa9\xda\xa4\x18\x51\xf6\xd3\x35\x3d\x5b\ --\x88\x96\x00\x41\x2b\x34\x55\xe5\x77\x2f\xae\xe6\x57\xbf\xfd\xa0\ --\x47\x7b\xd0\x1d\xc6\x4c\x98\xca\xec\xbb\x17\x11\x10\x14\x8c\xd3\ --\xe9\xe0\xf8\x77\xfb\x48\x3b\x76\x10\x5d\x6f\xd9\xeb\x4e\xe3\x46\ --\xc6\xb9\xbf\x70\xb8\x5c\x9c\x3c\x65\xee\x2f\x8c\x88\xb7\xb6\xfd\ --\x96\x90\x95\x68\x15\x15\x1a\x80\xa2\xb0\x5f\xca\x8e\x0a\x00\x08\ --\x0b\x0d\xe2\xbd\x5f\xff\x33\xaf\x6f\xfc\x8a\xfd\x47\x4e\xf6\x18\ --\x26\x07\x40\x08\x46\x8c\x1a\xcb\xb4\x59\xf3\x18\x34\x78\x18\x00\ --\xb9\xe7\xb2\xf8\x6e\xdf\x57\xd4\xd5\x54\x75\x69\x5e\x54\x37\x30\ --\x0a\x38\x78\x34\x93\xfa\x46\x73\x1b\x30\x6a\xa8\xb5\x7d\xf1\x00\ --\x5c\x0f\x8a\x4a\x94\x14\x30\x9e\x77\xd7\xc9\xcf\xcf\x87\x07\x7f\ --\xf1\x28\xd6\xb1\xc9\x9c\xc9\xfc\x91\xcb\x17\xcf\x53\x5d\x59\x8e\ --\x94\x37\xdc\xd3\x80\xa0\x60\xa2\x63\x07\x33\x7c\xd4\x58\x86\x8f\ --\x1e\xd7\xe6\x6f\x57\x57\x96\x71\xf0\x9b\x2f\xb9\x72\xe9\x42\xb7\ --\x42\x35\xf7\xcf\xf0\x03\x2d\xd1\xe1\xf5\x9f\x7c\x63\xda\xc6\xdf\ --\xcf\x97\x71\xb7\x0c\x6d\x2b\x2b\x52\x49\x81\xeb\x0a\x48\xb0\x8a\ --\xf4\x9f\xae\xe9\x67\x3b\x6f\x83\x56\xc4\x04\x42\x44\xb4\x95\x39\ --\xf3\x17\x33\x67\xfe\x62\x5c\x2e\x27\x0e\x7b\x33\x86\x6e\xe0\xe3\ --\xeb\x87\xe6\x26\x29\x52\x5c\x98\xcf\x67\x1f\xbd\x8d\xee\x81\x17\ --\xd8\x5f\xfc\xef\x27\x7b\xa8\xa8\x36\x7f\xab\x70\x7b\xe2\x58\x2c\ --\x5a\xdb\x55\xfe\xdc\x94\x38\x71\x0a\xda\xe5\x06\x15\xc1\x96\xee\ --\x3a\x17\x75\xf2\x6b\x34\xcd\x0b\x3f\xff\x40\x02\x82\x82\xdd\x4e\ --\x1e\xa0\xd9\xd6\x38\x60\x93\xaf\x6e\xea\x9e\xb6\x6d\xd7\x41\x76\ --\xfe\xdf\xd1\x1e\x79\x2c\x9c\x3b\xe3\x46\x41\xd2\x96\x24\x6d\x53\ --\x40\xa3\x45\x59\x0f\xb8\xbd\xad\x34\xde\x9c\x40\x8d\xc7\xc8\x29\ --\x17\xa4\x5e\x51\x28\xa8\xbd\x61\x2f\xec\x0e\x27\x6f\x6f\xdc\xc5\ --\xfa\x14\xf3\xa5\x0f\x30\x69\xcc\x08\x12\xc6\x8d\x6c\x2d\x56\xd9\ --\xbc\x95\x0d\xad\x85\x36\x05\x5c\x7f\x7b\xfb\xae\x3b\x06\x13\x62\ --\x25\xbe\x7f\xc3\xd4\x9f\x04\x2a\x1b\x21\xa7\x4c\xe0\x70\xb9\xf8\ --\xcb\x77\x69\xac\x7e\xe1\x75\xbe\xd8\xfb\x7d\x8f\x86\x59\x51\x14\ --\x7e\xb9\x62\x61\x7b\x66\x6f\xb5\x7f\x67\xdc\x21\xbe\xa5\xb9\x94\ --\xb7\x5c\x9a\xf1\x24\xd0\x21\xf2\x19\xe4\x0d\x09\x83\x24\x3f\x5c\ --\xe9\x3e\xdd\x74\x33\x91\x93\x7d\x8a\xa2\x6b\xf9\x54\x96\x14\xf2\ --\xc6\xb5\x4b\xd4\x35\x98\x5b\xfb\xf6\x78\x6c\xf1\xdc\xf6\x91\xec\ --\x52\xc3\xae\xbc\xd3\x9e\xde\x41\x01\x13\xe3\x45\x75\x46\xa1\xeb\ --\x25\x10\x5d\x1e\x12\x44\xfa\x4b\xac\xc1\x50\x58\x3b\x30\xc7\x56\ --\x6f\x70\x36\xf3\xc7\x3e\xf5\xbb\x3d\x71\x1c\x6b\xff\x71\xfe\x8d\ --\x0a\x21\x5f\x4c\x1c\x21\x3a\x58\xcb\x2e\x2f\x44\xa6\x58\xd5\x4d\ --\x20\xdd\xbe\x87\x19\x1f\x2d\x51\xbb\xf4\xf8\xfb\xc4\xb4\xc9\xb7\ --\xf0\x9b\x5f\xad\x44\x6d\x13\x58\x7e\x3f\x25\x56\xdd\xd6\xb9\x5d\ --\x97\xe9\x08\x21\xa4\xa1\xab\x2b\x11\x74\x39\x57\x5a\x5f\x7b\xff\ --\xbd\xe3\xe1\x7b\x67\xf1\xda\xcb\xeb\xda\xbf\x59\xa8\xd1\x35\x75\ --\xb5\x10\xa2\x8b\xf0\x6e\xbf\x67\xe2\x10\x71\x09\x43\x3e\xee\x8e\ --\x76\x4b\xa4\x24\xd0\xe3\xbf\x43\xb8\x87\xa2\x28\x24\xcc\x98\x45\ --\x50\x70\x58\xcf\x8d\x7b\x81\xd8\xa8\x30\xde\xf8\xcf\x27\x78\x76\ --\xcd\xe2\x76\x5f\x1e\xa4\x90\x6b\xdd\xbd\x10\x03\x93\x77\x82\x09\ --\x71\xda\x8e\x8c\x22\xfd\x0d\x24\xff\xd2\xbe\x5e\x11\x30\x2a\x42\ --\x92\x59\xd8\x37\x83\x18\x37\x64\x04\x73\xef\x7b\x88\xc8\x18\x6b\ --\xcf\x8d\x3d\x44\x74\x44\x28\xcb\x16\xdd\xc9\xfd\x77\x4d\xef\xf2\ --\x52\x45\xc0\x1f\x12\xac\xda\xce\xee\xfa\x9a\x66\x39\xa6\xc4\x2a\ --\x2f\x64\x14\x19\x61\x02\x56\xb5\xaf\x1f\x12\x22\xf1\xd1\xe0\x74\ --\x89\xa0\xc1\xc3\x90\x81\x7f\x40\x10\xc9\xf7\x2c\x62\xcc\x84\xa9\ --\x2d\x51\xcc\x7e\x22\x2a\x22\x84\xc4\x09\xa3\x99\x3b\x73\x0a\x49\ --\x93\x46\xa3\x28\x6e\x17\x73\xca\x64\xab\xf2\xb2\x19\x1f\x53\x05\ --\x08\x21\x64\x7a\xba\x5c\x27\xac\x32\x0a\x29\xef\xed\x20\x40\x80\ --\x64\xee\x08\x49\x69\x83\xe0\x74\xb1\xc0\xd6\x4d\x30\x46\x51\x55\ --\x12\xa6\xcf\x62\x66\xf2\x7c\xb7\xb9\x7a\xcd\xcb\x42\x78\x54\x0c\ --\x75\x35\xd5\x38\x1d\x5d\xb5\xa9\xaa\x1a\xb1\x51\x61\xc4\xc5\x86\ --\x63\x8d\x0c\x63\x78\xbc\x95\xa9\x13\x46\xf5\x98\xa3\x14\x88\x3d\ --\x7a\xb1\x58\x25\x06\x99\x3f\x9b\xf7\xe8\x53\x1c\x96\x52\x0b\x2e\ --\x32\xd6\x03\x6b\xdc\xd1\x9b\x5d\x70\xf8\x52\xcb\x53\xb4\x56\x5c\ --\xbe\x78\x8e\x93\x47\x0f\x71\xd7\xc2\x87\x08\x8f\x8c\xf1\x64\x18\ --\x00\x1c\xf6\x66\xa4\x34\x10\x08\x2c\x3e\xbe\xf8\x59\x60\xde\xa8\ --\x1e\xfe\x8c\xd4\x09\x42\xb2\x4d\x2f\x51\xd6\x78\xf2\x5c\xde\x63\ --\xbe\x52\x4a\x91\x51\x64\xfc\x41\xc0\x0b\xee\xe8\xa7\x8a\x05\x57\ --\xaa\x6e\xb0\x73\x39\x9d\xdd\xde\x13\x7a\x83\xd8\x20\xc9\xf4\xc1\ --\x1e\x5b\x1b\x29\xe0\xb5\xc9\x56\xe5\x25\x77\x16\xdf\x1d\x3c\x3e\ --\xd5\x85\x10\x72\xea\x20\xf5\x45\x21\xe4\x62\xdc\xdc\x19\x02\x3b\ --\x05\x64\x07\x62\xf2\xd0\x62\x70\x3d\x44\x9d\x94\x72\xe9\x94\x41\ --\xea\xbf\x79\x3a\x79\xe8\x85\x02\x5a\x31\xc5\xaa\x7d\xa5\x6b\x4a\ --\x22\xc8\x0e\x2f\x9c\x6f\x86\x83\x34\x38\x44\x12\xe6\x51\x36\x5e\ --\x7e\xaf\xaa\xca\xe4\xa9\x71\xda\xf6\xde\x8e\xd1\x67\x73\x2c\xa5\ --\x14\x99\x85\xfa\x72\x84\x78\x0d\x88\xba\x5a\x2b\xc8\xb8\xd6\x7f\ --\xeb\x1e\xee\x0f\xb7\x46\x4a\x42\x7c\x24\x5e\x3d\xbf\xc4\xa9\x92\ --\x82\x97\x13\x62\x95\x0d\xbd\xf9\xea\xed\xd1\x6f\x89\x33\x2f\xcb\ --\x10\x69\x31\x9e\x29\x69\x10\x2f\x9c\xc8\x17\x81\xfd\xe1\x35\xc5\ --\x2a\x89\x0f\xf5\x68\x1e\x95\x48\xde\x36\xec\xca\x3b\x9d\x7d\xfb\ --\xde\x62\xc0\x6e\x36\x9b\x4e\xca\x18\x17\xf2\x4f\xd5\x36\xb1\xa0\ --\xc1\x81\xe7\xff\x8c\xba\x0e\x4d\x85\x85\xb7\x9a\x67\x81\xa5\xe4\ --\x2c\xb0\xd1\xc7\xa2\x6c\x18\x17\x25\x7a\x97\xa7\xef\x06\x37\xe5\ --\x6a\xb7\x35\x4d\x2e\x6f\xd2\x79\xaa\xce\xce\xc4\x06\x3b\xbe\x9e\ --\xae\xcd\xfb\xc7\x1a\xa8\x1d\x25\x32\x80\xd3\x12\xf6\x2b\x52\x49\ --\x69\x0d\x63\x0d\x24\x6e\xfa\xdd\x76\xeb\x4f\x72\x8c\xcb\x30\x56\ --\x39\x75\x91\x60\xd7\x19\xe5\x70\x89\x08\x97\x81\xc5\x65\xa0\xb9\ --\x0c\x84\x04\xbc\x14\x64\xb0\xaf\x6c\x9a\x19\x6f\x9c\x03\x91\x23\ --\x24\x17\xa4\x22\xb3\x25\x6a\x6a\xa2\x55\xf4\x3e\x4b\xda\x0b\xfc\ --\x3f\xcf\xc2\x42\x82\x41\x31\x16\x33\x00\x00\x00\x00\x49\x45\x4e\ --\x44\xae\x42\x60\x82\ --\x00\x00\x03\xb1\ --\x89\ --\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ --\x00\x00\x10\x00\x00\x00\x10\x08\x06\x00\x00\x00\x1f\xf3\xff\x61\ --\x00\x00\x00\x04\x73\x42\x49\x54\x08\x08\x08\x08\x7c\x08\x64\x88\ --\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0d\xd7\x00\x00\x0d\xd7\ --\x01\x42\x28\x9b\x78\x00\x00\x00\x19\x74\x45\x58\x74\x53\x6f\x66\ --\x74\x77\x61\x72\x65\x00\x77\x77\x77\x2e\x69\x6e\x6b\x73\x63\x61\ --\x70\x65\x2e\x6f\x72\x67\x9b\xee\x3c\x1a\x00\x00\x03\x2e\x49\x44\ --\x41\x54\x38\x8d\x5d\x93\x5d\x4c\x9b\x75\x14\xc6\x7f\xff\xb7\x6f\ --\x8b\x6d\x0a\x2b\x8c\x41\xd9\x04\x5c\x1d\x96\x16\x27\xac\x2c\xab\ --\xba\x10\x03\xce\x69\x9c\x2e\x12\x8c\x2e\x3a\x13\x89\x0e\x83\x9a\ --\x5d\xe0\xc7\x05\xd1\x99\x18\xbd\x51\xb6\xcc\x45\x13\xa2\x75\xd3\ --\x69\x1c\x31\xce\x68\xc0\x1b\x98\xd3\x18\x97\xe9\x36\x98\xb8\x15\ --\x5a\xfa\xa1\x80\xb4\x0c\x3b\x69\xf9\x18\xb4\xd0\xf7\xef\xc5\xe4\ --\x0d\xf3\x5c\x9d\x9c\xe7\x39\x1f\x4f\xce\x39\x82\xff\xd9\xd1\xf3\ --\xf2\xd1\xf4\x32\xaf\xcd\x66\x70\x0a\x30\x59\x4d\x52\x7a\xcb\x64\ --\x40\x4a\x4e\xa9\xaa\xe2\xab\xb6\x8b\xcb\xab\xf9\x62\xc5\xe9\xbe\ --\x20\x2d\x33\xaa\xec\x09\x27\x44\x7d\x56\x03\xa3\x02\xf7\xdc\xaa\ --\x31\xbb\x28\x28\xc9\x93\x48\x29\x11\x42\x64\x05\x74\x9a\x92\x4a\ --\x5b\x55\x95\xc8\xe8\x05\x8e\x5d\x94\xb6\xf9\x05\x6d\xf8\xdc\x80\ --\xdf\x1e\x1d\x19\x42\xa6\x53\x90\x4d\xf3\x54\xe3\x0e\xb6\xd5\x38\ --\xf9\xe1\x97\x41\xce\x0f\x06\x79\xf5\xb9\xc7\x56\xfa\x9e\x4e\x8d\ --\x88\x5d\xf5\xf5\x62\x51\x05\x98\x9c\x9c\x3e\xf3\x91\xef\xa8\x7d\ --\x32\x36\x76\x83\x9c\xfb\xea\x6a\xe9\xfd\xa9\x9f\x37\x8f\x7c\xce\ --\x9d\x1e\xd7\x2a\x44\x36\x2c\x6f\x90\x3e\x60\xaf\xf2\x8d\x5f\xd6\ --\x75\x75\x9d\x70\x4f\xc6\xc6\x70\x94\xad\xe7\xf0\x81\x56\xb6\x54\ --\x6d\xd2\xa9\x8b\x99\x25\x00\x8a\xd7\xe6\xeb\xb1\x85\x25\x38\x3b\ --\xa6\x3c\xf9\xd9\x45\xf9\x88\x9a\x8c\x47\x9e\x0d\x8d\x04\x31\xdf\ --\x94\x43\x47\xfb\x3e\x8a\x0a\x6d\x74\xf5\xfc\xa8\x93\xd7\xda\x72\ --\x39\xb0\x7f\x2f\xaa\x6a\xe0\xf5\x8e\x4f\xb8\x9a\x9c\xc3\x5c\x58\ --\x86\xb7\xee\x7e\x66\x2d\xe6\x37\xd4\x68\x7c\xe6\x01\x80\x6a\xb7\ --\x83\xa2\x42\x9b\x9e\x78\x47\xa5\x03\xcf\xed\x9b\x98\x9b\xbf\xc6\ --\xa7\x27\xfb\x18\x0a\x8d\xae\x92\x10\x61\x32\x1e\xe3\xe9\x67\x5a\ --\x5d\xea\x5c\xd6\x58\x00\x60\x50\x14\x1d\x6e\xd9\xf3\x20\x45\x85\ --\x36\x3e\xfc\xe2\x3b\x7a\x4e\xff\x8a\xd5\x62\x66\x7f\x73\x23\x3b\ --\xee\xae\xe1\xec\xc8\x55\x3a\xde\xeb\x64\x34\x12\x24\x36\xf5\xb7\ --\x49\xdd\xee\x2a\x48\x77\x82\x3a\x70\x29\xcc\xd7\x3f\xff\x81\x31\ --\x77\x1d\x61\x7f\x84\xde\xde\x5e\xe6\xaf\x2d\xf0\x50\x83\x97\x96\ --\x27\x76\x31\x95\x48\x52\x90\x9f\x47\x83\x27\x8f\xaf\x1c\x15\x84\ --\x02\x7e\x92\xff\x24\x50\x37\xde\x6c\x1f\xad\xdd\x5c\xe1\xee\xbf\ --\x14\xe2\xd0\xe1\x23\xfa\x14\xeb\x4b\xcb\x69\x6d\x6d\x62\x4b\xb9\ --\x99\xf6\x77\x8e\x61\xb1\xe4\xd0\xd1\xde\x82\xd9\x08\x6b\x72\xb2\ --\x00\x6c\xb0\xa4\x13\xaa\x94\xf4\xbd\xfd\x4a\xb3\xfb\xd0\xf1\x53\ --\x0c\x87\xc7\xb1\x58\xad\xdc\xe6\xaa\x46\xd3\xb2\x84\x26\x66\x99\ --\xf8\x6b\x82\xdf\x03\x51\x7d\x8d\x57\x12\xd3\xf8\x83\x51\x00\x9c\ --\xe5\x6b\xba\x55\x55\x55\x7c\x56\x8b\xf9\xc5\xa6\xc6\xdd\x86\x50\ --\xe2\xfa\x61\xf6\x75\x7f\xc9\xe0\x85\x33\xec\xdc\xbd\x87\xf9\xff\ --\x8e\x75\x2a\xb5\xc4\xb9\xdf\x82\xbc\x7f\xfc\x5b\x16\x16\x33\x6c\ --\xab\xae\x94\x9b\x9d\x8e\x83\x4a\xb5\x5d\x5c\x16\xd0\xe9\x5c\x27\ --\x31\xab\xd7\xc7\x9f\x49\x4d\x03\x60\x34\x1a\x75\x49\xd1\x48\x98\ --\xb6\xb7\x3a\x89\x8e\xc5\x71\x57\x94\xf3\xd2\xbe\x26\x9f\xa7\x44\ --\x0c\xa9\x00\xa6\xa4\xd2\x26\x6d\xb2\xd2\x5b\xa6\xdd\x3b\x10\x53\ --\xc8\xcd\xb3\xf1\xf0\xe3\xcd\x38\xdd\x35\xfc\x19\x0e\x50\x7a\x4b\ --\x05\xc5\x36\x13\xa5\xc5\x36\xbc\x35\x2e\xee\xaa\x75\x7f\x2f\xae\ --\x18\x5e\xd0\x7f\x01\xc0\xef\x97\xa6\xb4\x4d\x3b\x38\x9e\x12\xcf\ --\xf7\x8f\xa3\x20\x74\x88\x7c\x33\x6c\x2f\xd7\x50\x0d\x64\x81\x0f\ --\xb4\xb8\xf2\xf2\xd6\xad\x62\xe9\x86\x02\x2b\x76\x32\x20\xeb\xa7\ --\x92\xbc\x3b\x93\xa6\x2a\xb3\x4c\x4e\xae\x09\xad\x6e\xa3\x36\x2c\ --\x14\x7a\x11\xca\xc7\x9e\x12\x31\xb4\x9a\xff\x2f\xc7\xd3\x35\x8d\ --\xdf\xe8\x52\x39\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\ --\ --\x00\x00\x0c\x01\ --\x89\ --\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ --\x00\x00\x30\x00\x00\x00\x30\x08\x06\x00\x00\x00\x57\x02\xf9\x87\ --\x00\x00\x00\x04\x73\x42\x49\x54\x08\x08\x08\x08\x7c\x08\x64\x88\ --\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0d\xd7\x00\x00\x0d\xd7\ --\x01\x42\x28\x9b\x78\x00\x00\x00\x19\x74\x45\x58\x74\x53\x6f\x66\ --\x74\x77\x61\x72\x65\x00\x77\x77\x77\x2e\x69\x6e\x6b\x73\x63\x61\ --\x70\x65\x2e\x6f\x72\x67\x9b\xee\x3c\x1a\x00\x00\x0b\x7e\x49\x44\ --\x41\x54\x68\x81\xb5\x9a\x79\x70\xd5\x55\x96\xc7\x3f\xe7\xf7\x7e\ --\x2f\xfb\x1e\x08\x21\x0b\x90\x8d\x80\x49\x34\x31\x09\x8b\x10\xe8\ --\xb8\x01\x5a\xb6\xb4\xd6\xa8\x88\x38\x8e\xd8\x3d\x88\xe5\x14\xf6\ --\xbe\x59\xd3\xce\x54\x69\x6b\xd3\x5a\x25\x53\xad\xe8\xb4\x82\x2c\ --\xda\x2d\x22\x4d\xf7\x40\x43\x77\xc9\xe2\x02\x91\x10\x76\x12\x48\ --\x08\x31\xfb\x9e\x97\x3d\x6f\xfb\xdd\xf9\xe3\x25\x21\x21\xbf\x97\ --\x0d\xfc\xfe\x45\xce\x3d\xf7\x9c\xef\xb9\xef\xfe\xce\xbd\xe7\x5c\ --\x84\x9b\x80\xf7\x2f\xa8\x4c\x7a\x8c\x67\x7a\x5d\xb2\xd8\xee\x96\ --\x38\xbb\x93\x10\x97\x81\xee\x34\x10\x01\x74\x0d\x35\x27\x4a\x35\ --\x25\x44\x70\x5a\x50\x25\xa0\x8e\xbb\xac\x96\x43\xf3\xa2\xa4\xfe\ --\x46\x7d\xcb\x64\x27\x6e\x3d\xad\x66\xf7\xd9\xd5\xab\x9d\x76\xb9\ --\xa7\xb3\x8f\x40\x35\x8a\xae\x06\xa4\x46\x29\x52\xa7\x5e\xa7\xa5\ --\xd4\x09\x44\xb6\x39\x95\xb6\x73\x7e\x9c\xb4\x4c\x86\xc7\x84\x03\ --\xd8\x5a\xa4\x16\x76\xf4\xa9\x77\x5a\xba\x25\xdd\x30\x61\x1d\xe2\ --\x07\x53\x03\x15\xb6\x5e\x21\x22\x40\x11\xee\x0f\x15\x6d\x70\xdb\ --\x74\x45\xa0\x8f\x57\xb3\xdd\xa2\x78\x57\x94\xb6\x31\x33\x5e\x6a\ --\xbe\x95\x00\xfe\xfc\x95\xf2\x6f\xd6\xd4\x9e\xc6\x4e\xb9\xd7\x8c\ --\xf8\x00\x74\x0d\xe6\xcf\x50\x04\xfb\x2a\x7c\x75\x38\x51\x25\xd4\ --\x76\x08\xa1\x7e\x90\x9f\x64\x8c\xe5\xa6\x47\xc1\xef\x42\x7a\xb4\ --\x57\x52\x52\xc4\x7e\xd3\x02\xd8\x71\x5a\x2d\x33\x0c\xb5\xa5\xd2\ --\x26\xd1\x76\xd7\xe8\xba\xba\x06\x77\x26\x1b\xf4\x38\x60\x4a\xa0\ --\x47\x66\x77\x41\x6b\x8f\x30\x3d\x64\xb4\x8d\x36\x0c\xa7\x35\xa5\ --\x3d\x9a\x19\x27\x97\xc7\x52\xd4\xc6\x52\xf8\xf8\xbc\xfb\xa7\xfe\ --\x16\xe3\x2f\x55\x36\x89\xbe\x33\xc9\x20\x3e\xd4\x9c\x44\x90\x0f\ --\x4c\x0f\xf1\xac\x7a\x79\x8b\x60\x1d\x62\xd9\x57\x67\x04\x79\x97\ --\xdb\x3d\x9a\xdb\x4c\xb7\x18\x85\x27\x6b\x5d\xdf\xbb\xa1\x00\xde\ --\x39\xae\x3e\xf0\xd5\xe4\xe5\x8b\x8d\x9a\xaf\xdd\x05\xa7\x6a\x85\ --\xea\x0e\x61\x5a\x90\xf2\xa4\x17\xc0\xde\xdd\xc1\x14\xe7\x15\xc2\ --\x7a\x4b\xe8\xad\x3d\x4f\x40\xe7\x05\x1c\xcd\x97\x69\x69\xaa\xc3\ --\xe1\x74\x9a\xda\x3d\x76\xaa\x98\xb5\x3f\x7d\x7d\x54\x62\x02\xc1\ --\xa2\xe4\xe3\xa2\x6a\xf7\xba\xd1\xf4\x74\x6f\x03\x7f\x3c\xa1\xb6\ --\x56\xb6\xb1\xa6\xa9\x47\x70\xb8\x21\x22\x00\x3a\xfa\x14\x15\x65\ --\x97\x39\x7a\xb5\x94\xaa\xab\xa5\x34\x35\xd4\xe0\xf4\x42\x12\xe0\ --\xd7\xcf\xaf\x66\xf9\xd2\x9c\xc1\xbf\x6b\x1b\x5a\x78\x73\xcb\xa7\ --\x7c\x71\xe2\x02\x7e\xbe\xde\xbf\xe8\x21\xb0\x20\xbc\x55\x54\xe3\ --\xb6\xde\x1e\x6b\xd9\x34\xee\x00\xde\x3f\xe1\x7e\xad\xc2\xc6\x93\ --\x0a\xcf\xfe\x75\x3a\xec\xfc\xe3\xf8\x71\x4e\x1e\x3b\x4c\x87\xad\ --\x75\x3c\x8e\x87\xc1\xee\x70\xb2\x6b\xdf\x51\xb6\xec\x3a\x48\x6f\ --\x9f\x63\xc2\xf3\x81\x37\x0e\x95\xba\xda\xf2\x53\xf4\xed\xd7\x0f\ --\x8c\x08\x60\xfb\xd7\xea\xae\xf2\x76\x7e\xac\xfa\xb7\xec\xb9\x93\ --\xc7\x38\x7c\xf0\x2f\xd8\xfb\x7a\x27\xe3\x98\x2b\xdf\xd4\xf2\x8b\ --\xd7\xde\xa3\xb6\x61\x52\x69\x7e\x00\x96\x0e\xa7\xf6\xee\xce\x0b\ --\xaa\xf6\xf1\x34\xf9\x6c\xe8\xc0\xb0\x6f\xe0\xaf\x85\x2a\xa0\xa1\ --\x4f\xed\x75\x19\x88\xdb\xed\xe2\xff\x3e\xd9\xc6\x81\xbd\x1f\x4d\ --\x9a\x3c\x40\x69\x45\xed\x8d\x92\x07\x20\x3e\x54\xf9\xa5\x84\x1a\ --\xbf\xff\xe0\x80\x0a\x1c\x2a\x1f\x16\x40\x9d\x9b\xdd\xed\x7d\x12\ --\xa0\x94\xc1\xbe\x4f\xb6\x51\x7c\xb6\xf0\x86\x1d\xdf\x2c\x28\x05\ --\x65\xcd\x92\xe9\x08\x57\x3b\x87\xca\x07\x03\xf8\xe8\x8c\x4a\x6f\ --\xec\xe2\x5e\x80\x63\x87\x0f\x72\xe9\xc2\xe9\x51\x0d\x66\xa5\x25\ --\xf3\x83\x55\xf7\xf3\x9b\x17\x9e\xc4\x47\xf7\x9a\x0b\x6e\x1a\x8e\ --\x55\x0a\xc5\x8d\x42\x7d\xa7\x3c\xb0\xfb\xa4\x9a\x3b\x20\x1f\xf4\ --\x6c\xeb\x51\x5b\x1d\x6e\x91\x8e\xd6\x06\x0a\x3e\x3f\xe8\xd5\xd0\ --\xec\xc4\x38\x7e\xbe\xee\x51\x66\x27\xc6\x0d\xca\x7e\xfb\x87\x8f\ --\x60\x8c\x03\xee\x46\xd0\xde\x07\x8d\x5d\x9e\xbc\xed\x70\x23\x0d\ --\x0e\xb5\x1d\xc8\x86\xfe\x5f\xa0\xa0\x5a\x45\xde\x12\xcd\xdc\xac\ --\x18\x45\x59\xe1\xdf\x71\x7b\x39\x64\xf2\x72\xd3\xd9\xfc\xf2\x86\ --\x61\xe4\xbf\x6d\x38\x0d\x28\x6e\x18\x7e\x61\x68\xee\x91\xac\x3f\ --\x5f\x50\x33\xa0\xff\x17\xb0\x6a\xc6\x6a\xab\x0f\xfe\xe2\xea\xe5\ --\xf3\x82\x33\xa6\x86\x66\x27\xc6\xf1\xd2\x8f\xfe\x15\xab\x6e\xb9\ --\x29\xc4\xe6\x26\xc7\x0f\x27\xd5\xd6\x4e\x6d\x43\x0b\xad\xb6\x2e\ --\x34\x11\x66\xc6\x46\x11\x18\x1e\xc5\xd7\x55\x16\x1c\xd7\xad\xa7\ --\xd3\x8d\x74\x76\x1b\x2f\x03\x4f\x78\xb6\x90\x52\x6b\x40\xf8\xaa\ --\xa8\x18\xa7\x6b\xe4\xea\x8b\x08\x2f\xac\x7d\xe8\xa6\xec\xf5\x88\ --\xf0\x10\xd6\x3f\xf1\x00\xcb\x96\x64\x53\xd7\xd8\xca\xa7\x07\xbe\ --\xe4\xf3\xaf\xcf\x51\x55\xd7\x34\x42\x37\x34\x2c\x82\xec\x3b\xbe\ --\x43\x66\x6e\x1e\x9a\x36\xfc\xd2\x60\xeb\x93\x07\x01\xf4\xc2\x0a\ --\x35\x1d\x8c\x6c\x80\xe2\xb2\x4a\x53\xa7\x73\x92\xe2\xc9\x48\x4d\ --\xb8\x21\xe2\x16\x8b\xc6\xc3\x2b\xf2\x58\xfb\xc8\x32\x00\x36\x6d\ --\xd9\xc3\xee\xbf\x7f\x39\xea\x9d\xa8\xdd\xd6\xca\x67\xfb\x76\x53\ --\x56\x72\x9e\x95\x8f\xad\xc5\xc7\xd7\x6f\x70\xac\xa3\x4f\x82\x76\ --\x9d\x55\x73\x74\x8b\x8f\x3b\x5f\x29\xcf\xcd\xa6\xb4\xa2\xd6\xd4\ --\x50\x5e\x6e\xc6\x0d\x91\xcf\x4a\x4b\xe2\x85\xb5\x0f\x93\x10\x1f\ --\xcd\xfe\xc3\x27\x78\x7b\xc7\xdf\x68\xb5\x75\x8e\x7b\x7e\x65\xf9\ --\x65\xf6\xef\xde\xce\x83\x8f\xad\x65\xe0\x12\xa6\x80\x1e\xa7\xf1\ --\x6f\xba\x52\x32\x1f\xa0\xca\x26\x54\x37\xf5\x98\x1a\x48\x4e\x88\ --\x99\x34\xf9\xbc\xdc\x34\x96\x2f\xcd\xe1\x72\x79\x35\xcf\xfe\xea\ --\x4d\xce\x5f\xae\x98\x94\x9d\xd2\x92\x73\x5c\x2a\x3e\x43\xea\x2d\ --\x99\x83\xb2\x5e\x97\xe4\xeb\x55\x36\xc9\xeb\xe8\x83\x8a\x36\xc1\ --\xe9\xe8\x33\x9d\x1c\x19\x1a\x3c\x61\x87\x33\x62\xa7\x91\x9a\x18\ --\x87\xdb\x50\x6c\x7c\xe7\x63\xf6\xfe\xf3\x38\x86\x31\x66\x41\x33\ --\x2a\x0a\x8e\xfe\x63\x58\x00\xdd\x0e\x49\xd0\x4b\x9a\x24\xbd\xbb\ --\xff\x7e\xe5\x6b\x35\xbf\x5d\xfb\xfb\xfb\x8e\xdb\x89\xbf\xbf\x2f\ --\x4f\xff\xcb\x32\x1e\x5e\xb1\x98\xfd\x87\x4e\xb0\xf9\xc3\x7d\x74\ --\x74\x76\x7b\xd5\xcf\xce\x48\x61\xd9\x92\x1c\x66\x27\xc6\x22\x08\ --\x27\xcf\x95\xf2\xfe\xae\x83\x74\x76\x8d\xdc\x0d\x8d\x75\xd5\xb4\ --\xb5\x36\x13\x1e\x31\x05\x00\xb7\x41\xb0\x9e\x13\xaf\x7a\x8e\x55\ --\x48\xa8\xc3\x0d\x4a\x33\xbf\xe2\xda\xda\xbb\x98\x11\x13\x35\x2a\ --\x71\x11\xe1\xde\x25\xd9\xac\x5f\xf3\x00\xf5\x4d\xad\x3c\xfb\xeb\ --\x4d\x5c\xba\x52\xe5\x55\x3f\x69\x66\x0c\x1b\x9e\xfe\x1e\x59\x69\ --\xc9\x23\xe4\xfe\x53\x66\xb1\xf1\x8d\x4d\xa6\xe7\xd1\x37\x57\x4a\ --\x08\x8f\x58\x0c\x80\xcb\xad\xac\x7a\xb8\x9f\xf2\xbf\x2b\x59\x51\ --\xdf\x25\x7c\x1a\x18\x40\xa3\x89\xb3\x86\x16\xdb\xa8\xe4\x67\x27\ --\xc4\xb1\xee\x89\xfb\x89\x9f\x3e\x95\xb7\xb6\xff\x8d\xfd\x87\x4f\ --\xa0\x94\x97\xca\x2d\xc0\x9f\x67\x1e\x5b\xc1\xca\x65\x77\xa0\x5b\ --\xcc\xcf\x94\x94\xc4\x59\x24\xa5\xa6\x73\xf9\xe2\xc8\x33\xa9\xb9\ --\xb1\x6e\xf0\xdf\x0e\x43\x3c\xc9\xd5\x57\x87\x99\x61\x8a\xf4\xc4\ --\xa9\xa6\x06\x8f\x1e\x3f\x8b\xdd\x05\x15\xad\xc2\x85\x7a\xe1\x62\ --\x83\xd0\x37\xe4\xea\xf0\xe6\x4b\xeb\xb9\x5c\x5e\xc3\xaa\xe7\x5f\ --\x61\xdf\xa1\xaf\x4d\xc9\x8b\x08\xf7\xe5\xcf\xe3\xc3\x4d\xbf\x60\ --\x76\x62\x2c\xff\xf1\x9f\x7f\xf0\xba\x20\x33\xc3\x15\xe9\xe9\xb7\ --\x9a\x8e\xb5\x36\x0f\x5f\x62\x1d\xe8\x02\x22\x00\x12\x67\x4c\x37\ --\x9d\xf4\x45\xe1\x79\x76\x1c\xa9\x24\x22\x7a\x16\xfe\x3a\xf4\xba\ --\xe0\x4a\x8b\xe0\x6f\x85\x8a\xab\x65\xec\xff\xeb\x27\x34\xd4\x99\ --\xa7\x60\x80\xd4\xa4\x78\x7e\xf8\xcc\x43\x44\x4f\x8d\xe0\x7f\x3e\ --\xd8\xcb\xc1\xa3\x27\xf1\xf5\xb1\x7a\xd5\xf7\xb7\xc2\xd2\xb4\x30\ --\x76\x9b\x8c\xd9\x7b\xaf\x7d\x1b\x3e\x9a\x32\x74\x84\x36\x94\x27\ --\x80\x79\x99\xa9\xa6\x06\x9d\x2e\x37\x3b\xb7\x6c\x66\xc1\x92\x7b\ --\x99\x91\x90\x82\x52\x8a\xc6\xba\x6a\x2e\x9e\x2d\xa4\xaa\xa2\xcc\ --\x2b\x91\x90\xe0\x40\xfe\x7d\xd5\x7d\xac\xc8\xcf\xe5\x93\xfd\x5f\ --\xb0\xe1\xbf\xde\xa6\xb7\x77\x5c\xdd\x12\xa6\x86\x07\x99\x73\x71\ --\x5e\xab\xe8\x74\x8b\x38\x75\xa5\xe4\x8a\xa0\x92\x00\xe2\xa7\x4f\ --\x25\x65\x56\x2c\xa5\x15\x23\x7b\x4b\x7d\xbd\x3d\x1c\x3e\xb0\x67\ --\x5c\xce\x35\x4d\xe3\xfe\xbb\x16\xf0\xec\xea\xfb\x69\x69\xeb\xe0\ --\xa9\x1f\xff\x9e\xca\x9a\x86\x71\xcd\x1d\x40\x4f\xaf\x79\x4a\x37\ --\xfa\x3f\x6c\x4d\x20\xc2\x9f\x1a\xcd\xd3\xab\xbc\x86\x35\x0f\xdf\ --\x33\x21\x47\xd7\x23\x26\x7e\x16\xab\x7f\xf0\x23\xd2\x96\x3c\x4a\ --\x7d\xa7\xc6\xa5\xf2\xea\x09\x93\x07\x68\xb5\x75\x99\xca\x23\x43\ --\xfc\xb9\x63\xa6\x62\x79\xaa\xc1\xed\x31\xc6\x5e\x0d\xd4\xf1\xa1\ --\x0a\xf9\x0b\x6e\x25\x2f\x37\x7d\xc2\x0e\x03\x82\x82\x59\xb1\xf2\ --\x71\x1e\x5f\xbb\x01\x8b\xc5\xc2\x8e\xf7\x36\xb1\xe7\xc8\x05\x26\ --\x7b\x76\x95\x56\x54\x9b\x07\x10\x16\x48\x54\x90\xc2\xc7\x02\x06\ --\xea\x98\x6e\xd5\x2d\x9f\x39\x5d\x86\xa2\xbf\x4b\x27\x22\xbc\xf8\ --\xfc\x6a\x7e\xfe\xda\x7b\x14\x9d\x2f\x1d\xd3\x91\x66\xb1\x90\x95\ --\xbb\x98\x45\xf9\x2b\x00\x38\x74\x60\x0f\xa7\x0a\x8e\x62\x18\x06\ --\x19\x99\x0b\x68\x99\x64\x39\x7d\xa4\xe0\x9c\xa9\x7c\x48\xa2\x51\ --\x3e\x56\xcb\x11\x3d\x63\x9a\x34\x14\x55\xbb\x0a\x11\xc9\x1d\x18\ --\x09\x08\xf0\xe3\x8d\x17\xd7\xf1\xda\xce\xaf\xf8\xe2\xe8\x61\xda\ --\xdb\x46\x16\xe5\x11\x53\xa6\x91\x3c\x27\x83\xcc\xdc\x45\x84\x84\ --\x86\x73\xf1\x4c\x21\x47\xfe\xb9\x97\xee\xce\x8e\x61\x7a\xd5\xed\ --\x13\x6f\x80\x9f\xbe\x78\x85\xd2\xab\xe6\x3d\xde\x5b\x52\x66\x0e\ --\xf0\x2f\xc8\x98\x26\x0d\x9e\x0b\xbe\xc8\x36\x20\x77\xa8\xa2\xc5\ --\xa2\xb1\x68\xf1\x12\xe6\x66\xe5\xd1\xd6\xda\x44\x6b\x4b\x13\x86\ --\xdb\x4d\x60\x70\x08\x61\x61\x91\x04\x04\x5d\xbb\x1f\xfd\x69\xcb\ --\x26\xaa\xae\x9a\x67\x23\x35\xc1\x2d\x64\x77\x38\x79\xfd\x7f\x77\ --\x9b\x9e\x25\x3e\x56\x2b\x0b\xb2\x3c\xe5\xb0\x20\xdb\xa0\xbf\x22\ --\x73\x2a\x6d\xa7\x55\x8c\x57\x80\xc1\x96\x85\xd3\x80\x2e\x3b\x20\ --\x42\x78\x64\x14\xe1\x91\xde\xaf\x12\xf5\xd5\xe6\x75\xc4\x68\x70\ --\x1b\xd0\xda\xe3\xe9\xf8\x0d\xc0\xe1\x72\xf1\xe2\xc6\x2d\x94\x57\ --\x9a\x9f\x29\x77\x2d\xca\x24\xc0\x73\x2f\xeb\x76\x28\xed\x4f\xd0\ --\x5f\x13\xcf\x8f\x93\x16\x51\xbc\x3b\x54\x59\x17\xcf\x09\xfd\x6d\ --\xe2\xe8\x55\x8d\x2f\x2b\x3c\x5b\xec\x62\xd9\x37\x7c\xff\x67\x6f\ --\xf0\x55\xd1\x45\x53\x5d\xab\x6e\x61\xcd\x43\x77\x7b\xfe\x10\xde\ --\x1e\x78\x10\x19\xa4\x28\x4a\xdb\xa8\xc4\xf8\x3e\xfd\xbf\x82\x08\ --\x2c\x9a\x65\xf0\x59\x99\x36\xa2\x26\xbd\x19\x30\x0c\x83\xe2\xb3\ --\x85\x14\xd8\x5a\xd8\x51\x53\xc2\xd9\x92\xf2\x51\xf5\x9f\x7e\x64\ --\x39\x33\x62\xa2\x50\xd0\xe9\xd6\xb5\x8d\x03\xf2\xc1\x00\x32\xe3\ --\xa5\xa6\xa8\xc6\xfd\xdf\xc0\x6f\x07\x64\x7e\x3a\xcc\x8d\x52\x9c\ --\xa9\x9b\xf4\x4b\x94\x57\x0c\x74\xfe\xc6\x83\xa5\x0b\x6e\x65\xf5\ --\xca\x3b\x01\x10\xc5\x4b\x43\xdf\xd6\x86\x15\x00\x46\x9d\xf6\xba\ --\x82\x53\x43\x65\xb3\xc2\x15\xc1\xe3\x2f\x07\x6e\x3a\xee\xcb\x9f\ --\xc7\x6f\x36\x3c\x39\x50\xd4\x17\x19\xf5\xda\x9b\x43\xc7\x87\x05\ --\x90\x93\x23\x4e\x0c\xed\x11\x60\x30\x17\x8a\x40\x56\xcc\xc4\x4f\ --\xa3\xd0\xf0\x48\xa6\x46\xc7\x4e\x8e\x35\x10\x12\x14\xc0\x2f\x9f\ --\x5b\xc5\x2f\x9f\x5b\x35\xd0\xca\xe9\xb2\xa0\x3d\x9e\x93\x23\xc3\ --\xfa\xf9\x23\x3e\xd3\xec\x78\x29\x3b\x59\xeb\x7a\x4a\x94\x7c\x0c\ --\x58\xc0\x93\x29\xe2\x42\xd5\xb8\x72\xba\x6e\xb5\x72\xfb\xfc\xa5\ --\x2c\x5c\xba\x0c\xab\x8f\x0f\x4d\xf5\x13\x7a\xb3\x23\x66\x5a\x24\ --\x0f\xde\xb3\x90\xef\xde\xb3\x90\xe0\xc0\xc1\x14\xe5\x06\xb5\xfa\ --\xb6\x58\xb9\x34\xc2\x9f\x99\x91\xec\x18\xfd\xd3\x93\xb5\xee\xf5\ --\xa2\xd8\x3c\x20\xcb\x89\x53\xc4\x86\xc0\xa5\x66\xc1\xe6\xe5\x74\ --\x4d\x9e\x93\x4e\xfe\xf2\x87\x08\x0d\x8f\x1c\x37\x61\x7f\x3f\x1f\ --\x92\x67\xc6\x92\x9d\x91\x42\x76\x46\x0a\xb7\xcd\x4d\xbc\xbe\x07\ --\xa4\x44\xd4\xba\xac\x18\x7d\xaf\xd9\xfc\x51\x97\xf4\x54\xb5\xeb\ --\x29\x25\xf2\x2e\x43\x02\x55\xca\xf3\xd4\x54\x69\xbb\x36\x75\xeb\ --\x5b\xaf\x92\x77\xf7\x03\x24\xa6\xdc\x32\xc2\x86\xcb\xe5\xc4\xd6\ --\xda\x4c\x6f\x4f\x37\x2e\xa7\x03\x43\x29\x74\x8b\x4e\x4c\xa4\x1f\ --\x77\xa7\x87\x11\x3e\x7a\xc3\xc0\xad\x14\xcf\x65\xc7\x59\x36\x7b\ --\x53\x18\x73\x4f\x9c\xaa\x75\xad\x34\x94\x7c\x20\x30\xe8\xa9\xbd\ --\x17\x0e\x95\x5f\x5b\x25\xc3\xed\x46\xf3\x52\x1e\x7a\x43\x5a\xb4\ --\x22\x25\x72\xd4\x57\xcb\x0e\x50\x6b\x6e\x8f\x35\x5f\xf9\x01\x8c\ --\xf9\x4a\x99\x15\xa3\xef\xd1\x0c\x2d\x7b\x68\x76\xf2\xbf\xae\xf6\ --\x9f\x28\x79\x1f\x0b\x24\x84\x8d\x4a\xbe\x48\x19\x5a\xf6\x58\xe4\ --\x61\x1c\x01\x00\x64\xc5\x4b\x69\x47\x8c\x36\x4f\x84\x0d\x0a\x3a\ --\x2d\xe3\x9a\x35\x12\x91\x81\x90\x1d\xa7\xf8\x4e\x92\x81\x97\x1e\ --\x71\x8f\x82\x97\x7c\x6d\xda\xc2\xec\x78\xf1\x5e\xea\x0d\xc1\x84\ --\x4f\xa8\xc2\x0a\x35\xdd\xe2\x63\xfc\x64\x5f\xb1\xb6\xc1\xee\x1e\ --\xff\xfc\xb4\x69\x8a\x94\x29\x5e\x57\xbd\x1b\x61\xb3\x4b\xd7\x7e\ --\x37\xd1\xff\x00\x32\xe9\x23\xf6\xc3\x53\x6a\x56\x97\xd3\x78\xb5\ --\xa3\x4f\xee\xeb\xb0\x4b\x90\x97\x2e\xca\x20\x16\x27\x18\x4c\x09\ --\x18\x26\x52\xa0\x0a\x14\xb2\xdd\xcf\xd0\x3e\x4c\x8b\x97\x89\x3f\ --\x7f\x72\x03\x01\x0c\xc5\xae\xb3\x6a\x4e\xbb\xdd\x58\xef\x72\x69\ --\x77\xf4\x38\xd5\x4c\xbb\x21\x21\x2e\xb7\xb2\xba\x0c\x11\x05\x58\ --\x35\x8c\xc5\x09\xc6\x37\x21\xbe\x72\x49\x94\x2a\x31\x44\x1d\xd7\ --\x2d\x96\x43\xb7\x45\x8b\x59\x1b\x6a\x42\xf8\x7f\xd2\xb5\x8d\x07\ --\x16\x9e\x74\x46\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\ --\ --\x00\x00\x19\xd5\ --\x89\ --\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ --\x00\x00\x60\x00\x00\x00\x60\x08\x06\x00\x00\x00\xe2\x98\x77\x38\ --\x00\x00\x00\x04\x73\x42\x49\x54\x08\x08\x08\x08\x7c\x08\x64\x88\ --\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x02\x0b\x00\x00\x02\x0b\ --\x01\xf7\x4d\xfa\xeb\x00\x00\x00\x19\x74\x45\x58\x74\x53\x6f\x66\ --\x74\x77\x61\x72\x65\x00\x77\x77\x77\x2e\x69\x6e\x6b\x73\x63\x61\ --\x70\x65\x2e\x6f\x72\x67\x9b\xee\x3c\x1a\x00\x00\x19\x52\x49\x44\ --\x41\x54\x78\x9c\xe5\x9d\x79\x60\x95\xd5\x9d\xf7\x3f\xe7\x79\xee\ --\xbd\xd9\x57\x12\x02\xd9\x48\x08\x10\x20\xec\x84\x4d\x50\x36\x17\ --\x16\x99\x22\x52\xec\x54\x5b\x44\x5c\xea\x54\xa7\xd5\xa9\xd3\xce\ --\x74\x3a\xb5\x9d\xb7\x7d\x6b\x3b\x6f\xa5\x76\x46\xe5\xd5\xb8\x80\ --\x5a\x14\x45\x05\x51\x51\x16\x95\x45\xd6\x40\xd8\x24\x21\x10\x42\ --\xc8\x4a\xf6\xe5\xee\xf7\x39\xf3\xc7\x85\x90\xe5\xde\x9b\xfb\xe4\ --\xde\x04\x3a\xfd\xfe\x95\x9c\xe7\x9c\xdf\x39\xf7\xfc\xce\xf2\x3b\ --\xbf\xe5\x1c\xc1\x0d\x8a\x37\xf6\xcb\x54\x87\x91\x85\x4e\x8d\x5c\ --\x97\x53\xe6\x38\x34\x91\x6e\x77\xc9\x38\xa7\x26\x8c\x2e\x0d\x55\ --\x93\xa8\x0e\x0d\xa1\x00\xaa\x82\x34\x28\x38\x85\x82\x2b\x33\x4e\ --\x56\x0c\x4b\xe0\x88\x40\x16\x69\xc8\x33\x8a\x50\x0b\x5d\x66\x8a\ --\x72\xb3\x44\xd3\xf5\xfe\x4d\x9e\x20\xae\x77\x03\xae\xe2\x85\xaf\ --\x65\x86\x41\xe5\x01\xbb\x4b\x2e\x32\xdb\xc5\xa8\x56\x3b\xe1\x52\ --\xea\xa7\xa3\x0a\x98\x95\xa9\x11\x17\xd6\x39\x5d\x48\xce\x03\xdb\ --\x41\x6e\x57\x5d\xea\xf6\x71\x43\x44\x43\x50\x1a\x1e\x20\xae\x2b\ --\x03\x5e\xde\x27\x87\x49\x83\xf6\x74\xab\x4d\x2c\x6e\xb4\x8a\xd8\ --\xde\x74\xb8\x27\xcc\xca\x90\x24\x44\xf8\x24\xe6\x02\xb9\x57\x08\ --\xde\xc0\xa6\x6e\x9c\x98\x29\x1a\x83\x53\xb3\x7e\xf4\x3b\x03\x5e\ --\xdd\x25\x43\x0d\xd1\x3c\xd9\x68\x95\x8f\xd4\x9a\x45\x7a\xb0\x3a\ --\x3d\xcc\x00\x36\x27\x24\x44\x4a\x6e\x1a\xa2\x8b\xa8\x55\xc0\x66\ --\x34\xf9\xfa\x84\x54\xf5\x53\x21\x84\x16\x9c\x16\xf9\x87\x7e\x63\ --\xc0\x33\x7b\x64\x54\x84\xca\x1f\x9b\x2c\x72\xa5\xcd\x29\x8c\xc1\ --\xa2\x1b\x61\x82\x11\x89\x92\xc4\x70\xc9\xbe\x52\x85\xf1\xc9\x92\ --\x44\xdf\xa3\xdf\x17\x4e\x21\xe5\xef\x9b\x52\xd4\xb7\xe6\x0a\xe1\ --\x0c\x56\x1b\x7d\xa1\xcf\x19\xf0\xcc\x19\x19\x15\xd5\x28\xd7\xd5\ --\xb7\x89\x25\x76\x17\xaa\xde\xf2\x06\x15\x26\x25\x4b\xe2\xc3\x25\ --\x56\x27\x14\x54\x28\x4c\x4c\xd1\x08\x35\xb8\xbf\x1b\x55\x68\xb1\ --\xc2\xbe\x52\x05\x4d\xc2\x94\x34\x49\x5c\x98\xc4\xa0\x04\xd4\xec\ --\x62\x90\xbf\x6b\x4a\x56\x5f\xef\x6b\x46\xf4\x29\x03\x9e\x3f\x20\ --\x9f\x6a\x32\xf3\x1f\x16\x07\x21\xbd\xa5\x61\x50\x20\x3a\x14\x4c\ --\xaa\x64\x5a\x9a\xa4\xc5\x0e\x8a\x80\x48\x93\xfb\x7b\x8b\x0d\x76\ --\x97\x28\xd8\x5d\xd7\xca\xa4\x44\x4b\xa6\xa4\x05\x65\x6d\x2b\x10\ --\x28\x3f\x9c\x98\x22\xf6\x06\x83\x98\x27\xf4\x09\x03\xde\x29\x90\ --\x99\xa5\x8d\xf2\xcb\x16\x9b\x48\x0b\x16\xcd\x09\x83\x25\x19\xf1\ --\x9d\x3b\x55\x4a\xf8\xaa\x44\xa1\xc1\xd2\x39\x6f\x46\x9c\x64\x42\ --\x72\x90\x36\x17\x90\x48\xde\x50\x0d\xca\x4f\xc6\x0f\x12\x35\xc1\ --\x22\x7a\x15\x41\x67\xc0\xd1\x0a\xe7\xd2\x36\xbb\x78\xf5\xb3\x22\ --\x25\x36\x58\x34\x23\x4d\x70\xeb\x70\xdf\x7b\xa3\xc5\x09\x6d\x36\ --\x28\xa9\x77\xff\xa4\x20\xcd\x80\x8e\xa8\x13\xc8\xd5\x13\x53\x0c\ --\x1f\x06\x93\x68\xd0\x18\xf0\xcc\x19\x19\x15\xd9\x20\x77\x59\xec\ --\x4c\x6e\xb5\x0b\xa2\x42\x40\x93\xd0\x6a\x77\x8f\xd4\x40\xa0\x08\ --\x98\x31\x44\x62\x50\x24\x2e\x0d\x8e\x57\x2a\xcc\x1b\xd6\xaf\xc2\ --\xca\x55\x48\xe0\xcf\x21\x8d\xca\x53\x39\x39\xc2\x1e\x0c\x82\x41\ --\x61\xc0\xba\x7c\x39\x3b\xd2\x24\xf3\x92\x22\x65\xd6\xc9\x2a\x41\ --\x45\x8b\x60\xd1\x48\x0d\xa3\xe2\xee\xfc\x03\x17\x05\x55\xad\xfa\ --\xaa\x12\x40\xa8\x11\x2c\x8e\x6b\x69\x06\x15\x52\xa2\x24\x59\x03\ --\x24\xd1\xa1\xc1\x68\x79\x2f\x21\xe4\x41\x21\xd4\x7b\x26\x0e\x16\ --\x17\x02\x26\x15\x28\x81\xbc\x83\xf2\x21\x4d\xe3\xb9\x61\x89\x5a\ --\xe8\xbe\x52\x05\x9b\x13\x42\x0d\x70\xc7\x08\x8d\xea\x56\xc1\xe9\ --\x1a\x81\xd9\x0e\x4e\x3f\x07\x6c\x98\x11\x52\x63\x24\x99\x71\x92\ --\xb3\xb5\x82\xb2\x66\x41\x66\x9c\x24\x29\x4a\x12\x1f\x0e\x81\x09\ --\x37\x6e\x34\x34\xb5\x10\x17\x13\x15\x28\x99\x7a\xa4\x72\xe7\xa4\ --\x54\xf1\x75\x20\x44\x02\x62\xc0\x4b\x07\xe4\xd3\x8d\x56\xf9\x8b\ --\xb9\x59\x52\xd9\x7f\x51\x50\x73\x65\x94\x2b\x02\x26\xa7\x4a\x0a\ --\x2a\x04\x76\x97\x5b\x92\x19\x9d\x24\x31\xaa\x70\xb2\x4a\x60\xf3\ --\x20\xd8\x0d\x8c\x94\x64\x27\xba\x3b\xf9\x6a\xa3\x2e\xd4\x0b\x92\ --\xa2\x24\x61\x41\x3a\x35\x38\x5d\x2e\x36\x7d\xba\x97\x8d\x5b\xbf\ --\x64\xe3\xf3\xbf\x08\x06\xc9\x36\x29\xb4\xe5\x93\x93\x8d\x9f\xf6\ --\x96\x80\xa1\xb7\x05\x5f\x38\xe0\x7a\xfe\x52\x33\x8f\x4e\x4e\x81\ --\x26\x2b\x5c\x6e\xbb\xc6\x4b\x4d\x42\xe1\x65\xc1\xc0\x48\x49\x65\ --\xb3\xc0\xa9\xc1\xf1\xca\xee\xbc\x76\xd8\xed\x34\xd4\xd5\x80\xb5\ --\x11\x11\xd2\x44\xc9\x51\x33\xad\x66\x2b\x9a\x26\x69\x6d\xb3\x20\ --\x71\x6f\x1e\x61\x21\x26\x42\x42\x8c\x44\x84\x85\x12\x16\x16\xca\ --\xe0\x81\xf1\x0c\x49\x1e\x48\x72\xd2\x00\xbf\xdb\x7b\xf0\x58\x21\ --\x6b\x5e\xd9\xc4\xc5\x8a\x1a\xa2\xa3\x22\x7a\xfb\xb3\xbb\x22\x42\ --\x48\xe5\xc3\xfc\x72\xe7\xfd\x93\x52\x0c\x7f\xe9\x0d\x81\x5e\x31\ --\x60\xed\x7e\xd7\xda\x8a\x66\xe5\x61\x29\xa1\xbc\x19\xea\xda\x94\ --\xf6\x8d\x36\xdc\x04\xd3\xd2\x34\xea\xcc\x82\x0b\x0d\x02\xd7\x95\ --\x74\x87\xc3\x4e\x65\xd9\x05\x2a\x2e\x95\x50\x59\x56\xca\xe5\x9a\ --\x4a\x9a\x9b\x1a\x7a\xbd\x43\xe7\x8e\x1b\xc1\x9a\x7f\x7f\xb4\xc7\ --\x7c\x55\x97\xeb\x79\xee\xb5\x0f\xf8\xea\xc0\x89\x5e\xd5\xe3\x07\ --\x4c\x20\xde\xc8\x2f\x77\xca\x49\x29\x86\x0d\x7a\x0b\xeb\x66\xc0\ --\x0b\x07\xe4\x6f\x2a\x9a\x79\xf8\x6a\xbf\x55\x36\x77\x1e\xd9\x66\ --\x3b\xec\x3a\xe7\x5e\xa9\x2d\x6d\x6d\x14\x9e\x3a\xca\xf9\xa2\x53\ --\x5c\x2c\x39\x8b\xd3\xe9\xe8\x4a\xae\xcf\x60\x77\x38\xf8\xcb\xe6\ --\x5d\xac\xdf\xb4\x03\xab\x2d\x28\x02\x8b\x2f\x28\x08\xb1\xee\x48\ --\x85\xa3\x61\x72\xb2\x71\x9b\x9e\x82\xba\x18\xf0\xda\x21\xf9\xf0\ --\x85\x46\xfe\xb5\xa7\x41\x5b\x7a\xae\x90\xe3\x47\xf6\x51\x7c\xe6\ --\x04\x2e\x97\xcb\x77\xe6\x3e\xc0\xbe\xfc\xd3\xfc\x29\xef\x7d\xca\ --\xab\x6b\xfb\xaf\x52\x89\x51\xa0\x6c\xca\xbf\x24\x6f\xd5\xb3\x31\ --\xfb\xcd\x80\x75\x05\x72\x5e\x69\xad\x7c\x51\x93\xde\xf7\xed\x4b\ --\xa5\xe7\xd9\xbb\x73\x2b\x65\x17\x8a\xfd\x25\x1b\x54\x54\x54\xd7\ --\xf1\xe2\x1b\x5b\xd8\xf9\x75\xc1\x75\xa9\x1f\x08\x6f\x75\x68\x1f\ --\xad\x3f\x22\x97\x7e\x6f\xb2\xd8\xed\x4f\x01\xbf\x18\xb0\xf6\x73\ --\x19\x53\xd9\xc0\x16\x87\x4b\x78\xec\xfd\xc6\xfa\x5a\x3e\xdb\xf2\ --\x36\x17\xcf\x17\xe9\x69\x6c\xd0\x60\xb3\x3b\x78\xe3\xfd\x1d\xbc\ --\xf9\xc1\x4e\xec\x8e\xfe\x5b\xe6\x3c\x21\xdc\x48\x7c\xbd\x55\x6e\ --\xc9\xdb\x23\xd3\x56\xcf\x12\x2d\x3d\xe5\xf7\x8b\x01\xf6\x08\xf6\ --\xb5\xb5\x12\xde\xed\x83\x94\x1c\xda\xb7\x93\xbd\xbb\x3e\xc1\x79\ --\x1d\x7f\xf8\xd3\xcf\xae\x63\xf7\xa1\x93\xd7\xad\xfe\x8e\x50\x04\ --\x84\xa8\xc4\x28\x06\x36\x03\x73\x7b\xca\xdf\x23\x03\x5e\x3a\x20\ --\x7f\x5f\xd6\xc4\xe8\xae\xe9\x0e\xbb\x9d\x4f\xde\x7f\x83\xa2\xd3\ --\xd7\x6d\xba\xb7\xc3\xd2\xf7\x9b\xac\x2e\x4c\x4d\x93\x80\x9c\x7d\ --\xb4\xc2\xb9\x74\x62\xb2\xe1\x03\x5f\x79\x7d\x1e\x2c\x5f\xc9\x97\ --\xa3\xab\x5b\xf9\x49\xd7\xf4\xd6\x96\x26\xfe\x92\xb7\xe6\x86\xe8\ --\xfc\x1b\x18\xc2\xe1\x14\x79\xaf\xe4\xcb\x6e\x83\xb7\x23\x7c\x32\ --\xa0\xd9\xc2\x56\xbb\xab\xf3\x69\xd9\x6a\x6e\x63\xe3\xba\xe7\xa9\ --\xa9\x2a\x0f\x46\x23\xff\x57\xa3\xa4\x41\xc4\xb7\x9a\xe5\x66\x5f\ --\x79\xbc\x32\xe0\xd5\xc3\xf2\x47\xf5\x6d\x64\x74\x4c\xb3\xdb\x6d\ --\xbc\xf7\xe6\x5a\xea\x6a\xaa\x82\xd4\xc4\xff\x9d\x70\x6a\x50\x5c\ --\x27\x38\x53\x23\xa8\x35\x8b\xac\xbc\xc3\xf2\x71\x6f\x79\x3d\x32\ --\xe0\xd5\x12\x19\x5a\xd3\xca\xef\xba\xa6\x6f\xff\x68\x23\x95\x97\ --\x4a\x83\xd2\x48\x21\x04\x43\x52\x93\xc8\x1d\x37\x82\x5b\xa6\x8d\ --\xc5\x68\xd0\x6d\xad\xbc\x21\xd1\x62\x83\xed\x67\x15\x4e\x56\x5d\ --\xd3\x02\xd4\xb6\xc8\x3f\xbc\x5a\x22\x3d\xea\x6f\x3d\x6e\xc2\xce\ --\xcb\xda\x4b\x6d\x76\xa5\x53\x81\xa2\xd3\x05\x9c\x2e\x38\x14\x50\ --\xe3\x84\x10\x4c\x9f\x30\x92\x3b\xe7\x4f\x67\xfc\xe8\xa1\xc4\x46\ --\x47\xb6\x7f\x5b\xb4\xea\xdf\x70\xb4\xb4\x05\x44\xff\x7a\x43\x4a\ --\x38\x5c\xae\x60\xed\xa2\x6c\x6c\x73\x88\x10\xad\x56\x7b\x1e\x78\ --\xa0\x6b\x99\x6e\x0c\x78\xba\x44\x86\xd6\x96\x72\x4f\xc7\x34\x8b\ --\xb9\x95\xcf\x3f\x7a\xbb\xd7\x0d\x13\x42\xb0\x70\xce\x14\xee\xbb\ --\x6b\x3e\xe9\xc9\x03\x7b\x4d\xe7\x46\x47\x75\xab\xa0\xc9\xe2\xf9\ --\x5b\x4d\x8b\xf8\xde\xda\xc3\xf2\xb1\x47\x72\x85\xb9\x63\x7a\x37\ --\x06\xa4\xd5\xf2\xa7\x52\x3b\x9d\x14\xc0\x27\x0e\xec\xc4\xd2\xd6\ --\xbb\xd1\x39\x70\x40\x2c\xff\xfe\xa3\xfb\x98\x30\x3a\xab\x57\xe5\ --\xff\x9a\xd0\xe6\x43\x1a\xb6\x38\x85\x01\xa7\xf6\x67\x60\x75\xc7\ --\xf4\x4e\x7b\x80\x94\x52\x64\xc4\x69\xf3\x26\xa5\x4a\x92\xa3\x25\ --\xe1\x46\x48\x0b\x6f\xe1\xd0\x7e\xbf\x4e\xd5\xdd\x30\x32\x2b\x9d\ --\xbc\xdf\x3f\xf9\x37\xd1\xf9\x0e\xed\x9a\x3d\xda\x1b\x9a\xac\xca\ --\xbd\xef\x48\xd9\x69\xb3\xeb\xc4\x80\x63\xe5\xae\x45\x71\x61\x0c\ --\x4b\x8f\x91\x4c\x4d\x93\xdc\x3e\x42\xe3\xd0\xbe\x5d\x58\xac\xfa\ --\x0f\x3a\xa3\x86\xa5\xf3\xdc\x2f\x1f\x0d\x86\xe5\xe9\x86\x47\x9d\ --\x19\xbe\x3a\xaf\xd0\xda\x43\x37\xb5\xda\x09\xb1\xe6\x6b\x3f\xeb\ --\x98\xd6\x79\x06\x28\xca\xca\x8e\xff\x6b\x9a\x64\xdb\x97\x87\x75\ --\x37\x68\xe0\x80\x58\x7e\xf7\xb3\xd5\x84\x87\x5f\x4f\xc3\x6d\xdf\ --\xa3\xcd\x0e\xfb\x4a\x05\x7b\x4a\x14\x5a\x6c\xfe\x95\xa9\xb7\x28\ --\x9d\x8c\x18\xed\x7b\xc0\xe1\x73\x32\x06\xa9\xdd\xd9\xf1\xe3\xa9\ --\xb3\x17\xb8\x5c\xaf\xcf\xab\x5b\x08\xc1\xcf\xfe\xe1\x3b\x0c\x88\ --\x8d\xd6\x55\xae\xbf\x30\x34\x3d\x99\x27\x1f\x5c\xe6\xf5\x7b\x45\ --\x75\x1d\x45\x25\xe5\x94\x96\x57\x51\x53\xdb\x44\x4b\x9b\x19\xa7\ --\xcb\x45\x88\xc9\x48\x54\x44\x38\x99\x69\x83\x18\x96\x91\xcc\xf0\ --\xa1\xe9\x1c\xb9\x64\xa4\xde\xcb\xa6\xeb\x0d\x8d\x66\x52\x5e\x3b\ --\x2c\xb3\xee\xcf\x15\xe7\xa0\x03\x03\x44\x88\xf6\x1d\xa0\x93\x53\ --\xf7\x17\xbd\x50\xeb\xde\x3a\x73\x22\x53\xc7\x67\xeb\x2e\xd7\xd7\ --\x88\x08\x0f\x63\xf5\x3d\x0b\xb8\x7b\xc1\x2c\x54\xf5\xda\xc4\x77\ --\xba\x5c\x1c\x3a\x5e\xc4\xae\x7d\xc7\x38\x7c\xbc\x88\x9a\x3a\xff\ --\x1c\xa5\xc3\x23\x22\xc8\xce\x99\xc4\xf8\x29\x33\x49\x18\x38\xd8\ --\xef\x76\x68\x80\x4d\xd3\x9e\x06\xbe\x07\x1d\x19\x20\xe4\xbd\x5d\ --\x6d\xf4\xfb\x8f\x9d\xf1\x9b\x30\x80\xa2\x28\xac\x5a\x71\x87\xae\ --\x32\x7d\x0d\x21\x04\x0b\x66\xe7\xf2\xe8\x7d\x4b\x88\x8f\xbd\xb6\ --\x1f\x99\xad\x36\xb6\x6c\xdf\xcf\xdb\x5b\xbe\xf0\xbb\xd3\x3b\xc2\ --\xdc\xd6\xc6\xd1\x83\xbb\x29\x38\xbc\x97\xf1\xb9\x33\x99\x39\x6f\ --\x11\xa1\x61\xdd\x15\xc6\x9e\xd0\x6a\x53\xda\x57\x1a\x03\x5c\x59\ --\x7e\xd0\x6e\xea\x98\xc9\x6a\xb3\x53\x56\x71\x59\x57\xa3\xa6\x4f\ --\x18\x79\x43\xc9\xf9\x23\x32\x53\x79\xe2\xc1\x65\x8c\xcd\xce\x6c\ --\x4f\x73\xb9\x34\xde\xdf\xb6\x97\x57\x36\x6e\xa3\x39\x08\x07\x3f\ --\x4d\xd3\x38\x7a\x70\x37\xe7\x8a\x4e\xb1\xfc\xbe\x1f\x10\x9f\x98\ --\xd4\x63\x99\x66\x2b\xb1\x6b\x0f\xcb\xf4\x47\x72\xc5\x45\x03\x80\ --\x12\xea\x9a\x0d\xa2\x93\x78\x74\xbe\xac\x12\x4d\xd3\xe7\x7d\xb6\ --\x68\xde\x34\x5d\xf9\xfb\x0a\x51\x11\xe1\x3c\xf4\xdd\x45\x2c\xbd\ --\x6d\x06\x8a\x72\x6d\xb9\x29\xf8\xe6\x1c\x7f\x7c\x79\x13\xe7\x4a\ --\x2b\x82\x5e\x67\x73\x63\x3d\x6f\xe5\xad\x61\xd9\x7d\x8f\x90\x9c\ --\x9a\xe1\x33\xaf\x94\x60\x70\x69\x8f\x00\x3f\x37\x00\x08\x29\xe6\ --\x76\xb5\x34\x9e\x3d\xaf\x4f\xdb\xa9\xaa\x0a\x53\xc7\x8d\xd0\x55\ --\x26\xd8\x10\x42\x70\xfb\x2d\x93\x79\xec\xfb\x7f\xd7\x49\xfc\xad\ --\x6b\x6c\xe6\xf9\xf5\x5b\xf8\xec\xab\x23\xc8\x60\x45\x84\x78\x80\ --\xd5\x62\xe6\x83\xb7\x5e\xe6\xfb\x8f\x3e\x45\x64\x54\x8c\xcf\xbc\ --\x16\xa7\x58\xcc\x55\x06\x48\xc1\xbc\xae\x19\x4a\xab\xea\x74\x55\ --\x3e\x72\x68\xfa\x75\x15\x3b\x47\x66\xa5\xf3\xe4\x43\xcb\x18\x3d\ --\x6c\x48\x7b\x9a\xd3\xe5\x62\xe3\xd6\xaf\x78\x65\xe3\x36\x2c\x16\ --\x3f\xe5\xc4\x00\x61\x6e\x6b\x61\xeb\x7b\xeb\x58\xb1\xf2\x87\x08\ --\xe1\x5d\xdb\xdf\x6a\x17\xd9\x00\x86\x2b\xeb\xff\xd8\x8e\x1f\xcf\ --\xd7\x0b\x0a\x2b\xf5\x35\x38\x2b\xc3\x7f\x49\x20\xd8\x78\xe0\xdb\ --\x77\x30\x26\x3b\x13\x45\xb9\x36\x8d\x8f\x9c\x38\xcb\x1f\xf3\xde\ --\xa3\xf4\x52\x75\xbf\xb7\xa7\xac\xa4\x98\xfc\x03\xbb\x99\x3c\x7d\ --\xb6\xd7\x3c\x16\x27\xa1\x9b\x8a\xe5\x40\x83\xc1\x44\xb6\xd6\x41\ --\xfc\xb1\x3a\xe1\x74\x8d\xc0\x66\xd1\x27\xe0\x5e\xcf\xcd\x77\xdc\ --\xa8\xa1\xed\x7f\x57\xd7\x36\xf0\x5f\xaf\x7d\xc8\xae\xfd\xd7\xd7\ --\x5a\xf7\xf5\x97\xdb\x18\x37\x69\x3a\x46\x93\xe7\xd8\x14\x29\xa1\ --\xb1\x91\x85\x06\x4d\x75\x65\x23\x05\x1a\xd0\x6a\x85\x53\x35\x02\ --\xa7\x0b\x6c\x36\xab\xae\x0a\x13\xe2\x7d\xaf\x79\xc1\x46\x4c\x54\ --\x67\x91\xcf\xee\x74\xb2\xe1\xc3\x2f\x58\xb7\xe9\xf3\xfe\x70\xc4\ --\xea\x11\x56\x73\x1b\xc7\xf3\xf7\xfb\x9c\x05\x4e\xa7\x76\x8b\xe1\ --\x64\xa5\x72\x4f\x9d\x59\xd0\x68\xed\xec\x25\xe8\xb0\xeb\x63\x40\ --\x78\x68\xaf\xa3\x90\x74\x21\x32\x3c\x8c\xd5\xdf\x59\xc0\xb2\x3b\ --\x66\xb5\xa7\x7d\x7d\xf4\x1b\xfe\x94\xb7\x89\x4b\x55\xfd\xe8\x88\ --\xe5\x07\x4e\xf4\xc4\x00\x29\x46\x1a\x1a\xad\x62\x7c\xd7\x10\x1f\ --\x00\x45\xd5\xe7\xb5\x18\x62\x0a\x5a\xe0\xa3\x47\x28\x8a\x60\xd1\ --\xdc\xa9\x3c\xf2\xdd\xc5\xed\x12\x4e\x45\x75\x1d\x7f\x7a\xf5\x7d\ --\xf6\x1e\x3e\x15\x30\xfd\xb8\x98\x28\x66\xe6\x8e\x26\x33\x6d\x30\ --\xc9\x49\x03\x08\x0b\x31\x51\xdb\xd0\xcc\xb1\xd3\xc5\xec\xd8\x77\ --\xac\x57\x9b\x78\x6d\x75\x05\x8d\x0d\x75\xc4\xc6\x79\x76\x22\x76\ --\x6a\xa4\x1a\x9c\x12\x8f\xea\xca\xb0\x10\x7d\x23\xda\xe1\xe8\xbb\ --\x60\xc2\xd1\xc3\x86\xf0\xc4\x83\xcb\x18\x35\x2c\x1d\x08\xae\x23\ --\xd6\x8c\x89\xa3\xf8\xfb\x6f\xcd\x65\xc2\xe8\xac\x4e\x67\x86\xab\ --\x58\x30\x3b\x97\x1f\xdc\x7b\x27\xbf\x7f\xf1\x6d\xbe\x3a\xa8\xdf\ --\xf7\xe8\x5c\xe1\x49\xaf\xb3\xc0\xe1\x12\xb1\x86\x99\xe9\x5a\xc5\ --\x91\x72\x11\x53\xd5\xd2\xf9\x20\x20\x8c\x26\x5d\x15\x59\xec\xc1\ --\x5f\x77\xe3\x62\xa2\xf8\xc1\xbd\x8b\x59\x38\x67\x6a\xbb\x84\xf3\ --\xd5\x81\x13\xfc\xf9\xf5\x0f\xa8\xac\xa9\x0f\x88\xf6\xd8\xec\x4c\ --\x1e\xbf\xff\x5b\x8c\x1e\x3e\xa4\xc7\xbc\xb1\xd1\x91\x3c\xfd\xe4\ --\x2a\x1e\xff\xcd\x7a\x4e\x9d\x38\xa6\xab\x1e\x5f\x0c\xb0\x3b\x65\ --\xa8\xc1\xa8\x12\x3e\x25\x4d\xb2\xaf\x54\x50\xd7\xe1\x64\x6e\xd2\ --\xc9\x80\xfa\x86\x1e\xbd\xf0\xfc\x86\xaa\x2a\xdc\xbd\x60\x16\x0f\ --\xdc\xb3\x80\xc8\x70\xb7\x7e\xf0\x62\x45\x0d\x6b\xf2\x36\x71\xb0\ --\xa0\x30\x20\xda\xf1\xb1\x51\x3c\x7a\xdf\x12\x16\xcc\xce\x45\x78\ --\xf6\xb4\xf4\x88\x46\xab\xca\xbc\x3b\xbf\x43\xe9\x85\x12\x5a\x5b\ --\xfc\xd7\x10\x57\x55\x94\x79\xfd\x26\x11\xaa\x01\x88\x52\x05\xcc\ --\x1c\xa2\x51\xd9\x22\xb8\xdc\xea\xb6\x6d\x9a\xbc\x88\x4f\xde\x50\ --\x56\x19\x9c\x08\xce\x49\x63\x86\xf3\xc4\xea\x65\x64\xa6\x0d\x02\ --\xdc\x4a\xb3\xd7\xdf\xfd\x9c\x77\x3e\xfa\x02\x87\xb3\xf7\x9e\xd6\ --\xaa\xaa\x70\xf7\xc2\x9b\x59\xbd\xe2\x0e\x22\xc2\xc3\x7a\x2e\xd0\ --\x05\x03\x22\x24\x61\xa1\x61\xe4\xde\x34\x97\x2f\xb6\xf9\x74\x76\ --\xeb\x04\xbb\xd5\x42\x6b\x4b\x93\xc7\x93\xb1\x4b\x43\x31\x00\x91\ --\xe0\xf6\x69\x4c\x89\x96\xa4\x44\x03\x48\xea\xb3\xe3\x38\xac\x23\ --\xfa\xe9\x4c\xb1\x77\x4e\xfb\x83\xa4\x01\xb1\xfc\xe4\xe1\x6f\x33\ --\x6f\xc6\xf8\xf6\xb4\xed\x7b\x8f\xf2\xdf\xaf\x7f\xa8\xdb\x26\xd1\ --\x15\x13\x73\xb2\x78\x62\xf5\xdd\x0c\x4d\x77\x1f\x16\xed\x4e\x27\ --\x26\x83\x3e\x21\x43\x00\x52\xc0\x98\x09\x53\xf9\xf2\xb3\xcd\x48\ --\xe9\xbf\x9e\xac\xfe\x72\xb5\x37\x06\x08\xaf\xad\x18\x76\x65\x04\ --\xfa\x8b\xd3\xc5\x17\x69\x69\x33\x13\x15\x71\x4d\x3e\x77\x68\x70\ --\xa2\x52\x30\x3c\x41\xa2\x0a\x77\x94\xa3\xc9\x8b\xfb\xcf\xda\xdf\ --\xfd\xb8\xbd\x53\xce\x5f\xac\xe4\xd9\xbc\xf7\x38\x7a\xea\x9c\xae\ --\x36\x74\x45\x62\x7c\x0c\x3f\x5c\xf9\x2d\x6e\x9d\x39\xb1\x3d\x6d\ --\xe7\xd7\x05\xac\x7f\xef\x73\x5e\xfd\xcf\x6e\x1e\x97\x3e\xa1\x08\ --\x18\x91\x20\x29\x94\x11\x0c\x4e\x49\xa7\xe2\xd2\x05\xbf\xcb\xd6\ --\x5d\xae\x26\x7d\xa8\x67\x3d\x99\x01\x68\x05\xe2\xbb\x7e\x18\x92\ --\xa2\xef\x64\xab\x69\x1a\x1f\xef\x3a\xc4\xf2\xc5\xb3\xb9\xd4\x28\ --\xa8\x35\x43\x4d\xab\xc0\xe1\x82\xc8\x10\x28\xaa\x15\x20\x61\x4c\ --\x52\xf7\x88\x77\x4d\x82\xaa\x1a\x68\x33\x5b\xc8\x7b\x67\x1b\xef\ --\x7d\xb2\x1b\x97\xab\xf7\x71\xc0\x46\x83\xca\x8a\x3b\xe7\xb0\x72\ --\xf9\x6d\xed\xe7\x93\x92\xb2\x2a\x9e\xcd\xdb\x44\xfe\xc9\xb3\xbd\ --\x8e\x11\x1b\x35\x50\x62\x52\x21\x29\x39\x4d\x17\x03\x9a\x9a\x3c\ --\x0b\x0c\xaa\x82\x34\x00\x2d\x78\x60\x40\xe2\x80\x18\xc2\xc2\x42\ --\x74\xc9\xbf\x1b\x36\xef\x62\x68\xce\x34\xca\xcd\xd7\x66\x41\xb8\ --\x09\x8a\x6b\xdd\xa7\x6b\x80\x63\x95\x82\xc2\x5a\x81\xc0\x1d\x8e\ --\x6a\x34\x40\x61\x35\x9c\x3c\x76\x88\xdd\xdb\x37\xd3\xd4\x1c\xd8\ --\x66\x3e\x75\x7c\x36\x3f\x5e\xbd\xac\x5d\x35\xd2\x6a\xb6\xf0\xca\ --\xdb\x9f\xf2\xde\xa7\x7b\x02\x62\xea\x55\x64\x0d\x90\x4c\x1c\x96\ --\xc8\xd1\x83\xfe\x97\x71\xd8\x3c\xf7\xa1\xaa\xa0\x5d\x9d\x01\xdd\ --\x20\x84\x60\xe4\xd0\x54\x5d\xcb\xc0\xe5\xfa\x26\xd6\xbe\xf6\x36\ --\x8b\xbf\xbd\xb2\x5d\x13\x18\x6a\x00\x2b\x74\xba\x4c\xe3\x6a\xf0\ --\x75\x51\xad\xa0\xe2\xd2\x05\xbe\xfc\xf4\x03\xca\xcb\x4a\xfc\xae\ --\xc7\x13\x06\x0f\x8c\xe7\xf1\x95\x4b\xb9\x65\x9a\x5b\xaf\xa8\x69\ --\x92\x4f\xbe\x38\xc8\x8b\x6f\x6e\xa5\xa1\x29\x78\x12\x1a\x40\xc6\ --\x60\x7d\xf6\x6e\xbb\xdd\x33\x03\x84\x22\x5d\x06\x90\xcd\xde\xc2\ --\x85\x67\xe6\x8e\xd1\xbd\x0e\x9f\x39\x75\x0c\x97\xcb\xc5\x6d\x7f\ --\x77\x0f\xe1\x11\x51\xd4\x9b\xbb\xe7\xd1\x34\x8d\x8b\x25\x45\x1c\ --\xde\xb7\x8b\x0b\xc5\xfa\xcc\x9e\x5d\x61\x32\x1a\xb9\x77\xe9\x3c\ --\xee\xbb\x6b\x7e\xfb\x69\xfc\x9b\xe2\x8b\x3c\xfb\xf2\x26\x4e\x17\ --\x07\xc7\x8f\xb5\x2b\xc2\x42\xf5\x89\xe8\x4e\x2f\x0c\x08\x51\xb1\ --\x1a\x10\x4a\xb9\xb7\x50\xd1\x59\x53\xc6\xf0\x5f\xaf\xeb\xbf\x9b\ --\xe2\xec\x99\x13\x94\x9e\x2f\x62\x44\xce\x44\x52\x87\x64\x12\x19\ --\x15\x8b\xdd\x6e\xa3\xa9\xa1\x96\xda\xcb\xd5\x9c\x2f\x3a\xd9\x6b\ --\x4f\xbb\x8e\x98\x99\x9b\xc3\x8f\x56\xdd\xd5\x1e\x2f\xdc\xd0\xd4\ --\xc2\xda\xb7\xb6\xf2\xf1\xae\x83\x68\x5a\xdf\x19\x5e\xf4\x4a\x50\ --\x76\x87\xe7\x43\xaa\x41\xa1\xd1\x20\x90\x85\xde\x9a\x9a\x3a\x28\ --\x81\x8c\xb4\x41\x5c\x28\xd3\xef\x8e\x6e\xb7\xdb\x38\x79\x74\x3f\ --\x27\x8f\xee\xd7\x5d\xb6\x27\xa4\x0e\x4a\xe0\x47\xab\x97\x31\x63\ --\xe2\x28\xc0\x6d\xe7\xdd\xb4\x6d\x0f\x79\x1b\x3e\xa5\xd5\xac\xd3\ --\x4f\xa4\x17\xd0\xab\x6d\x75\x79\x09\xcf\x35\x28\xe2\x92\x41\x22\ --\x0b\x7d\xdd\x58\xb0\x64\xfe\x74\xfe\xfc\x9a\xff\x07\x8f\xbe\x84\ --\xc9\x64\xe2\xae\xc5\xb7\xf1\xe0\x8a\x39\x84\x19\xaf\x8d\xc2\x5f\ --\x3f\xb7\x9e\x1d\x7b\xf5\xa9\x08\x02\x81\x59\xa7\x62\xce\x68\xea\ --\x6c\x29\x0c\x37\x42\x5a\xac\x64\x40\x98\x7c\xc7\xa0\xb8\xd4\x42\ --\x4d\xf1\x2e\x1d\x2c\x99\x37\x8d\xd7\xdf\xfd\x8c\xe6\x56\x0f\x8b\ --\x79\x3f\x22\x7b\xf4\x04\x66\x2f\x58\x4a\x74\x4c\x1c\x5f\x97\x42\ --\x6e\x9a\x46\xf4\x95\xc3\x7a\x53\x4b\xff\xb6\xed\x72\xbd\x3e\x37\ --\x96\xe4\xf8\x30\x46\x24\xb8\xaf\x5c\x4b\x8a\x82\xe4\x28\x89\x10\ --\x20\x85\xb2\x47\xb1\x86\x73\x06\xf0\xba\x60\x86\x87\x87\x72\xff\ --\xf2\xdb\x03\x6d\x73\xaf\x11\x9f\x98\xc4\x8a\x95\x3f\x64\xc9\x3d\ --\xab\x88\x8e\x89\x03\xa0\xc9\x2a\x79\x73\xe7\x85\xf6\xcb\x41\xfa\ --\x1b\x65\x95\xfa\xdc\x75\x06\xc6\x86\x32\x3a\x49\x32\x29\x45\x92\ --\x12\xed\xee\x7c\x40\xb3\x18\x29\x32\x4c\x1f\x20\x9a\xf3\xcb\x5d\ --\x27\x80\x71\xde\x08\x2c\x5f\x74\x33\xbb\x0f\x9d\x08\xf8\x64\xaa\ --\x07\x46\x53\x08\x33\xe7\x2c\x60\xd2\xf4\xd9\x28\xea\xb5\xe3\x73\ --\x65\x79\x29\x3b\x3e\x7a\x97\x90\xb0\x30\x26\xe4\x3c\xca\xc0\x48\ --\x1f\x44\xfa\x08\xc5\x17\xf4\xb9\xb5\x44\x46\x74\xd7\x3d\x49\x28\ --\x98\x95\x28\x5a\x14\x00\x21\xd9\xe9\x8b\x80\xa2\x28\xfc\xea\x89\ --\x95\xfd\xe6\xef\x99\x35\x22\x87\x07\x1e\xfb\x57\x72\x67\xce\x6b\ --\xef\x7c\xab\xc5\xcc\xce\x8f\x37\xf1\xd6\x4b\x6b\xa8\xaa\xb8\x08\ --\x40\x5d\x9b\xa0\xad\x9f\xc3\x93\xdb\xcc\x16\x0a\xcf\x5f\xd2\x55\ --\x26\x75\x50\x82\xa7\xe4\x1d\x70\xc5\x33\x4e\x0a\xb9\x0b\xc4\x8f\ --\x7d\x11\x89\x8f\x8d\xe2\xb7\x3f\x5d\xc5\x53\xbf\x7d\x39\x28\x1e\ --\x65\x9e\x90\x38\x28\x99\xf9\x8b\x97\x93\x9a\x7e\x2d\x9e\x40\x4a\ --\x8d\x82\xc3\xfb\xd8\xbd\x7d\x2b\x36\x6b\xe7\xb5\xde\xa9\x41\x41\ --\x45\xff\x2e\x43\xfb\x8f\x16\xea\x76\x58\x1b\x36\x24\xb9\x5b\x9a\ --\xa2\xc9\x5d\x70\x85\x01\x9a\x55\xfd\x52\x09\xd5\x5c\xe0\xfb\x5e\ --\xcf\x9c\xe1\x19\xbc\xf8\x7f\x1e\xe7\x9f\x7e\xf3\xff\x03\x36\x88\ --\x74\x44\x68\x78\x04\x37\xcd\x5e\xc0\x84\xa9\xb3\x3a\x59\xa5\xca\ --\xcb\x4a\xd8\xb1\xf5\x5d\x6a\x2a\xbd\x8f\xb8\x56\x9b\xf0\xbe\x81\ --\xf5\x01\x3e\xfe\xe2\x80\xae\xfc\xaa\xaa\x90\x99\xde\x4d\xb1\xe9\ --\xb4\x85\xab\x7b\xe0\x0a\x03\x72\xb3\x44\x53\x7e\xb9\x73\x2f\x88\ --\x5b\x7a\x22\x98\x9e\x92\xc4\x2b\x7f\xf8\x27\x9e\x5d\xb7\x8d\xed\ --\xbb\xf6\xe8\x1e\x0d\x1d\x11\x1d\x13\xc7\xe4\x9b\xe6\x32\x76\xd2\ --\xf4\x4e\xf6\x07\x73\x6b\x0b\x5f\x7e\xbe\x99\x53\x05\x87\x7a\xbc\ --\x4f\xc8\xec\x80\x06\x73\xff\xcc\x82\xd2\x4b\xd5\x1c\x2a\xd0\x77\ --\x1f\xc6\x90\x94\x41\x98\x8c\x9d\xed\xe5\x52\x88\xdd\xd3\x07\x88\ --\x66\xe8\xe0\x1d\x2d\x85\x78\x53\x48\x7a\x64\x00\xb8\x7d\x2f\x67\ --\xdd\x7e\x37\x29\xa3\x66\x52\x70\x78\x2f\xdf\x1c\xcf\xc7\x62\xf6\ --\xa8\x52\xea\x86\x98\xd8\x78\x86\x64\x65\x33\x22\x67\x02\xe9\x99\ --\x23\x3a\x8d\xf8\xab\x8e\xae\x7b\x77\x7d\x82\xdd\xea\xff\x81\xca\ --\xd5\x4f\x53\xe0\xa5\x0d\x1f\xeb\x1e\x70\xd3\x27\x8e\xec\x96\x26\ --\xa4\xf6\xc6\xd5\xbf\xaf\x31\xc0\xa2\xbc\x2d\x42\xb5\x35\x74\x89\ --\x11\xf0\x06\x45\xc0\x80\xc4\x41\xcc\x5b\x78\x37\x73\x6e\x5f\x4a\ --\x55\x65\x19\x97\xab\xca\xa9\xbb\x5c\x85\xcd\x6a\xc5\xe9\xb0\xa3\ --\xa8\x06\x42\xc3\xc2\x88\x8a\x8a\x25\x3e\x31\x89\xc4\x41\x29\xc4\ --\xc4\x76\x53\xbc\x02\x50\x56\x7a\x8e\x1d\x5b\xdf\xa5\xb6\x3a\xf8\ --\x8e\xb3\xc1\xc0\xbe\x23\xa7\xf9\x62\xff\x71\xdd\xe5\xe6\xcc\xe8\ --\x26\x5c\x5a\x85\x5d\xdd\x74\xf5\x9f\x76\x06\xe4\x66\x89\xa6\xa3\ --\xe5\xae\x2d\x12\x56\xf8\x43\x78\x6c\x92\xc6\xee\x0b\xee\xd1\xab\ --\xa8\x2a\xc9\xa9\x19\x3d\x7a\x05\xfb\xc2\x87\x1b\xf2\xb0\x9a\x6f\ --\xcc\x38\xe1\xcb\xf5\x4d\x3c\xf3\x82\xfe\x30\xdd\x41\x89\xf1\x8c\ --\xca\x4a\xef\x9a\xfc\x41\xc7\xeb\xf2\x3b\xfb\x61\x68\xf2\x75\x7f\ --\x08\xbb\x24\x9c\xad\xbd\x61\xde\x7e\xd0\x0d\x97\xe6\xff\x55\x75\ --\xad\x66\x0b\x3f\xfd\xbf\x2f\x53\xd7\xd8\xac\xbb\x1e\x8f\x86\x7f\ --\x45\xae\xeb\xf4\x6f\xc7\x7f\x26\xa4\xaa\x9f\x48\x49\x8f\xce\x2f\ --\xf5\x66\xfd\x17\xb1\xde\x48\x70\x49\x77\x70\x5d\xb3\xcd\x37\x23\ --\xea\x1b\x5b\xf8\xc7\xa7\x9f\xa7\xa8\x44\x9f\xdc\x0f\x10\x16\x16\ --\xc2\x8a\xc5\xdd\xb6\xd4\xd3\x13\x07\xa9\x9d\xee\x94\xeb\xc4\x00\ --\x21\x84\x54\x14\xd9\xed\x8e\x88\xae\x88\x09\x95\x28\x7f\xbd\xfd\ --\x0f\xb8\xaf\xd9\xdc\x59\xac\xb0\xf9\x1b\x85\xae\x3e\x51\xe0\xf6\ --\xae\x5e\xf5\x93\xff\xa4\x48\xe7\xa1\xeb\x2a\x96\x2f\xbc\xd9\x83\ --\xe9\x53\xfe\x47\xd7\x07\x22\xba\x29\xb6\xcf\x0e\x56\x37\x0c\xab\ --\xd0\x7e\x09\x0c\xf7\x46\xdc\xa4\x42\x4e\x92\xe4\x54\x95\xdb\xa9\ --\xf7\xaf\x19\x52\xc2\xf9\x7a\x18\x74\xc5\x3f\xb0\xa4\xac\x8a\x75\ --\x9b\x3e\x67\xfb\x9e\xa3\xbd\x0e\xe6\x88\x8b\x89\xe2\xef\x97\xcc\ --\xe9\x9a\x5c\x5c\x9c\xac\x6e\xec\x9a\xd8\x8d\x01\x2b\x84\x70\xe5\ --\x97\x3b\x9f\x01\xf1\xb2\xaf\x4a\xb2\x06\xb8\x1f\x49\x38\xda\xcf\ --\x27\xd1\xbe\xc0\xa5\xea\x16\x76\x96\x17\xf3\xd1\x8e\xfd\x1c\x3a\ --\x5e\x14\x70\x14\xcd\x3f\xff\x60\x45\xb7\xd1\x2f\xa4\xfc\xcd\x0a\ --\x21\xba\x39\x36\x79\x34\xed\x14\x27\xab\xaf\x0d\xab\xd0\x1e\x03\ --\x26\xf8\xaa\x28\x3d\x4e\x52\xde\xcc\x75\xd3\x4a\xf6\x16\x0e\x9b\ --\x95\x0f\xff\xf2\x32\x76\x87\x9d\xe6\x86\x3a\x1a\xea\x83\xe7\x55\ --\xbd\x78\xde\x34\x6e\x9e\x32\xa6\x6b\x72\xfe\xd9\x14\x75\xbd\xa7\ --\xfc\x1e\x63\x68\x56\x08\xe1\x52\x34\xe5\x11\xf0\xbd\xc2\x08\x60\ --\xdc\x60\x19\x94\x0b\xb5\xfb\x13\x2e\x97\xcb\x6d\x36\x3d\x57\x18\ --\xd4\xce\xcf\x19\x9e\xc1\x8f\x1f\xe8\x16\x04\xae\x21\x95\xc7\x3c\ --\x8d\x7e\xf0\x71\x63\xd6\x84\x34\x71\x10\x78\xad\xa7\x4a\x23\x4d\ --\x90\x39\xa0\x3f\xb5\x31\x37\x26\x86\xa6\x27\xf3\x87\x9f\x3f\xd4\ --\xcd\x60\x2f\x21\xcf\xd7\x45\xae\x3e\x07\xaf\x26\x94\x9f\x02\x3d\ --\x46\xeb\x65\x27\x4a\xaf\x1e\x6f\x7f\x0b\xc8\xce\x4a\x63\xcd\x2f\ --\x1e\x21\x3a\xb2\x5b\xa0\x76\xad\x53\x2a\xff\xe2\xab\xac\x4f\x06\ --\xe4\x26\x8b\x5a\x21\xe5\x4a\x7c\x58\xcc\xc0\x2d\x15\x8d\x1c\xf8\ --\xb7\x39\x0b\xe6\xcd\x18\xcf\x7f\xff\xfa\x31\xe2\xe3\xba\xd9\x4a\ --\xa4\x40\x3e\x38\x2d\x55\xf8\x1c\xc0\x3d\x2e\xdf\x13\x53\x0d\x5b\ --\x85\x60\x4d\x4f\xf9\x32\xe3\x25\x03\x23\xfb\x8f\x09\x46\x9d\xee\ --\xf3\xc1\x46\x58\xa8\x89\x7f\x5c\x75\x17\xbf\x7a\x72\x25\xa1\x21\ --\xdd\xdb\x22\xe1\xff\xf9\xf3\xde\x8c\x5f\x0e\x2e\xae\x0a\xe5\xa7\ --\xca\x60\xd7\x74\x10\x33\xbc\xe5\x11\xb8\x5f\x3a\xfa\xec\x6c\xdf\ --\x4a\x44\x06\x83\x91\x29\xb3\xe6\x33\x6d\xd6\xad\x7d\x5a\x8f\x2f\ --\x4c\x19\x3f\x82\xa7\x1e\x5e\xe1\xfd\xfd\x02\x21\x0f\x86\x36\xa8\ --\x3f\xf7\x87\x96\x5f\x0c\xc8\xcd\x15\x8e\xa3\x95\xf2\xbb\x52\xd3\ --\x0e\x02\x89\xde\xf2\x85\x9b\x20\x3e\x1c\x8f\xde\x70\xc1\xc0\x90\ --\xac\x6c\xe6\x2f\xba\x9b\xf8\x84\x9e\xef\x63\xe8\x0b\x8c\xcd\xce\ --\xe4\xbe\xbb\xe6\x33\x33\x37\xc7\x57\xb6\x1a\x0d\xf5\xdb\xfe\x3e\ --\xf2\xe3\xb7\x8b\xd7\xc4\xc1\xe2\x42\x7e\x85\x5c\x24\xa5\xb6\x53\ --\xe0\x39\xae\x0c\xdc\x8f\x37\x1c\x28\x53\x82\xca\x84\xd8\xf8\x04\ --\xe6\x2d\x5c\xc6\xd0\x11\x3e\x7f\x78\x9f\xc0\x64\x34\x32\x67\xc6\ --\x38\x96\xcc\x9f\xce\xc4\x9c\x61\x3e\xf3\x4a\x68\x91\x42\x59\x98\ --\x9b\x2c\x2e\xfa\x4b\x5f\x97\x8f\xdd\xa4\x64\x71\xf8\xc8\x25\xc7\ --\x52\x84\xf2\x31\x78\x7e\x1d\x2f\xc4\x00\x37\x67\x68\x94\x35\x09\ --\xbe\xa9\x16\x58\x02\x88\xdd\x33\x1a\x4d\x4c\xbb\xe5\x56\x72\x6f\ --\x9a\x87\xc1\xd0\xb7\x51\x98\x1d\x11\x16\x6a\x62\xca\xb8\x11\xcc\ --\x98\x94\xc3\x9c\x19\xe3\x3a\xc5\x3c\xf8\x80\x5d\x15\xda\xf2\x09\ --\xc9\x6a\xbe\x9e\xba\x74\xbf\xa0\x31\x39\xd5\xb8\x33\xbf\xdc\x79\ --\x3f\x88\x37\xf1\xb2\x89\x0b\x01\xe9\xb1\x92\xd4\x18\x49\x55\x8b\ --\xfb\x25\xa5\x56\x9d\x51\x9e\xc3\x47\x8d\x63\xee\x82\xbb\x88\xf6\ --\x62\xc0\x09\x16\x14\x45\x30\x28\x31\x9e\xac\xf4\xc1\xe4\x8c\xc8\ --\x60\x4c\x76\x06\xa3\x87\xa7\x77\x33\x23\xf6\x00\x4d\x22\xbf\x3f\ --\x21\xd9\xf8\x99\xde\xfa\x7b\xf5\x86\xcc\xa4\x14\xc3\x86\x23\x15\ --\x4e\xbb\x90\xe2\x4d\xc0\xeb\x0d\x1d\x8a\x80\xe4\x68\xf7\x13\x54\ --\xf9\x97\x04\xe5\xcd\x3d\x6f\xd0\xf1\x09\x03\x99\xb7\xf0\x6e\x32\ --\x86\x75\x37\xe5\x79\xc3\xed\x4b\xee\xa1\xae\xb6\x9a\x96\xc6\x06\ --\x6c\x36\x0b\x36\x9b\x15\x97\xc3\x81\xfd\x4a\xe4\xa6\x50\x04\x21\ --\x21\x61\x28\x8a\x8a\x29\xc4\x44\x7a\x62\x04\xe3\x33\xa3\x49\x1a\ --\x10\x4b\xea\xe0\x04\xbd\x9d\xdd\x15\x76\x90\x2b\x27\xa7\x18\x7a\ --\x75\xb1\x6a\x40\x22\xcb\x91\x4b\x8e\x79\x42\x28\xef\x03\x3d\x3a\ --\x0c\x79\x7b\xf7\xf1\x2a\xd6\xfe\xf1\x97\x8c\x9d\x34\x9d\x69\x37\ --\xdf\x86\xaa\x33\x48\x5c\x2f\x6e\xc9\xd4\x88\xf7\xef\x72\xab\x9e\ --\xd0\x7a\xe5\x19\x2b\x5d\xef\xc6\x74\x44\xc0\x32\xe3\x91\x0a\x39\ --\x59\x48\xed\x63\xa0\xc7\x98\xa6\xe2\x3a\xc1\xc9\x2a\xcf\x55\x9a\ --\xdb\x5a\x08\x8f\xe8\x9f\x2b\x2e\xe7\x0f\xd3\x88\x0a\xfc\x66\x85\ --\x6a\x29\x94\xc5\x93\x93\xc5\x91\x40\x88\x04\xac\x47\x9b\x9c\x2c\ --\x8e\x38\x51\x72\x41\xee\xeb\x29\x6f\x5c\xa8\xf7\x83\x5a\x7f\x75\ --\x7e\x52\x94\x0c\xbc\xf3\xa5\x3c\xa4\xaa\xca\x8c\x40\x3b\x1f\x82\ --\xf3\x32\x20\x53\x53\x44\x59\x53\xb2\x3a\x5b\xc2\xaf\xf0\xa1\x41\ --\x0d\xed\x3f\x41\xc6\x2b\x46\x26\x06\x74\x5a\x97\xc0\x73\x21\x4d\ --\xea\xac\xf1\x83\x44\x60\x31\x55\x57\x10\xb4\xc5\xf6\xca\xcb\xd3\ --\x4f\xe7\x97\x3b\xf3\x41\xbc\x02\x74\x3b\x26\x06\xf8\xca\x75\xc0\ --\x18\x18\x29\x89\xd3\x1f\xa3\x7d\x15\xb5\x12\xf9\xc0\xe4\x14\xc3\ --\x96\x20\x36\x29\xf8\xaa\xfc\x49\x29\x86\xcd\x06\xa7\x32\x1c\x78\ --\x8e\x2e\xb3\xe1\x7a\xa8\xeb\xe2\xc2\xdc\x0f\x3c\x8f\x1d\x24\xaf\ --\xbc\xed\xa2\x1b\x12\xc9\x7a\x14\x65\x74\xb0\x3b\x1f\xfa\xf8\x49\ --\xf3\x23\x15\x72\xb2\xd0\x5c\x2f\x20\xc4\x14\x70\xbb\x83\x7c\xf4\ --\x8d\xd2\x2f\x8c\x88\x0f\x87\xd1\x49\x1a\x09\x81\x49\x3b\xc7\xae\ --\x3c\x69\xde\xe3\xfe\xd6\x5b\xf4\xe9\xa2\x30\x39\x59\x1c\x29\x4e\ --\x51\x67\x80\x5c\x0d\x9c\x55\x15\x30\xf5\xad\x84\x89\x2a\x20\x37\ --\x55\x72\x4b\x66\x40\x9d\x5f\x24\xa4\x5c\x55\x9c\xac\xe4\xf6\x65\ --\xe7\x43\x1f\xcf\x80\x8e\x90\x52\x2a\xf9\x15\xae\xc5\x3b\xcf\x29\ --\x1b\x5a\xac\x22\x38\x52\xb8\x07\x0c\x4f\x90\xe4\x24\xf5\x6e\x8e\ --\x49\xc9\x49\x81\xfc\x43\x53\x8a\xfa\xd6\x95\x3d\xad\xcf\xd1\xc7\ --\xe3\xf1\x1a\xae\xf8\xc3\x6c\x91\x52\x46\xbe\x59\xa0\x3d\xd9\x64\ --\x16\x8f\xd5\xb6\x89\x8c\x60\x3b\xd6\xf6\xe2\xed\x61\x0b\xf0\x21\ --\x8a\x5c\x37\x69\x90\xfa\xa9\x10\xa2\x5f\xb7\xaa\xeb\xea\xce\xb0\ --\xee\xb0\x4c\xb7\xba\xb4\xdf\xb6\x39\x94\x85\x4d\x16\xe2\x83\x11\ --\xda\x3b\x34\x5e\x32\x6e\x70\x8f\x84\x9c\x08\xb9\x07\xc9\x7a\xcd\ --\xaa\xbe\x97\x9b\x25\x02\xbb\x8e\x25\x00\xdc\x30\xfe\x24\x6f\x15\ --\xca\x04\x6b\x8b\xf6\x90\xc5\xae\x2c\x6b\xb1\xc9\x31\x16\xa7\x08\ --\xed\x8d\x7b\x8e\xb7\x25\x48\x48\xce\x03\xdb\x41\x6e\xc7\xa1\x7e\ --\xde\xd1\x41\xf6\x7a\xe2\x86\x61\x40\x57\xbc\x55\x28\x13\x34\x33\ --\xb7\x3b\x9c\xda\x4d\x36\x97\x32\xde\xe6\x22\xc3\xa5\xc9\x68\x97\ --\x26\x8c\x2e\x0d\x83\x53\xc3\xe0\x74\x21\xa4\x00\xa3\x82\x54\x90\ --\x5a\x88\x51\xd8\x66\x66\xb8\x4e\x98\x54\x71\x01\x41\x91\x40\x9e\ --\xd1\x50\x0b\x2d\x46\x8a\x66\x25\xf6\xfc\xb0\xe6\xf5\xc0\xff\x00\ --\x7f\xe1\xcb\x24\x2c\x98\x3d\x94\x00\x00\x00\x00\x49\x45\x4e\x44\ --\xae\x42\x60\x82\ --\x00\x00\x49\xbb\ --\x89\ --\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ --\x00\x01\x00\x00\x00\x01\x00\x08\x06\x00\x00\x00\x5c\x72\xa8\x66\ --\x00\x00\x00\x04\x73\x42\x49\x54\x08\x08\x08\x08\x7c\x08\x64\x88\ --\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0d\xd7\x00\x00\x0d\xd7\ --\x01\x42\x28\x9b\x78\x00\x00\x00\x19\x74\x45\x58\x74\x53\x6f\x66\ --\x74\x77\x61\x72\x65\x00\x77\x77\x77\x2e\x69\x6e\x6b\x73\x63\x61\ --\x70\x65\x2e\x6f\x72\x67\x9b\xee\x3c\x1a\x00\x00\x20\x00\x49\x44\ --\x41\x54\x78\x9c\xec\xbd\x67\x7c\x1c\xd5\xbd\xff\xff\x3e\xb3\xab\ --\xde\x25\xab\x17\xf7\x82\xbb\x64\x19\x1b\x63\x5c\x31\x06\x4c\xb3\ --\x29\x09\x84\x16\x48\xc8\x4d\x0f\xe1\xde\x4b\x92\x9b\xe4\x47\x92\ --\xff\x4d\x42\x72\x13\xd2\x81\x04\xd3\x0c\x04\x0c\x36\x1d\x4c\x71\ --\xc3\x05\x5c\x24\xb9\xf7\xaa\x66\x49\xb6\xba\xb4\x7d\xe7\xfc\x1f\ --\xac\x7b\x91\x76\x56\xb3\x3b\xbb\xd2\xbc\x1f\xf0\xc2\xab\x99\x73\ --\xbe\x5a\xcd\xf9\xcc\x29\xdf\x22\x30\x89\x68\x9e\x5c\x27\xb3\xe2\ --\xe2\x98\x2c\x24\xc5\x4e\x8f\x3a\x58\x95\x4a\xb6\x2a\xc9\x50\x55\ --\x52\x3c\x52\x26\x79\x54\xe2\x3d\x2a\x31\x48\x21\x54\x55\x2a\x2a\ --\x42\x01\xf0\xa8\x08\x55\xfa\xda\x88\xb6\x20\x4f\xb5\x67\x55\xf0\ --\x08\xc0\x6a\xc1\x63\x55\x70\x58\x14\x3a\x15\x21\xdb\x2d\x8a\x68\ --\xe9\x17\xaf\x6e\x1b\x98\x2e\x37\x0a\x95\x3a\x69\xb5\x1c\x71\x78\ --\x38\x3c\xa5\x50\xd8\x0d\xf9\xc5\x4d\x74\x41\x18\x6d\x80\x49\xf7\ --\xfc\x7d\xa5\x4c\x4c\x48\x61\xae\xea\x55\x67\x38\x3d\xa2\xc4\xa5\ --\x8a\x22\x87\x9b\x74\x97\x97\x58\xb7\x17\x25\x54\x76\xc4\x5a\xe1\ --\xea\xa1\x2a\xd6\x73\x7b\xac\x07\x79\x18\xc4\x11\x24\x87\x11\x72\ --\xbb\xc5\x62\xd9\xee\xae\x66\x6f\x69\xa9\x70\x87\xca\x36\x93\xc0\ --\x30\x05\x20\xcc\x78\x66\xa7\x4c\x8f\xb2\xf3\x65\xb7\x2a\xe7\xda\ --\xdc\x8c\xb5\xb9\x44\xae\xdd\x43\x8c\x94\xdd\xdf\x1b\x0a\x46\x64\ --\x49\x46\x64\xfa\x65\x8c\x0b\xd8\x85\x64\xbb\x10\x6c\x53\x85\xb2\ --\xc1\xe9\x65\xb3\x39\x63\x08\x2f\x4c\x01\x30\x98\x97\xca\xe5\x48\ --\x9b\x57\xbd\xcf\xe1\x14\xb3\x1c\x1e\x31\xbc\xd3\x45\x52\x98\x8c\ --\xf5\x8b\x22\x04\x8c\xcc\x92\x0c\xed\x17\x90\x95\x1e\x60\x2b\xb0\ --\x0e\x29\xcb\x54\xc5\xb2\xaa\x34\x4f\x54\xea\x6b\xa1\x89\x16\x4c\ --\x01\x08\x31\x4f\x54\xc8\xd4\x44\x0f\x5f\x77\x7b\xb8\xbd\xc3\x25\ --\x47\x77\x3a\x45\x5c\x38\x0f\xf8\x4b\x31\xa9\x50\x92\x9b\xdc\x73\ --\xcb\x85\xe4\x10\xf0\xa9\x2a\xe4\x7b\xc9\x36\xcb\xc7\x43\x87\x0a\ --\x67\xcf\xad\x33\xf1\x17\x53\x00\x42\xc0\xe2\x32\x39\xa1\xdd\xa3\ --\x3e\xd2\xe6\x56\x66\xb7\xda\xc9\x52\x23\x71\xc4\x9f\xc7\xa8\xec\ --\x80\x67\x01\x5d\xd1\x01\x62\x39\x52\x2e\x53\xa4\xf2\xee\xf8\x42\ --\x51\xa3\x77\x07\x26\xe7\x62\x0a\x40\x90\x78\xaa\x5c\x96\x7a\xec\ --\xf2\x47\x76\x8f\x98\xd3\xe1\x44\x87\x77\x65\x78\x31\x6d\xa0\x4a\ --\x7a\x7c\x50\xbb\x50\x41\x7e\x2e\x84\x78\x5d\x7a\x94\xd7\x4b\x8a\ --\x44\x6d\x50\x7b\xeb\xa3\x98\x02\xa0\x23\x8b\xb6\xca\xe1\x0e\x87\ --\xfc\x55\x9b\x53\xcc\x6d\x75\x90\x6c\xb4\x3d\xc1\xa2\x28\x45\x52\ --\x52\x10\x52\x49\x53\x11\xf2\x33\x54\xb1\xd8\x8d\xb2\x78\x52\x81\ --\x68\x0c\x65\xe7\xbd\x19\x53\x00\x74\x60\x51\xb9\xbc\xf3\x78\x07\ --\xbf\x6d\x73\x50\xa4\x1a\x6d\x4c\x90\x89\xb5\xc2\xec\xa1\x2a\x51\ --\x21\x3b\x7c\xbc\x00\x27\x42\xbc\x83\xf4\xfe\xb3\x38\xcf\xba\x5c\ --\x08\xd1\xdb\x26\x57\x21\xc5\x14\x80\x40\x90\x52\xac\xac\x21\x5f\ --\xb8\xd4\x87\xaa\x5b\xc5\xb7\x0f\x9e\x10\xe9\xde\x3e\xf2\x18\x8e\ --\xcb\x93\x0c\x4c\x0b\x9b\x5f\xf6\x80\x84\x97\xbd\x28\x0b\x2f\xcf\ --\x17\x55\x46\x1b\x13\x89\x98\x02\xa0\x81\xef\x7e\x20\x63\x06\x27\ --\xf3\x13\x87\x9b\xef\x39\xbd\xa4\x7a\x7b\xe9\xeb\x3e\x35\x0e\x06\ --\x65\x48\x92\xa2\x25\x55\x2d\x82\x43\x4d\x67\x1e\x93\xe9\x83\x54\ --\xd2\xe2\x0c\x34\xee\x62\x08\xdc\x42\xe5\x35\x50\xfe\x50\x5c\x20\ --\xb6\x18\x6d\x4e\x24\x61\x0a\x80\x1f\xfc\xf8\x03\x99\xd9\x2f\x89\ --\xdf\xda\x5d\x7c\xc5\xe5\x25\xc6\x68\x7b\x82\x45\xac\x15\x46\x66\ --\x4b\x0a\x53\xe5\xe9\x07\xe3\x68\x8b\xa0\xa2\xc6\xf7\xaf\xc4\x18\ --\x98\x3e\x50\x25\xca\x62\x9c\x8d\xdd\x23\xd7\x49\x78\xbc\x24\xcf\ --\xf2\x9e\xb9\x3c\xe8\x1e\x53\x00\xba\xe0\x37\x2b\xe5\x80\xd8\x28\ --\x16\xb6\xda\x99\xa9\xca\xde\xfb\x5d\x59\x2d\x30\x24\x5d\x32\xa4\ --\x9f\x3c\xc7\xcd\xf7\x48\xb3\x60\x47\x9d\xc0\xa3\x42\x5a\x1c\x5c\ --\xd1\x5f\x25\x3a\xac\x07\xff\x19\xa4\x64\x87\x82\xfc\xbf\x96\x7c\ --\xcb\xcb\x33\x85\xf0\x18\x6d\x4f\xb8\xd2\x6b\x1f\xea\x9e\xf0\xf8\ --\x4a\x59\x10\x65\xe1\x5f\xed\x4e\xe6\x7a\xc3\x74\xe0\x0b\x01\xa9\ --\xb1\x90\x16\x27\xb1\x9c\x1c\xb4\x76\x37\xb4\x38\x04\x1d\x27\x5d\ --\x69\x14\x01\xfd\x12\x24\xf1\xd1\xf8\x36\xed\x24\xb8\x25\xb8\x3d\ --\xa0\x28\x60\x15\xbe\xe9\x7e\x7e\xb2\xc4\x7a\xd6\xc0\x96\x12\xb6\ --\xd4\x0a\x8e\xb6\x9c\xf9\xd5\xaf\x1c\x20\xc9\x4c\x88\xc8\x17\xea\ --\x11\x29\xf8\xcd\xc1\x5c\x65\xe1\x1d\x42\x78\x8d\x36\x26\xdc\x08\ --\xcb\x87\xdb\x28\xfe\xf7\x33\x99\x1b\x27\x78\xba\xcd\x21\x6f\x50\ --\xa5\x08\xdb\xef\x26\x2d\x0e\x4a\xf2\x55\x92\x2e\xb1\x18\xd9\xdf\ --\x28\xd8\x59\x27\xb8\xa2\x48\x92\xad\xd1\xb1\x58\x95\xb0\xb9\x5a\ --\x50\xdb\x76\xee\xaf\x3f\x26\x47\x32\x38\x23\x22\x05\xe0\x14\xbb\ --\x91\xf2\xb7\xc5\xf9\x96\x97\x84\x10\xbd\x74\xf7\x46\x3b\x61\xfb\ --\x90\x87\x92\xc7\xde\x95\xf1\xa9\xa9\xea\x93\xad\x0e\xe5\x6e\xaf\ --\x0c\x5d\x74\x5d\x20\x44\x5b\x60\xce\xb0\xae\x8f\xe1\x3a\x5c\xf0\ --\xe9\x7e\x05\xab\x02\x43\xfb\x49\x86\xf5\x93\xf8\x23\x67\x5e\x09\ --\x9b\x2a\x05\x75\x1d\x17\x5e\x2c\x04\x64\x25\x48\x92\x62\x20\x3e\ --\x1a\x72\x92\x24\xf1\x51\x3d\xf8\x45\x8c\x63\x8b\x22\xd4\x47\xc7\ --\xe7\x45\x7d\x6c\xb4\x21\xe1\x40\x9f\x16\x80\xc7\x1e\x93\x4a\xf2\ --\x2c\x1e\xb1\xbb\x79\xcc\xe9\x25\xb8\x7e\x6d\x3a\x91\x18\x0d\xc3\ --\x32\x7d\xd3\x7e\x8f\xd7\x37\x5d\x8f\xb2\x42\x6e\x92\x44\x39\xeb\ --\xaf\xb9\xff\x84\x60\xdf\x71\x81\x14\x70\x45\xa1\x4a\x46\x42\xd7\ --\xed\x7a\x54\xf8\xe2\xa8\xe0\x84\xcd\xbf\x47\x22\x4a\xf1\xf9\x03\ --\xc4\x5a\x7b\xf0\xcb\x18\x8a\xf8\x14\x45\x7c\xbf\x24\x57\xec\x32\ --\xda\x12\x23\xe9\xb3\x02\xf0\xc7\xd5\xf2\x1a\x97\xca\x0b\x36\x37\ --\x39\x46\xdb\xa2\x07\x85\x29\x92\x09\x01\x7a\xe7\xa9\x12\xbe\xa8\ --\x14\x34\x5c\xe4\xcd\xdf\x15\x7a\x05\x04\x19\x86\xc0\x8d\xe4\x49\ --\xd5\xa1\xfc\xbc\x74\xb0\x68\x35\xda\x1c\x23\xe8\x73\x02\xf0\xeb\ --\x4f\x65\x46\x6c\x0c\x6f\xb6\xda\xb9\x2a\x82\x1f\xdd\x0b\x28\xce\ --\x93\xf4\x0f\xc0\x41\x47\x02\x65\xd5\x82\xea\x56\xed\x8f\xc2\x35\ --\x43\x55\xe2\xa3\x35\xdf\x16\x8e\x34\x48\xe4\x8f\x4a\xf2\x2c\xcf\ --\xf7\xb5\xa3\xc3\xb0\x5e\xef\xea\x8a\x94\xe2\x0f\x6b\xe5\x7f\x7a\ --\x05\xb5\x2d\xbd\x6c\xf0\x0f\x4a\x0f\x6c\xf0\x83\x6f\xa9\x10\xc8\ --\xe0\x4f\x3e\xb9\x17\xd0\x4b\xc8\x12\x88\x67\x2b\x6a\xbd\xab\xb7\ --\xd6\xc8\xe1\x46\x1b\x13\x4a\xfa\xc4\x0c\x60\xa5\x94\xd6\xf2\xb5\ --\xf2\x8b\x56\xbb\x98\x60\xb4\x2d\x7a\x53\x98\x22\x29\xc9\xf7\x6f\ --\x93\xef\x7c\x9c\x1e\x58\x7e\x40\xc1\x15\xc0\xe1\x58\xdc\xc9\xf4\ --\x60\x96\xde\xf7\x0a\xb1\x4b\xf8\x5d\x6c\x8b\xf2\xeb\x51\xa3\x84\ --\xcb\x68\x63\x82\x4d\xaf\x17\x80\xb2\x5a\x39\x41\x48\x75\xe1\xfe\ --\x13\x62\xdc\xce\xfa\xde\xf5\xeb\xc6\x47\xf9\x36\xe2\x2c\x3d\xf8\ --\xb5\x54\xe9\x3b\x35\x70\x7a\x7c\x8d\xb8\xbc\xe0\xf6\x42\xab\x03\ --\xda\x9c\x02\x9b\xd3\x27\x14\x17\x3b\x37\x1b\x9f\x27\x19\x10\x3e\ --\x71\x01\xba\x22\xa1\x42\x0a\xe5\x6b\xa5\x79\xa2\xdc\x68\x5b\x82\ --\x49\xc4\xee\xe1\x76\x87\x94\x52\xd9\x72\x4c\xfd\xae\x94\xea\xef\ --\x80\xe8\xb8\xc8\x3c\xb2\xea\x92\xa2\x54\xd9\xa3\xc1\x0f\x3e\x67\ --\xa1\xe4\x18\x20\xe6\x62\x03\xd9\xf7\x99\x94\xd0\xee\x84\xbd\xc7\ --\x05\x35\x67\xf9\x07\xf4\xd6\x58\x08\x00\x01\xc5\x42\xaa\x1b\xca\ --\x6a\xbc\xff\x7b\x30\x4f\xf9\x55\x6f\x75\x22\xea\x5d\xaf\xc4\x93\ --\x6c\xae\x95\x45\x8a\xf4\x2e\x02\x31\x0d\x7c\x6f\xb5\x0d\x55\x0a\ --\x8d\x9d\x46\x5b\xa6\x2f\xe3\x72\x25\x03\xd3\xbb\x7f\x03\xcb\x93\ --\xff\xe9\xa9\x6b\x93\xc4\xb7\x67\x70\xb8\x49\x90\x18\x2d\x29\x2d\ --\x90\xc4\xf4\xda\x57\xc8\xd9\xc8\xcf\xbd\x56\xcb\xdd\x13\xb3\xc5\ --\x21\xa3\x2d\xd1\x9b\x5e\x27\x00\x2f\x6c\xf2\xfe\xd6\x6a\x15\xdf\ --\x73\x7b\x89\x73\x7a\xa0\xc3\x25\x68\x77\xfa\xa6\xba\xbd\x8d\xdc\ --\x24\xc9\xa4\xa2\xae\x7f\xb1\x83\x8d\x82\xdd\x0d\x82\x91\xd9\x92\ --\x41\x7e\x88\x85\xc9\x25\x69\x93\x42\x7e\x7b\x42\x9e\xf5\x25\xa3\ --\x0d\xd1\x93\x5e\x23\x00\xef\x6d\x93\x69\xd5\x36\xbe\xa8\x6d\x63\ --\x58\x57\xd7\xc5\x58\xc1\x22\xc0\xd6\x4b\x32\xd6\x9f\xbd\x0e\x6f\ --\x77\xfa\x3c\x05\x63\xac\xbe\xb7\xf5\x8e\x3a\xc1\xc1\x46\xdf\x9f\ --\xb8\x30\x55\x32\x21\xdf\x14\x80\x1e\x23\x78\x41\x45\xf9\x56\x69\ --\x9e\xb0\x19\x6d\x8a\x1e\xf4\x0a\x01\xf8\x77\x99\xbc\xea\x58\xa7\ --\x5c\xa6\x28\x22\xbe\x5f\x82\x24\x21\xca\xb7\x6e\xdd\x5e\x27\x38\ --\x95\xa8\x23\x31\x06\x8a\x73\xcf\x78\xc4\x35\xdb\xe1\x70\x93\xa0\ --\xd3\x2d\x48\x39\xb9\xfe\x3d\xdc\x2c\x08\x97\xfc\xfb\xfe\x22\x80\ --\xac\x44\x89\x57\xc2\x89\x4e\x41\x9c\x15\xc6\xe6\x4a\x8e\x36\x73\ --\xda\xa5\xd7\x6a\x81\x2b\xfb\x87\x61\x1c\x7f\xe4\xb2\x4d\xf5\x2a\ --\x0b\x4a\x8b\xc4\x41\xa3\x0d\xe9\x29\x11\x2f\x00\x2f\x6e\xf2\xfe\ --\x8f\x43\x15\x3f\x1f\x99\x25\xa3\xcf\x3e\x97\x6e\xb1\xc3\xaa\x43\ --\x67\xce\xa8\x86\x64\x48\x46\xe7\x74\x3d\xba\xb7\x9f\xf5\xc6\xec\ --\x0d\x08\x01\xfd\x53\x25\xc3\x33\x25\xbd\x71\x13\xd4\x60\xda\x84\ --\x90\xf7\x15\xe7\x59\xdf\x32\xda\x90\x9e\x10\xb1\x4f\xfb\x63\x52\ --\x2a\x39\x1b\xf8\xb0\xdd\x29\xaf\x99\x31\xf8\xcc\x6e\xb8\xcb\xeb\ --\x7b\xb3\x1f\x38\x21\x70\x9f\xb5\x4b\x6d\xb5\xc0\x75\xc3\xbb\x3e\ --\x32\xab\x6a\x15\x94\x55\x87\xdf\x57\x62\x51\xb4\xed\xb8\xa7\xc4\ --\x42\x41\x8a\x2f\xb1\x47\xe4\xfa\xea\x47\x04\x12\xf8\x5d\x71\x9e\ --\xf2\x93\x48\x8d\x30\x0c\xbf\xa7\xdd\x0f\x9e\xde\x2c\x73\xed\x0e\ --\x2a\x9a\xed\x64\x4f\x1f\xa8\x92\x7a\x72\x6a\x5b\xd5\x2a\xd8\x7a\ --\x4c\xe0\xb9\xc8\x81\x4d\x46\x02\x5c\x39\x40\x3d\xc7\xf5\x51\x4a\ --\xa8\xef\x14\x20\x7d\x71\xf5\xdb\xeb\x02\xf3\x8a\xd3\x1b\x21\x7c\ --\xd3\xfa\x82\x64\xc8\x4c\xf4\x0d\xe2\xf2\x1a\x41\x65\xcb\xc5\x6d\ --\x8b\xb1\x42\x46\xbc\xa4\x5f\x02\xe4\x24\xca\xde\xe4\xa1\x17\x21\ --\x88\xb7\x2d\x16\xf1\x95\x71\x39\x22\xe2\xce\x99\x8c\x7f\xda\x35\ --\xf2\xc2\x16\x59\x5c\xdf\x22\xd7\x75\xba\x44\xdc\xd8\xb3\x12\x54\ --\xee\x6e\x10\xec\x3d\x7e\xe9\x5f\xa7\xb4\x40\x52\x90\x72\x66\x09\ --\x20\x25\x6c\xac\x12\x1c\x6b\x0f\x9f\xaf\x20\x4a\x81\xa2\x34\xc9\ --\xa0\x0c\xdf\x3e\x06\x80\xdd\x03\x15\x35\xe7\x06\xea\x08\x7c\x39\ --\x01\xf2\x52\x24\x59\x89\xbe\x10\xdd\xf0\xf9\x2d\xfa\x2c\x5b\x2d\ --\x52\xb9\x61\x5c\x81\xa8\x36\xda\x10\x2d\x44\xd4\x04\xf1\x85\x4d\ --\xf2\xe6\xda\x66\xde\xb0\xbb\x85\x75\x54\xf6\x99\xc1\x5f\xd5\xd2\ --\xf5\xe0\x07\x2e\x48\x65\x75\xa0\x31\x3c\x06\x7f\xb4\x05\xb2\x93\ --\x24\x79\x49\x90\x95\x74\xa1\x63\xcf\xa6\x4a\x85\xa6\xb3\xca\x69\ --\x26\xc7\x40\x71\x7e\xef\xdc\xd0\x73\x79\x3c\xbc\xfa\xf6\x4a\xae\ --\x9d\x31\x91\xac\x8c\x54\xa3\xcd\xd1\xca\x38\xaf\x50\xbf\x28\xaf\ --\x96\xf3\x4a\x0a\xc4\x56\xa3\x8d\xf1\x97\x88\x11\x80\x17\xcb\xe4\ --\xc3\x47\x5b\xf8\x83\xdb\x8b\x18\xda\xef\x4c\x59\x2a\xb7\xea\xdb\ --\xbc\xeb\x8e\x56\x07\x64\x25\xfa\xfe\xbf\xc5\xe1\x9b\x31\x5c\x8a\ --\x7e\x09\x92\x7e\xf1\x10\x1f\x03\xd1\x8a\x6f\x0d\xee\xf2\xc2\x81\ --\x13\x82\x66\x1d\x6a\xdb\x5a\x14\x5f\x42\x8d\xc2\x14\xdf\x54\x5f\ --\xe9\xc2\x7c\xab\x45\x02\x02\x45\xf8\x2a\xf3\x0e\xe9\x17\xe6\x19\ --\x4b\x02\xa4\x6c\xfb\x7e\xfe\xb8\x70\x09\x47\xab\xeb\xb9\x7a\x6a\ --\x89\xd1\xe6\x04\x4a\xbe\x14\xea\x9a\xb2\x5a\xf7\x1d\x13\xf2\xa2\ --\x96\x19\x6d\x8c\x3f\x44\x84\x00\x2c\xdc\xec\xfd\xcb\xe1\x26\xbe\ --\xeb\x95\xbe\xa9\xef\xc8\xac\x33\x53\xf9\x83\x8d\xc2\xaf\x60\x96\ --\x43\x4d\xe2\x74\xc4\x5c\x79\x8d\x72\x49\xc7\xa0\xf8\x68\x5f\xdd\ --\xbb\xd4\xd8\x73\x3d\xe7\xda\x9c\xe0\xf4\xf6\x6c\xc6\xa0\x08\x18\ --\xd2\x4f\x32\x24\x43\xfa\x9d\x5c\xb3\x38\x4f\x72\xa2\xf3\xcc\x5e\ --\x40\x6f\xa3\xa1\xb1\x85\xa7\x5f\x79\x9f\x8f\x56\x6f\x36\xda\x14\ --\x5d\x10\x90\x84\x54\xde\x2e\xab\xf1\xdc\x3b\x21\xdf\xfa\x9a\xd1\ --\xf6\x74\x47\xd8\x3f\x52\x4f\x7d\xa1\x2e\xae\x6c\x16\xb7\x9f\x3a\ --\x9f\x1f\x93\xa3\x9e\x33\x30\xab\x2f\xb1\x31\x76\x3e\x76\xb7\x2f\ --\x4d\x16\xd0\xa5\x60\xd8\x5c\xb0\xfa\x90\x2f\x9d\x56\xac\xd5\x77\ --\x7a\xe0\xf6\x42\x67\x0f\xe3\xc2\xa2\x2d\x30\xa5\xff\x99\x0d\x4b\ --\x7f\x89\x8b\xf2\x39\xf1\xf4\x36\x9c\x2e\x37\x6f\x7c\xf0\x19\xcf\ --\xbf\xf1\x31\x76\x47\xaf\x0b\xba\x8b\x16\x88\x97\xcb\x6b\x3c\x89\ --\x25\xf9\xd6\x85\x46\x1b\xd3\x15\x61\x2d\x00\x7f\x5f\xaf\x7e\x58\ --\xdb\x26\xae\x3d\xf5\xef\x9c\x24\x79\x4e\x41\xca\x56\x87\x2f\x92\ --\xcd\x5f\xb4\x84\xbd\x7a\x54\x6d\x6d\x77\x47\x69\x81\xbc\xe8\xe0\ --\xef\xb4\xd9\xe9\xb4\x39\xe9\xb4\x3b\xb0\x39\x1c\xd8\xed\xbe\x4e\ --\x5d\x1e\x0f\x0e\xe7\x85\xee\x8a\xb1\x31\x51\x44\x5b\x7d\x7f\xb6\ --\xa4\x04\x5f\x83\x71\x71\x31\xa4\x24\x26\x90\x94\x18\x87\xa2\x84\ --\xff\x02\x61\xed\xa6\x9d\xfc\xe5\xf9\x37\xa9\xad\xef\xd5\x25\xfe\ --\x2c\x20\xfe\x55\x56\xeb\x4d\x9a\x90\x67\xf9\x93\xd1\xc6\x5c\x8a\ --\xb0\x15\x80\x27\x3f\x57\x3f\x3d\xd6\x2e\x66\x9f\xfd\x59\xd1\x59\ --\xfb\x42\x52\xfa\x5c\x5d\xb5\xa0\x08\xdf\x71\x59\x66\x02\x24\xc7\ --\xfa\xda\xd8\xa7\xd3\xba\xfe\x6c\xa4\x54\x69\x69\x6e\xa2\xa3\xad\ --\x99\x8e\xb6\x56\xdc\xb6\x56\x8e\x6e\x68\xe1\x44\x53\x2b\x27\x9a\ --\xdb\x38\xde\xd4\x4a\x47\xa7\x9d\x0e\x9b\xce\x1d\x03\xf1\xf1\xb1\ --\xa4\x24\xc6\x93\x92\x94\x48\x46\x5a\x12\xd9\x19\xa9\xf4\x4b\x4f\ --\x21\x27\x33\x9d\xa2\xfc\x4c\x8a\xf2\xb3\x89\x8f\x35\xa6\xb6\x49\ --\x75\xdd\x09\xfe\xbc\x70\x29\x9f\x57\xec\x36\xa4\x7f\x03\x10\x42\ --\xf2\x44\x45\x8d\x37\xa5\x38\xdf\xf2\x0b\xa3\x8d\xb9\x18\x61\x29\ --\x00\x4f\x6f\x50\x57\xd7\xb4\xfa\x22\xf9\xce\x26\x2e\xca\x37\x15\ --\x56\xa5\xef\x68\xec\x78\x67\xd7\x02\x90\x18\xe3\xf3\x84\x8b\xb1\ --\xfa\x62\xe7\xd3\xe2\xcf\xec\xb2\xdb\xdd\xb0\xa3\xbe\x67\x83\xdf\ --\xeb\xf5\xd2\xd2\x74\x9c\x13\x0d\x75\xb4\x36\x9f\xe0\x44\x43\x1d\ --\x8d\xc7\xeb\x68\x3a\x5e\x8f\xdb\x6d\xcc\xb4\xd6\x66\x73\x60\xb3\ --\x39\x38\xd6\xd0\x74\xd1\x9f\x5f\x3f\xf3\x72\x7e\xf2\xed\x3b\x43\ --\x6a\x93\xd3\xe5\xe6\xe5\xb7\x96\xf3\xd2\x9b\x2b\x70\xb9\x7b\x49\ --\x10\x86\x06\x24\x3c\x56\x5e\xe3\x55\x4a\xf2\x2d\xff\xcf\x68\x5b\ --\xce\x27\xec\x04\xe0\xa9\xcf\xd5\x4f\x2f\x36\xf8\x01\x76\xd4\x2b\ --\x14\x24\x4b\x0e\x37\x0b\xda\x1c\xdd\xb7\x35\x22\xf3\xc2\xb3\xff\ --\xfa\x76\x41\x65\x0b\xd4\xb5\x9f\x89\x13\xf0\x97\x96\xe6\x46\x6a\ --\x8f\x1e\xa2\xae\xb6\x8a\x9a\xaa\x43\x34\x1c\xab\x46\x46\x5a\xf0\ --\x40\x88\x59\xb7\x79\x27\x7f\x7a\x76\xe9\x25\x05\xa9\x0f\xf1\xf3\ --\x8a\x5a\xaf\xa3\x38\xcf\xf2\x1b\xa3\x0d\x39\x9b\xb0\x12\x80\xa7\ --\x36\xc8\x77\x6b\x5b\x99\x7d\xa9\x9f\x37\x76\x42\x63\x37\x6f\xfd\ --\xb3\x39\xdc\x24\x90\xf8\x66\x0c\xad\x76\xa8\x6d\x13\x38\xfc\x2c\ --\x12\xe5\xf5\x7a\xa9\xad\x3a\x44\xd5\xe1\x83\x1c\xab\x39\x42\x6d\ --\xd5\x11\x9c\x0e\xfd\xa7\xec\xbd\x95\xca\xda\x06\x9e\x58\xb8\x84\ --\x4d\x5b\xf7\x19\x6d\x4a\xd8\x20\x25\xbf\x2e\xaf\xf6\xba\x4a\x0a\ --\x2c\x7f\x30\xda\x96\x53\x84\x8d\x00\x3c\xb9\x5e\xbe\x5e\xdb\xca\ --\x0d\x7a\xb6\xd9\x68\x83\x46\x3f\xf3\xdc\x03\xb4\xb5\x34\x71\x70\ --\xef\x4e\x8e\x1c\xd8\x4d\xd5\x91\x03\xb8\x5c\x4e\x3d\xcd\xe9\x13\ --\xd8\x1c\x4e\x5e\x78\xe3\x13\x16\xbf\xb7\x0a\xf7\xc5\x7c\xb2\xfb\ --\x3a\x82\xdf\x57\xd4\x7a\xda\x8a\xf3\xac\xff\x32\xda\x14\x08\x13\ --\x01\xf8\xe7\x06\xef\x33\xd5\xad\xdc\x66\x44\xdf\x4d\xc7\xeb\xd9\ --\xb7\x6b\x2b\xfb\xf7\x6c\xa3\xbe\xd6\x2c\x31\xdf\x13\x96\xaf\xdb\ --\xc2\xdf\x5f\x7c\x9b\x86\xc6\x16\xa3\x4d\x09\x67\x84\x94\xe2\xc9\ --\xb2\x1a\x4f\x5b\x38\xf8\x09\x18\x2e\x00\xcf\x6e\xf2\xfe\xf7\xd1\ --\x16\xe5\xc1\x50\xf6\xe9\xb0\x75\xb2\x6f\xf7\x56\x76\x6e\xd9\x44\ --\x4d\x65\xaf\xcb\xf2\x14\x72\x2a\x6b\x1b\xf8\xd3\xb3\x4b\xd9\xb8\ --\x65\xaf\xd1\xa6\x44\x0a\x16\x21\xc4\xa2\xf2\x1a\x77\x63\x49\x7e\ --\xd4\xa7\x46\x1a\x62\xa8\x00\xbc\x50\x26\xe7\x57\xb6\xf0\xdb\x50\ --\xec\xa3\x49\x29\x39\x72\x60\x37\x5b\x36\xae\xe5\xd0\xfe\xdd\x48\ --\x19\x91\xd1\x9b\x61\x85\xcd\xe6\xe0\xd9\xd7\x3f\xe2\x8d\x0f\xd6\ --\xe0\xf1\x9a\xd3\x7d\x4d\x48\xa2\x40\x59\xb2\xb9\x4a\x4e\x2d\x2d\ --\x14\xdb\x8d\x32\xc3\x30\x01\x78\xb9\x42\x8e\xaf\x6c\x61\xb1\xdb\ --\x1b\xdc\x40\x36\xa7\xc3\xce\xb6\xb2\xf5\x6c\xdd\xb4\x8e\x96\xe6\ --\x5e\xed\x78\x12\x32\xa4\x94\x7c\xb2\xa6\x9c\xbf\xbf\xf8\x0e\x8d\ --\x2d\x6d\x46\x9b\x13\xc9\x24\x2b\x8a\xfa\xce\xf6\x7a\x39\x79\x4c\ --\xb6\xa8\x37\xc2\x00\x43\x04\xe0\xc5\xad\x32\xab\xa6\x45\xae\xb3\ --\xbb\x45\xd0\xfa\xb7\x75\xb6\xb3\x65\xd3\x5a\xca\x3e\x5f\x6d\xee\ --\xde\xeb\x48\x65\x4d\x3d\x4f\x3c\xbb\xd4\xdc\xdd\xd7\x8f\x01\x6e\ --\x8f\xfa\xfe\xd6\x3a\x39\xdd\x88\x7c\x02\x21\x17\x80\xc5\x3b\x65\ --\x74\x4d\x13\xdb\x3b\x9c\x22\x28\xd5\x78\x3b\xda\x5a\xf9\xfc\xb3\ --\x8f\xd8\x51\xbe\x01\xaf\xd7\xcf\x33\x3f\x93\x6e\xe9\xb0\xd9\x59\ --\xf8\xea\x32\x96\x7e\xb4\x16\x6f\x6f\x2e\x08\x60\x0c\x13\x3e\x3f\ --\xc2\xf6\x95\x2b\xe5\xb0\x99\x33\x45\x48\x1f\xda\x90\x0b\x40\x43\ --\xab\x5c\xd3\x6c\x17\x59\x7a\xb7\xeb\x74\xd8\xd8\xb0\x66\x39\xe5\ --\x1b\x56\xe3\xe9\x83\xde\x66\xc1\x42\x4a\xc9\x47\x9f\x95\xf1\x8f\ --\x45\xef\xd0\xd4\xd2\x6e\xb4\x39\xbd\x96\x13\x9d\x0c\x94\xf1\x7c\ --\x0a\xcc\x08\x65\xbf\x21\x15\x80\x85\x1b\xbd\xbf\x39\xda\x22\x2e\ --\xd7\xb3\x4d\x55\x55\xd9\xb2\x69\x0d\xeb\x56\x2c\xc3\xe9\xe8\x15\ --\x99\x9a\xc3\x86\x7d\x87\xaa\xf9\xe3\x33\x4b\xd8\xb1\xef\x88\xd1\ --\xa6\xf4\x7a\x06\x67\x48\xf6\x34\x88\xe9\x0b\x37\x7b\x7f\xf9\x60\ --\xa9\xe5\xe7\xa1\xea\x37\x64\x02\xb0\x68\x93\x9c\x73\xa4\x8d\x47\ --\xf5\x6c\xb3\xae\xa6\x92\x4f\xdf\x7f\x9d\xba\x9a\x4a\x3d\x9b\xed\ --\xf3\x9c\x9a\xee\x2f\x59\xb6\x16\x55\x35\xa7\xfb\xa1\x60\x70\x86\ --\x64\xff\x09\x41\x6d\xab\xf2\xd3\x17\xcb\xe4\xaa\x7b\x27\x88\x15\ --\xa1\xe8\x37\x24\x02\xf0\xca\x5e\xd9\xaf\xba\x8e\x77\xf4\xda\xf1\ --\x77\x39\x1d\xac\x5c\xf6\x26\xdb\x2b\x36\x10\x71\x89\xfc\xc3\x18\ --\x55\x95\xbc\xbf\x62\x03\x4f\xbd\xf2\x1e\xad\x6d\x11\x97\xdf\x32\ --\xa2\xb1\x2a\xbe\xe4\xae\x9d\x2e\x44\x7d\x87\x7c\xef\xcd\x0a\x99\ --\x37\xbf\x58\x04\xdd\xa3\x2a\x24\x02\xd0\xd2\xc4\xe7\x1d\x4e\x62\ --\xf5\x68\xab\xf2\xf0\x3e\x96\xbd\xf9\x0a\x6d\xad\xcd\x7a\x34\x67\ --\x72\x16\x7f\x7b\xf1\x6d\x16\xbf\xb7\xda\x68\x33\xfa\x2c\xee\x93\ --\xae\x14\xed\x4e\x11\xd7\xe0\x94\x6b\x81\xd1\xc1\xee\x33\xe8\xd9\ --\x23\x9e\xd9\xe4\x7d\xaa\xae\x9d\x21\x3d\x6d\xc7\xeb\xf5\xb0\xe2\ --\x83\xa5\x2c\x7e\xe1\x1f\xe6\xe0\x0f\x12\x1d\x9d\xe6\x71\xa9\x91\ --\xe4\x26\xfb\x66\xb3\x42\x40\x8b\x43\x8c\x5a\xba\x4b\xfe\x57\xb0\ --\xfb\x0c\xea\x0c\xe0\xa9\x8d\x72\x76\x6d\x2b\x0f\xf5\xb4\x9d\xf6\ --\xd6\x16\xde\x5d\xfc\x1c\xb5\xd5\x47\x74\xb0\xca\xc4\x24\x3c\x29\ --\xce\x93\x8c\xcb\xf5\x89\xc0\xc9\x44\xb1\x3f\x29\xaf\x95\x8b\x4b\ --\xf2\xc4\xd1\x60\xf5\x19\xb4\x19\xc0\xe2\x9d\x32\xba\xcd\xce\x9b\ --\x1e\xb5\x67\xeb\xfe\xaa\x23\xfb\x59\xf4\xf4\xff\x99\x83\xdf\xa4\ --\x4f\xa0\x08\xce\xce\x12\x9d\x8a\xf4\x2e\x5a\x2c\xa5\x9f\x29\x64\ --\x03\xe8\x2f\x58\x0d\x37\xb7\xcb\xf7\x3b\x9c\x24\xf5\xa4\x8d\xb2\ --\xcf\x57\xb1\xf8\xf9\xbf\x63\xeb\x34\xcf\x9f\x4d\xfa\x2a\xe2\xaa\ --\x21\xc7\xd4\xa0\x2d\x05\x82\x22\x00\x2f\x6d\x95\xb7\x1d\x6b\x17\ --\x57\x07\xdc\x80\x94\xac\x5f\xf5\x21\x2b\x97\xbd\x69\x66\xdc\x31\ --\x31\x81\x5f\x6e\xa9\x91\xc5\xc1\x68\x58\x77\x01\xf8\xcb\x7e\x19\ --\x53\xd7\xca\xf3\x97\xca\xbb\xdf\x1d\x5e\xaf\x87\x77\xdf\x78\x81\ --\xf5\x2b\x23\xa2\xae\x82\x89\x49\xf0\x91\x44\xd5\xb6\xab\xaf\xff\ --\x7d\xa5\x4c\xd4\xbb\x69\xdd\x05\x20\xae\x99\xb7\xdb\x1c\x24\x04\ --\x72\xaf\xd7\xeb\xe5\xdd\xc5\xcf\xb1\x77\x47\x85\xde\x66\x99\x98\ --\x44\x34\x07\x1a\x95\xc1\x4a\x2c\x4b\xf5\x6e\x57\x57\x01\x58\x54\ --\x26\xaf\xad\x69\x65\x6e\x20\xf7\x9e\x1a\xfc\x07\xf6\xec\xd0\xd3\ --\x24\x13\x93\x88\xa7\xc5\xee\xcb\x87\x59\xdf\xc1\x9c\x85\x9b\xe4\ --\x75\x7a\xb6\xad\x9b\x00\x2c\x5e\x2c\x2d\xf5\x1d\xbc\x1a\xc8\xd4\ --\x5f\x3d\x3d\xf8\x0d\xcb\x8b\x60\x62\x12\x96\x48\x60\x7b\xbd\x72\ --\x3a\xb9\x6d\xb3\x9d\x7f\x2f\x5e\xac\xdf\xa9\x80\x6e\x02\xd0\x31\ --\x90\x7f\xb5\x39\x49\x09\xe4\xde\x15\xcb\x96\x9a\x83\xdf\xc4\xe4\ --\x22\xec\xa8\x13\x34\x9e\xe5\x95\xdd\xe6\x20\xa5\xb5\x3f\xba\x95\ --\x1b\xd3\x45\x00\x16\x6f\x91\xf9\xc7\xda\xb9\x2f\x90\x7b\x37\xac\ --\xf9\x84\x2d\x1b\xd7\xea\x61\x86\x89\x49\xaf\xc1\xe1\x81\x4d\xd5\ --\x82\x83\x8d\x17\xba\xd1\xd4\xb7\x73\xcf\x33\xeb\x64\x7f\x3d\xfa\ --\xd1\xc5\x13\xb0\xc5\x21\x97\x3a\x3d\x42\xb3\x98\xec\xd9\x51\xc1\ --\x9a\xe5\xef\xeb\x61\x82\x89\x49\xaf\xa0\xcd\xc9\xc9\xa8\xc0\x4b\ --\x17\xae\x71\xa9\x28\x4e\x85\xa5\xc0\x84\x9e\xf6\xd7\xe3\x19\xc0\ --\xbf\xcb\xe5\xec\xda\x76\xed\x31\xfe\x8d\xc7\xeb\xf8\xe8\xad\x57\ --\xcc\x68\x3e\x13\x13\xc0\xe3\x85\xb2\x1a\xc1\xca\x03\x0a\x55\x2d\ --\xdd\x57\xad\x6a\xe8\xa0\xe4\xb9\x32\x79\x63\x4f\xfb\xed\xf1\x0c\ --\xa0\xc9\xce\x22\xad\x1b\x7f\x6e\x97\x8b\xb7\x5f\x7b\xd6\xb0\xfa\ --\x79\xc1\xc6\x6a\xb1\x90\x96\x92\x48\xbf\xf4\x14\x12\xe2\x7d\x41\ --\x90\x2e\x97\x87\x6d\x7b\xcc\x14\xe4\x26\x17\xe2\x51\x61\xed\x51\ --\x85\x16\x0d\xb1\x58\x52\x42\x73\x27\x0b\x81\x1e\x65\xd7\xea\x91\ --\x00\xbc\xb8\xc9\xfb\xf0\xc1\x66\x72\xb5\xde\xf7\xc9\xfb\x8b\x69\ --\x3a\x6e\x48\x12\x54\xdd\x89\x8b\x8b\xa1\x64\xd4\x10\x86\x0f\x2a\ --\x64\xd8\xc0\x02\x86\x0c\xc8\x25\xbb\x5f\x1a\x42\x9c\xbb\x76\xab\ --\xad\x6f\xe4\x8e\x6f\xff\x7f\x06\x59\x69\x12\xce\xec\xa8\x13\x9a\ --\x06\xff\x29\x5a\x1c\x64\x3e\xb7\xc9\xfb\x93\xaf\x4e\xb4\xfc\x3a\ --\xd0\xbe\x03\x16\x80\xc5\x8b\xa5\xe5\xa8\x5d\xfe\xaf\xd6\x09\xfc\ --\xee\x6d\x9b\xd9\xb5\x65\x53\xa0\xdd\x86\x05\x39\x99\xe9\xcc\xbc\ --\x62\x1c\x57\x94\x5c\xc6\x98\x11\x83\x88\xb2\x06\x2d\x56\xc3\xa4\ --\x97\xd3\x6c\x87\xa3\x2d\x81\xc7\xcb\x1d\xb7\x89\x9f\x2e\x5e\x2c\ --\x1f\xbf\xe3\x0e\x11\x50\x61\x86\x80\x05\xa0\x63\xa0\xfa\xfb\xf6\ --\x66\x25\x4e\xcb\x3d\x0e\x5b\x27\x2b\x97\xbd\x15\x68\x97\x86\x12\ --\x6d\xb5\x32\x75\xe2\x28\xe6\x4e\x9f\xc8\x15\x25\x97\xa1\x28\x41\ --\x4f\xa5\x60\xd2\xcb\x91\x12\xb6\x1e\x53\x7a\xb4\x0d\xd6\xe1\x14\ --\x71\x2d\x03\xd4\x3f\x00\x3f\x08\xe4\xfe\x80\x04\xe0\x31\x29\xad\ --\x8d\x9f\xf1\x4d\xad\xf7\x2d\xff\x70\x69\xc4\x45\xf6\xc5\xc5\x46\ --\x73\xc3\xac\xc9\xdc\xbd\x60\x36\x19\xa9\xc9\x46\x9b\x63\xd2\x8b\ --\xa8\x6c\x09\x6c\xea\x7f\x3e\x8d\x1d\xca\x37\x17\xef\x94\xff\x7d\ --\xc7\x28\xa1\x79\x53\x2d\x20\x01\x18\x54\xae\xfe\xfe\x80\x53\xd1\ --\x94\xe2\xeb\xf0\xfe\xdd\xec\xde\xb6\x39\x90\xee\x0c\x21\x36\x26\ --\x9a\x3b\x6e\x98\xc6\x97\xe6\xcd\x20\x25\x39\xa0\xd0\x06\x13\x93\ --\x4b\x22\x81\x03\x17\x39\xe3\x0f\x04\xbb\x87\xe8\xd6\x4e\xfe\x04\ --\x7c\x4b\xeb\xbd\x9a\xe7\xb1\x8b\xa5\xb4\x34\x74\x88\xff\xd0\x72\ --\x8f\xea\xf5\xb2\xe2\xc3\x25\x5a\xbb\x32\x8c\x29\x13\x46\xb2\xe8\ --\x89\x47\x79\xe8\xce\x79\xe6\xe0\x37\x09\x0a\x76\x17\xb4\xeb\x58\ --\x7d\xbe\xd1\x26\xbf\xf6\xdc\x61\xa9\x39\xef\xa6\xe6\x19\x80\x7b\ --\x8b\xfa\xfb\x36\x8d\x6f\xff\xad\x65\xeb\x69\x6e\x3c\xae\xb5\xab\ --\x90\x93\x95\x91\xca\x0f\x1e\x58\xc0\xb4\x49\x63\x8c\x36\xc5\xa4\ --\x97\x63\xd7\xb9\x76\x8d\xcd\x25\xa2\x3c\xc7\xd5\x3f\x03\xdf\xd0\ --\x72\x9f\xa6\x19\x80\x94\x52\x34\x74\x28\x9a\x3a\x70\xb9\x9c\x6c\ --\xf8\xec\x23\x2d\xb7\x18\x42\xc9\xe8\xa1\x2c\xfc\xdd\x0f\xcd\xc1\ --\x6f\x12\x12\xa2\x82\x90\x8d\xb3\xc9\xa6\xdc\xa7\x35\x50\x48\x93\ --\x19\x2f\x95\xab\x3f\x6e\xb6\x2b\x7e\xd7\xf4\x53\x04\x1c\xa9\x58\ --\x4e\x47\x7b\xf8\x6e\xfc\x29\x8a\xc2\x83\x5f\x9a\xcb\x3d\xf3\xe7\ --\xa0\x28\x41\x2d\x54\x6c\x62\x72\x9a\xa6\x4e\xfd\x9f\xb5\x4e\x17\ --\x31\x9d\x03\xd5\x9f\x02\xbf\xf0\xf7\x1e\x4d\x02\x90\x9d\x28\xe6\ --\x67\x24\x48\x6c\x6e\x68\x73\xc0\x09\x9b\xa0\xe3\x12\xeb\x18\xab\ --\x05\xc6\x64\xd8\xf8\xeb\xca\x55\x5a\xba\x08\x29\xf1\xf1\xb1\xfc\ --\xef\x23\x5f\x65\xe2\xb8\x61\x46\x9b\x62\xd2\x87\x70\x7a\x60\x67\ --\x7d\x70\x5e\x36\x8d\x76\xe5\xfb\x04\x43\x00\xca\xab\xe5\x38\x84\ --\x7a\x5e\xf0\x81\xc4\xe6\x82\x23\xcd\x82\xa3\x2d\x02\xa7\xc7\x97\ --\xd3\x3c\x33\x41\x32\x26\x47\xf2\xce\x87\xeb\xb0\xdb\x75\xdc\xe9\ --\xd0\x91\xa4\x84\x78\xfe\xef\xa7\x5f\x67\xd4\xd0\x01\x46\x9b\x62\ --\xd2\x87\xf0\xaa\xb0\xb1\x5a\xc1\x1d\xa4\x8a\x6b\x6d\x0e\xd2\x9e\ --\x2f\x93\x5f\xb9\x7f\x82\x78\xd9\x9f\xeb\xfd\x9f\x01\x08\xf5\xbf\ --\xe1\xc2\x14\xdf\xf1\xd1\x30\x32\x5b\x72\x59\x96\xc4\xee\xf1\x95\ --\x38\x8a\xb6\x80\xc7\xeb\x65\xc9\xb2\xf0\x0c\xf3\x4d\x4f\x4d\xe2\ --\x89\x9f\xfd\x07\x83\xfb\xe7\x19\x6d\x8a\x49\x1f\xc2\xa3\xc2\xc6\ --\xaa\x73\xe3\xfb\x83\x41\x9b\x93\x5f\x01\x7e\x09\x80\x5f\x9b\x80\ --\x1b\x1b\x64\x0e\x82\xdb\xbb\xba\x46\x08\x88\x8f\xf2\x0d\x7e\x80\ --\xe5\x6b\x2b\x68\x38\x11\xf4\xd2\x66\x9a\x49\x4f\x4d\xe2\xef\xbf\ --\xfa\xae\x39\xf8\x4d\x42\x4a\xab\x03\x56\x1d\x52\x68\xe8\x08\xfe\ --\x3e\x53\x53\x27\x03\x9f\xdf\x22\x47\xf9\x73\xad\x5f\x33\x80\x28\ --\x8f\xfa\x55\x29\x89\xd2\x62\xc4\x1b\x1f\xae\xd1\x72\x79\x48\x88\ --\x89\x8e\xe2\x37\x8f\x3e\x40\x61\x6e\xa6\xd1\xa6\x98\xf4\x11\x1c\ --\x1e\xd8\x77\x5c\x70\xa4\x59\x10\x68\xa6\x6c\xad\xa8\x12\x9c\x4e\ --\xf9\x7f\x40\xb7\xf9\x03\xbb\x9d\x01\x48\x29\x85\x94\x3c\xa0\xc5\ --\x80\xa3\xd5\xf5\xec\x3e\x10\x5e\x25\xbb\x85\x10\xfc\xe8\x9b\x5f\ --\x36\xd7\xfc\x26\x41\x47\x05\xea\xda\x05\x65\x35\x82\x4f\xf7\x2b\ --\x1c\x6a\x0a\xdd\xe0\x3f\x45\x93\x4d\xcc\x7e\x6c\xa5\xec\xf6\x05\ --\xdf\xed\x05\x15\x35\x9e\x59\x08\x45\x53\x71\xcf\x0f\x56\x85\x5f\ --\xb4\xdf\x03\x77\xcc\x65\xce\x55\x25\x46\x9b\x61\xd2\xcb\xb1\xbb\ --\x61\xfd\x51\x45\x57\x2f\xbf\x00\xed\x88\x2a\x48\xe7\x11\xe0\xf1\ --\xae\xae\xeb\x7e\x0f\x40\x28\x5f\xd7\xd2\xb1\xaa\xaa\x7c\xfc\x59\ --\x78\xf9\xfc\x97\x8c\x1e\xca\xfd\xb7\x5d\x63\xb4\x19\x26\x7e\x90\ --\x94\x10\x4f\x6c\x4c\xb4\xd1\x66\x04\x84\x04\x2a\x6a\x85\xe1\x83\ --\xff\x14\x36\x87\xec\x36\x36\xa0\xcb\x19\xc0\x86\x6a\x99\x01\xea\ --\x2d\x5a\x3a\x2d\xdb\x7e\x80\xe3\x4d\xad\x5a\x6e\x09\x2a\x71\x71\ --\x31\xfc\xf8\x5b\x5f\xbe\x20\x41\x87\x49\x78\xa1\x28\x82\xeb\x66\ --\x5c\xce\x37\xef\xbe\x81\xd4\x64\xdd\x0b\xe0\x9c\xc6\xe6\x70\xd2\ --\x70\xbc\x99\xa6\xd6\x76\x4e\x34\xb5\xd1\x61\x77\x60\xb7\x3b\x70\ --\x38\xdd\xb8\xdc\x1e\x84\x80\xa4\x84\x38\x14\x45\x21\x25\x29\x81\ --\x94\xa4\x04\xd2\x52\x12\x29\xc8\xcd\x24\x39\xb1\x6b\x1f\xb8\xa3\ --\xcd\x22\x24\x9b\x7c\xfe\xd2\x62\x17\x45\x2f\x6e\x90\x03\xef\x9d\ --\x24\x0e\x5f\xea\x9a\x2e\x05\xc0\x2a\xd4\x3b\x81\x18\x2d\x9d\xae\ --\xdd\x1c\x5e\xe9\xbd\xbf\x7d\xcf\x4d\xe4\x66\xa5\x1b\x6d\x86\x49\ --\x17\x0c\x1f\x5c\xc8\x23\x5f\xbb\x95\x91\x43\x75\x49\x74\x0b\x80\ --\xcb\xe3\xe1\xd0\xd1\x5a\x0e\x57\xd5\x73\xb8\xba\x8e\x23\x95\x75\ --\x1c\xa9\xa9\xe7\x58\x43\x53\xc0\xf5\x26\x93\x93\x12\xe8\x9f\x97\ --\xc5\x65\x43\x0a\x19\x3d\x7c\x20\xa3\x87\x0f\x20\x2b\x23\x15\x80\ --\xfa\x0e\xc1\x8e\xba\xf0\x19\xfc\x70\x72\x33\x50\xa8\xbf\x02\xee\ --\xbe\xd4\x35\x5d\x0a\x80\x40\xde\x7e\x91\xa3\xff\x2e\xf9\xbc\x7c\ --\xb7\xa6\xeb\x83\xc9\x84\x31\x43\xb9\x79\xce\x15\x46\x9b\x61\x72\ --\x09\x92\x93\x12\xf8\xc6\x9d\xd7\x73\xe3\xd5\x57\xf4\xd8\x0d\xdb\ --\xe3\xf5\xb2\x6b\xff\x51\x2a\x76\x1e\xa0\x7c\xc7\x01\x76\xec\x3d\ --\x82\xd3\xa5\x6f\xc4\x4d\x5b\x7b\x27\xdb\xf7\x1e\x66\xfb\xde\xc3\ --\x2c\x7e\xff\x33\x00\x06\x15\xe5\x32\x66\xcc\x18\x92\x0b\xc6\x90\ --\x9d\x57\xa4\x6b\x7f\x7a\xd0\x6a\x57\x6e\xe8\xea\xe7\x97\x14\x80\ --\xcd\x47\x64\x2e\xa8\x57\x6a\xe9\xec\x68\x75\x3d\xb5\xf5\x8d\x5a\ --\x6e\x09\x1a\x8a\x22\xf8\xfe\x57\xe7\x9b\x53\xff\x30\x44\x51\x04\ --\x37\xce\xbe\x82\x6f\xdc\x75\x3d\xc9\x49\x81\x87\x5b\x77\xd8\xec\ --\x7c\xb6\x61\x3b\xab\x3e\xdf\x4a\xc5\xae\x03\xd8\x1d\xa1\x4f\x32\ --\x7b\xa8\xf2\x18\x87\x2a\x8f\x01\x1f\x93\x9e\x99\xcd\xf8\x89\x57\ --\x32\x6a\xdc\xe5\xc4\xc4\x6a\x4a\x96\x15\x34\xda\x9d\xa4\x3c\x5f\ --\x26\x27\xdc\x3f\x41\x94\x5d\xec\xe7\x97\x14\x00\x4b\xb4\x7a\x87\ --\x94\x68\x8a\x2c\x5a\x5f\xbe\x4b\xab\x7d\x41\x63\xf6\x94\x62\x06\ --\x15\x69\xce\x57\x6a\x12\x64\x46\x0e\xed\xcf\x23\x5f\xbb\x95\xe1\ --\x83\x0b\x03\xba\xdf\x66\x77\xb2\x66\xe3\x76\x96\xaf\xaf\x60\xd3\ --\xd6\xbd\xb8\x3d\x01\xa5\xc2\x0b\x0a\x4d\xc7\xeb\x59\xf1\xc1\x52\ --\xd6\x7c\xf2\x1e\xe3\x4a\xa7\x30\x69\xda\x1c\xe2\xe2\x83\xb7\x9f\ --\xe1\x0f\x12\x70\xb9\xe5\x8f\x81\xdb\x2e\xf6\xf3\x4b\x0a\x80\x94\ --\xf2\x0e\xad\xd3\xff\x0d\x5b\xf6\x68\xba\x3e\x58\x58\x2c\x0a\x5f\ --\xbd\x23\xa0\x1a\xa5\x26\x41\x22\x35\x39\x91\x6f\xde\x7d\x03\xd7\ --\xcd\xb8\x3c\xa0\xe9\xfe\xd1\xea\x7a\x96\x2c\x5b\xcb\x87\xab\x37\ --\x85\x6d\x7c\xc9\x29\xdc\x6e\x17\x9b\x3f\x5f\xc5\xb6\xb2\xcf\x29\ --\x99\x3c\x83\xcb\xaf\x9a\x4d\x74\xb4\xa6\xad\x34\x5d\x69\x77\x89\ --\xab\x2f\xf5\xb3\x8b\x0a\xc0\xd6\x6a\x59\xe0\x45\x9d\xac\xa5\x13\ --\x55\x55\xd9\xb5\xef\xa8\x56\xdb\x82\xc2\xdc\x69\xa5\x14\xe5\xf5\ --\x28\x5d\xba\x89\x4e\x28\x8a\xc2\xfc\xb9\x53\xf8\xda\x97\xaf\x23\ --\x29\xc1\xef\x48\xf2\xd3\x6c\xa8\xd8\xc3\x2b\xef\xac\xa0\x7c\xc7\ --\x81\x80\x37\xef\x8c\xc2\xe5\x72\xf2\xc5\x67\x1f\xb1\x7b\xdb\x26\ --\xe6\xdc\xf8\x25\x06\x0c\x19\x61\x88\x1d\x6d\x0e\x52\x5e\xdc\x20\ --\x4b\xef\x9d\x24\x2e\x38\x9f\xbf\xa8\x00\xa8\x42\xbd\x09\x8d\xc9\ --\x42\x0e\x55\x1d\xc3\xe6\x30\x5e\x99\x15\x45\x70\xdf\x6d\x73\x8c\ --\x36\xc3\x04\x18\x3b\x62\x10\x0f\x7f\x6d\x01\x43\x07\xe4\x6b\xbe\ --\x77\xdb\x9e\x43\x3c\xfd\xf2\x07\x6c\xdd\x7d\x30\x08\x96\x85\x96\ --\xd6\x96\x26\xde\x58\xf4\x24\xa3\x8a\x27\x31\xfb\xfa\x5b\x43\x3e\ --\x1b\x90\x80\x03\xf5\x87\xc0\x5d\xe7\xff\xec\xa2\x02\x20\x11\xd7\ --\xfa\x6e\xf3\x9f\x1d\x7b\xc3\xe3\xed\x3f\x69\xdc\x08\xf2\xb3\xfb\ --\x19\x6d\x46\x9f\x26\x3d\x2d\x99\x6f\xdd\x7d\x23\x73\xa7\x4d\xd0\ --\xbc\x09\x5b\x5b\xdf\xc8\x5f\x9f\x7f\x8b\x35\x9b\x76\x04\xc9\x3a\ --\xe3\xd8\x59\xb1\x81\xfa\x9a\x4a\x6e\xbe\xf3\x6b\xa4\xa5\x87\xf6\ --\x19\xb5\xb9\x94\x99\x17\xfb\xfc\x02\x01\xd8\xb9\x53\x46\x3b\x51\ --\x2f\x7a\x71\x57\xec\xdc\x77\x24\x00\xb3\xf4\x67\xfe\x75\x53\x8d\ --\x36\xa1\xcf\x62\xb1\x28\xdc\x7a\xdd\x55\x3c\x78\xc7\x5c\x12\xe2\ --\xb5\xed\x82\x3b\x5d\x6e\x5e\x7e\x6b\x39\x2f\xbf\xb5\x42\xf7\xe3\ --\xbb\x70\xe2\x44\xc3\x31\x5e\x7a\xfa\x0f\xdc\x78\xfb\x7d\x21\x5d\ --\x12\xb4\xb9\xc8\x7e\xe9\x0b\x99\x7c\xf7\x64\xd1\x76\xf6\xe7\x17\ --\x08\x80\x33\xd5\x33\x0d\x14\xcd\x5b\x97\x3b\xf7\x1b\x1f\xfc\x93\ --\x96\x92\xc4\xa4\x71\xc6\xac\xb3\xfa\x3a\xc5\xa3\x86\xf0\xf0\x83\ --\x0b\x02\x3a\x79\x59\xb3\x69\x07\x7f\x7d\xfe\xad\xb0\x39\x42\x0e\ --\x36\x4e\x87\x8d\xa5\xaf\xfc\x93\x1b\x6e\xbb\x8f\x61\x23\xc7\x85\ --\xa4\x4f\x8f\x17\xe1\xb6\xa8\xdf\x00\x7e\x7f\xf6\xe7\x17\x2e\x01\ --\x84\x72\x9d\xc6\xd9\x3f\x6e\x8f\x97\x9a\x3a\xe3\xb3\xfe\xce\x9a\ --\x32\x0e\x8b\xc5\xac\xd8\x13\x4a\x32\x52\x93\xf9\xe6\x3d\x81\x4d\ --\xf7\xab\xeb\x4e\xf0\x97\x67\xdf\x0c\xab\xe3\xe3\x50\xa1\x7a\xbd\ --\xbc\xbb\xf8\x79\xae\x5f\xf0\x15\x2e\x1b\x5b\x1a\x92\x3e\x6d\x1e\ --\xf1\x25\xba\x15\x00\xc9\xb5\x5a\x1b\xae\xad\x3b\x81\xd7\x1b\xa4\ --\x1c\x47\x1a\x98\x31\x39\x34\x6a\x6a\xe2\xab\x80\x7c\xc7\x0d\xd3\ --\xb9\xff\xb6\x6b\x88\x8f\xd3\xb6\xa9\x65\x77\xb8\x78\x71\xe9\x27\ --\xbc\xf6\xce\x2a\x5c\x1e\x4f\x90\x2c\x0c\x7f\xa4\x54\xf9\x60\xe9\ --\xcb\x58\xac\x51\x21\x99\x09\x74\xb8\xc4\x05\x49\x42\xce\x11\x80\ --\xed\xf5\x32\xdb\xed\x51\x47\x6a\x6d\xf8\x68\xad\xf1\x6f\xff\x84\ --\xf8\x38\xc6\x8c\x18\x68\xb4\x19\x7d\x82\xe2\x51\x83\xf9\xe1\xd7\ --\x6e\x63\x60\x61\x8e\xe6\x7b\xd7\x6d\xde\xc9\x13\x0b\x97\x52\x77\ --\xbc\x29\x08\x96\x45\x1e\x3e\x11\x58\x44\x72\x4a\x1a\x39\xf9\xc1\ --\x75\x25\xb6\x39\x89\x7d\x63\x9b\x1c\x71\xdb\x58\x71\xda\x61\xe7\ --\x1c\x01\x70\x7b\xbd\x53\xb5\x3a\xff\x00\x54\xd5\x1a\x5f\xea\x7b\ --\xd2\xb8\x61\x58\x2d\x66\x95\xde\x60\x92\x99\x9e\xc2\x37\xbe\x72\ --\x03\xd7\x4e\xd7\x3e\x65\xad\xac\x6d\xe0\xcf\xcf\xbd\xc9\x86\x8a\ --\xf0\x70\x16\x0b\x27\x3c\x6e\x37\x6f\xfd\xfb\x19\xee\x7e\xe8\x11\ --\x12\x93\x53\x82\xd6\x8f\x04\xda\x9c\xea\xfd\xc0\x8f\x4e\x7d\x76\ --\x8e\x00\x08\xc4\x95\x81\xb8\x5a\x1c\xad\x69\xe8\x99\x65\x3a\x50\ --\x32\xc6\x4c\xed\x1d\x2c\xa2\xad\x56\xbe\x74\xd3\x0c\xee\x5d\x30\ --\x87\xb8\x58\x6d\xb1\xfa\x36\xbb\x93\xe7\x5e\xff\x88\xd7\xdf\xff\ --\x0c\x8f\x37\x7c\xdc\x76\xc3\x8d\x8e\xf6\x56\xde\x5d\xfc\x1c\x5f\ --\x7e\xf0\x7b\x08\x11\xbc\x7d\x2c\xbb\x5b\xcc\xe1\x52\x02\x20\x91\ --\x57\x06\x32\x03\xa8\x6b\x30\x7e\x3a\x37\x76\xc4\x00\xa3\x4d\xe8\ --\x95\x94\x8c\x1e\xca\x0f\x1f\x5c\xc0\x80\x00\xa7\xfb\x7f\x7c\x66\ --\x09\xf5\x27\x9a\x83\x60\x59\xef\xa3\xa6\xea\x30\x1b\xd7\x2e\x67\ --\xd2\x55\xc1\x73\x64\xb3\xb9\x18\x7e\xf6\xbf\x4f\x0b\xc0\xfa\x2a\ --\x19\x87\x54\xc7\x07\xd2\x68\x63\x6b\x47\x4f\xed\xea\x11\x09\xf1\ --\x71\x0c\x28\x30\x03\x7f\xf4\x24\x37\x2b\x9d\xef\xde\x3f\x9f\x69\ --\x97\x8f\xd6\x7c\xef\xc1\xa3\xb5\x3c\xb1\x70\x29\x5b\x76\x45\xbe\ --\x17\x5f\xa8\x59\xbf\x72\x19\x83\x86\x8e\x22\x33\x27\x38\x59\xab\ --\x3b\x5c\x22\xe1\x1f\xdb\x64\xda\xb7\xc6\x8a\x66\x38\x4b\x00\x62\ --\x2d\x4c\x44\xa2\x69\x7e\xd7\xe9\x82\x6d\x75\x82\x86\x66\x63\x4b\ --\x7f\x0d\x1d\x90\x67\x96\xf5\xd2\x89\xe8\xa8\x28\xbe\x72\xcb\x2c\ --\xee\x9e\x3f\x9b\x98\x68\x4d\x89\xa0\xe9\xb0\xd9\x59\xf8\xea\x32\ --\x96\x7e\xb4\x36\x2c\x4e\x85\x22\x11\xaf\xd7\xc3\x87\x6f\xbe\xc4\ --\xdd\xdf\xf8\x4f\x14\x45\xff\xa5\x80\x04\x12\x5d\x7c\x09\x78\x0a\ --\xce\x12\x00\x21\xd5\xcb\xb5\xac\xff\xdb\x9d\xb0\xe6\xb0\x82\xc3\ --\xe5\xc5\x61\xb3\xe9\x6c\xa6\x36\xcc\xb0\x5f\x7d\x98\x70\x32\x77\ --\x62\x5e\x76\x86\xa6\xfb\xa4\x94\x7c\xb8\x6a\x13\x4f\xbe\xf4\x1e\ --\xcd\xad\xe1\x5b\x07\x32\x52\x68\xa8\xab\x61\x7b\xd9\xe7\x8c\x9b\ --\xa8\x29\x1d\x87\xdf\xb8\x24\x73\x39\x5f\x00\x90\x8c\xf3\x77\xf9\ --\x2f\x25\x94\x55\x2b\xb8\xbc\x60\xb3\x75\x18\x1e\xa5\x65\x0a\x80\ --\x3e\xcc\x0d\x60\x77\x7f\xdf\xa1\x6a\xfe\xf8\xcc\x12\x76\x84\x89\ --\x2b\x78\x6f\x61\xdd\xaa\x0f\x19\x39\xae\x94\xa8\x20\x04\x0e\xd9\ --\x5d\x8c\x3d\xf5\xff\xa7\x05\x40\x8a\x33\x1f\x76\x47\x75\xab\xa0\ --\xc5\xe1\xfb\x7f\x5b\x87\xf1\x8a\x6f\x06\xff\x84\x9e\xb6\x0e\x1b\ --\xff\x7c\xe5\x7d\xde\xf9\xf4\x0b\x54\xd5\x9c\xee\xeb\x8d\xad\xa3\ --\x9d\x0d\x6b\x96\x33\x75\xf6\xf5\xba\xb7\xdd\xe9\x92\xa7\x37\x18\ --\x14\x80\xcd\x9b\x65\x14\xe0\x97\x13\xbd\x94\xb0\xef\xc4\x99\xa9\ --\x82\xcb\x6d\x7c\x08\x70\x76\x66\xaa\xd1\x26\xf4\x19\x54\x55\xf2\ --\xce\x27\x9f\xf3\xe5\xef\xfe\x9a\xb7\x3e\x5e\x6f\x0e\xfe\x20\x52\ --\xf6\xf9\x4a\x6c\x9d\xfa\xbf\x60\x1d\x6e\x11\xfb\xf4\x66\x19\x0f\ --\xa7\x66\x00\xd9\x8c\x00\xff\x36\x00\xab\x5a\xcf\xcd\x7b\xee\x75\ --\x1b\xeb\xca\x29\x84\x20\xbb\x5f\x9a\xa1\x36\xf4\x15\x76\xed\x3f\ --\xca\x1f\x9f\x59\xca\x9e\x83\xc6\x07\x7e\xf5\x05\xdc\x6e\x17\x5b\ --\x36\xad\x65\xca\x8c\x6e\x2b\x7c\x69\x42\x05\xa2\xe1\x1a\xe0\x2d\ --\x05\xc0\x62\xf1\xfa\x35\xfd\x6f\x77\x72\x41\xea\x63\x8f\xc7\xd8\ --\xd0\xcd\xc4\xf8\x38\xcd\xbb\xd5\x26\xda\x68\xeb\xb0\xf1\xe7\x67\ --\xdf\xe4\x3f\xfe\xe7\xcf\xe6\xe0\x0f\x31\x15\x1b\xd6\xe2\x71\xeb\ --\x3f\xc6\x54\xd5\x17\xf2\x6f\x05\x90\xaa\x18\xd5\xd5\x06\xa0\xc3\ --\x03\xc7\xda\x04\x7b\x8e\x0b\x5c\xe7\x39\x73\x79\xbc\xc6\xce\x00\ --\xba\x2b\xd6\x60\x72\x06\x21\x04\x03\x0a\xb2\xfd\xbe\x5e\x55\x55\ --\xde\xfc\x68\x3d\xcf\xbc\xfa\x21\xed\x9d\xc6\x9e\xf4\xf4\x55\xec\ --\xb6\x0e\x76\x6f\x2f\x63\x4c\x89\xa6\x0c\x7d\xdd\xe2\x51\x45\x09\ --\x9c\x5a\x02\x08\x06\x81\x6f\x7d\xdf\xe6\x80\x86\x4e\x41\x9b\x13\ --\x3a\x5d\x82\x0e\x27\x17\x0c\xfa\xb3\x51\x0d\x8e\xe6\x4a\x4e\x32\ --\x05\xc0\x1f\x2e\x1b\x52\xc4\xc3\x0f\x2e\xf0\xbb\xf8\xc6\xb6\xdd\ --\x87\xf8\xe3\x33\x4b\x39\x70\xb4\x26\xc8\x96\x99\x74\x47\xd9\xe7\ --\xab\x74\x17\x00\x97\x57\x14\xc2\x49\x01\x58\x77\x44\x5c\xa3\x4a\ --\x41\x9b\x03\xdc\x1a\xf7\x74\x82\x31\x3d\xd1\x82\xd6\x50\xd4\xbe\ --\x46\x6a\x72\x22\xdf\xb8\x6b\x1e\xf3\x66\x4d\xf2\xcb\x59\xaa\xb1\ --\xa5\x8d\x7f\x2c\x7a\x97\x8f\x3f\x2b\x33\xfc\x78\xd7\xc4\xc7\x89\ --\x86\x63\x34\x1c\xab\x26\x2b\xb7\x40\xb7\x36\x9d\x1e\x99\x01\x27\ --\x05\xa0\xd9\x2e\x52\x3d\x11\xba\x99\x1b\x6d\xed\xb6\xc0\x71\x9f\ --\xc4\x62\x51\x98\x37\x6b\x12\xdf\xb8\x73\x1e\x29\xc9\xdd\x17\xdf\ --\xf0\x7a\x55\x96\x2c\x5b\xcb\xc2\xd7\x96\xd1\x69\xb3\x87\xc0\x42\ --\x13\x2d\xec\xde\x5e\xae\xab\x00\x38\x3c\xc2\x77\x0a\xf0\xd7\x0d\ --\x72\xe0\xf1\xd6\x00\x22\x80\x4e\x62\xb1\x18\x3b\x00\x2d\x56\x33\ --\x03\xd0\xf9\x14\x8f\x1a\x7c\x32\x3d\x97\x7f\xfe\xe4\xe5\x3b\x0f\ --\xf0\xc4\x33\x4b\x38\x5c\x55\x17\x64\xcb\x42\x4b\x5a\x4a\x12\x69\ --\x29\x89\xa4\x24\x25\x90\x9c\x14\x8f\xd7\xeb\xc5\xee\x70\xd1\x61\ --\x73\x50\x73\xec\x04\x1d\x11\x24\x74\x7b\x77\x94\x33\x7d\xce\x8d\ --\xa0\x53\xa5\x2b\x97\x17\xe5\x2f\x9f\xc9\x4c\x6b\x9c\x85\x1e\x15\ --\xcf\x0b\x86\xbf\xb2\x16\xcc\x1c\x00\x67\xc8\xca\x48\xe5\xdb\xf7\ --\xde\xcc\xec\x2b\xfd\x8b\xe9\x6a\x68\x6c\xe1\xef\x2f\xbe\xcd\xf2\ --\x75\x5b\x82\x6c\x59\xf0\x89\xb6\x5a\x19\x37\x6a\x10\x25\xa3\x86\ --\x32\x7c\x50\x21\x43\x06\xe4\x91\x9e\x9a\x74\xc9\xeb\xa5\x94\x54\ --\x1d\x3b\xce\x9e\x03\x55\x6c\xd8\xba\x87\x35\x9b\x76\x60\xb3\x39\ --\x42\x68\xb1\x36\xda\x5a\x9b\xa9\xae\x3c\x4c\x41\xff\x41\xba\xb5\ --\x99\x94\x24\x63\xa2\xc1\x00\x00\x20\x00\x49\x44\x41\x54\xc0\x64\ --\xab\xe2\x51\x2f\xd3\x58\x02\xe0\x1c\x84\xc1\x03\xd0\x74\x44\xf1\ --\x3d\xfc\x5f\xbe\x79\x06\xf7\xcc\xf7\x2f\x5e\xdf\xed\xf1\xb2\xf8\ --\xbd\x55\x3c\xff\xc6\xc7\x86\xd4\xd3\xd3\x8b\xb8\xd8\x68\xa6\x4f\ --\x1a\xcb\xac\x2b\x8b\x29\x19\x35\x84\xd8\x18\xff\x63\xd9\x84\x10\ --\x14\xe5\x65\x51\x94\x97\xc5\x35\xd3\x26\x60\x73\x38\x79\x7f\xc5\ --\x06\x16\xbd\xb9\x9c\xa6\xe6\xb6\xee\x1b\x30\x80\xfd\xbb\xb6\xe8\ --\x2a\x00\x0a\x8c\xb1\xaa\x82\x1e\xd5\x64\x56\x0c\x16\x00\x4f\xa4\ --\x6e\x5e\xe8\xc4\x94\x09\x23\xf9\xde\x57\xe7\x53\x90\xe3\x9f\x3b\ --\xf4\xc6\x2d\x7b\xf9\xd3\xb3\x4b\xa9\xac\x35\x3e\x89\x4b\xa0\x0c\ --\x1f\x5c\xc8\xad\xd7\x4e\x65\xc6\xe4\x71\xba\x6d\x02\xc7\xc7\xc6\ --\x70\xfb\xf5\xd3\x98\x37\x73\x12\xff\xfa\xf7\x07\xbc\xf1\xe1\x9a\ --\xb0\xdb\x04\x3d\x72\x68\xaf\xae\xed\xb9\x25\x03\xad\x28\x4a\x7a\ --\x4f\x1a\xb1\x18\xbc\x04\x70\x1b\xec\x87\x60\x14\x85\xb9\x99\x7c\ --\xf7\xab\xb7\x30\xa5\xc4\xbf\x14\x8e\xb5\xf5\x8d\xfc\xed\x85\xb7\ --\xf8\x6c\x63\xe4\x16\xdc\x98\x5c\x72\x19\x77\xdd\x3c\x8b\x92\x51\ --\x43\x82\xd6\x47\x7c\x5c\x0c\xdf\x7f\x60\x3e\xa5\x63\x87\xf1\x8b\ --\x3f\x2d\x0a\x8b\x6a\x57\xa7\x68\x6c\xa8\xa3\xa3\xbd\x95\xc4\x24\ --\x7d\xd2\x86\xa9\x1e\x99\x67\x2d\xce\x53\x77\x0f\x4a\x63\xde\xd6\ --\x63\x0a\xcd\x01\xec\x89\x18\x3d\x03\xb0\xdb\x23\x77\x0a\x1b\x08\ --\x71\xb1\xd1\xdc\x77\xeb\x35\xdc\x71\xe3\x74\xbf\x4e\x40\x7c\x05\ --\x37\x56\xf0\xf2\x5b\xcb\x23\xb6\xe0\xc6\xd8\x11\x83\xf8\xe6\x3d\ --\x37\x30\x66\x78\xe8\x92\xbe\x5e\x59\x3a\x8a\xbf\xfe\xe2\xdb\x7c\ --\xff\x97\x4f\xd1\x11\x46\x4e\x50\x95\x07\xf7\x31\x72\xfc\x44\x5d\ --\xda\xf2\x48\x91\x69\x55\x20\x23\x35\x0e\xae\x1a\xa8\x52\x56\x2d\ --\xa8\x69\xd3\xb6\xcb\x68\xb5\x6a\xcb\x11\xa7\x37\x6d\x9d\x91\xb3\ --\x93\xdb\x13\x84\x10\xcc\x9e\x32\x9e\x6f\xdd\x7b\x13\x59\x19\xfe\ --\x05\x3f\x7d\xb6\x71\x07\x7f\x7b\x21\x72\x0b\x6e\xe4\x66\xa5\xf3\ --\x9d\x7b\x6f\x66\xfa\x64\xbf\x03\x55\x75\x65\xf8\xe0\x42\x1e\x7a\ --\xe8\xeb\xfc\xe5\x6f\xff\x30\xdc\xdf\xe5\x14\x47\x0e\xed\xd5\x4d\ --\x00\xbc\x2a\x69\x56\x89\xc8\x00\x89\x22\x60\x42\x81\xc4\x79\x14\ --\x4e\x74\xfa\x2f\x02\xf1\xf1\xdd\x9f\x31\x07\x93\xf6\x8e\xf0\x51\ --\xe7\x60\x31\xb8\x7f\x1e\x3f\x78\x60\x3e\xc5\x7e\x4e\x7d\x23\x3d\ --\x03\x6f\x4c\xb4\x2f\x2b\xd1\x57\x6e\xd1\x9e\x95\x48\x4f\xaa\x5b\ --\x05\x4a\xea\x20\x66\x5f\x7f\x1b\x1f\xbd\xfd\x6f\xc3\xec\x38\x9b\ --\xaa\xc3\xfb\x75\x6b\x4b\x55\x65\xa2\x15\xd4\x7e\xa7\x12\x81\x2a\ --\x02\x26\x15\x49\x3e\x3b\x74\x6e\xc4\x5f\x57\xc4\xc6\x19\xeb\x8a\ --\xdb\xda\xde\x89\xd7\xab\xf6\xca\x8a\x40\x49\x09\xf1\x7c\xed\xcb\ --\xd7\x71\xcb\x35\x53\xfc\xfa\xfd\x6c\x0e\x27\x2f\x2e\xf9\x84\xd7\ --\xde\x5d\x85\xdb\x13\x99\x19\x78\xaf\x9a\x38\x9a\xef\xde\x7f\x8b\ --\xe6\xac\x44\xc1\x60\xdf\x71\xdf\xb8\x18\x53\x32\x99\xc3\xfb\x77\ --\xb1\x6f\xd7\x56\x83\x2d\x82\xf6\xb6\x16\x6c\x1d\xed\xc4\x27\x5e\ --\xfa\x88\xd3\x5f\x3c\x52\xc4\x59\x41\x9c\x33\x9f\x8c\x52\x60\x72\ --\x7f\x95\xcf\x0e\x29\x38\xfd\xd8\x5f\x8b\x8d\x8b\xf7\x39\x27\x18\ --\xb4\x63\xaa\xaa\x2a\xc7\x9b\x5a\xc8\xc9\xec\xd1\x5e\x66\x58\xa1\ --\x28\x82\x1b\x66\x4d\xe2\xa1\xbb\xe6\x91\x9a\xec\x5f\x99\xc6\x4f\ --\xd7\x55\xf0\x8f\x17\xdf\xa1\xa1\xb1\x25\xc8\xd6\x05\x87\xa2\xbc\ --\x2c\xbe\xff\xd5\xf9\x4c\x2a\x0e\x9f\xda\x8e\x67\x3f\xd1\xb3\xae\ --\xbb\x95\xc3\x07\xf6\xe0\x76\x19\xbf\x29\x58\x7f\xac\x9a\x81\x43\ --\x2f\xeb\x71\x3b\x5e\x29\x63\xac\x42\x12\x2b\xcf\x9b\xf1\x27\x44\ --\xc1\xd4\x01\x2a\x1b\x2a\x15\x3a\xba\xd9\x63\x53\x2c\x16\xa2\xa2\ --\xa2\x0d\xfd\x62\xea\x8e\x37\xf7\x1a\x01\x18\x35\x74\x00\x0f\x7f\ --\x6d\x3e\x23\x06\xfb\x57\x25\xe6\x50\xe5\x31\x9e\x58\xb8\x84\x8a\ --\x9d\x91\x99\x81\x37\x3e\x36\x86\x7b\x6f\x9d\xc3\x97\x6e\x9c\x41\ --\x94\x35\xbc\x9c\xba\x06\xa4\x49\xb6\x9f\x0c\x7f\x4f\x4c\x4e\xa1\ --\xf4\x8a\x19\x7c\xbe\xfa\x23\x83\xad\x82\x06\xbd\x04\x40\x15\x16\ --\xab\x14\x17\x4f\x04\x92\x14\x03\xb3\x86\xa8\x54\xb6\x08\x1a\x3a\ --\xa0\xd5\x21\xb0\xb9\x2f\xfe\xa2\x8f\x8f\x4f\xa0\xd5\x40\x01\xa8\ --\xaa\x3d\xce\xf8\x91\x83\x0d\xeb\x5f\x0f\xd2\xd3\x92\xf9\xe6\xc9\ --\xaa\x3b\xfe\x14\xd9\xec\xb4\xd9\x59\xf8\xda\x32\x96\x2c\x8b\xdc\ --\x0c\xbc\x57\x5f\x59\xac\x69\x53\x33\xd4\xf4\x4f\x93\xec\xaa\x17\ --\x78\x4f\x3e\xf3\xa5\x53\x66\x50\xf6\xc5\x6a\x5c\x4e\x63\x3d\x06\ --\x1b\x8e\x55\xeb\xd2\x8e\xaa\xa2\x58\xe9\x22\x13\x90\x22\x7c\x2a\ --\x38\x20\x0d\x40\xe2\xf0\x40\x4d\xab\xa0\xaa\x55\xd0\xea\x38\x23\ --\x06\xb1\x71\xf1\xb4\xb6\x18\x57\x1c\xe4\x60\x65\xad\x61\x7d\xf7\ --\x14\xab\xc5\xc2\x6d\xd7\x5f\xc5\x03\xb7\xcf\x25\x3e\x3e\xb6\xdb\ --\xeb\x4f\x65\xe0\x7d\xea\xe5\xf7\x68\x6a\x31\x3e\x1f\x63\x20\x0c\ --\x2a\xca\xe5\xe1\x07\x17\xf8\xbd\xa9\x69\x14\x56\x05\x62\xa3\x7c\ --\xe9\xef\x01\x62\x62\xe3\x19\x39\xb6\x94\x2d\x9b\xd6\x1a\x6a\x57\ --\x7d\x9d\x4e\x02\x00\xc2\x8a\x20\xc6\xdf\x72\xe0\xb1\x56\x18\x9c\ --\x21\x19\x9c\x21\x71\xab\xd0\x66\x87\x76\xa7\xe0\x93\x7e\x69\xd4\ --\xeb\xa4\x4a\x81\xb0\xff\x70\x64\x0a\x40\xe9\xd8\x61\xfc\xe0\xab\ --\xf3\xfd\xae\xba\x13\xe9\x19\x78\x13\xe2\xe3\x78\xf0\x4b\xd7\x72\ --\xeb\xb5\x53\x23\x62\xd3\x56\x05\x6c\xe7\x9d\xfe\x8d\x2b\xbd\xd2\ --\x70\x01\x68\x69\x6e\xc4\xe3\x76\x63\x8d\xea\xf1\x09\x89\xb0\x6a\ --\x2d\x06\x72\x8a\x28\x05\x32\x12\x20\x23\x41\x32\xbc\x28\x8d\xad\ --\xdb\x7b\x6a\x4b\xe0\xec\x39\x58\x89\xcb\xe3\x89\x98\xd0\x60\xad\ --\x45\x36\xdb\x3b\x6d\x3c\xfb\xda\x47\x2c\x59\xb6\x36\x22\x63\x1f\ --\x84\x10\x5c\x33\x6d\x02\xdf\xbe\xe7\xa6\x2e\x03\x74\xc2\x0d\xbb\ --\xeb\xc2\x25\x6f\x66\x4e\x1e\xe9\x99\xd9\x34\x1d\x37\xb0\x20\xae\ --\x94\xb4\xb5\x36\x91\xde\xcf\xff\xec\x4e\x17\xc3\xab\x22\xba\x5c\ --\x02\xf8\x4b\xae\xc1\x47\x36\x4e\x97\x9b\x3d\xfb\x2b\x19\x7b\x99\ --\x7e\x81\x12\xc1\x20\x26\x3a\x8a\xbb\x6e\x9e\xc5\x57\x6e\x99\xe5\ --\x57\xe0\x8a\xaa\xaa\xbc\xf3\xe9\x17\xfc\xf3\xdf\x1f\xd0\xd6\xde\ --\x19\x02\x0b\xf5\x67\xf8\xe0\x42\x1e\x7e\x70\x01\xa3\x87\x0d\xf0\ --\xeb\xfa\xda\xfa\x46\x52\x92\xe2\x49\x88\x8f\x0b\xae\x61\x7e\x10\ --\x6d\x05\x8b\xe0\xf4\x1e\xc0\x29\x86\x5e\x36\x96\x0d\xc7\x3f\x31\ --\xc6\xa8\x93\xb4\x34\x37\xf6\x58\x00\x24\xe7\x15\x07\x0d\x94\xbc\ --\x2c\xe3\xcf\x6c\x37\x6e\xdd\x1b\xb0\x00\x34\xda\xa0\xaa\x45\x70\ --\x59\x96\x24\x26\x48\x93\x88\x94\xa4\x78\x16\x3d\xf1\xa8\xdf\xe7\ --\xdb\x3b\xf6\x1d\xe1\x8f\xcf\x2c\x61\xdf\x21\xe3\x96\x56\x3d\x21\ --\x39\x29\x81\x6f\xdc\x79\x3d\x37\x5e\x7d\x85\x5f\x99\x88\x1c\x4e\ --\x17\x2f\xbf\xb5\x82\x57\xde\x5e\xc1\xa2\x27\x1e\x0d\x0b\x01\x88\ --\x52\x60\x58\xa6\x64\x77\xc3\xb9\xf6\x0f\x18\x72\x19\x1b\x3e\x33\ --\x56\x00\x5a\x9b\xf5\xf1\xee\xb4\x02\x2e\xa0\x47\xdf\x76\x6e\x96\ --\xf1\x69\xb9\x57\x6f\xd8\xc6\xd7\xbe\xac\x3d\x7d\x72\x65\xab\x60\ --\x6b\x8d\x6f\xa7\x37\x3d\x1e\x8a\x52\xcf\xc8\xbd\xdd\x0d\x31\x56\ --\xdf\x66\x68\x4f\x49\x88\x8f\xf3\xeb\xa1\x6e\x6b\xef\xe4\xb9\xd7\ --\x3f\x66\xc9\xb2\x35\xa8\x6a\x78\x45\xa3\xf9\x83\xa2\x08\xe6\x5c\ --\x35\x81\xef\xde\x77\xb3\xdf\x3e\x0c\xeb\x36\xef\xe4\xcf\xcf\xbd\ --\x19\x96\x2e\xcb\xc3\x32\x25\x4e\x0f\x1c\x6a\x3a\xf3\x10\xe4\x15\ --\xf4\xc7\x6a\x8d\x32\x34\x23\xb6\x1e\x9b\xee\x02\xb0\x22\x70\x21\ --\x7b\x26\x00\x39\x61\x30\x03\x38\x5c\x55\xc7\xa1\xca\x63\x7e\x97\ --\x09\xb3\xb9\x60\x7b\xbd\xe0\xd8\xc9\xd8\x87\xe4\x58\x28\x48\xf1\ --\x0d\x38\x09\xec\xaa\x17\x1c\x38\x21\x88\xb2\xc0\xd0\x7e\xbe\x8d\ --\xcf\x60\xd6\x1f\xf5\x7a\x55\x96\x7c\xb8\x86\x85\x8b\x3f\x8a\xd8\ --\x94\x5c\x63\x86\x0f\xe4\xe1\x07\x17\x30\x6c\x90\x7f\xa9\xab\x8e\ --\x54\xd5\xf1\xa7\xe7\xde\x64\xf3\xb6\x7d\x41\xb6\x2c\x70\x04\x30\ --\x26\x57\x62\x55\xce\x14\xc4\xb1\x58\xac\xe4\xe4\x17\x52\x7d\xf4\ --\x90\x61\x76\xb5\xe9\x30\x03\xb0\x28\x48\x2b\x92\x1e\x1f\xe0\xc7\ --\xc7\xc6\x90\x93\x99\x4e\xdd\x71\xe3\x8e\x02\x01\xde\xfe\x64\x3d\ --\x0f\x3f\x78\xeb\x45\x7f\xe6\x51\xa1\xd3\x09\x2d\x0e\x41\x7d\x07\ --\xd4\xb5\x09\xce\xde\x4e\x2b\x4c\xf5\x0d\x70\x55\x42\x45\xad\xa0\ --\xaa\xc5\xf7\xc7\x76\x79\x61\x67\xbd\xe0\x68\xb3\x60\x42\x81\x4a\ --\x5a\x10\x66\xa6\xe5\x3b\x0f\xf0\xa7\x85\x4b\x39\x54\x79\x4c\xff\ --\xc6\x43\x40\x7a\x5a\x32\xdf\xba\xfb\x46\xe6\x4e\x9b\xe0\x97\x0f\ --\x83\xcd\xe6\xe0\xd9\xd7\x3f\xe2\x8d\x0f\xd6\xe0\xf1\x86\xbf\xcb\ --\xb2\x00\x46\x66\x4b\x12\xa2\x61\x6b\xad\xef\xb9\xe9\x97\x95\x67\ --\xac\x00\xb4\x36\xeb\xd1\x8c\x3c\xb5\x04\xe8\x31\xc3\x06\xe6\x19\ --\x2e\x00\xcb\x56\x97\xf1\xf5\x3b\xaf\x27\xf1\xe4\x54\x5b\x95\x70\ --\xe0\x84\xa0\xb2\x55\xd0\xe9\xa4\xcb\xd3\xce\x7d\x0d\x82\x13\x9d\ --\xd0\xe6\x10\xd8\x2f\x32\xb3\xeb\x70\xf9\xaa\x21\x4f\x2a\x92\x64\ --\x27\xea\x33\x35\x8f\xf4\x94\x5c\x56\x8b\x85\x5b\xaf\x9b\xca\x03\ --\x77\xcc\xf5\x6b\x79\x23\xa5\x64\xd9\xea\xcd\x3c\xf9\xf2\x7b\x61\ --\x9b\x75\xa7\x2b\xfa\xa7\x49\xe2\xa2\x60\x63\xb5\x20\x33\xdb\xbf\ --\x7c\x8b\xc1\xc2\x61\xef\x79\x10\x9c\x02\xd2\x2a\x24\xae\xf3\x5d\ --\x81\x03\x61\xd8\xa0\x42\xc3\x93\x4d\x74\xda\xec\x2c\x7e\x6f\x35\ --\x0f\xdc\x71\x2d\x52\xc2\xfa\xa3\x0a\x27\xfc\xdc\x3c\x77\xab\x50\ --\xdf\xde\xf5\x17\xa1\x4a\xf8\xa2\x52\x30\x24\x1d\x32\x13\x7d\xbb\ --\xc3\x36\x97\x4f\x58\xfa\xc5\x4b\x52\x2f\x32\x06\xaa\x5a\x05\x95\ --\xcd\xe0\xf0\x08\x14\x01\x59\x89\x92\xc1\xe9\x1e\xde\xf9\x78\x1d\ --\xff\x7a\xf5\x03\xec\x76\xe3\x7d\xcb\x03\xa1\x78\xd4\x10\x1e\x7e\ --\x70\xbe\xdf\x89\x47\xf7\x1d\xaa\xe6\x4f\xcf\xbe\xc9\xb6\x3d\xc6\ --\xbd\x35\xf5\x20\x2b\x51\x72\xd5\x00\x49\xed\x91\x2c\x43\xed\xb0\ --\xdb\x7a\x7e\x2a\xa4\x28\xa8\x56\x29\xd0\xc5\xaf\x71\xd8\x40\xfd\ --\x52\x16\xf7\x84\x57\xdf\x5b\xcd\x4d\x73\xae\xa0\x43\xa6\xfa\x3d\ --\xf8\xb5\x20\x25\xec\x6f\x14\xec\xbf\x60\x09\x26\xc8\x4a\x94\x8c\ --\xc9\x91\x24\xc5\x80\xc7\x0b\xdb\xea\x04\x95\x2d\xe7\x8a\xca\x96\ --\xed\x7b\x58\xfd\xd1\x52\x4e\x1c\x8f\xcc\x94\x5c\x59\x19\xa9\x7c\ --\xe7\xbe\x9b\x99\x35\xc5\xbf\xc4\xa3\x2d\x6d\x1d\xfc\xf3\x95\xf7\ --\x79\x6f\xc5\x86\x88\xdc\xd4\xbc\x18\x29\xb1\x70\xf5\x98\x54\x5e\ --\x34\xd0\x06\xa7\xd3\x81\x94\x2a\x42\x04\xee\x50\x65\x15\xd2\x6b\ --\x05\xd9\x4c\xe0\x59\xc1\x4f\x33\x6c\x50\x7e\x8f\xdb\xd0\x03\x9b\ --\xcd\xc1\x9f\x9f\x7d\x93\x69\x37\x3d\xe0\xf7\x3d\x85\x29\x92\x31\ --\xb9\x92\xf5\x47\x94\xd3\x65\xcf\x03\xa1\xa1\x43\xb0\xe2\xa0\x20\ --\x21\xca\xe7\x41\x76\xf6\xf3\xde\xda\xdc\xc8\xca\x65\x6f\x72\x60\ --\x8f\x81\x1e\x53\x3d\x20\xda\x6a\xe5\x4b\x37\xcd\xe0\xde\x05\xfe\ --\x25\x1e\xf5\x7a\x55\xde\xfa\xb8\xf7\x96\x15\x2b\xca\x49\x45\x51\ --\x14\xe3\x1c\xb3\xa4\xc4\x61\xb3\x13\x97\x10\x78\x3e\x0e\x8b\x82\ --\xd3\x0a\xca\x89\xae\x57\xc7\xfe\xd1\x2f\x2d\x85\x8c\xd4\x64\x1a\ --\x5b\x8c\x5f\xdb\xad\xfc\x7c\x2b\x31\xd9\x5f\x30\xba\xd8\xbf\x72\ --\x4a\x49\xb1\x10\x6d\x81\xd4\x38\x49\x8b\xa3\x67\x62\x28\x25\xe7\ --\x44\x50\x7a\xdc\x6e\x36\xae\xfb\x94\x8d\x6b\x97\x87\x4d\x56\x19\ --\xad\x5c\x51\x7c\x19\xdf\x7b\x60\x3e\x85\xb9\x99\x7e\x5d\x5f\xb1\ --\xf3\x00\x7f\x7a\xf6\x4d\x0e\x1e\x8d\x4c\x17\x6d\x7f\xb0\x5a\x2c\ --\x24\x25\xc6\xd1\xda\x66\x9c\x83\x96\xc3\xd1\xd9\x23\x01\x50\x84\ --\xb0\x59\x41\xea\x76\xf8\x5a\x32\x66\x08\x9f\xac\x29\xd7\xab\xb9\ --\x1e\xf1\xe9\xfb\x6f\x90\xd6\x2f\x9b\xfc\xc2\xee\xf3\xc8\x1d\x6c\ --\x14\x08\xe0\x58\x37\x7b\x00\x5a\xd9\xb7\x6b\x2b\xab\x3f\x7a\xcb\ --\xd0\x40\xa9\x9e\x90\x97\x9d\xc1\xf7\xee\x9f\xcf\xd4\x89\xa3\xfc\ --\xba\xbe\xa1\xb1\x85\x7f\xbc\xf8\x0e\xcb\xd7\x6f\x09\xbb\x8c\xba\ --\xc1\x20\x25\x31\xc1\x50\x01\xb0\xdb\x6c\xa4\xf5\xe0\x04\x5e\x51\ --\xe8\xb0\x0a\x38\xa1\xd7\x9f\x6a\xe2\xd8\xe1\x61\x23\x00\x1e\xb7\ --\x9b\xa5\x2f\xfd\x93\xdb\xef\xfb\x26\x39\x79\x5d\xc7\xd6\x3b\x3d\ --\xbe\xa3\x3e\xbd\xa8\xae\x3c\xc8\x67\x1f\xbf\x43\x6d\xd5\x11\xdd\ --\xda\x0c\x25\xb1\x31\xd1\xdc\x3d\x7f\x36\x77\xdd\x3c\x93\x68\x3f\ --\x02\x4e\x5c\x1e\x0f\x8b\xdf\x5d\xcd\x0b\x4b\x22\xbb\xce\x80\x56\ --\x92\x12\x8c\xcd\x86\xd5\xd3\x1c\x1c\x56\x85\x26\xab\x0a\x8d\x7a\ --\x3d\xfa\xa5\x63\x86\xe9\xd4\x92\x3e\x38\x1d\x36\x16\x3f\xf7\x37\ --\xae\xbf\xf5\x5e\x86\x8c\x18\x1d\xf4\xfe\x8e\x1e\xdc\xcb\xc6\x75\ --\xcb\x39\x7a\x50\xdf\xfc\xed\xa1\x64\xfa\xe4\xb1\x7c\xf7\xbe\x9b\ --\xfd\x4e\xb0\xb2\xbe\x7c\x17\x7f\x7d\xee\x2d\xaa\x8e\x1d\x0f\xb2\ --\x65\xe1\x47\x5c\x9c\xb1\x09\x71\x55\xb5\x67\x3e\x14\x56\x45\x1e\ --\xb7\x0a\x64\xa3\x1e\x9b\x80\x00\x59\xfd\x52\x29\xca\xcb\x0a\xab\ --\xa2\x13\x2e\x97\x93\xb7\x5e\x7d\x86\xe2\x89\x53\xb9\x6a\xf6\x3c\ --\xa2\x63\xf5\xf5\xe4\x71\x39\xec\xec\xd9\xb9\x85\x2d\x1b\xd7\xd0\ --\x50\x17\xb9\xa5\xb4\x8b\xf2\xb3\x79\xf8\x81\x05\x4c\x1c\xe7\x9f\ --\x88\x57\xd7\x9d\xe0\x2f\xcf\xbd\xc9\xfa\xb2\x5d\x41\xb6\x2c\x7c\ --\x89\x32\x38\x25\x7e\x4f\x13\xc1\x58\x15\x51\x6b\x15\x2a\xc7\xa4\ --\x8e\xa1\xd9\xa5\x63\x87\x85\x95\x00\x00\x20\x25\x15\x1b\xd7\xb0\ --\x77\xe7\x16\x2e\xbf\xea\x6a\xc6\x4d\xb8\x82\xa8\xe8\xc0\x2b\xca\ --\xb8\x5d\x4e\x8e\x1c\xdc\xcb\xde\x1d\x15\x1c\xd8\xb3\xdd\x50\x9f\ --\xf0\x9e\x12\x1f\x1b\xc3\xfd\xb7\x5f\xc3\xed\xf3\xa6\xfb\x95\x92\ --\xcb\xee\x70\xb1\xe8\xcd\x4f\x78\xf5\xed\x55\xb8\x3c\x7d\xb3\x28\ --\xcb\x29\xac\x06\xa7\x30\xeb\xf1\x0c\xc0\xaa\x1e\xb1\x4a\xab\xe5\ --\x08\x3a\x1e\x65\xcc\xbc\x62\x1c\x4b\x97\x19\x9b\x30\xe1\x52\xd8\ --\x3a\xdb\x59\xb5\xec\x4d\xd6\xad\xf8\x80\x21\x23\xc6\x30\x70\xc8\ --\x08\x72\xf2\x8a\x48\xeb\x97\xd5\xa5\x0b\x6b\x7b\x5b\x0b\x0d\x75\ --\x35\x1c\xaf\xab\xe6\xe8\xc1\xfd\xd4\x54\x1d\x42\x8d\x00\x17\xd6\ --\xae\x10\x42\x9c\x4e\xc9\x95\x99\xee\x5f\xa5\x99\xe5\xeb\xb6\xf0\ --\xf7\x17\xdf\x8e\xd8\xc4\xa3\x7a\x63\x74\x52\x13\x6f\x0f\xab\x62\ --\x09\xaf\xb2\xcd\xea\xf0\x70\x38\x56\x41\xa2\xd3\x3a\x60\xdc\x65\ --\x83\xc9\x4c\x4f\xe1\x78\x53\xab\x1e\xcd\x05\x05\xb7\xcb\xc9\xee\ --\x6d\x9b\xd9\xbd\x6d\x33\x00\x51\xd1\x31\xa4\x65\x64\x12\x1d\x15\ --\x43\x54\x4c\x0c\x16\x8b\x05\xbb\xad\x13\xbb\xad\x93\xce\x8e\x36\ --\x9c\x8e\xc8\x0c\xce\xb9\x14\x5a\x53\x72\x1d\xaa\xac\xe5\x89\x85\ --\x4b\x23\x36\xf1\x68\xb0\x30\x3a\x8e\x41\xf6\x70\x09\xd0\xea\xe5\ --\x0b\xeb\x94\x42\x61\x2f\xaf\xf1\x1e\x07\x74\xf1\x6d\x54\x14\xc1\ --\xec\x2b\x8b\x79\xf5\xdd\x55\x7a\x34\x17\x12\xdc\x2e\xa7\x6e\x89\ --\x16\xc3\x99\xb8\xd8\x68\xee\xbc\x69\x26\xf7\x2c\x98\xe3\xd7\x74\ --\xbf\xc3\x66\x67\xd1\xd2\xe5\x2c\x7e\x2f\x72\xeb\x0c\x04\x13\x97\ --\xdb\xd8\x25\x90\x2a\x03\xff\x9b\x44\x5b\x50\xbf\x33\x49\x34\x5a\ --\x01\x84\x90\x87\xa5\x14\xba\x39\x37\x5f\x3d\x35\xb2\x04\xa0\xb7\ --\x23\x84\x60\xee\xb4\x09\x7c\xeb\xee\x1b\x49\x4f\x4b\xee\xf6\x7a\ --\x55\x95\xbc\xbf\x62\x03\x4f\xbf\xf2\x3e\x2d\x6d\x1d\x21\xb0\x30\ --\x32\xf1\xb8\x0d\x9e\x01\xf4\xc0\xb5\x3a\x36\x8a\x4e\x38\x99\x11\ --\x48\x4a\x71\x04\x98\xa4\x8b\x55\xc0\x88\xc1\x45\x0c\x28\xcc\xe1\ --\x48\x55\x9d\x5e\x4d\x9a\x04\xc8\xb0\x81\x05\xfc\xe0\xc1\xf9\x8c\ --\x1d\xe1\x5f\xb6\xa4\x5d\xfb\x8f\xf2\xc4\xc2\xa5\xec\x3e\x50\x19\ --\x64\xcb\x22\x9f\x4e\x83\x2b\x07\xf7\x24\x29\x68\x8c\x45\x36\xc1\ --\x69\x01\xe0\xa0\x1f\x61\xdc\x9a\xb8\xe3\xfa\x69\xfc\xee\xe9\xc5\ --\xfa\x36\x6a\xe2\x37\x49\x09\xf1\x7c\xfd\xae\xeb\xb9\x65\xce\x15\ --\x28\x7e\x96\x70\x7f\xe5\xed\x15\x3c\xf9\xd2\x7b\x7d\xc2\x8b\x4f\ --\x0f\x8c\xce\xd3\x68\xb1\x6a\x13\x00\x01\xa4\xc4\x41\x6e\x92\x24\ --\x23\x4e\xbe\x07\x27\x05\x40\x08\xb9\x43\x2f\x5f\x80\x53\x5c\x3b\ --\x73\x22\xcf\xbc\xf6\x61\xc4\xe6\xae\x8f\x58\x84\x60\xe4\xd8\x52\ --\xe6\xdf\x72\x33\x63\xfb\x27\x22\x84\xff\x83\xf9\x48\x75\xbd\x39\ --\xf8\x35\xd0\x62\xb0\x00\xf8\x3b\x03\x88\xb1\xfa\x52\xdd\x0d\x48\ --\x97\x24\x9c\xbc\x45\x48\xb9\x1a\x4e\x0a\x80\xc5\x62\xd9\xae\x77\ --\x75\x99\x68\xab\x95\x1b\x67\x5f\xc1\x0b\x4b\x3e\xd6\xb5\x5d\x93\ --\x4b\x93\x93\x5f\xc4\xec\x79\xb7\x91\x9b\xdf\x1f\x27\xb0\xa9\x0a\ --\x92\x62\x04\xc5\xf9\x2a\xe9\xc6\xe7\xd8\xec\x55\x38\x9c\x2e\xc3\ --\x73\x39\x58\x2d\x5d\x67\xb0\x4d\x8c\xf6\xa5\xb3\x3b\x95\xed\xea\ --\x6c\xbc\x8a\x65\x3b\x9c\x14\x80\xa6\x6c\xf6\xa4\xd4\xe2\x04\x02\ --\xf7\x8e\xb9\x08\xb7\x5e\x7b\x25\xaf\xbe\xbb\x12\xa7\x2b\x72\x1d\ --\x65\x22\x81\xb8\x84\x04\xae\x9a\x7d\x23\x63\x4a\x26\x5f\xe0\xcf\ --\xd0\xee\xf4\x65\x32\x1a\x92\x21\x19\x99\x25\xd1\x7b\xa9\xd7\x57\ --\xa9\x3f\xae\x4b\x4a\xae\x1e\x31\xae\xd0\x4a\x56\xa6\xa4\xae\x43\ --\xd0\x76\xb2\x52\x97\x10\x90\x11\x0f\x03\xd3\x25\x79\x49\x97\xfc\ --\x7b\x3b\x0e\xe5\xb2\x1f\x4e\x0a\xc0\x4c\x21\x3c\xe5\x35\xde\xdd\ --\x80\x7f\x59\x1e\xfc\x24\x3d\x2d\x99\x3b\x6e\x98\xce\xa2\xa5\x9f\ --\xea\xd9\xac\xc9\x49\x84\x50\x18\x37\x71\x0a\x53\x67\xcd\xeb\xb2\ --\x4c\xbb\x94\xb0\xff\x84\xa0\xc9\x2e\x98\x58\xa0\x12\x1b\x19\xf5\ --\x53\xc2\x9a\xba\x30\x10\x80\x82\xb4\x68\x06\x67\x49\x2e\xcb\xf2\ --\x55\xea\xb2\xbb\x20\x3e\x0a\xfc\x38\xe1\xdd\x79\x87\x10\x5e\x80\ --\x33\xbb\x43\x82\x6d\xc1\x30\xf2\x9e\x5b\x66\xfb\x9d\x1e\xda\xc4\ --\x7f\xf2\x0b\x07\x72\xcf\x37\x1e\xe1\xea\x79\xb7\x77\x39\xf8\xcf\ --\xa6\xb1\x13\x56\x1e\x54\x38\xd1\x69\x4e\x03\x7a\x4a\x75\xdd\x09\ --\xa3\x4d\x20\x2d\xe5\x4c\x95\xa5\x28\xc5\x97\xd9\xda\x1f\xef\x64\ --\xc1\x99\xb1\x7e\x5a\x00\x84\x24\x28\xa9\x6a\xe2\xe3\x63\x79\xe0\ --\x8e\xb9\xc1\x68\xba\x4f\x12\x9f\x98\xc4\x75\xf3\xbf\xc2\x9d\x0f\ --\x7e\x9f\xac\x5c\x6d\x69\xd8\x5a\x9a\x1b\xa9\x28\xdb\xc4\xba\xa3\ --\x67\xd2\xa1\x9b\x04\x86\xd1\x19\x9c\x15\x45\x21\x35\x39\xb0\x64\ --\x20\x52\x72\x3a\x79\xe7\xe9\xc9\xa0\x2a\x94\x0d\x42\x06\x27\xbd\ --\xd1\x4d\x73\xae\xe0\xed\x4f\x3e\xef\xd5\x19\x62\x82\x8d\xa2\x28\ --\x14\x5f\x7e\x15\x57\xce\xbc\x4e\x73\x44\xa3\xc7\xed\x66\xc3\xda\ --\x4f\xd9\xb4\x76\x39\xc3\xc7\x94\x30\x72\xdc\x44\xb6\x1e\x13\xe4\ --\x5c\x7a\x8d\x68\xd2\x0d\x87\x0d\xf6\x71\x49\x4d\x4e\xf0\xfb\x78\ --\xf7\x7c\x84\x50\xbe\x38\xf5\xff\xa7\x05\x20\xb9\x93\x8d\xed\xf1\ --\xfa\x6f\x04\x82\x2f\x7d\xd2\x4f\xbf\x7b\x17\x0f\xfd\xe8\x09\xd3\ --\xa5\x34\x00\x0a\x07\x0c\x61\xf6\xf5\xb7\xd2\x2f\x80\x54\xd4\xfb\ --\xf7\x6c\x67\xd5\x87\x4b\x2f\xc8\x4a\xe4\xf0\xf8\xf2\x16\x26\x18\ --\x1b\xd2\x1e\x91\xa8\xaa\xca\xfe\xa3\xc6\x86\x7e\x9f\x3d\xfd\xd7\ --\x88\xb3\xc5\xc5\xe9\xac\x3d\xa7\x05\x60\xe8\x50\xe1\x2c\xaf\xf1\ --\x54\x80\xf0\x2f\x91\x9e\x46\x86\x0e\xc8\xe7\xfe\xdb\xaf\xe1\x5f\ --\xff\xfe\x30\x18\xcd\xf7\x4a\x12\x12\x93\x99\x3e\xe7\x26\x46\x8e\ --\x2b\x45\xeb\xab\xba\xb9\xe9\x04\x2b\x3f\x58\xc2\xa1\xfd\x97\x8e\ --\xd7\x6f\x77\x0a\x12\xa2\xcd\x73\x7f\xad\xec\x3f\x5c\x63\xf8\x11\ --\x60\x46\x80\x55\x96\x05\x72\xd3\xcc\x81\xe2\x74\xea\xdb\x73\xf7\ --\x83\x85\x58\x87\x24\x28\x02\x00\x70\xf7\x2d\x57\xb3\x7e\xf3\x6e\ --\x76\xee\x3f\x12\xac\x2e\x7a\x05\x8a\xc5\x42\xc9\xe4\xe9\x5c\x39\ --\xe3\x5a\xcd\x79\x0b\xdc\x2e\x17\x5f\x7c\xf6\x31\x9b\xd7\xaf\xec\ --\x36\x5c\xb4\xd9\x0e\x39\x91\x53\xad\x3b\x6c\xd8\xbe\xf7\x88\xd1\ --\x26\x90\x93\x19\x58\x3d\x4e\x89\x58\x77\xf6\xbf\xad\xe7\xfe\x50\ --\xae\x13\x88\x47\x7a\x60\x57\x97\x58\x2c\x0a\xbf\x7e\xf4\xab\x7c\ --\xfd\xd1\x27\xcc\x98\xf2\x4b\x50\x38\x70\x08\x57\xcf\xbb\x9d\x8c\ --\xcc\x1c\xcd\xf7\x1e\xdc\xbb\x83\x15\x1f\x2c\xf1\x3b\x09\xe9\xe1\ --\x26\xc1\x80\x93\xd5\x6e\x4c\xfc\xa7\x6c\xbb\xf1\xb5\x0c\x8b\xf2\ --\x03\x2b\x0d\x2e\x91\x97\x16\x00\xab\x62\x59\xa7\xb7\x47\xe0\xf9\ --\x64\xa4\x26\xf3\xdb\x1f\x3d\xc8\xb7\x7f\xf6\xd7\x3e\x95\x40\xb2\ --\x3b\x12\x93\x53\x98\x36\xfb\x46\x46\x8e\x9f\xa8\xf9\xde\xe6\xc6\ --\xe3\xac\xf8\x70\x09\x87\xf7\xef\xd6\x74\x9f\xcb\x0b\x1b\xaa\x14\ --\xae\x1a\xa0\x62\x70\x6e\x8b\x88\xc1\xed\xf1\xb2\x79\xc7\x7e\xa3\ --\xcd\xa0\x28\x3f\xa0\xe0\x5d\x29\x14\xcb\x17\x67\x7f\x70\x8e\x00\ --\x8c\xcb\x11\x0d\xe5\x35\xde\x9d\x80\x7f\x79\xa0\x03\x64\xd8\xc0\ --\x02\xfe\xe7\x3b\x5f\xe1\xe7\x7f\x7c\xc1\xb8\xc2\x0a\x61\x82\xc5\ --\x62\xa5\xf4\xca\x99\x4c\xbe\xea\x1a\xa2\xa2\xb5\xed\xc8\xb9\x5d\ --\x4e\xd6\xaf\xfa\x88\xb2\x2f\x56\x05\x9c\xa1\xa8\xc5\x0e\xdb\x8e\ --\x09\x8a\xf3\xcd\xbd\x00\x7f\xd8\xba\xeb\xa0\xe1\xeb\x7f\x80\xa2\ --\xbc\x80\x04\x60\x5b\x49\xae\x38\x27\x7b\xeb\x05\x3e\x61\x12\x3e\ --\x14\x41\x16\x00\x80\x19\x93\xc7\xf2\xd8\x0f\xee\xe1\x97\x7f\x7e\ --\xc9\xf0\xcc\x2a\x46\x51\x34\x68\x18\x57\x5f\x7f\x1b\xe9\x99\xda\ --\xa7\x73\x07\xf7\xee\x60\xf9\xfb\x6f\xe8\x52\x25\xb6\xb2\x45\x30\ --\x2c\xd3\x14\x00\x7f\x58\xbe\xbe\xc2\x68\x13\x88\xb2\x5a\xc8\xf5\ --\x33\x6b\xf3\x79\x5c\xb0\x03\x7f\x81\x00\x08\xa9\x2e\x43\x28\xff\ --\x19\x48\xeb\x5a\x99\x35\x65\x3c\x42\x11\xfc\xe2\x89\x45\x7d\x4a\ --\x04\x52\xd2\x32\x98\x79\xed\x7c\x86\x8c\x18\xa3\xf9\xde\x13\x0d\ --\xc7\x58\xfe\xfe\x1b\x54\x1d\x39\xa0\x9b\x3d\x12\x68\x73\x9a\x0e\ --\x01\xdd\xe1\xf6\x78\x59\xfd\x45\x50\x1c\x66\x35\x51\x98\x97\x1d\ --\x58\x3e\x42\x45\x59\x76\xfe\x47\x17\x08\x40\x4c\xab\x75\x8d\x23\ --\x55\x6d\x17\x10\x92\xfd\xe1\x99\x93\xc7\x11\xff\xa3\x18\xfe\xdf\ --\x13\x2f\xd2\x61\xeb\x5d\xb9\xf7\xce\xc7\x1a\x15\xc5\xe5\x53\x67\ --\x73\xf9\x95\x57\x6b\x4e\xe6\xe0\x72\xd8\x59\xb7\x6a\x19\x15\x1b\ --\x3e\x0b\xca\xb2\x29\xc6\x62\xce\x00\xba\xe3\xf3\xb2\x5d\xb4\x75\ --\x18\x5f\xe7\x70\xd4\xb0\xae\x0b\xdd\x5c\x82\x36\xb5\x86\xf5\xe7\ --\x7f\x78\x81\x00\x8c\x1a\x25\x5c\xe5\x35\xea\x4a\x90\x37\x05\xd2\ --\x4b\x20\x4c\x2a\x1e\xc1\x33\xbf\xfb\x21\x3f\x7e\x7c\xa1\xe1\x1e\ --\x56\xc1\x62\xe8\x88\x31\xcc\xb8\x76\x3e\x29\x5a\x6b\x39\x49\xc9\ --\xae\xad\x9b\x59\xfd\xe9\x3b\x74\xb6\x07\xaf\xee\x62\x4f\x6b\x22\ --\xf6\x05\xde\xfa\x78\x5d\xf7\x17\x85\x80\x51\x43\x07\x68\xbf\x49\ --\x8a\x4f\x4b\x4b\xc5\x05\x61\xb9\x17\x8f\x0b\x93\x72\x19\x82\x90\ --\x09\x00\x40\x41\x4e\x3f\x9e\xfe\xcd\x0f\x78\xe2\x99\x25\x7c\xb8\ --\x6a\x53\x28\xbb\x0e\x2a\x85\x03\x86\x30\xf5\xea\x1b\xfc\xaa\x51\ --\x78\x3e\x0d\x75\x35\x2c\x7f\xff\x0d\x6a\x2a\x0f\x05\xc1\xb2\x73\ --\xd9\x7e\x4c\xd0\x68\x33\x45\xe0\x52\x54\xd6\x36\xb0\x69\x9b\xf1\ --\xc7\x7f\x00\xa3\x86\xf5\xd7\x7c\x8f\x50\xd4\x0b\xa6\xff\x70\x09\ --\x01\x50\xa4\xf2\x8e\x2a\xd4\xbf\x71\x76\xb4\x60\x08\x88\x8f\x8d\ --\xe1\x7f\xbe\x73\x17\x73\xa6\x4e\xe0\xf1\xa7\x16\x53\x7f\x22\x32\ --\x8b\x6a\x22\x04\x03\x06\x0d\x67\xe2\x95\xb3\xe8\x3f\x78\xb8\xe6\ --\xdb\x9d\x0e\x1b\x6b\x57\x7c\xc0\x96\x8d\xeb\x90\x41\x8a\xcf\x38\ --\x1f\xc9\xb9\x55\x8d\x4d\xce\xe5\xf9\x37\x3e\x0e\x8b\x6c\x49\x09\ --\xf1\x71\xf4\xd7\xee\x03\xa0\x7a\x5d\x96\xf7\x2e\xf6\x83\x8b\x0a\ --\xc0\xf8\x42\x51\x53\x51\xe3\x59\x2f\x11\x53\xb5\xf6\xa4\x07\x97\ --\x8f\x1f\xce\xcf\x7f\xfa\x28\x8b\x96\xae\xa0\xfc\x8b\x55\xb8\x7a\ --\x58\x04\x31\x54\x44\xc7\xc6\x31\x7a\xdc\xe5\x8c\xbf\x7c\x2a\xe9\ --\xfd\xb4\x1f\xd3\x48\x29\xd9\xb9\x65\x03\xab\x3f\x7e\x17\xbb\xcd\ --\xcc\xc6\x1b\x2e\x1c\xa9\xaa\xe3\xd3\xb5\xc6\xef\xfe\x03\x8c\x1e\ --\xde\x1f\xe5\xfc\xf4\x3e\xdd\x20\x85\x58\x5d\x3a\x40\x5c\x34\x7c\ --\xf1\x92\xa9\x21\x24\x62\x31\x60\x88\x00\x78\x55\xa8\xe9\x88\x65\ --\xea\xec\xeb\x99\x70\xc5\x34\x36\x7c\xf6\x09\x5b\x37\xaf\xc7\xed\ --\x0e\xbf\x57\x94\xd5\x1a\xc5\x80\x21\x23\x18\x31\xaa\x98\x41\x23\ --\x46\x13\x1d\x60\xc9\xb1\xfa\xda\x2a\x3e\x7d\xff\x75\x8e\x55\x1f\ --\xd5\xd9\x42\x93\x9e\xb2\xf0\xb5\x65\x61\xe3\xaf\x32\x69\xfc\x65\ --\x9a\xef\x11\xaa\xbc\x64\x76\xde\x4b\x0a\x80\x27\x4a\x79\xdd\xea\ --\x56\x9f\x00\x42\x5e\x00\xed\x78\xa7\xc0\x75\xf2\x54\x30\x2e\x3e\ --\x91\x19\xd7\xce\xe7\x8a\x19\xd7\xb2\x73\xcb\x26\xb6\x96\xad\xa3\ --\xb1\xc1\xd8\x8d\xc2\xa8\xe8\x18\xfa\x0f\x1a\xc6\xf0\x51\xe3\x19\ --\x3c\x7c\x34\xd1\x31\xb1\x01\xb7\xe5\xb0\x75\xb2\x66\xf9\xfb\x6c\ --\x2b\x5b\x1f\x16\x53\x4c\x93\x73\xd9\x77\xb8\x9a\x55\x1b\x8c\x3f\ --\xfa\x3b\xc5\x94\x09\x23\xb5\xde\xe2\xb5\x58\x95\xa5\x97\xfa\xe1\ --\x25\x05\xe0\xf2\x2c\x51\x57\x5e\xeb\x59\x83\x14\x33\xb4\xf6\xd8\ --\x53\x5a\x1d\x17\x7e\x16\x13\x1b\x47\xc9\xe4\x69\x94\x4c\x9e\x46\ --\x5d\x6d\x25\x07\x76\xef\xe0\xc0\xde\xed\x9c\xa8\x0f\x7e\x8e\x81\ --\xa8\xe8\x68\xf2\x0b\x07\x51\x34\x70\x28\x85\x03\x87\x92\x9d\x57\ --\x18\x70\x2c\xf6\x29\xa4\x94\x6c\x2b\x5b\xcf\x9a\xe5\xef\xe3\xb0\ --\x19\x9b\x5d\xd6\xe4\xe2\xa8\xaa\xe4\x2f\xcf\xbd\x15\x36\xc2\x5c\ --\x94\x97\x45\x41\x4e\x3f\x8d\x77\x89\x15\xe3\x72\xc4\x25\xab\xf5\ --\x76\x9d\x1d\x4e\x15\x8b\x11\xcc\xd0\xd8\x63\x8f\x89\xea\x66\xce\ --\x91\x93\x57\x44\x4e\x5e\x11\x53\x67\x5f\x4f\x7b\x5b\x0b\xb5\x55\ --\x47\x38\x56\x75\x98\xba\x9a\x2a\x1a\x4f\xd4\x07\xbc\x7e\x16\x42\ --\x21\x35\x2d\x9d\x8c\xac\x5c\xd2\x33\xb3\xc9\xcc\xca\x25\x3d\x33\ --\x87\x7e\x59\xb9\x58\x74\x2c\x05\x7d\xac\xfa\x28\x9f\xbe\xff\x3a\ --\xf5\xb5\x55\xba\xb5\x69\xa2\x3f\x6f\x7c\xb8\x86\x2d\xbb\xc2\xa7\ --\x1e\x62\x00\x6f\x7f\x40\x7d\xad\xab\x9f\x76\x29\x00\x6e\x94\xc5\ --\x51\xa8\x7f\x04\x02\x9f\xe3\x06\x40\x6e\x92\x64\x57\xbd\xc0\xe3\ --\xc7\xb2\x2b\x29\x39\x95\xe1\xa3\xc6\x33\x7c\xd4\x99\x7c\xa6\x4e\ --\x87\x9d\x96\xa6\x13\x74\x76\xb6\xe3\xe8\xec\xc4\x66\xef\x44\x3d\ --\x19\x1a\xeb\xb0\xdb\x89\x8e\x8e\xc1\x6a\xb5\x12\x1d\x1b\x4b\x4c\ --\x4c\x1c\x09\xc9\xc9\x24\x24\x24\x91\x94\x92\x86\x55\x63\xb1\x05\ --\x2d\xd8\x6d\x1d\xac\xfe\xf8\x5d\x76\x6e\xd9\x10\x36\x6f\x15\x93\ --\x8b\x53\x75\xec\x38\xff\x7c\xe5\x7d\xa3\xcd\x38\x87\xa9\x13\x47\ --\x6b\xbd\xc5\x6e\xf5\x58\x2e\x39\xfd\x87\x6e\x04\x60\x52\x81\x68\ --\x2c\xaf\xf1\xbe\x05\x7c\x59\x6b\xcf\x3d\x21\x2e\x0a\x2e\x2f\x94\ --\x7c\x71\x54\x10\xc8\xd6\x4b\x4c\x6c\x1c\xd9\x79\x85\xba\xdb\xd5\ --\x13\x6c\x1d\xed\x2c\xfc\xeb\xaf\x71\x3a\x8c\xf7\x24\x33\xe9\x1a\ --\x55\x95\xfc\xe6\x1f\xaf\xe2\x70\x86\xcf\xa6\x73\x5e\x76\x06\xe3\ --\x2e\xf3\xaf\xbc\xdb\x69\x04\xaf\x8f\xed\x2f\xba\x0c\x16\xe9\x76\ --\x21\x2b\xa5\xfa\x2f\x6d\xbd\xea\x43\x56\xa2\x64\x68\x2f\x0a\x50\ --\x71\xb9\x5d\xe6\xe0\x8f\x10\x9e\x79\xed\x03\xb6\xed\x0e\xbe\xf3\ --\x95\x16\xe6\x4e\x2b\xbd\xa0\xe6\x43\x77\x48\x94\x67\xba\xbb\xa6\ --\x5b\x01\x28\xc9\xb7\xae\x04\x0c\x09\x80\x8e\x35\x13\x55\x98\x84\ --\x98\x65\xab\x37\xf3\xe2\x92\xf0\xab\x63\x31\xe7\xaa\x12\xad\xb7\ --\xec\x2b\xc9\x65\x6d\x77\x17\x75\x2b\x00\x42\x08\x89\xe0\x59\xad\ --\xbd\xf7\x94\x36\x27\xec\x69\x30\x5d\x53\x4d\x42\xc7\xd6\xdd\x07\ --\xf9\xdd\x93\x5d\xee\x99\x19\xc2\xd8\xcb\x06\x69\x8e\xff\x17\xf0\ --\x2f\xe1\x47\x61\x48\xbf\xce\xb2\xa2\x2c\xca\x73\x08\x42\x56\xdf\ --\xab\xc5\x0e\x6b\x0f\x2b\x38\xbb\x4e\x69\x67\x62\xa2\x1b\x47\xab\ --\xeb\xf9\xc9\xef\x9f\xc3\xe5\x09\xbf\x87\xee\xd6\x6b\xaf\xd2\x7a\ --\x8b\x4b\xb1\x28\x2f\xfa\x73\xa1\x5f\x02\x30\x26\x5b\xd4\x0b\x95\ --\x90\x48\x63\xbb\x13\xd6\x1d\x51\x4e\x3b\x02\x99\xf4\x3d\xf6\x1c\ --\x17\x84\xf2\x90\x64\xdf\xe1\x6a\xbe\xfd\xf3\xbf\xd1\xda\x16\x7e\ --\xfe\x18\x79\xd9\x19\xcc\x98\x3c\x56\xd3\x3d\x12\x5e\xe9\xea\xec\ --\xff\x6c\xfc\xf6\x66\x51\xa5\xf2\x7b\x5f\xdb\xc1\xa5\xaa\x55\xe0\ --\x0e\x0f\xaf\x4b\x13\x83\xa8\x6c\x11\x6c\xa8\x12\x21\x79\x09\xec\ --\x3e\x50\xc9\x0f\x7e\xf9\x14\x2d\x6d\xe1\x19\x7b\x71\xc7\xbc\xe9\ --\x9a\x93\x7f\x08\xa9\xfc\xc9\xdf\x6b\xfd\x6e\x79\x42\xa1\xd8\x06\ --\x62\xb9\x26\x4b\x02\xa0\x3b\x27\x20\x93\xbe\x41\x5d\xbb\x60\xe5\ --\x01\x85\x23\xcd\x81\x1d\x05\xfb\xc3\x86\x8a\x3d\x7c\xff\xb1\x7f\ --\xd0\xd6\x1e\x7e\x6f\x7e\x80\xe4\xc4\x78\xae\x9f\x75\xb9\xc6\xbb\ --\xc4\xb2\x92\x02\xb1\xd5\xdf\xab\x35\xd5\x89\x95\xc2\xfb\x07\x21\ --\x95\xab\x35\x5a\xa4\x89\xec\x04\xc9\x4e\xcc\xcd\x3f\x13\xb0\x7b\ --\x60\x4b\xad\x60\x47\x9d\x20\x21\x06\xa2\x15\x49\x94\x05\xfa\xa7\ --\x41\x76\x62\xe0\x93\x51\x29\x25\xaf\xbc\xbd\x82\xa7\x5f\x79\x1f\ --\x55\x0d\xdf\xa3\xe6\x2f\xdf\x38\x93\xf8\x58\x8d\xc1\x65\xd2\xfb\ --\x7f\x5a\x2e\xd7\x24\x00\x13\xf2\xa2\x96\x95\xd7\x78\xb7\x02\xe3\ --\x34\x19\xa5\x81\xe4\x58\x48\x8a\xf1\xed\x05\x98\x98\x00\x78\x54\ --\x68\xb5\x03\x27\x5f\x0c\x75\xed\x30\x63\xb0\x24\x39\x80\xc0\xcb\ --\xd6\xb6\x4e\x7e\xf1\x97\x45\x6c\xdc\xb2\x57\x57\x1b\xf5\xa6\x5f\ --\x5a\x0a\xb7\xcf\x9b\xa6\xf5\xb6\x6d\xc5\xf9\xd6\x15\x5a\x6e\xd0\ --\x1c\xd1\x22\xa4\x7c\x42\xeb\x3d\x5a\xc9\x4f\x09\x5f\x55\x36\x31\ --\x1e\x55\xc2\xfe\xe3\xda\x67\x89\x9f\xae\xab\xe0\x9e\x47\x7e\x17\ --\xf6\x83\x1f\xe0\x81\x2f\x5d\x4b\x5c\xac\xb6\x34\xf1\x42\xc8\xc7\ --\xfd\x39\xfa\x3b\x1b\xcd\x02\xb0\x3f\xdf\xf2\x92\x84\xa0\x7e\x83\ --\xfd\xd3\xa4\x5f\x75\xce\x4d\xfa\x2e\xd5\x6d\xc2\xef\x63\xe2\xda\ --\xfa\x46\x1e\xf9\xdf\xa7\x79\xec\x89\x17\x69\x6a\x0e\x5e\x5e\x45\ --\xbd\x28\xca\xcb\x62\xde\x4c\xad\x6b\x7f\xf6\xed\xcf\xb5\x68\x3e\ --\xa9\xd3\x2c\x00\x77\x08\xe1\x55\x84\xfc\x95\xd6\xfb\xb4\x10\x67\ --\x85\xab\x06\xa8\x24\x87\x34\x04\xc9\x24\x92\x90\x12\xea\x3b\xba\ --\x9e\x05\x34\xb7\xb6\xf3\xf7\x17\xdf\xe1\x9e\x87\x1f\x67\x43\xc5\ --\x9e\x10\x59\xd6\x33\x84\x10\xfc\xe7\x43\xb7\x05\xb0\xf3\x2f\x7f\ --\x7a\x87\x10\x9a\xcf\x4d\x34\xed\x01\x9c\x62\x7c\xae\xe5\xdf\x15\ --\xb5\xea\x7f\x03\xda\x0e\x28\x35\x90\x12\x0b\x33\x06\xab\xec\xae\ --\x17\xec\x3f\x61\x6e\x0a\x9a\x5c\x48\x43\x07\x14\xa5\x5e\xf8\x79\ --\x73\x6b\x3b\xaf\xbe\xbb\x9a\x25\x1f\xae\x09\xab\x80\x1e\x7f\x98\ --\x37\xeb\x72\x4a\x46\x0f\xd5\x74\x8f\x94\xec\x28\xce\xb7\x2c\x09\ --\xa4\xbf\x80\x04\x40\x08\xa1\x96\x57\x7b\x7e\x85\x10\xaf\x07\x72\ --\xbf\xbf\x28\xc0\xa8\x6c\x89\xc3\xed\xf3\x0f\x30\x31\x39\x9b\x56\ --\x87\xe0\x94\x6b\x8a\xaa\x4a\xca\x77\xec\xe7\xc3\xd5\x9b\x58\xf5\ --\xf9\x56\x9c\xae\x90\x39\xae\xea\x46\x7a\x5a\x32\xdf\xbe\x57\x7b\ --\x32\x6e\x45\xc8\x9f\x0a\x21\x02\x3a\x2d\x0d\x48\x00\x00\x8a\xf3\ --\x2d\x4b\x2a\x6a\xd5\x2d\xc0\xf8\x6e\x2f\xee\x21\x63\xf3\x24\x8d\ --\x36\x81\x2d\xf2\xfe\xa6\x26\x41\xa4\xcd\xe6\x66\xe3\xd6\x03\x6c\ --\xa8\xd8\xcd\xca\xcf\xb7\x46\x7c\xc5\xe9\x47\x1e\xbc\x95\xa4\x84\ --\x78\xad\xb7\x95\x8d\xcf\xb3\xbc\x13\x68\x9f\x01\x0b\x80\x10\x42\ --\x96\x57\xbb\xff\x13\xa1\x04\x3d\x74\x2a\x4a\x81\xf1\x79\x92\xf5\ --\x47\xcd\x59\x40\x5f\x45\x4a\x95\xb6\x96\x66\xea\x8f\x55\xd3\x70\ --\xac\x86\xfa\x63\x95\x54\x1f\x39\x18\x96\x89\x62\x03\xe1\xe6\x39\ --\x53\x98\xae\xd1\xe5\x17\x40\xa0\xfe\x58\x88\xc0\xcb\x3a\x05\x2c\ --\x00\x00\x25\x05\x51\xcb\xcb\x6b\xd4\x77\x41\xde\xd8\x93\x76\xfc\ --\x21\x2b\x51\x92\x9f\x02\x35\xe6\x52\xa0\xd7\xf3\xe1\xd2\x97\x4e\ --\x97\x4e\xb3\x77\x76\xd0\xd9\xd1\x8e\xad\xb3\xbd\xd7\x66\x51\x1a\ --\xd2\x3f\x9f\xef\x3f\x70\x8b\xf6\x1b\xa5\x58\x5a\x5c\x10\xf5\x49\ --\x4f\xfa\xee\x91\x00\x00\xa8\x5e\xf1\xb0\x62\x91\xd7\x00\x81\xe5\ --\xc3\xd6\xc0\x98\x1c\x49\x7d\x87\xc0\x63\x06\x0a\xf5\x6a\x42\x51\ --\x09\x29\x5c\x88\x8f\x8d\xe1\x97\x3f\xbc\x87\x68\x8d\xb5\x22\x01\ --\x97\x90\xe2\x47\x3d\xed\xbf\xc7\x95\x7f\x4a\x8b\xc4\x41\x09\x7f\ --\xed\x69\x3b\xfe\x10\x6b\x85\x11\xbd\x28\x4b\x90\x49\xdf\x46\x51\ --\x14\x7e\xf6\xfd\xbb\x29\xd2\x5e\xe9\x07\x24\x7f\x28\x2e\x14\x3d\ --\x4e\xd4\xa3\x4b\xe9\x2f\x7b\xb4\xf2\x4b\x20\x24\xc9\xfa\x07\x65\ --\x48\x92\x82\x3e\xd7\x30\x31\x09\x3e\xdf\xbd\xff\x66\xae\xd2\x9e\ --\xe8\x13\xa0\xde\x15\xa7\xfc\x56\x0f\x1b\x74\x11\x80\xa9\x99\xa2\ --\x5d\x22\x7f\xa2\x47\x5b\xdd\xa1\x00\xa3\xb3\xcd\x59\x80\x49\x64\ --\x73\xf3\x9c\x29\xdc\x7e\xbd\x66\x5f\x7f\x1f\x42\xfe\xd7\xe4\x0c\ --\xa1\x8b\x4b\xa3\x6e\xc5\x3f\x4b\xf2\x2c\xcf\x83\x08\x49\x32\xb5\ --\xec\x24\x49\xbf\x78\x53\x04\x4c\x22\x93\xab\xaf\x2c\xe6\x91\xaf\ --\xdf\x1a\xd0\xbd\x52\x88\x95\xc5\xb9\x96\x97\xf4\xb2\x45\x37\x01\ --\x10\x42\x48\x8b\x45\x3c\x04\x84\x24\xb8\x7a\x54\x8e\x34\x83\x86\ --\x4d\x22\x8e\x19\x93\xc7\xf2\xb3\xef\xdd\x1d\x68\x65\x29\x9b\xf4\ --\x88\xaf\x6b\x0d\xf8\xe9\x0a\x5d\xcb\x7f\x8f\xcb\x11\x87\x81\xa0\ --\xc6\x09\x9c\x22\x2d\x0e\x72\x92\xcd\x59\x80\x49\xe4\x30\x7d\xf2\ --\x58\x1e\x7b\xf8\x5e\xcd\x7e\xfe\xa7\x91\xfc\xbc\xb4\x48\xe8\x5a\ --\xaa\x48\x57\x01\x00\x68\xcd\x53\xfe\x00\x94\xe9\xdd\xee\xc5\x18\ --\x99\x25\xd1\x98\x2a\xdd\xc4\xc4\x10\xe6\x4e\x2f\xe5\x17\x0f\xdf\ --\x8b\x35\xf0\x12\x73\x5b\x5a\xf3\x95\x3f\xeb\x69\x13\x04\x41\x00\ --\x66\x0a\xe1\x51\x85\xf2\x50\x28\xb2\x08\x27\xc5\xf8\x42\x87\x4d\ --\x4c\xc2\x99\xdb\xaf\x9f\xc6\x4f\xbf\x73\x57\x4f\x06\xbf\x0b\xa9\ --\xdc\x3f\x53\x08\xdd\x53\x16\xeb\x2e\x00\x00\xa5\x79\xa2\x5c\xc0\ --\x63\xc1\x68\xfb\x7c\x46\x66\x49\xa2\xcd\xdc\x01\x26\x61\x88\xc5\ --\xa2\xf0\x5f\x0f\xdd\xce\xf7\x1f\x98\xaf\xb9\xaa\xcf\xd9\x48\xf8\ --\x99\x96\x3c\x7f\x5a\x08\x8a\x00\x00\x8c\xcf\x55\x7e\x2b\x85\x58\ --\x19\xac\xf6\x4f\x11\x6d\xf1\x89\x80\x89\x49\x38\x91\x9a\x9c\xc8\ --\x1f\xfe\xe7\x1b\xdc\x7c\xcd\x94\x1e\xb6\x24\x3f\x3b\xe8\x5b\x56\ --\x07\x85\xa0\x09\x80\x10\x42\xb5\xaa\xe2\x5e\xa0\x29\x58\x7d\x9c\ --\xa2\x7f\xba\x24\xd7\xdc\x10\x34\x09\x13\x2e\x1b\x52\xc4\x33\x8f\ --\x3f\x4c\xe9\xd8\x61\x3d\x6d\xaa\x45\x15\x96\x7b\x02\x49\xf4\xe1\ --\x2f\x41\x13\x00\x80\x71\x05\xa2\x1a\x29\xbf\x11\xcc\x3e\xc0\x97\ --\x2a\xb2\x38\x4f\x92\xa0\x2d\x85\x9a\x89\x89\xae\x28\x8a\xe0\xae\ --\x9b\x67\xf1\xe4\xff\x7e\x8f\x9c\xcc\xf4\x1e\xb7\x27\x91\xff\x51\ --\x9a\x27\x2a\x75\x30\xed\x92\x04\x55\x00\x00\x4a\x0a\xac\x6f\x20\ --\x78\x21\xd8\xfd\x44\x5b\xa0\xb4\x40\x0d\xfe\x2f\x14\xe1\xc4\xc6\ --\xc6\x19\x6d\x42\xaf\x24\x2f\x3b\x83\xbf\xfd\xe2\x3b\x7c\xeb\x9e\ --\x1b\x7b\xb2\xd9\x77\x1a\x09\xff\x9a\x90\x6f\x0d\x7a\x35\xae\x1e\ --\x47\x03\xfa\x43\xab\x53\xf9\x8f\x94\x68\x75\x0c\xa0\xb9\xc4\xa9\ --\x16\xd2\xe2\x60\x68\xa6\x64\x6f\x00\x19\x63\x7b\x3b\x71\x09\x09\ --\x4c\x9b\x7d\x23\xa3\x4b\x26\x1b\x6d\x4a\xaf\x42\x51\x04\x37\xcf\ --\x99\xc2\x37\xef\xb9\x51\x7b\x0e\xff\x4b\xb3\xc5\xa9\x2a\xdf\xd7\ --\xab\xb1\xae\x08\x89\x00\xcc\x1c\x28\x1c\xe5\xb5\x72\x01\x52\x2d\ --\x03\x32\x82\xd9\xd7\xd0\x0c\xc9\xc1\x46\x81\xc7\x2c\x2f\x06\xf8\ --\x92\x4c\x5e\x36\xb6\x94\x99\x73\xe7\x13\x97\x90\x60\xb4\x39\xbd\ --\x8a\xa1\x03\xf2\x79\xe4\xa1\xdb\x18\x3d\x6c\x80\x9e\xcd\x36\x59\ --\x2c\xca\x82\x29\xf9\xc2\xae\x67\xa3\x97\x22\x24\x02\x00\x50\x92\ --\x27\x8e\x56\xd4\xb8\xef\x94\x28\x1f\x02\x41\x3b\xb8\xb3\x5a\x20\ --\x3d\x5e\xd2\xd0\x4d\xc6\xd8\xbe\x40\x5e\xe1\x00\x66\xcf\xbb\x9d\ --\xec\xdc\x02\xa3\x4d\xe9\x55\x24\x27\x25\xf0\xb5\x2f\x5f\xc7\x2d\ --\x73\xae\x08\xd4\xa5\xf7\x52\xa8\x52\xa8\x5f\x19\x97\x63\x39\xac\ --\x67\xa3\x5d\x11\x32\x01\x00\x28\xce\x8f\xfa\xa4\xa2\xc6\xfb\x2b\ --\x19\x64\x1f\x81\x7e\x09\xbe\x8c\xb1\x7d\x95\xd8\xf8\x04\xae\x98\ --\x3e\x97\x92\x49\xd3\x7a\x74\xfe\x6c\x72\x2e\x71\xb1\xd1\x2c\xb8\ --\xf6\x2a\xee\x59\x30\x9b\xc4\x78\xfd\xf7\x52\x84\xe0\xa7\x25\x79\ --\x51\xcb\x74\x6f\xb8\x0b\x42\x2a\x00\x00\xe3\xf3\x94\x5f\x55\xd4\ --\xca\x62\x90\x37\x07\xab\x8f\x82\x64\xdf\x3e\x80\xb7\x8f\x2d\x03\ --\x14\x45\x61\xfc\xc4\xab\xb8\x72\xd6\x75\xc4\x98\x9b\x7d\xba\x11\ --\x1b\x13\xcd\x8d\xb3\x27\x73\xcf\x82\xab\x49\x4f\x4d\x0a\x4e\x27\ --\x52\x2c\x19\x9f\x27\x74\x89\xf1\xd7\x42\xc8\x05\x40\x08\xa1\xae\ --\xaf\x92\x77\xc6\x2a\xea\x0a\x10\x41\xd9\x91\x8a\x8f\x86\xf1\xb9\ --\x92\xf2\xda\xd0\xd6\x99\x37\x92\x82\xa2\xc1\xcc\x9e\x77\x1b\x99\ --\x39\x79\x46\x9b\xd2\x6b\x88\x8f\x8f\x65\xde\x8c\xcb\xb9\x7b\xc1\ --\x6c\x32\x52\x93\x83\xd8\x93\xdc\x6c\xb1\x2a\xf7\xe9\x19\xe5\xe7\ --\x2f\x21\x17\x00\x80\x29\x85\xc2\x5e\x7e\x4c\xde\x84\x54\x3f\x47\ --\x32\x38\x18\x7d\x14\xa6\x4a\x14\x05\x2a\x6a\x7a\xf7\x86\x60\x42\ --\x62\x32\x33\xe6\xde\xcc\x65\x63\x26\x60\x46\x46\xe9\x43\x51\x7e\ --\x36\xf3\xe7\x4e\x61\xde\xcc\x49\xc4\xc7\x05\x3d\xfd\xd4\xe1\x28\ --\xab\xe5\x86\x31\xd9\xc2\x90\x1a\xe5\x86\x08\x00\x40\x49\xae\x38\ --\x5e\x56\x2b\x6f\x14\xa8\xeb\x80\xb4\x60\xf4\x91\x9f\x2c\x49\x8e\ --\x91\x6c\xac\x52\x7a\x5d\xb5\x61\xc5\x62\xa1\x64\xd2\x34\xa6\xcc\ --\xb8\x96\xe8\x18\xb3\x86\x5a\x4f\x89\xb2\x5a\x98\x5a\x3a\x9a\xf9\ --\xd7\x5e\x49\xf1\xa8\x21\xa1\xda\x3b\x69\x52\x85\x72\xfd\x98\x6c\ --\x51\x1f\x8a\xce\x2e\x86\x61\x02\x00\x30\x21\x4f\xec\x2e\x3f\x26\ --\xe7\xa3\xaa\x1f\x11\xa4\xac\xc2\x49\x31\xbe\x12\x63\xfb\x8e\x0b\ --\x0e\x9c\x10\x78\x7b\xc1\x92\xa0\x70\xc0\x10\x66\xcf\xbb\x8d\x7e\ --\x59\xb9\x46\x9b\x12\xf1\x0c\x1f\x5c\xc8\xdc\x69\xa5\xcc\x99\x5a\ --\x4c\x5a\x4a\x90\xd6\xf7\x17\x43\xe0\x46\x55\xef\x28\xcd\xb7\x18\ --\x5a\xb4\xd0\x50\x01\x00\x28\xc9\x15\xab\xcb\x6a\x3c\xf7\x09\xc4\ --\xcb\x04\xe9\x78\xd0\x22\xe0\xb2\x2c\x49\x61\xaa\x64\x47\x9d\xa0\ --\xae\x3d\x32\xa7\xca\x49\xc9\xa9\x4c\x9f\x7b\x0b\x23\x46\x17\x1b\ --\x6d\x4a\xc4\xa2\x28\x82\xcb\x06\xf7\x67\xfa\xa4\x31\x4c\x9b\x3c\ --\x96\x82\x9c\x7e\x46\x98\xe1\x45\x95\x77\x95\x14\x44\x2d\x37\xa2\ --\xf3\xb3\x31\x5c\x00\x00\x26\xe4\x5b\x5f\xab\xa8\xf6\xc4\x4a\x21\ --\x9e\x25\x88\xee\xc9\x89\xd1\x30\xb9\x48\xd2\x64\x97\xec\xae\x17\ --\x1c\xef\x8c\x0c\x21\xb0\x58\x2c\x4c\xb8\x62\x26\x93\xa7\x5f\x43\ --\x74\xb4\x99\x12\x59\x2b\x09\xf1\x71\x94\x8e\x1d\xca\xa4\x71\x23\ --\x98\x52\x3a\x92\x7e\x69\x29\x46\x9a\x23\x85\x90\xff\x51\x9c\x6f\ --\x7d\xc3\x48\x23\x4e\x11\x16\x02\x00\x50\x5c\x60\x7d\xa1\xdc\xec\ --\x1a\x97\x00\x00\x09\x20\x49\x44\x41\x54\xac\xc6\x9b\x28\xe0\x6f\ --\xc1\xee\x2b\x3d\x0e\xae\x1c\x20\xe9\x70\x49\x2a\x9b\x05\x95\x2d\ --\x02\x87\xee\xa9\x16\xf4\xa1\xff\xe0\xe1\x5c\x3d\xef\x36\xd2\x32\ --\xb2\x8c\x36\x25\x62\x48\x49\x4e\x60\xd4\xd0\xfe\x8c\x1e\x36\x80\ --\xf1\xa3\x06\x33\x6a\xe8\x80\xc0\xd3\x70\xe9\x8c\x94\x3c\x52\x92\ --\x6f\x7d\xc6\x68\x3b\x4e\x11\x36\x02\x00\x30\x21\xdf\xf2\xf7\xb2\ --\x6a\x6f\xb4\x10\xfc\x31\x14\xfd\x25\x46\xc3\xc8\x6c\xc9\x65\x59\ --\x92\xda\x36\xc1\x8e\x7a\x81\x3d\x4c\x0a\x90\x26\x26\xa7\x30\x6d\ --\xf6\x8d\x8c\x1c\x3f\xd1\x68\x53\xc2\x1a\x45\x51\x28\xca\xcf\x62\ --\xf8\xa0\x02\xc6\x8d\x18\xc4\x98\x11\x03\x19\x50\x90\x1d\x9e\x0e\ --\x50\x82\x1f\x4f\xc8\xb7\x3c\x61\xb4\x19\x67\x13\x56\x02\x00\x30\ --\xa1\xc0\xf2\x44\x79\x8d\x37\x15\xf8\x79\xa8\xfa\x14\x02\xf2\x53\ --\x24\xd9\x89\x92\x6d\x75\xbe\x19\x81\x51\x28\x16\x0b\xe3\x4b\xa7\ --\x32\xf5\xea\x79\xe6\x74\xff\x2c\xa2\xac\x16\x32\x33\x52\x19\x50\ --\x90\xcd\xc0\xc2\x5c\x06\x16\xe6\x30\xb0\x20\x9b\xc2\xfc\x2c\x3d\ --\x83\x70\x82\x86\x84\x5f\x4c\xc8\xb3\x84\xdc\xd1\xa7\x3b\xc2\x50\ --\x26\x7d\x94\xd7\x78\x1f\x05\x0c\xf9\xc2\x2a\x5b\x04\x5b\x6a\x05\ --\xaa\x8e\x27\x06\x2d\xcd\x8d\x3c\xf3\xa7\x5f\x76\x79\xcd\xa0\xa1\ --\x23\x99\x79\xfd\xad\xa4\xa5\x1b\xb2\x31\x85\xcb\xe5\xa4\xb9\xf1\ --\x38\x4d\x27\xea\x69\x6f\x6d\xa6\xa3\xbd\x95\xb6\x96\x66\x3a\x3b\ --\xda\xb0\x77\x76\x60\xb7\xdb\x70\x3a\xf4\x8d\x51\x11\x42\x10\x1d\ --\x13\x47\x5c\x7c\x3c\x89\x49\xc9\x14\x64\xa5\x50\x94\x9d\x4c\x56\ --\x46\x2a\x19\xa9\xc9\x64\xf5\x4b\x21\x33\x3d\x95\x9c\xcc\x74\x14\ --\x25\x6c\x1f\xd7\xee\xf8\x7f\x25\xf9\x96\xae\xff\xf8\x06\x11\x76\ --\x33\x80\x53\x94\xe4\x5b\x1e\x2f\xaf\xf6\xb6\x22\xf8\x3b\x21\xc8\ --\x5b\x70\x36\x45\xa9\x92\x84\x28\xc9\x86\x2a\x05\x57\x08\x0a\x91\ --\xa6\xa4\x65\x30\xf3\xda\x05\x0c\x19\x11\x50\x99\x28\xdd\x88\x8e\ --\x8e\x21\x3b\xb7\xa0\xeb\xe0\x21\x29\x71\x38\xec\xd8\xed\x36\x5c\ --\x27\xc5\xc0\xe5\x74\xa2\xaa\x5e\xbc\xaa\x17\xb7\xeb\xdc\x72\xdd\ --\x42\x08\x62\xce\xf2\x53\x88\x89\x8d\x23\x26\x36\x96\xa8\xe8\x18\ --\xa2\x63\x62\xcf\x99\xe5\xc4\x58\x61\xce\x10\x15\x6b\xef\xc9\xf1\ --\x28\x85\xe0\xe1\xe2\x3c\x8b\xee\xd9\x7c\xf5\x22\x6c\x05\x00\xa0\ --\xa4\xc0\xf2\x54\x45\xad\xa7\x5d\x4a\xf1\x3c\x21\xb6\x35\x23\x01\ --\xa6\xf4\x57\x59\x73\x58\x09\x9a\xef\x80\x35\x2a\x8a\x92\x49\xd3\ --\xb9\x62\xfa\x5c\xa2\xa2\x23\x24\x9d\x91\x10\xc4\xc6\xc5\x13\x1b\ --\x17\xaf\x7b\xd3\x43\xfb\xc9\xde\x34\xf8\xbd\x12\xf9\xf5\x92\x3c\ --\xeb\x73\x46\x1b\xd2\x15\x61\x2d\x00\x00\xc5\x79\xd6\x97\xcb\x6a\ --\x3c\x1e\x81\x78\x11\x08\xe9\x28\x49\x8d\x83\xd1\xb9\x92\xad\xb5\ --\xfa\x4f\x3d\x07\x0f\x1b\xc5\xcc\xeb\x6f\x25\x35\x2d\xa8\xe9\x11\ --\x22\x8a\xcc\x84\x5e\xe0\xa5\xe5\xc3\x89\x94\x77\x4f\x28\x08\x8f\ --\xa3\xbe\xae\x08\x7b\x01\x80\x93\x7e\x02\x35\xb2\x5a\xa2\xbe\x05\ --\x84\x74\x81\x5c\x94\x22\xd9\x55\x27\x70\xeb\x14\x4f\x90\x9a\xde\ --\x8f\x59\xd7\x2d\x60\xd0\xb0\x51\xfa\x34\xd8\x8b\xe8\x0d\x5e\x9a\ --\x40\xb3\x50\xd5\x05\xc5\x85\x51\xab\x8c\x36\xc4\x1f\x22\x6a\x57\ --\xa5\xac\x4a\x0e\x11\x8a\xfa\x01\x30\x34\x94\xfd\x6e\xa8\x14\x1c\ --\xeb\xa1\xf7\x60\x7b\x5b\x0b\x3b\x2b\x36\x32\x71\xea\x2c\x2c\x96\ --\x88\xd0\xdd\x90\x73\x45\x91\x24\x3b\x29\xa2\x55\xe0\xb0\x2a\x94\ --\xeb\x4b\xf3\x84\xa1\xee\xbd\x5a\x88\x28\x01\x00\xd8\x5c\x2b\xfb\ --\x29\xd2\xfb\x16\x88\x2b\x43\xd5\xe7\x81\x46\xc1\x8e\xba\x88\xfb\ --\xaa\x22\x8e\xab\x87\xa8\x24\x86\xff\x89\xde\xc5\x11\x72\x63\x94\ --\xc5\x72\x93\x91\x81\x3d\x81\x10\x1e\xee\x51\x1a\x28\xcd\x13\x27\ --\x54\x61\xb9\x46\x20\xde\x0c\x55\x9f\xa9\x66\xb0\x5d\xd0\xc9\x49\ --\x92\x91\x3b\xf8\xa5\x58\xe2\xf0\x5a\x66\x44\xda\xe0\x87\x08\x14\ --\x00\x80\xd2\x3c\x61\x1b\x9f\x27\x6e\x05\x7e\x04\x04\xfd\xa0\x2e\ --\x39\x36\xa2\xa7\xa5\x61\x8f\x10\x11\x5b\xdd\x49\x02\x8f\x17\xe7\ --\x8b\x3b\xa6\x14\x86\x26\x89\xa7\xde\x44\xa4\x00\x00\x08\x21\x64\ --\x49\xbe\xe5\x71\x45\xaa\x73\x80\x86\x60\xf6\x15\x6d\x81\x58\x73\ --\xd9\x1e\x34\x06\xa6\x49\x92\x23\x6f\x96\xd5\x28\x85\x7a\x5d\x49\ --\xbe\xe5\x47\x42\x88\x88\x4d\x39\x13\xb1\x02\x70\x8a\xf1\x05\x51\ --\x2b\x3d\x28\xa5\x48\xb9\x29\x98\xfd\x24\xc5\x44\xe4\x1b\x2a\xec\ --\x51\xf0\x9d\xff\x47\x12\x12\x2a\x2c\x16\x65\xe2\x84\xbc\xa8\x8f\ --\x8c\xb6\xa5\xa7\x44\xbc\x00\x00\x5c\x9e\x2f\xaa\x1c\xd2\x32\x5d\ --\x40\xd0\x9c\x2e\xe2\xa2\x82\xd5\x72\xdf\x26\x3f\x55\x46\xd4\x77\ --\x2b\xe1\x5f\x6d\x2e\x65\xca\xb8\x1c\x11\xb2\xd4\xdd\xc1\xa4\xd7\ --\x6d\x6d\x97\xd7\x7a\x6e\x45\x8a\x7f\x02\x3d\x2f\xce\x76\x16\x3b\ --\xeb\x05\xfb\x4f\xf4\xba\xaf\xcb\x70\xa6\x0f\x52\x49\x8b\x84\x04\ --\xc6\x82\x56\xa4\xfc\x66\x49\xbe\xf5\xdf\x46\x9b\xa2\x27\xbd\x62\ --\x06\x70\x36\x25\x79\xd6\x25\x1e\x94\xf1\x08\xb9\xca\x68\x5b\x4c\ --\xba\x26\x3d\x9e\x88\x18\xfc\x52\x88\x95\x16\x55\x19\xdd\xdb\x06\ --\x3f\xf4\x42\x01\x00\xdf\x92\xa0\x38\xd7\x32\x4b\x08\x7e\x00\xb8\ --\xba\xbd\xc1\x24\xe4\x08\x60\x54\x56\xd8\xef\x9d\x79\x24\xfc\xa2\ --\x24\x57\x5c\x3d\xae\x40\x54\x1b\x6d\x4c\x30\xe8\x95\x02\x00\xbe\ --\x53\x82\xe2\x3c\xcb\x9f\x15\x94\xc9\x40\x79\x4f\xdb\xeb\x2b\xf5\ --\x05\x42\xc5\x88\x2c\x49\x46\x58\x97\x2a\x94\x9b\x91\x4a\xe9\x84\ --\x7c\xcb\x63\x91\xbc\xcb\xdf\x1d\xbd\x56\x00\x4e\x31\x3e\x5f\x54\ --\xb4\xe6\x29\x93\x4e\xce\x06\x02\x2e\x18\x66\x8e\xff\x9e\x23\x84\ --\x6f\xca\x3f\xa9\x48\x32\x3c\x33\x6c\xbf\x51\x3b\xf0\xa3\x03\x79\ --\x96\xc9\x25\x05\x62\xab\xd1\xc6\x04\x9b\x3e\xb5\xab\xb5\xa9\x5e\ --\x0e\xb2\x78\xe4\x53\x20\xe7\x68\xbd\x77\xdb\x31\xc1\xa1\xa6\x3e\ --\xf5\x75\x05\x8c\x00\x32\x12\x24\xfd\x12\x20\x21\x0a\x62\xa3\x20\ --\xc6\x22\x89\x8f\x06\x6b\x38\xbf\x72\xa4\x5c\xad\x60\x79\x68\x7c\ --\x81\xd8\x67\xb4\x29\xa1\xa2\xcf\x3d\xd1\x52\x4a\x51\x5e\xeb\xbd\ --\x5f\x20\x7e\x03\x64\xfb\x7b\xdf\xf6\x3a\xc1\xc1\xc6\x3e\xf7\x75\ --\x69\x26\x3b\x49\x32\x32\x4b\x92\x12\x59\x8e\x3d\x75\x48\xf9\x68\ --\x49\x81\xf5\x45\xa3\x0d\x09\x35\x7d\xf6\x89\xde\x5a\x27\x13\x3c\ --\x5e\xf5\xbf\x04\x3c\x0a\x74\xfb\xb8\x9a\x01\x41\x5d\x93\x99\x20\ --\x19\x96\x19\x61\x31\xfd\x02\x37\x92\x27\x5d\xb1\xca\xcf\x26\x67\ --\x88\x36\xa3\xcd\x31\x82\x3e\xff\x44\x97\x55\xc9\x21\xc2\x22\x7f\ --\x8d\x94\xb7\x77\x75\x5d\x5d\xbb\xe0\x8b\xca\x3e\xff\x75\x5d\x40\ --\x46\x02\x8c\xce\x8e\x90\xb3\xfc\xb3\x10\x88\xf7\xbc\x5e\xf1\x83\ --\xd2\x22\x71\xd0\x68\x5b\x8c\xc4\x7c\xa2\x4f\x52\x5e\xe3\xbe\x1a\ --\x94\xc7\x81\x92\x8b\xfd\xbc\xcd\x01\x2b\x0e\x86\xf3\x02\x36\xb4\ --\xc4\x45\xc1\x98\x1c\x49\x5e\x72\x04\xbd\xf1\x01\x90\x9b\xa5\x94\ --\x8f\x4e\x28\x88\x5a\x61\xb4\x25\xe1\x80\x29\x00\xe7\x51\x5e\xe3\ --\xbe\x5a\xa2\xfc\x4e\xc0\x39\xf5\xb7\xdc\x5e\x78\x7f\x8f\x29\x00\ --\xe0\x9b\xe6\x4f\x2c\x94\x44\x47\x56\xfe\xbe\x9d\x42\xca\x5f\x8c\ --\xcf\xb7\xbc\x61\x44\x19\xee\x70\xc5\x7c\xa2\xcf\xa3\x24\x3f\xea\ --\xd3\x92\x3c\x65\x82\x44\xde\x04\x6c\x3b\xf5\xb9\xd5\x02\x61\x52\ --\x5c\xc6\x50\xd2\xe2\x60\x72\xff\x88\x1a\xfc\xbb\x91\xf2\xbe\x03\ --\x79\xca\xb8\xe2\x02\xeb\xeb\xe6\xe0\x3f\x17\x73\x06\xd0\x05\x8b\ --\xa5\xb4\x0c\x3e\xe6\xbd\x53\x48\xf1\x5f\x2d\x76\xc6\xae\x3a\xd4\ --\xb7\x15\x40\x00\x33\x07\xab\x91\x12\xba\xbb\x45\x08\xf9\xfb\xf1\ --\xb9\x96\x57\x7b\xb3\x23\x4f\x4f\x31\x05\xc0\x4f\xde\xde\x2d\x17\ --\x1c\x3a\xc1\x53\x2d\x76\xc2\xd7\x85\x25\xc8\xa4\xc4\xc1\xcc\x41\ --\xe1\x3e\x96\xe4\x3a\x09\x8f\x97\xe4\x59\xde\x33\xdf\xf6\xdd\x63\ --\x0a\x80\x46\x16\x95\xcb\x9b\x3a\x9d\x3c\xde\xd0\xc9\x08\x4f\xb8\ --\x8f\x05\x9d\xc9\x4f\xf6\xad\xfd\xc3\x10\x17\x82\x7f\xab\x5e\xe5\ --\x0f\xa5\x85\x62\xbb\xd1\xc6\x44\x12\xa6\x00\x04\xc8\xe2\xcd\xb2\ --\xa8\xd9\xa3\xfe\xae\xd9\xf6\xff\xb7\x77\x37\x3d\x4d\x04\x61\x1c\ --\xc0\xff\xcf\x4c\x09\x50\x8a\x21\x82\xd8\x42\x40\x88\xc1\x10\x09\ --\x28\x95\x78\x20\x26\x86\x53\x23\x07\x8d\x9c\xf5\x13\x78\xf4\xa4\ --\x37\x3f\x84\x31\x72\xd0\x18\xbd\x10\x3d\x18\xe2\x81\x83\x06\x0f\ --\x36\xbe\x04\x4d\x14\xc3\x41\x13\x4b\xe2\xa1\x18\x15\xb5\x94\x76\ --\xdf\xe6\x79\x3c\xd4\x78\x52\x23\xd2\x76\xd9\x3a\xbf\x0f\xb0\xf3\ --\xec\x66\xe7\x9f\xd9\xdd\xd9\x19\x3a\x5d\x0a\x28\x22\xbb\x7a\x6c\ --\x4f\x77\x42\x30\xb9\x6f\x47\x05\xc0\x1b\x00\xd7\xb4\x56\xd7\x0f\ --\x25\xa9\xa6\xab\x42\x35\x2a\x1b\x00\x55\x70\xe3\xb9\x9c\xd9\xf4\ --\x70\xf1\x73\x09\xc3\xbe\x69\xdc\x6b\xda\xda\x04\x64\x0e\x84\x3e\ --\xec\x71\x41\x34\x0f\x31\xb3\xe3\x3d\xb1\x07\x76\x98\xbf\x3d\x0d\ --\x7b\xb3\x86\x61\x31\x27\xc9\xf7\xeb\x7c\x69\xbd\xac\x66\xbe\x94\ --\xd1\xd5\x88\x7f\x10\x4e\x0f\x73\x18\x5f\x00\x0c\x40\x8b\x44\x3c\ --\x07\x57\xdf\x19\x1f\xa4\xaf\x75\xaf\xa0\x41\xd9\x00\xa8\x91\xd9\ --\x67\x32\xc2\x06\x17\x4a\x01\x32\xdf\x9c\xc6\x09\x83\x63\x03\x82\ --\xae\xfa\x4c\xf7\x65\x40\x1e\x13\xd1\x6d\x3f\xa6\xe6\x8e\x76\xd3\ --\x5a\x3d\x1a\xfd\xdf\xd8\x00\xa8\x83\xbb\x2f\xe4\xe0\xba\xe0\xfc\ --\x86\x83\x4c\xc1\x41\x4f\x94\x1f\x13\xd2\xbd\x82\xfe\x8e\x9a\x05\ --\x40\x01\x42\xf7\x49\xf1\x82\xf1\xf4\xbd\x89\x01\xca\xd7\xaa\x21\ --\xab\x22\xb2\x37\x62\x54\x5d\x5e\x94\x44\xbc\x9d\xcf\x39\xbe\x9a\ --\x29\x7a\x32\x5a\xf4\xa8\x35\x4a\xa3\x83\x23\xbd\x82\xbe\xea\x06\ --\xc0\x4b\x00\x0b\xc4\xbc\x60\x3e\xc4\xb2\x13\x13\xe4\x57\xf3\xe0\ --\xd6\x9f\xd9\x00\x08\xd9\xcd\x15\x49\x99\x32\x9f\x2d\x79\x74\xb2\ --\xec\xd3\xc8\x86\x83\x8e\xd0\x5f\xb3\xfd\x46\x73\xac\x32\x11\x68\ --\x1b\x7b\x24\x04\xa8\x74\xf8\x2c\x89\x3c\x12\xad\x1f\xa6\x53\xf4\ --\xb1\x6a\x05\x5a\x5b\x66\x03\x60\x87\xb9\xf5\x44\x76\xe9\x16\x9c\ --\x72\x03\x3e\xe1\x06\xea\xf0\xa6\x8f\xbe\x82\x83\x04\x87\x3c\x4a\ --\x20\x54\xa6\x00\xef\x4d\xfc\x75\x21\x0e\x80\x15\x01\x5e\x91\x60\ --\x99\x48\x3d\x4d\x94\xb0\x34\x34\x44\x6e\xed\xaa\xb4\xb6\xca\x06\ --\x40\x04\x5c\x5d\x92\xb8\x12\x4c\x13\xf3\x71\x03\x1a\xf3\x03\xf4\ --\xbb\x86\x3a\xcb\x3e\xda\x3c\x53\x9f\xff\x39\xf6\x77\x0a\x46\x93\ --\xbf\xe8\xfc\x84\x3c\x44\x72\x02\xca\x11\xe1\x9d\xb0\xbc\x86\xd2\ --\xcb\x85\x14\xde\x4e\x11\x05\xf5\xa8\xcd\xfa\x77\x36\x00\x22\xee\ --\x4a\x56\xba\x5b\x9a\x31\x49\xe0\xb1\x00\xaa\x4f\x8c\x24\x0d\x63\ --\x8f\x2f\xd8\x6d\x98\xda\x03\x96\x36\x16\x34\x31\x93\x06\x80\x80\ --\xa1\x01\x90\x61\x90\xf9\xd1\x9f\x35\x01\x5a\xfd\x5c\xf6\x90\x63\ --\x0a\xac\x35\x02\x05\xf1\x34\xa1\xac\x15\x8a\xe9\x5e\x99\x8f\x37\ --\x21\x0f\x91\x4f\xac\x64\x4d\x10\x5b\xdd\x70\xb1\x3a\x35\x48\x4e\ --\x38\x67\x6e\x55\xc3\x77\x15\x65\xab\x07\x70\xac\xd6\x54\x00\x00\ --\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\ --\x00\x00\x05\xc2\ --\x89\ --\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ --\x00\x00\x18\x00\x00\x00\x18\x08\x06\x00\x00\x00\xe0\x77\x3d\xf8\ --\x00\x00\x00\x04\x73\x42\x49\x54\x08\x08\x08\x08\x7c\x08\x64\x88\ --\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0d\xd7\x00\x00\x0d\xd7\ --\x01\x42\x28\x9b\x78\x00\x00\x00\x19\x74\x45\x58\x74\x53\x6f\x66\ --\x74\x77\x61\x72\x65\x00\x77\x77\x77\x2e\x69\x6e\x6b\x73\x63\x61\ --\x70\x65\x2e\x6f\x72\x67\x9b\xee\x3c\x1a\x00\x00\x05\x3f\x49\x44\ --\x41\x54\x48\x89\x7d\x95\x69\x6c\x54\x55\x14\x80\xbf\xfb\xe6\x31\ --\xe5\xcd\x74\x1e\xb5\x53\x5a\x9c\x96\xca\x5a\x01\x31\x85\x52\x11\ --\xab\x60\x52\x40\xc3\x22\x1a\x14\x89\x10\x23\xb8\x41\x5c\xb0\x44\ --\x82\x06\x7f\x68\xa2\xd1\xa8\x08\x08\x46\x04\x11\x90\x62\xaa\x56\ --\x45\x5a\x4b\x54\x44\x04\x62\x44\x96\x41\x0d\x4b\x2d\x52\x5a\xa0\ --\x0b\xd0\x5a\x3a\x9d\x4e\x3b\xed\xbc\x77\xfc\x51\x66\xa4\x1b\xe7\ --\xd7\xbb\x27\xe7\x7e\xe7\x9d\xf5\x2a\xae\x23\xf9\xc7\x24\xa7\x35\ --\x2c\x2f\x36\xb7\x33\xa9\xd5\x52\x66\xb8\x5d\x9c\x22\x8a\x9c\xc1\ --\x52\x99\xe4\xa2\x54\x90\xef\x2c\xb4\x9d\xe3\x53\xd5\xf9\xde\x18\ --\xaa\x27\xe5\xe6\x23\x72\x7b\x30\x2c\xf9\xf5\x21\x35\x5c\xa4\x43\ --\xe7\x33\x85\x54\x13\xaa\x02\x30\x34\x51\xf0\xba\x63\xe6\x36\x4a\ --\x7d\xad\x94\x5a\x3e\xf6\x46\x55\xd1\x95\xa5\x75\x55\x7c\x7d\xdc\ --\xca\x13\x5b\x0e\x04\xc3\xff\xc3\x5d\x7d\xc0\xa1\x41\xa2\x4b\xc8\ --\x4e\x13\x3c\x7d\xff\xb7\x17\x11\x0d\x91\x39\xb6\x6d\xff\xe5\xaf\ --\x8a\xcc\xba\x6e\x04\x1b\x0e\xd9\x3b\x83\xad\xcc\x6a\x0c\x34\x71\ --\xba\xac\x8c\xfa\xfa\x3a\x0c\x09\xa2\x22\x21\x3c\xf1\x06\x8b\xe6\ --\xcd\xc4\x65\xc4\x01\x50\x71\xbe\x96\x55\x9f\x7c\xc3\x1b\xcb\x16\ --\x60\xc6\xbb\xae\x89\x86\xa5\x59\x3e\xc7\xda\xa8\x42\x8f\x7e\x6c\ --\xfa\x5d\x56\x9d\xa8\x6c\x98\xb5\xef\xc7\x9d\x94\x9d\xfc\x13\xdb\ --\xb6\xbb\xa5\xee\xb1\xd9\x53\x71\x3a\x75\x36\x7c\x56\x42\x61\xc9\ --\x7e\x22\x96\xd5\x3d\x23\xc2\xea\x92\x93\x91\xd0\x8c\x51\xfa\xa6\ --\x58\x8a\xb6\x1f\x95\x09\x87\x4f\x55\xe4\x6d\xfd\xf0\x1d\x4a\x8f\ --\x1f\xeb\x11\x1e\x95\x40\xa0\x99\x82\xa2\xbd\x3d\xc1\x63\x4e\x4c\ --\x43\xad\xd9\xf6\xbb\x64\xc7\x1c\x5c\xb8\xdc\x54\xb0\xe3\xb3\x4f\ --\x54\xb8\x35\x04\x40\x3f\xd3\xcd\x73\x8f\xdd\xcf\xca\x15\x4f\xf7\ --\xea\x28\x2a\xaa\x4b\x9b\xd8\x02\xfb\xca\x35\x77\x63\x84\x02\x00\ --\xfd\x48\xb5\xa4\x7f\x5a\xb8\x3b\x3d\x18\x0c\x00\x60\x9a\x1e\x3e\ --\x7e\xeb\x05\x7c\x29\x5e\x02\xc1\x50\xaf\xe0\x74\x5f\x32\x79\x4f\ --\xcc\xc6\xe3\x76\x11\x08\x86\xb8\x12\x08\xe2\xf1\xc4\x73\xfa\x8a\ --\x9b\x36\x0b\xea\x42\x0c\x2b\xf0\x4b\xb6\xae\x61\x3f\x70\xe0\xd0\ --\x1f\xb1\x6e\x7a\x6a\xee\xbd\xf8\x52\xbc\xbd\x82\x75\xdd\xc1\xe2\ --\xf9\x33\x79\x68\xfa\x44\x76\xfd\x72\x98\xf7\xb7\xec\xa0\xf2\xc2\ --\xc5\xab\xd1\x28\xd2\x87\x64\x90\x3b\x6d\x36\xde\xfe\x03\x08\xb4\ --\xc9\x2b\x3a\xa2\xa6\x55\xd5\xfe\x1b\x03\x4c\x1c\x3f\xba\x47\xf0\ --\x84\xac\x91\xb8\xdd\x06\x71\xce\x3e\x8c\xbe\x79\x10\x8b\x56\xbc\ --\xcf\x99\xca\xea\x4e\x36\x22\x42\xe5\x99\xbf\xf9\x62\xeb\x07\x2c\ --\x78\xe6\x25\x5a\x5c\x9e\x1c\xfd\xd7\x72\xfb\xae\xe6\x50\x47\x2a\ --\x34\x4d\x91\xd8\xcf\xec\x74\x29\x35\x25\x89\x25\x0b\x1f\xe0\xce\ --\xec\x5b\xa8\x6b\x68\xe4\xed\x8f\x8a\xd9\x7d\xc0\x8f\x5c\x1d\x92\ --\x21\xe9\x3e\x32\x47\x0e\xa6\xb6\xae\x81\x83\xfe\x53\x88\x08\xa1\ --\x60\x13\x47\x7f\xdb\x47\xe2\xb4\x99\x37\xe8\x83\x93\x94\xee\xd0\ --\x1d\x58\x11\x0b\xdb\x16\x82\xcd\x21\x4c\x4f\xc7\x98\xba\x8d\xbe\ --\xe4\xaf\x59\x8e\xa6\x69\x14\x14\xed\x65\x73\xe1\x0f\xb4\xb4\x84\ --\x01\xb8\x29\x2d\x85\xbc\x85\xb3\xb9\x2d\x33\x03\x80\xcb\xcd\x8a\ --\xd5\xf9\x7b\xd8\xff\x53\x31\x00\xe5\x65\x27\x69\xbf\x67\x46\x1f\ --\xdd\x67\x12\x49\xf7\x25\x73\xf6\x5c\x0d\x00\x3b\x76\x1f\x64\xec\ --\x1d\x53\x68\x0a\x43\xff\x78\x07\xa5\xa5\xff\xf0\x79\xe1\x37\x9c\ --\xab\xea\xc8\xb3\x61\xc4\xf1\xf8\x9c\x7b\x99\x33\x63\x12\xb6\x6d\ --\x63\x59\x36\x0e\x87\x86\xd7\x2d\xe4\x4e\x9a\x10\x73\xd0\x50\x7f\ --\x09\xa4\x63\xd0\xaa\x73\xb2\x46\x65\x44\x1d\x6c\x2a\x28\x61\xf0\ --\xe1\x72\xdc\x66\x3f\xaa\xcf\x9d\xa5\xfe\x72\x6d\xac\x80\x53\x26\ --\x66\xf1\xec\xa3\xf7\x91\x74\x43\x3f\x7e\x3d\x72\x82\xb5\x5b\xbe\ --\xe5\xe3\xb7\x97\x62\xc6\xbb\xd0\x80\x9c\x61\x06\x4a\x53\x88\x2d\ --\x44\x22\xed\xc4\xe9\x12\xd6\x41\x95\xcf\x9d\x79\x77\xc6\xae\xbd\ --\x87\x68\x68\x6c\x42\x44\x28\x3f\x7d\xb2\x53\x1d\xfa\x0f\xf0\x91\ --\x3b\xfd\x21\x46\x8f\x18\x4a\xbc\x2b\xcc\xb2\x37\x37\x72\xd0\x7f\ --\xaa\x5b\x23\x04\x9b\x1a\x11\xbb\xa3\x36\xa6\xc7\xcd\xd4\xe1\xea\ --\x67\x4d\x90\x92\xc4\x04\x0f\xeb\x5e\x7b\x86\x31\xa3\x47\x74\x9a\ --\x9c\xa4\x14\x1f\x53\x66\xcc\x61\xde\x93\x4b\xa9\x39\x77\x96\x8b\ --\xf5\xcd\xfc\x75\xbe\xb5\x47\x38\xc0\x81\x43\xc7\xaf\x69\x0e\x2f\ --\x0a\x29\xd6\x2d\xb4\x9d\x3a\xf6\x9a\x41\x03\x07\x38\x96\x3e\xbf\ --\x98\xa3\x15\xad\x84\x5a\x42\xb8\x0c\x17\xce\xbe\x06\x15\x67\x4a\ --\xd9\xb6\xfe\x5d\x1a\xea\x2f\x71\xcb\x98\xf1\x9c\xae\xeb\x71\xc3\ --\x53\x75\xb1\x8e\xcd\x85\xdf\xc7\xce\xb9\x77\x64\xda\x0e\xb4\x62\ --\x7d\x7c\xaa\x3a\xef\xaf\xb2\xb6\x02\x4f\x24\x18\x42\x9c\x61\xe0\ --\xec\x6b\x00\x10\x6e\x0d\xf1\xd5\xb6\xf5\x3d\x02\xa3\xb2\xc7\x5f\ --\x49\xcb\xbf\x35\x6c\xff\x76\x4f\x6c\xf2\x93\xbd\x09\x4c\xce\xc9\ --\xda\x96\x99\xa6\x2e\xe8\x00\x9a\xad\xbd\x6a\x69\xf6\xc3\x5e\x17\ --\x9e\x21\x89\xc2\x99\xfa\x8e\xbf\x8c\xbe\x07\xd7\x93\xf7\xd6\x6e\ --\xec\x74\x36\x3d\x6e\x5e\x7f\x71\x41\x73\x52\x42\xe2\x0a\xb8\xba\ --\xec\xc6\x0c\x54\x55\x4a\x93\xb9\x80\x35\xb2\xbf\x10\xa7\x77\x86\ --\x68\x0e\x07\xd9\x77\xe6\x62\xb8\xdc\xf4\x26\xba\xc3\xc1\xd4\x89\ --\x59\x6c\x5d\xb9\xcc\x1e\x95\x91\xfe\x48\xf6\x20\x55\x03\x5d\x1e\ --\x1c\x7f\xb5\xb5\x04\x61\x75\x9b\x85\x76\xbc\x56\x51\x56\xd3\x42\ --\xd1\x17\x5b\x98\x3c\xfd\x41\xbc\xc9\x03\x00\x68\x6f\x0b\xb3\xff\ --\xa7\x62\x5a\x5b\x5a\x18\xe8\x35\x18\x98\xec\x26\xdd\x97\xc2\xb8\ --\x5b\x87\x91\x60\xc6\xdb\x40\x5e\x56\xaa\x63\x5d\x94\xd9\xad\x62\ --\xfe\xaa\xc8\x2c\x41\x6d\x6f\xb7\xf0\xec\x3a\xa5\xba\xef\xe3\x68\ --\x54\x0a\x26\x0f\xb3\x71\x3b\x63\xaa\x80\x88\xcc\x1f\x97\xa6\x7f\ --\xd7\xc9\xae\xeb\xc5\xac\x54\xbd\x48\x69\xda\x50\x5d\xb1\x4e\xeb\ --\x05\x3e\xd4\x2b\x4c\x1d\x1e\x83\xdb\x08\xf9\x76\xbb\x36\xa2\x2b\ --\xbc\xc7\x08\xae\x95\x2f\x4f\xc8\x98\x40\xb3\xfd\x72\x30\xac\x72\ --\xdb\x2c\x65\x86\x2d\x9c\x11\x1b\x75\xcf\x70\xfb\x1f\xc3\xa9\xca\ --\x94\x48\x89\x26\x5a\x51\x66\x9a\xba\xd0\x1b\xe3\x3f\x12\xae\x2a\ --\x58\xfd\xf2\x8c\xf2\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\ --\x82\ --" -- --qt_resource_name = b"\ --\x00\x05\ --\x00\x6f\xa6\x53\ --\x00\x69\ --\x00\x63\x00\x6f\x00\x6e\x00\x73\ --\x00\x17\ --\x0b\xce\x1a\xe7\ --\x00\x71\ --\x00\x75\x00\x74\x00\x65\x00\x62\x00\x72\x00\x6f\x00\x77\x00\x73\x00\x65\x00\x72\x00\x2d\x00\x31\x00\x32\x00\x38\x00\x78\x00\x31\ --\x00\x32\x00\x38\x00\x2e\x00\x70\x00\x6e\x00\x67\ --\x00\x17\ --\x07\xc8\x36\xe7\ --\x00\x71\ --\x00\x75\x00\x74\x00\x65\x00\x62\x00\x72\x00\x6f\x00\x77\x00\x73\x00\x65\x00\x72\x00\x2d\x00\x35\x00\x31\x00\x32\x00\x78\x00\x35\ --\x00\x31\x00\x32\x00\x2e\x00\x70\x00\x6e\x00\x67\ --\x00\x15\ --\x02\x0a\xc7\x87\ --\x00\x71\ --\x00\x75\x00\x74\x00\x65\x00\x62\x00\x72\x00\x6f\x00\x77\x00\x73\x00\x65\x00\x72\x00\x2d\x00\x33\x00\x32\x00\x78\x00\x33\x00\x32\ --\x00\x2e\x00\x70\x00\x6e\x00\x67\ --\x00\x15\ --\x02\xf8\xd9\xc7\ --\x00\x71\ --\x00\x75\x00\x74\x00\x65\x00\x62\x00\x72\x00\x6f\x00\x77\x00\x73\x00\x65\x00\x72\x00\x2d\x00\x36\x00\x34\x00\x78\x00\x36\x00\x34\ --\x00\x2e\x00\x70\x00\x6e\x00\x67\ --\x00\x15\ --\x02\x26\xc3\x07\ --\x00\x71\ --\x00\x75\x00\x74\x00\x65\x00\x62\x00\x72\x00\x6f\x00\x77\x00\x73\x00\x65\x00\x72\x00\x2d\x00\x31\x00\x36\x00\x78\x00\x31\x00\x36\ --\x00\x2e\x00\x70\x00\x6e\x00\x67\ --\x00\x15\ --\x02\x14\xc5\x47\ --\x00\x71\ --\x00\x75\x00\x74\x00\x65\x00\x62\x00\x72\x00\x6f\x00\x77\x00\x73\x00\x65\x00\x72\x00\x2d\x00\x34\x00\x38\x00\x78\x00\x34\x00\x38\ --\x00\x2e\x00\x70\x00\x6e\x00\x67\ --\x00\x15\ --\x02\xa6\xd3\x07\ --\x00\x71\ --\x00\x75\x00\x74\x00\x65\x00\x62\x00\x72\x00\x6f\x00\x77\x00\x73\x00\x65\x00\x72\x00\x2d\x00\x39\x00\x36\x00\x78\x00\x39\x00\x36\ --\x00\x2e\x00\x70\x00\x6e\x00\x67\ --\x00\x17\ --\x0a\x1f\xbe\xe7\ --\x00\x71\ --\x00\x75\x00\x74\x00\x65\x00\x62\x00\x72\x00\x6f\x00\x77\x00\x73\x00\x65\x00\x72\x00\x2d\x00\x32\x00\x35\x00\x36\x00\x78\x00\x32\ --\x00\x35\x00\x36\x00\x2e\x00\x70\x00\x6e\x00\x67\ --\x00\x15\ --\x02\x38\xc1\xc7\ --\x00\x71\ --\x00\x75\x00\x74\x00\x65\x00\x62\x00\x72\x00\x6f\x00\x77\x00\x73\x00\x65\x00\x72\x00\x2d\x00\x32\x00\x34\x00\x78\x00\x32\x00\x34\ --\x00\x2e\x00\x70\x00\x6e\x00\x67\ --" -- --qt_resource_struct = b"\ --\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x01\ --\x00\x00\x00\x00\x00\x02\x00\x00\x00\x09\x00\x00\x00\x02\ --\x00\x00\x00\x78\x00\x00\x00\x00\x00\x01\x00\x00\xbd\xb9\ --\x00\x00\x01\x08\x00\x00\x00\x00\x00\x01\x00\x00\xda\x06\ --\x00\x00\x00\xd8\x00\x00\x00\x00\x00\x01\x00\x00\xd6\x51\ --\x00\x00\x01\x9c\x00\x00\x00\x00\x00\x01\x00\x01\x49\xa3\ --\x00\x00\x01\x38\x00\x00\x00\x00\x00\x01\x00\x00\xe6\x0b\ --\x00\x00\x00\xa8\x00\x00\x00\x00\x00\x01\x00\x00\xc5\x97\ --\x00\x00\x00\x44\x00\x00\x00\x00\x00\x01\x00\x00\x23\x02\ --\x00\x00\x01\x68\x00\x00\x00\x00\x00\x01\x00\x00\xff\xe4\ --\x00\x00\x00\x10\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\ --" -- --def qInitResources(): -- QtCore.qRegisterResourceData(0x01, qt_resource_struct, qt_resource_name, qt_resource_data) -- --def qCleanupResources(): -- QtCore.qUnregisterResourceData(0x01, qt_resource_struct, qt_resource_name, qt_resource_data) -- --qInitResources() -diff --git a/qutebrowser/utils/utils.py b/qutebrowser/utils/utils.py -index 9c68932f3..a28d662b3 100644 ---- a/qutebrowser/utils/utils.py -+++ b/qutebrowser/utils/utils.py -@@ -784,30 +784,13 @@ def mimetype_extension(mimetype: str) -> Optional[str]: - - This mostly delegates to Python's mimetypes.guess_extension(), but backports some - changes (via a simple override dict) which are missing from earlier Python versions. -- Most likely, this can be dropped once the minimum Python version is raised to 3.7. -+ Most likely, this can be dropped once the minimum Python version is raised to 3.10. - """ - overrides = { -+ # Added in 3.10 -+ "application/x-hdf5": ".h5", - # Added around 3.8 - "application/manifest+json": ".webmanifest", -- "application/x-hdf5": ".h5", -- -- # Added in Python 3.7 -- "application/wasm": ".wasm", -- -- # Wrong values for Python 3.6 -- # https://bugs.python.org/issue1043134 -- # https://github.com/python/cpython/pull/14375 -- "application/octet-stream": ".bin", # not .a -- "application/postscript": ".ps", # not .ai -- "application/vnd.ms-excel": ".xls", # not .xlb -- "application/vnd.ms-powerpoint": ".ppt", # not .pot -- "application/xml": ".xsl", # not .rdf -- "audio/mpeg": ".mp3", # not .mp2 -- "image/jpeg": ".jpg", # not .jpe -- "image/tiff": ".tiff", # not .tif -- "text/html": ".html", # not .htm -- "text/plain": ".txt", # not .bat -- "video/mpeg": ".mpeg", # not .m1v - } - if mimetype in overrides: - return overrides[mimetype] -diff --git a/requirements.txt b/requirements.txt -index 25c1bd98f..92364a87f 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -2,17 +2,11 @@ - - adblock==0.5.2 - colorama==0.4.4 --dataclasses==0.6 ; python_version<"3.7" - importlib-metadata==4.11.3 ; python_version=="3.7.*" --importlib-resources==5.6.0 ; python_version=="3.7.*" or python_version=="3.8.*" --Jinja2==3.1.1 ; python_version>="3.7" --MarkupSafe==2.1.1 ; python_version>="3.7" -+importlib-resources==5.7.1 ; python_version=="3.7.*" or python_version=="3.8.*" -+Jinja2==3.1.1 -+MarkupSafe==2.1.1 - Pygments==2.11.2 - PyYAML==6.0 --typing_extensions==4.1.1 ; python_version<"3.8" --zipp==3.7.0 ; python_version>="3.7" --importlib-resources<5.6.0 ; python_version=="3.6.*" --importlib-metadata<4.9 ; python_version=="3.6.*" --zipp<3.7 ; python_version=="3.6.*" --MarkupSafe<2.1.0 ; python_version=="3.6.*" --Jinja2<3.1.0 ; python_version=="3.6.*" -+typing_extensions==4.2.0 ; python_version<"3.8" -+zipp==3.8.0 -diff --git a/scripts/asciidoc2html.py b/scripts/asciidoc2html.py -index afbc4d575..ba8493247 100755 ---- a/scripts/asciidoc2html.py -+++ b/scripts/asciidoc2html.py -@@ -199,7 +199,11 @@ class AsciiDoc: - continue - self._build_website_file(item_path.parent, item_path.name) - -- copy = {'icons': 'icons', 'doc/img': 'doc/img', 'www/media': 'media/'} -+ copy = { -+ 'qutebrowser/icons': 'icons', -+ 'doc/img': 'doc/img', -+ 'www/media': 'media/', -+ } - - for src, dest in copy.items(): - full_src = REPO_ROOT / src -diff --git a/scripts/dev/changelog_urls.json b/scripts/dev/changelog_urls.json -index 0de1d68d9..34b74eeb0 100644 ---- a/scripts/dev/changelog_urls.json -+++ b/scripts/dev/changelog_urls.json -@@ -27,7 +27,6 @@ - "hypothesis": "https://hypothesis.readthedocs.io/en/latest/changes.html", - "mypy": "https://mypy-lang.blogspot.com/", - "types-PyYAML": "https://github.com/python/typeshed/commits/master/stubs/PyYAML", -- "types-dataclasses": "https://github.com/python/typeshed/commits/master/stubs/dataclasses", - "pytest": "https://docs.pytest.org/en/latest/changelog.html", - "iniconfig": "https://github.com/RonnyPfannschmidt/iniconfig/blob/master/CHANGELOG", - "tox": "https://tox.readthedocs.io/en/latest/changelog.html", -@@ -140,7 +139,6 @@ - "importlib-resources": "https://importlib-resources.readthedocs.io/en/latest/history.html", - "importlib-metadata": "https://github.com/python/importlib_metadata/blob/main/CHANGES.rst", - "zipp": "https://github.com/jaraco/zipp/blob/main/CHANGES.rst", -- "dataclasses": "https://github.com/ericvsmith/dataclasses#release-history", - "pip": "https://pip.pypa.io/en/stable/news/", - "wheel": "https://wheel.readthedocs.io/en/stable/news.html", - "setuptools": "https://setuptools.readthedocs.io/en/latest/history.html", -@@ -154,8 +152,10 @@ - "readme-renderer": "https://github.com/pypa/readme_renderer/blob/main/CHANGES.rst", - "requests-toolbelt": "https://github.com/requests/toolbelt/blob/master/HISTORY.rst", - "rfc3986": "https://rfc3986.readthedocs.io/en/latest/release-notes/index.html", -- "tqdm": "https://tqdm.github.io/releases/", - "twine": "https://twine.readthedocs.io/en/stable/changelog.html", - "webencodings": "https://github.com/gsnedders/python-webencodings/commits/master", -- "PyJWT": "https://github.com/jpadilla/pyjwt/blob/master/CHANGELOG.rst" -+ "PyJWT": "https://github.com/jpadilla/pyjwt/blob/master/CHANGELOG.rst", -+ "commonmark": "https://github.com/readthedocs/commonmark.py/blob/master/CHANGELOG.md", -+ "rich": "https://github.com/Textualize/rich/blob/master/CHANGELOG.md", -+ "ply": "https://github.com/dabeaz/ply/blob/master/CHANGES" - } -diff --git a/scripts/dev/check_coverage.py b/scripts/dev/check_coverage.py -index c66cb3e8d..8f1d2df2b 100644 ---- a/scripts/dev/check_coverage.py -+++ b/scripts/dev/check_coverage.py -@@ -333,7 +333,7 @@ def main_check(): - subprocess.run([sys.executable, '-m', 'coverage', 'report', - '--show-missing', '--include', filters], check=True) - print() -- print("To debug this, run 'tox -e py36-pyqt515-cov' " -+ print("To debug this, run 'tox -e py39-pyqt515-cov' " - "(replace Python/Qt versions based on your system) locally and check " - "htmlcov/index.html") - print("or check https://codecov.io/github/qutebrowser/qutebrowser") -@@ -353,7 +353,7 @@ def main_check_all(): - tests. - - This runs pytest with the used executable, so check_coverage.py should be -- called with something like ./.tox/py36/bin/python. -+ called with something like ./.tox/py39/bin/python. - """ - for test_file, src_file in PERFECT_FILES: - if test_file is None: -diff --git a/scripts/dev/gen_resources.py b/scripts/dev/gen_resources.py -deleted file mode 100644 -index efa6c6a3d..000000000 ---- a/scripts/dev/gen_resources.py -+++ /dev/null -@@ -1,30 +0,0 @@ --#!/usr/bin/env python3 --# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et: -- --# Copyright 2014-2021 Florian Bruhin (The-Compiler) -- --# this file is part of qutebrowser. --# --# qutebrowser is free software: you can redistribute it and/or modify --# it under the terms of the gnu general public license as published by --# the free software foundation, either version 3 of the license, or --# (at your option) any later version. --# --# qutebrowser is distributed in the hope that it will be useful, --# but without any warranty; without even the implied warranty of --# merchantability or fitness for a particular purpose. see the --# gnu general public license for more details. --# --# you should have received a copy of the gnu general public license --# along with qutebrowser. If not, see . -- --"""Generate Qt resources based on source files.""" -- --import subprocess --import pathlib -- --ROOT = pathlib.Path(__file__).parents[2] --OUTPUT = ROOT / 'qutebrowser' / 'resources.py' --INPUT = ROOT / 'misc' / 'qutebrowser.rcc' -- --subprocess.run(['pyrcc5', '-o', str(OUTPUT), str(INPUT)], check=True) -diff --git a/scripts/dev/misc_checks.py b/scripts/dev/misc_checks.py -index 05fdb7932..908daad4d 100644 ---- a/scripts/dev/misc_checks.py -+++ b/scripts/dev/misc_checks.py -@@ -50,7 +50,7 @@ def _get_files( - filenames = subprocess.run( - ['git', 'ls-files', '--cached', '--others', '--exclude-standard', '-z'], - stdout=subprocess.PIPE, -- universal_newlines=True, -+ text=True, - check=True, - ) - all_ignored = ignored or [] -diff --git a/scripts/dev/recompile_requirements.py b/scripts/dev/recompile_requirements.py -index f8337b21f..365f9a51e 100644 ---- a/scripts/dev/recompile_requirements.py -+++ b/scripts/dev/recompile_requirements.py -@@ -239,6 +239,9 @@ def extract_requirement_name(path: pathlib.Path) -> str: - - e.g. "pylint" from "misc/requirements/requirements-pylint.txt" - """ -+ if path == pathlib.Path("requirements.txt"): -+ return "qutebrowser" -+ - prefix = "requirements-" - assert path.suffix == ".txt", path - assert path.stem.startswith(prefix), path -@@ -419,7 +422,7 @@ def test_tox(): - list_proc = subprocess.run([venv_python, '-m', 'tox', '--listenvs'], - check=True, - stdout=subprocess.PIPE, -- universal_newlines=True) -+ text=True) - environments = list_proc.stdout.strip().split('\n') - for env in environments: - with utils.gha_group('tox for {}'.format(env)): -diff --git a/scripts/dev/run_pylint_on_tests.py b/scripts/dev/run_pylint_on_tests.py -index a44828a85..28c6e32c9 100644 ---- a/scripts/dev/run_pylint_on_tests.py -+++ b/scripts/dev/run_pylint_on_tests.py -@@ -64,9 +64,6 @@ def main(): - 'import-error', - # tests/helpers imports - 'wrong-import-order', -- # https://github.com/PyCQA/pylint/issues/6036 -- # https://github.com/PyCQA/pylint/issues/6037 -- 'unnecessary-ellipsis', - ] - - toxinidir = sys.argv[1] -diff --git a/scripts/link_pyqt.py b/scripts/link_pyqt.py -index 158cc145d..0ec7f2556 100644 ---- a/scripts/link_pyqt.py -+++ b/scripts/link_pyqt.py -@@ -44,13 +44,13 @@ def run_py(executable, *code): - f.write('\n'.join(code)) - cmd = [executable, filename] - try: -- ret = subprocess.run(cmd, universal_newlines=True, check=True, -+ ret = subprocess.run(cmd, text=True, check=True, - stdout=subprocess.PIPE).stdout - finally: - os.remove(filename) - else: - cmd = [executable, '-c', '\n'.join(code)] -- ret = subprocess.run(cmd, universal_newlines=True, check=True, -+ ret = subprocess.run(cmd, text=True, check=True, - stdout=subprocess.PIPE).stdout - return ret.rstrip() - -diff --git a/scripts/mkvenv.py b/scripts/mkvenv.py -index 7f6920bb8..737ea145d 100755 ---- a/scripts/mkvenv.py -+++ b/scripts/mkvenv.py -@@ -147,7 +147,7 @@ def run_venv( - return subprocess.run( - [str(venv_dir / subdir / executable)] + [str(arg) for arg in args], - check=True, -- universal_newlines=capture_output or capture_error, -+ text=capture_output or capture_error, - stdout=subprocess.PIPE if capture_output else None, - stderr=subprocess.PIPE if capture_error else None, - env=proc_env, -diff --git a/scripts/setupcommon.py b/scripts/setupcommon.py -index b1d246044..bd549d7cc 100644 ---- a/scripts/setupcommon.py -+++ b/scripts/setupcommon.py -@@ -43,7 +43,7 @@ def _call_git(gitpath, *args): - return subprocess.run( - ['git'] + list(args), - cwd=gitpath, check=True, -- stdout=subprocess.PIPE).stdout.decode('UTF-8').strip() -+ stdout=subprocess.PIPE, text=True).stdout.strip() - - - def _git_str(): -diff --git a/setup.py b/setup.py -index 4c4bd3243..cb088e04c 100755 ---- a/setup.py -+++ b/setup.py -@@ -72,9 +72,8 @@ try: - ['qutebrowser = qutebrowser.qutebrowser:main']}, - zip_safe=True, - install_requires=['jinja2', 'PyYAML', -- 'dataclasses; python_version < "3.7"', - 'importlib_resources>=1.1.0; python_version < "3.9"'], -- python_requires='>=3.6', -+ python_requires='>=3.7', - name='qutebrowser', - version=_get_constant('version'), - description=_get_constant('description'), -@@ -96,7 +95,6 @@ try: - 'Operating System :: MacOS', - 'Operating System :: POSIX :: BSD', - 'Programming Language :: Python :: 3', -- 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9', -diff --git a/tests/end2end/conftest.py b/tests/end2end/conftest.py -index 14ac6f395..5241ab4c3 100644 ---- a/tests/end2end/conftest.py -+++ b/tests/end2end/conftest.py -@@ -55,8 +55,8 @@ def pytest_unconfigure(config): - if config.getoption('--qute-profile-subprocs'): - stats = pstats.Stats() - for fn in pathlib.Path('prof').iterdir(): -- stats.add((pathlib.Path('prof') / fn)) -- stats.dump_stats((pathlib.Path('prof') / 'combined.pstats')) -+ stats.add(pathlib.Path('prof') / fn) -+ stats.dump_stats(pathlib.Path('prof') / 'combined.pstats') - - - def _check_version(op_str, running_version, version_str, as_hex=False): -diff --git a/tests/end2end/features/conftest.py b/tests/end2end/features/conftest.py -index da42ac6e1..c08eb2e0b 100644 ---- a/tests/end2end/features/conftest.py -+++ b/tests/end2end/features/conftest.py -@@ -214,12 +214,15 @@ def open_path(quteproc, server, path): - path = path.replace('(port)', str(server.port)) - - new_tab = False -+ related_tab = False - new_bg_tab = False - new_window = False - private = False - as_url = False - wait = True - -+ related_tab_suffix = ' in a new related tab' -+ related_background_tab_suffix = ' in a new related background tab' - new_tab_suffix = ' in a new tab' - new_bg_tab_suffix = ' in a new background tab' - new_window_suffix = ' in a new window' -@@ -231,6 +234,14 @@ def open_path(quteproc, server, path): - if path.endswith(new_tab_suffix): - path = path[:-len(new_tab_suffix)] - new_tab = True -+ elif path.endswith(related_tab_suffix): -+ path = path[:-len(related_tab_suffix)] -+ new_tab = True -+ related_tab = True -+ elif path.endswith(related_background_tab_suffix): -+ path = path[:-len(related_background_tab_suffix)] -+ new_bg_tab = True -+ related_tab = True - elif path.endswith(new_bg_tab_suffix): - path = path[:-len(new_bg_tab_suffix)] - new_bg_tab = True -@@ -249,9 +260,9 @@ def open_path(quteproc, server, path): - else: - break - -- quteproc.open_path(path, new_tab=new_tab, new_bg_tab=new_bg_tab, -- new_window=new_window, private=private, as_url=as_url, -- wait=wait) -+ quteproc.open_path(path, related_tab=related_tab, new_tab=new_tab, -+ new_bg_tab=new_bg_tab, new_window=new_window, -+ private=private, as_url=as_url, wait=wait) - - - @bdd.when(bdd.parsers.parse("I set {opt} to {value}")) -diff --git a/tests/end2end/fixtures/quteprocess.py b/tests/end2end/fixtures/quteprocess.py -index ab8f28d26..0254d8990 100644 ---- a/tests/end2end/fixtures/quteprocess.py -+++ b/tests/end2end/fixtures/quteprocess.py -@@ -792,16 +792,17 @@ class QuteProc(testprocess.Process): - self.set_setting(opt, old_value) - - def open_path(self, path, *, new_tab=False, new_bg_tab=False, -- new_window=False, private=False, as_url=False, port=None, -- https=False, wait=True): -+ related_tab=False, new_window=False, private=False, -+ as_url=False, port=None, https=False, wait=True): - """Open the given path on the local webserver in qutebrowser.""" - url = self.path_to_url(path, port=port, https=https) - self.open_url(url, new_tab=new_tab, new_bg_tab=new_bg_tab, -- new_window=new_window, private=private, as_url=as_url, -- wait=wait) -+ related_tab=related_tab, new_window=new_window, -+ private=private, as_url=as_url, wait=wait) - - def open_url(self, url, *, new_tab=False, new_bg_tab=False, -- new_window=False, private=False, as_url=False, wait=True): -+ related_tab=False, new_window=False, private=False, -+ as_url=False, wait=True): - """Open the given url in qutebrowser.""" - if sum(1 for opt in [new_tab, new_bg_tab, new_window, private, as_url] - if opt) > 1: -@@ -811,9 +812,15 @@ class QuteProc(testprocess.Process): - self.send_cmd(url, invalid=True) - line = None - elif new_tab: -- line = self.send_cmd(':open -t ' + url) -+ if related_tab: -+ line = self.send_cmd(':open -t -r ' + url) -+ else: -+ line = self.send_cmd(':open -t ' + url) - elif new_bg_tab: -- line = self.send_cmd(':open -b ' + url) -+ if related_tab: -+ line = self.send_cmd(':open -b -r ' + url) -+ else: -+ line = self.send_cmd(':open -b ' + url) - elif new_window: - line = self.send_cmd(':open -w ' + url) - elif private: -diff --git a/tests/end2end/fixtures/webserver_sub.py b/tests/end2end/fixtures/webserver_sub.py -index b4964d973..392fbe43f 100644 ---- a/tests/end2end/fixtures/webserver_sub.py -+++ b/tests/end2end/fixtures/webserver_sub.py -@@ -231,7 +231,7 @@ def drip(): - - def generate_bytes(): - for _ in range(numbytes): -- yield "*".encode('utf-8') -+ yield b"*" - time.sleep(pause) - - response = flask.Response(generate_bytes(), headers={ -@@ -294,7 +294,7 @@ def view_user_agent(): - def favicon(): - # WORKAROUND for https://github.com/PyCQA/pylint/issues/5783 - # pylint: disable-next=no-member,useless-suppression -- icon_dir = END2END_DIR.parents[1] / 'icons' -+ icon_dir = END2END_DIR.parents[1] / 'qutebrowser' / 'icons' - return flask.send_from_directory( - icon_dir, 'qutebrowser.ico', mimetype='image/vnd.microsoft.icon') - -diff --git a/tests/end2end/test_hints_html.py b/tests/end2end/test_hints_html.py -index f1cda97fe..5af09649f 100644 ---- a/tests/end2end/test_hints_html.py -+++ b/tests/end2end/test_hints_html.py -@@ -59,7 +59,7 @@ def _parse_file(test_name): - with file_path.open('r', encoding='utf-8') as html: - soup = bs4.BeautifulSoup(html, 'html.parser') - -- comment = str(soup.find(text=lambda text: isinstance(text, bs4.Comment))) -+ comment = str(soup.find(string=lambda text: isinstance(text, bs4.Comment))) - - if comment is None: - raise InvalidFile(test_name, "no comment found") -diff --git a/tests/end2end/test_invocations.py b/tests/end2end/test_invocations.py -index 667a4ee72..5a34d0357 100644 ---- a/tests/end2end/test_invocations.py -+++ b/tests/end2end/test_invocations.py -@@ -336,7 +336,7 @@ def test_command_on_start(request, quteproc_new): - quteproc_new.wait_for_quit() - - --@pytest.mark.parametrize('python', ['python2', 'python3.5']) -+@pytest.mark.parametrize('python', ['python2', 'python3.6']) - def test_launching_with_old_python(python): - try: - proc = subprocess.run( -@@ -346,7 +346,7 @@ def test_launching_with_old_python(python): - except FileNotFoundError: - pytest.skip(f"{python} not found") - assert proc.returncode == 1 -- error = "At least Python 3.6.1 is required to run qutebrowser" -+ error = "At least Python 3.7 is required to run qutebrowser" - assert proc.stderr.decode('ascii').startswith(error) - - -diff --git a/tests/helpers/stubs.py b/tests/helpers/stubs.py -index 6998958b8..b71e68384 100644 ---- a/tests/helpers/stubs.py -+++ b/tests/helpers/stubs.py -@@ -346,6 +346,7 @@ class FakeCommand: - hide: bool = False - debug: bool = False - deprecated: bool = False -+ tree_tab: bool = False - completion: Any = None - maxsplit: int = None - takes_count: Callable[[], bool] = lambda: False -diff --git a/tests/unit/config/test_configtypes.py b/tests/unit/config/test_configtypes.py -index ef3007f71..c34efce54 100644 ---- a/tests/unit/config/test_configtypes.py -+++ b/tests/unit/config/test_configtypes.py -@@ -19,7 +19,6 @@ - """Tests for qutebrowser.config.configtypes.""" - - import re --import sys - import json - import math - import warnings -@@ -1501,12 +1500,8 @@ class TestRegex: - pytest.param('(' * 500, id='too many parens'), - pytest.param(r'foo\Xbar', id='invalid escape X'), - pytest.param(r'foo\Cbar', id='invalid escape C'), -- pytest.param(r'[[]]', id='nested set', marks=pytest.mark.skipif( -- sys.hexversion < 0x03070000, -- reason="Warning was added in Python 3.7")), -- pytest.param(r'[a||b]', id='set operation', marks=pytest.mark.skipif( -- sys.hexversion < 0x03070000, -- reason="Warning was added in Python 3.7")), -+ pytest.param(r'[[]]', id='nested set'), -+ pytest.param(r'[a||b]', id='set operation'), - ]) - def test_to_py_invalid(self, klass, val): - with pytest.raises(configexc.ValidationError): -diff --git a/tests/unit/misc/test_checkpyver.py b/tests/unit/misc/test_checkpyver.py -index 52e022a44..35f8cfeec 100644 ---- a/tests/unit/misc/test_checkpyver.py -+++ b/tests/unit/misc/test_checkpyver.py -@@ -28,19 +28,18 @@ import pytest - from qutebrowser.misc import checkpyver - - --TEXT = (r"At least Python 3.6.1 is required to run qutebrowser, but it's " -+TEXT = (r"At least Python 3.7 is required to run qutebrowser, but it's " - r"running with \d+\.\d+\.\d+.") - - - @pytest.mark.not_frozen --@pytest.mark.parametrize('python', ['python2', 'python3.5']) -+@pytest.mark.parametrize('python', ['python2', 'python3.6']) - def test_old_python(python): - """Run checkpyver with old python versions.""" - try: - proc = subprocess.run( - [python, checkpyver.__file__, '--no-err-windows'], -- stdout=subprocess.PIPE, -- stderr=subprocess.PIPE, -+ capture_output=True, - check=False) - except FileNotFoundError: - pytest.skip(f"{python} not found") -diff --git a/tests/unit/misc/test_notree.py b/tests/unit/misc/test_notree.py -new file mode 100644 -index 000000000..fe07b01ec ---- /dev/null -+++ b/tests/unit/misc/test_notree.py -@@ -0,0 +1,310 @@ -+# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et: -+ -+# Copyright 2019 Florian Bruhin (The-Compiler) -+# -+# This file is part of qutebrowser. -+# -+# qutebrowser is free software: you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation, either version 3 of the License, or -+# (at your option) any later version. -+# -+# qutebrowser is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with qutebrowser. If not, see . -+"""Tests for misc.notree library.""" -+import pytest -+ -+from qutebrowser.misc.notree import TreeError, Node, TraverseOrder -+ -+ -+@pytest.fixture -+def tree(): -+ """Return an example tree. -+ -+ n1 -+ ├─n2 -+ │ ├─n4 -+ │ └─n5 -+ └─n3 -+ ├─n6 -+ │ ├─n7 -+ │ ├─n8 -+ │ └─n9 -+ │ └─n10 -+ └─n11 -+ """ -+ # these are actually used because they appear in expected strings -+ n1 = Node('n1') -+ n2 = Node('n2', n1) -+ n4 = Node('n4', n2) -+ n5 = Node('n5', n2) -+ n3 = Node('n3', n1) -+ n6 = Node('n6', n3) -+ n7 = Node('n7', n6) -+ n8 = Node('n8', n6) -+ n9 = Node('n9', n6) -+ n10 = Node('n10', n9) -+ n11 = Node('n11', n3) -+ return n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11 -+ -+ -+@pytest.fixture -+def node(tree): -+ return tree[0] -+ -+ -+def test_creation(): -+ node = Node('foo') -+ assert node.value == 'foo' -+ -+ child = Node('bar', node) -+ assert child.parent == node -+ assert node.children == (child, ) -+ -+ -+def test_attach_parent(): -+ n1 = Node('n1', None, []) -+ print(n1.children) -+ n2 = Node('n2', n1) -+ n3 = Node('n3') -+ -+ n2.parent = n3 -+ assert n2.parent == n3 -+ assert n3.children == (n2, ) -+ assert n1.children == () -+ -+ -+def test_duplicate_child(): -+ p = Node('n1') -+ try: -+ c1 = Node('c1', p) -+ c2 = Node('c2', p) -+ p.children = [c1, c1, c2] -+ raise AssertionError("Can add duplicate child") -+ except TreeError: -+ pass -+ finally: -+ if len(p.children) == 3: -+ raise AssertionError("Can add duplicate child") -+ -+ -+def test_replace_parent(): -+ p1 = Node('foo') -+ p2 = Node('bar') -+ _ = Node('_', p2) -+ c = Node('baz', p1) -+ c.parent = p2 -+ assert c.parent is p2 -+ assert c not in p1.children -+ assert c in p2.children -+ -+ -+def test_replace_children(tree): -+ n2 = tree[1] -+ n3 = tree[2] -+ n6 = tree[5] -+ n11 = tree[10] -+ n3.children = [n11] -+ n2.children = (n6, ) + n2.children -+ assert n6.parent is n2 -+ assert n6 in n2.children -+ assert n11.parent is n3 -+ assert n11 in n3.children -+ assert n6 not in n3.children -+ assert len(n3.children) == 1 -+ -+ -+def test_promote_to_first(tree): -+ n1 = tree[0] -+ n3 = tree[2] -+ n6 = tree[5] -+ assert n6.parent is n3 -+ assert n3.parent is n1 -+ n6.promote(to='first') -+ assert n6.parent is n1 -+ assert n1.children[0] is n6 -+ -+ -+def test_promote_to_last(tree): -+ n1 = tree[0] -+ n3 = tree[2] -+ n6 = tree[5] -+ assert n6.parent is n3 -+ assert n3.parent is n1 -+ n6.promote(to='last') -+ assert n6.parent is n1 -+ assert n1.children[-1] is n6 -+ -+ -+def test_promote_to_prev(tree): -+ n1 = tree[0] -+ n3 = tree[2] -+ n6 = tree[5] -+ assert n6.parent is n3 -+ assert n3.parent is n1 -+ assert n1.children[1] is n3 -+ n6.promote(to='prev') -+ assert n6.parent is n1 -+ assert n1.children[1] is n6 -+ -+ -+def test_promote_to_next(tree): -+ n1 = tree[0] -+ n3 = tree[2] -+ n6 = tree[5] -+ assert n6.parent is n3 -+ assert n3.parent is n1 -+ assert n1.children[1] is n3 -+ n6.promote(to='next') -+ assert n6.parent is n1 -+ assert n1.children[2] is n6 -+ -+ -+def test_demote_to_first(tree): -+ n11 = tree[10] -+ n6 = tree[5] -+ assert n11.parent is n6.parent -+ parent = n11.parent -+ assert parent.children.index(n11) == parent.children.index(n6) + 1 -+ n11.demote(to='first') -+ assert n11.parent is n6 -+ assert n6.children[0] is n11 -+ -+ -+def test_demote_to_last(tree): -+ n11 = tree[10] -+ n6 = tree[5] -+ assert n11.parent is n6.parent -+ parent = n11.parent -+ assert parent.children.index(n11) == parent.children.index(n6) + 1 -+ n11.demote(to='last') -+ assert n11.parent is n6 -+ assert n6.children[-1] is n11 -+ -+ -+def test_traverse(node): -+ len_traverse = len(list(node.traverse())) -+ len_render = len(node.render()) -+ assert len_traverse == len_render -+ -+ -+def test_traverse_postorder(tree): -+ n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11 = tree -+ actual = list(n1.traverse(TraverseOrder.POST)) -+ print('\n'.join([str(n) for n in actual])) -+ assert actual == [n4, n5, n2, n7, n8, n10, n9, n6, n11, n3, n1] -+ -+ -+def test_traverse_postorder_r(tree): -+ n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11 = tree -+ actual = list(n1.traverse(TraverseOrder.POST_R)) -+ print('\n'.join([str(n) for n in actual])) -+ assert actual == [n11, n10, n9, n8, n7, n6, n3, n5, n4, n2, n1] -+ -+ -+def test_render_tree(node): -+ expected = [ -+ 'n1', -+ '├─n2', -+ '│ ├─n4', -+ '│ └─n5', -+ '└─n3', -+ ' ├─n6', -+ ' │ ├─n7', -+ ' │ ├─n8', -+ ' │ └─n9', -+ ' │ └─n10', -+ ' └─n11' -+ ] -+ result = [char + str(n) for char, n in node.render()] -+ print('\n'.join(result)) -+ assert expected == result -+ -+ -+def test_uid(node): -+ uids = set() -+ for n in node.traverse(): -+ assert n not in uids -+ uids.add(n.uid) -+ # pylint: disable=unused-variable -+ n1 = Node('n1') -+ n2 = Node('n2', n1) -+ n4 = Node('n4', n2) # noqa: F841 -+ n5 = Node('n5', n2) # noqa: F841 -+ n3 = Node('n3', n1) -+ n6 = Node('n6', n3) -+ n7 = Node('n7', n6) # noqa: F841 -+ n8 = Node('n8', n6) # noqa: F841 -+ n9 = Node('n9', n6) -+ n10 = Node('n10', n9) # noqa: F841 -+ n11 = Node('n11', n3) -+ # pylint: enable=unused-variable -+ for n in n1.traverse(): -+ assert n not in uids -+ uids.add(n.uid) -+ -+ n11_uid = n11.uid -+ assert n1.get_descendent_by_uid(n11_uid) is n11 -+ -+ with pytest.raises(TreeError) as _: -+ assert node.get_descendent_by_uid(n11_uid) is n11 -+ -+ -+def test_collapsed(node): -+ pre_collapsed_traverse = list(node.traverse()) -+ to_collapse = node.children[1] -+ -+ # collapse -+ to_collapse.collapsed = True -+ assert to_collapse.collapsed is True -+ for n in node.traverse(render_collapsed=False): -+ assert to_collapse not in n.path[:-1] -+ -+ assert list(to_collapse.traverse(render_collapsed=False)) == [to_collapse] -+ -+ assert list(node.traverse()) == pre_collapsed_traverse -+ -+ expected = [ -+ 'n1', -+ '├─n2', -+ '│ ├─n4', -+ '│ └─n5', -+ '└─n3' -+ ] -+ result = [char + str(n) for char, n in node.render()] -+ print('\n'.join(result)) -+ assert expected == result -+ -+ # uncollapse -+ to_collapse.collapsed = False -+ -+ assert any(n for n in node.traverse(render_collapsed=False) if to_collapse -+ in n.path[:-1]) -+ -+ -+def test_memoization(node): -+ assert node._Node__modified is True -+ node.render() -+ assert node._Node__modified is False -+ -+ node.children[0].parent = None -+ assert node._Node__modified is True -+ node.render() -+ assert node._Node__modified is False -+ -+ n2 = Node('ntest', parent=node) -+ assert node._Node__modified is True -+ assert n2._Node__modified is True -+ node.render() -+ assert node._Node__modified is False -+ -+ node.children[0].children[1].parent = None -+ assert node._Node__modified is True -+ assert node.children[0]._Node__modified is True -+ node.render() -+ assert node._Node__modified is False -diff --git a/tests/unit/misc/userscripts/test_qute_lastpass.py b/tests/unit/misc/userscripts/test_qute_lastpass.py -index 24272a048..ebd9a7591 100644 ---- a/tests/unit/misc/userscripts/test_qute_lastpass.py -+++ b/tests/unit/misc/userscripts/test_qute_lastpass.py -@@ -122,7 +122,7 @@ class TestQuteLastPassComponents: - - subprocess_mock.assert_called_once_with( - ['lpass', 'show', '-x', '-j', '-G', '\\bexample\\.com'], -- stdout=ANY, stderr=ANY) -+ capture_output=True) - - def test_pass_returns_candidates(self, subprocess_mock): - """Test if pass_ returns expected lpass site entry.""" -@@ -263,7 +263,7 @@ class TestQuteLastPassMain: - - subprocess_mock.assert_has_calls([ - call(['lpass', 'show', '-x', '-j', '-G', '\\bwww\\.example\\.com'], -- stdout=ANY, stderr=ANY), -+ capture_output=True), - call(['rofi', '-dmenu'], - input=b'12345 | www.example.com | https://www.example.com | fake@fake.com\n23456 | Sites/www.example.com | https://www.example.com | john.doe@fake.com', - stdout=ANY) -@@ -328,13 +328,13 @@ class TestQuteLastPassMain: - - subprocess_mock.assert_has_calls([ - call(['lpass', 'show', '-x', '-j', '-G', '\\bwww\\.example\\.com'], -- stdout=ANY, stderr=ANY), -+ capture_output=True), - call(['lpass', 'show', '-x', '-j', '-G', '\\bexample\\.com'], -- stdout=ANY, stderr=ANY), -+ capture_output=True), - call(['lpass', 'show', '-x', '-j', '-G', '\\bwwwexample'], -- stdout=ANY, stderr=ANY), -+ capture_output=True), - call(['lpass', 'show', '-x', '-j', '-G', '\\bexample'], -- stdout=ANY, stderr=ANY), -+ capture_output=True), - call(['rofi', '-dmenu'], - input=b'12345 | www.example.com | https://www.example.com | fake@fake.com\n23456 | Sites/www.example.com | https://www.example.com | john.doe@fake.com\n345 | example.com | https://example.com | joe.doe@fake.com\n456 | Sites/example.com | http://example.com | jane.doe@fake.com', - stdout=ANY) -diff --git a/tests/unit/utils/test_standarddir.py b/tests/unit/utils/test_standarddir.py -index f5d8204a4..0ca635ae2 100644 ---- a/tests/unit/utils/test_standarddir.py -+++ b/tests/unit/utils/test_standarddir.py -@@ -498,7 +498,7 @@ def test_no_qapplication(qapp, tmpdir, monkeypatch): - monkeypatch.setenv('HOME', str(home_dir)) - - proc = subprocess.run([sys.executable, str(pyfile)] + sys.path, -- universal_newlines=True, -+ text=True, - check=True, - stdout=subprocess.PIPE) - sub_locations = json.loads(proc.stdout) -diff --git a/tests/unit/utils/test_utils.py b/tests/unit/utils/test_utils.py -index 330ef3b96..4620c2198 100644 ---- a/tests/unit/utils/test_utils.py -+++ b/tests/unit/utils/test_utils.py -@@ -931,7 +931,7 @@ def test_parse_duration_hypothesis(duration): - - @pytest.mark.parametrize('mimetype, extension', [ - ('application/pdf', '.pdf'), # handled by Python -- ('text/plain', '.txt'), # wrong in Python 3.6, overridden -+ ('text/plain', '.txt'), # was wrong in Python 3.6, handled now - ('application/manifest+json', '.webmanifest'), # newer - ('text/xul', '.xul'), # strict=False - ('doesnot/exist', None), -diff --git a/tox.ini b/tox.ini -index 370adbc9e..0990b1b4a 100644 ---- a/tox.ini -+++ b/tox.ini -@@ -18,7 +18,6 @@ passenv = PYTHON DISPLAY XAUTHORITY HOME USERNAME USER CI XDG_* QUTE_* DOCKER QT - basepython = - py: {env:PYTHON:python3} - py3: {env:PYTHON:python3} -- py36: {env:PYTHON:python3.6} - py37: {env:PYTHON:python3.7} - py38: {env:PYTHON:python3.8} - py39: {env:PYTHON:python3.9} diff --git a/scripts/wpass b/scripts/wpass index 018616f..97e4671 100644 --- a/scripts/wpass +++ b/scripts/wpass @@ -50,10 +50,6 @@ main() { } autotype(){ - if pgrep qutebrowser >/dev/null; then - qutebrowser ":mode-enter insert" - fi - env wtype -s 100 "$username" env wtype -s 100 -k tab env wtype -s 100 "$password" diff --git a/user/home.nix b/user/home.nix index 7ec6061..8453572 100644 --- a/user/home.nix +++ b/user/home.nix @@ -19,7 +19,6 @@ ./alacritty.nix ./git.nix ./ssh.nix - ./qutebrowser ./gpg.nix ./rofi.nix ./mpv.nix @@ -157,13 +156,7 @@ text-editor = lib.mkDefault "kak.desktop"; image-viewer = lib.mkDefault "pqiv.desktop"; video-player = lib.mkDefault "mpv.desktop"; - web-browser = lib.mkDefault ( - { - firefox = lib.mkDefault "firefox.desktop"; - qutebrowser = lib.mkDefault "org.qutebrowser.qutebrowser.desktop"; - } - .${pkgs.uservars.browser} - ); + web-browser = lib.mkDefault "firefox.desktop"; document-viewer = lib.mkDefault "org.pwmt.zathura.desktop"; file-manager = lib.mkDefault "thunar.desktop"; archive-manager = "engrampa.desktop"; diff --git a/user/qutebrowser/colors.nix b/user/qutebrowser/colors.nix deleted file mode 100644 index 999cc28..0000000 --- a/user/qutebrowser/colors.nix +++ /dev/null @@ -1,261 +0,0 @@ -{ - config, - pkgs, - lib, - font, - ... -}: -let - inherit (pkgs.uservars) - key - theme - accent - font - browser - ; - inherit (theme) color; -in -{ - programs.qutebrowser.settings = { - hints.border = "2px solid ${accent.color}"; - - content.user_stylesheets = "style.css"; - colors = { - - ######################################################## - # Tabs - ######################################################## - - tabs = - let - tabs_defaults = { - odd = { - fg = color.txt; - bg = color.bg; - }; - even = { - fg = color.txt; - bg = color.bg_dark; - }; - selected = { - odd = { - fg = accent.fg; - bg = accent.color; - }; - even = { - fg = accent.fg; - bg = accent.color; - }; - }; - }; - in - { - bar = { - bg = color.bg; - }; - pinned = tabs_defaults; - } - // tabs_defaults; - - ######################################################## - # Completion for urls and commands - ######################################################## - - completion = { - fg = color.txt; - even = { - bg = color.bg; - }; - odd = { - bg = color.bg; - }; - scrollbar = { - bg = color.bg_dark; - }; - match = { - fg = accent.color; - }; - category = { - fg = color.txt; - bg = color.bg_dark; - border = { - top = color.bg_dark; - bottom = color.bg_dark; - }; - }; - item = { - selected = { - fg = accent.fg; - bg = accent.color; - border = { - top = color.bg_dark; - bottom = color.bg_dark; - }; - match = { - fg = color.txt; - }; - }; - }; - }; - - ######################################################## - # Statusbar - ######################################################## - - statusbar = { - normal = { - fg = color.txt; - bg = color.bg; - }; - insert = { - fg = color.normal.green; - bg = color.bg; - }; - passthrough = { - fg = color.normal.blue; - bg = color.bg; - }; - command = { - fg = color.txt; - bg = color.bg; - }; - caret = { - selection = { - fg = accent.fg; - bg = accent.color; - }; - }; - url = { - success = { - https = { - fg = color.txt; - }; - http = { - fg = color.normal.red; - }; - }; - hover = { - fg = color.normal.cyan; - }; - }; - }; - ######################################################## - # Downloads - ######################################################## - - downloads = { - start = { - bg = color.normal.blue; - }; - stop = { - bg = color.normal.green; - }; - bar = { - bg = color.bg; - }; - }; - - ######################################################## - # Choice of what element should be clicked - ######################################################## - - hints = { - fg = color.txt; - bg = color.bg; - match = { - fg = accent.color; - }; - }; - - ######################################################## - # List of what each keybinding does - ######################################################## - - keyhint = { - fg = color.txt; - bg = color.bg; - suffix = { - fg = accent.color; - }; - }; - - ######################################################## - # Right click menu - ######################################################## - - contextmenu = { - menu = { - fg = color.txt; - bg = color.bg; - }; - selected = { - fg = accent.fg; - bg = accent.color; - }; - disabled = { - fg = color.bg_light; - }; - }; - - ######################################################## - # Dark theme - ######################################################## - - # webpage = lib.mkIf (color.type == "dark") { - # bg = color.bg; - # preferred_color_scheme = "dark"; - # darkmode = { - # enabled = false; - # threshold = { - # text = 150; - # background = 205; - # }; - # }; - # }; - }; - }; - home.file = { - ".config/qutebrowser/style.css".text = '' - ${lib.optionalString (color.type == "dark") '' - button, - input[type="button"] { - color: unset; - background-color: unset; - } - - .bg-gradient-to-b, - body { - background-image: none !important; - } - - /*************************** - * Remove borked ellements * - ***************************/ - - .search-filters-wrap:before, .search-filters-wrap:after { - - display: none; - } - ''} - - /***************** - * Hide some ads * - *****************/ - - /*Reddit*/ - #sr-header-area .redesign-beta-optin, - .link.promotedlink.promoted, - .spacer:empty, - .spacer .premium-banner-outer, - .ad-container, - - /*Youtube*/ - div#masthead-ad , - .video-ads, - #player-ads, - ytd-popup-container { - display: none !important; - } - ''; - }; -} diff --git a/user/qutebrowser/dark-theme.nix b/user/qutebrowser/dark-theme.nix deleted file mode 100644 index 6acd813..0000000 --- a/user/qutebrowser/dark-theme.nix +++ /dev/null @@ -1,97 +0,0 @@ -{ - config, - pkgs, - lib, - font, - ... -}: -let - inherit (pkgs.uservars) theme; - inherit (theme) color; - - # ".config/qutebrowser/greasemonkey/darkreader.js".text = - darkThemeUserscript = - enabled: - pkgs.writeText "darkreader.js" '' - // ==UserScript== - // @name Dark Reader (Unofficial) - // @icon https://darkreader.org/images/darkreader-icon-256x256.png - // @namespace DarkReader - // @description Inverts the brightness of pages to reduce eye strain - // @version 4.7.15 - // @author https://github.com/darkreader/darkreader#contributors - // @homepageURL https://darkreader.org/ | https://github.com/darkreader/darkreader - // @run-at document-end - // @grant none - // @include http* - // @require https://cdn.jsdelivr.net/npm/darkreader/darkreader.min.js - // @noframes - // ==/UserScript== - - DarkReader.setFetchMethod(window.fetch) - - if (${if enabled then "false" else "true"}) { - DarkReader.disable(); - return; - } - - const ignore_list = [ - "askubuntu.com", - "mathoverflow.com", - "mathoverflow.net", - "serverfault.com", - "stackapps.com", - "stackexchange.com", - "stackoverflow.com", - "superuser.com", - "hub.docker.com", - ]; - - for (let item of ignore_list) { - if (window.location.origin.indexOf(item) >= 0) { - console.log("URL matched dark-mode ignore list"); - return; - } - } - - DarkReader.enable({ - brightness: 100, - contrast: 100, - sepia: 0, - - darkSchemeBackgroundColor: "${color.bg}", - darkSchemeTextColor: "${color.txt}", - - lightSchemeBackgroundColor: "${color.bg}", - lightSchemeTextColor: "${color.txt}", - }); - ''; -in -{ - programs.qutebrowser.keyBindings = { - normal = { - "K" = "spawn --userscript toggle-dark-theme"; - }; - }; - home.file = { - ".local/share/qutebrowser/userscripts/toggle-dark-theme".executable = true; - ".local/share/qutebrowser/userscripts/toggle-dark-theme".text = '' - #!/bin/sh - DARK_READER_SCRIPT="$HOME/.config/qutebrowser/greasemonkey/darkreader.js" - MARKER="$HOME/.config/qutebrowser/is-dark-mode" - if test -f "$MARKER" - then - rm -f "$MARKER" - cp -f ${darkThemeUserscript false} "$DARK_READER_SCRIPT" - echo "jseval --world main DarkReader.disable()" >> "$QUTE_FIFO" - else - touch "$MARKER" - cp -f ${darkThemeUserscript true} "$DARK_READER_SCRIPT" - echo "jseval --world main DarkReader.enable()" >> "$QUTE_FIFO" - fi - if test -n "$QUTE_FIFO"; then - echo "greasemonkey-reload --quiet" >> "$QUTE_FIFO" - fi - ''; - }; -} diff --git a/user/qutebrowser/default.nix b/user/qutebrowser/default.nix deleted file mode 100644 index c115cca..0000000 --- a/user/qutebrowser/default.nix +++ /dev/null @@ -1,159 +0,0 @@ -{ - config, - pkgs, - lib, - font, - ... -}: -let - inherit (pkgs.uservars) key browser editor; -in -{ - imports = [ - ./colors.nix - ./dark-theme.nix - ./fonts.nix - ]; - - config = { - programs.qutebrowser = lib.mkIf (browser == "qutebrowser") { - enable = true; - # enableDefaultBindings = false; - keyBindings = { - normal = { - # basic movent - "${key.left}" = "scroll left"; - "${key.down}" = "scroll down"; - "${key.up}" = "scroll up"; - "${key.right}" = "scroll right"; - - "${lib.toUpper key.up}" = "scroll-px 0 -100"; - "${lib.toUpper key.down}" = "scroll-px 0 100"; - "${lib.toUpper key.left}" = "back"; - "${lib.toUpper key.right}" = "forward"; - "${lib.toUpper key.tabL}" = "tab-prev"; - "${lib.toUpper key.tabR}" = "tab-next"; - - "${key.next}" = "search-next"; - "${lib.toUpper key.next}" = "search-prev"; - - "${key.insertMode}" = "mode-enter insert"; - # ":" = "mode-enter command"; - - "t" = "hint all"; - "h" = "set-cmd-text -s :open"; - "T" = "hint all tab"; - "H" = "set-cmd-text -s :open -t"; - - "" = "tree-tab-promote"; - "" = "tree-tab-demote"; - - "co" = "tab-only --pinned keep"; - - # "K" = "jseval --world main if (DarkReader.isEnabled()) {DarkReader.disable()} else {DarkReader.enable()}"; - }; - insert = { - # quit insert mode - "" = "mode-enter normal"; - }; - caret = { - # basic movent - "${key.left}" = "move-to-prev-char"; - "${key.down}" = "move-to-next-line"; - "${key.up}" = "move-to-prev-line"; - "${key.right}" = "move-to-next-char"; - - "${key.insertMode}" = "mode-enter insert"; - }; - }; - settings = { - tabs.tree_tabs = true; - tabs.position = "right"; - tabs.pinned.shrink = false; - tabs.title.format = "{tree}{collapsed}{audio}{index}: {current_title}"; - tabs.title.format_pinned = "{tree}{collapsed}{audio}{index} 🔒: {current_title}"; - - session.lazy_restore = true; - auto_save.session = true; - - hints.chars = key.hints; - editor.command = [ - "terminal" - "-e" - { - kakoune = "kak"; - helix = "hx"; - } - .${editor} - "{file}" - "+{line}" - ]; - - input.insert_mode.auto_leave = false; - - content.autoplay = false; - content.blocking.adblock.lists = [ - "https://easylist.to/easylist/easylist.txt" - "https://easylist.to/easylist/easyprivacy.txt" - "https://easylist-downloads.adblockplus.org/easylistdutch.txt" - "https://easylist-downloads.adblockplus.org/abp-filters-anti-cv.txt" - "https://www.i-dont-care-about-cookies.eu/abp/" - "https://secure.fanboy.co.nz/fanboy-cookiemonster.txt" - ]; - }; - extraConfig = '' - config.load_autoconfig() - config.set("content.notifications.enabled", True, "https://web.whatsapp.com") - ''; - }; - systemd.user.services = lib.mkIf (browser == "qutebrowser") { - qutebrowser = { - Unit = { - Description = "Qutebrowser Web client"; - PartOf = [ "graphical-session.target" ]; - After = [ "graphical-session.target" ]; - }; - Service = { - ExecStartPre = "/usr/bin/env sleep 10s"; - ExecStart = "${pkgs.qutebrowser}/bin/qutebrowser"; - Restart = "on-failure"; - }; - Install = { - WantedBy = [ "sway-session.target" ]; - }; - }; - }; - home.file = { - # For some stupid reason qutebrowser crashes if this dir does not exist - ".local/share/qutebrowser/greasemonkey/.keep".text = ""; - ".config/qutebrowser/greasemonkey/youtube.js".text = '' - // ==UserScript== - // @name Auto Skip YouTube Ads - // @version 1.0.2 - // @description Speed up and skip YouTube ads automatically - // @author codiac-killer - // @match *://*.youtube.com/* - // @exclude *://*.youtube.com/subscribe_embed?* - // ==/UserScript== - - let main = new MutationObserver(() => { - // Get skip button and click it - let btn = document.getElementsByClassName("ytp-ad-skip-button ytp-button").item(0) - if (btn) { - btn.click() - } - - // (unskipable ads) If skip button didn't exist / was not clicked speed up video - const ad = [...document.querySelectorAll('.ad-showing')][0]; - if (ad) { - // Speed up and mute - document.querySelector('video').playbackRate = 16; - document.querySelector('video').muted = true; - } - }) - - main.observe(document.getElementsByClassName("video-ads ytp-ad-module").item(0), {attributes: true, characterData: true, childList: true}) - ''; - }; - }; -} diff --git a/user/qutebrowser/fonts.nix b/user/qutebrowser/fonts.nix deleted file mode 100644 index 6ab43de..0000000 --- a/user/qutebrowser/fonts.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ pkgs, ... }: -let - inherit (pkgs.uservars) font; -in -{ - programs.qutebrowser.settings.fonts = - let - mkFont = name: size: "${toString size}px ${name}"; - DEF_MONO = mkFont font.mono font.size.medium; - BIG_MONO = mkFont font.mono font.size.big; - DEF_INTER = mkFont font.interface font.size.medium; - BIG_INTER = mkFont font.interface font.size.big; - in - { - debug_console = BIG_INTER; - downloads = BIG_INTER; - hints = "bold " + BIG_MONO; - keyhint = BIG_INTER; - prompts = BIG_INTER; - statusbar = DEF_MONO; - completion = { - entry = BIG_INTER; - category = BIG_INTER; - }; - messages = { - error = DEF_INTER; - info = DEF_INTER; - warning = DEF_INTER; - }; - tabs = { - selected = BIG_INTER; - unselected = BIG_INTER; - }; - }; -} diff --git a/user/sway/sway-assigns.nix b/user/sway/sway-assigns.nix index 0d1eefd..5ad5473 100644 --- a/user/sway/sway-assigns.nix +++ b/user/sway/sway-assigns.nix @@ -17,8 +17,6 @@ in wayland.windowManager.sway.config = { assigns = { "2" = [ - { class = "qutebrowser"; } - { app_id = "qutebrowser"; } { class = "firefox"; } { app_id = "firefox"; } { class = "Chromium"; } From ed047a7538ceed422cd86cd1087d5283699bf97e Mon Sep 17 00:00:00 2001 From: lelgenio Date: Mon, 3 Jun 2024 15:28:21 -0300 Subject: [PATCH 137/404] kak: add javascript region to blade templates --- user/kakoune/filetypes.kak | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/user/kakoune/filetypes.kak b/user/kakoune/filetypes.kak index b384bfe..fd0b87c 100644 --- a/user/kakoune/filetypes.kak +++ b/user/kakoune/filetypes.kak @@ -93,6 +93,7 @@ hook global WinSetOption filetype=blade %[ hook -once -always window WinSetOption filetype=.* %{ remove-hooks window blade-.+ } require-module php + require-module javascript add-highlighter buffer/blade regions add-highlighter buffer/blade/base default-region group @@ -108,6 +109,9 @@ hook global WinSetOption filetype=blade %[ add-highlighter buffer/blade/php/ ref php add-highlighter buffer/blade/php/ regex '@((end)?php)' 1:block + add-highlighter buffer/blade/js region '' group + add-highlighter buffer/blade/js/ ref javascript + add-highlighter buffer/blade/expression region '\{\{(?!--)' '(?!--)\}\}' ref php add-highlighter buffer/blade/statement region -recurse '\(' '@(if|foreach|for|section|yield|include)\s*\(' '\)' ref php add-highlighter buffer/blade/base/ regex '@(else(if)?|include|case|break)' 1:keyword From e5cc4e207e2a5b3c36a99d836d4abbc4d2566d42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 3 Jun 2024 20:46:23 -0300 Subject: [PATCH 138/404] waybar: always show mpd icon --- user/waybar/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/waybar/default.nix b/user/waybar/default.nix index 95615fa..5113808 100644 --- a/user/waybar/default.nix +++ b/user/waybar/default.nix @@ -137,7 +137,7 @@ in { format = "{stateIcon} {title} - {artist}"; format-paused = "{stateIcon}"; - format-stopped = ""; + format-stopped = "{stateIcon}"; state-icons = { stopped = ""; paused = ""; From 805058f755983ff668e7f4ceae97828e3ef939e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 3 Jun 2024 21:00:29 -0300 Subject: [PATCH 139/404] monolith: only set kernel version here --- hosts/monolith.nix | 2 ++ system/configuration.nix | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/monolith.nix b/hosts/monolith.nix index b217f73..5f1bc66 100644 --- a/hosts/monolith.nix +++ b/hosts/monolith.nix @@ -64,6 +64,8 @@ in rocmPackages.rocm-smi ]; + boot.kernelPackages = pkgs.linuxPackages_6_1; + programs.corectrl = { enable = true; gpuOverclock = { diff --git a/system/configuration.nix b/system/configuration.nix index 8054fa9..e00ff47 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -24,8 +24,6 @@ ./network.nix ]; - boot.kernelPackages = pkgs.linuxPackages_latest; - zramSwap.enable = true; programs.adb.enable = true; From 2462668cf38868f13b1c024be6fe558b8ba316d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 3 Jun 2024 22:35:49 -0300 Subject: [PATCH 140/404] monolith: remove corectrl --- hosts/monolith.nix | 11 ----------- user/sway/default.nix | 1 - 2 files changed, 12 deletions(-) diff --git a/hosts/monolith.nix b/hosts/monolith.nix index 5f1bc66..2e33fd8 100644 --- a/hosts/monolith.nix +++ b/hosts/monolith.nix @@ -40,7 +40,6 @@ in "zenpower" ]; boot.kernelParams = [ - "amdgpu.dcdebugmask=0x10" # amdgpu undervolting bug "video=DP-1:1920x1080@144" # hibernation "resume=LABEL=BTRFS_ROOT" # findmnt -o LABEL --noheadings /swap/ @@ -64,16 +63,6 @@ in rocmPackages.rocm-smi ]; - boot.kernelPackages = pkgs.linuxPackages_6_1; - - programs.corectrl = { - enable = true; - gpuOverclock = { - enable = true; - ppfeaturemask = "0xffffffff"; - }; - }; - fileSystems."/" = { device = "/dev/disk/by-label/BTRFS_ROOT"; fsType = "btrfs"; diff --git a/user/sway/default.nix b/user/sway/default.nix index d7afafd..3205143 100644 --- a/user/sway/default.nix +++ b/user/sway/default.nix @@ -104,7 +104,6 @@ in exec ${pkgs.dbus-sway-environment}/bin/dbus-sway-environment exec swaymsg workspace 2 exec_always systemctl --user restart waybar.service - exec corectrl --minimize-systray ''; }; services.gammastep = { From 741d67c4ec70dc5eef9380645c19bf4a4be4ff91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Tue, 4 Jun 2024 01:37:46 -0300 Subject: [PATCH 141/404] sway: only enable vrr on fullscreen --- scripts/default.nix | 1 + scripts/vrr-fullscreen | 28 ++++++++++++++++++++++++++++ user/sway/default.nix | 17 ++++++++++++++++- 3 files changed, 45 insertions(+), 1 deletion(-) create mode 100755 scripts/vrr-fullscreen diff --git a/scripts/default.nix b/scripts/default.nix index 01ce2b8..72f9cc6 100644 --- a/scripts/default.nix +++ b/scripts/default.nix @@ -130,6 +130,7 @@ coreutils gnugrep ]; + vrr-fullscreen = [ ]; } // lib.mapAttrs import_script { wdmenu = ./wdmenu.nix; diff --git a/scripts/vrr-fullscreen b/scripts/vrr-fullscreen new file mode 100755 index 0000000..8413923 --- /dev/null +++ b/scripts/vrr-fullscreen @@ -0,0 +1,28 @@ +#!/usr/bin/env bash + +# List of supported outputs for VRR +output_vrr_whitelist=( + "DP-1" + "DP-2" +) + +# Toggle VRR for fullscreened apps in prespecified displays to avoid stutters while in desktop +swaymsg -t subscribe -m '[ "window" ]' | while read window_json; do + window_event=$(echo ${window_json} | jq -r '.change') + + # Process only focus change and fullscreen toggle + if [[ $window_event = "focus" || $window_event = "fullscreen_mode" ]]; then + output_json=$(swaymsg -t get_outputs | jq -r '.[] | select(.focused == true)') + output_name=$(echo ${output_json} | jq -r '.name') + + # Use only VRR in whitelisted outputs + if [[ ${output_vrr_whitelist[*]} =~ ${output_name} ]]; then + output_vrr_status=$(echo ${output_json} | jq -r '.adaptive_sync_status') + window_fullscreen_status=$(echo ${window_json} | jq -r '.container.fullscreen_mode') + + # Only update output if nesseccary to avoid flickering + [[ $output_vrr_status = "disabled" && $window_fullscreen_status = "1" ]] && swaymsg output "${output_name}" adaptive_sync 1 + [[ $output_vrr_status = "enabled" && $window_fullscreen_status = "0" ]] && swaymsg output "${output_name}" adaptive_sync 0 + fi + fi +done diff --git a/user/sway/default.nix b/user/sway/default.nix index 3205143..570a25b 100644 --- a/user/sway/default.nix +++ b/user/sway/default.nix @@ -69,7 +69,7 @@ in }; output = { "*" = { - adaptive_sync = "enabled"; + adaptive_sync = "off"; bg = "${theme.background} fill"; mode = "1920x1080@144.000Hz"; }; @@ -116,6 +116,21 @@ in indicator = true; }; + systemd.user.services.vrr-fullscreen = { + Unit = { + Description = "Enable VRR for fullscreen windows"; + PartOf = [ "graphical-session.target" ]; + After = [ "graphical-session.target" ]; + }; + Service = { + ExecStart = "${lib.getExe pkgs.vrr-fullscreen}"; + Restart = "on-failure"; + }; + Install = { + WantedBy = [ "sway-session.target" ]; + }; + }; + xdg.configFile."OpenTabletDriver/settings.json".source = ./open-tablet-driver.json; home.packages = with pkgs; [ From 0f4ac759c63f9679e48b1c5fda774ed6eb272645 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 5 Jun 2024 01:18:48 -0300 Subject: [PATCH 142/404] treewide: remove variables from pkgs --- overlays/default.nix | 3 --- scripts/wdmenu.nix | 10 +--------- scripts/wfile-picker.nix | 2 +- scripts/wlauncher.nix | 10 +--------- settings/default.nix | 6 ++++++ system/boot.nix | 2 +- system/configuration.nix | 3 +++ system/greetd.nix | 2 +- user/alacritty.nix | 2 +- user/bmenu.nix | 2 +- user/firefox.nix | 2 +- user/fish/default.nix | 10 +--------- user/fzf.nix | 2 +- user/git.nix | 2 +- user/gnome.nix | 3 ++- user/helix.nix | 9 +++++++-- user/home.nix | 3 +++ user/hyprland.nix | 2 +- user/kakoune/default.nix | 2 +- user/man.nix | 2 +- user/mangohud.nix | 2 +- user/mimeapps.nix | 2 +- user/mpd.nix | 2 +- user/pqiv.nix | 2 +- user/rofi.nix | 2 +- user/ssh.nix | 2 +- user/sway/default.nix | 4 ++-- user/sway/kanshi.nix | 2 +- user/sway/mako.nix | 2 +- user/sway/sway-assigns.nix | 2 +- user/sway/sway-binds.nix | 2 +- user/sway/sway-modes.nix | 2 +- user/sway/swayidle.nix | 2 +- user/sway/swaylock.nix | 2 +- user/sway/theme.nix | 2 +- user/vdir.nix | 9 +++++++-- user/waybar/default.nix | 2 +- user/zathura.nix | 2 +- 38 files changed, 60 insertions(+), 64 deletions(-) create mode 100644 settings/default.nix diff --git a/overlays/default.nix b/overlays/default.nix index 14257ba..8d4046b 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -6,7 +6,6 @@ rec { themes new-packages patches - variables lib_extended ]; @@ -80,8 +79,6 @@ rec { } ); - variables = (final: prev: { uservars = import ../user/variables.nix; }); - lib_extended = ( final: prev: { lib = prev.lib // rec { diff --git a/scripts/wdmenu.nix b/scripts/wdmenu.nix index 85fb6fc..3505781 100644 --- a/scripts/wdmenu.nix +++ b/scripts/wdmenu.nix @@ -1,12 +1,4 @@ { pkgs, ... }: -let - inherit (pkgs.uservars) dmenu; - available_menus = { - bmenu = "bmenu"; - rofi = "rofi -dmenu -sort"; - }; - menu_cmd = available_menus.${dmenu}; -in pkgs.writeShellScriptBin "wdmenu" '' - exec ${menu_cmd} "$@" + exec bmenu "$@" '' diff --git a/scripts/wfile-picker.nix b/scripts/wfile-picker.nix index eb68752..d8ced8a 100644 --- a/scripts/wfile-picker.nix +++ b/scripts/wfile-picker.nix @@ -1,6 +1,6 @@ { pkgs, ... }: let - inherit (pkgs.uservars) dmenu; + inherit (config.my) dmenu; available_menus = { bmenu = "bmenu run"; rofi = "rofi -show drun -sort"; diff --git a/scripts/wlauncher.nix b/scripts/wlauncher.nix index eb68752..d2c2dec 100644 --- a/scripts/wlauncher.nix +++ b/scripts/wlauncher.nix @@ -1,12 +1,4 @@ { pkgs, ... }: -let - inherit (pkgs.uservars) dmenu; - available_menus = { - bmenu = "bmenu run"; - rofi = "rofi -show drun -sort"; - }; - menu_cmd = available_menus.${dmenu}; -in pkgs.writeShellScriptBin "wlauncher" '' - exec ${menu_cmd} "$@" + exec bmenu run "$@" '' diff --git a/settings/default.nix b/settings/default.nix new file mode 100644 index 0000000..2a2ca08 --- /dev/null +++ b/settings/default.nix @@ -0,0 +1,6 @@ +{ lib, ... }: +{ + options = { + my = lib.mkOption { }; + }; +} diff --git a/system/boot.nix b/system/boot.nix index 81d838e..fa1ed8d 100644 --- a/system/boot.nix +++ b/system/boot.nix @@ -43,7 +43,7 @@ }; plymouth = { enable = true; - theme = lib.mkIf (pkgs.uservars.desktop == "sway") "red_loader"; + theme = lib.mkIf (config.my.desktop == "sway") "red_loader"; themePackages = with pkgs; [ (adi1090x-plymouth-themes.override { selected_themes = [ "red_loader" ]; }) ]; diff --git a/system/configuration.nix b/system/configuration.nix index e00ff47..6661e40 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -22,8 +22,11 @@ ./users.nix ./containers.nix ./network.nix + ../settings ]; + my = import ../user/variables.nix; + zramSwap.enable = true; programs.adb.enable = true; diff --git a/system/greetd.nix b/system/greetd.nix index 68f0cf8..b152c72 100644 --- a/system/greetd.nix +++ b/system/greetd.nix @@ -5,7 +5,7 @@ ... }: let - inherit (pkgs.uservars) + inherit (config.my) key accent font diff --git a/user/alacritty.nix b/user/alacritty.nix index ae2e2fb..91b98c0 100644 --- a/user/alacritty.nix +++ b/user/alacritty.nix @@ -5,7 +5,7 @@ ... }: let - inherit (pkgs.uservars) + inherit (config.my) key theme accent diff --git a/user/bmenu.nix b/user/bmenu.nix index 38c36c6..1543dcf 100644 --- a/user/bmenu.nix +++ b/user/bmenu.nix @@ -6,7 +6,7 @@ ... }: let - inherit (pkgs.uservars) + inherit (config.my) key theme accent diff --git a/user/firefox.nix b/user/firefox.nix index 4c442e3..207ebb6 100644 --- a/user/firefox.nix +++ b/user/firefox.nix @@ -6,7 +6,7 @@ ... }: let - inherit (pkgs.uservars) desktop browser; + inherit (config.my) desktop browser; bugfixedFirefox = pkgs.firefox-esr-unwrapped // { requireSigning = false; allowAddonSideload = true; diff --git a/user/fish/default.nix b/user/fish/default.nix index 07ba4c2..aef7fd5 100644 --- a/user/fish/default.nix +++ b/user/fish/default.nix @@ -5,15 +5,7 @@ ... }: let - inherit (pkgs.uservars) - key - theme - color - accent - font - editor - desktop - ; + inherit (config.my) accent editor desktop; in { config = { diff --git a/user/fzf.nix b/user/fzf.nix index a4113fa..df16adb 100644 --- a/user/fzf.nix +++ b/user/fzf.nix @@ -6,7 +6,7 @@ ... }: let - inherit (pkgs.uservars) + inherit (config.my) key theme accent diff --git a/user/git.nix b/user/git.nix index f50a249..94532f3 100644 --- a/user/git.nix +++ b/user/git.nix @@ -5,7 +5,7 @@ ... }: let - inherit (pkgs.uservars) username mail; + inherit (config.my) username mail; in { config = { diff --git a/user/gnome.nix b/user/gnome.nix index d7282dc..53dd630 100644 --- a/user/gnome.nix +++ b/user/gnome.nix @@ -2,9 +2,10 @@ pkgs, lib, inputs, + config, ... }: -lib.mkIf (pkgs.uservars.desktop == "gnome") { +lib.mkIf (config.my.desktop == "gnome") { home.pointerCursor = { name = "Adwaita"; diff --git a/user/helix.nix b/user/helix.nix index 292cfb0..b711055 100644 --- a/user/helix.nix +++ b/user/helix.nix @@ -1,6 +1,11 @@ -{ pkgs, lib, ... }: +{ + pkgs, + lib, + config, + ... +}: let - inherit (pkgs.uservars) accent theme editor; + inherit (config.my) accent theme editor; inherit (theme) color; in { diff --git a/user/home.nix b/user/home.nix index 8453572..e482406 100644 --- a/user/home.nix +++ b/user/home.nix @@ -44,8 +44,11 @@ ./xdg-dirs.nix inputs.hyprland.homeManagerModules.default inputs.nix-index-database.hmModules.nix-index + ../settings ]; + my = import ./variables.nix; + # Home Manager needs a bit of information about you and the # paths it should manage. home.username = "lelgenio"; diff --git a/user/hyprland.nix b/user/hyprland.nix index e1a632b..721e14b 100644 --- a/user/hyprland.nix +++ b/user/hyprland.nix @@ -5,7 +5,7 @@ ... }: { - config = lib.mkIf (pkgs.uservars.desktop == "hyprland") { + config = lib.mkIf (config.my.desktop == "hyprland") { wayland.windowManager.hyprland = { enable = false; extraConfig = '' diff --git a/user/kakoune/default.nix b/user/kakoune/default.nix index 091fe1b..ebb17f5 100644 --- a/user/kakoune/default.nix +++ b/user/kakoune/default.nix @@ -5,7 +5,7 @@ ... }: let - inherit (pkgs.uservars) + inherit (config.my) key dmenu editor diff --git a/user/man.nix b/user/man.nix index c77607e..cc56089 100644 --- a/user/man.nix +++ b/user/man.nix @@ -6,7 +6,7 @@ ... }: let - inherit (pkgs.uservars) + inherit (config.my) key theme color diff --git a/user/mangohud.nix b/user/mangohud.nix index f43564f..440b750 100644 --- a/user/mangohud.nix +++ b/user/mangohud.nix @@ -6,7 +6,7 @@ ... }: let - inherit (pkgs.uservars) + inherit (config.my) key theme color diff --git a/user/mimeapps.nix b/user/mimeapps.nix index ff39ea4..a5ddae6 100644 --- a/user/mimeapps.nix +++ b/user/mimeapps.nix @@ -6,7 +6,7 @@ ... }: let - inherit (pkgs.uservars) browser; + inherit (config.my) browser; cfg = config.xdg.defaultApplications; in { diff --git a/user/mpd.nix b/user/mpd.nix index 8a4c155..f4cca16 100644 --- a/user/mpd.nix +++ b/user/mpd.nix @@ -5,7 +5,7 @@ ... }: { - config = lib.mkIf (pkgs.uservars.desktop != "gnome") { + config = lib.mkIf (config.my.desktop != "gnome") { services.mpd = { enable = true; musicDirectory = config.home.homeDirectory + "/Música"; diff --git a/user/pqiv.nix b/user/pqiv.nix index 10e6c3d..70cf9de 100644 --- a/user/pqiv.nix +++ b/user/pqiv.nix @@ -6,7 +6,7 @@ ... }: let - inherit (pkgs.uservars) + inherit (config.my) key theme color diff --git a/user/rofi.nix b/user/rofi.nix index 79307eb..c24a0ce 100644 --- a/user/rofi.nix +++ b/user/rofi.nix @@ -6,7 +6,7 @@ ... }: let - inherit (pkgs.uservars) + inherit (config.my) key theme accent diff --git a/user/ssh.nix b/user/ssh.nix index 3193876..60649ba 100644 --- a/user/ssh.nix +++ b/user/ssh.nix @@ -5,7 +5,7 @@ ... }: let - inherit (pkgs.uservars) username mail; + inherit (config.my) username mail; in { config = { diff --git a/user/sway/default.nix b/user/sway/default.nix index 570a25b..d98b0d7 100644 --- a/user/sway/default.nix +++ b/user/sway/default.nix @@ -5,7 +5,7 @@ ... }: let - inherit (pkgs.uservars) + inherit (config.my) key accent font @@ -24,7 +24,7 @@ in ./swaylock.nix ./theme.nix ]; - config = lib.mkIf (pkgs.uservars.desktop == "sway") { + config = lib.mkIf (config.my.desktop == "sway") { services.mako.enable = true; services.swayidle.enable = true; services.kanshi.enable = true; diff --git a/user/sway/kanshi.nix b/user/sway/kanshi.nix index f35fd4f..c0a584b 100644 --- a/user/sway/kanshi.nix +++ b/user/sway/kanshi.nix @@ -5,7 +5,7 @@ ... }: let - inherit (pkgs.uservars) + inherit (config.my) key accent font diff --git a/user/sway/mako.nix b/user/sway/mako.nix index c8575ab..4f43734 100644 --- a/user/sway/mako.nix +++ b/user/sway/mako.nix @@ -5,7 +5,7 @@ ... }: let - inherit (pkgs.uservars) + inherit (config.my) key accent font diff --git a/user/sway/sway-assigns.nix b/user/sway/sway-assigns.nix index 5ad5473..3822a22 100644 --- a/user/sway/sway-assigns.nix +++ b/user/sway/sway-assigns.nix @@ -1,7 +1,7 @@ { config, pkgs, ... }: let in -# inherit (pkgs.uservars) key accent font theme; +# inherit (config.my) key accent font theme; # inherit (theme) color; # inherit (pkgs) lib; # mod = "Mod4"; diff --git a/user/sway/sway-binds.nix b/user/sway/sway-binds.nix index fe22594..543de59 100644 --- a/user/sway/sway-binds.nix +++ b/user/sway/sway-binds.nix @@ -1,6 +1,6 @@ { config, pkgs, ... }: let - inherit (pkgs.uservars) + inherit (config.my) key accent font diff --git a/user/sway/sway-modes.nix b/user/sway/sway-modes.nix index ea75ca8..cc3efff 100644 --- a/user/sway/sway-modes.nix +++ b/user/sway/sway-modes.nix @@ -1,6 +1,6 @@ { config, pkgs, ... }: let - inherit (pkgs.uservars) + inherit (config.my) key accent font diff --git a/user/sway/swayidle.nix b/user/sway/swayidle.nix index b0bd455..2c5384f 100644 --- a/user/sway/swayidle.nix +++ b/user/sway/swayidle.nix @@ -5,7 +5,7 @@ ... }: let - inherit (pkgs.uservars) + inherit (config.my) key accent font diff --git a/user/sway/swaylock.nix b/user/sway/swaylock.nix index eb6104e..e46b5d9 100644 --- a/user/sway/swaylock.nix +++ b/user/sway/swaylock.nix @@ -5,7 +5,7 @@ ... }: let - inherit (pkgs.uservars) + inherit (config.my) key accent font diff --git a/user/sway/theme.nix b/user/sway/theme.nix index 202eaff..ca4ea76 100644 --- a/user/sway/theme.nix +++ b/user/sway/theme.nix @@ -6,7 +6,7 @@ ... }: let - inherit (pkgs.uservars) theme font desktop; + inherit (config.my) theme font desktop; inherit (theme) color gtk_theme diff --git a/user/vdir.nix b/user/vdir.nix index 80e6145..02aa2b6 100644 --- a/user/vdir.nix +++ b/user/vdir.nix @@ -1,6 +1,11 @@ -{ pkgs, lib, ... }: +{ + pkgs, + lib, + config, + ... +}: let - inherit (pkgs.uservars) nextcloud; + inherit (config.my) nextcloud; pass_cmd = ( pkgs.writeShellScript "get_pass" '' pass "${nextcloud.pass}" | head -n1 diff --git a/user/waybar/default.nix b/user/waybar/default.nix index 5113808..d2dc661 100644 --- a/user/waybar/default.nix +++ b/user/waybar/default.nix @@ -7,7 +7,7 @@ ... }: let - inherit (pkgs.uservars) + inherit (config.my) key theme accent diff --git a/user/zathura.nix b/user/zathura.nix index ccb4c42..70e1c23 100644 --- a/user/zathura.nix +++ b/user/zathura.nix @@ -6,7 +6,7 @@ ... }: let - inherit (pkgs.uservars) + inherit (config.my) key accent font From 5dee442c4591fa6c650c7ab5dcafe64acf22de1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 6 Jun 2024 01:42:13 -0300 Subject: [PATCH 143/404] update --- flake.lock | 124 +++++++++++++++++++++++++++-------------------------- flake.nix | 2 +- 2 files changed, 64 insertions(+), 62 deletions(-) diff --git a/flake.lock b/flake.lock index 76a2850..10104d2 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1715290355, - "narHash": "sha256-2T7CHTqBXJJ3ZC6R/4TXTcKoXWHcvubKNj9SfomURnw=", + "lastModified": 1716561646, + "narHash": "sha256-UIGtLO89RxKt7RF2iEgPikSdU53r6v/6WYB0RW3k89I=", "owner": "ryantm", "repo": "agenix", - "rev": "8d37c5bdeade12b6479c85acd133063ab53187a0", + "rev": "c2fc0762bbe8feb06a2e59a364fa81b3a57671c9", "type": "github" }, "original": { @@ -291,11 +291,11 @@ "flake-compat_5": { "flake": false, "locked": { - "lastModified": 1668681692, - "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "009399224d5e398d03b22badca40a37ac85412a1", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -429,7 +429,7 @@ }, "flake-utils_7": { "inputs": { - "systems": "systems_9" + "systems": "systems_10" }, "locked": { "lastModified": 1681202837, @@ -447,7 +447,7 @@ }, "flake-utils_8": { "inputs": { - "systems": "systems_10" + "systems": "systems_11" }, "locked": { "lastModified": 1710146030, @@ -491,11 +491,11 @@ ] }, "locked": { - "lastModified": 1716563886, - "narHash": "sha256-MKSVKxP50gEbdP60G0M5LampyVSIGT8FGGB88nKPmi8=", + "lastModified": 1717527182, + "narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=", "owner": "nix-community", "repo": "home-manager", - "rev": "00a86e4f7a6455ad58b7090a931f1c6097e4fcd7", + "rev": "845a5c4c073f74105022533907703441e0464bc3", "type": "github" }, "original": { @@ -521,11 +521,11 @@ ] }, "locked": { - "lastModified": 1713612213, - "narHash": "sha256-zJboXgWNpNhKyNF8H/3UYzWkx7w00TOCGKi3cwi+tsw=", + "lastModified": 1716576411, + "narHash": "sha256-FIN1wMoyePBTtibCbaeJaoKNLuAYIGwLCWAYC1DJanw=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "cab4746180f210a3c1dd3d53e45c510e309e90e1", + "rev": "57298fc4f13c807e50ada2c986a3114b7fc2e621", "type": "github" }, "original": { @@ -546,11 +546,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1715342341, - "narHash": "sha256-jHCjAwaukNCI7yVsbB8oppl1dUujvFAfRiXaecqWGI0=", + "lastModified": 1717605046, + "narHash": "sha256-zzdMmUNJCPY1KqVjzpukHOecae1AiAzwmBN5hq7jM2U=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "38911d6df4977b6b00557cc887eb151d032e505b", + "rev": "c95845b1488b4bd63e901cbdc4cb68c27a45971b", "type": "github" }, "original": { @@ -598,11 +598,11 @@ ] }, "locked": { - "lastModified": 1713121246, - "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=", + "lastModified": 1716473782, + "narHash": "sha256-+qLn4lsHU6iL3+HTo1gTQ1tWzet8K9h+IfVemzEQZj8=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706", + "rev": "87d5d984109c839482b88b4795db073eb9ed446f", "type": "github" }, "original": { @@ -623,11 +623,11 @@ ] }, "locked": { - "lastModified": 1715287423, - "narHash": "sha256-B7AJIjOyWgVMKhu7DlOnWa0VprdhywUVHuB/j+EwSxM=", + "lastModified": 1716058375, + "narHash": "sha256-CwjWoVnBZE5SBpRx9dgSQGCr4Goxyfcyv3zZbOhVqzk=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "e2fc1c0eb8b392110588f478cce644348ead7271", + "rev": "3afed4364790aebe0426077631af1e164a9650cc", "type": "github" }, "original": { @@ -698,11 +698,11 @@ ] }, "locked": { - "lastModified": 1714878592, - "narHash": "sha256-E68C03sYRsYFsK7wiGHUIJm8IsyPRALOrFoTL0glXnI=", + "lastModified": 1717297675, + "narHash": "sha256-43UmlS1Ifx17y93/Vc258U7bOlAAIZbu8dsGDHOIIr0=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "a362555e9dbd4ecff3bb98969bbdb8f79fe87f10", + "rev": "972a52bee3991ae1f1899e6452e0d7c01ee566d9", "type": "github" }, "original": { @@ -784,21 +784,20 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-23_05": "nixpkgs-23_05", - "nixpkgs-23_11": "nixpkgs-23_11", + "nixpkgs-24_05": "nixpkgs-24_05", "utils": "utils_2" }, "locked": { - "lastModified": 1706219574, - "narHash": "sha256-qO+8UErk+bXCq2ybHU4GzXG4Ejk4Tk0rnnTPNyypW4g=", + "lastModified": 1717515260, + "narHash": "sha256-UJhSsczeTpRpoXICuRk++NORXE2qNTEwOn0rL3uTJ3E=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "e47f3719f1db3e0961a4358d4cb234a0acaa7baf", + "rev": "b51ae1a235353ffdfa9f5874e6aea32e367a5739", "type": "gitlab" }, "original": { "owner": "simple-nixos-mailserver", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixos-mailserver", "type": "gitlab" } @@ -818,33 +817,18 @@ "type": "indirect" } }, - "nixpkgs-23_05": { + "nixpkgs-24_05": { "locked": { - "lastModified": 1704290814, - "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", + "lastModified": 1717144377, + "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", + "rev": "805a384895c696f802a9bf5bf4720f37385df547", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-23.05", - "type": "indirect" - } - }, - "nixpkgs-23_11": { - "locked": { - "lastModified": 1706098335, - "narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a77ab169a83a4175169d78684ddd2e54486ac651", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "type": "indirect" } }, @@ -882,11 +866,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1716408587, - "narHash": "sha256-el71IUaQdEmntmd51GBpkJs/Hqh6S4dmfmUGP8GQaME=", + "lastModified": 1717281328, + "narHash": "sha256-evZPzpf59oNcDUXxh2GHcxHkTEG4fjae2ytWP85jXRo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1a7abfa62e8a36f7f2dbe463722ed9ea31be5e43", + "rev": "b3b2b28c1daa04fe2ae47c21bb76fd226eac4ca1", "type": "github" }, "original": { @@ -1073,6 +1057,21 @@ "type": "github" } }, + "systems_11": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -1233,12 +1232,15 @@ } }, "utils_2": { + "inputs": { + "systems": "systems_9" + }, "locked": { - "lastModified": 1605370193, - "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=", + "lastModified": 1709126324, + "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", "owner": "numtide", "repo": "flake-utils", - "rev": "5021eac20303a61fafe17224c087f5519baed54d", + "rev": "d465f4819400de7c8d874d50b982301f28a84605", "type": "github" }, "original": { @@ -1285,11 +1287,11 @@ ] }, "locked": { - "lastModified": 1714662532, - "narHash": "sha256-Pj2xGSYhapYbXL7sk7TTlOtCZcTfPQoL3fPbZeg7L4Y=", + "lastModified": 1716290197, + "narHash": "sha256-1u9Exrc7yx9qtES2brDh7/DDZ8w8ap1nboIOAtCgeuM=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "1f228ba2f1f254195c0b571302b37482861abee3", + "rev": "91e48d6acd8a5a611d26f925e51559ab743bc438", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 8f847b0..44746ce 100644 --- a/flake.nix +++ b/flake.nix @@ -33,7 +33,7 @@ }; nixos-mailserver = { - url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-23.11"; + url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05"; inputs.nixpkgs.follows = "nixpkgs"; }; From 97915651db337e132a99b15ced42b148c108f080 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 7 Jun 2024 01:18:32 -0300 Subject: [PATCH 144/404] phantom: update nextcloud --- hosts/phantom/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/phantom/nextcloud.nix b/hosts/phantom/nextcloud.nix index de1bd6d..88f0b02 100644 --- a/hosts/phantom/nextcloud.nix +++ b/hosts/phantom/nextcloud.nix @@ -7,7 +7,7 @@ { services.nextcloud = { enable = true; - package = pkgs.nextcloud27; + package = pkgs.nextcloud29; hostName = "cloud.lelgenio.com"; https = true; config = { From a1631f773258bc6c717aecbd4de6af75135384c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 7 Jun 2024 01:50:56 -0300 Subject: [PATCH 145/404] phantom: set hostname --- hosts/phantom/default.nix | 2 ++ hosts/phantom/email.nix | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/hosts/phantom/default.nix b/hosts/phantom/default.nix index 462e070..922218f 100644 --- a/hosts/phantom/default.nix +++ b/hosts/phantom/default.nix @@ -20,6 +20,8 @@ ./forgejo.nix ]; + networking.hostName = "phantom"; + services.nginx.virtualHosts."lelgenio.com" = { enableACME = true; forceSSL = true; diff --git a/hosts/phantom/email.nix b/hosts/phantom/email.nix index c218977..1951629 100644 --- a/hosts/phantom/email.nix +++ b/hosts/phantom/email.nix @@ -5,9 +5,6 @@ ... }: { - # It's important to let Digital Ocean set the hostname so we get rDNS to work - networking.hostName = ""; - imports = [ inputs.nixos-mailserver.nixosModules.mailserver ]; mailserver = { From be7ca49629dbb71734cf251cc44541b7f5a08be4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 8 Jun 2024 10:00:44 -0300 Subject: [PATCH 146/404] vdir: remove vdir --- user/fish/completions/todo.fish | 124 -------------------------------- user/fish/default.nix | 6 -- user/home.nix | 1 - user/variables.nix | 18 +---- user/vdir.nix | 92 ------------------------ 5 files changed, 1 insertion(+), 240 deletions(-) delete mode 100644 user/fish/completions/todo.fish delete mode 100644 user/vdir.nix diff --git a/user/fish/completions/todo.fish b/user/fish/completions/todo.fish deleted file mode 100644 index 8c0bb32..0000000 --- a/user/fish/completions/todo.fish +++ /dev/null @@ -1,124 +0,0 @@ -set __fish_complete_todoman_subcomands cancel copy delete done edit flush list move new show -function __fish_complete_todoman_not_subcomand - not __fish_seen_subcommand_from $__fish_complete_todoman_subcomands -end - -function __fish_complete_todoman_list_todos - todo list | - string replace -r '^\[.\] ' "" | - string replace -r ' ' '\t' | - string replace -r '\t!*' '\t' | - string replace -r '\(.*?\)' "" -end - -function __fish_complete_todoman_config_path - set -q XDG_CONFIG_DIR - or set -l XDG_CONFIG_DIR "$HOME/.config" - - set -l config_path "$XDG_CONFIG_DIR/todoman/config.py" - - test -f "$config_path" - and echo "$config_path" -end - -function __fish_complete_todoman_lists_dir - set -l config_path (__fish_complete_todoman_config_path) - or return - - # looks something like "~/.local/share/calendars/*" - string replace -fr 'path\s*=\s*"(.*)"\s*$' '$1' < $config_path | - string replace -r '^~' "$HOME" | - string replace -r '\*$' '' -end - -function __fish_complete_todoman_list_lists - set -l lists_path (__fish_complete_todoman_lists_dir) - string replace -r '.*/(.*?)$' '$1' $lists_path/* -end - - -#### Initial command definition #### -complete --erase todo -complete -c todo -f - -#### Base command flags #### -complete -c todo -n __fish_complete_todoman_not_subcomand -s v -l verbosity -a "CRITICAL ERROR WARNING INFO DEBUG" -complete -c todo -n __fish_complete_todoman_not_subcomand -l colour -l color -a "always auto never" -complete -c todo -n __fish_complete_todoman_not_subcomand -l porcelain -a "Use a stable JSON format" -complete -c todo -n __fish_complete_todoman_not_subcomand -s h -l humanize -a "Format all dates and times in a human friendly way" -complete -c todo -n __fish_complete_todoman_not_subcomand -s c -l config -a "The config file to use." -complete -c todo -n __fish_complete_todoman_not_subcomand -l version -d "Show the version and exit." -complete -c todo -n __fish_complete_todoman_not_subcomand -l help -d "Show this message and exit." - -#### Subcommands #### -complete -c todo -n __fish_complete_todoman_not_subcomand -a cancel -d 'Cancel one or more tasks' -complete -c todo -n __fish_complete_todoman_not_subcomand -a copy -d 'Copy tasks to another list' -complete -c todo -n __fish_complete_todoman_not_subcomand -a delete -d 'Delete tasks' -complete -c todo -n __fish_complete_todoman_not_subcomand -a done -d 'Mark one or more tasks as done' -complete -c todo -n __fish_complete_todoman_not_subcomand -a edit -d 'Edit the task with id ID' -complete -c todo -n __fish_complete_todoman_not_subcomand -a flush -d 'Delete done tasks' -complete -c todo -n __fish_complete_todoman_not_subcomand -a list -d 'List tasks' -complete -c todo -n __fish_complete_todoman_not_subcomand -a move -d 'Move tasks to another list' -complete -c todo -n __fish_complete_todoman_not_subcomand -a new -d 'Create a new task with SUMMARY' -complete -c todo -n __fish_complete_todoman_not_subcomand -a show -d 'Show details about a task' - -#### Subcommand flags #### - -complete -c todo -n "__fish_seen_subcommand_from cancel" -a "(__fish_complete_todoman_list_todos)" -d 'Cancel one or more tasks.' -complete -c todo -n "__fish_seen_subcommand_from cancel" -l help -d 'Show this message and exit.' - -complete -c todo -n "__fish_seen_subcommand_from copy" -a "(__fish_complete_todoman_list_todos)" -d 'Cancel one or more tasks.' -complete -c todo -n "__fish_seen_subcommand_from copy" -s l -l list -d 'The list to copy the tasks to.' -complete -c todo -n "__fish_seen_subcommand_from copy" -l help -d 'Show this message and exit.' - -complete -c todo -n "__fish_seen_subcommand_from delete" -a "(__fish_complete_todoman_list_todos)" -d 'Delete tasks.' -complete -c todo -n "__fish_seen_subcommand_from delete" -l yes -d 'Confirm the action without prompting.' -complete -c todo -n "__fish_seen_subcommand_from delete" -l help -d 'Show this message and exit.' - -complete -c todo -n "__fish_seen_subcommand_from done" -a "(__fish_complete_todoman_list_todos)" -d 'Mark one or more tasks as done.' -complete -c todo -n "__fish_seen_subcommand_from done" -l help -d 'Show this message and exit.' - -complete -c todo -n "__fish_seen_subcommand_from edit" -a "(__fish_complete_todoman_list_todos)" -d 'Edit the task with id ID.' -complete -c todo -n "__fish_seen_subcommand_from edit" -l raw -d 'Open the raw file for editing in $EDITOR. Only use this' -complete -c todo -n "__fish_seen_subcommand_from edit" -s s -l start -r -d 'When the task starts.' -complete -c todo -n "__fish_seen_subcommand_from edit" -s d -l due -r -d 'Due date of the task, in the format specified in the configuration.' -complete -c todo -n "__fish_seen_subcommand_from edit" -l location -r -d 'The location where this todo takes place.' -complete -c todo -n "__fish_seen_subcommand_from edit" -l priority -r -d 'Priority for this task' -complete -c todo -n "__fish_seen_subcommand_from edit" -s i -l interactive -r -d 'Go into interactive mode before saving the task.' -complete -c todo -n "__fish_seen_subcommand_from edit" -l help -d 'Show this message and exit.' - -complete -c todo -n "__fish_seen_subcommand_from flush" -d 'Delete done tasks. This will also clear the cache to reset task IDs.' -complete -c todo -n "__fish_seen_subcommand_from flush" -l yes -d 'Confirm the action without prompting.' -complete -c todo -n "__fish_seen_subcommand_from flush" -l help -d 'Show this message and exit.' - -complete -c todo -n "__fish_seen_subcommand_from flush" -d 'Delete done tasks. This will also clear the cache to reset task IDs.' -complete -c todo -n "__fish_seen_subcommand_from flush" -l yes -d 'Confirm the action without prompting.' -complete -c todo -n "__fish_seen_subcommand_from flush" -l help -d 'Show this message and exit.' - -complete -c todo -n "__fish_seen_subcommand_from list" -a "(__fish_complete_todoman_list_lists)" -d 'List tasks by list name' -complete -c todo -n "__fish_seen_subcommand_from list" -l location -r -d 'Only show tasks with location containg TEXT' -complete -c todo -n "__fish_seen_subcommand_from list" -l category -d "Only show tasks with category containg" -complete -c todo -n "__fish_seen_subcommand_from list" -l grep -d "Only show tasks with message containg" -complete -c todo -n "__fish_seen_subcommand_from list" -l sort -d "Sort tasks by field" -a "description location status summary uid rrule percent_complete priority sequence categories completed_at created_at dtstamp start due last_modified" -complete -c todo -n "__fish_seen_subcommand_from list" -l reverse -l no-reverse -d 'Sort tasks in reverse order (see --sort)' -complete -c todo -n "__fish_seen_subcommand_from list" -l due -d 'Only show tasks due in INTEGER hours' -complete -c todo -n "__fish_seen_subcommand_from list" -l priority -r -d 'Only show tasks with priority at least as high as' -a "low medium high" -complete -c todo -n "__fish_seen_subcommand_from list" -l start -r -d "Only shows tasks before/after given DATE" -complete -c todo -n "__fish_seen_subcommand_from list" -l startable -d "Show only todos which should can be started today" -complete -c todo -n "__fish_seen_subcommand_from list" -s s -l status -r -d "Show only todos with the provided comma-separated" -a "NEEDS-ACTION CANCELLED COMPLETED IN-PROCESS ANY" -complete -c todo -n "__fish_seen_subcommand_from list" -l help -d "Show this message and exit." - -complete -c todo -n "__fish_seen_subcommand_from move" -a "(__fish_complete_todoman_list_todos)" -d 'Move tasks to another list.' -complete -c todo -n "__fish_seen_subcommand_from move" -s l -l list -a "(__fish_complete_todoman_list_lists)" -d 'The list to move the tasks to.' -complete -c todo -n "__fish_seen_subcommand_from move" -l help -d 'Show this message and exit.' - -complete -c todo -n "__fish_seen_subcommand_from new" -d 'Create a new task with SUMMARY.' -complete -c todo -n "__fish_seen_subcommand_from new" -s l -l list -a "(__fish_complete_todoman_list_lists)" -d 'List in which the task will be saved.' -complete -c todo -n "__fish_seen_subcommand_from new" -s r -l read-description -d 'Read task description from stdin.' -complete -c todo -n "__fish_seen_subcommand_from new" -s s -l start -d 'When the task starts.' -complete -c todo -n "__fish_seen_subcommand_from new" -s d -l due -d 'Due date of the task, in the format specified in the configuration.' -complete -c todo -n "__fish_seen_subcommand_from new" -l location -d 'The location where this todo takes place.' -complete -c todo -n "__fish_seen_subcommand_from new" -s i -l interactive -d 'Go into interactive mode before saving the task.' -complete -c todo -n "__fish_seen_subcommand_from new" -l help -d 'Show this message and exit.' - -complete -c todo -n "__fish_seen_subcommand_from show" -a "(__fish_complete_todoman_list_todos)" -d 'Show details about a task.' diff --git a/user/fish/default.nix b/user/fish/default.nix index aef7fd5..c28432e 100644 --- a/user/fish/default.nix +++ b/user/fish/default.nix @@ -32,8 +32,6 @@ in set_color normal bind \cy 'commandline | wl-copy -n' - - ${pkgs.todoman}/bin/todo list ''; shellAliases = { rm = "trash"; @@ -85,10 +83,6 @@ in }; xdg.configFile = { "fish/conf.d/prompt.fish".source = ./fish_prompt.fish; - "fish/completions/" = { - recursive = true; - source = ./completions; - }; "fish/conf.d/" = { recursive = true; source = ./conf.d; diff --git a/user/home.nix b/user/home.nix index e482406..4efdd01 100644 --- a/user/home.nix +++ b/user/home.nix @@ -28,7 +28,6 @@ ./desktop-entries.nix ./chat.nix ./syncthing.nix - ./vdir.nix ./bmenu.nix ./fzf.nix ./ranger diff --git a/user/variables.nix b/user/variables.nix index 80ac8ba..cb35123 100644 --- a/user/variables.nix +++ b/user/variables.nix @@ -108,24 +108,8 @@ rec { mail = { personal = { from = "Leonardo Eugênio"; - user = "lelgenio@disroot.org"; - imap = "disroot.org"; - smtp = "disroot.org"; - pass = "disroot.org"; + user = "lelgenio@lelgenio.com"; }; - work = { - from = "Leonardo Eugênio"; - user = "leonardo@wopus.com.br"; - imap = "imap.hostinger.com"; - smtp = "smtp.hostinger.com"; - pass = "Work/wopus_email"; - }; - }; - nextcloud = { - name = "disroot"; - user = "lelgenio"; - host = "cloud.disroot.org"; - pass = "disroot.org"; }; dmenu = "bmenu"; diff --git a/user/vdir.nix b/user/vdir.nix deleted file mode 100644 index 02aa2b6..0000000 --- a/user/vdir.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ - pkgs, - lib, - config, - ... -}: -let - inherit (config.my) nextcloud; - pass_cmd = ( - pkgs.writeShellScript "get_pass" '' - pass "${nextcloud.pass}" | head -n1 - '' - ); -in -{ - systemd.user.services.vdirsyncer = { - Unit.Description = "vdirsyncer calendar and contacts synchronization"; - Service = { - Type = "oneshot"; - ExecStart = toString ( - pkgs.writeShellScript "run-vdirsyncer" '' - ${pkgs.coreutils}/bin/yes | ${pkgs.vdirsyncer}/bin/vdirsyncer discover - ${pkgs.coreutils}/bin/yes | ${pkgs.vdirsyncer}/bin/vdirsyncer sync - '' - ); - }; - }; - systemd.user.timers.vdirsyncer = { - Unit.Description = "vdirsyncer calendar and contacts synchronization"; - Timer = { - OnCalendar = "*:0/30"; - Unit = "vdirsyncer.service"; - }; - Install.WantedBy = [ "timers.target" ]; - }; - - xdg.configFile = { - "vdirsyncer/config".text = '' - [general] - status_path = "~/.vdirsyncer/status/" - - [pair contacts] - a = "contacts_local" - b = "contacts_remote" - - collections = ["from a", "from b"] - - metadata = ["displayname"] - - [storage contacts_local] - type = "filesystem" - path = "~/.local/share/contacts/" - fileext = ".vcf" - - [storage contacts_remote] - type = "carddav" - url = "https://${nextcloud.host}/remote.php/dav/addressbooks/users/${nextcloud.user}/" - username = "${nextcloud.user}" - password.fetch = [ "command", "${pass_cmd}" ] - - [pair calendar] - a = "calendar_local" - b = "calendar_remote" - collections = ["from a", "from b"] - metadata = ["displayname", "color"] - conflict_resolution = "b wins" - - [storage calendar_local] - type = "filesystem" - path = "~/.local/share/calendars/" - fileext = ".ics" - - [storage calendar_remote] - type = "caldav" - url = "https://${nextcloud.host}/remote.php/dav/calendars/${nextcloud.user}/" - username = "${nextcloud.user}" - password.fetch = [ "command", "${pass_cmd}" ] - ''; - "todoman/config.py".text = '' - path = "~/.local/share/calendars/*" - date_format = "%Y-%m-%d" - time_format = "%H:%M" - default_list = "Personal" - default_due = 48 - ''; - }; - - home.packages = with pkgs; [ - vdirsyncer - todoman - ]; -} From dee7d066f26c8fbed2726db11f1484a3dd1fca63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 10 Jun 2024 22:50:25 -0300 Subject: [PATCH 147/404] Revert "monolith: remove corectrl" This reverts commit 43dd44d237cb62986f211d42308220099210fae7. --- hosts/monolith.nix | 11 +++++++++++ user/sway/default.nix | 1 + 2 files changed, 12 insertions(+) diff --git a/hosts/monolith.nix b/hosts/monolith.nix index 2e33fd8..5f1bc66 100644 --- a/hosts/monolith.nix +++ b/hosts/monolith.nix @@ -40,6 +40,7 @@ in "zenpower" ]; boot.kernelParams = [ + "amdgpu.dcdebugmask=0x10" # amdgpu undervolting bug "video=DP-1:1920x1080@144" # hibernation "resume=LABEL=BTRFS_ROOT" # findmnt -o LABEL --noheadings /swap/ @@ -63,6 +64,16 @@ in rocmPackages.rocm-smi ]; + boot.kernelPackages = pkgs.linuxPackages_6_1; + + programs.corectrl = { + enable = true; + gpuOverclock = { + enable = true; + ppfeaturemask = "0xffffffff"; + }; + }; + fileSystems."/" = { device = "/dev/disk/by-label/BTRFS_ROOT"; fsType = "btrfs"; diff --git a/user/sway/default.nix b/user/sway/default.nix index d98b0d7..0ad5a6b 100644 --- a/user/sway/default.nix +++ b/user/sway/default.nix @@ -104,6 +104,7 @@ in exec ${pkgs.dbus-sway-environment}/bin/dbus-sway-environment exec swaymsg workspace 2 exec_always systemctl --user restart waybar.service + exec corectrl --minimize-systray ''; }; services.gammastep = { From ac8acaba5990778da5274e06fbef73845cd98086 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Tue, 11 Jun 2024 00:50:05 -0300 Subject: [PATCH 148/404] flake: remove maildir-notify-daemon --- flake.lock | 205 +++------------------------------------ flake.nix | 4 - overlays/default.nix | 1 - user/desktop-entries.nix | 18 ---- 4 files changed, 16 insertions(+), 212 deletions(-) diff --git a/flake.lock b/flake.lock index 10104d2..403f6fa 100644 --- a/flake.lock +++ b/flake.lock @@ -16,22 +16,6 @@ "type": "github" } }, - "advisory-db_2": { - "flake": false, - "locked": { - "lastModified": 1683272394, - "narHash": "sha256-4XQZbSZ8XYAeASpr0Er8mNPnjbYLJwvaB+VyH+bt6DE=", - "owner": "rustsec", - "repo": "advisory-db", - "rev": "50bed3ba4066e6255dab434dc845e7f655812ce1", - "type": "github" - }, - "original": { - "owner": "rustsec", - "repo": "advisory-db", - "type": "github" - } - }, "agenix": { "inputs": { "darwin": "darwin", @@ -95,30 +79,6 @@ "type": "github" } }, - "crane_2": { - "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_4", - "nixpkgs": [ - "maildir-notify-daemon", - "nixpkgs" - ], - "rust-overlay": "rust-overlay_2" - }, - "locked": { - "lastModified": 1683505101, - "narHash": "sha256-VBU64Jfu2V4sUR5+tuQS9erBRAe/QEYUxdVMcJGMZZs=", - "owner": "ipetkov", - "repo": "crane", - "rev": "7b5bd9e5acb2bb0cfba2d65f34d8568a894cdb6c", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, "darwin": { "inputs": { "nixpkgs": [ @@ -243,22 +203,6 @@ } }, "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", @@ -272,7 +216,7 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, - "flake-compat_4": { + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1650374568, @@ -288,7 +232,7 @@ "type": "github" } }, - "flake-compat_5": { + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1696426674, @@ -324,7 +268,7 @@ }, "flake-utils-plus": { "inputs": { - "flake-utils": "flake-utils_6" + "flake-utils": "flake-utils_4" }, "locked": { "lastModified": 1696331477, @@ -375,14 +319,14 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_5" + "systems": "systems_6" }, "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -393,7 +337,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_6" + "systems": "systems_8" }, "locked": { "lastModified": 1681202837, @@ -411,43 +355,7 @@ }, "flake-utils_6": { "inputs": { - "systems": "systems_8" - }, - "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_7": { - "inputs": { - "systems": "systems_10" - }, - "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_8": { - "inputs": { - "systems": "systems_11" + "systems": "systems_9" }, "locked": { "lastModified": 1710146030, @@ -652,29 +560,6 @@ "type": "github" } }, - "maildir-notify-daemon": { - "inputs": { - "advisory-db": "advisory-db_2", - "crane": "crane_2", - "flake-utils": "flake-utils_5", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1683946606, - "narHash": "sha256-nzI8XDjf7Q0NZdVuxEvkkU4x0w229DmJZAN2yB92oMc=", - "owner": "lelgenio", - "repo": "maildir-notify-daemon", - "rev": "f609cbd6dd6accce8f24594bc2e13822023e3d79", - "type": "github" - }, - "original": { - "owner": "lelgenio", - "repo": "maildir-notify-daemon", - "type": "github" - } - }, "material-wifi-icons": { "flake": false, "locked": { @@ -759,7 +644,7 @@ }, "nixos-conf-editor": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "nixpkgs": "nixpkgs_3", "snowfall-lib": "snowfall-lib" }, @@ -780,7 +665,7 @@ "nixos-mailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_4", "nixpkgs": [ "nixpkgs" ], @@ -920,7 +805,6 @@ "home-manager": "home-manager_2", "hyprland": "hyprland", "lipsum": "lipsum", - "maildir-notify-daemon": "maildir-notify-daemon", "material-wifi-icons": "material-wifi-icons", "nix-index-database": "nix-index-database", "nix-software-center": "nix-software-center", @@ -977,36 +861,9 @@ "type": "github" } }, - "rust-overlay_2": { - "inputs": { - "flake-utils": [ - "maildir-notify-daemon", - "crane", - "flake-utils" - ], - "nixpkgs": [ - "maildir-notify-daemon", - "crane", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1683080331, - "narHash": "sha256-nGDvJ1DAxZIwdn6ww8IFwzoHb2rqBP4wv/65Wt5vflk=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "d59c3fa0cba8336e115b376c2d9e91053aa59e56", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "snowfall-lib": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_3", "flake-utils-plus": "flake-utils-plus", "nixpkgs": [ "nixos-conf-editor", @@ -1042,36 +899,6 @@ "type": "github" } }, - "systems_10": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_11": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -1194,7 +1021,7 @@ }, "tlauncher": { "inputs": { - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_5", "nixpkgs": [ "nixpkgs" ] @@ -1215,7 +1042,7 @@ }, "utils": { "inputs": { - "systems": "systems_7" + "systems": "systems_5" }, "locked": { "lastModified": 1689068808, @@ -1233,7 +1060,7 @@ }, "utils_2": { "inputs": { - "systems": "systems_9" + "systems": "systems_7" }, "locked": { "lastModified": 1709126324, @@ -1251,7 +1078,7 @@ }, "wl-crosshair": { "inputs": { - "flake-utils": "flake-utils_8", + "flake-utils": "flake-utils_6", "nixpkgs": [ "nixpkgs" ] diff --git a/flake.nix b/flake.nix index 44746ce..bc4963b 100644 --- a/flake.nix +++ b/flake.nix @@ -55,10 +55,6 @@ url = "github:lelgenio/demoji"; inputs.nixpkgs.follows = "nixpkgs"; }; - maildir-notify-daemon = { - url = "github:lelgenio/maildir-notify-daemon"; - inputs.nixpkgs.follows = "nixpkgs"; - }; wl-crosshair = { url = "github:lelgenio/wl-crosshair"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/overlays/default.nix b/overlays/default.nix index 8d4046b..8e09aeb 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -50,7 +50,6 @@ rec { dhist = inputs.dhist.packages.${prev.system}.dhist; demoji = inputs.demoji.packages.${prev.system}.default; tlauncher = inputs.tlauncher.packages.${prev.system}.tlauncher; - maildir-notify-daemon = inputs.maildir-notify-daemon.packages.${prev.system}.default; wl-crosshair = inputs.wl-crosshair.packages.${prev.system}.default; } ); diff --git a/user/desktop-entries.nix b/user/desktop-entries.nix index 1b809d3..c513d45 100644 --- a/user/desktop-entries.nix +++ b/user/desktop-entries.nix @@ -41,24 +41,6 @@ TryExec = "kak"; }; }; - neomutt = { - name = "Neomutt"; - genericName = "Email Client"; - comment = "View and Send Emails"; - exec = "neomutt %U"; - terminal = true; - type = "Application"; - icon = "mutt"; - categories = [ - "Network" - "Email" - ]; - startupNotify = false; - mimeType = [ "x-scheme-handler/mailto" ]; - settings = { - Keywords = "Mail;E-mail;"; - }; - }; down_meme = { name = "DownMeme"; genericName = "Download memes"; From 2d5d9ffb50e3e618d70ae4c01b2fec7dc8d79e48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Tue, 11 Jun 2024 00:55:58 -0300 Subject: [PATCH 149/404] bemenu: remove obsolete patch --- overlays/default.nix | 6 ------ user/pqiv.nix | 1 - 2 files changed, 7 deletions(-) diff --git a/overlays/default.nix b/overlays/default.nix index 8e09aeb..216b5b5 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -56,12 +56,6 @@ rec { patches = ( final: prev: { - bemenu = prev.bemenu.overrideAttrs (o: { - postPatch = '' - substituteInPlace lib/renderers/wayland/window.c \ - --replace ZWLR_LAYER_SHELL_V1_LAYER_TOP ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY - ''; - }); mySway = prev.sway.override { sway-unwrapped = prev.sway-unwrapped.overrideAttrs (old: { patches = old.patches ++ [ ../patches/sway/fix-hide_cursor-clearing-focus.patch ]; diff --git a/user/pqiv.nix b/user/pqiv.nix index 70cf9de..755d417 100644 --- a/user/pqiv.nix +++ b/user/pqiv.nix @@ -32,7 +32,6 @@ let ); in { - # My bemenu wrapper xdg.configFile = { "pqivrc".text = '' [options] From 5aec52a446aa005fc43e83eb51a4bea3322339fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Tue, 11 Jun 2024 01:02:16 -0300 Subject: [PATCH 150/404] mangohud: remove obsolete patch --- overlays/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/overlays/default.nix b/overlays/default.nix index 216b5b5..5a5fdeb 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -61,14 +61,6 @@ rec { patches = old.patches ++ [ ../patches/sway/fix-hide_cursor-clearing-focus.patch ]; }); }; - mangohud = prev.mangohud.overrideAttrs (o: { - patches = o.patches ++ [ - (prev.fetchpatch { - url = "https://github.com/flightlessmango/MangoHud/commit/95141de657e02577f1d3fab0ca12122bfb68bc56.patch"; - hash = "sha256-a2tESliGBkfF7uYQn8TDgeFt07A9FOioI4VcTT7DC7A="; - }) - ]; - }); } ); From fd76de5f568f2e8d6aa4b2d4011bc921856f1485 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Tue, 11 Jun 2024 01:08:21 -0300 Subject: [PATCH 151/404] packages: extract material-wifi-icons --- flake.lock | 17 ----------------- flake.nix | 3 --- overlays/default.nix | 7 ------- pkgs/default.nix | 1 + pkgs/material-wifi-icons.nix | 16 ++++++++++++++++ 5 files changed, 17 insertions(+), 27 deletions(-) create mode 100644 pkgs/material-wifi-icons.nix diff --git a/flake.lock b/flake.lock index 403f6fa..9689596 100644 --- a/flake.lock +++ b/flake.lock @@ -560,22 +560,6 @@ "type": "github" } }, - "material-wifi-icons": { - "flake": false, - "locked": { - "lastModified": 1703850449, - "narHash": "sha256-KykU5J7SdpBDG+6rkD//XeHd+6pK3qabe+88RduhwKc=", - "owner": "dcousens", - "repo": "material-wifi-icons", - "rev": "2daf6b3d96d65beb2a3e37a9a53556aab3826d97", - "type": "github" - }, - "original": { - "owner": "dcousens", - "repo": "material-wifi-icons", - "type": "github" - } - }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -805,7 +789,6 @@ "home-manager": "home-manager_2", "hyprland": "hyprland", "lipsum": "lipsum", - "material-wifi-icons": "material-wifi-icons", "nix-index-database": "nix-index-database", "nix-software-center": "nix-software-center", "nixos-conf-editor": "nixos-conf-editor", diff --git a/flake.nix b/flake.nix index bc4963b..da9130f 100644 --- a/flake.nix +++ b/flake.nix @@ -18,9 +18,6 @@ ranger-icons.url = "github:alexanderjeurissen/ranger_devicons"; ranger-icons.flake = false; - material-wifi-icons.url = "github:dcousens/material-wifi-icons"; - material-wifi-icons.flake = false; - plymouth-themes.url = "github:adi1090x/plymouth-themes"; plymouth-themes.flake = false; diff --git a/overlays/default.nix b/overlays/default.nix index 5a5fdeb..3de7b1a 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -15,13 +15,6 @@ rec { themes = ( final: prev: { - material-wifi-icons = final.stdenv.mkDerivation rec { - name = "material-wifi-icons"; - src = inputs.material-wifi-icons; - installPhase = '' - install -D material-wifi.ttf $out/share/fonts/${name} - ''; - }; papirus_red = (final.papirus-icon-theme.override { color = "red"; }); orchis_theme_compact = ( final.orchis-theme.override { diff --git a/pkgs/default.nix b/pkgs/default.nix index 00600fc..391ab1b 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -7,4 +7,5 @@ cargo-checkmate = pkgs.callPackage ./cargo-checkmate.nix { }; lipsum = pkgs.callPackage ./lipsum.nix { inherit inputs; }; emmet-cli = pkgs.callPackage ./emmet-cli.nix { }; + material-wifi-icons = pkgs.callPackage ./material-wifi-icons.nix { }; } diff --git a/pkgs/material-wifi-icons.nix b/pkgs/material-wifi-icons.nix new file mode 100644 index 0000000..c8b0dcc --- /dev/null +++ b/pkgs/material-wifi-icons.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchFromGitHub }: +stdenv.mkDerivation rec { + pname = "material-wifi-icons"; + version = "0.0.1"; + + src = fetchFromGitHub { + owner = "dcousens"; + repo = "material-wifi-icons"; + rev = "2daf6b3d96d65beb2a3e37a9a53556aab3826d97"; + hash = "sha256-KykU5J7SdpBDG+6rkD//XeHd+6pK3qabe+88RduhwKc="; + }; + + installPhase = '' + install -D material-wifi.ttf $out/share/fonts/${pname} + ''; +} From 105d2f4359f4ad1e016209fc6cca5cf1b07b49b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Tue, 11 Jun 2024 01:10:39 -0300 Subject: [PATCH 152/404] packages: extract lipsum --- flake.lock | 17 ----------------- flake.nix | 3 --- pkgs/default.nix | 2 +- pkgs/lipsum.nix | 19 +++++++++++++++---- 4 files changed, 16 insertions(+), 25 deletions(-) diff --git a/flake.lock b/flake.lock index 9689596..9b990c7 100644 --- a/flake.lock +++ b/flake.lock @@ -544,22 +544,6 @@ "type": "github" } }, - "lipsum": { - "flake": false, - "locked": { - "lastModified": 1630421397, - "narHash": "sha256-a6uv0tJulN9cAGWxvQr8B0PUJEY8Rx4e759xzS66Xlo=", - "owner": "hannenz", - "repo": "lipsum", - "rev": "0fb31e6ede10fbd78d7652f5fb21670cddd8e3ed", - "type": "github" - }, - "original": { - "owner": "hannenz", - "repo": "lipsum", - "type": "github" - } - }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -788,7 +772,6 @@ "dzgui-nix": "dzgui-nix", "home-manager": "home-manager_2", "hyprland": "hyprland", - "lipsum": "lipsum", "nix-index-database": "nix-index-database", "nix-software-center": "nix-software-center", "nixos-conf-editor": "nixos-conf-editor", diff --git a/flake.nix b/flake.nix index da9130f..fd2fc09 100644 --- a/flake.nix +++ b/flake.nix @@ -21,9 +21,6 @@ plymouth-themes.url = "github:adi1090x/plymouth-themes"; plymouth-themes.flake = false; - lipsum.url = "github:hannenz/lipsum"; - lipsum.flake = false; - agenix = { url = "github:ryantm/agenix"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/pkgs/default.nix b/pkgs/default.nix index 391ab1b..4bfc896 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -5,7 +5,7 @@ { blade-formatter = pkgs.callPackage ./blade-formatter { }; cargo-checkmate = pkgs.callPackage ./cargo-checkmate.nix { }; - lipsum = pkgs.callPackage ./lipsum.nix { inherit inputs; }; + lipsum = pkgs.callPackage ./lipsum.nix { }; emmet-cli = pkgs.callPackage ./emmet-cli.nix { }; material-wifi-icons = pkgs.callPackage ./material-wifi-icons.nix { }; } diff --git a/pkgs/lipsum.nix b/pkgs/lipsum.nix index 427f04e..de1b75a 100644 --- a/pkgs/lipsum.nix +++ b/pkgs/lipsum.nix @@ -1,11 +1,22 @@ -{ pkgs, inputs }: -pkgs.stdenv.mkDerivation rec { +{ + stdenv, + fetchFromGitHub, + pkg-config, + vala, + wrapGAppsHook, +}: +stdenv.mkDerivation rec { pname = "lipsum"; version = "0.0.1"; - src = inputs.lipsum; + src = fetchFromGitHub { + owner = "hannenz"; + repo = "lipsum"; + rev = "0fb31e6ede10fbd78d7652f5fb21670cddd8e3ed"; + hash = "sha256-a6uv0tJulN9cAGWxvQr8B0PUJEY8Rx4e759xzS66Xlo="; + }; - nativeBuildInputs = with pkgs; [ + nativeBuildInputs = [ pkg-config vala wrapGAppsHook From b4a8a7b74fa3cbe1bc8882e6dd8aaa8ed74b481e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Tue, 11 Jun 2024 01:18:02 -0300 Subject: [PATCH 153/404] sway: remove obsolete systemd integration --- overlays/default.nix | 3 --- overlays/sway.nix | 19 ------------------- system/greetd.nix | 1 - user/sway/default.nix | 1 - 4 files changed, 24 deletions(-) delete mode 100644 overlays/sway.nix diff --git a/overlays/default.nix b/overlays/default.nix index 3de7b1a..e83ed4c 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -2,7 +2,6 @@ rec { all = [ scripts - sway themes new-packages patches @@ -11,8 +10,6 @@ rec { scripts = (import ../scripts); - sway = (import ./sway.nix); - themes = ( final: prev: { papirus_red = (final.papirus-icon-theme.override { color = "red"; }); diff --git a/overlays/sway.nix b/overlays/sway.nix deleted file mode 100644 index c6d8d5e..0000000 --- a/overlays/sway.nix +++ /dev/null @@ -1,19 +0,0 @@ -(pkgs: _: { - # bash script to let dbus know about important env variables and - # propogate them to relevent services run at the end of sway config - # see - # https://github.com/emersion/xdg-desktop-portal-wlr/wiki/"It-doesn't-work"-Troubleshooting-Checklist - # note: this is pretty much the same as /etc/sway/config.d/nixos.conf but also restarts - # some user services to make sure they have the correct environment variables - dbus-sway-environment = pkgs.writeTextFile { - name = "dbus-sway-environment"; - destination = "/bin/dbus-sway-environment"; - executable = true; - text = '' - systemctl --user import-environment - dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway SWAYSOCK - # systemctl --user stop pipewire wireplumber xdg-desktop-portal xdg-desktop-portal-wlr - # systemctl --user start pipewire wireplumber xdg-desktop-portal xdg-desktop-portal-wlr - ''; - }; -}) diff --git a/system/greetd.nix b/system/greetd.nix index b152c72..2b5f22f 100644 --- a/system/greetd.nix +++ b/system/greetd.nix @@ -45,7 +45,6 @@ in services.greetd = let greetd_main_script = pkgs.writeShellScriptBin "main" '' - ${pkgs.dbus-sway-environment}/bin/dbus-sway-environment export XDG_CURRENT_DESKTOP=sway GTK_THEME="${theme.gtk_theme}" XCURSOR_THEME="${theme.cursor_theme}" ${pkgs.greetd.gtkgreet}/bin/gtkgreet -l -c ${desktop} swaymsg exit diff --git a/user/sway/default.nix b/user/sway/default.nix index 0ad5a6b..988453d 100644 --- a/user/sway/default.nix +++ b/user/sway/default.nix @@ -101,7 +101,6 @@ in }; extraConfig = '' for_window [title=.*] inhibit_idle fullscreen - exec ${pkgs.dbus-sway-environment}/bin/dbus-sway-environment exec swaymsg workspace 2 exec_always systemctl --user restart waybar.service exec corectrl --minimize-systray From 71e882d2d82c6fd0a996b933678851895574a4e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Tue, 11 Jun 2024 01:23:05 -0300 Subject: [PATCH 154/404] flake: remove hyprland --- flake.lock | 197 +++------------------------------------------- flake.nix | 9 +-- system/nix.nix | 2 - user/home.nix | 2 - user/hyprland.nix | 136 -------------------------------- 5 files changed, 11 insertions(+), 335 deletions(-) delete mode 100644 user/hyprland.nix diff --git a/flake.lock b/flake.lock index 9b990c7..68f335b 100644 --- a/flake.lock +++ b/flake.lock @@ -319,7 +319,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1694529238, @@ -337,7 +337,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_8" + "systems": "systems_7" }, "locked": { "lastModified": 1681202837, @@ -355,7 +355,7 @@ }, "flake-utils_6": { "inputs": { - "systems": "systems_9" + "systems": "systems_8" }, "locked": { "lastModified": 1710146030, @@ -413,137 +413,6 @@ "type": "github" } }, - "hyprcursor": { - "inputs": { - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1716576411, - "narHash": "sha256-FIN1wMoyePBTtibCbaeJaoKNLuAYIGwLCWAYC1DJanw=", - "owner": "hyprwm", - "repo": "hyprcursor", - "rev": "57298fc4f13c807e50ada2c986a3114b7fc2e621", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprcursor", - "type": "github" - } - }, - "hyprland": { - "inputs": { - "hyprcursor": "hyprcursor", - "hyprlang": "hyprlang", - "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems_4", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1717605046, - "narHash": "sha256-zzdMmUNJCPY1KqVjzpukHOecae1AiAzwmBN5hq7jM2U=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "c95845b1488b4bd63e901cbdc4cb68c27a45971b", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "Hyprland", - "type": "github" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "hyprland", - "xdph", - "nixpkgs" - ], - "systems": [ - "hyprland", - "xdph", - "systems" - ] - }, - "locked": { - "lastModified": 1691753796, - "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprlang": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1716473782, - "narHash": "sha256-+qLn4lsHU6iL3+HTo1gTQ1tWzet8K9h+IfVemzEQZj8=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "87d5d984109c839482b88b4795db073eb9ed446f", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprwayland-scanner": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1716058375, - "narHash": "sha256-CwjWoVnBZE5SBpRx9dgSQGCr4Goxyfcyv3zZbOhVqzk=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "3afed4364790aebe0426077631af1e164a9650cc", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -771,7 +640,6 @@ "dhist": "dhist", "dzgui-nix": "dzgui-nix", "home-manager": "home-manager_2", - "hyprland": "hyprland", "nix-index-database": "nix-index-database", "nix-software-center": "nix-software-center", "nixos-conf-editor": "nixos-conf-editor", @@ -897,16 +765,16 @@ }, "systems_4": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -970,21 +838,6 @@ "type": "github" } }, - "systems_9": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tlauncher": { "inputs": { "flake-utils": "flake-utils_5", @@ -1008,7 +861,7 @@ }, "utils": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1689068808, @@ -1026,7 +879,7 @@ }, "utils_2": { "inputs": { - "systems": "systems_7" + "systems": "systems_6" }, "locked": { "lastModified": 1709126324, @@ -1062,36 +915,6 @@ "repo": "wl-crosshair", "type": "github" } - }, - "xdph": { - "inputs": { - "hyprland-protocols": "hyprland-protocols", - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1716290197, - "narHash": "sha256-1u9Exrc7yx9qtES2brDh7/DDZ8w8ap1nboIOAtCgeuM=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "91e48d6acd8a5a611d26f925e51559ab743bc438", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index fd2fc09..ae7eea7 100644 --- a/flake.nix +++ b/flake.nix @@ -10,11 +10,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - hyprland = { - url = "github:hyprwm/Hyprland"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - ranger-icons.url = "github:alexanderjeurissen/ranger_devicons"; ranger-icons.flake = false; @@ -88,12 +83,10 @@ ./system/secrets.nix ./system/specialisation.nix ./system/greetd.nix - { login-manager.greetd.enable = desktop == "sway" || desktop == "hyprland"; } + { login-manager.greetd.enable = desktop == "sway"; } inputs.agenix.nixosModules.default - inputs.hyprland.nixosModules.default inputs.dzgui-nix.nixosModules.default - { programs.hyprland.enable = (desktop == "hyprland"); } inputs.home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; diff --git a/system/nix.nix b/system/nix.nix index ac8a8be..c91e362 100644 --- a/system/nix.nix +++ b/system/nix.nix @@ -30,7 +30,6 @@ in "https://cache.nixos.org" "https://nix-community.cachix.org" # "http://nixcache.lelgenio.1337.cx:5000" - "https://hyprland.cachix.org" "https://lelgenio.cachix.org" "https://wegank.cachix.org" "https://snowflakeos.cachix.org/" @@ -39,7 +38,6 @@ in "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" # "nixcache.lelgenio.1337.cx:zxCfx7S658llDgAUG0JVyNrlAdFVvPniSdDOkvfTPS8=" - "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" "lelgenio.cachix.org-1:W8tMlmDFLU/V+6DlChXjekxoHZpjgVHZpmusC4cueBc=" "wegank.cachix.org-1:xHignps7GtkPP/gYK5LvA/6UFyz98+sgaxBSy7qK0Vs=" "snowflakeos.cachix.org-1:gXb32BL86r9bw1kBiw9AJuIkqN49xBvPd1ZW8YlqO70=" diff --git a/user/home.nix b/user/home.nix index 4efdd01..0fe2422 100644 --- a/user/home.nix +++ b/user/home.nix @@ -15,7 +15,6 @@ ./vscode ./fish ./firefox.nix - ./hyprland.nix ./alacritty.nix ./git.nix ./ssh.nix @@ -41,7 +40,6 @@ ./gnome.nix ./thunar.nix ./xdg-dirs.nix - inputs.hyprland.homeManagerModules.default inputs.nix-index-database.hmModules.nix-index ../settings ]; diff --git a/user/hyprland.nix b/user/hyprland.nix deleted file mode 100644 index 721e14b..0000000 --- a/user/hyprland.nix +++ /dev/null @@ -1,136 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: -{ - config = lib.mkIf (config.my.desktop == "hyprland") { - wayland.windowManager.hyprland = { - enable = false; - extraConfig = '' - monitor=,preferred,auto,1 - - input { - kb_file= - kb_layout=us(colemak) - kb_variant= - kb_model= - kb_options= - kb_rules= - - follow_mouse=1 - - touchpad { - natural_scroll=no - } - } - - general { - sensitivity=1.0 # for mouse cursor - main_mod=SUPER - - gaps_in=5 - gaps_out=10 - border_size=2 - col.active_border=0xffF44336 - col.inactive_border=0x66333333 - - apply_sens_to_raw=0 # whether to apply the sensitivity to raw input (e.g. used by games where you aim using your mouse) - - damage_tracking=full # leave it on full unless you hate your GPU and want to make it suffer - } - - decoration { - rounding=5 - blur=1 - blur_size=3 # minimum 1 - blur_passes=1 # minimum 1, more passes = more resource intensive. - # Your blur "amount" is blur_size * blur_passes, but high blur_size (over around 5-ish) will produce artifacts. - # if you want heavy blur, you need to up the blur_passes. - # the more passes, the more you can up the blur_size without noticing artifacts. - } - - animations { - enabled=1 - animation=windows,1,7,default - animation=border,1,10,default - animation=fade,1,10,default - animation=workspaces,1,6,default - } - - dwindle { - pseudotile=0 # enable pseudotiling on dwindle - } - - gestures { - workspace_swipe=no - } - - # example window rules - # for windows named/classed as abc and xyz - #windowrule=move 69 420,abc - #windowrule=size 420 69,abc - #windowrule=tile,xyz - #windowrule=float,abc - #windowrule=pseudo,abc - #windowrule=monitor 0,xyz - - # example binds - bind=SUPER,Q,exec,kitty - bind=SUPER,RETURN,exec,alacritty - bind=SUPER,x,killactive, - bind=SUPER,M,exit, - # bind=SUPER,E,exec,dolphin - bind=SUPER,V,togglefloating, - bind=SUPER,s,exec,wlauncher - bind=SUPER,P,pseudo, - - bind=SUPER,f,fullscreen - - bind=SUPER,n,movefocus,l - bind=SUPER,o,movefocus,r - bind=SUPER,i,movefocus,u - bind=SUPER,e,movefocus,d - - bind=SUPER,left,movefocus,l - bind=SUPER,right,movefocus,r - bind=SUPER,up,movefocus,u - bind=SUPER,down,movefocus,d - - bind=SUPER,1,workspace,1 - bind=SUPER,2,workspace,2 - bind=SUPER,3,workspace,3 - bind=SUPER,4,workspace,4 - bind=SUPER,5,workspace,5 - bind=SUPER,6,workspace,6 - bind=SUPER,7,workspace,7 - bind=SUPER,8,workspace,8 - bind=SUPER,9,workspace,9 - bind=SUPER,0,workspace,10 - - bind=ALT,1,movetoworkspace,1 - bind=ALT,2,movetoworkspace,2 - bind=ALT,3,movetoworkspace,3 - bind=ALT,4,movetoworkspace,4 - bind=ALT,5,movetoworkspace,5 - bind=ALT,6,movetoworkspace,6 - bind=ALT,7,movetoworkspace,7 - bind=ALT,8,movetoworkspace,8 - bind=ALT,9,movetoworkspace,9 - bind=ALT,0,movetoworkspace,10 - - bind=SUPER,u,workspace,e-1 - bind=SUPER,y,workspace,e+1 - - bind=SUPER,mouse_down,workspace,e-1 - bind=SUPER,mouse_up,workspace,e+1 - ''; - }; - home.file.".config/eww".source = ./eww; - home.packages = with pkgs; [ - eww-wayland - jq - ]; - }; -} From c4a82f770f8946ae88bca8376285bdba10bdd9f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Tue, 11 Jun 2024 09:30:29 -0300 Subject: [PATCH 155/404] docker: format config --- system/containers.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/system/containers.nix b/system/containers.nix index 377647d..19698e5 100644 --- a/system/containers.nix +++ b/system/containers.nix @@ -1,10 +1,18 @@ { pkgs, ... }: { services.flatpak.enable = true; - virtualisation.docker.enable = true; - virtualisation.docker.autoPrune.enable = true; - virtualisation.docker.autoPrune.dates = "monthly"; - virtualisation.docker.autoPrune.flags = [ "--all --volumes" ]; + + virtualisation.docker = { + enable = true; + autoPrune = { + enable = true; + dates = "monthly"; + flags = [ + "--all" + "--volumes" + ]; + }; + }; programs.extra-container.enable = true; From 858062dd6037b307e482d31e3e9fa836fd70c2c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Tue, 11 Jun 2024 11:53:17 -0300 Subject: [PATCH 156/404] firefox: install return_youtube_dislikes --- user/firefox.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/user/firefox.nix b/user/firefox.nix index 207ebb6..0fab5dd 100644 --- a/user/firefox.nix +++ b/user/firefox.nix @@ -54,6 +54,12 @@ in url = "https://addons.mozilla.org/firefox/downloads/file/4050795/youtube_recommended_videos-1.6.2.xpi"; hash = "sha256-xMuglNassZb9WqjfEGg6WeuhMACRuYqQor+iX1dEdsE="; }) + (pkgs.fetchFirefoxAddon { + name = "return_youtube_dislikes"; + url = "https://addons.mozilla.org/firefox/downloads/file/4208483/return_youtube_dislikes-3.0.0.14.xpi"; + hash = "sha256-oxqyNUmEa36rkqCU6S34NJBHtIu9gH8GnRKAg8Oyf2E="; + }) + (pkgs.fetchFirefoxAddon { name = "mastodon_simplified_federation"; url = "https://addons.mozilla.org/firefox/downloads/file/4215691/mastodon_simplified_federation-2.2.xpi"; From 24c200982e082a71ef3f311c426a801f8b1e21dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Tue, 11 Jun 2024 11:55:14 -0300 Subject: [PATCH 157/404] flake: de-depulicate flake inputs --- flake.lock | 113 ++++++++++------------------------------------------- flake.nix | 13 +++++- 2 files changed, 31 insertions(+), 95 deletions(-) diff --git a/flake.lock b/flake.lock index 68f335b..f7f8c3c 100644 --- a/flake.lock +++ b/flake.lock @@ -19,7 +19,9 @@ "agenix": { "inputs": { "darwin": "darwin", - "home-manager": "home-manager", + "home-manager": [ + "home-manager" + ], "nixpkgs": [ "nixpkgs" ], @@ -148,14 +150,16 @@ }, "dzgui-nix": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1715128199, - "narHash": "sha256-mj23cBtiDKy3pgg+J26UA8giZgmJApO8IQlC6+XTAx8=", + "lastModified": 1718144257, + "narHash": "sha256-rgRnU05sgqdDpxF3n6oaGUOGbW0xehijrBNr3DJnN3U=", "owner": "lelgenio", "repo": "dzgui-nix", - "rev": "03968bade43d23c47e8b4f102c711c171c446645", + "rev": "c0aa386e8c08946dc2b8713e59a77cb6079a0b62", "type": "github" }, "original": { @@ -372,27 +376,6 @@ } }, "home-manager": { - "inputs": { - "nixpkgs": [ - "agenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1703113217, - "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -436,7 +419,9 @@ "nix-software-center": { "inputs": { "nixos-appstream-data": "nixos-appstream-data", - "nixpkgs": "nixpkgs_2", + "nixpkgs": [ + "nixpkgs" + ], "utils": "utils" }, "locked": { @@ -482,7 +467,9 @@ "nixos-conf-editor": { "inputs": { "flake-compat": "flake-compat_2", - "nixpkgs": "nixpkgs_3", + "nixpkgs": [ + "nixpkgs" + ], "snowfall-lib": "snowfall-lib" }, "locked": { @@ -506,7 +493,9 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-24_05": "nixpkgs-24_05", + "nixpkgs-24_05": [ + "nixpkgs" + ], "utils": "utils_2" }, "locked": { @@ -525,68 +514,6 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 1714562304, - "narHash": "sha256-Mr3U37Rh6tH0FbaDFu0aZDwk9mPAe7ASaqDOGgLqqLU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "bcd44e224fd68ce7d269b4f44d24c2220fd821e7", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixpkgs-unstable", - "type": "indirect" - } - }, - "nixpkgs-24_05": { - "locked": { - "lastModified": 1717144377, - "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "805a384895c696f802a9bf5bf4720f37385df547", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-24.05", - "type": "indirect" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1692638711, - "narHash": "sha256-J0LgSFgJVGCC1+j5R2QndadWI1oumusg6hCtYAzLID4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "91a22f76cd1716f9d0149e8a5c68424bb691de15", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1698318101, - "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "63678e9f3d3afecfeafa0acead6239cdb447574c", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1717281328, "narHash": "sha256-evZPzpf59oNcDUXxh2GHcxHkTEG4fjae2ytWP85jXRo=", @@ -639,12 +566,12 @@ "demoji": "demoji", "dhist": "dhist", "dzgui-nix": "dzgui-nix", - "home-manager": "home-manager_2", + "home-manager": "home-manager", "nix-index-database": "nix-index-database", "nix-software-center": "nix-software-center", "nixos-conf-editor": "nixos-conf-editor", "nixos-mailserver": "nixos-mailserver", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs", "plymouth-themes": "plymouth-themes", "ranger-icons": "ranger-icons", "tlauncher": "tlauncher", diff --git a/flake.nix b/flake.nix index ae7eea7..efe0d7a 100644 --- a/flake.nix +++ b/flake.nix @@ -19,15 +19,18 @@ agenix = { url = "github:ryantm/agenix"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.home-manager.follows = "home-manager"; }; nixos-mailserver = { url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs-24_05.follows = "nixpkgs"; }; dzgui-nix = { url = "github:lelgenio/dzgui-nix"; + inputs.nixpkgs.follows = "nixpkgs"; }; tlauncher = { @@ -50,8 +53,14 @@ }; # gnome stuff - nixos-conf-editor.url = "github:vlinkz/nixos-conf-editor"; - nix-software-center.url = "github:vlinkz/nix-software-center"; + nixos-conf-editor = { + url = "github:vlinkz/nixos-conf-editor"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nix-software-center = { + url = "github:vlinkz/nix-software-center"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = inputs: From f8b341422f756a2a46b7c381140ee4dfc719579a Mon Sep 17 00:00:00 2001 From: lelgenio Date: Wed, 12 Jun 2024 17:44:27 -0300 Subject: [PATCH 158/404] update --- flake.lock | 18 +++++++++--------- hosts/double-rainbow.nix | 6 ++++++ 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index f7f8c3c..d51c314 100644 --- a/flake.lock +++ b/flake.lock @@ -403,11 +403,11 @@ ] }, "locked": { - "lastModified": 1717297675, - "narHash": "sha256-43UmlS1Ifx17y93/Vc258U7bOlAAIZbu8dsGDHOIIr0=", + "lastModified": 1718011381, + "narHash": "sha256-sFXI+ZANp/OC+MwfJoZgPSf4xMdtzQMe1pS3FGti4C8=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "972a52bee3991ae1f1899e6452e0d7c01ee566d9", + "rev": "88ad3d7501e22b2401dd72734b032b7baa794434", "type": "github" }, "original": { @@ -499,11 +499,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1717515260, - "narHash": "sha256-UJhSsczeTpRpoXICuRk++NORXE2qNTEwOn0rL3uTJ3E=", + "lastModified": 1718084203, + "narHash": "sha256-Cx1xoVfSMv1XDLgKg08CUd1EoTYWB45VmB9XIQzhmzI=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "b51ae1a235353ffdfa9f5874e6aea32e367a5739", + "rev": "29916981e7b3b5782dc5085ad18490113f8ff63b", "type": "gitlab" }, "original": { @@ -515,11 +515,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1717281328, - "narHash": "sha256-evZPzpf59oNcDUXxh2GHcxHkTEG4fjae2ytWP85jXRo=", + "lastModified": 1718086528, + "narHash": "sha256-hoB7B7oPgypePz16cKWawPfhVvMSXj4G/qLsfFuhFjw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b3b2b28c1daa04fe2ae47c21bb76fd226eac4ca1", + "rev": "47b604b07d1e8146d5398b42d3306fdebd343986", "type": "github" }, "original": { diff --git a/hosts/double-rainbow.nix b/hosts/double-rainbow.nix index be5dd48..e33b612 100644 --- a/hosts/double-rainbow.nix +++ b/hosts/double-rainbow.nix @@ -46,6 +46,12 @@ in swapDevices = [ ]; + services.udev.extraRules = '' + # Force all disks to use mq-deadline scheduler + # For some reason "noop" is used by default which is kinda bad when io is saturated + ACTION=="add|change", KERNEL=="sd[a-z]*[0-9]*|mmcblk[0-9]*p[0-9]*|nvme[0-9]*n[0-9]*p[0-9]*", ATTR{../queue/scheduler}="mq-deadline" + ''; + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's # still possible to use this option, but it's recommended to use it in conjunction From 115a1486efe41f354a47f21bbfb30b83be0990e2 Mon Sep 17 00:00:00 2001 From: lelgenio Date: Wed, 12 Jun 2024 23:36:18 -0300 Subject: [PATCH 159/404] firefox: force sidebar to the right --- user/firefox.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/user/firefox.nix b/user/firefox.nix index 0fab5dd..3b127b4 100644 --- a/user/firefox.nix +++ b/user/firefox.nix @@ -93,6 +93,7 @@ in "devtools.theme" = "auto"; "toolkit.legacyUserProfileCustomizations.stylesheets" = true; "browser.tabs.inTitlebar" = if desktop == "sway" then 0 else 1; + "sidebar.position_start" = false; # Move sidebar to the right # enable media RDD to allow gpu acceleration "media.rdd-ffmpeg.enabled" = true; From fea1f63b5d12d5a6bef70f58963958801842eb45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 13 Jun 2024 11:50:32 -0300 Subject: [PATCH 160/404] vscode: use fhs version --- user/vscode/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/vscode/default.nix b/user/vscode/default.nix index 35d972b..a477666 100644 --- a/user/vscode/default.nix +++ b/user/vscode/default.nix @@ -3,7 +3,7 @@ programs.vscode = { enable = true; - package = pkgs.vscodium; + package = pkgs.vscodium-fhs; extensions = with pkgs.vscode-extensions; [ jnoortheen.nix-ide github.github-vscode-theme From 3e6b7853b97a592732c798554cc03fa2143a8461 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 13 Jun 2024 11:51:00 -0300 Subject: [PATCH 161/404] flake: remove specialisations --- flake.nix | 1 - system/specialisation.nix | 21 --------------------- 2 files changed, 22 deletions(-) delete mode 100644 system/specialisation.nix diff --git a/flake.nix b/flake.nix index efe0d7a..8e17499 100644 --- a/flake.nix +++ b/flake.nix @@ -90,7 +90,6 @@ { nixpkgs.pkgs = pkgs; } ./system/configuration.nix ./system/secrets.nix - ./system/specialisation.nix ./system/greetd.nix { login-manager.greetd.enable = desktop == "sway"; } diff --git a/system/specialisation.nix b/system/specialisation.nix deleted file mode 100644 index 23b410f..0000000 --- a/system/specialisation.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ pkgs, ... }: -{ - specialisation.dark-theme.configuration = { - nixpkgs.overlays = [ (final: prev: { uservars = prev.uservars; }) ]; - }; - specialisation.light-theme.configuration = { - nixpkgs.overlays = [ - (final: prev: { - uservars = prev.uservars // rec { - theme = prev.uservars.themes.light; - color = theme.color; - }; - }) - ]; - }; - environment.systemPackages = [ - (pkgs.writeShellScriptBin "theme" '' - sudo "/nix/var/nix/profiles/system/specialisation/$1-theme/bin/switch-to-configuration" test - '') - ]; -} From 59724dc47dd61faca079243186c538f68207daf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 13 Jun 2024 21:14:58 -0300 Subject: [PATCH 162/404] monolith: remove bigboy mounts --- hosts/monolith.nix | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/hosts/monolith.nix b/hosts/monolith.nix index 5f1bc66..262f19a 100644 --- a/hosts/monolith.nix +++ b/hosts/monolith.nix @@ -141,22 +141,6 @@ in fsType = "btrfs"; options = [ "nofail" ] ++ btrfs_options ++ btrfs_ssd; }; - fileSystems."/home/lelgenio/projects" = { - device = "/dev/disk/by-label/BTRFS_BIGBOY"; - fsType = "btrfs"; - options = [ - "subvol=@projects" - "nofail" - ] ++ btrfs_options ++ btrfs_ssd; - }; - fileSystems."/var/lib/docker" = { - device = "/dev/disk/by-label/BTRFS_BIGBOY"; - fsType = "btrfs"; - options = [ - "subvol=@docker" - "nofail" - ] ++ btrfs_options ++ btrfs_ssd; - }; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's From a48c51b9203614e9214a0858d84b03177b093fad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 23 Feb 2023 19:18:15 -0300 Subject: [PATCH 163/404] add disko --- flake.nix | 4 +++ hosts/partition/i15.nix | 41 +++++++++++++++++++++++++++ install/i15.sh | 63 ----------------------------------------- 3 files changed, 45 insertions(+), 63 deletions(-) create mode 100644 hosts/partition/i15.nix delete mode 100644 install/i15.sh diff --git a/flake.nix b/flake.nix index 8e17499..b6d2153 100644 --- a/flake.nix +++ b/flake.nix @@ -38,6 +38,9 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + inputs.disko.url = "github:nix-community/disko"; + inputs.disko.inputs.nixpkgs.follows = "nixpkgs"; + # my stuff dhist = { url = "github:lelgenio/dhist"; @@ -96,6 +99,7 @@ inputs.agenix.nixosModules.default inputs.dzgui-nix.nixosModules.default inputs.home-manager.nixosModules.home-manager + inputs.disko.nixosModules.disko { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; diff --git a/hosts/partition/i15.nix b/hosts/partition/i15.nix new file mode 100644 index 0000000..f97dad3 --- /dev/null +++ b/hosts/partition/i15.nix @@ -0,0 +1,41 @@ +{ disks ? [ "/dev/sda" ], ... }: { + disk.sda = { + type = "disk"; + device = builtins.elemAt disks 0; + content = { + type = "table"; + format = "gpt"; + partitions = [ + { + type = "partition"; + name = "NIX_BOOT"; + start = "1MiB"; + end = "1GiB"; + bootable = true; + content = { + type = "filesystem"; + format = "vfat"; + mountpoint = "/boot"; + options = [ "defaults" ]; + }; + } + { + type = "partition"; + name = "NIX_CRYPT_ROOT"; + start = "1GiB"; + end = "100%"; + content = { + type = "luks"; + name = "main"; + content = { + type = "btrfs"; + name = "BTRFS_ROOT"; + mountpoint = "/"; + subvolumes = [ "/home" "/nixos" "/swap" ]; + }; + }; + } + ]; + }; + }; +} diff --git a/install/i15.sh b/install/i15.sh deleted file mode 100644 index 72a5ac6..0000000 --- a/install/i15.sh +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/sh - -set -xe - -settle() { - udevadm trigger --subsystem-match=block - udevadm settle -} - -lsblk -echo 'Enter the name of the device to WIPE and install (something like "sda"):' -read DRIVE_ID - -echo 'Enter a passphrase to encrypt the disk:' -read -s DRIVE_PASSPHRASE - -echo "Creating partition table..." -parted -s "/dev/${DRIVE_ID}" -- mklabel gpt - -echo "Creating EFI system partition..." -parted -s "/dev/${DRIVE_ID}" -- mkpart ESP 1MiB 1GiB -parted -s "/dev/${DRIVE_ID}" -- set 1 boot on -mkfs.fat -F32 "/dev/${DRIVE_ID}1" -n NIX_BOOT - -echo "Creating encrypted root partition..." -parted -s "/dev/${DRIVE_ID}" -- mkpart luks 1GiB 100% -echo "$DRIVE_PASSPHRASE" | cryptsetup --batch-mode luksFormat --label CRYPT_ROOT "/dev/${DRIVE_ID}2" -settle -echo "$DRIVE_PASSPHRASE" | cryptsetup luksOpen /dev/disk/by-label/CRYPT_ROOT "crypt_root" - -echo "Creating btrfs partition..." -mkfs.btrfs --quiet --label NIX_ROOT /dev/mapper/"crypt_root" -MNTPOINT=$(mktemp -d) -mount /dev/mapper/"crypt_root" "$MNTPOINT" - -echo "Creating subvolumes..." -btrfs subvolume create "$MNTPOINT"/@nixos -btrfs subvolume create "$MNTPOINT"/@home -btrfs subvolume create "$MNTPOINT"/@swap - -echo "Closing btrfs partition..." -umount -Rl "$MNTPOINT" -rm -rf "$MNTPOINT" - -echo "Mounting root btrfs submodule to '$MNTPOINT' ..." -MNTPOINT=$(mktemp -d) -mount /dev/disk/by-label/NIX_ROOT "$MNTPOINT" -o subvol=@nixos,noatime,compress=zstd - -echo "Creating and mounting EFI system partition mountpoint..." -mkdir -p "$MNTPOINT/boot" -mount /dev/disk/by-label/NIX_BOOT "$MNTPOINT/boot" - -echo "Creating home partition mountpoint..." -mkdir -p "$MNTPOINT/home" -mount /dev/disk/by-label/NIX_ROOT "$MNTPOINT/home" -o subvol=@home,noatime,compress=zstd - -echo "Swapfile" -mkdir -p "$MNTPOINT/swap" -mount /dev/disk/by-label/NIX_ROOT "$MNTPOINT/swap" -o subvol=@swap,noatime - -# echo "Installing system..." -nixos-generate-config --root "$MNTPOINT" -# nixos-install --root "$MNTPOINT" From 386fb53ba8b082127558986a2b596df0bfef8c40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 24 Feb 2023 11:59:17 -0300 Subject: [PATCH 164/404] Add disko --- flake.nix | 13 +++++---- hosts/i15/default.nix | 25 +++++++++++++++++ hosts/i15/partitions-test.nix | 14 ++++++++++ .../{partition/i15.nix => i15/partitions.nix} | 28 +++++++++++++------ hosts/{monolith.nix => monolith/default.nix} | 0 hosts/{pixie.nix => pixie/default.nix} | 0 hosts/{rainbow.nix => rainbow/default.nix} | 0 overlays/default.nix | 10 +++++++ 8 files changed, 77 insertions(+), 13 deletions(-) create mode 100644 hosts/i15/default.nix create mode 100644 hosts/i15/partitions-test.nix rename hosts/{partition/i15.nix => i15/partitions.nix} (50%) rename hosts/{monolith.nix => monolith/default.nix} (100%) rename hosts/{pixie.nix => pixie/default.nix} (100%) rename hosts/{rainbow.nix => rainbow/default.nix} (100%) diff --git a/flake.nix b/flake.nix index b6d2153..5a3d537 100644 --- a/flake.nix +++ b/flake.nix @@ -38,8 +38,8 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - inputs.disko.url = "github:nix-community/disko"; - inputs.disko.inputs.nixpkgs.follows = "nixpkgs"; + disko.url = "github:nix-community/disko"; + disko.inputs.nixpkgs.follows = "nixpkgs"; # my stuff dhist = { @@ -116,15 +116,18 @@ ++ lib.optional (desktop == "kde") ./system/kde.nix; in { + checks."${system}" = { + disko-format-i15 = pkgs.callPackage ./hosts/i15/partitions-test.nix { }; + }; nixosConfigurations = { i15 = lib.nixosSystem { inherit system specialArgs; - modules = [ ./hosts/i15.nix ] ++ common_modules; + modules = [ ./hosts/i15 ] ++ common_modules; }; monolith = lib.nixosSystem { inherit system specialArgs; modules = [ - ./hosts/monolith.nix + ./hosts/monolith ./system/monolith-gitlab-runner.nix ./system/monolith-forgejo-runner.nix ./system/nix-serve.nix @@ -134,7 +137,7 @@ rainbow = lib.nixosSystem { inherit system specialArgs; modules = [ - ./hosts/rainbow.nix + ./hosts/rainbow ./system/rainbow-gitlab-runner.nix ] ++ common_modules; }; diff --git a/hosts/i15/default.nix b/hosts/i15/default.nix new file mode 100644 index 0000000..6518e66 --- /dev/null +++ b/hosts/i15/default.nix @@ -0,0 +1,25 @@ +{ config, lib, pkgs, modulesPath, ... }: { + networking.hostName = "i15"; # Define your hostname. + + imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; + + boot.initrd.availableKernelModules = + [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_usb_sdmmc" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + disko.devices = (import ./partitions.nix { disks = [ "/dev/sda" ]; }); + boot.loader.efi.efiSysMountPoint = "/boot/efi"; + + swapDevices = [{ + device = "/swap/swapfile"; + size = (1024 * 8) + (1024 * 2); # RAM size + 2 GB + }]; + + networking.useDHCP = lib.mkDefault true; + + powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand"; + hardware.cpu.intel.updateMicrocode = + lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/hosts/i15/partitions-test.nix b/hosts/i15/partitions-test.nix new file mode 100644 index 0000000..89f06b7 --- /dev/null +++ b/hosts/i15/partitions-test.nix @@ -0,0 +1,14 @@ +{ config, lib, pkgs, ... }: +pkgs.makeDiskoTest { + name = "test-disko-i15"; + disko-config = ./partitions.nix; + enableOCR = true; + bootCommands = '' + machine.wait_for_text("[Pp]assphrase for") + machine.send_chars("secretsecret\n") + ''; + extraTestScript = '' + machine.succeed("cryptsetup isLuks /dev/vda2"); + machine.succeed("mountpoint /home"); + ''; +} diff --git a/hosts/partition/i15.nix b/hosts/i15/partitions.nix similarity index 50% rename from hosts/partition/i15.nix rename to hosts/i15/partitions.nix index f97dad3..ed7ff7e 100644 --- a/hosts/partition/i15.nix +++ b/hosts/i15/partitions.nix @@ -1,4 +1,8 @@ -{ disks ? [ "/dev/sda" ], ... }: { +{ disks ? [ "/dev/sda" ], ... }: +let + btrfs_options = [ "compress=zstd:3" "noatime" ]; +in +{ disk.sda = { type = "disk"; device = builtins.elemAt disks 0; @@ -10,28 +14,36 @@ type = "partition"; name = "NIX_BOOT"; start = "1MiB"; - end = "1GiB"; + end = "300MiB"; bootable = true; content = { type = "filesystem"; + extraArgs = [ "-n" "BOOT_I15" ]; format = "vfat"; mountpoint = "/boot"; - options = [ "defaults" ]; + # options = [ "defaults" ]; }; } { type = "partition"; - name = "NIX_CRYPT_ROOT"; - start = "1GiB"; + name = "CRYPT_I15"; + start = "300MiB"; end = "100%"; content = { type = "luks"; name = "main"; + keyFile = "/tmp/secret.key"; content = { type = "btrfs"; - name = "BTRFS_ROOT"; - mountpoint = "/"; - subvolumes = [ "/home" "/nixos" "/swap" ]; + extraArgs = [ "--label" "ROOT_I15" ]; + subvolumes = let mountOptions = btrfs_options; in { + "/home" = { inherit mountOptions; }; + "/nixos" = { + inherit mountOptions; + mountpoint = "/"; + }; + "/swap" = { inherit mountOptions; }; + }; }; }; } diff --git a/hosts/monolith.nix b/hosts/monolith/default.nix similarity index 100% rename from hosts/monolith.nix rename to hosts/monolith/default.nix diff --git a/hosts/pixie.nix b/hosts/pixie/default.nix similarity index 100% rename from hosts/pixie.nix rename to hosts/pixie/default.nix diff --git a/hosts/rainbow.nix b/hosts/rainbow/default.nix similarity index 100% rename from hosts/rainbow.nix rename to hosts/rainbow/default.nix diff --git a/overlays/default.nix b/overlays/default.nix index e83ed4c..d9f41ae 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -6,6 +6,7 @@ rec { new-packages patches lib_extended + disko ]; scripts = (import ../scripts); @@ -69,4 +70,13 @@ rec { }; } ); + + disko = final: prev: { + makeDiskoTest = + let + makeTest = import (prev.path + "/nixos/tests/make-test-python.nix"); + eval-config = import (prev.path + "/nixos/lib/eval-config.nix"); + in + (prev.callPackage "${inputs.disko}/tests/lib.nix" { inherit makeTest eval-config; }).makeDiskoTest; + }; } From 262255432f226bd9b5715006ee022f154bdb39d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 13 Jun 2024 22:01:35 -0300 Subject: [PATCH 165/404] i15 format --- hosts/i15/default.nix | 31 ++++++++++++++++++-------- hosts/i15/partitions-test.nix | 7 +++++- hosts/i15/partitions.nix | 42 ++++++++++++++++++++++++++--------- 3 files changed, 59 insertions(+), 21 deletions(-) diff --git a/hosts/i15/default.nix b/hosts/i15/default.nix index 6518e66..ca7c217 100644 --- a/hosts/i15/default.nix +++ b/hosts/i15/default.nix @@ -1,10 +1,22 @@ -{ config, lib, pkgs, modulesPath, ... }: { +{ + config, + lib, + pkgs, + modulesPath, + ... +}: +{ networking.hostName = "i15"; # Define your hostname. imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = - [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_usb_sdmmc" ]; + boot.initrd.availableKernelModules = [ + "xhci_pci" + "ahci" + "usb_storage" + "sd_mod" + "rtsx_usb_sdmmc" + ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; @@ -12,14 +24,15 @@ disko.devices = (import ./partitions.nix { disks = [ "/dev/sda" ]; }); boot.loader.efi.efiSysMountPoint = "/boot/efi"; - swapDevices = [{ - device = "/swap/swapfile"; - size = (1024 * 8) + (1024 * 2); # RAM size + 2 GB - }]; + swapDevices = [ + { + device = "/swap/swapfile"; + size = (1024 * 8) + (1024 * 2); # RAM size + 2 GB + } + ]; networking.useDHCP = lib.mkDefault true; powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand"; - hardware.cpu.intel.updateMicrocode = - lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/hosts/i15/partitions-test.nix b/hosts/i15/partitions-test.nix index 89f06b7..bb2c273 100644 --- a/hosts/i15/partitions-test.nix +++ b/hosts/i15/partitions-test.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: pkgs.makeDiskoTest { name = "test-disko-i15"; disko-config = ./partitions.nix; diff --git a/hosts/i15/partitions.nix b/hosts/i15/partitions.nix index ed7ff7e..7b69e0f 100644 --- a/hosts/i15/partitions.nix +++ b/hosts/i15/partitions.nix @@ -1,6 +1,12 @@ -{ disks ? [ "/dev/sda" ], ... }: +{ + disks ? [ "/dev/sda" ], + ... +}: let - btrfs_options = [ "compress=zstd:3" "noatime" ]; + btrfs_options = [ + "compress=zstd:3" + "noatime" + ]; in { disk.sda = { @@ -18,7 +24,10 @@ in bootable = true; content = { type = "filesystem"; - extraArgs = [ "-n" "BOOT_I15" ]; + extraArgs = [ + "-n" + "BOOT_I15" + ]; format = "vfat"; mountpoint = "/boot"; # options = [ "defaults" ]; @@ -35,15 +44,26 @@ in keyFile = "/tmp/secret.key"; content = { type = "btrfs"; - extraArgs = [ "--label" "ROOT_I15" ]; - subvolumes = let mountOptions = btrfs_options; in { - "/home" = { inherit mountOptions; }; - "/nixos" = { - inherit mountOptions; - mountpoint = "/"; + extraArgs = [ + "--label" + "ROOT_I15" + ]; + subvolumes = + let + mountOptions = btrfs_options; + in + { + "/home" = { + inherit mountOptions; + }; + "/nixos" = { + inherit mountOptions; + mountpoint = "/"; + }; + "/swap" = { + inherit mountOptions; + }; }; - "/swap" = { inherit mountOptions; }; - }; }; }; } From 9ef5b2eb8398d6c7393fe6efac9190596169c2a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 13 Jun 2024 22:43:42 -0300 Subject: [PATCH 166/404] disko: add monolith config --- flake.lock | 21 +++++ hosts/monolith/default.nix | 169 ++++++++++++++++++----------------- hosts/monolith/partition.nix | 68 ++++++++++++++ 3 files changed, 175 insertions(+), 83 deletions(-) create mode 100644 hosts/monolith/partition.nix diff --git a/flake.lock b/flake.lock index d51c314..8c9aa48 100644 --- a/flake.lock +++ b/flake.lock @@ -148,6 +148,26 @@ "type": "github" } }, + "disko": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1718242063, + "narHash": "sha256-n3AWItJ4a94GT0cray/eUV7tt3mulQ52L+lWJN9d1E8=", + "owner": "nix-community", + "repo": "disko", + "rev": "832a9f2c81ff3485404bd63952eadc17bf7ccef2", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "disko", + "type": "github" + } + }, "dzgui-nix": { "inputs": { "nixpkgs": [ @@ -565,6 +585,7 @@ "agenix": "agenix", "demoji": "demoji", "dhist": "dhist", + "disko": "disko", "dzgui-nix": "dzgui-nix", "home-manager": "home-manager", "nix-index-database": "nix-index-database", diff --git a/hosts/monolith/default.nix b/hosts/monolith/default.nix index 262f19a..ed9acbe 100644 --- a/hosts/monolith/default.nix +++ b/hosts/monolith/default.nix @@ -20,7 +20,10 @@ let ]; in { - imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ./partition.nix + ]; boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" @@ -43,8 +46,8 @@ in "amdgpu.dcdebugmask=0x10" # amdgpu undervolting bug "video=DP-1:1920x1080@144" # hibernation - "resume=LABEL=BTRFS_ROOT" # findmnt -o LABEL --noheadings /swap/ - "resume_offset=36709632" # btrfs inspect-internal map-swapfile -r /swap/swapfile + # "resume=LABEL=BTRFS_ROOT" # findmnt -o LABEL --noheadings /swap/ + # "resume_offset=36709632" # btrfs inspect-internal map-swapfile -r /swap/swapfile ]; systemd.sleep.extraConfig = '' HibernateDelaySec=30s @@ -74,73 +77,73 @@ in }; }; - fileSystems."/" = { - device = "/dev/disk/by-label/BTRFS_ROOT"; - fsType = "btrfs"; - options = [ "subvol=nixos" ] ++ btrfs_options ++ btrfs_ssd; - }; - # boot.initrd.luks.reusePassphrases = true; - boot.initrd.luks.devices = { - "main" = { - bypassWorkqueues = true; - device = "/dev/disk/by-label/CRYPT_ROOT"; - }; - "data" = { - bypassWorkqueues = true; - device = "/dev/disk/by-label/CRYPT_DATA"; - }; - "bigboy" = { - bypassWorkqueues = true; - device = "/dev/disk/by-label/CRYPT_BIGBOY"; - }; - }; - boot.loader.efi.efiSysMountPoint = "/boot/efi"; - fileSystems."/boot/efi" = { - device = "/dev/disk/by-label/NIXBOOT"; - fsType = "vfat"; - }; - fileSystems."/home" = { - device = "/dev/disk/by-label/BTRFS_ROOT"; - fsType = "btrfs"; - options = [ "subvol=home" ] ++ btrfs_options ++ btrfs_ssd; - }; - fileSystems."/home/lelgenio/Games" = { - device = "/dev/disk/by-label/BTRFS_DATA"; - fsType = "btrfs"; - options = [ - "subvol=@games" - "nofail" - ] ++ btrfs_options; - }; - fileSystems."/home/lelgenio/Downloads/Torrents" = { - device = "/dev/disk/by-label/BTRFS_DATA"; - fsType = "btrfs"; - options = [ - "subvol=@torrents" - "nofail" - ] ++ btrfs_options; - }; - fileSystems."/home/lelgenio/Música" = { - device = "/dev/disk/by-label/BTRFS_DATA"; - fsType = "btrfs"; - options = [ - "subvol=@music" - "nofail" - ] ++ btrfs_options; - }; - fileSystems."/home/lelgenio/.local/mount/data" = { - device = "/dev/disk/by-label/BTRFS_DATA"; - fsType = "btrfs"; - options = [ - "subvol=@data" - "nofail" - ] ++ btrfs_options; - }; - fileSystems."/home/lelgenio/.local/mount/bigboy" = { - device = "/dev/disk/by-label/BTRFS_BIGBOY"; - fsType = "btrfs"; - options = [ "nofail" ] ++ btrfs_options ++ btrfs_ssd; - }; + # fileSystems."/" = { + # device = "/dev/disk/by-label/BTRFS_ROOT"; + # fsType = "btrfs"; + # options = [ "subvol=nixos" ] ++ btrfs_options ++ btrfs_ssd; + # }; + # # boot.initrd.luks.reusePassphrases = true; + # boot.initrd.luks.devices = { + # "main" = { + # bypassWorkqueues = true; + # device = "/dev/disk/by-label/CRYPT_ROOT"; + # }; + # "data" = { + # bypassWorkqueues = true; + # device = "/dev/disk/by-label/CRYPT_DATA"; + # }; + # "bigboy" = { + # bypassWorkqueues = true; + # device = "/dev/disk/by-label/CRYPT_BIGBOY"; + # }; + # }; + # boot.loader.efi.efiSysMountPoint = "/boot/efi"; + # fileSystems."/boot/efi" = { + # device = "/dev/disk/by-label/NIXBOOT"; + # fsType = "vfat"; + # }; + # fileSystems."/home" = { + # device = "/dev/disk/by-label/BTRFS_ROOT"; + # fsType = "btrfs"; + # options = [ "subvol=home" ] ++ btrfs_options ++ btrfs_ssd; + # }; + # fileSystems."/home/lelgenio/Games" = { + # device = "/dev/disk/by-label/BTRFS_DATA"; + # fsType = "btrfs"; + # options = [ + # "subvol=@games" + # "nofail" + # ] ++ btrfs_options; + # }; + # fileSystems."/home/lelgenio/Downloads/Torrents" = { + # device = "/dev/disk/by-label/BTRFS_DATA"; + # fsType = "btrfs"; + # options = [ + # "subvol=@torrents" + # "nofail" + # ] ++ btrfs_options; + # }; + # fileSystems."/home/lelgenio/Música" = { + # device = "/dev/disk/by-label/BTRFS_DATA"; + # fsType = "btrfs"; + # options = [ + # "subvol=@music" + # "nofail" + # ] ++ btrfs_options; + # }; + # fileSystems."/home/lelgenio/.local/mount/data" = { + # device = "/dev/disk/by-label/BTRFS_DATA"; + # fsType = "btrfs"; + # options = [ + # "subvol=@data" + # "nofail" + # ] ++ btrfs_options; + # }; + # fileSystems."/home/lelgenio/.local/mount/bigboy" = { + # device = "/dev/disk/by-label/BTRFS_BIGBOY"; + # fsType = "btrfs"; + # options = [ "nofail" ] ++ btrfs_options ++ btrfs_ssd; + # }; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's @@ -162,17 +165,17 @@ in ''; # swap - fileSystems."/swap" = { - device = "/dev/disk/by-label/BTRFS_ROOT"; - fsType = "btrfs"; - # Note these options effect the entire BTRFS filesystem and not just this volume, - # with the exception of `"subvol=swap"`, the other options are repeated in my other `fileSystem` mounts - options = [ "subvol=swap" ] ++ btrfs_options ++ btrfs_ssd; - }; - swapDevices = [ - { - device = "/swap/swapfile"; - size = (1024 * 16) + (1024 * 2); # RAM size + 2 GB - } - ]; + # fileSystems."/swap" = { + # device = "/dev/disk/by-label/BTRFS_ROOT"; + # fsType = "btrfs"; + # # Note these options effect the entire BTRFS filesystem and not just this volume, + # # with the exception of `"subvol=swap"`, the other options are repeated in my other `fileSystem` mounts + # options = [ "subvol=swap" ] ++ btrfs_options ++ btrfs_ssd; + # }; + # swapDevices = [ + # { + # device = "/swap/swapfile"; + # size = (1024 * 16) + (1024 * 2); # RAM size + 2 GB + # } + # ]; } diff --git a/hosts/monolith/partition.nix b/hosts/monolith/partition.nix new file mode 100644 index 0000000..d75d814 --- /dev/null +++ b/hosts/monolith/partition.nix @@ -0,0 +1,68 @@ +let + btrfs_options = [ + "compress=zstd:3" + "noatime" + "x-systemd.device-timeout=0" + ]; + btrfs_ssd = btrfs_options ++ [ + "ssd" + "discard=async" + ]; +in +{ + disko.devices = { + disk = { + bigboy_disk = { + type = "disk"; + device = "/dev/nvme0n1"; + content = { + type = "gpt"; + partitions = { + ESP = { + size = "2G"; + type = "EF00"; + content = { + type = "filesystem"; + format = "vfat"; + mountpoint = "/boot"; + mountOptions = [ "defaults" ]; + }; + }; + luks = { + size = "100%"; + content = { + type = "luks"; + name = "bigboy"; + # disable settings.keyFile if you want to use interactive password entry + passwordFile = "/tmp/secret.key"; # Interactive + # settings = { + # allowDiscards = true; + # keyFile = "/tmp/secret.key"; + # }; + # additionalKeyFiles = [ "/tmp/additionalSecret.key" ]; + content = { + type = "btrfs"; + extraArgs = [ "-f" ]; + subvolumes = { + "/@nixos" = { + mountpoint = "/"; + mountOptions = btrfs_ssd; + }; + "/@home" = { + mountpoint = "/home"; + mountOptions = btrfs_ssd; + }; + "/@swap" = { + mountpoint = "/.swapvol"; + swap.swapfile.size = "32G"; + }; + }; + }; + }; + }; + }; + }; + }; + }; + }; +} From ed200c95f46a9bd091f1eda43538d44d9bab20db Mon Sep 17 00:00:00 2001 From: lelgenio Date: Sun, 16 Jun 2024 13:53:34 -0300 Subject: [PATCH 167/404] home: use vesktop --- user/chat.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user/chat.nix b/user/chat.nix index f0987ed..a68055f 100644 --- a/user/chat.nix +++ b/user/chat.nix @@ -9,14 +9,14 @@ wayland.windowManager.sway = { extraConfig = '' exec thunderbird - exec webcord + exec vesktop exec telegram-desktop ''; }; home.packages = with pkgs; [ tdesktop - webcord + vesktop thunderbird element-desktop-wayland ]; From 5be11a714e119a4ed33e0eb6e138439c61388322 Mon Sep 17 00:00:00 2001 From: lelgenio Date: Sun, 16 Jun 2024 13:53:44 -0300 Subject: [PATCH 168/404] flake: update --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 8c9aa48..80ca984 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1716561646, - "narHash": "sha256-UIGtLO89RxKt7RF2iEgPikSdU53r6v/6WYB0RW3k89I=", + "lastModified": 1718371084, + "narHash": "sha256-abpBi61mg0g+lFFU0zY4C6oP6fBwPzbHPKBGw676xsA=", "owner": "ryantm", "repo": "agenix", - "rev": "c2fc0762bbe8feb06a2e59a364fa81b3a57671c9", + "rev": "3a56735779db467538fb2e577eda28a9daacaca6", "type": "github" }, "original": { @@ -535,11 +535,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1718086528, - "narHash": "sha256-hoB7B7oPgypePz16cKWawPfhVvMSXj4G/qLsfFuhFjw=", + "lastModified": 1718208800, + "narHash": "sha256-US1tAChvPxT52RV8GksWZS415tTS7PV42KTc2PNDBmc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "47b604b07d1e8146d5398b42d3306fdebd343986", + "rev": "cc54fb41d13736e92229c21627ea4f22199fee6b", "type": "github" }, "original": { From 997726aac4f957d3b85bec670ea0496e1a1a1d86 Mon Sep 17 00:00:00 2001 From: lelgenio Date: Sun, 16 Jun 2024 13:54:10 -0300 Subject: [PATCH 169/404] auto_connect_gamepad: add delay --- scripts/auto_connect_gamepad | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/auto_connect_gamepad b/scripts/auto_connect_gamepad index 9753966..6ff45b7 100755 --- a/scripts/auto_connect_gamepad +++ b/scripts/auto_connect_gamepad @@ -22,5 +22,6 @@ while true; do sleep 10s continue fi + sleep 1s try_to_connect_to_all_controllers done From 87adf0780eb1c0b8656308bedc5f516414a03246 Mon Sep 17 00:00:00 2001 From: lelgenio Date: Sun, 16 Jun 2024 13:54:34 -0300 Subject: [PATCH 170/404] monolith: remove unnecessary hibernation params --- hosts/monolith/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/hosts/monolith/default.nix b/hosts/monolith/default.nix index ed9acbe..5cd81fd 100644 --- a/hosts/monolith/default.nix +++ b/hosts/monolith/default.nix @@ -45,9 +45,6 @@ in boot.kernelParams = [ "amdgpu.dcdebugmask=0x10" # amdgpu undervolting bug "video=DP-1:1920x1080@144" - # hibernation - # "resume=LABEL=BTRFS_ROOT" # findmnt -o LABEL --noheadings /swap/ - # "resume_offset=36709632" # btrfs inspect-internal map-swapfile -r /swap/swapfile ]; systemd.sleep.extraConfig = '' HibernateDelaySec=30s From 5d12a3467f367da0a689c2741a44c1fbc156564d Mon Sep 17 00:00:00 2001 From: lelgenio Date: Sun, 16 Jun 2024 13:55:06 -0300 Subject: [PATCH 171/404] monolith: re-enable old mounts --- hosts/monolith/default.nix | 104 ++++++++++++++++++------------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/hosts/monolith/default.nix b/hosts/monolith/default.nix index 5cd81fd..f375186 100644 --- a/hosts/monolith/default.nix +++ b/hosts/monolith/default.nix @@ -74,26 +74,26 @@ in }; }; - # fileSystems."/" = { - # device = "/dev/disk/by-label/BTRFS_ROOT"; - # fsType = "btrfs"; - # options = [ "subvol=nixos" ] ++ btrfs_options ++ btrfs_ssd; - # }; - # # boot.initrd.luks.reusePassphrases = true; - # boot.initrd.luks.devices = { - # "main" = { - # bypassWorkqueues = true; - # device = "/dev/disk/by-label/CRYPT_ROOT"; - # }; - # "data" = { - # bypassWorkqueues = true; - # device = "/dev/disk/by-label/CRYPT_DATA"; - # }; - # "bigboy" = { - # bypassWorkqueues = true; - # device = "/dev/disk/by-label/CRYPT_BIGBOY"; - # }; - # }; + fileSystems."/mnt/old" = { + device = "/dev/disk/by-label/BTRFS_ROOT"; + fsType = "btrfs"; + options = [ "nofail" ] ++ btrfs_options ++ btrfs_ssd; + }; + # boot.initrd.luks.reusePassphrases = true; + boot.initrd.luks.devices = { + "old" = { + bypassWorkqueues = true; + device = "/dev/disk/by-label/CRYPT_ROOT"; + }; + "data" = { + bypassWorkqueues = true; + device = "/dev/disk/by-label/CRYPT_DATA"; + }; + # "bigboy" = { + # bypassWorkqueues = true; + # device = "/dev/disk/by-label/CRYPT_BIGBOY"; + # }; + }; # boot.loader.efi.efiSysMountPoint = "/boot/efi"; # fileSystems."/boot/efi" = { # device = "/dev/disk/by-label/NIXBOOT"; @@ -104,38 +104,38 @@ in # fsType = "btrfs"; # options = [ "subvol=home" ] ++ btrfs_options ++ btrfs_ssd; # }; - # fileSystems."/home/lelgenio/Games" = { - # device = "/dev/disk/by-label/BTRFS_DATA"; - # fsType = "btrfs"; - # options = [ - # "subvol=@games" - # "nofail" - # ] ++ btrfs_options; - # }; - # fileSystems."/home/lelgenio/Downloads/Torrents" = { - # device = "/dev/disk/by-label/BTRFS_DATA"; - # fsType = "btrfs"; - # options = [ - # "subvol=@torrents" - # "nofail" - # ] ++ btrfs_options; - # }; - # fileSystems."/home/lelgenio/Música" = { - # device = "/dev/disk/by-label/BTRFS_DATA"; - # fsType = "btrfs"; - # options = [ - # "subvol=@music" - # "nofail" - # ] ++ btrfs_options; - # }; - # fileSystems."/home/lelgenio/.local/mount/data" = { - # device = "/dev/disk/by-label/BTRFS_DATA"; - # fsType = "btrfs"; - # options = [ - # "subvol=@data" - # "nofail" - # ] ++ btrfs_options; - # }; + fileSystems."/home/lelgenio/Games" = { + device = "/dev/disk/by-label/BTRFS_DATA"; + fsType = "btrfs"; + options = [ + "subvol=@games" + "nofail" + ] ++ btrfs_options; + }; + fileSystems."/home/lelgenio/Downloads/Torrents" = { + device = "/dev/disk/by-label/BTRFS_DATA"; + fsType = "btrfs"; + options = [ + "subvol=@torrents" + "nofail" + ] ++ btrfs_options; + }; + fileSystems."/home/lelgenio/Música" = { + device = "/dev/disk/by-label/BTRFS_DATA"; + fsType = "btrfs"; + options = [ + "subvol=@music" + "nofail" + ] ++ btrfs_options; + }; + fileSystems."/home/lelgenio/.local/mount/data" = { + device = "/dev/disk/by-label/BTRFS_DATA"; + fsType = "btrfs"; + options = [ + "subvol=@data" + "nofail" + ] ++ btrfs_options; + }; # fileSystems."/home/lelgenio/.local/mount/bigboy" = { # device = "/dev/disk/by-label/BTRFS_BIGBOY"; # fsType = "btrfs"; From 8698143a277686862255c0709ec6c98c2a9958d7 Mon Sep 17 00:00:00 2001 From: lelgenio Date: Sun, 16 Jun 2024 13:55:19 -0300 Subject: [PATCH 172/404] uesrs: add to input group --- system/users.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/system/users.nix b/system/users.nix index ead5528..4528a6a 100644 --- a/system/users.nix +++ b/system/users.nix @@ -19,6 +19,7 @@ "bluetooth" "corectrl" "vboxusers" + "input" ]; shell = pkgs.fish; openssh.authorizedKeys.keys = [ From 4d981a3dce959fd10a3a967d167aa77a99c49201 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 17 Jun 2024 10:44:10 -0300 Subject: [PATCH 173/404] update --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 80ca984..69ca0dd 100644 --- a/flake.lock +++ b/flake.lock @@ -155,11 +155,11 @@ ] }, "locked": { - "lastModified": 1718242063, - "narHash": "sha256-n3AWItJ4a94GT0cray/eUV7tt3mulQ52L+lWJN9d1E8=", + "lastModified": 1718588625, + "narHash": "sha256-8ZbrJq1jcmyzJ4SDkvd8JOZD4/fNUHpL4cpqVe4w3CU=", "owner": "nix-community", "repo": "disko", - "rev": "832a9f2c81ff3485404bd63952eadc17bf7ccef2", + "rev": "8262659fc990cecdf6a8de74c3de7b6ec58c2276", "type": "github" }, "original": { @@ -402,11 +402,11 @@ ] }, "locked": { - "lastModified": 1717527182, - "narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=", + "lastModified": 1718530513, + "narHash": "sha256-BmO8d0r+BVlwWtMLQEYnwmngqdXIuyFzMwvmTcLMee8=", "owner": "nix-community", "repo": "home-manager", - "rev": "845a5c4c073f74105022533907703441e0464bc3", + "rev": "a1fddf0967c33754271761d91a3d921772b30d0e", "type": "github" }, "original": { @@ -423,11 +423,11 @@ ] }, "locked": { - "lastModified": 1718011381, - "narHash": "sha256-sFXI+ZANp/OC+MwfJoZgPSf4xMdtzQMe1pS3FGti4C8=", + "lastModified": 1718507237, + "narHash": "sha256-xBEWCxWeRpWQggFFp8ugJCDa63cOJsVvx71R9F0Eowg=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "88ad3d7501e22b2401dd72734b032b7baa794434", + "rev": "6af2c5e58c20311276f59d247341cafeebfcb6f4", "type": "github" }, "original": { @@ -535,11 +535,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1718208800, - "narHash": "sha256-US1tAChvPxT52RV8GksWZS415tTS7PV42KTc2PNDBmc=", + "lastModified": 1718437845, + "narHash": "sha256-ZT7Oc1g4I4pHVGGjQFnewFVDRLH5cIZhEzODLz9YXeY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cc54fb41d13736e92229c21627ea4f22199fee6b", + "rev": "752c634c09ceb50c45e751f8791cb45cb3d46c9e", "type": "github" }, "original": { From 9ac2f6fdef5c97433f45d70a5ab38cef89380f4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 20 Jun 2024 23:24:59 -0300 Subject: [PATCH 174/404] mastodon: clean up media more often --- hosts/phantom/mastodon.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/phantom/mastodon.nix b/hosts/phantom/mastodon.nix index f984c65..d0dd5d3 100644 --- a/hosts/phantom/mastodon.nix +++ b/hosts/phantom/mastodon.nix @@ -18,7 +18,7 @@ }; streamingProcesses = 2; extraConfig.SINGLE_USER_MODE = "true"; - mediaAutoRemove.olderThanDays = 10; + mediaAutoRemove.olderThanDays = 5; }; age.secrets.phantom-mastodon-mailer-password = { From b2c028b1ad359094812297921e24f7e72511b366 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 21 Jun 2024 00:28:51 -0300 Subject: [PATCH 175/404] mimeapps: force associations --- user/mimeapps.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/user/mimeapps.nix b/user/mimeapps.nix index a5ddae6..be6ac1a 100644 --- a/user/mimeapps.nix +++ b/user/mimeapps.nix @@ -492,6 +492,7 @@ in { enable = true; defaultApplications = mimes; + associations.added = mimes; }; }; } From 6f19edbe7766081041cafff5ac9f643774bd259f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 21 Jun 2024 00:29:33 -0300 Subject: [PATCH 176/404] monolith: use tmpfs on /tmp --- hosts/monolith/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hosts/monolith/default.nix b/hosts/monolith/default.nix index f375186..4dcc8b7 100644 --- a/hosts/monolith/default.nix +++ b/hosts/monolith/default.nix @@ -161,6 +161,11 @@ in ACTION=="add|change", KERNEL=="sd[a-z]*[0-9]*|mmcblk[0-9]*p[0-9]*|nvme[0-9]*n[0-9]*p[0-9]*", ATTR{../queue/scheduler}="mq-deadline" ''; + boot.tmp = { + cleanOnBoot = true; + useTmpfs = true; + }; + # swap # fileSystems."/swap" = { # device = "/dev/disk/by-label/BTRFS_ROOT"; From 1e6a39732e35c5f015e82a1476d9fd54c2ca3f83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 21 Jun 2024 00:30:23 -0300 Subject: [PATCH 177/404] sway: add screen brightnes binds --- user/sway/default.nix | 1 + user/sway/sway-binds.nix | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/user/sway/default.nix b/user/sway/default.nix index 988453d..57627d6 100644 --- a/user/sway/default.nix +++ b/user/sway/default.nix @@ -146,6 +146,7 @@ in wdmenu wlauncher volumesh + brightnessctl showkeys pamixer libnotify diff --git a/user/sway/sway-binds.nix b/user/sway/sway-binds.nix index 543de59..7b33cd0 100644 --- a/user/sway/sway-binds.nix +++ b/user/sway/sway-binds.nix @@ -16,7 +16,6 @@ let _lock = pkgs.writeShellScriptBin "_lock" '' ${pkgs.sway}/bin/swaymsg mode default ${pkgs.swaylock}/bin/swaylock -f - systemctl --user start swayidle.service ''; _suspend = pkgs.writeShellScriptBin "_suspend" '' ${pkgs.sway}/bin/swaymsg mode default @@ -158,6 +157,12 @@ let "Control+Print" = "exec ${pkgs.screenshotsh}/bin/screenshotsh clip"; }; + screen_binds = { + "XF86MonBrightnessDown" = "exec brightnessctl --min-value=1 set 5%-"; + "XF86MonBrightnessUp" = "exec brightnessctl --min-value=1 set 5%+"; + "${mod}+l" = lib.getExe _lock; + }; + other_binds = { "${mod}+p" = "exec ${pkgs.wpass}/bin/wpass"; "${mod}+s" = "exec ${menu}"; @@ -196,5 +201,6 @@ in system_binds parenting_binds screenshot_binds + screen_binds ]; } From 523b873404d4b3e43513998e9778b57c0ecd93ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 21 Jun 2024 00:30:44 -0300 Subject: [PATCH 178/404] sway: enable wrappers --- overlays/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/overlays/default.nix b/overlays/default.nix index d9f41ae..2ac2ae1 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -48,6 +48,8 @@ rec { patches = ( final: prev: { mySway = prev.sway.override { + withBaseWrapper = true; + withGtkWrapper = true; sway-unwrapped = prev.sway-unwrapped.overrideAttrs (old: { patches = old.patches ++ [ ../patches/sway/fix-hide_cursor-clearing-focus.patch ]; }); From f0ac5ca8b664c540af332f72508781668370ceb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 21 Jun 2024 00:30:53 -0300 Subject: [PATCH 179/404] home: install home manager command --- user/home.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/home.nix b/user/home.nix index 0fe2422..30f556e 100644 --- a/user/home.nix +++ b/user/home.nix @@ -52,7 +52,7 @@ home.homeDirectory = "/home/lelgenio"; # Let Home Manager install and manage itself. - # programs.home-manager.enable = true; + programs.home-manager.enable = true; home.packages = with pkgs; [ # home-manager From 9ca684e342d165bce979915d2db5066a4831ba25 Mon Sep 17 00:00:00 2001 From: lelgenio Date: Fri, 21 Jun 2024 15:08:44 -0300 Subject: [PATCH 180/404] kakoune: add shortcut to keep new and head in merge --- user/kakoune/git-mode.kak | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/user/kakoune/git-mode.kak b/user/kakoune/git-mode.kak index ec4ed14..e016f1b 100644 --- a/user/kakoune/git-mode.kak +++ b/user/kakoune/git-mode.kak @@ -32,6 +32,7 @@ map global git 'N' ': git-next-merge-conflict ' -docstring 'next git me map global git 'P' ': git-prev-merge-conflict ' -docstring 'previous git merge conflict' map global git 'm' ': git-merge-head ' -docstring 'merge using head' map global git 'M' ': git-merge-new ' -docstring 'merge using new' +map global git '' ': git-merge-head-and-new ' -docstring 'merge using both head and new' map global git '' ': git-merge-original ' -docstring 'merge using original' define-command -override git-next-merge-conflict %{ @@ -92,6 +93,19 @@ define-command -override git-merge-new %{ } } -docstring "merge using new" +define-command -override git-merge-head-and-new %{ + evaluate-commands -draft %{ + # delete head marker + execute-keys ^{4,}xd + # select middle of conflict + execute-keys /^[|]{4,}x + # extendo to theirs marker + execute-keys ?^={4,}xd + # delete end marker + execute-keys /^{4,}xd + } +} -docstring "merge using head and new" + define-command -override git-graph %{ try %{ delete-buffer '*git-graph*' } edit -scratch '*git-graph*' From f8ce09485348d2841fe678eb89d3ac65682903e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 22 Jun 2024 13:45:50 -0300 Subject: [PATCH 181/404] flake: pin dzgui --- flake.lock | 24 +++++++++++++++++++++--- flake.nix | 2 +- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 69ca0dd..8ad533e 100644 --- a/flake.lock +++ b/flake.lock @@ -168,22 +168,40 @@ "type": "github" } }, + "dzgui": { + "flake": false, + "locked": { + "lastModified": 1702780245, + "narHash": "sha256-cdW5LN2Q7eYW8xIqKPQfeYPd7e6VdJGaoA9NMHesCrE=", + "owner": "aclist", + "repo": "dztui", + "rev": "28323f3edb8fa747dc559d1939ccdd7729e4e3a1", + "type": "github" + }, + "original": { + "owner": "aclist", + "repo": "dztui", + "type": "github" + } + }, "dzgui-nix": { "inputs": { + "dzgui": "dzgui", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1718144257, - "narHash": "sha256-rgRnU05sgqdDpxF3n6oaGUOGbW0xehijrBNr3DJnN3U=", + "lastModified": 1702850463, + "narHash": "sha256-qR/c/GjsLUzrCyHN/Q9nnClduf6OqTg26S1AFYKPzxA=", "owner": "lelgenio", "repo": "dzgui-nix", - "rev": "c0aa386e8c08946dc2b8713e59a77cb6079a0b62", + "rev": "2ed6515b27d8186b9fedfe1dcaf861f07e796a0d", "type": "github" }, "original": { "owner": "lelgenio", + "ref": "dzgui-4.1.0", "repo": "dzgui-nix", "type": "github" } diff --git a/flake.nix b/flake.nix index 5a3d537..25a7dae 100644 --- a/flake.nix +++ b/flake.nix @@ -29,7 +29,7 @@ }; dzgui-nix = { - url = "github:lelgenio/dzgui-nix"; + url = "github:lelgenio/dzgui-nix/dzgui-4.1.0"; inputs.nixpkgs.follows = "nixpkgs"; }; From 1c7e4004c6030f0349468c8fd09fb42b4dd54f36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 22 Jun 2024 14:20:37 -0300 Subject: [PATCH 182/404] phantom: add warthunder-leak-counter --- flake.lock | 79 ++++++++++++++++++++++- flake.nix | 4 ++ hosts/phantom/default.nix | 1 + hosts/phantom/warthunder-leak-counter.nix | 19 ++++++ 4 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 hosts/phantom/warthunder-leak-counter.nix diff --git a/flake.lock b/flake.lock index 8ad533e..6315137 100644 --- a/flake.lock +++ b/flake.lock @@ -81,6 +81,27 @@ "type": "github" } }, + "crane_2": { + "inputs": { + "nixpkgs": [ + "warthunder-leak-counter", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1718730147, + "narHash": "sha256-QmD6B6FYpuoCqu6ZuPJH896ItNquDkn0ulQlOn4ykN8=", + "owner": "ipetkov", + "repo": "crane", + "rev": "32c21c29b034d0a93fdb2379d6fabc40fc3d0e6c", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -399,6 +420,24 @@ "inputs": { "systems": "systems_8" }, + "locked": { + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_7": { + "inputs": { + "systems": "systems_9" + }, "locked": { "lastModified": 1710146030, "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", @@ -614,6 +653,7 @@ "plymouth-themes": "plymouth-themes", "ranger-icons": "ranger-icons", "tlauncher": "tlauncher", + "warthunder-leak-counter": "warthunder-leak-counter", "wl-crosshair": "wl-crosshair" } }, @@ -804,6 +844,21 @@ "type": "github" } }, + "systems_9": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tlauncher": { "inputs": { "flake-utils": "flake-utils_5", @@ -861,9 +916,31 @@ "type": "github" } }, + "warthunder-leak-counter": { + "inputs": { + "crane": "crane_2", + "flake-utils": "flake-utils_6", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1719076817, + "narHash": "sha256-B6NTomYXL50j6fabZrAGvTPp3zv5oFxNUhwvLhDNoMw=", + "ref": "refs/heads/main", + "rev": "406d6646970191c016a375f25a35aa00dfa0d4aa", + "revCount": 4, + "type": "git", + "url": "https://git.lelgenio.com/lelgenio/warthunder-leak-counter" + }, + "original": { + "type": "git", + "url": "https://git.lelgenio.com/lelgenio/warthunder-leak-counter" + } + }, "wl-crosshair": { "inputs": { - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_7", "nixpkgs": [ "nixpkgs" ] diff --git a/flake.nix b/flake.nix index 25a7dae..21caeb9 100644 --- a/flake.nix +++ b/flake.nix @@ -54,6 +54,10 @@ url = "github:lelgenio/wl-crosshair"; inputs.nixpkgs.follows = "nixpkgs"; }; + warthunder-leak-counter = { + url = "git+https://git.lelgenio.com/lelgenio/warthunder-leak-counter"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # gnome stuff nixos-conf-editor = { diff --git a/hosts/phantom/default.nix b/hosts/phantom/default.nix index 922218f..66dec30 100644 --- a/hosts/phantom/default.nix +++ b/hosts/phantom/default.nix @@ -18,6 +18,7 @@ ./writefreely.nix ./email.nix ./forgejo.nix + ./warthunder-leak-counter.nix ]; networking.hostName = "phantom"; diff --git a/hosts/phantom/warthunder-leak-counter.nix b/hosts/phantom/warthunder-leak-counter.nix new file mode 100644 index 0000000..acdbc0b --- /dev/null +++ b/hosts/phantom/warthunder-leak-counter.nix @@ -0,0 +1,19 @@ +{ + inputs, + pkgs, + config, + ... +}: +{ + imports = [ inputs.warthunder-leak-counter.nixosModules.default ]; + + services.warthunder-leak-counter.enable = true; + + services.nginx.virtualHosts."warthunder-leak-counter.lelgenio.com" = { + enableACME = true; + forceSSL = true; + locations."/" = { + proxyPass = "http://127.0.0.1:${toString config.services.warthunder-leak-counter.port}"; + }; + }; +} From c1de53fdfb59d32edca9a5ecffdd043bd0b04cbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 24 Jun 2024 11:32:54 -0300 Subject: [PATCH 183/404] firefox: install user_agent_string_switcher extension --- user/firefox.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/user/firefox.nix b/user/firefox.nix index 3b127b4..8518c3f 100644 --- a/user/firefox.nix +++ b/user/firefox.nix @@ -38,6 +38,12 @@ in url = "https://addons.mozilla.org/firefox/downloads/file/4198829/ublock_origin-1.54.0.xpi"; hash = "sha256-l5cWCQgZFxD/CFhTa6bcKeytmSPDCyrW0+XjcddZ5E0="; }) + (pkgs.fetchFirefoxAddon { + name = "user_agent_string_switcher"; + url = "https://addons.mozilla.org/firefox/downloads/file/4098688/user_agent_string_switcher-0.5.0.xpi"; + hash = "sha256-ncjaPIxG1PBNEv14nGNQH6ai9QL4WbKGk5oJDbY+rjM="; + }) + (pkgs.fetchFirefoxAddon { name = "i-still-dont-care-about-cookies"; url = "https://github.com/OhMyGuus/I-Still-Dont-Care-About-Cookies/releases/download/v1.1.4/istilldontcareaboutcookies-1.1.4.xpi"; From 871fbeafa707d85edb0c1f0be1626b7bc924db88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Tue, 25 Jun 2024 12:23:12 -0300 Subject: [PATCH 184/404] phantom: limit nix daemon to a single concurrent job --- hosts/phantom/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hosts/phantom/default.nix b/hosts/phantom/default.nix index 66dec30..db8a0bf 100644 --- a/hosts/phantom/default.nix +++ b/hosts/phantom/default.nix @@ -54,6 +54,11 @@ identityPaths = [ "/root/.ssh/id_rsa" ]; }; + nix.settings = { + cores = 1; + max-jobs = 1; + }; + system.autoUpgrade = { enable = true; dates = "04:40"; @@ -62,7 +67,7 @@ "--update-input" "nixpkgs" "--no-write-lock-file" - "-L" + "--print-build-logs" ]; flake = "git+https://git.lelgenio.com/lelgenio/nixos-config#phantom"; }; From ecc3c1ddea96b54dd863bfe6d696f69759d7e804 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 28 Jun 2024 19:28:08 -0300 Subject: [PATCH 185/404] update --- flake.lock | 18 +++++++++--------- user/fish/default.nix | 1 + 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 6315137..03069d6 100644 --- a/flake.lock +++ b/flake.lock @@ -176,11 +176,11 @@ ] }, "locked": { - "lastModified": 1718588625, - "narHash": "sha256-8ZbrJq1jcmyzJ4SDkvd8JOZD4/fNUHpL4cpqVe4w3CU=", + "lastModified": 1719451710, + "narHash": "sha256-h+bFEQHQ46pBkEsOXbxmmY6QNPPGrgpDbNlHtAKG49M=", "owner": "nix-community", "repo": "disko", - "rev": "8262659fc990cecdf6a8de74c3de7b6ec58c2276", + "rev": "8767dbf5d723b1b6834f4d09b217da7c31580d58", "type": "github" }, "original": { @@ -480,11 +480,11 @@ ] }, "locked": { - "lastModified": 1718507237, - "narHash": "sha256-xBEWCxWeRpWQggFFp8ugJCDa63cOJsVvx71R9F0Eowg=", + "lastModified": 1719111455, + "narHash": "sha256-rnIxHx+fLpydjMQsbpZ21kblUr/lMqSaAtMA4+qMMEE=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "6af2c5e58c20311276f59d247341cafeebfcb6f4", + "rev": "4293f532d0107dfb7e6f8b34a0421dc8111320e6", "type": "github" }, "original": { @@ -592,11 +592,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1718437845, - "narHash": "sha256-ZT7Oc1g4I4pHVGGjQFnewFVDRLH5cIZhEzODLz9YXeY=", + "lastModified": 1719253556, + "narHash": "sha256-A/76RFUVxZ/7Y8+OMVL1Lc8LRhBxZ8ZE2bpMnvZ1VpY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "752c634c09ceb50c45e751f8791cb45cb3d46c9e", + "rev": "fc07dc3bdf2956ddd64f24612ea7fc894933eb2e", "type": "github" }, "original": { diff --git a/user/fish/default.nix b/user/fish/default.nix index c28432e..4d4fccf 100644 --- a/user/fish/default.nix +++ b/user/fish/default.nix @@ -36,6 +36,7 @@ in shellAliases = { rm = "trash"; tree = "eza -T"; + kys = "shutdown now"; }; shellAbbrs = { off = "shutdown now"; From 16e5216814a400354ce8f345b1aa53222f2237db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 28 Jun 2024 22:50:17 -0300 Subject: [PATCH 186/404] gnome: package gnome-pass-search-provider --- pkgs/default.nix | 1 + pkgs/gnome-pass-search-provider.nix | 64 +++++++++++++++++++++++++++++ system/gnome.nix | 3 ++ user/gnome.nix | 2 + user/gpg.nix | 1 - user/sway/default.nix | 2 + 6 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 pkgs/gnome-pass-search-provider.nix diff --git a/pkgs/default.nix b/pkgs/default.nix index 4bfc896..73134c7 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -8,4 +8,5 @@ lipsum = pkgs.callPackage ./lipsum.nix { }; emmet-cli = pkgs.callPackage ./emmet-cli.nix { }; material-wifi-icons = pkgs.callPackage ./material-wifi-icons.nix { }; + gnome-pass-search-provider = pkgs.callPackage ./gnome-pass-search-provider.nix { }; } diff --git a/pkgs/gnome-pass-search-provider.nix b/pkgs/gnome-pass-search-provider.nix new file mode 100644 index 0000000..e149505 --- /dev/null +++ b/pkgs/gnome-pass-search-provider.nix @@ -0,0 +1,64 @@ +{ + stdenv, + fetchFromGitHub, + python3Packages, + wrapGAppsHook, + gtk3, + gobject-introspection, + gnome, +}: + +let + inherit (python3Packages) + dbus-python + pygobject3 + fuzzywuzzy + levenshtein + ; +in + +stdenv.mkDerivation rec { + pname = "gnome-pass-search-provider"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "jle64"; + repo = "gnome-pass-search-provider"; + rev = version; + hash = "sha256-PDR8fbDoT8IkHiTopQp0zd4DQg7JlacA6NdKYKYmrWw="; + }; + + nativeBuildInputs = [ + python3Packages.wrapPython + wrapGAppsHook + ]; + + propagatedBuildInputs = [ + dbus-python + pygobject3 + fuzzywuzzy + levenshtein + + gtk3 + gobject-introspection + ]; + + env = { + LIBDIR = builtins.placeholder "out" + "/lib"; + DATADIR = builtins.placeholder "out" + "/share"; + }; + + postPatch = '' + substituteInPlace conf/org.gnome.Pass.SearchProvider.service.{dbus,systemd} \ + --replace-fail "/usr/lib" "$LIBDIR" + ''; + + installPhase = '' + bash ./install.sh + ''; + + postFixup = '' + makeWrapperArgs=( "''${gappsWrapperArgs[@]}" ) + wrapPythonProgramsIn "$out/lib" "$out $propagatedBuildInputs" + ''; +} diff --git a/system/gnome.nix b/system/gnome.nix index 6a3509b..f56f938 100644 --- a/system/gnome.nix +++ b/system/gnome.nix @@ -30,6 +30,8 @@ hardware.opentabletdriver.enable = lib.mkForce false; + programs.gpaste.enable = true; + # services.xserver.displayManager.autologin.user = "lelgenio"; environment.systemPackages = with pkgs; @@ -40,5 +42,6 @@ chrome-gnome-shell gnomeExtensions.quick-settings-audio-devices-hider + gnome-pass-search-provider ]; } diff --git a/user/gnome.nix b/user/gnome.nix index 53dd630..4924158 100644 --- a/user/gnome.nix +++ b/user/gnome.nix @@ -49,6 +49,8 @@ lib.mkIf (config.my.desktop == "gnome") { QT_QPA_PLATFORMTHEME = "qt5ct"; }; + services.gpg-agent.pinentryPackage = pkgs.pinentry-gnome3; + xdg.defaultApplications = { enable = lib.mkForce false; }; diff --git a/user/gpg.nix b/user/gpg.nix index dc39066..f1c472f 100644 --- a/user/gpg.nix +++ b/user/gpg.nix @@ -10,7 +10,6 @@ enable = true; defaultCacheTtl = 604800; maxCacheTtl = 604800; - pinentryPackage = pkgs.pinentry-curses; extraConfig = '' allow-preset-passphrase ''; diff --git a/user/sway/default.nix b/user/sway/default.nix index 57627d6..3e86994 100644 --- a/user/sway/default.nix +++ b/user/sway/default.nix @@ -131,6 +131,8 @@ in }; }; + services.gpg-agent.pinentryPackage = pkgs.pinentry-all; + xdg.configFile."OpenTabletDriver/settings.json".source = ./open-tablet-driver.json; home.packages = with pkgs; [ From ff3df4f34db3eecea493f83b8c088a3a990b57bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 29 Jun 2024 01:32:00 -0300 Subject: [PATCH 187/404] sway: assign vesktop to chat workspace --- user/sway/sway-assigns.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/user/sway/sway-assigns.nix b/user/sway/sway-assigns.nix index 3822a22..65e1a97 100644 --- a/user/sway/sway-assigns.nix +++ b/user/sway/sway-assigns.nix @@ -44,6 +44,8 @@ in { title = "Discord"; } { class = "WebCord"; } { app_id = "WebCord"; } + { class = "vesktop"; } + { app_id = "vesktop"; } { class = "Element"; } { app_id = "Element"; } ]; From d6d9b95ab2007fe39ffc15234a76cc83d9a53d65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 29 Jun 2024 01:52:05 -0300 Subject: [PATCH 188/404] monolith: mount root --- hosts/monolith/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hosts/monolith/default.nix b/hosts/monolith/default.nix index 4dcc8b7..bf2771b 100644 --- a/hosts/monolith/default.nix +++ b/hosts/monolith/default.nix @@ -136,11 +136,11 @@ in "nofail" ] ++ btrfs_options; }; - # fileSystems."/home/lelgenio/.local/mount/bigboy" = { - # device = "/dev/disk/by-label/BTRFS_BIGBOY"; - # fsType = "btrfs"; - # options = [ "nofail" ] ++ btrfs_options ++ btrfs_ssd; - # }; + fileSystems."/home/lelgenio/.local/mount/old" = { + device = "/dev/disk/by-label/BTRFS_ROOT"; + fsType = "btrfs"; + options = [ "nofail" ] ++ btrfs_options ++ btrfs_ssd; + }; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's From ef39a83167893be88c0125831ba904e36c699642 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 1 Jul 2024 10:26:37 -0300 Subject: [PATCH 189/404] scripts: fix auto_connect_gamepad --- scripts/auto_connect_gamepad | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/auto_connect_gamepad b/scripts/auto_connect_gamepad index 6ff45b7..d373281 100755 --- a/scripts/auto_connect_gamepad +++ b/scripts/auto_connect_gamepad @@ -1,11 +1,11 @@ #!/bin/sh list_paired_controllers() { - bluetoothctl devices Paired | grep -i 'controller' | cut -d' ' -f2 + bluetoothctl devices Paired | grep 'Controller' | cut -d' ' -f2 } count_connected_controllers() { - bluetoothctl devices Connected | grep -i 'controller' | wc -l + bluetoothctl devices Connected | grep 'Controller' | wc -l } try_to_connect_to_all_controllers() { From f0dd6793fa13d1ce83c823b73ff899225c52eedb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 3 Jul 2024 12:58:04 -0300 Subject: [PATCH 190/404] firefox: switch to dev edition --- user/firefox.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user/firefox.nix b/user/firefox.nix index 8518c3f..f703486 100644 --- a/user/firefox.nix +++ b/user/firefox.nix @@ -7,7 +7,7 @@ }: let inherit (config.my) desktop browser; - bugfixedFirefox = pkgs.firefox-esr-unwrapped // { + bugfixedFirefox = pkgs.firefox-devedition-unwrapped // { requireSigning = false; allowAddonSideload = true; }; @@ -91,7 +91,7 @@ in ]; }; profiles = { - main = { + dev-edition-default = { isDefault = true; search.force = true; search.default = "DuckDuckGo"; From 8bca10051ab72d247e2e9da0a460eb5d619a7491 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 3 Jul 2024 12:59:17 -0300 Subject: [PATCH 191/404] kdenlive: fix dark theme --- user/sway/theme.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/user/sway/theme.nix b/user/sway/theme.nix index ca4ea76..3185d37 100644 --- a/user/sway/theme.nix +++ b/user/sway/theme.nix @@ -79,6 +79,13 @@ lib.mkIf (desktop == "sway") { # fixed=@Variant(\0\0\0@\0\0\0\x1c\0H\0\x61\0\x63\0k\0 \0N\0\x65\0r\0\x64\0 \0\x46\0o\0n\0t@(\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10) # general=@Variant(\0\0\0@\0\0\0\x1e\0L\0i\0\x62\0\x65\0r\0\x61\0t\0i\0o\0n\0 \0S\0\x61\0n\0s@(\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10) ''; + "kdedefaults/kdeglobals".text = '' + [General] + ColorScheme=BreezeDark + + [Icons] + Theme=${icon_theme} + ''; }; services.xsettingsd = { enable = true; From 89b758f163ba06382d444bf5c3a82f68b73ae177 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 4 Jul 2024 11:47:46 -0300 Subject: [PATCH 192/404] firefox: update ublock --- user/firefox.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user/firefox.nix b/user/firefox.nix index f703486..f5baa53 100644 --- a/user/firefox.nix +++ b/user/firefox.nix @@ -35,8 +35,8 @@ in }) (pkgs.fetchFirefoxAddon { name = "ublock-origin"; - url = "https://addons.mozilla.org/firefox/downloads/file/4198829/ublock_origin-1.54.0.xpi"; - hash = "sha256-l5cWCQgZFxD/CFhTa6bcKeytmSPDCyrW0+XjcddZ5E0="; + url = "https://addons.mozilla.org/firefox/downloads/file/4290466/ublock_origin-1.58.0.xpi"; + hash = "sha256-RwxWmUpxdNshV4rc5ZixWKXcCXDIfFz+iJrGMr0wheo="; }) (pkgs.fetchFirefoxAddon { name = "user_agent_string_switcher"; From 0150248650cbdc61b36d4b5d20ae8afb750bf669 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 6 Jul 2024 18:32:29 -0300 Subject: [PATCH 193/404] monolith: extract undervolt config --- hosts/monolith/default.nix | 9 +-------- hosts/monolith/undervolt.nix | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 8 deletions(-) create mode 100644 hosts/monolith/undervolt.nix diff --git a/hosts/monolith/default.nix b/hosts/monolith/default.nix index bf2771b..a0dd171 100644 --- a/hosts/monolith/default.nix +++ b/hosts/monolith/default.nix @@ -23,6 +23,7 @@ in imports = [ (modulesPath + "/installer/scan/not-detected.nix") ./partition.nix + ./undervolt.nix ]; boot.initrd.availableKernelModules = [ "nvme" @@ -66,14 +67,6 @@ in boot.kernelPackages = pkgs.linuxPackages_6_1; - programs.corectrl = { - enable = true; - gpuOverclock = { - enable = true; - ppfeaturemask = "0xffffffff"; - }; - }; - fileSystems."/mnt/old" = { device = "/dev/disk/by-label/BTRFS_ROOT"; fsType = "btrfs"; diff --git a/hosts/monolith/undervolt.nix b/hosts/monolith/undervolt.nix new file mode 100644 index 0000000..7666a5d --- /dev/null +++ b/hosts/monolith/undervolt.nix @@ -0,0 +1,16 @@ +{ pkgs, ... }: +let + undervoltGpu = pkgs.writeShellScript "undervolt-gpu" '' + set -xe + cd $1 + test -e pp_od_clk_voltage + echo "vo -100" > pp_od_clk_voltage + echo "c" > pp_od_clk_voltage + ''; +in +{ + boot.kernelParams = [ "amdgpu.ppfeaturemask=0xfffd7fff" ]; + services.udev.extraRules = '' + ACTION=="add", SUBSYSTEM=="hwmon", ATTR{name}=="amdgpu", ATTR{power1_cap}="186000000", RUN+="${undervoltGpu} %S%p/device" + ''; +} From 36c725400f78c4d856bcd01f1ce94a90004cf573 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 6 Jul 2024 18:41:17 -0300 Subject: [PATCH 194/404] firefox: install github auto-load extension --- user/firefox.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/user/firefox.nix b/user/firefox.nix index f5baa53..2e1a6f3 100644 --- a/user/firefox.nix +++ b/user/firefox.nix @@ -49,6 +49,11 @@ in url = "https://github.com/OhMyGuus/I-Still-Dont-Care-About-Cookies/releases/download/v1.1.4/istilldontcareaboutcookies-1.1.4.xpi"; hash = "sha256-yt6yRiLTuaK4K/QwgkL9gCVGsSa7ndFOHqZvKqIGZ5U="; }) + (pkgs.fetchFirefoxAddon { + name = "github_no_more"; + url = "https://addons.mozilla.org/firefox/downloads/file/4293306/github_no_more-0.0.1.xpi"; + hash = "sha256-1vzgo7z4K6aZAVAo5VqihYQi77mZ0rE68xbt7Oqz29s="; + }) (pkgs.fetchFirefoxAddon { name = "vimium_ff"; From bc8150a87924e5e31848612e7feeaf923fed1eb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 6 Jul 2024 18:41:32 -0300 Subject: [PATCH 195/404] qt: try to improve themes --- system/media-packages.nix | 1 + user/sway/theme.nix | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/system/media-packages.nix b/system/media-packages.nix index 818b78b..8458087 100644 --- a/system/media-packages.nix +++ b/system/media-packages.nix @@ -23,6 +23,7 @@ in gimp inkscape krita + kdePackages.breeze kdePackages.kdenlive pitivi blender-hip diff --git a/user/sway/theme.nix b/user/sway/theme.nix index 3185d37..17ac73c 100644 --- a/user/sway/theme.nix +++ b/user/sway/theme.nix @@ -48,9 +48,11 @@ lib.mkIf (desktop == "sway") { gtk3 = shared; } ); + qt = { enable = true; - platformTheme.name = "qtct"; + platformTheme.name = "gtk3"; + style.name = "qt5ct"; }; dconf.settings = { From dbe5e0196118d991f584bc53dfaba5abcd77ebd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 8 Jul 2024 02:04:58 -0300 Subject: [PATCH 196/404] monolith: fix amdgpu performance in new kernels --- hosts/monolith/default.nix | 2 -- hosts/monolith/undervolt.nix | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/monolith/default.nix b/hosts/monolith/default.nix index a0dd171..4a8d69b 100644 --- a/hosts/monolith/default.nix +++ b/hosts/monolith/default.nix @@ -65,8 +65,6 @@ in rocmPackages.rocm-smi ]; - boot.kernelPackages = pkgs.linuxPackages_6_1; - fileSystems."/mnt/old" = { device = "/dev/disk/by-label/BTRFS_ROOT"; fsType = "btrfs"; diff --git a/hosts/monolith/undervolt.nix b/hosts/monolith/undervolt.nix index 7666a5d..1bd6c28 100644 --- a/hosts/monolith/undervolt.nix +++ b/hosts/monolith/undervolt.nix @@ -3,6 +3,8 @@ let undervoltGpu = pkgs.writeShellScript "undervolt-gpu" '' set -xe cd $1 + echo "manual" > power_dpm_force_performance_level + echo "1" > pp_power_profile_mode test -e pp_od_clk_voltage echo "vo -100" > pp_od_clk_voltage echo "c" > pp_od_clk_voltage From b6bd4d79565c1b4161b1ba0e49019e12757bafa6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 11 Jul 2024 01:29:33 -0300 Subject: [PATCH 197/404] keyboard: fix capslock backspace bind for some programs --- system/configuration.nix | 1 + system/keyboard.nix | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 system/keyboard.nix diff --git a/system/configuration.nix b/system/configuration.nix index 6661e40..516a3ff 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -22,6 +22,7 @@ ./users.nix ./containers.nix ./network.nix + ./keyboard.nix ../settings ]; diff --git a/system/keyboard.nix b/system/keyboard.nix new file mode 100644 index 0000000..7691343 --- /dev/null +++ b/system/keyboard.nix @@ -0,0 +1,15 @@ +{ pkgs, lib, ... }: +{ + services.keyd = { + enable = true; + keyboards.default = { + ids = [ "*" ]; + settings = { + "main" = { + # Some programs don't respect colemaks capslock bind, so we force it here + "capslock" = "backspace"; + }; + }; + }; + }; +} From 37c13221652dd6adafe9c0243e4075467bbe5e2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 15 Jul 2024 01:45:32 -0300 Subject: [PATCH 198/404] phantom: install invidious --- hosts/phantom/default.nix | 1 + hosts/phantom/invidious.nix | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 hosts/phantom/invidious.nix diff --git a/hosts/phantom/default.nix b/hosts/phantom/default.nix index db8a0bf..a0bf560 100644 --- a/hosts/phantom/default.nix +++ b/hosts/phantom/default.nix @@ -19,6 +19,7 @@ ./email.nix ./forgejo.nix ./warthunder-leak-counter.nix + ./invidious.nix ]; networking.hostName = "phantom"; diff --git a/hosts/phantom/invidious.nix b/hosts/phantom/invidious.nix new file mode 100644 index 0000000..739d9ae --- /dev/null +++ b/hosts/phantom/invidious.nix @@ -0,0 +1,20 @@ +{ config, ... }: +{ + services.invidious = { + enable = true; + domain = "invidious.lelgenio.com"; + nginx.enable = true; + settings.db = { + user = "invidious"; + dbname = "invidious"; + }; + }; + + services.nginx = { + clientMaxBodySize = "100m"; + virtualHosts.${config.services.invidious.domain} = { + enableACME = true; + forceSSL = true; + }; + }; +} From 6642b6c663c8e810d6760b1285905be49cb3107a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 15 Jul 2024 01:45:44 -0300 Subject: [PATCH 199/404] firefox: enable invidious support --- user/firefox.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/user/firefox.nix b/user/firefox.nix index 2e1a6f3..7ea410b 100644 --- a/user/firefox.nix +++ b/user/firefox.nix @@ -61,14 +61,9 @@ in hash = "sha256-lKLX6IWWtliRdH1Ig33rVEB4DVfbeuMw0dfUPV/mSSI="; }) (pkgs.fetchFirefoxAddon { - name = "unhook"; - url = "https://addons.mozilla.org/firefox/downloads/file/4050795/youtube_recommended_videos-1.6.2.xpi"; - hash = "sha256-xMuglNassZb9WqjfEGg6WeuhMACRuYqQor+iX1dEdsE="; - }) - (pkgs.fetchFirefoxAddon { - name = "return_youtube_dislikes"; - url = "https://addons.mozilla.org/firefox/downloads/file/4208483/return_youtube_dislikes-3.0.0.14.xpi"; - hash = "sha256-oxqyNUmEa36rkqCU6S34NJBHtIu9gH8GnRKAg8Oyf2E="; + name = "invidious_redirect"; + url = "https://addons.mozilla.org/firefox/downloads/file/4292924/invidious_redirect_2-1.16.xpi"; + hash = "sha256-ApCc+MNmW9Wd/5seV6npePQVEaszT/rhD9EB7HGiUb8="; }) (pkgs.fetchFirefoxAddon { @@ -117,7 +112,7 @@ in "media.rdd-vpx.enabled" = true; "media.rdd-wav.enabled" = true; - "media.av1.enabled" = false; + "media.av1.enabled" = true; "media.ffmpeg.vaapi-drm-display.enabled" = true; "media.ffmpeg.vaapi.enabled" = true; "media.ffvpx.enabled" = true; From 8f8b0e02eab0f9e4a1ebd0d9af4ee00cdbc94ecd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 15 Jul 2024 02:16:02 -0300 Subject: [PATCH 200/404] update --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 03069d6..04d8d8f 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1718371084, - "narHash": "sha256-abpBi61mg0g+lFFU0zY4C6oP6fBwPzbHPKBGw676xsA=", + "lastModified": 1720546205, + "narHash": "sha256-boCXsjYVxDviyzoEyAk624600f3ZBo/DKtUdvMTpbGY=", "owner": "ryantm", "repo": "agenix", - "rev": "3a56735779db467538fb2e577eda28a9daacaca6", + "rev": "de96bd907d5fbc3b14fc33ad37d1b9a3cb15edc6", "type": "github" }, "original": { @@ -176,11 +176,11 @@ ] }, "locked": { - "lastModified": 1719451710, - "narHash": "sha256-h+bFEQHQ46pBkEsOXbxmmY6QNPPGrgpDbNlHtAKG49M=", + "lastModified": 1720661479, + "narHash": "sha256-nsGgA14vVn0GGiqEfomtVgviRJCuSR3UEopfP8ixW1I=", "owner": "nix-community", "repo": "disko", - "rev": "8767dbf5d723b1b6834f4d09b217da7c31580d58", + "rev": "786965e1b1ed3fd2018d78399984f461e2a44689", "type": "github" }, "original": { @@ -459,11 +459,11 @@ ] }, "locked": { - "lastModified": 1718530513, - "narHash": "sha256-BmO8d0r+BVlwWtMLQEYnwmngqdXIuyFzMwvmTcLMee8=", + "lastModified": 1720042825, + "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", "owner": "nix-community", "repo": "home-manager", - "rev": "a1fddf0967c33754271761d91a3d921772b30d0e", + "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", "type": "github" }, "original": { @@ -480,11 +480,11 @@ ] }, "locked": { - "lastModified": 1719111455, - "narHash": "sha256-rnIxHx+fLpydjMQsbpZ21kblUr/lMqSaAtMA4+qMMEE=", + "lastModified": 1720926593, + "narHash": "sha256-fW6e27L6qY6s+TxInwrS2EXZZfhMAlaNqT0sWS49qMA=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "4293f532d0107dfb7e6f8b34a0421dc8111320e6", + "rev": "5fe5b0cdf1268112dc96319388819b46dc051ef4", "type": "github" }, "original": { @@ -592,11 +592,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1719253556, - "narHash": "sha256-A/76RFUVxZ/7Y8+OMVL1Lc8LRhBxZ8ZE2bpMnvZ1VpY=", + "lastModified": 1720823163, + "narHash": "sha256-FZ5dnrvKkln9ESdoTR8R7GKW9rNpXNZrxGsOXsbsTpE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fc07dc3bdf2956ddd64f24612ea7fc894933eb2e", + "rev": "f12ee5f64c6a09995e71c9626d88c4efa983b488", "type": "github" }, "original": { From 789b651b4f0654cf58956a750b844d66cad34791 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 15 Jul 2024 11:49:06 -0300 Subject: [PATCH 201/404] thunar: fix finding programs --- user/thunar.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/user/thunar.nix b/user/thunar.nix index 2a9fe5b..26b90e9 100644 --- a/user/thunar.nix +++ b/user/thunar.nix @@ -10,6 +10,12 @@ }) ]; + wayland.windowManager.sway = { + extraConfig = '' + exec_always systemctl --user import-environment PATH + ''; + }; + xdg.configFile = { "Thunar/".source = ./thunar; }; From b2b50bf5e37a7bfc40712d5796f1358f58fd1292 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 15 Jul 2024 11:50:00 -0300 Subject: [PATCH 202/404] sway: disable vrr --- scripts/default.nix | 1 - scripts/vrr-fullscreen | 28 ---------------------------- user/sway/default.nix | 16 ---------------- 3 files changed, 45 deletions(-) delete mode 100755 scripts/vrr-fullscreen diff --git a/scripts/default.nix b/scripts/default.nix index 72f9cc6..01ce2b8 100644 --- a/scripts/default.nix +++ b/scripts/default.nix @@ -130,7 +130,6 @@ coreutils gnugrep ]; - vrr-fullscreen = [ ]; } // lib.mapAttrs import_script { wdmenu = ./wdmenu.nix; diff --git a/scripts/vrr-fullscreen b/scripts/vrr-fullscreen deleted file mode 100755 index 8413923..0000000 --- a/scripts/vrr-fullscreen +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env bash - -# List of supported outputs for VRR -output_vrr_whitelist=( - "DP-1" - "DP-2" -) - -# Toggle VRR for fullscreened apps in prespecified displays to avoid stutters while in desktop -swaymsg -t subscribe -m '[ "window" ]' | while read window_json; do - window_event=$(echo ${window_json} | jq -r '.change') - - # Process only focus change and fullscreen toggle - if [[ $window_event = "focus" || $window_event = "fullscreen_mode" ]]; then - output_json=$(swaymsg -t get_outputs | jq -r '.[] | select(.focused == true)') - output_name=$(echo ${output_json} | jq -r '.name') - - # Use only VRR in whitelisted outputs - if [[ ${output_vrr_whitelist[*]} =~ ${output_name} ]]; then - output_vrr_status=$(echo ${output_json} | jq -r '.adaptive_sync_status') - window_fullscreen_status=$(echo ${window_json} | jq -r '.container.fullscreen_mode') - - # Only update output if nesseccary to avoid flickering - [[ $output_vrr_status = "disabled" && $window_fullscreen_status = "1" ]] && swaymsg output "${output_name}" adaptive_sync 1 - [[ $output_vrr_status = "enabled" && $window_fullscreen_status = "0" ]] && swaymsg output "${output_name}" adaptive_sync 0 - fi - fi -done diff --git a/user/sway/default.nix b/user/sway/default.nix index 3e86994..9fcf2a0 100644 --- a/user/sway/default.nix +++ b/user/sway/default.nix @@ -69,7 +69,6 @@ in }; output = { "*" = { - adaptive_sync = "off"; bg = "${theme.background} fill"; mode = "1920x1080@144.000Hz"; }; @@ -116,21 +115,6 @@ in indicator = true; }; - systemd.user.services.vrr-fullscreen = { - Unit = { - Description = "Enable VRR for fullscreen windows"; - PartOf = [ "graphical-session.target" ]; - After = [ "graphical-session.target" ]; - }; - Service = { - ExecStart = "${lib.getExe pkgs.vrr-fullscreen}"; - Restart = "on-failure"; - }; - Install = { - WantedBy = [ "sway-session.target" ]; - }; - }; - services.gpg-agent.pinentryPackage = pkgs.pinentry-all; xdg.configFile."OpenTabletDriver/settings.json".source = ./open-tablet-driver.json; From a7eb3ce176c576cfae334b85ff260c63960c522e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 15 Jul 2024 12:03:13 -0300 Subject: [PATCH 203/404] waybar: fix clock locale --- user/waybar/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/waybar/default.nix b/user/waybar/default.nix index d2dc661..c94edf5 100644 --- a/user/waybar/default.nix +++ b/user/waybar/default.nix @@ -106,7 +106,7 @@ in }; clock = { interval = 60; - format = "{:%H:%M %a %d/%m}"; + format = "{:L%H:%M %a %d/%m}"; tooltip-format = "{calendar}"; calendar = { mode = "year"; From 4a61403ede58c6f60377ab93aaee71e08d10536c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 15 Jul 2024 12:50:49 -0300 Subject: [PATCH 204/404] invidious: fix conflic with forgejo port --- hosts/phantom/forgejo.nix | 3 --- hosts/phantom/invidious.nix | 10 +--------- hosts/phantom/nginx.nix | 1 + 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/hosts/phantom/forgejo.nix b/hosts/phantom/forgejo.nix index eefb003..cd95461 100644 --- a/hosts/phantom/forgejo.nix +++ b/hosts/phantom/forgejo.nix @@ -13,9 +13,6 @@ in virtualHosts.${cfg.settings.server.DOMAIN} = { forceSSL = true; enableACME = true; - extraConfig = '' - client_max_body_size 512M; - ''; locations."/".proxyPass = "http://localhost:${toString srv.HTTP_PORT}"; }; }; diff --git a/hosts/phantom/invidious.nix b/hosts/phantom/invidious.nix index 739d9ae..8c1e0f6 100644 --- a/hosts/phantom/invidious.nix +++ b/hosts/phantom/invidious.nix @@ -1,20 +1,12 @@ -{ config, ... }: { services.invidious = { enable = true; domain = "invidious.lelgenio.com"; nginx.enable = true; + port = 10601; settings.db = { user = "invidious"; dbname = "invidious"; }; }; - - services.nginx = { - clientMaxBodySize = "100m"; - virtualHosts.${config.services.invidious.domain} = { - enableACME = true; - forceSSL = true; - }; - }; } diff --git a/hosts/phantom/nginx.nix b/hosts/phantom/nginx.nix index 0153fa6..bfff32c 100644 --- a/hosts/phantom/nginx.nix +++ b/hosts/phantom/nginx.nix @@ -11,6 +11,7 @@ recommendedTlsSettings = true; recommendedOptimisation = true; recommendedGzipSettings = true; + clientMaxBodySize = "512M"; }; # Redirect *lelgenio.xyz -> *lelgenio.com From ac6a8dde52c221cc3fc221e9978fa84470c66eab Mon Sep 17 00:00:00 2001 From: lelgenio Date: Wed, 17 Jul 2024 18:01:01 -0300 Subject: [PATCH 205/404] fish: update fish aliases --- user/fish/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/fish/default.nix b/user/fish/default.nix index 4d4fccf..a744d02 100644 --- a/user/fish/default.nix +++ b/user/fish/default.nix @@ -36,7 +36,7 @@ in shellAliases = { rm = "trash"; tree = "eza -T"; - kys = "shutdown now"; + kill_yourself = "shutdown now"; }; shellAbbrs = { off = "shutdown now"; From 83ffaf9ee663e195839e48ffa74f4454fdb42618 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 18 Jul 2024 01:17:07 -0300 Subject: [PATCH 206/404] alacritty: add missing SearchPrevious bind --- user/alacritty.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/user/alacritty.nix b/user/alacritty.nix index 91b98c0..eaaa414 100644 --- a/user/alacritty.nix +++ b/user/alacritty.nix @@ -116,6 +116,12 @@ in mode = "Vi|~Search"; action = "SearchNext"; } + { + key = lib.toUpper key.next; + mods = "Shift"; + mode = "Vi|~Search"; + action = "SearchPrevious"; + } { key = "Up"; mods = "Control|Shift"; From 80675769d248775366570f1a2044f97bd2f56188 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Tue, 23 Jul 2024 16:32:31 -0300 Subject: [PATCH 207/404] docker: disable iptables to fix bad security --- system/containers.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/system/containers.nix b/system/containers.nix index 19698e5..2e8e52a 100644 --- a/system/containers.nix +++ b/system/containers.nix @@ -4,6 +4,9 @@ virtualisation.docker = { enable = true; + daemon.settings = { + "iptables" = false; + }; autoPrune = { enable = true; dates = "monthly"; From f565e4cc3e6107f1cdb36db3c15acc9c159ca567 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Tue, 23 Jul 2024 18:26:33 -0300 Subject: [PATCH 208/404] firewall: don't log refused connections --- system/network.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/system/network.nix b/system/network.nix index aee7518..682639d 100644 --- a/system/network.nix +++ b/system/network.nix @@ -9,6 +9,11 @@ # Open kde connect ports programs.kdeconnect.enable = true; + networking.firewall = { + enable = true; + logRefusedConnections = false; + }; + # Enable CUPS to print documents. # services.printing.enable = true; From 0247c7aadbf0ee5141154f787b58938f0fdde1be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 24 Jul 2024 20:16:59 -0300 Subject: [PATCH 209/404] update --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 04d8d8f..c9f3362 100644 --- a/flake.lock +++ b/flake.lock @@ -176,11 +176,11 @@ ] }, "locked": { - "lastModified": 1720661479, - "narHash": "sha256-nsGgA14vVn0GGiqEfomtVgviRJCuSR3UEopfP8ixW1I=", + "lastModified": 1721735625, + "narHash": "sha256-4T0FK0b3Q7Dd7oj79M7GhA9+YqKxxGT0iN+h8yqdP7s=", "owner": "nix-community", "repo": "disko", - "rev": "786965e1b1ed3fd2018d78399984f461e2a44689", + "rev": "4698b1ef375e9c904037e0b2049aa73d39ac1b2d", "type": "github" }, "original": { @@ -480,11 +480,11 @@ ] }, "locked": { - "lastModified": 1720926593, - "narHash": "sha256-fW6e27L6qY6s+TxInwrS2EXZZfhMAlaNqT0sWS49qMA=", + "lastModified": 1721531260, + "narHash": "sha256-O72uxk4gYFQDwNkoBioyrR3GK9EReZmexCStBaORMW8=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "5fe5b0cdf1268112dc96319388819b46dc051ef4", + "rev": "b6db9fd8dc59bb2ccb403f76d16ba8bbc1d5263d", "type": "github" }, "original": { @@ -592,11 +592,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1720823163, - "narHash": "sha256-FZ5dnrvKkln9ESdoTR8R7GKW9rNpXNZrxGsOXsbsTpE=", + "lastModified": 1721548954, + "narHash": "sha256-7cCC8+Tdq1+3OPyc3+gVo9dzUNkNIQfwSDJ2HSi2u3o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f12ee5f64c6a09995e71c9626d88c4efa983b488", + "rev": "63d37ccd2d178d54e7fb691d7ec76000740ea24a", "type": "github" }, "original": { From 21fc3e6d719e61d3cb324876c14253ddabeaad95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 24 Jul 2024 21:18:01 -0300 Subject: [PATCH 210/404] keyd: fix modifier keys (rightshift bacame leftshift) --- system/keyboard.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/system/keyboard.nix b/system/keyboard.nix index 7691343..bdb9f24 100644 --- a/system/keyboard.nix +++ b/system/keyboard.nix @@ -8,6 +8,16 @@ "main" = { # Some programs don't respect colemaks capslock bind, so we force it here "capslock" = "backspace"; + + # keyd has incorrect defaults :/ + "leftshift" = "leftshift"; + "rightshift" = "rightshift"; + "leftalt" = "leftalt"; + "rightalt" = "rightalt"; + "leftcontrol" = "leftcontrol"; + "rightcontrol" = "rightcontrol"; + "leftmeta" = "leftmeta"; + "rightmeta" = "rightmeta"; }; }; }; From 240facab85686a9245f27eb65b73551338ffdf78 Mon Sep 17 00:00:00 2001 From: lelgenio Date: Mon, 29 Jul 2024 14:13:15 -0300 Subject: [PATCH 211/404] Revert "docker: disable iptables to fix bad security" This reverts commit 84e26f0573dc439336419562b13460b72ebe3d4e. --- system/containers.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/system/containers.nix b/system/containers.nix index 2e8e52a..19698e5 100644 --- a/system/containers.nix +++ b/system/containers.nix @@ -4,9 +4,6 @@ virtualisation.docker = { enable = true; - daemon.settings = { - "iptables" = false; - }; autoPrune = { enable = true; dates = "monthly"; From 9c853446088a8de027521bd287423dca60a3c28e Mon Sep 17 00:00:00 2001 From: lelgenio Date: Mon, 29 Jul 2024 15:07:13 -0300 Subject: [PATCH 212/404] gitlab-runner: update from registrationToken to authenticationToken --- ...thoreb-itinerario-registrationConfigFile.age | Bin 864 -> 717 bytes ...thoreb-itinerario-registrationConfigFile.age | Bin 836 -> 717 bytes system/gitlab-runner.nix | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/secrets/monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.age b/secrets/monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.age index 9f9e0e3a368fc813f1a896b1a033da962cb49ae7..60c5c70e5ef67bac5524c21cf48bb7c14cc91239 100644 GIT binary patch delta 689 zcmaFBc9wO5Mtx+NqmxTvu4O^6Pe!FrqPLGra7n34W^sU5UZP8ZM_xflN=T@Qenoh? zi?N$Yx>0zxZ)I*~PDWxi9w`se!ZD9mrr(fc4TFEo>yjZcxgyv zs#Bz;sfTu2l1oORe`QWmmPdeLT1HS}S)oC0dWvU>m$yNBgn^$|RYXOmwnb!0M3PZhsA*oMnWw)~m5Yx_ zR;WitX1z&XT0t%Rkwtk}4i}fMuC9Wsp<#}xWlmXWMu1;cgkxk#dRVBZXQ*?!SFvkxu#0a> zo==!rk#=ElrX$zV)7`pip7mC@b_OSIh<|Xms$}Yq6<&($9z08Ss=wx8cTP|*z2i`P zk{wt?ndgCYJG8AmU^fARkzgfKM56=&6~chl7Cx& a-{sijlm86*^$$;14XfX~`rgEMp&bB@u=vpc delta 837 zcmX@h`habMM!l0!d9p!3pl@=NWnPG}PilpGa$04!Yhj>yO1e>~lY2mrM{rSjx{r2V zlwV|~aafUArFmF^kE^FiQdo$&Q81TTk!5k3zd?$3WoUS6YDrXtsjqW#gtuXOsd-g- zrE^NSlXhfMxOrAcVzEJKaAdH7vA0o}uVYGxnWJOF^2sX?93(c~x#jlx0AAxlw_yyNj8pXJKTBiC2J&hf8Tnu#sz6X<1f!UPekz zNT6$RZhcBxYEB_nWrTl5zGr4xL}a-|k!NICZi#+TX=-|akz;UjX+dgsQo2Ewd#PVY zrn6T?u2Zmyd1h#;zjvf@p08m>PI#y{S7~HKX<2Y;fvJm;PqK+`c}{Xps-KCwpJ`Z> zep#qdhD))5k7-dsZiQQ0TfMOmmzV17orM?q?Nab}jAet2YMsdt2jc|lcqP^MFk zQ+;4YxJR&wxkq7PF&CGvor0O0ZhBE_VsWa1Yq&xvmwSP1VM0#&=R$ivFvxj9ykz1L2N@SX0vY~6JSCpAkct%BFQh0uuzi&2Ib8VvT z|I;0k*XPXeFTFDF>8b^Ry(^`dH=K$-xTm^@`{(@6+ds+fjNI>*{r66j^dZk<2ZDnw z>|7h3zPxcnYSWpSuKK_3R5ky*KH-LgpaR3+L$?2(H>fo`F5mll{%QSbyEm^ft`#=5 Tlji&0J-6`h&K;~e_Kmp!3KA=@ diff --git a/secrets/rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.age b/secrets/rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.age index a1015ad6ff4fbaaceff1a7d5c6b3c73c9f10e774..03118e3abaad963bb9c2830f03a815001887a31c 100644 GIT binary patch delta 689 zcmX@Yc9wO5M!mOln43v(rHN&6iGONfu~BJhUZi(+Sz=0IYG!V3c#fAzX|k(VMOs9q zQI)oTc6L-jW<_XTc)FLXhf$t$q6wFukG`8hcxqKrVOfTDNNPoniCd0`pG823QMrDK zX?jY!zK?dAr%9Gmq;pwPQl^KaNpVVOdTvB`W_qMWReez?m#K$&q-Ab;l3}Ewxk;L% zSyftybGA{MM{c&Zw_{L#n2~v8QLs^3m3w|zU}iu@URjw%REVizs+*y!c2u#6Czp0) zNknQ!g{yyIWKNcscchnBo|~m>PF0#;qD5Y1fupl~Npe<*t3|47p@B zd7f{kb69X&0=A!e!(4mWPv`po@EjidN&_*?iK(K@Vdb4G9Y17l{QGL^ z(Fwu1OXuv_@u2;UUFU}l7hNVFVhxmP@#Ck%3EjaCwladwo(7mt(o1i@uqkPe?>kzPWjE zv2#(0YnXwhhgXWXbCkQjUx0U1MXp(BaHVO0rH7GrW?n&oM@nF7iIY#6YpAh%Bv)X* zS%`T^lygv~Te7*ES4x3lc5z^3dAehHuCI5vTZL(sVQ8vRN?E2?WvqL})=(F&CGvoq}q$rn+~TZhBE_VsWa1hkm|-c3_=NL?D+-PGx9Nj;mu* zN={&rNw&LBiKU-@c!5P)YD8*8uw_(~XJnC^Z)s4XPe!C=WMH9JL87mZXK8XtzME@) zn72Duj&r3^a#UEBnR7-(nvuJEU^$nrZoRHTezJE#K&okSwo7ECk58JDn?)@>K>kI5aq zx)U Date: Sun, 28 Jul 2024 00:38:32 -0300 Subject: [PATCH 213/404] waybar: fix stopped icon not appearing man waybar-mpd says {stateIcon} is not set when stopped --- user/waybar/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/user/waybar/default.nix b/user/waybar/default.nix index c94edf5..d33076e 100644 --- a/user/waybar/default.nix +++ b/user/waybar/default.nix @@ -137,9 +137,8 @@ in { format = "{stateIcon} {title} - {artist}"; format-paused = "{stateIcon}"; - format-stopped = "{stateIcon}"; + format-stopped = ""; state-icons = { - stopped = ""; paused = ""; playing = ""; }; From 48ab9a83f6c5ff2c5ef2aa995d935ee7d7176059 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sun, 28 Jul 2024 00:39:20 -0300 Subject: [PATCH 214/404] pass: install pass-export --- user/pass.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/user/pass.nix b/user/pass.nix index e1c5bb8..9a0082d 100644 --- a/user/pass.nix +++ b/user/pass.nix @@ -26,6 +26,7 @@ _gpg-unlock qtpass readQrCode + pass-export ]; }; } From 9c76e76cd158627fbf660bc92673451c450d162b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 1 Aug 2024 12:25:46 -0300 Subject: [PATCH 215/404] forgejo: fix email host address --- hosts/phantom/forgejo.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/phantom/forgejo.nix b/hosts/phantom/forgejo.nix index cd95461..2693ff4 100644 --- a/hosts/phantom/forgejo.nix +++ b/hosts/phantom/forgejo.nix @@ -34,7 +34,7 @@ in }; mailer = { ENABLED = true; - SMTP_ADDR = "mail.lelgenio.com"; + SMTP_ADDR = "lelgenio.com"; FROM = "noreply@git.lelgenio.com"; USER = "noreply@git.lelgenio.com"; }; From d49d18f659b8bf233b90ffc3a5abb325afcb6ad3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 8 Aug 2024 00:26:35 -0300 Subject: [PATCH 216/404] keyboard: remove config, too buggy --- system/configuration.nix | 1 - system/keyboard.nix | 25 ------------------------- 2 files changed, 26 deletions(-) delete mode 100644 system/keyboard.nix diff --git a/system/configuration.nix b/system/configuration.nix index 516a3ff..6661e40 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -22,7 +22,6 @@ ./users.nix ./containers.nix ./network.nix - ./keyboard.nix ../settings ]; diff --git a/system/keyboard.nix b/system/keyboard.nix deleted file mode 100644 index bdb9f24..0000000 --- a/system/keyboard.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ pkgs, lib, ... }: -{ - services.keyd = { - enable = true; - keyboards.default = { - ids = [ "*" ]; - settings = { - "main" = { - # Some programs don't respect colemaks capslock bind, so we force it here - "capslock" = "backspace"; - - # keyd has incorrect defaults :/ - "leftshift" = "leftshift"; - "rightshift" = "rightshift"; - "leftalt" = "leftalt"; - "rightalt" = "rightalt"; - "leftcontrol" = "leftcontrol"; - "rightcontrol" = "rightcontrol"; - "leftmeta" = "leftmeta"; - "rightmeta" = "rightmeta"; - }; - }; - }; - }; -} From ad0b57f2b40b345e8cc0a3c7a83e98843b1df65f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 8 Aug 2024 00:26:57 -0300 Subject: [PATCH 217/404] gitlab: remove old configs --- system/gitlab-runner.nix | 1 - system/monolith-gitlab-runner.nix | 12 ------------ 2 files changed, 13 deletions(-) diff --git a/system/gitlab-runner.nix b/system/gitlab-runner.nix index fa426e2..c50e1b9 100644 --- a/system/gitlab-runner.nix +++ b/system/gitlab-runner.nix @@ -47,6 +47,5 @@ PATH = "/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/bin:/sbin:/usr/bin:/usr/sbin"; NIX_SSL_CERT_FILE = "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt"; }; - tagList = [ "nix" ]; }; } diff --git a/system/monolith-gitlab-runner.nix b/system/monolith-gitlab-runner.nix index 8e419d1..f17fbe3 100644 --- a/system/monolith-gitlab-runner.nix +++ b/system/monolith-gitlab-runner.nix @@ -14,18 +14,6 @@ in enable = true; settings.concurrent = 4; services = { - # ci_test = { - # registrationConfigFile = "/srv/gitlab-runner/env/ci_test"; - # dockerImage = "debian"; - # dockerPrivileged = true; - # }; - thoreb_builder = { - registrationConfigFile = - config.age.secrets.monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.path; - dockerImage = "debian"; - dockerPrivileged = true; - }; - # runner for building in docker via host's nix-daemon # nix store will be readable in runner, might be insecure thoreb-telemetria-nix = mkNixRunner config.age.secrets.gitlab-runner-thoreb-telemetria-registrationConfigFile.path; From 7e3c4f804378d8109ca26644b645af3951d9f983 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 8 Aug 2024 00:27:08 -0300 Subject: [PATCH 218/404] update --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index c9f3362..f7fc1e7 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1720546205, - "narHash": "sha256-boCXsjYVxDviyzoEyAk624600f3ZBo/DKtUdvMTpbGY=", + "lastModified": 1722339003, + "narHash": "sha256-ZeS51uJI30ehNkcZ4uKqT4ZDARPyqrHADSKAwv5vVCU=", "owner": "ryantm", "repo": "agenix", - "rev": "de96bd907d5fbc3b14fc33ad37d1b9a3cb15edc6", + "rev": "3f1dae074a12feb7327b4bf43cbac0d124488bb7", "type": "github" }, "original": { @@ -176,11 +176,11 @@ ] }, "locked": { - "lastModified": 1721735625, - "narHash": "sha256-4T0FK0b3Q7Dd7oj79M7GhA9+YqKxxGT0iN+h8yqdP7s=", + "lastModified": 1723080788, + "narHash": "sha256-C5LbM5VMdcolt9zHeLQ0bYMRjUL+N+AL5pK7/tVTdes=", "owner": "nix-community", "repo": "disko", - "rev": "4698b1ef375e9c904037e0b2049aa73d39ac1b2d", + "rev": "ffc1f95f6c28e1c6d1e587b51a2147027a3e45ed", "type": "github" }, "original": { @@ -480,11 +480,11 @@ ] }, "locked": { - "lastModified": 1721531260, - "narHash": "sha256-O72uxk4gYFQDwNkoBioyrR3GK9EReZmexCStBaORMW8=", + "lastModified": 1722740924, + "narHash": "sha256-UQPgA5d8azLZuDHZMPmvDszhuKF1Ek89SrTRtqsQ4Ss=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "b6db9fd8dc59bb2ccb403f76d16ba8bbc1d5263d", + "rev": "97ca0a0fca0391de835f57e44f369a283e37890f", "type": "github" }, "original": { @@ -592,11 +592,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1721548954, - "narHash": "sha256-7cCC8+Tdq1+3OPyc3+gVo9dzUNkNIQfwSDJ2HSi2u3o=", + "lastModified": 1722869614, + "narHash": "sha256-7ojM1KSk3mzutD7SkrdSflHXEujPvW1u7QuqWoTLXQU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "63d37ccd2d178d54e7fb691d7ec76000740ea24a", + "rev": "883180e6550c1723395a3a342f830bfc5c371f6b", "type": "github" }, "original": { From 305bd6867a441a4c216367ad9a33381e42436877 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 9 Aug 2024 01:21:49 -0300 Subject: [PATCH 219/404] gnome: remove nixos-conf-editor and nix-software-center --- flake.lock | 229 +++---------------------------------------------- flake.nix | 10 --- user/gnome.nix | 3 - 3 files changed, 10 insertions(+), 232 deletions(-) diff --git a/flake.lock b/flake.lock index f7fc1e7..e10548a 100644 --- a/flake.lock +++ b/flake.lock @@ -266,36 +266,6 @@ } }, "flake-compat_2": { - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" - } - }, - "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_4": { "flake": false, "locked": { "lastModified": 1696426674, @@ -329,24 +299,6 @@ "type": "github" } }, - "flake-utils-plus": { - "inputs": { - "flake-utils": "flake-utils_4" - }, - "locked": { - "lastModified": 1696331477, - "narHash": "sha256-YkbRa/1wQWdWkVJ01JvV+75KIdM37UErqKgTf0L54Fk=", - "owner": "gytis-ivaskevicius", - "repo": "flake-utils-plus", - "rev": "bfc53579db89de750b25b0c5e7af299e0c06d7d3", - "type": "github" - }, - "original": { - "owner": "gytis-ivaskevicius", - "repo": "flake-utils-plus", - "type": "github" - } - }, "flake-utils_2": { "inputs": { "systems": "systems_3" @@ -385,11 +337,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -400,7 +352,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_7" + "systems": "systems_6" }, "locked": { "lastModified": 1681202837, @@ -418,25 +370,7 @@ }, "flake-utils_6": { "inputs": { - "systems": "systems_8" - }, - "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_7": { - "inputs": { - "systems": "systems_9" + "systems": "systems_7" }, "locked": { "lastModified": 1710146030, @@ -493,87 +427,17 @@ "type": "github" } }, - "nix-software-center": { - "inputs": { - "nixos-appstream-data": "nixos-appstream-data", - "nixpkgs": [ - "nixpkgs" - ], - "utils": "utils" - }, - "locked": { - "lastModified": 1714856183, - "narHash": "sha256-Ue7xV+rZqImux4DDj3VMla4LIH2g8VeXbTJwgvX7wOo=", - "owner": "vlinkz", - "repo": "nix-software-center", - "rev": "b9e0f53536e1e94e7d8c3cda3c6866b3f9d01386", - "type": "github" - }, - "original": { - "owner": "vlinkz", - "repo": "nix-software-center", - "type": "github" - } - }, - "nixos-appstream-data": { - "inputs": { - "flake-utils": [ - "nix-software-center", - "utils" - ], - "nixpkgs": [ - "nix-software-center", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1712858390, - "narHash": "sha256-XE7gr+zU3N4SHPAhsgk8cVAFp1iBg+Lxxp3y4dUF1vE=", - "owner": "korfuri", - "repo": "nixos-appstream-data", - "rev": "0465d42a4433faa63b7a5eb0b8d397937c9fc13a", - "type": "github" - }, - "original": { - "owner": "korfuri", - "ref": "flake", - "repo": "nixos-appstream-data", - "type": "github" - } - }, - "nixos-conf-editor": { - "inputs": { - "flake-compat": "flake-compat_2", - "nixpkgs": [ - "nixpkgs" - ], - "snowfall-lib": "snowfall-lib" - }, - "locked": { - "lastModified": 1707338010, - "narHash": "sha256-UtLeZzDdk96sLTRcWsGrkWCslNUDytrGe0VmOTB/iig=", - "owner": "vlinkz", - "repo": "nixos-conf-editor", - "rev": "27b5e92f580f794c690093503869aab242f075ab", - "type": "github" - }, - "original": { - "owner": "vlinkz", - "repo": "nixos-conf-editor", - "type": "github" - } - }, "nixos-mailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_2", "nixpkgs": [ "nixpkgs" ], "nixpkgs-24_05": [ "nixpkgs" ], - "utils": "utils_2" + "utils": "utils" }, "locked": { "lastModified": 1718084203, @@ -646,8 +510,6 @@ "dzgui-nix": "dzgui-nix", "home-manager": "home-manager", "nix-index-database": "nix-index-database", - "nix-software-center": "nix-software-center", - "nixos-conf-editor": "nixos-conf-editor", "nixos-mailserver": "nixos-mailserver", "nixpkgs": "nixpkgs", "plymouth-themes": "plymouth-themes", @@ -701,29 +563,6 @@ "type": "github" } }, - "snowfall-lib": { - "inputs": { - "flake-compat": "flake-compat_3", - "flake-utils-plus": "flake-utils-plus", - "nixpkgs": [ - "nixos-conf-editor", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1696432959, - "narHash": "sha256-oJQZv2MYyJaVyVJY5IeevzqpGvMGKu5pZcCCJvb+xjc=", - "owner": "snowfallorg", - "repo": "lib", - "rev": "92803a029b5314d4436a8d9311d8707b71d9f0b6", - "type": "github" - }, - "original": { - "owner": "snowfallorg", - "repo": "lib", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -829,39 +668,9 @@ "type": "github" } }, - "systems_8": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_9": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tlauncher": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nixpkgs" ] @@ -884,24 +693,6 @@ "inputs": { "systems": "systems_4" }, - "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "utils_2": { - "inputs": { - "systems": "systems_6" - }, "locked": { "lastModified": 1709126324, "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", @@ -919,7 +710,7 @@ "warthunder-leak-counter": { "inputs": { "crane": "crane_2", - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_5", "nixpkgs": [ "nixpkgs" ] @@ -940,7 +731,7 @@ }, "wl-crosshair": { "inputs": { - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_6", "nixpkgs": [ "nixpkgs" ] diff --git a/flake.nix b/flake.nix index 21caeb9..23ece59 100644 --- a/flake.nix +++ b/flake.nix @@ -58,16 +58,6 @@ url = "git+https://git.lelgenio.com/lelgenio/warthunder-leak-counter"; inputs.nixpkgs.follows = "nixpkgs"; }; - - # gnome stuff - nixos-conf-editor = { - url = "github:vlinkz/nixos-conf-editor"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - nix-software-center = { - url = "github:vlinkz/nix-software-center"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; outputs = inputs: diff --git a/user/gnome.nix b/user/gnome.nix index 4924158..e5ef257 100644 --- a/user/gnome.nix +++ b/user/gnome.nix @@ -28,9 +28,6 @@ lib.mkIf (config.my.desktop == "gnome") { }; home.packages = with pkgs; [ - inputs.nixos-conf-editor.packages.${pkgs.system}.nixos-conf-editor - inputs.nix-software-center.packages.${pkgs.system}.nix-software-center - adw-gtk3 newsflash From 1707e15e3d892ed1ec2715cdf005329c0bf28190 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 9 Aug 2024 01:22:18 -0300 Subject: [PATCH 220/404] gtk: force configuration replacement --- user/sway/theme.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/user/sway/theme.nix b/user/sway/theme.nix index 17ac73c..731d12a 100644 --- a/user/sway/theme.nix +++ b/user/sway/theme.nix @@ -49,6 +49,9 @@ lib.mkIf (desktop == "sway") { } ); + xdg.configFile."gtk-3.0/settings.ini".force = true; + xdg.configFile."gtk-4.0/settings.ini".force = true; + qt = { enable = true; platformTheme.name = "gtk3"; From b0155af10cba4ebc794f28fda5d86aa818980a1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 9 Aug 2024 01:41:01 -0300 Subject: [PATCH 221/404] sway: replace swappy with satty --- user/sway/default.nix | 3 ++- user/sway/sway-binds.nix | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/user/sway/default.nix b/user/sway/default.nix index 9fcf2a0..6b495d2 100644 --- a/user/sway/default.nix +++ b/user/sway/default.nix @@ -145,7 +145,8 @@ in wl-crosshair grim - swappy + satty + xdg-user-dirs (tesseract5.override { enableLanguages = [ "eng" diff --git a/user/sway/sway-binds.nix b/user/sway/sway-binds.nix index 7b33cd0..cd0ac9a 100644 --- a/user/sway/sway-binds.nix +++ b/user/sway/sway-binds.nix @@ -170,7 +170,9 @@ let "${mod}+c" = "exec ${pkgs.color_picker}/bin/color_picker"; "${mod}+Return" = "exec ${terminal}"; "${mod}+Ctrl+Return" = "exec thunar"; - "${mod}+Shift+s" = "exec grim - | swappy -f -"; + "${mod}+Shift+s" = '' + exec grim - | satty --filename - --fullscreen --output-filename "$(xdg-user-dir PICTURES)"/Screenshots/satty-$(date '+%Y%m%d-%H:%M:%S').png + ''; "${mod}+Ctrl+v" = "exec wl-paste | tesseract -l por - - | wl-copy"; "${mod}+k" = "exec showkeys"; "${mod}+Alt+x" = "exec pkill wl-crosshair || exec wl-crosshair"; From 11aa7e5d8176ed72e0da4ae525a2ce1b8901b6e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 9 Aug 2024 15:07:56 -0300 Subject: [PATCH 222/404] kakoune: add kak-tree-sitter --- pkgs/default.nix | 3 +- pkgs/kak-tree-sitter.nix | 34 ++++++++++ user/kakoune/colors.nix | 109 +++++++++++++++++++++++++++++++ user/kakoune/default.nix | 7 +- user/kakoune/kak-tree-sitter.nix | 64 ++++++++++++++++++ 5 files changed, 215 insertions(+), 2 deletions(-) create mode 100644 pkgs/kak-tree-sitter.nix create mode 100644 user/kakoune/kak-tree-sitter.nix diff --git a/pkgs/default.nix b/pkgs/default.nix index 73134c7..eccb020 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -2,11 +2,12 @@ # You can build them using 'nix build .#example' or (legacy) 'nix-build -A example' { pkgs, inputs }: -{ +rec { blade-formatter = pkgs.callPackage ./blade-formatter { }; cargo-checkmate = pkgs.callPackage ./cargo-checkmate.nix { }; lipsum = pkgs.callPackage ./lipsum.nix { }; emmet-cli = pkgs.callPackage ./emmet-cli.nix { }; material-wifi-icons = pkgs.callPackage ./material-wifi-icons.nix { }; gnome-pass-search-provider = pkgs.callPackage ./gnome-pass-search-provider.nix { }; + kak-tree-sitter = pkgs.callPackage ./kak-tree-sitter.nix { }; } diff --git a/pkgs/kak-tree-sitter.nix b/pkgs/kak-tree-sitter.nix new file mode 100644 index 0000000..1765977 --- /dev/null +++ b/pkgs/kak-tree-sitter.nix @@ -0,0 +1,34 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromSourcehut, + makeWrapper, +}: + +rustPlatform.buildRustPackage rec { + pname = "kak-tree-sitter"; + version = "1.1.2"; + + src = fetchFromSourcehut { + owner = "~hadronized"; + repo = "kak-tree-sitter"; + rev = "kak-tree-sitter-v${version}"; + hash = "sha256-wBWfSyR8LGtug/mCD0bJ4lbdN3trIA/03AnCxZoEOSA="; + }; + + cargoSha256 = "sha256-DDXMsH5wA6Q3jFGjYBkU3x9yOto3zeUSHP6ifkveJe0="; + + nativeBuildInputs = [ makeWrapper ]; + + postFixup = '' + wrapProgram "$out/bin/ktsctl" \ + --suffix PATH : ${stdenv.cc} + ''; + + meta = with lib; { + description = "Server that interfaces tree-sitter with kakoune"; + homepage = "https://git.sr.ht/~hadronized/kak-tree-sitter"; + license = with licenses; [ mit ]; + }; +} diff --git a/user/kakoune/colors.nix b/user/kakoune/colors.nix index e9b9d07..97ac236 100644 --- a/user/kakoune/colors.nix +++ b/user/kakoune/colors.nix @@ -114,3 +114,112 @@ with colors; Hint = "blue"; } )) ++ '' + # Color palette + declare-option str red "red" + declare-option str mauve "magenta" + declare-option str maroon "rgb:ee99a0" + declare-option str pink "rgb:f5bde6" + declare-option str cyan "cyan" + declare-option str yellow "yellow" + declare-option str green "green" + declare-option str white "white" + declare-option str blue "blue" + declare-option str sky "rgb:91d7e3" + declare-option str lavender "rgb:b7bdf8" + declare-option str black1 "rgb:202020" + declare-option str black2 "rgb:272727" + declare-option str black3 "rgb:3a3a3a" + declare-option str orange "rgb:f5a97f" + declare-option str teal "rgb:8bd5ca" + declare-option str flamingo "rgb:f0c6c6" + declare-option str gray0 "rgb:606060" + declare-option str gray1 "rgb:737373" + declare-option str bright_red "%opt{red}+b" + declare-option str bright_green "%opt{green}+b" + declare-option str bright_yellow "%opt{yellow}+b" + declare-option str bright_blue "%opt{blue}+b" + declare-option str bright_cyan "%opt{cyan}+b" + declare-option str foreground %opt{white} + declare-option str background %opt{black2} + declare-option str overlay0 "rgb:878787" + declare-option str overlay1 "rgb:9a9a9a" + + # Tree-sitter () + set-face global ts_attribute "%opt{blue}" + set-face global ts_comment "%opt{overlay0}+i" + set-face global ts_conceal "%opt{mauve}+i" + set-face global ts_constant "%opt{orange}" + set-face global ts_constant_builtin_boolean "%opt{sky}" + set-face global ts_constant_character "%opt{yellow}" + set-face global ts_constant_macro "%opt{mauve}" + set-face global ts_constructor "%opt{cyan}" + set-face global ts_diff_plus "%opt{green}" + set-face global ts_diff_minus "%opt{red}" + set-face global ts_diff_delta "%opt{blue}" + set-face global ts_diff_delta_moved "%opt{mauve}" + set-face global ts_error "%opt{red}+b" + set-face global ts_function "%opt{blue}" + set-face global ts_function_builtin "%opt{blue}+i" + set-face global ts_function_macro "%opt{mauve}" + set-face global ts_hint "%opt{blue}+b" + set-face global ts_info "%opt{green}+b" + set-face global ts_keyword "%opt{mauve}" + set-face global ts_keyword_conditional "%opt{mauve}+i" + set-face global ts_keyword_control_conditional "%opt{mauve}+i" + set-face global ts_keyword_control_directive "%opt{mauve}+i" + set-face global ts_keyword_control_import "%opt{mauve}+i" + set-face global ts_keyword_directive "%opt{mauve}+i" + set-face global ts_keyword_storage "%opt{mauve}" + set-face global ts_keyword_storage_modifier "%opt{mauve}" + set-face global ts_keyword_storage_modifier_mut "%opt{mauve}" + set-face global ts_keyword_storage_modifier_ref "%opt{teal}" + set-face global ts_label "%opt{cyan}+i" + set-face global ts_markup_bold "%opt{orange}+b" + set-face global ts_markup_heading "%opt{red}" + set-face global ts_markup_heading_1 "%opt{red}" + set-face global ts_markup_heading_2 "%opt{mauve}" + set-face global ts_markup_heading_3 "%opt{green}" + set-face global ts_markup_heading_4 "%opt{yellow}" + set-face global ts_markup_heading_5 "%opt{pink}" + set-face global ts_markup_heading_6 "%opt{teal}" + set-face global ts_markup_heading_marker "%opt{orange}+b" + set-face global ts_markup_italic "%opt{pink}+i" + set-face global ts_markup_list_checked "%opt{green}" + set-face global ts_markup_list_numbered "%opt{blue}+i" + set-face global ts_markup_list_unchecked "%opt{teal}" + set-face global ts_markup_list_unnumbered "%opt{mauve}" + set-face global ts_markup_link_label "%opt{blue}" + set-face global ts_markup_link_url "%opt{teal}+u" + set-face global ts_markup_link_uri "%opt{teal}+u" + set-face global ts_markup_link_text "%opt{blue}" + set-face global ts_markup_quote "%opt{gray1}" + set-face global ts_markup_raw "%opt{green}" + set-face global ts_markup_strikethrough "%opt{gray1}+s" + set-face global ts_namespace "%opt{blue}+i" + set-face global ts_operator "%opt{sky}" + set-face global ts_property "%opt{sky}" + set-face global ts_punctuation "%opt{overlay1}" + set-face global ts_punctuation_special "%opt{sky}" + set-face global ts_special "%opt{blue}" + set-face global ts_spell "%opt{mauve}" + set-face global ts_string "%opt{green}" + set-face global ts_string_regex "%opt{orange}" + set-face global ts_string_regexp "%opt{orange}" + set-face global ts_string_escape "%opt{mauve}" + set-face global ts_string_special "%opt{blue}" + set-face global ts_string_special_path "%opt{green}" + set-face global ts_string_special_symbol "%opt{mauve}" + set-face global ts_string_symbol "%opt{red}" + set-face global ts_tag "%opt{mauve}" + set-face global ts_tag_error "%opt{red}" + set-face global ts_text "%opt{white}" + set-face global ts_text_title "%opt{mauve}" + set-face global ts_type "%opt{yellow}" + set-face global ts_type_enum_variant "%opt{flamingo}" + set-face global ts_variable "%opt{white}" + set-face global ts_variable_builtin "%opt{red}" + set-face global ts_variable_other_member "%opt{teal}" + set-face global ts_variable_parameter "%opt{maroon}+i" + set-face global ts_warning "%opt{orange}+b" +'' diff --git a/user/kakoune/default.nix b/user/kakoune/default.nix index ebb17f5..051f21d 100644 --- a/user/kakoune/default.nix +++ b/user/kakoune/default.nix @@ -6,7 +6,6 @@ }: let inherit (config.my) - key dmenu editor theme @@ -17,6 +16,7 @@ let inherit (pkgs.kakouneUtils) buildKakounePlugin; in { + imports = [ ./kak-tree-sitter.nix ]; config = { programs.kakoune = { enable = true; @@ -100,6 +100,9 @@ in ) ) + '' + try %{ + eval %sh{ kak-tree-sitter -vvvv -dks --init $kak_session } + } set global scrolloff 10,20 set global autoreload yes @@ -118,11 +121,13 @@ in home.file = { ".config/kak-lsp/kak-lsp.toml".source = ./kak-lsp.toml; }; + home.packages = with pkgs; [ terminal ranger bmenu kak-lsp + kak-tree-sitter kak-pager kak-man-pager diff --git a/user/kakoune/kak-tree-sitter.nix b/user/kakoune/kak-tree-sitter.nix new file mode 100644 index 0000000..8818f1f --- /dev/null +++ b/user/kakoune/kak-tree-sitter.nix @@ -0,0 +1,64 @@ +{ pkgs, lib, ... }: +let + hx-src = pkgs.helix.src; + kts-src = pkgs.kak-tree-sitter.src; + inherit (pkgs) fetchFromGitHub; +in +with pkgs.tree-sitter-grammars; +{ + xdg.configFile."kak-tree-sitter/config.toml".text = + lib.foldlAttrs + ( + acc: name: vals: + acc + + '' + [language.${name}.grammar.source.local] + path = "${vals.parser}" + [language.${name}.grammar] + compile = "cc" + compile_args = ["-c", "-fpic", "../scanner.c", "../parser.c", "-I", ".."] + compile_flags = ["-O3"] + link = "cc" + link_args = ["-shared", "-fpic", "scanner.o", "parser.o", "-o", "typescript.so"] + link_flags = ["-O3"] + [language.${name}.queries.source.local] + path = "${vals.queries}" + [language.${name}.queries] + path = "${vals.queries}" + '' + ) + "" + { + nix = { + parser = tree-sitter-nix + "/parser"; + queries = tree-sitter-nix + "/queries"; + }; + + scss = { + parser = tree-sitter-scss + "/parser"; + queries = tree-sitter-scss + "/queries"; + }; + css = { + parser = tree-sitter-css + "/parser"; + queries = tree-sitter-css + "/queries"; + }; + + javascript = { + parser = tree-sitter-javascript + "/parser"; + queries = tree-sitter-javascript + "/queries"; + }; + typescript = { + parser = + tree-sitter-typescript.overrideAttrs (old: { + src = fetchFromGitHub { + owner = "tree-sitter"; + repo = "tree-sitter-typescript"; + rev = "b1bf4825d9eaa0f3bdeb1e52f099533328acfbdf"; + hash = "sha256-oZKit8kScXcOptmT2ckywL5JlAVe+wuwhuj6ThEI5OQ="; + }; + }) + + "/parser"; + queries = kts-src + "/runtime/queries/typescript"; + }; + }; +} From 6309c1dd083519f05e2e5aee4036090943e65b32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 14 Aug 2024 00:31:17 -0300 Subject: [PATCH 223/404] kakoune: update kak-tree-sitter config --- pkgs/kak-tree-sitter.nix | 2 +- user/kakoune/colors.nix | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/kak-tree-sitter.nix b/pkgs/kak-tree-sitter.nix index 1765977..3e3d9d1 100644 --- a/pkgs/kak-tree-sitter.nix +++ b/pkgs/kak-tree-sitter.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-wBWfSyR8LGtug/mCD0bJ4lbdN3trIA/03AnCxZoEOSA="; }; - cargoSha256 = "sha256-DDXMsH5wA6Q3jFGjYBkU3x9yOto3zeUSHP6ifkveJe0="; + cargoSha256 = "sha256-OQPUWqJAts8DbFNSsC/CmMCbuZ9TVxRTR05O7oiodKI="; nativeBuildInputs = [ makeWrapper ]; diff --git a/user/kakoune/colors.nix b/user/kakoune/colors.nix index 97ac236..a0917d4 100644 --- a/user/kakoune/colors.nix +++ b/user/kakoune/colors.nix @@ -130,7 +130,7 @@ with colors; declare-option str black1 "rgb:202020" declare-option str black2 "rgb:272727" declare-option str black3 "rgb:3a3a3a" - declare-option str orange "rgb:f5a97f" + declare-option str orange ${orange} declare-option str teal "rgb:8bd5ca" declare-option str flamingo "rgb:f0c6c6" declare-option str gray0 "rgb:606060" @@ -146,7 +146,7 @@ with colors; declare-option str overlay1 "rgb:9a9a9a" # Tree-sitter () - set-face global ts_attribute "%opt{blue}" + set-face global ts_attribute "%opt{cyan}" set-face global ts_comment "%opt{overlay0}+i" set-face global ts_conceal "%opt{mauve}+i" set-face global ts_constant "%opt{orange}" @@ -208,7 +208,7 @@ with colors; set-face global ts_string_regexp "%opt{orange}" set-face global ts_string_escape "%opt{mauve}" set-face global ts_string_special "%opt{blue}" - set-face global ts_string_special_path "%opt{green}" + set-face global ts_string_special_path "%opt{orange}" set-face global ts_string_special_symbol "%opt{mauve}" set-face global ts_string_symbol "%opt{red}" set-face global ts_tag "%opt{mauve}" @@ -217,7 +217,7 @@ with colors; set-face global ts_text_title "%opt{mauve}" set-face global ts_type "%opt{yellow}" set-face global ts_type_enum_variant "%opt{flamingo}" - set-face global ts_variable "%opt{white}" + set-face global ts_variable "%opt{blue}" set-face global ts_variable_builtin "%opt{red}" set-face global ts_variable_other_member "%opt{teal}" set-face global ts_variable_parameter "%opt{maroon}+i" From ed076e1e76312d7418c4e839c1afb19377e21dd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 14 Aug 2024 00:34:06 -0300 Subject: [PATCH 224/404] steam: fix gamescope compatibility --- system/steam.nix | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/system/steam.nix b/system/steam.nix index ddc33c8..8b764d0 100644 --- a/system/steam.nix +++ b/system/steam.nix @@ -6,23 +6,28 @@ }: { programs.steam.enable = true; - programs.steam.package = pkgs.steam.override { - extraLibraries = - pkgs: - with config.hardware.opengl; - if pkgs.hostPlatform.is64bit then - [ package ] ++ extraPackages - else - [ package32 ] ++ extraPackages32; + programs.steam.extraPackages = + config.fonts.packages + ++ (with pkgs; [ + capitaine-cursors + bibata-cursors + mangohud + xdg-user-dirs + gamescope + + # gamescope compatibility?? + xorg.libXcursor + xorg.libXi + xorg.libXinerama + xorg.libXScrnSaver + libpng + libpulseaudio + libvorbis + stdenv.cc.cc.lib + libkrb5 + keyutils + ]); - extraPkgs = - pkgs: with pkgs; [ - capitaine-cursors - bibata-cursors - mangohud - xdg-user-dirs - ]; - }; environment.systemPackages = with pkgs; [ protontricks bottles From 2457164e1bd05bfd3939b34a7a4501618ea05220 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 14 Aug 2024 22:01:27 -0300 Subject: [PATCH 225/404] Revert "monolith: disable virtualbox while it's borked" This reverts commit 48c074f1f42b622fee8acdd9e733e63e058c9144. --- hosts/monolith/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/monolith/default.nix b/hosts/monolith/default.nix index 4a8d69b..b45a935 100644 --- a/hosts/monolith/default.nix +++ b/hosts/monolith/default.nix @@ -143,6 +143,8 @@ in hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; networking.hostName = "monolith"; # Define your hostname. + virtualisation.virtualbox.host.enable = true; + services.udev.extraRules = '' # Fix broken suspend with Logitech USB dongle # `lsusb | grep Logitech` will return "vendor:product" From 9c664ca2ace7345caeb6a9b7d15fd6b85be76665 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 15 Aug 2024 01:49:10 -0300 Subject: [PATCH 226/404] sway: configure mouse --- system/configuration.nix | 1 + system/mouse.nix | 15 +++++++++++++++ user/sway/default.nix | 6 ++++++ 3 files changed, 22 insertions(+) create mode 100644 system/mouse.nix diff --git a/system/configuration.nix b/system/configuration.nix index 6661e40..c8095f6 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -18,6 +18,7 @@ ./fonts.nix ./sound.nix ./bluetooth.nix + ./mouse.nix ./locale.nix ./users.nix ./containers.nix diff --git a/system/mouse.nix b/system/mouse.nix new file mode 100644 index 0000000..b5d5b16 --- /dev/null +++ b/system/mouse.nix @@ -0,0 +1,15 @@ +{ + # Allow configuring Logitech Peripherals + services.ratbagd.enable = true; + + # Sway does not undersand high resolution scroll wheels + # I don't need this, so I disable it + environment.etc."libinput/local-overrides.quirks".text = '' + [Logitech G502 X PLUS] + MatchUdevType=mouse + MatchBus=usb + MatchVendor=0x046D + MatchProduct=0x4099 + AttrEventCode=-REL_WHEEL_HI_RES + ''; +} diff --git a/user/sway/default.nix b/user/sway/default.nix index 6b495d2..a8ed460 100644 --- a/user/sway/default.nix +++ b/user/sway/default.nix @@ -79,6 +79,12 @@ in }; # Ignore PS4 controller touchpad events input."1356:2508:Wireless_Controller_Touchpad".events = "disabled"; + + input."1133:16537:Logitech_G502_X_PLUS" = { + accel_profile = "flat"; + pointer_accel = "0"; + }; + input."type:touchpad" = { # Disable While Typing dwt = "enabled"; From a4b7e8ca5a05dc28d2ae5dcfc0459b1d22195cdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 16 Aug 2024 21:21:39 -0300 Subject: [PATCH 227/404] update --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index e10548a..a8868fa 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1722339003, - "narHash": "sha256-ZeS51uJI30ehNkcZ4uKqT4ZDARPyqrHADSKAwv5vVCU=", + "lastModified": 1723293904, + "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=", "owner": "ryantm", "repo": "agenix", - "rev": "3f1dae074a12feb7327b4bf43cbac0d124488bb7", + "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41", "type": "github" }, "original": { @@ -176,11 +176,11 @@ ] }, "locked": { - "lastModified": 1723080788, - "narHash": "sha256-C5LbM5VMdcolt9zHeLQ0bYMRjUL+N+AL5pK7/tVTdes=", + "lastModified": 1723685519, + "narHash": "sha256-GkXQIoZmW2zCPp1YFtAYGg/xHNyFH/Mgm79lcs81rq0=", "owner": "nix-community", "repo": "disko", - "rev": "ffc1f95f6c28e1c6d1e587b51a2147027a3e45ed", + "rev": "276a0d055a720691912c6a34abb724e395c8e38a", "type": "github" }, "original": { @@ -414,11 +414,11 @@ ] }, "locked": { - "lastModified": 1722740924, - "narHash": "sha256-UQPgA5d8azLZuDHZMPmvDszhuKF1Ek89SrTRtqsQ4Ss=", + "lastModified": 1723352546, + "narHash": "sha256-WTIrvp0yV8ODd6lxAq4F7EbrPQv0gscBnyfn559c3k8=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "97ca0a0fca0391de835f57e44f369a283e37890f", + "rev": "ec78079a904d7d55e81a0468d764d0fffb50ac06", "type": "github" }, "original": { @@ -456,11 +456,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1722869614, - "narHash": "sha256-7ojM1KSk3mzutD7SkrdSflHXEujPvW1u7QuqWoTLXQU=", + "lastModified": 1723556749, + "narHash": "sha256-+CHVZnTnIYRLYsARInHYoWkujzcRkLY/gXm3s5bE52o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "883180e6550c1723395a3a342f830bfc5c371f6b", + "rev": "4a92571f9207810b559c9eac203d1f4d79830073", "type": "github" }, "original": { From 18448867793479f649410b40462857c250938dfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 16 Aug 2024 21:21:54 -0300 Subject: [PATCH 228/404] vscode: don't use fhs --- user/vscode/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/vscode/default.nix b/user/vscode/default.nix index a477666..35d972b 100644 --- a/user/vscode/default.nix +++ b/user/vscode/default.nix @@ -3,7 +3,7 @@ programs.vscode = { enable = true; - package = pkgs.vscodium-fhs; + package = pkgs.vscodium; extensions = with pkgs.vscode-extensions; [ jnoortheen.nix-ide github.github-vscode-theme From dcfdac35169ebfa65e19496c156be66e6b2e761c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 17 Aug 2024 00:02:05 -0300 Subject: [PATCH 229/404] sway: suspend powerplay mousepad led in sync with mouse --- scripts/default.nix | 7 ++- scripts/powerplay-led-idle | 79 ++++++++++++++++++++++++++++++++ user/sway/default.nix | 1 + user/sway/powerplay-led-idle.nix | 17 +++++++ 4 files changed, 103 insertions(+), 1 deletion(-) create mode 100755 scripts/powerplay-led-idle create mode 100644 user/sway/powerplay-led-idle.nix diff --git a/scripts/default.nix b/scripts/default.nix index 01ce2b8..799403e 100644 --- a/scripts/default.nix +++ b/scripts/default.nix @@ -128,7 +128,12 @@ auto_connect_gamepad = [ bluez coreutils - gnugrep + final.gnugrep + ]; + powerplay-led-idle = [ + final.bash + libinput + libratbag ]; } // lib.mapAttrs import_script { diff --git a/scripts/powerplay-led-idle b/scripts/powerplay-led-idle new file mode 100755 index 0000000..a99905e --- /dev/null +++ b/scripts/powerplay-led-idle @@ -0,0 +1,79 @@ +#!/usr/bin/env bash + +set -e + +# Constants +SECONDS_UNTIL_FADE=$(( 1 * 60)) +SECONDS_UNTIL_OFF=$(( 5 * 60)) + +COLOR_ON=ff0000 +COLOR_FADE=880000 +COLOR_OFF=000000 + +# Logging + +if [[ "$1" = "debug" ]]; then + echo "Running with debugging" >&2 + DEBUG="true" + + SECONDS_UNTIL_FADE=$(( 3 )) + SECONDS_UNTIL_OFF=$(( 5 )) +fi + +log() { + if [[ "$DEBUG" = "true" ]]; then + echo "$@" >&2 + fi +} + +# Implementation + +main() { + CURRENT_STATE="UNKNOWN" + LAST_POINTER_MOTION="$(date +%s)" + + if [ "$(ratbagctl list | wc -l)" -ne 1 ]; then + echo "Not exactly one device found, exiting..." + exit 1 + fi + + DEVICE="$(ratbagctl list | cut -d: -f1)" + + while true; do + while read line; do + LAST_POINTER_MOTION="$(date +%s)" + break + done < <( + timeout 5s \ + libinput debug-events \ + | grep POINTER_MOTION + ) + TIME_SINCE_LAST=$(( "$(date +%s)" - "$LAST_POINTER_MOTION" )) + log "Last pointer motion was $TIME_SINCE_LAST seconds ago" + if [ "$TIME_SINCE_LAST" -gt "$SECONDS_UNTIL_OFF" ]; then + setState OFF "$COLOR_OFF" + elif [ "$TIME_SINCE_LAST" -gt "$SECONDS_UNTIL_FADE" ]; then + setState FADE "$COLOR_FADE" + else + setState ON "$COLOR_ON" + fi + done +} + +setState() { + STATE="$1" + COLOR="$2" + MODE="$3" + + if [[ "$STATE" = "$CURRENT_STATE" ]]; then + log "Already in $STATE state" + return + fi + log "Changing state to $STATE" + CURRENT_STATE="$STATE" + + ratbagctl "$DEVICE" led 0 set mode on + ratbagctl "$DEVICE" led 0 set color "$COLOR" +} + +main diff --git a/user/sway/default.nix b/user/sway/default.nix index a8ed460..af61969 100644 --- a/user/sway/default.nix +++ b/user/sway/default.nix @@ -23,6 +23,7 @@ in ./swayidle.nix ./swaylock.nix ./theme.nix + ./powerplay-led-idle.nix ]; config = lib.mkIf (config.my.desktop == "sway") { services.mako.enable = true; diff --git a/user/sway/powerplay-led-idle.nix b/user/sway/powerplay-led-idle.nix new file mode 100644 index 0000000..a6aa3e0 --- /dev/null +++ b/user/sway/powerplay-led-idle.nix @@ -0,0 +1,17 @@ +{ pkgs, lib, ... }: +{ + systemd.user.services.powerplay-led-idle = { + Unit = { + Description = "Autosuspend Powerplay mousepad led"; + PartOf = [ "graphical-session.target" ]; + After = [ "graphical-session.target" ]; + }; + Service = { + ExecStart = lib.getExe pkgs.powerplay-led-idle; + Restart = "on-failure"; + }; + Install = { + WantedBy = [ "sway-session.target" ]; + }; + }; +} From 6f832e601c4109e3edee16c6370620a8219a0bfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 17 Aug 2024 02:40:11 -0300 Subject: [PATCH 230/404] firefox: remove github autoload extension --- user/firefox.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/user/firefox.nix b/user/firefox.nix index 7ea410b..b23616a 100644 --- a/user/firefox.nix +++ b/user/firefox.nix @@ -49,11 +49,6 @@ in url = "https://github.com/OhMyGuus/I-Still-Dont-Care-About-Cookies/releases/download/v1.1.4/istilldontcareaboutcookies-1.1.4.xpi"; hash = "sha256-yt6yRiLTuaK4K/QwgkL9gCVGsSa7ndFOHqZvKqIGZ5U="; }) - (pkgs.fetchFirefoxAddon { - name = "github_no_more"; - url = "https://addons.mozilla.org/firefox/downloads/file/4293306/github_no_more-0.0.1.xpi"; - hash = "sha256-1vzgo7z4K6aZAVAo5VqihYQi77mZ0rE68xbt7Oqz29s="; - }) (pkgs.fetchFirefoxAddon { name = "vimium_ff"; From 00b20bdd5189c6f3c0b92e6dadf45a6e39f3476b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 17 Aug 2024 11:47:48 -0300 Subject: [PATCH 231/404] scripts: fixup infinite recursion and recompilations --- scripts/_diffr | 0 scripts/_sway_idle_toggle | 0 scripts/bmenu | 0 scripts/br | 0 scripts/default.nix | 76 +++++++++++++++++++-------------------- scripts/helix-pager | 0 scripts/kak-pager | 0 scripts/playerctl-status | 0 scripts/pulse_sink | 0 scripts/screenshotsh | 0 scripts/showkeys | 0 scripts/terminal | 0 scripts/wl-copy-file | 0 scripts/wpass | 0 14 files changed, 37 insertions(+), 39 deletions(-) mode change 100644 => 100755 scripts/_diffr mode change 100644 => 100755 scripts/_sway_idle_toggle mode change 100644 => 100755 scripts/bmenu mode change 100644 => 100755 scripts/br mode change 100644 => 100755 scripts/helix-pager mode change 100644 => 100755 scripts/kak-pager mode change 100644 => 100755 scripts/playerctl-status mode change 100644 => 100755 scripts/pulse_sink mode change 100644 => 100755 scripts/screenshotsh mode change 100644 => 100755 scripts/showkeys mode change 100644 => 100755 scripts/terminal mode change 100644 => 100755 scripts/wl-copy-file mode change 100644 => 100755 scripts/wpass diff --git a/scripts/_diffr b/scripts/_diffr old mode 100644 new mode 100755 diff --git a/scripts/_sway_idle_toggle b/scripts/_sway_idle_toggle old mode 100644 new mode 100755 diff --git a/scripts/bmenu b/scripts/bmenu old mode 100644 new mode 100755 diff --git a/scripts/br b/scripts/br old mode 100644 new mode 100755 diff --git a/scripts/default.nix b/scripts/default.nix index 799403e..c254599 100644 --- a/scripts/default.nix +++ b/scripts/default.nix @@ -1,34 +1,32 @@ ( final: prev: - with prev; let - import_script = (_: path: import (path) { inherit pkgs lib; }); - create_script = ( - name: text: runtimeInputs: - let - script_body = pkgs.writeTextFile { - inherit name; - executable = true; - text = '' - ${builtins.readFile text} - ''; - }; - in - (pkgs.writeShellApplication { - inherit name runtimeInputs; - text = ''exec ${script_body} "$@"''; - checkPhase = ""; - }) - ); - create_scripts = lib.mapAttrs (name: deps: create_script name ./${name} deps); + lib = prev.lib; - pass = pkgs.pass.withExtensions (ex: with ex; [ pass-otp ]); + importScript = (_: path: import (path) { inherit (final) pkgs lib; }); + wrapScript = + name: text: runtimeInputs: + final.runCommand name + { + nativeBuildInputs = [ final.makeWrapper ]; + meta.mainProgram = name; + } + '' + mkdir -p $out/bin + cp ${text} $out/bin/${name} + wrapProgram $out/bin/${name} \ + --suffix PATH : ${lib.makeBinPath runtimeInputs} + ''; + createScripts = lib.mapAttrs (name: deps: wrapScript name ./${name} deps); + + myPass = final.pass.withExtensions (ex: with ex; [ pass-otp ]); in - create_scripts { + with final; + createScripts { br = [ ]; bmenu = [ - final.bemenu - final.dhist + bemenu + dhist fish j4-dmenu-desktop jq @@ -44,21 +42,21 @@ fish ]; _diffr = [ diffr ]; - _thunar-terminal = [ final.terminal ]; - _sway_idle_toggle = [ final.swayidle ]; + _thunar-terminal = [ terminal ]; + _sway_idle_toggle = [ swayidle ]; kak-pager = [ fish - final._diffr + _diffr ]; - kak-man-pager = [ final.kak-pager ]; + kak-man-pager = [ kak-pager ]; helix-pager = [ fish - final._diffr + _diffr ]; - helix-man-pager = [ final.helix-pager ]; + helix-man-pager = [ helix-pager ]; musmenu = [ mpc-cli - final.wdmenu + wdmenu trash-cli xdg-user-dirs libnotify @@ -73,9 +71,9 @@ gnupg ]; wpass = [ - final.wdmenu + wdmenu fd - pass + myPass sd wl-clipboard wtype @@ -96,7 +94,7 @@ pulse_sink = [ pulseaudio pamixer - final.wdmenu + wdmenu ]; color_picker = [ grim @@ -108,13 +106,13 @@ dzadd = [ procps libnotify - final.wdmenu + wdmenu jq mpv pqiv python3Packages.deemix mpc-cli - final.mpdDup + mpdDup ]; mpdDup = [ mpc-cli @@ -128,15 +126,15 @@ auto_connect_gamepad = [ bluez coreutils - final.gnugrep + gnugrep ]; powerplay-led-idle = [ - final.bash + bash libinput libratbag ]; } - // lib.mapAttrs import_script { + // lib.mapAttrs importScript { wdmenu = ./wdmenu.nix; wlauncher = ./wlauncher.nix; _gpg-unlock = ./_gpg-unlock.nix; diff --git a/scripts/helix-pager b/scripts/helix-pager old mode 100644 new mode 100755 diff --git a/scripts/kak-pager b/scripts/kak-pager old mode 100644 new mode 100755 diff --git a/scripts/playerctl-status b/scripts/playerctl-status old mode 100644 new mode 100755 diff --git a/scripts/pulse_sink b/scripts/pulse_sink old mode 100644 new mode 100755 diff --git a/scripts/screenshotsh b/scripts/screenshotsh old mode 100644 new mode 100755 diff --git a/scripts/showkeys b/scripts/showkeys old mode 100644 new mode 100755 diff --git a/scripts/terminal b/scripts/terminal old mode 100644 new mode 100755 diff --git a/scripts/wl-copy-file b/scripts/wl-copy-file old mode 100644 new mode 100755 diff --git a/scripts/wpass b/scripts/wpass old mode 100644 new mode 100755 From 1e4fd37cff0f82330b7edd6f96a72a8214d342dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 17 Aug 2024 18:05:39 -0300 Subject: [PATCH 232/404] sway: fix mousepad led timeout --- scripts/powerplay-led-idle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/powerplay-led-idle b/scripts/powerplay-led-idle index a99905e..888abde 100755 --- a/scripts/powerplay-led-idle +++ b/scripts/powerplay-led-idle @@ -4,7 +4,7 @@ set -e # Constants SECONDS_UNTIL_FADE=$(( 1 * 60)) -SECONDS_UNTIL_OFF=$(( 5 * 60)) +SECONDS_UNTIL_OFF=$(( 6 * 60)) COLOR_ON=ff0000 COLOR_FADE=880000 From fc3c07c09344fb7c8b62004b4dcbde38304bfe77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 19 Aug 2024 00:01:40 -0300 Subject: [PATCH 233/404] hardware: always enable powerplay led idle --- user/home.nix | 1 + user/{sway => }/powerplay-led-idle.nix | 2 +- user/sway/default.nix | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) rename user/{sway => }/powerplay-led-idle.nix (88%) diff --git a/user/home.nix b/user/home.nix index 30f556e..e606b4f 100644 --- a/user/home.nix +++ b/user/home.nix @@ -42,6 +42,7 @@ ./xdg-dirs.nix inputs.nix-index-database.hmModules.nix-index ../settings + ./powerplay-led-idle.nix ]; my = import ./variables.nix; diff --git a/user/sway/powerplay-led-idle.nix b/user/powerplay-led-idle.nix similarity index 88% rename from user/sway/powerplay-led-idle.nix rename to user/powerplay-led-idle.nix index a6aa3e0..a34990e 100644 --- a/user/sway/powerplay-led-idle.nix +++ b/user/powerplay-led-idle.nix @@ -11,7 +11,7 @@ Restart = "on-failure"; }; Install = { - WantedBy = [ "sway-session.target" ]; + WantedBy = [ "graphical-session.target" ]; }; }; } diff --git a/user/sway/default.nix b/user/sway/default.nix index af61969..a8ed460 100644 --- a/user/sway/default.nix +++ b/user/sway/default.nix @@ -23,7 +23,6 @@ in ./swayidle.nix ./swaylock.nix ./theme.nix - ./powerplay-led-idle.nix ]; config = lib.mkIf (config.my.desktop == "sway") { services.mako.enable = true; From 1af0c86c5e947a91d81cb1e8c5c48cf703d4e3e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 19 Aug 2024 00:02:36 -0300 Subject: [PATCH 234/404] scripts: fix pass-export TOTP containing too much information for keepassxc --- scripts/default.nix | 1 + scripts/pass-export | 3 +++ 2 files changed, 4 insertions(+) diff --git a/scripts/default.nix b/scripts/default.nix index c254599..47aaac5 100644 --- a/scripts/default.nix +++ b/scripts/default.nix @@ -69,6 +69,7 @@ pass-export = [ pass2csv gnupg + sd ]; wpass = [ wdmenu diff --git a/scripts/pass-export b/scripts/pass-export index 658f803..27596fc 100755 --- a/scripts/pass-export +++ b/scripts/pass-export @@ -8,3 +8,6 @@ pass2csv "$PASSWORD_STORE_DIR" "$HOME/passwords.csv" \ -f User '(user|login)(:\s*)?' \ -f TOTP 'otpauth(:)?' \ -f URL 'url(:\s*)?' + +# Fix TOTP format for keepass +sd '"//totp/.*?secret=(.*?)(&.*?)?"' '"$1"' "$HOME/passwords.csv" \ No newline at end of file From 87871fa0a85c61c01fde1f6ed1a26118b48c9159 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 19 Aug 2024 00:04:42 -0300 Subject: [PATCH 235/404] gnome: use keepass as password manager --- user/gnome.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/gnome.nix b/user/gnome.nix index e5ef257..5a37f04 100644 --- a/user/gnome.nix +++ b/user/gnome.nix @@ -34,7 +34,7 @@ lib.mkIf (config.my.desktop == "gnome") { foliate amberol pitivi - gnome-passwordsafe + keepassxc libsForQt5.qt5ct libsForQt5.qtstyleplugin-kvantum From df51258918c4b6a5ca673878d719fd0b9c0a5665 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 19 Aug 2024 00:05:28 -0300 Subject: [PATCH 236/404] gnome: don't hardcode qt program styles --- user/gnome.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/user/gnome.nix b/user/gnome.nix index 5a37f04..443f1fe 100644 --- a/user/gnome.nix +++ b/user/gnome.nix @@ -42,10 +42,6 @@ lib.mkIf (config.my.desktop == "gnome") { qt6Packages.qtstyleplugin-kvantum ]; - home.sessionVariables = { - QT_QPA_PLATFORMTHEME = "qt5ct"; - }; - services.gpg-agent.pinentryPackage = pkgs.pinentry-gnome3; xdg.defaultApplications = { From 436188d4607b5c0a5f2e4633bd212b1c32e6a386 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 19 Aug 2024 11:51:40 -0300 Subject: [PATCH 237/404] firefox: fix tab bar style on gnome --- user/firefox.nix | 51 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 47 insertions(+), 4 deletions(-) diff --git a/user/firefox.nix b/user/firefox.nix index b23616a..48c4fc9 100644 --- a/user/firefox.nix +++ b/user/firefox.nix @@ -124,10 +124,53 @@ in "devtools.chrome.enabled" = true; "devtools.debugger.remote-enabled" = true; }; - userChrome = lib.mkIf (desktop == "sway") '' - #titlebar { display: none !important; } - #sidebar-header { display: none !important; } - ''; + userChrome = + if desktop == "sway" then + '' + #titlebar { display: none !important; } + #sidebar-header { display: none !important; } + '' + else + '' + /* Element | chrome://browser/content/browser.xhtml */ + + #navigator-toolbox { + display: grid; + grid-template-columns: 1fr 50px; + overflow: hidden; + } + + /* Element | chrome://browser/content/browser.xhtml */ + + #nav-bar { + flex: 1; + width: 100%; + grid-column: 1 / 3; + grid-row: 1; + z-index: 0; + padding-right: 29px !important; + } + + /* Element | chrome://browser/content/browser.xhtml */ + + .toolbar-items { + display: none; + } + + /* Element | chrome://browser/content/browser.xhtml */ + + #TabsToolbar { + max-width: 50px; + } + + /* Element | chrome://browser/content/browser.xhtml */ + + #titlebar { + max-width: 50px; + grid-area: 1 / 2; + z-index: 10; + } + ''; }; }; }; From 5abc32d0f4919d51c0443a4249baa1779c8e0d50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Tue, 20 Aug 2024 01:16:36 -0300 Subject: [PATCH 238/404] add user davikiwi --- hosts/phantom/users.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/hosts/phantom/users.nix b/hosts/phantom/users.nix index 6291321..493f913 100644 --- a/hosts/phantom/users.nix +++ b/hosts/phantom/users.nix @@ -40,6 +40,23 @@ ]; initialHashedPassword = "$y$j9T$E3aBBSSq0Gma8hZD9L7ov0$iCGDW4fqrXWfHO0qodBYYgMFA9CpIraoklHcPbJJrM3"; }; + + users.users.davikiwi = { + isNormalUser = true; + description = "Davi"; + hashedPassword = "$y$j9T$0e/rczjOVCy7PuwC3pG0V/$gTHZhfO4wQSlFvbDyfghbCnGI2uDI0a52zSrQ/yOA5A"; + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGgZDBnj+gVMHqoNvjpx2T/HqnxUDbLPshu+t7301gXd Davi@DESKTOP-EVHFGJ9" + ]; + extraGroups = [ "docker" ]; + packages = with pkgs; [ + (pkgs.python3.withPackages (python-pkgs: [ + python-pkgs.pip + python-pkgs.wheel + ])) + ]; + }; + security.sudo.wheelNeedsPassword = false; programs.fish.enable = true; From b18d3b52c2bf5316412f1bf866097487eb55850c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Tue, 20 Aug 2024 10:50:40 -0300 Subject: [PATCH 239/404] davi: extract configuration --- hosts/phantom/davi.nix | 26 ++++++++++++++++++++++++++ hosts/phantom/default.nix | 1 + hosts/phantom/users.nix | 16 ---------------- 3 files changed, 27 insertions(+), 16 deletions(-) create mode 100644 hosts/phantom/davi.nix diff --git a/hosts/phantom/davi.nix b/hosts/phantom/davi.nix new file mode 100644 index 0000000..876aee7 --- /dev/null +++ b/hosts/phantom/davi.nix @@ -0,0 +1,26 @@ +{ pkgs, ... }: +{ + users.users.davikiwi = { + isNormalUser = true; + description = "Davi"; + hashedPassword = "$y$j9T$0e/rczjOVCy7PuwC3pG0V/$gTHZhfO4wQSlFvbDyfghbCnGI2uDI0a52zSrQ/yOA5A"; + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGgZDBnj+gVMHqoNvjpx2T/HqnxUDbLPshu+t7301gXd Davi@DESKTOP-EVHFGJ9" + ]; + extraGroups = [ "docker" ]; + packages = with pkgs; [ + (pkgs.python3.withPackages (python-pkgs: [ + python-pkgs.pip + python-pkgs.wheel + ])) + ]; + }; + + services.nginx.virtualHosts."davikiwi.lelgenio.com" = { + enableACME = true; + forceSSL = true; + locations."/" = { + proxyPass = "http://127.0.0.1:24618"; + }; + }; +} diff --git a/hosts/phantom/default.nix b/hosts/phantom/default.nix index a0bf560..6c135d9 100644 --- a/hosts/phantom/default.nix +++ b/hosts/phantom/default.nix @@ -20,6 +20,7 @@ ./forgejo.nix ./warthunder-leak-counter.nix ./invidious.nix + ./davi.nix ]; networking.hostName = "phantom"; diff --git a/hosts/phantom/users.nix b/hosts/phantom/users.nix index 493f913..a881f50 100644 --- a/hosts/phantom/users.nix +++ b/hosts/phantom/users.nix @@ -41,22 +41,6 @@ initialHashedPassword = "$y$j9T$E3aBBSSq0Gma8hZD9L7ov0$iCGDW4fqrXWfHO0qodBYYgMFA9CpIraoklHcPbJJrM3"; }; - users.users.davikiwi = { - isNormalUser = true; - description = "Davi"; - hashedPassword = "$y$j9T$0e/rczjOVCy7PuwC3pG0V/$gTHZhfO4wQSlFvbDyfghbCnGI2uDI0a52zSrQ/yOA5A"; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGgZDBnj+gVMHqoNvjpx2T/HqnxUDbLPshu+t7301gXd Davi@DESKTOP-EVHFGJ9" - ]; - extraGroups = [ "docker" ]; - packages = with pkgs; [ - (pkgs.python3.withPackages (python-pkgs: [ - python-pkgs.pip - python-pkgs.wheel - ])) - ]; - }; - security.sudo.wheelNeedsPassword = false; programs.fish.enable = true; From 630660afcff654a31b2142bee951400bb5537198 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 28 Aug 2024 19:56:54 -0300 Subject: [PATCH 240/404] hardware: remove controller hacks --- scripts/auto_connect_gamepad | 27 --------------------------- scripts/default.nix | 5 ----- system/bluetooth.nix | 2 +- user/controller.nix | 26 -------------------------- user/home.nix | 1 - 5 files changed, 1 insertion(+), 60 deletions(-) delete mode 100755 scripts/auto_connect_gamepad delete mode 100644 user/controller.nix diff --git a/scripts/auto_connect_gamepad b/scripts/auto_connect_gamepad deleted file mode 100755 index d373281..0000000 --- a/scripts/auto_connect_gamepad +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -list_paired_controllers() { - bluetoothctl devices Paired | grep 'Controller' | cut -d' ' -f2 -} - -count_connected_controllers() { - bluetoothctl devices Connected | grep 'Controller' | wc -l -} - -try_to_connect_to_all_controllers() { - list_paired_controllers | while read paired_controller; do - echo "Trying to connect to controller $paired_controller" - bluetoothctl connect "$paired_controller" - done -} - -while true; do - echo "looping" - if test "$(count_connected_controllers)" -ne 0 ; then - echo "there is a controller connected, not attempting to connect to any other" - sleep 10s - continue - fi - sleep 1s - try_to_connect_to_all_controllers -done diff --git a/scripts/default.nix b/scripts/default.nix index 47aaac5..0e88436 100644 --- a/scripts/default.nix +++ b/scripts/default.nix @@ -124,11 +124,6 @@ zbar wl-clipboard ]; - auto_connect_gamepad = [ - bluez - coreutils - gnugrep - ]; powerplay-led-idle = [ bash libinput diff --git a/system/bluetooth.nix b/system/bluetooth.nix index 1bcea1f..a5d00c0 100644 --- a/system/bluetooth.nix +++ b/system/bluetooth.nix @@ -6,7 +6,7 @@ settings = { General = { DiscoverableTimeout = 0; - # Discoverable = true; + Discoverable = true; AlwaysPairable = true; }; Policy = { diff --git a/user/controller.nix b/user/controller.nix deleted file mode 100644 index fe08a98..0000000 --- a/user/controller.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ pkgs, lib, ... }: -{ - systemd.user.services = { - autoconnect-gamepad = { - Unit = { - Description = "Attempt to connect to game controllers"; - PartOf = [ "graphical-session.target" ]; - After = [ "graphical-session.target" ]; - }; - Service = { - ExecStart = lib.getExe pkgs.auto_connect_gamepad; - }; - Install = { - WantedBy = [ "sway-session.target" ]; - }; - }; - }; - - xdg.desktopEntries = { - disconnect-controller = { - name = "Disconnect Controller"; - exec = "bluetoothctl disconnect 84:30:95:97:1A:79"; - terminal = false; - }; - }; -} diff --git a/user/home.nix b/user/home.nix index e606b4f..315ea4b 100644 --- a/user/home.nix +++ b/user/home.nix @@ -8,7 +8,6 @@ }: { imports = [ - ./controller.nix ./waybar ./helix.nix ./kakoune From c273dbcb1eac3db86bf6cc5292f44e04e1deae1c Mon Sep 17 00:00:00 2001 From: lelgenio Date: Sat, 14 Sep 2024 15:23:01 -0300 Subject: [PATCH 241/404] update --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index a8868fa..d22245c 100644 --- a/flake.lock +++ b/flake.lock @@ -176,11 +176,11 @@ ] }, "locked": { - "lastModified": 1723685519, - "narHash": "sha256-GkXQIoZmW2zCPp1YFtAYGg/xHNyFH/Mgm79lcs81rq0=", + "lastModified": 1726325969, + "narHash": "sha256-Mlw7009cdFry9OHpS6jy294lXhb+gcRa0iS2hYhkC6s=", "owner": "nix-community", "repo": "disko", - "rev": "276a0d055a720691912c6a34abb724e395c8e38a", + "rev": "3632080c41d7a657995807689a08ef6c4bcb2c72", "type": "github" }, "original": { @@ -393,11 +393,11 @@ ] }, "locked": { - "lastModified": 1720042825, - "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", + "lastModified": 1725703823, + "narHash": "sha256-tDgM4d8mLK0Hd6YMB2w1BqMto1XBXADOzPEaLl10VI4=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", + "rev": "208df2e558b73b6a1f0faec98493cb59a25f62ba", "type": "github" }, "original": { @@ -414,11 +414,11 @@ ] }, "locked": { - "lastModified": 1723352546, - "narHash": "sha256-WTIrvp0yV8ODd6lxAq4F7EbrPQv0gscBnyfn559c3k8=", + "lastModified": 1725765290, + "narHash": "sha256-hwX53i24KyWzp2nWpQsn8lfGQNCP0JoW/bvQmcR1DPY=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "ec78079a904d7d55e81a0468d764d0fffb50ac06", + "rev": "642275444c5a9defce57219c944b3179bf2adaa9", "type": "github" }, "original": { @@ -456,11 +456,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1723556749, - "narHash": "sha256-+CHVZnTnIYRLYsARInHYoWkujzcRkLY/gXm3s5bE52o=", + "lastModified": 1726062281, + "narHash": "sha256-PyFVySdGj3enKqm8RQuo4v1KLJLmNLOq2yYOHsI6e2Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4a92571f9207810b559c9eac203d1f4d79830073", + "rev": "e65aa8301ba4f0ab8cb98f944c14aa9da07394f8", "type": "github" }, "original": { From 93ba59ccfbd8a089cfceee07b24c6ea8e1d2c69a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sun, 15 Sep 2024 20:22:24 -0300 Subject: [PATCH 242/404] pass: install import extension --- user/pass.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/user/pass.nix b/user/pass.nix index 9a0082d..4a69d12 100644 --- a/user/pass.nix +++ b/user/pass.nix @@ -9,7 +9,12 @@ config = { programs.password-store = { enable = true; - package = pkgs.pass.withExtensions (ex: with ex; [ pass-otp ]); + package = pkgs.pass.withExtensions ( + ex: with ex; [ + pass-otp + pass-import + ] + ); }; services = { pass-secret-service.enable = true; From 5ea6c66347a2b480f6bad96050b4ce06b706be1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 16 Sep 2024 01:13:56 -0300 Subject: [PATCH 243/404] sway: enable adaptive sync --- user/sway/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/user/sway/default.nix b/user/sway/default.nix index a8ed460..42e26af 100644 --- a/user/sway/default.nix +++ b/user/sway/default.nix @@ -71,6 +71,7 @@ in "*" = { bg = "${theme.background} fill"; mode = "1920x1080@144.000Hz"; + adaptive_sync = "on"; }; }; fonts = { From 4f044c97cf8eddc217cb187b4e5866ad5b3c849d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 18 Sep 2024 12:58:31 -0300 Subject: [PATCH 244/404] update --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index d22245c..689e9af 100644 --- a/flake.lock +++ b/flake.lock @@ -176,11 +176,11 @@ ] }, "locked": { - "lastModified": 1726325969, - "narHash": "sha256-Mlw7009cdFry9OHpS6jy294lXhb+gcRa0iS2hYhkC6s=", + "lastModified": 1726590912, + "narHash": "sha256-5bxY85siOIqOcQ8TOMAWLkMUZvLUADS2i5TsZhzUIZY=", "owner": "nix-community", "repo": "disko", - "rev": "3632080c41d7a657995807689a08ef6c4bcb2c72", + "rev": "d32d1504c77d7f6ba7e033357dcf638baceab9b7", "type": "github" }, "original": { @@ -393,11 +393,11 @@ ] }, "locked": { - "lastModified": 1725703823, - "narHash": "sha256-tDgM4d8mLK0Hd6YMB2w1BqMto1XBXADOzPEaLl10VI4=", + "lastModified": 1726592409, + "narHash": "sha256-2Y6CDvD/BD43WLS77PHu6dUHbdUfFhuzkY8oJAecD/U=", "owner": "nix-community", "repo": "home-manager", - "rev": "208df2e558b73b6a1f0faec98493cb59a25f62ba", + "rev": "2ab00f89dd3ecf8012f5090e6d7ca1a7ea30f594", "type": "github" }, "original": { @@ -414,11 +414,11 @@ ] }, "locked": { - "lastModified": 1725765290, - "narHash": "sha256-hwX53i24KyWzp2nWpQsn8lfGQNCP0JoW/bvQmcR1DPY=", + "lastModified": 1726449931, + "narHash": "sha256-1AX7MyYzP7sNgZiGF8jwehCCI75y2kBGwACeryJs+yE=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "642275444c5a9defce57219c944b3179bf2adaa9", + "rev": "c1b0fa0bec5478185eae2fd3f39b9e906fc83995", "type": "github" }, "original": { @@ -456,11 +456,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726062281, - "narHash": "sha256-PyFVySdGj3enKqm8RQuo4v1KLJLmNLOq2yYOHsI6e2Q=", + "lastModified": 1726447378, + "narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e65aa8301ba4f0ab8cb98f944c14aa9da07394f8", + "rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1", "type": "github" }, "original": { From 3b70708469240cb46708ac750696e4ee737933c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 18 Sep 2024 22:52:28 -0300 Subject: [PATCH 245/404] fish: fix git prompt not showing staged changes if there's no commit --- user/fish/fish_prompt.fish | 40 +++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/user/fish/fish_prompt.fish b/user/fish/fish_prompt.fish index 2cba6be..e5784bd 100644 --- a/user/fish/fish_prompt.fish +++ b/user/fish/fish_prompt.fish @@ -103,29 +103,29 @@ function fish_git_prompt _fish_prompt_warn "init" end - git rev-parse HEAD -- &>/dev/null - or return + # if we have at least one commit + if git rev-parse HEAD -- &>/dev/null + # print a "↑" if ahead of origin + test 0 -ne (git log --oneline "$git_remote_branch"..HEAD -- | wc -l) + and set -f _git_sync_ahead '↑' - # print a "↑" if ahead of origin - test 0 -ne (git log --oneline "$git_remote_branch"..HEAD -- | wc -l) - and set -f _git_sync_ahead '↑' + # print a "↓" if behind of origin + test 0 -lt (git log --oneline HEAD.."$git_remote_branch" -- | wc -l) + and set -l _git_sync_behind '↓' - # print a "↓" if behind of origin - test 0 -lt (git log --oneline HEAD.."$git_remote_branch" -- | wc -l) - and set -l _git_sync_behind '↓' + if set -q _git_sync_ahead _git_sync_behind + _fish_prompt_normal '⇅' + else if set -q _git_sync_ahead + _fish_prompt_normal '↑' + else if set -q _git_sync_behind + _fish_prompt_normal '↓' + end - if set -q _git_sync_ahead _git_sync_behind - _fish_prompt_normal '⇅' - else if set -q _git_sync_ahead - _fish_prompt_normal '↑' - else if set -q _git_sync_behind - _fish_prompt_normal '↓' - end - - if test -n "$git_log_unpushed" - and not string match -qr "$git_branch" "$git_log_unpushed" - _fish_prompt_normal '↻' - _fish_prompt_warn $git_log_unpushed[1] + if test -n "$git_log_unpushed" + and not string match -qr "$git_branch" "$git_log_unpushed" + _fish_prompt_normal '↻' + _fish_prompt_warn $git_log_unpushed[1] + end end ############################################################ From deec0c5653ff6289a11c679103a2991e216d409e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 19 Sep 2024 11:09:23 -0300 Subject: [PATCH 246/404] Revert "sway: disable vrr" This reverts commit 752f029bce075d605d22e1a0b40c016801467e13. --- scripts/default.nix | 1 + scripts/vrr-fullscreen | 28 ++++++++++++++++++++++++++++ user/sway/default.nix | 17 ++++++++++++++++- 3 files changed, 45 insertions(+), 1 deletion(-) create mode 100755 scripts/vrr-fullscreen diff --git a/scripts/default.nix b/scripts/default.nix index 0e88436..1e3290e 100644 --- a/scripts/default.nix +++ b/scripts/default.nix @@ -129,6 +129,7 @@ libinput libratbag ]; + vrr-fullscreen = [ ]; } // lib.mapAttrs importScript { wdmenu = ./wdmenu.nix; diff --git a/scripts/vrr-fullscreen b/scripts/vrr-fullscreen new file mode 100755 index 0000000..8413923 --- /dev/null +++ b/scripts/vrr-fullscreen @@ -0,0 +1,28 @@ +#!/usr/bin/env bash + +# List of supported outputs for VRR +output_vrr_whitelist=( + "DP-1" + "DP-2" +) + +# Toggle VRR for fullscreened apps in prespecified displays to avoid stutters while in desktop +swaymsg -t subscribe -m '[ "window" ]' | while read window_json; do + window_event=$(echo ${window_json} | jq -r '.change') + + # Process only focus change and fullscreen toggle + if [[ $window_event = "focus" || $window_event = "fullscreen_mode" ]]; then + output_json=$(swaymsg -t get_outputs | jq -r '.[] | select(.focused == true)') + output_name=$(echo ${output_json} | jq -r '.name') + + # Use only VRR in whitelisted outputs + if [[ ${output_vrr_whitelist[*]} =~ ${output_name} ]]; then + output_vrr_status=$(echo ${output_json} | jq -r '.adaptive_sync_status') + window_fullscreen_status=$(echo ${window_json} | jq -r '.container.fullscreen_mode') + + # Only update output if nesseccary to avoid flickering + [[ $output_vrr_status = "disabled" && $window_fullscreen_status = "1" ]] && swaymsg output "${output_name}" adaptive_sync 1 + [[ $output_vrr_status = "enabled" && $window_fullscreen_status = "0" ]] && swaymsg output "${output_name}" adaptive_sync 0 + fi + fi +done diff --git a/user/sway/default.nix b/user/sway/default.nix index 42e26af..2a6dc70 100644 --- a/user/sway/default.nix +++ b/user/sway/default.nix @@ -69,9 +69,9 @@ in }; output = { "*" = { + adaptive_sync = "off"; bg = "${theme.background} fill"; mode = "1920x1080@144.000Hz"; - adaptive_sync = "on"; }; }; fonts = { @@ -122,6 +122,21 @@ in indicator = true; }; + systemd.user.services.vrr-fullscreen = { + Unit = { + Description = "Enable VRR for fullscreen windows"; + PartOf = [ "graphical-session.target" ]; + After = [ "graphical-session.target" ]; + }; + Service = { + ExecStart = "${lib.getExe pkgs.vrr-fullscreen}"; + Restart = "on-failure"; + }; + Install = { + WantedBy = [ "sway-session.target" ]; + }; + }; + services.gpg-agent.pinentryPackage = pkgs.pinentry-all; xdg.configFile."OpenTabletDriver/settings.json".source = ./open-tablet-driver.json; From b9fd4e0b7e2d23efec28080a764810bb840102aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 30 Aug 2024 19:25:36 -0300 Subject: [PATCH 247/404] monolith: switch to latest kernel --- hosts/monolith/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/monolith/default.nix b/hosts/monolith/default.nix index b45a935..3350e0d 100644 --- a/hosts/monolith/default.nix +++ b/hosts/monolith/default.nix @@ -36,6 +36,8 @@ in hardware.opentabletdriver.enable = true; + boot.kernelPackages = pkgs.linuxPackages_latest; + boot.extraModulePackages = with config.boot.kernelPackages; [ zenpower ]; boot.initrd.kernelModules = [ "amdgpu" ]; boot.kernelModules = [ From e10fc81ebb74b3c1029dad8d61205ca2932c102c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 25 Sep 2024 22:24:46 -0300 Subject: [PATCH 248/404] flake: add unstable --- flake.lock | 16 ++++++++++++++++ flake.nix | 7 ++++++- overlays/default.nix | 5 +++++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index 689e9af..a76aa8d 100644 --- a/flake.lock +++ b/flake.lock @@ -469,6 +469,21 @@ "type": "indirect" } }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1726937504, + "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9357f4f23713673f310988025d9dc261c20e70c6", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, "plymouth-themes": { "flake": false, "locked": { @@ -512,6 +527,7 @@ "nix-index-database": "nix-index-database", "nixos-mailserver": "nixos-mailserver", "nixpkgs": "nixpkgs", + "nixpkgs-unstable": "nixpkgs-unstable", "plymouth-themes": "plymouth-themes", "ranger-icons": "ranger-icons", "tlauncher": "tlauncher", diff --git a/flake.nix b/flake.nix index 23ece59..ec2011f 100644 --- a/flake.nix +++ b/flake.nix @@ -2,6 +2,8 @@ description = "My system config"; inputs = { nixpkgs.url = "nixpkgs/nixos-24.05"; + nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; + home-manager.url = "github:nix-community/home-manager/release-24.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; @@ -157,7 +159,10 @@ }; phantom = lib.nixosSystem { inherit system specialArgs; - modules = [ ./hosts/phantom ]; + modules = [ + { nixpkgs.pkgs = pkgs; } + ./hosts/phantom + ]; }; }; diff --git a/overlays/default.nix b/overlays/default.nix index 2ac2ae1..8886897 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -2,6 +2,7 @@ rec { all = [ scripts + unstable themes new-packages patches @@ -11,6 +12,10 @@ rec { scripts = (import ../scripts); + unstable = final: prev: { + unstable = import inputs.nixpkgs-unstable { inherit (final) system config; }; + }; + themes = ( final: prev: { papirus_red = (final.papirus-icon-theme.override { color = "red"; }); From 0809764c5868a41178279a363c7eabd7227b6d7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 25 Sep 2024 22:08:10 -0300 Subject: [PATCH 249/404] invidious: install many helpers --- hosts/phantom/invidious.nix | 34 +++++++++++++++++++++++--- secrets/phantom-invidious-settings.age | 16 ++++++++++++ secrets/secrets.nix | 1 + 3 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 secrets/phantom-invidious-settings.age diff --git a/hosts/phantom/invidious.nix b/hosts/phantom/invidious.nix index 8c1e0f6..60c1dca 100644 --- a/hosts/phantom/invidious.nix +++ b/hosts/phantom/invidious.nix @@ -1,12 +1,40 @@ { + inputs, + pkgs, + config, + ... +}: +{ + # Replace with unstable, since 24.05 does not have sig-helper + disabledModules = [ "services/web-apps/invidious.nix" ]; + imports = [ (inputs.nixpkgs-unstable + "/nixos/modules/services/web-apps/invidious.nix") ]; + services.invidious = { enable = true; domain = "invidious.lelgenio.com"; nginx.enable = true; port = 10601; - settings.db = { - user = "invidious"; - dbname = "invidious"; + http3-ytproxy.enable = true; + sig-helper = { + enable = true; + package = pkgs.unstable.inv-sig-helper; + }; + # { + # "visitor_data": "...", + # "po_token": "..." + # } + extraSettingsFile = config.age.secrets.phantom-invidious-settings.path; + settings = { + force_resolve = "ipv6"; + db = { + user = "invidious"; + dbname = "invidious"; + }; }; }; + + age.secrets.phantom-invidious-settings = { + file = ../../secrets/phantom-invidious-settings.age; + mode = "666"; + }; } diff --git a/secrets/phantom-invidious-settings.age b/secrets/phantom-invidious-settings.age new file mode 100644 index 0000000..6ca9077 --- /dev/null +++ b/secrets/phantom-invidious-settings.age @@ -0,0 +1,16 @@ +age-encryption.org/v1 +-> ssh-rsa BwwxHg +iTcgtxF1IxopbtF+aw7V8IQfH7tWiMk9lE/eWlVHVjeaRvER5W6Y3xZNOFCjtbqY +VwEyV6ibfZ4GJt1jRu2icEH/AnLUJFFGQnxu/K/rtoZ3tqSIk9WCBv3aPo4oZRiU +uaaxi2gD8qo1RLyl/Ij7Djw4i/isUOO1EON5sgx1d39k6qUD4Mak0DSU4EtGdTsr +OaxDAc0kAxhxZQOUH/QlKa0HLonaFcy1LHqvttOcw3UZuZnaYfZiPlcqe3USS9cm +96aIC5cS9pHr4JFrqRYvfpla2TY5jlCB/xBGw3KjGEIQoBPXSsJZA6BCMZyp00++ +tdfS2aomt9HFmb1wZDS0jWAxkVF6nXXBbolFVih+58h0nYLljtHIQ3SizRoXY459 +x3JE9NReHp2OO3SlIeO03Kv8YMBvj7nSSd1C1PMpu+hJ/eCXi1WQxD6QY+40muk6 +KhqE3PZ8BCY2b+VpywUF5gVH28mo3jscqAzhf2dZ3SQlzldI+hFyKPxTdAqkfUOH + +--- cinb+wzjVfTkpfm1CtFIFaepwoQVCj1MquB5rAC45Ew + +6 +ZCHS0 7 EX* qb=OwuP ǖѳ/mv2Vī +xv[̂A~evd0ni1қQ"@ٹ{Kp:ϵusB(Xr[QVgT@*B .hE鲟뒭zlz|k`l88McchZ` ?yeo+M-:/**cZD2&Ǣ e*Hn"~+|ua(6J \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 368b837..7b5fdd8 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -17,4 +17,5 @@ in "phantom-renawiki.age".publicKeys = [ main_ssh_public_key ]; "phantom-forgejo-mailer-password.age".publicKeys = [ main_ssh_public_key ]; "phantom-mastodon-mailer-password.age".publicKeys = [ main_ssh_public_key ]; + "phantom-invidious-settings.age".publicKeys = [ main_ssh_public_key ]; } From 8d85dd15d78c9992b7fb7a089874bad45f96a72d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 27 Sep 2024 20:08:08 -0300 Subject: [PATCH 250/404] phantom: use NAS for syncthing data --- hosts/phantom/hardware-config.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hosts/phantom/hardware-config.nix b/hosts/phantom/hardware-config.nix index 683a684..4df34c8 100644 --- a/hosts/phantom/hardware-config.nix +++ b/hosts/phantom/hardware-config.nix @@ -5,6 +5,12 @@ ... }: { + fileSystems."/var/lib/syncthing-data" = { + device = "172.16.130.7:/nas/5749/syncthinng_data"; + fsType = "nfs"; + options = [ "nofail" ]; + }; + swapDevices = [ { device = "/swap/swapfile"; From f0af06970caf96d0450e59ca99d26050bfdbae72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 27 Sep 2024 20:26:11 -0300 Subject: [PATCH 251/404] phantom: load vpsfreecz configuration from upstream instead of duplicating --- flake.lock | 16 ++++++++ flake.nix | 2 + hosts/phantom/default.nix | 2 +- hosts/phantom/vpsadminos.nix | 76 ------------------------------------ 4 files changed, 19 insertions(+), 77 deletions(-) delete mode 100644 hosts/phantom/vpsadminos.nix diff --git a/flake.lock b/flake.lock index a76aa8d..2df61ec 100644 --- a/flake.lock +++ b/flake.lock @@ -531,6 +531,7 @@ "plymouth-themes": "plymouth-themes", "ranger-icons": "ranger-icons", "tlauncher": "tlauncher", + "vpsadminos": "vpsadminos", "warthunder-leak-counter": "warthunder-leak-counter", "wl-crosshair": "wl-crosshair" } @@ -723,6 +724,21 @@ "type": "github" } }, + "vpsadminos": { + "locked": { + "lastModified": 1727306253, + "narHash": "sha256-PdVXdZvhAqQFALZiACXIjwFRSo0EhEKMm94uxvyFyPk=", + "owner": "vpsfreecz", + "repo": "vpsadminos", + "rev": "bd2b87cbcb75a9e9aa25f76fb7e1f0f625963277", + "type": "github" + }, + "original": { + "owner": "vpsfreecz", + "repo": "vpsadminos", + "type": "github" + } + }, "warthunder-leak-counter": { "inputs": { "crane": "crane_2", diff --git a/flake.nix b/flake.nix index ec2011f..1150434 100644 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,8 @@ home-manager.url = "github:nix-community/home-manager/release-24.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; + vpsadminos.url = "github:vpsfreecz/vpsadminos"; + nix-index-database = { url = "github:Mic92/nix-index-database"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/hosts/phantom/default.nix b/hosts/phantom/default.nix index 6c135d9..ad4c42e 100644 --- a/hosts/phantom/default.nix +++ b/hosts/phantom/default.nix @@ -6,7 +6,7 @@ }: { imports = [ - ./vpsadminos.nix + inputs.vpsadminos.nixosConfigurations.container inputs.agenix.nixosModules.default ../../system/nix.nix ./hardware-config.nix diff --git a/hosts/phantom/vpsadminos.nix b/hosts/phantom/vpsadminos.nix deleted file mode 100644 index 8102fbb..0000000 --- a/hosts/phantom/vpsadminos.nix +++ /dev/null @@ -1,76 +0,0 @@ -# This file provides compatibility for NixOS to run in a container on vpsAdminOS -# hosts. -# -# If you're experiencing issues, try updating this file to the latest version -# from vpsAdminOS repository: -# -# https://github.com/vpsfreecz/vpsadminos/blob/staging/os/lib/nixos-container/vpsadminos.nix - -{ - config, - pkgs, - lib, - ... -}: -with lib; -let - nameservers = [ - "1.1.1.1" - "2606:4700:4700::1111" - ]; -in -{ - networking.nameservers = mkDefault nameservers; - services.resolved = mkDefault { fallbackDns = nameservers; }; - networking.dhcpcd.extraConfig = "noipv4ll"; - - systemd.services.systemd-sysctl.enable = false; - systemd.services.systemd-oomd.enable = false; - systemd.sockets."systemd-journald-audit".enable = false; - systemd.mounts = [ - { - where = "/sys/kernel/debug"; - enable = false; - } - ]; - systemd.services.rpc-gssd.enable = false; - - # Due to our restrictions in /sys, the default systemd-udev-trigger fails - # on accessing PCI devices, etc. Override it to match only network devices. - # In addition, boot.isContainer prevents systemd-udev-trigger.service from - # being enabled at all, so add it explicitly. - systemd.additionalUpstreamSystemUnits = [ "systemd-udev-trigger.service" ]; - systemd.services.systemd-udev-trigger.serviceConfig.ExecStart = [ - "" - "-udevadm trigger --subsystem-match=net --action=add" - ]; - - boot.isContainer = true; - boot.enableContainers = mkDefault true; - boot.loader.initScript.enable = true; - boot.specialFileSystems."/run/keys".fsType = mkForce "tmpfs"; - boot.systemdExecutable = mkDefault "/run/current-system/systemd/lib/systemd/systemd systemd.unified_cgroup_hierarchy=0"; - - # Overrides for - documentation.enable = mkOverride 500 true; - documentation.nixos.enable = mkOverride 500 true; - networking.useHostResolvConf = mkOverride 500 false; - services.openssh.startWhenNeeded = mkOverride 500 false; - - # Bring up the network, /ifcfg.{add,del} are supplied by the vpsAdminOS host - systemd.services.networking-setup = { - description = "Load network configuration provided by the vpsAdminOS host"; - before = [ "network.target" ]; - wantedBy = [ "network.target" ]; - after = [ "network-pre.target" ]; - path = [ pkgs.iproute2 ]; - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; - ExecStart = "${pkgs.bash}/bin/bash /ifcfg.add"; - ExecStop = "${pkgs.bash}/bin/bash /ifcfg.del"; - }; - unitConfig.ConditionPathExists = "/ifcfg.add"; - restartIfChanged = false; - }; -} From 653f016b5152f9b27d1f0f02471213a7c1742629 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 27 Sep 2024 21:27:27 -0300 Subject: [PATCH 252/404] home: cleanup unused packages --- user/home.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/user/home.nix b/user/home.nix index 315ea4b..b9fcc4c 100644 --- a/user/home.nix +++ b/user/home.nix @@ -54,9 +54,7 @@ # Let Home Manager install and manage itself. programs.home-manager.enable = true; home.packages = with pkgs; [ - # home-manager - - terminal # see flake.nix + terminal pulse_sink pulseaudio @@ -81,7 +79,6 @@ amdgpu_top inxi dmidecode - ncdu ## text manipulation sd @@ -110,7 +107,6 @@ ## Network speedtest-cli nmap - httpie miniupnpc deluge nicotine-plus @@ -122,7 +118,6 @@ # rustup docker-compose - gnumake mariadb nodePackages.intelephense From 7eedcdcd03fa6d315d72d704cb85acacd70323ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sun, 29 Sep 2024 00:11:28 -0300 Subject: [PATCH 253/404] switch: update switch script --- switch | 5 ++--- user/fish/default.nix | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/switch b/switch index 65782ae..1b114fc 100755 --- a/switch +++ b/switch @@ -4,10 +4,9 @@ nix fmt git --no-pager diff -sudo nice ionice \ - nixos-rebuild \ +nixos-rebuild \ switch \ - --verbose \ + --use-remote-sudo \ --print-build-logs \ --flake .# \ $@ diff --git a/user/fish/default.nix b/user/fish/default.nix index a744d02..30893ee 100644 --- a/user/fish/default.nix +++ b/user/fish/default.nix @@ -36,7 +36,6 @@ in shellAliases = { rm = "trash"; tree = "eza -T"; - kill_yourself = "shutdown now"; }; shellAbbrs = { off = "shutdown now"; @@ -51,7 +50,7 @@ in c = "cargo"; # system sv = "sudo systemct"; - suv = "sudo systemct --user"; + suv = "systemct --user"; # docker abbrs d = "docker"; dc = "docker-compose"; From 0ca0475dd459e248c7f0e1122dca43653237f74f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 30 Sep 2024 11:49:48 -0300 Subject: [PATCH 254/404] phantom: add docker --- hosts/phantom/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/hosts/phantom/default.nix b/hosts/phantom/default.nix index ad4c42e..84b2a5d 100644 --- a/hosts/phantom/default.nix +++ b/hosts/phantom/default.nix @@ -56,6 +56,18 @@ identityPaths = [ "/root/.ssh/id_rsa" ]; }; + virtualisation.docker = { + enable = true; + daemon.settings = { + # needed by bitbucket runner ??? + log-driver = "json-file"; + log-opts = { + max-size = "10m"; + max-file = "3"; + }; + }; + }; + nix.settings = { cores = 1; max-jobs = 1; From 53894b285473957ef13fdd792245cbbb6ec2f9d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Tue, 1 Oct 2024 11:00:26 -0300 Subject: [PATCH 255/404] nixos: workaround for nm-wait-online hanging during nixos switch --- system/configuration.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/system/configuration.nix b/system/configuration.nix index c8095f6..b905240 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -48,6 +48,15 @@ services.geoclue2.enable = true; + # Workaround for nm-wait-online hanging?? + # Ref: https://github.com/NixOS/nixpkgs/issues/180175 + systemd.services.NetworkManager-wait-online = { + serviceConfig.ExecStart = [ + "" + "${pkgs.networkmanager}/bin/nm-online -q" + ]; + }; + systemd.extraConfig = '' DefaultTimeoutStopSec=10s ''; From cfe08e3b20d18531d8d634a9089c75c8b69bf982 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Tue, 1 Oct 2024 10:50:43 -0300 Subject: [PATCH 256/404] pkgs: use upstream kak-tree-sitter --- pkgs/default.nix | 1 - pkgs/kak-tree-sitter.nix | 34 -------------------------------- user/kakoune/default.nix | 2 +- user/kakoune/kak-tree-sitter.nix | 2 +- 4 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 pkgs/kak-tree-sitter.nix diff --git a/pkgs/default.nix b/pkgs/default.nix index eccb020..1332030 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -9,5 +9,4 @@ rec { emmet-cli = pkgs.callPackage ./emmet-cli.nix { }; material-wifi-icons = pkgs.callPackage ./material-wifi-icons.nix { }; gnome-pass-search-provider = pkgs.callPackage ./gnome-pass-search-provider.nix { }; - kak-tree-sitter = pkgs.callPackage ./kak-tree-sitter.nix { }; } diff --git a/pkgs/kak-tree-sitter.nix b/pkgs/kak-tree-sitter.nix deleted file mode 100644 index 3e3d9d1..0000000 --- a/pkgs/kak-tree-sitter.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - lib, - stdenv, - rustPlatform, - fetchFromSourcehut, - makeWrapper, -}: - -rustPlatform.buildRustPackage rec { - pname = "kak-tree-sitter"; - version = "1.1.2"; - - src = fetchFromSourcehut { - owner = "~hadronized"; - repo = "kak-tree-sitter"; - rev = "kak-tree-sitter-v${version}"; - hash = "sha256-wBWfSyR8LGtug/mCD0bJ4lbdN3trIA/03AnCxZoEOSA="; - }; - - cargoSha256 = "sha256-OQPUWqJAts8DbFNSsC/CmMCbuZ9TVxRTR05O7oiodKI="; - - nativeBuildInputs = [ makeWrapper ]; - - postFixup = '' - wrapProgram "$out/bin/ktsctl" \ - --suffix PATH : ${stdenv.cc} - ''; - - meta = with lib; { - description = "Server that interfaces tree-sitter with kakoune"; - homepage = "https://git.sr.ht/~hadronized/kak-tree-sitter"; - license = with licenses; [ mit ]; - }; -} diff --git a/user/kakoune/default.nix b/user/kakoune/default.nix index 051f21d..337e007 100644 --- a/user/kakoune/default.nix +++ b/user/kakoune/default.nix @@ -127,7 +127,7 @@ in ranger bmenu kak-lsp - kak-tree-sitter + unstable.kak-tree-sitter kak-pager kak-man-pager diff --git a/user/kakoune/kak-tree-sitter.nix b/user/kakoune/kak-tree-sitter.nix index 8818f1f..59ab3e0 100644 --- a/user/kakoune/kak-tree-sitter.nix +++ b/user/kakoune/kak-tree-sitter.nix @@ -1,7 +1,7 @@ { pkgs, lib, ... }: let hx-src = pkgs.helix.src; - kts-src = pkgs.kak-tree-sitter.src; + kts-src = pkgs.unstable.kak-tree-sitter-unwrapped.src; inherit (pkgs) fetchFromGitHub; in with pkgs.tree-sitter-grammars; From 1fb1bec2247772036bfea4118f33966da89887d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Tue, 1 Oct 2024 11:00:59 -0300 Subject: [PATCH 257/404] pkgs: use upstream blade-formatter --- pkgs/blade-formatter/default.nix | 64 ---------------- pkgs/blade-formatter/package.json | 120 ------------------------------ pkgs/default.nix | 1 - user/home.nix | 2 +- 4 files changed, 1 insertion(+), 186 deletions(-) delete mode 100644 pkgs/blade-formatter/default.nix delete mode 100755 pkgs/blade-formatter/package.json diff --git a/pkgs/blade-formatter/default.nix b/pkgs/blade-formatter/default.nix deleted file mode 100644 index f824066..0000000 --- a/pkgs/blade-formatter/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ - lib, - mkYarnPackage, - fetchFromGitHub, - fetchYarnDeps, - testers, - writeText, - runCommand, - blade-formatter, -}: - -mkYarnPackage rec { - pname = "blade-formatter"; - version = "1.38.2"; - - src = fetchFromGitHub { - owner = "shufo"; - repo = pname; - rev = "v${version}"; - hash = "sha256-JvILLw7Yp4g/dSsYtZ2ylmlXfS9t+2KADlBrYOJWTpg="; - }; - - packageJSON = ./package.json; - offlineCache = fetchYarnDeps { - yarnLock = "${src}/yarn.lock"; - hash = "sha256-UFDxw3fYMzSUhZw+TCEh/dN7OioKI75LzKSnEwGPKDA="; - }; - - postBuild = "yarn build"; - - passthru.tests = { - version = testers.testVersion { - package = blade-formatter; - command = "blade-formatter --version"; - }; - - simple = testers.testEqualContents { - assertion = "blade-formatter formats a basic blade file"; - expected = writeText "expected" '' - @if (true) - Hello world! - @endif - ''; - actual = - runCommand "actual" - { - nativeBuildInputs = [ blade-formatter ]; - base = writeText "base" '' - @if( true ) Hello world! @endif - ''; - } - '' - blade-formatter $base > $out - ''; - }; - }; - - meta = with lib; { - description = "Laravel Blade template formatter"; - homepage = "https://github.com/shufo/blade-formatter"; - license = licenses.mit; - maintainers = with maintainers; [ lelgenio ]; - }; -} diff --git a/pkgs/blade-formatter/package.json b/pkgs/blade-formatter/package.json deleted file mode 100755 index b43fa5c..0000000 --- a/pkgs/blade-formatter/package.json +++ /dev/null @@ -1,120 +0,0 @@ -{ - "name": "blade-formatter", - "engines": { - "node": ">= 14.0.0" - }, - "keywords": [ - "php", - "formatter", - "laravel" - ], - "version": "1.38.2", - "description": "An opinionated blade template formatter for Laravel", - "main": "./dist/bundle.cjs", - "types": "./dist/types/main.d.ts", - "type": "module", - "exports": { - ".": { - "import": "./dist/bundle.js", - "require": "./dist/bundle.cjs", - "default": "./dist/bundle.js" - }, - "./*": "./*" - }, - "scripts": { - "build": "cross-env NODE_ENV=production node esbuild.js && cross-env NODE_ENV=production ESM_BUILD=true node esbuild.js", - "prepublish": "tsc src/main.ts --declaration --emitDeclarationOnly --outDir ./dist/types || true", - "watch": "node esbuild.js", - "test": "yarn run build && node --experimental-vm-modules node_modules/.bin/jest", - "lint": "eslint src -c .eslintrc.json --ext ts", - "fix": "prettier {src,__tests__}/**/*.ts --write", - "check_formatted": "prettier **/*.ts -c", - "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0", - "prepare": "husky install", - "bin": "cross-env ./bin/blade-formatter.cjs" - }, - "bin": { - "blade-formatter": "bin/blade-formatter.cjs" - }, - "author": "Shuhei Hayashibara", - "license": "MIT", - "dependencies": { - "@prettier/plugin-php": "^0.19.7", - "@shufo/tailwindcss-class-sorter": "3.0.1", - "aigle": "^1.14.1", - "ajv": "^8.9.0", - "chalk": "^4.1.0", - "concat-stream": "^2.0.0", - "detect-indent": "^6.0.0", - "find-config": "^1.0.0", - "glob": "^8.0.1", - "html-attribute-sorter": "^0.4.3", - "ignore": "^5.1.8", - "js-beautify": "^1.14.8", - "lodash": "^4.17.19", - "php-parser": "3.1.5", - "prettier": "^2.2.0", - "tailwindcss": "^3.1.8", - "vscode-oniguruma": "1.7.0", - "vscode-textmate": "^7.0.1", - "xregexp": "^5.0.1", - "yargs": "^17.3.1" - }, - "devDependencies": { - "@babel/core": "^7.6.4", - "@babel/plugin-transform-modules-commonjs": "^7.16.5", - "@babel/preset-env": "^7.13.12", - "@babel/preset-typescript": "^7.16.5", - "@types/concat-stream": "^2.0.0", - "@types/find-config": "^1.0.1", - "@types/fs-extra": "^11.0.0", - "@types/glob": "^8.0.0", - "@types/jest": "^29.0.0", - "@types/js-beautify": "^1.13.3", - "@types/lodash": "^4.14.178", - "@types/mocha": "^10.0.0", - "@types/node": "^18.0.0", - "@types/xregexp": "^4.4.0", - "@typescript-eslint/eslint-plugin": "^5.8.1", - "@typescript-eslint/parser": "^5.8.1", - "app-root-path": "^3.0.0", - "babel-jest": "^29.0.0", - "codecov": "^3.8.3", - "cross-env": "^7.0.3", - "esbuild": "^0.19.0", - "esbuild-node-externals": "^1.4.1", - "eslint": "^8.5.0", - "eslint-config-airbnb-base": "^15.0.0", - "eslint-config-airbnb-typescript": "^17.0.0", - "eslint-config-prettier": "^9.0.0", - "eslint-import-resolver-typescript": "^3.0.0", - "eslint-plugin-import": "^2.25.3", - "eslint-plugin-jest": "^26.0.0", - "eslint-plugin-prettier": "^5.0.0", - "fs-extra": "^11.0.0", - "husky": "^8.0.0", - "jest": "^29.0.0", - "lint-staged": ">=10", - "source-map-loader": "^4.0.0", - "ts-jest": "^29.0.0", - "ts-loader": "^9.2.6", - "ts-migrate": "^0.1.27", - "ts-node": "^10.4.0", - "typescript": "^5.0.0" - }, - "repository": { - "type": "git", - "url": "https://github.com/shufo/blade-formatter.git" - }, - "files": [ - "dist", - "src", - "bin", - "wasm", - "syntaxes", - "CHANGELOG.md" - ], - "lint-staged": { - "*.ts": "yarn run fix" - } -} diff --git a/pkgs/default.nix b/pkgs/default.nix index 1332030..b3f1b79 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -3,7 +3,6 @@ { pkgs, inputs }: rec { - blade-formatter = pkgs.callPackage ./blade-formatter { }; cargo-checkmate = pkgs.callPackage ./cargo-checkmate.nix { }; lipsum = pkgs.callPackage ./lipsum.nix { }; emmet-cli = pkgs.callPackage ./emmet-cli.nix { }; diff --git a/user/home.nix b/user/home.nix index b9fcc4c..aef10ad 100644 --- a/user/home.nix +++ b/user/home.nix @@ -127,7 +127,7 @@ clang-tools # c/c++ lsp server rust-analyzer # rust analyzer - blade-formatter + unstable.blade-formatter nixfmt-rfc-style ]; From 9eaabe5146bff6c9515654262002ca6691b53183 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Tue, 1 Oct 2024 10:46:58 -0300 Subject: [PATCH 258/404] update --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 2df61ec..b031598 100644 --- a/flake.lock +++ b/flake.lock @@ -176,11 +176,11 @@ ] }, "locked": { - "lastModified": 1726590912, - "narHash": "sha256-5bxY85siOIqOcQ8TOMAWLkMUZvLUADS2i5TsZhzUIZY=", + "lastModified": 1727531434, + "narHash": "sha256-b+GBgCWd2N6pkiTkRZaMFOPztPO4IVTaclYPrQl2uLk=", "owner": "nix-community", "repo": "disko", - "rev": "d32d1504c77d7f6ba7e033357dcf638baceab9b7", + "rev": "b709e1cc33fcde71c7db43850a55ebe6449d0959", "type": "github" }, "original": { @@ -393,11 +393,11 @@ ] }, "locked": { - "lastModified": 1726592409, - "narHash": "sha256-2Y6CDvD/BD43WLS77PHu6dUHbdUfFhuzkY8oJAecD/U=", + "lastModified": 1726989464, + "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", "owner": "nix-community", "repo": "home-manager", - "rev": "2ab00f89dd3ecf8012f5090e6d7ca1a7ea30f594", + "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", "type": "github" }, "original": { @@ -414,11 +414,11 @@ ] }, "locked": { - "lastModified": 1726449931, - "narHash": "sha256-1AX7MyYzP7sNgZiGF8jwehCCI75y2kBGwACeryJs+yE=", + "lastModified": 1727658919, + "narHash": "sha256-YAePt2GldkkRJ08LvZNHcuS6shIVStj+K+1DZN3gbnM=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "c1b0fa0bec5478185eae2fd3f39b9e906fc83995", + "rev": "f9fdf8285690a351e8998f1e703ebdf9cdf51dee", "type": "github" }, "original": { @@ -456,11 +456,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726447378, - "narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=", + "lastModified": 1727540905, + "narHash": "sha256-40J9tW7Y794J7Uw4GwcAKlMxlX2xISBl6IBigo83ih8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1", + "rev": "fbca5e745367ae7632731639de5c21f29c8744ed", "type": "github" }, "original": { @@ -471,11 +471,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1726937504, - "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=", + "lastModified": 1727634051, + "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9357f4f23713673f310988025d9dc261c20e70c6", + "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", "type": "github" }, "original": { From 531bf80cf2ffb05529e7713e6b5f8d7f0ffa6c7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 2 Oct 2024 10:57:45 -0300 Subject: [PATCH 259/404] update dzgui --- flake.lock | 24 +++--------------------- flake.nix | 2 +- system/steam.nix | 1 - 3 files changed, 4 insertions(+), 23 deletions(-) diff --git a/flake.lock b/flake.lock index b031598..6b892ec 100644 --- a/flake.lock +++ b/flake.lock @@ -189,40 +189,22 @@ "type": "github" } }, - "dzgui": { - "flake": false, - "locked": { - "lastModified": 1702780245, - "narHash": "sha256-cdW5LN2Q7eYW8xIqKPQfeYPd7e6VdJGaoA9NMHesCrE=", - "owner": "aclist", - "repo": "dztui", - "rev": "28323f3edb8fa747dc559d1939ccdd7729e4e3a1", - "type": "github" - }, - "original": { - "owner": "aclist", - "repo": "dztui", - "type": "github" - } - }, "dzgui-nix": { "inputs": { - "dzgui": "dzgui", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1702850463, - "narHash": "sha256-qR/c/GjsLUzrCyHN/Q9nnClduf6OqTg26S1AFYKPzxA=", + "lastModified": 1727831626, + "narHash": "sha256-Gvt5lapgNRRTL95gFH8vm48f8gjsk7GYM4Qo5aUOzzo=", "owner": "lelgenio", "repo": "dzgui-nix", - "rev": "2ed6515b27d8186b9fedfe1dcaf861f07e796a0d", + "rev": "38cf2b507d75cc36ec127b21fc5a4144fc821525", "type": "github" }, "original": { "owner": "lelgenio", - "ref": "dzgui-4.1.0", "repo": "dzgui-nix", "type": "github" } diff --git a/flake.nix b/flake.nix index 1150434..594ceda 100644 --- a/flake.nix +++ b/flake.nix @@ -33,7 +33,7 @@ }; dzgui-nix = { - url = "github:lelgenio/dzgui-nix/dzgui-4.1.0"; + url = "github:lelgenio/dzgui-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/system/steam.nix b/system/steam.nix index 8b764d0..1d8b412 100644 --- a/system/steam.nix +++ b/system/steam.nix @@ -34,5 +34,4 @@ ]; programs.dzgui.enable = true; - programs.dzgui.package = inputs.dzgui-nix.packages.${pkgs.system}.default; } From 63953f0e3d2d3d7730501566baf5aac6cbb68526 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 4 Oct 2024 12:34:04 -0300 Subject: [PATCH 260/404] update --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 6b892ec..36c8be4 100644 --- a/flake.lock +++ b/flake.lock @@ -176,11 +176,11 @@ ] }, "locked": { - "lastModified": 1727531434, - "narHash": "sha256-b+GBgCWd2N6pkiTkRZaMFOPztPO4IVTaclYPrQl2uLk=", + "lastModified": 1727977578, + "narHash": "sha256-DBORKcmQ7ZjA4qE1MsnF1MmZSokOGrw4W9vTCioOv2U=", "owner": "nix-community", "repo": "disko", - "rev": "b709e1cc33fcde71c7db43850a55ebe6449d0959", + "rev": "574400001b3ffe555c7a21e0ff846230759be2ed", "type": "github" }, "original": { @@ -438,11 +438,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1727540905, - "narHash": "sha256-40J9tW7Y794J7Uw4GwcAKlMxlX2xISBl6IBigo83ih8=", + "lastModified": 1727907660, + "narHash": "sha256-QftbyPoieM5M50WKUMzQmWtBWib/ZJbHo7mhj5riQec=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fbca5e745367ae7632731639de5c21f29c8744ed", + "rev": "5966581aa04be7eff830b9e1457d56dc70a0b798", "type": "github" }, "original": { @@ -453,11 +453,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1727634051, - "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", + "lastModified": 1727802920, + "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", + "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", "type": "github" }, "original": { @@ -708,11 +708,11 @@ }, "vpsadminos": { "locked": { - "lastModified": 1727306253, - "narHash": "sha256-PdVXdZvhAqQFALZiACXIjwFRSo0EhEKMm94uxvyFyPk=", + "lastModified": 1727870662, + "narHash": "sha256-YWXD5ye8keD/RRXucTE7zlx+UcrXLMMJJMEF+habAA8=", "owner": "vpsfreecz", "repo": "vpsadminos", - "rev": "bd2b87cbcb75a9e9aa25f76fb7e1f0f625963277", + "rev": "28237ec2fae4502f4e96a9b801b182631de4360d", "type": "github" }, "original": { From 41fe2f92ea2158b8c95a4b100033eb3fb7310254 Mon Sep 17 00:00:00 2001 From: lelgenio Date: Fri, 4 Oct 2024 14:34:45 -0300 Subject: [PATCH 261/404] rainbow: disable docker gitlab runner --- system/rainbow-gitlab-runner.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/system/rainbow-gitlab-runner.nix b/system/rainbow-gitlab-runner.nix index aa177de..3230c8b 100644 --- a/system/rainbow-gitlab-runner.nix +++ b/system/rainbow-gitlab-runner.nix @@ -14,18 +14,6 @@ in enable = true; settings.concurrent = 1; services = { - # ci_test = { - # registrationConfigFile = "/srv/gitlab-runner/env/ci_test"; - # dockerImage = "debian"; - # dockerPrivileged = true; - # }; - thoreb_builder = { - registrationConfigFile = - config.age.secrets.rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.path; - dockerImage = "debian"; - dockerPrivileged = true; - }; - thoreb-telemetria-nix = mkNixRunner config.age.secrets.gitlab-runner-thoreb-telemetria-registrationConfigFile.path; thoreb-itinerario-nix = mkNixRunner config.age.secrets.rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.path; }; From 3c980261334a7e252082e26609c221c260c1816b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 5 Oct 2024 10:50:17 -0300 Subject: [PATCH 262/404] goofs --- flake.lock | 34 ++++++++++++++++++++++++++++++++++ flake.nix | 8 ++++++++ hosts/phantom/default.nix | 1 + hosts/phantom/goofs.nix | 13 +++++++++++++ 4 files changed, 56 insertions(+) create mode 100644 hosts/phantom/goofs.nix diff --git a/flake.lock b/flake.lock index 36c8be4..6383872 100644 --- a/flake.lock +++ b/flake.lock @@ -57,6 +57,22 @@ "type": "gitlab" } }, + "catboy-spinner": { + "flake": false, + "locked": { + "lastModified": 1728098748, + "narHash": "sha256-FHM/a+wqctmg1LXf/XB6TcXowL0Wzbq1kSCGVnxGgL8=", + "ref": "refs/heads/main", + "rev": "c6fc11b0900826508f6a766c65cf92e0c7c4eab9", + "revCount": 4, + "type": "git", + "url": "https://git.lelgenio.com/lelgenio/catboy-spinner" + }, + "original": { + "type": "git", + "url": "https://git.lelgenio.com/lelgenio/catboy-spinner" + } + }, "crane": { "inputs": { "flake-compat": "flake-compat", @@ -501,6 +517,7 @@ "root": { "inputs": { "agenix": "agenix", + "catboy-spinner": "catboy-spinner", "demoji": "demoji", "dhist": "dhist", "disko": "disko", @@ -513,6 +530,7 @@ "plymouth-themes": "plymouth-themes", "ranger-icons": "ranger-icons", "tlauncher": "tlauncher", + "tomater": "tomater", "vpsadminos": "vpsadminos", "warthunder-leak-counter": "warthunder-leak-counter", "wl-crosshair": "wl-crosshair" @@ -688,6 +706,22 @@ "url": "https://git.lelgenio.xyz/lelgenio/tlauncher-nix" } }, + "tomater": { + "flake": false, + "locked": { + "lastModified": 1728089744, + "narHash": "sha256-WOz/qUKyao7lM2qcwqqcJDw4jI8mUJL6kNUNm0sxPKk=", + "ref": "refs/heads/main", + "rev": "efff561c745514a7874e3f5de95307a74efc7df9", + "revCount": 1, + "type": "git", + "url": "https://git.lelgenio.com/lelgenio/tomater" + }, + "original": { + "type": "git", + "url": "https://git.lelgenio.com/lelgenio/tomater" + } + }, "utils": { "inputs": { "systems": "systems_4" diff --git a/flake.nix b/flake.nix index 594ceda..a07cd8c 100644 --- a/flake.nix +++ b/flake.nix @@ -62,6 +62,14 @@ url = "git+https://git.lelgenio.com/lelgenio/warthunder-leak-counter"; inputs.nixpkgs.follows = "nixpkgs"; }; + catboy-spinner = { + url = "git+https://git.lelgenio.com/lelgenio/catboy-spinner"; + flake = false; + }; + tomater = { + url = "git+https://git.lelgenio.com/lelgenio/tomater"; + flake = false; + }; }; outputs = inputs: diff --git a/hosts/phantom/default.nix b/hosts/phantom/default.nix index 84b2a5d..a057af7 100644 --- a/hosts/phantom/default.nix +++ b/hosts/phantom/default.nix @@ -21,6 +21,7 @@ ./warthunder-leak-counter.nix ./invidious.nix ./davi.nix + ./goofs.nix ]; networking.hostName = "phantom"; diff --git a/hosts/phantom/goofs.nix b/hosts/phantom/goofs.nix new file mode 100644 index 0000000..1629ab5 --- /dev/null +++ b/hosts/phantom/goofs.nix @@ -0,0 +1,13 @@ +{ inputs, ... }: +{ + services.nginx.virtualHosts."catboy-spinner.lelgenio.com" = { + enableACME = true; + forceSSL = true; + root = inputs.catboy-spinner; + }; + services.nginx.virtualHosts."tomater.lelgenio.com" = { + enableACME = true; + forceSSL = true; + root = inputs.tomater; + }; +} From 576d276c13a130f2c0915380a40b52a6cef96872 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 5 Oct 2024 14:10:33 -0300 Subject: [PATCH 263/404] forgejo: enable push to create --- hosts/phantom/forgejo.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hosts/phantom/forgejo.nix b/hosts/phantom/forgejo.nix index 2693ff4..dbb63d3 100644 --- a/hosts/phantom/forgejo.nix +++ b/hosts/phantom/forgejo.nix @@ -27,6 +27,9 @@ in ENABLED = true; DEFAULT_ACTIONS_URL = "github"; }; + repository = { + ENABLE_PUSH_CREATE_USER = true; + }; server = { DOMAIN = "git.lelgenio.com"; HTTP_PORT = 3000; From 28f47361a0e1a76f82f043a27fd8cee2e54d6144 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 5 Oct 2024 14:11:33 -0300 Subject: [PATCH 264/404] add goofs --- flake.lock | 89 ++++++++++++++++++++++++++++++++++++++--- flake.nix | 4 ++ hosts/phantom/goofs.nix | 25 +++++++++++- 3 files changed, 111 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 6383872..0d88871 100644 --- a/flake.lock +++ b/flake.lock @@ -98,6 +98,27 @@ } }, "crane_2": { + "inputs": { + "nixpkgs": [ + "made-you-look", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1718730147, + "narHash": "sha256-QmD6B6FYpuoCqu6ZuPJH896ItNquDkn0ulQlOn4ykN8=", + "owner": "ipetkov", + "repo": "crane", + "rev": "32c21c29b034d0a93fdb2379d6fabc40fc3d0e6c", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "crane_3": { "inputs": { "nixpkgs": [ "warthunder-leak-counter", @@ -332,7 +353,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1681202837, @@ -370,6 +391,24 @@ "inputs": { "systems": "systems_7" }, + "locked": { + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_7": { + "inputs": { + "systems": "systems_8" + }, "locked": { "lastModified": 1710146030, "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", @@ -405,6 +444,28 @@ "type": "github" } }, + "made-you-look": { + "inputs": { + "crane": "crane_2", + "flake-utils": "flake-utils_4", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1728148016, + "narHash": "sha256-63w9Nt1bt2l7HSGHca99rcDXsk8giISsWlRhiEp1XtY=", + "ref": "refs/heads/main", + "rev": "acd877886420f4e0b00af1548a6cbda8dc89632f", + "revCount": 2, + "type": "git", + "url": "https://git.lelgenio.com/lelgenio/made-you-look" + }, + "original": { + "type": "git", + "url": "https://git.lelgenio.com/lelgenio/made-you-look" + } + }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -523,6 +584,7 @@ "disko": "disko", "dzgui-nix": "dzgui-nix", "home-manager": "home-manager", + "made-you-look": "made-you-look", "nix-index-database": "nix-index-database", "nixos-mailserver": "nixos-mailserver", "nixpkgs": "nixpkgs", @@ -685,9 +747,24 @@ "type": "github" } }, + "systems_8": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tlauncher": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "nixpkgs": [ "nixpkgs" ] @@ -724,7 +801,7 @@ }, "utils": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1709126324, @@ -757,8 +834,8 @@ }, "warthunder-leak-counter": { "inputs": { - "crane": "crane_2", - "flake-utils": "flake-utils_5", + "crane": "crane_3", + "flake-utils": "flake-utils_6", "nixpkgs": [ "nixpkgs" ] @@ -779,7 +856,7 @@ }, "wl-crosshair": { "inputs": { - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_7", "nixpkgs": [ "nixpkgs" ] diff --git a/flake.nix b/flake.nix index a07cd8c..652aa6c 100644 --- a/flake.nix +++ b/flake.nix @@ -62,6 +62,10 @@ url = "git+https://git.lelgenio.com/lelgenio/warthunder-leak-counter"; inputs.nixpkgs.follows = "nixpkgs"; }; + made-you-look = { + url = "git+https://git.lelgenio.com/lelgenio/made-you-look"; + inputs.nixpkgs.follows = "nixpkgs"; + }; catboy-spinner = { url = "git+https://git.lelgenio.com/lelgenio/catboy-spinner"; flake = false; diff --git a/hosts/phantom/goofs.nix b/hosts/phantom/goofs.nix index 1629ab5..771904b 100644 --- a/hosts/phantom/goofs.nix +++ b/hosts/phantom/goofs.nix @@ -1,5 +1,28 @@ -{ inputs, ... }: +{ inputs, config, ... }: { + imports = [ + inputs.warthunder-leak-counter.nixosModules.default + inputs.made-you-look.nixosModules.default + ]; + + services.warthunder-leak-counter.enable = true; + services.nginx.virtualHosts."warthunder-leak-counter.lelgenio.com" = { + enableACME = true; + forceSSL = true; + locations."/" = { + proxyPass = "http://127.0.0.1:${toString config.services.warthunder-leak-counter.port}"; + }; + }; + + services.made-you-look.enable = true; + services.nginx.virtualHosts."coolest-thing-ever.lelgenio.com" = { + enableACME = true; + forceSSL = true; + locations."/" = { + proxyPass = "http://127.0.0.1:${toString config.services.made-you-look.port}"; + }; + }; + services.nginx.virtualHosts."catboy-spinner.lelgenio.com" = { enableACME = true; forceSSL = true; From d49b17879d2e46db898f5b0260b747c8afb2e460 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 5 Oct 2024 17:26:45 -0300 Subject: [PATCH 265/404] update goofs --- flake.lock | 45 ++++++++++++++++------- flake.nix | 4 ++ hosts/phantom/default.nix | 1 - hosts/phantom/goofs.nix | 5 +++ hosts/phantom/warthunder-leak-counter.nix | 19 ---------- 5 files changed, 40 insertions(+), 34 deletions(-) delete mode 100644 hosts/phantom/warthunder-leak-counter.nix diff --git a/flake.lock b/flake.lock index 0d88871..c7313d6 100644 --- a/flake.lock +++ b/flake.lock @@ -213,11 +213,11 @@ ] }, "locked": { - "lastModified": 1727977578, - "narHash": "sha256-DBORKcmQ7ZjA4qE1MsnF1MmZSokOGrw4W9vTCioOv2U=", + "lastModified": 1728109432, + "narHash": "sha256-wmbErh8FG7dRKOtMMpHUqDtFjeqt9Zjx4zssSeTalwU=", "owner": "nix-community", "repo": "disko", - "rev": "574400001b3ffe555c7a21e0ff846230759be2ed", + "rev": "48ebb577855fb2398653f033b3b2208a9249203d", "type": "github" }, "original": { @@ -453,11 +453,11 @@ ] }, "locked": { - "lastModified": 1728148016, - "narHash": "sha256-63w9Nt1bt2l7HSGHca99rcDXsk8giISsWlRhiEp1XtY=", + "lastModified": 1728159958, + "narHash": "sha256-r/h/ch70KfOQ8moftDhHagu3WajglaqU+hrEzUtTM1Y=", "ref": "refs/heads/main", - "rev": "acd877886420f4e0b00af1548a6cbda8dc89632f", - "revCount": 2, + "rev": "96e978aa2f414d4b92b78e7ae975d7ff7db95a91", + "revCount": 3, "type": "git", "url": "https://git.lelgenio.com/lelgenio/made-you-look" }, @@ -515,11 +515,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1727907660, - "narHash": "sha256-QftbyPoieM5M50WKUMzQmWtBWib/ZJbHo7mhj5riQec=", + "lastModified": 1728067476, + "narHash": "sha256-/uJcVXuBt+VFCPQIX+4YnYrHaubJSx4HoNsJVNRgANM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5966581aa04be7eff830b9e1457d56dc70a0b798", + "rev": "6e6b3dd395c3b1eb9be9f2d096383a8d05add030", "type": "github" }, "original": { @@ -530,11 +530,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1727802920, - "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", + "lastModified": 1728018373, + "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", + "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", "type": "github" }, "original": { @@ -595,7 +595,8 @@ "tomater": "tomater", "vpsadminos": "vpsadminos", "warthunder-leak-counter": "warthunder-leak-counter", - "wl-crosshair": "wl-crosshair" + "wl-crosshair": "wl-crosshair", + "youre-wrong": "youre-wrong" } }, "rust-analyzer-src": { @@ -874,6 +875,22 @@ "repo": "wl-crosshair", "type": "github" } + }, + "youre-wrong": { + "flake": false, + "locked": { + "lastModified": 1728148764, + "narHash": "sha256-JhYA4YBS9Cpm4i80KK95Fg6doZhdydZ4W/bEG1M1FJU=", + "ref": "refs/heads/main", + "rev": "b206caa7b7efbd2d4b68d3a8fc50c224f6629d39", + "revCount": 1, + "type": "git", + "url": "https://git.lelgenio.com/lelgenio/youre-wrong" + }, + "original": { + "type": "git", + "url": "https://git.lelgenio.com/lelgenio/youre-wrong" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 652aa6c..7c5709b 100644 --- a/flake.nix +++ b/flake.nix @@ -74,6 +74,10 @@ url = "git+https://git.lelgenio.com/lelgenio/tomater"; flake = false; }; + youre-wrong = { + url = "git+https://git.lelgenio.com/lelgenio/youre-wrong"; + flake = false; + }; }; outputs = inputs: diff --git a/hosts/phantom/default.nix b/hosts/phantom/default.nix index a057af7..e5570ee 100644 --- a/hosts/phantom/default.nix +++ b/hosts/phantom/default.nix @@ -18,7 +18,6 @@ ./writefreely.nix ./email.nix ./forgejo.nix - ./warthunder-leak-counter.nix ./invidious.nix ./davi.nix ./goofs.nix diff --git a/hosts/phantom/goofs.nix b/hosts/phantom/goofs.nix index 771904b..8eb7f69 100644 --- a/hosts/phantom/goofs.nix +++ b/hosts/phantom/goofs.nix @@ -33,4 +33,9 @@ forceSSL = true; root = inputs.tomater; }; + services.nginx.virtualHosts."youre-wrong.lelgenio.com" = { + enableACME = true; + forceSSL = true; + root = inputs.youre-wrong; + }; } diff --git a/hosts/phantom/warthunder-leak-counter.nix b/hosts/phantom/warthunder-leak-counter.nix deleted file mode 100644 index acdbc0b..0000000 --- a/hosts/phantom/warthunder-leak-counter.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - inputs, - pkgs, - config, - ... -}: -{ - imports = [ inputs.warthunder-leak-counter.nixosModules.default ]; - - services.warthunder-leak-counter.enable = true; - - services.nginx.virtualHosts."warthunder-leak-counter.lelgenio.com" = { - enableACME = true; - forceSSL = true; - locations."/" = { - proxyPass = "http://127.0.0.1:${toString config.services.warthunder-leak-counter.port}"; - }; - }; -} From 55ab02f3cef42fd948f67ff235222b92e28b8d82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sun, 6 Oct 2024 12:21:54 -0300 Subject: [PATCH 266/404] update youre-wrong --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index c7313d6..4bb7f11 100644 --- a/flake.lock +++ b/flake.lock @@ -879,11 +879,11 @@ "youre-wrong": { "flake": false, "locked": { - "lastModified": 1728148764, - "narHash": "sha256-JhYA4YBS9Cpm4i80KK95Fg6doZhdydZ4W/bEG1M1FJU=", + "lastModified": 1728228087, + "narHash": "sha256-W40rQbQAo3lGrKlfenSA8JaGwZMSx/X4lP71enQtK7Y=", "ref": "refs/heads/main", - "rev": "b206caa7b7efbd2d4b68d3a8fc50c224f6629d39", - "revCount": 1, + "rev": "64e7876233e99ad7223cae29688374a1c1ff569a", + "revCount": 2, "type": "git", "url": "https://git.lelgenio.com/lelgenio/youre-wrong" }, From 35ce459191079553bf24d409b1db15408bad9441 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sun, 6 Oct 2024 13:35:13 -0300 Subject: [PATCH 267/404] add hello-fonts --- flake.lock | 17 +++++++++++++++++ flake.nix | 4 ++++ hosts/phantom/goofs.nix | 5 +++++ 3 files changed, 26 insertions(+) diff --git a/flake.lock b/flake.lock index 4bb7f11..c006e3e 100644 --- a/flake.lock +++ b/flake.lock @@ -423,6 +423,22 @@ "type": "github" } }, + "hello-fonts": { + "flake": false, + "locked": { + "lastModified": 1728232065, + "narHash": "sha256-1DUW1YqZALPFxBM7HYcNZiCZQvMqUiJ1m04NU4IIe3I=", + "ref": "refs/heads/main", + "rev": "10f7485fea930bb45e97fbda0cd68f199a7e8f59", + "revCount": 1, + "type": "git", + "url": "https://git.lelgenio.com/lelgenio/hello-fonts" + }, + "original": { + "type": "git", + "url": "https://git.lelgenio.com/lelgenio/hello-fonts" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -583,6 +599,7 @@ "dhist": "dhist", "disko": "disko", "dzgui-nix": "dzgui-nix", + "hello-fonts": "hello-fonts", "home-manager": "home-manager", "made-you-look": "made-you-look", "nix-index-database": "nix-index-database", diff --git a/flake.nix b/flake.nix index 7c5709b..dbbf16e 100644 --- a/flake.nix +++ b/flake.nix @@ -78,6 +78,10 @@ url = "git+https://git.lelgenio.com/lelgenio/youre-wrong"; flake = false; }; + hello-fonts = { + url = "git+https://git.lelgenio.com/lelgenio/hello-fonts"; + flake = false; + }; }; outputs = inputs: diff --git a/hosts/phantom/goofs.nix b/hosts/phantom/goofs.nix index 8eb7f69..c0b670a 100644 --- a/hosts/phantom/goofs.nix +++ b/hosts/phantom/goofs.nix @@ -38,4 +38,9 @@ forceSSL = true; root = inputs.youre-wrong; }; + services.nginx.virtualHosts."hello-fonts.lelgenio.com" = { + enableACME = true; + forceSSL = true; + root = inputs.hello-fonts; + }; } From 44eb8af347c634a9a4d19d42ca606f0243bb920d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Tue, 8 Oct 2024 19:03:16 -0300 Subject: [PATCH 268/404] update --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index c006e3e..5e74698 100644 --- a/flake.lock +++ b/flake.lock @@ -213,11 +213,11 @@ ] }, "locked": { - "lastModified": 1728109432, - "narHash": "sha256-wmbErh8FG7dRKOtMMpHUqDtFjeqt9Zjx4zssSeTalwU=", + "lastModified": 1728334376, + "narHash": "sha256-CTKEKPzD/j8FK6H4DO3EjyixZd3HHvgAgfnCwpGFP5c=", "owner": "nix-community", "repo": "disko", - "rev": "48ebb577855fb2398653f033b3b2208a9249203d", + "rev": "d39ee334984fcdae6244f5a8e6ab857479cbaefe", "type": "github" }, "original": { @@ -489,11 +489,11 @@ ] }, "locked": { - "lastModified": 1727658919, - "narHash": "sha256-YAePt2GldkkRJ08LvZNHcuS6shIVStj+K+1DZN3gbnM=", + "lastModified": 1728263287, + "narHash": "sha256-GJDtsxz2/zw6g/Nrp4XVWBS5IaZ7ZUkuvxPOBEDe7pg=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "f9fdf8285690a351e8998f1e703ebdf9cdf51dee", + "rev": "5fce10c871bab6d7d5ac9e5e7efbb3a2783f5259", "type": "github" }, "original": { @@ -531,11 +531,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728067476, - "narHash": "sha256-/uJcVXuBt+VFCPQIX+4YnYrHaubJSx4HoNsJVNRgANM=", + "lastModified": 1728193676, + "narHash": "sha256-PbDWAIjKJdlVg+qQRhzdSor04bAPApDqIv2DofTyynk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6e6b3dd395c3b1eb9be9f2d096383a8d05add030", + "rev": "ecbc1ca8ffd6aea8372ad16be9ebbb39889e55b6", "type": "github" }, "original": { @@ -837,11 +837,11 @@ }, "vpsadminos": { "locked": { - "lastModified": 1727870662, - "narHash": "sha256-YWXD5ye8keD/RRXucTE7zlx+UcrXLMMJJMEF+habAA8=", + "lastModified": 1728335559, + "narHash": "sha256-95/KJBA449oAjf6bLwaCvDgys7yE8vKXY3wHe/uUkiw=", "owner": "vpsfreecz", "repo": "vpsadminos", - "rev": "28237ec2fae4502f4e96a9b801b182631de4360d", + "rev": "c928bdec26484e99621cc76cb165abb73aa7d029", "type": "github" }, "original": { From 8273c5898061e0ab3539155f77be1fe5aae8430d Mon Sep 17 00:00:00 2001 From: lelgenio Date: Wed, 9 Oct 2024 17:36:43 -0300 Subject: [PATCH 269/404] sway: disable acceleration for all pointers --- user/sway/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/sway/default.nix b/user/sway/default.nix index 2a6dc70..6679134 100644 --- a/user/sway/default.nix +++ b/user/sway/default.nix @@ -81,7 +81,7 @@ in # Ignore PS4 controller touchpad events input."1356:2508:Wireless_Controller_Touchpad".events = "disabled"; - input."1133:16537:Logitech_G502_X_PLUS" = { + input."type:pointer" = { accel_profile = "flat"; pointer_accel = "0"; }; From 4d6d6357e385319451af0326ddceadf30c2771c1 Mon Sep 17 00:00:00 2001 From: lelgenio Date: Wed, 9 Oct 2024 17:37:06 -0300 Subject: [PATCH 270/404] rainbow: add swap --- hosts/double-rainbow.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/double-rainbow.nix b/hosts/double-rainbow.nix index e33b612..4c8636a 100644 --- a/hosts/double-rainbow.nix +++ b/hosts/double-rainbow.nix @@ -44,7 +44,7 @@ in fsType = "vfat"; }; - swapDevices = [ ]; + swapDevices = [ { device = "/swapfile"; } ]; services.udev.extraRules = '' # Force all disks to use mq-deadline scheduler From 62379e3a626d1c27310144afba8297a26a6d1726 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 10 Oct 2024 01:42:06 -0300 Subject: [PATCH 271/404] waybar: add controller battery status --- scripts/controller-battery | 38 ++++++++++++++++++++++++++++++++++++++ scripts/default.nix | 1 + user/waybar/default.nix | 7 +++++++ user/waybar/style.css | 1 + 4 files changed, 47 insertions(+) create mode 100755 scripts/controller-battery diff --git a/scripts/controller-battery b/scripts/controller-battery new file mode 100755 index 0000000..b8ed4f2 --- /dev/null +++ b/scripts/controller-battery @@ -0,0 +1,38 @@ +#!/bin/sh + +set -e + +CONTROLLER=$(find /sys/class/power_supply -maxdepth 1 -name '*controller*' || true) + +if test -z "$CONTROLLER"; then + echo + exit 0 +fi + +CAPACITY=$(cat "$CONTROLLER/capacity") + +echo -n '󰊴' + +if test "$CAPACITY" -ge 90; then + echo '󰁹' +elif test "$CAPACITY" -ge 90; then + echo '󰂂' +elif test "$CAPACITY" -ge 80; then + echo '󰂁' +elif test "$CAPACITY" -ge 70; then + echo '󰂀' +elif test "$CAPACITY" -ge 60; then + echo '󰁿' +elif test "$CAPACITY" -ge 50; then + echo '󰁾' +elif test "$CAPACITY" -ge 40; then + echo '󰁽' +elif test "$CAPACITY" -ge 30; then + echo '󰁼' +elif test "$CAPACITY" -ge 20; then + echo '󰁻' +elif test "$CAPACITY" -ge 10; then + echo '󰁺' +else + echo '󰂎' +fi diff --git a/scripts/default.nix b/scripts/default.nix index 1e3290e..99b6635 100644 --- a/scripts/default.nix +++ b/scripts/default.nix @@ -130,6 +130,7 @@ libratbag ]; vrr-fullscreen = [ ]; + controller-battery = [ ]; } // lib.mapAttrs importScript { wdmenu = ./wdmenu.nix; diff --git a/user/waybar/default.nix b/user/waybar/default.nix index d33076e..b36dfce 100644 --- a/user/waybar/default.nix +++ b/user/waybar/default.nix @@ -35,6 +35,7 @@ in "mpd" "custom/playerctl" "tray" + "custom/controller-battery" "custom/caffeine" "pulseaudio" (lib.optional (osConfig.services.vpn.enable or false) "custom/vpn") @@ -157,6 +158,12 @@ in "sway/language" = { format = "{short} {variant}"; }; + "custom/controller-battery" = { + format = "{}"; + exec = lib.getExe pkgs.controller-battery; + interval = 1; + tooltip = false; + }; "custom/caffeine" = { format = "{}"; exec = "systemctl --user status swayidle > /dev/null && echo 󰒲 || echo 󰒳"; diff --git a/user/waybar/style.css b/user/waybar/style.css index f9c0fb1..36c6ebd 100644 --- a/user/waybar/style.css +++ b/user/waybar/style.css @@ -37,6 +37,7 @@ window#waybar.solo { #mpd, #custom-mpd, #custom-playerctl, +#custom-controller-battery, #tray, #clock, #network, From c08d6295d70613f13de37e8a98f88bcdd87b1178 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 10 Oct 2024 23:04:59 -0300 Subject: [PATCH 272/404] switch: fix quoting --- switch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/switch b/switch index 1b114fc..93bd80a 100755 --- a/switch +++ b/switch @@ -9,4 +9,4 @@ nixos-rebuild \ --use-remote-sudo \ --print-build-logs \ --flake .# \ - $@ + "$@" From 1e2d64a1c7c3629c9828f1ec460a0608ce8a8f23 Mon Sep 17 00:00:00 2001 From: lelgenio Date: Mon, 14 Oct 2024 17:27:55 -0300 Subject: [PATCH 273/404] rainbow: cleanup --- flake.nix | 12 +-- hosts/rainbow/default.nix | 85 ------------------- ...oreb-itinerario-registrationConfigFile.age | 13 --- secrets/secrets.nix | 3 - system/rainbow-gitlab-runner.nix | 22 ----- system/secrets.nix | 1 - 6 files changed, 1 insertion(+), 135 deletions(-) delete mode 100644 hosts/rainbow/default.nix delete mode 100644 secrets/rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.age delete mode 100644 system/rainbow-gitlab-runner.nix diff --git a/flake.nix b/flake.nix index dbbf16e..54c9a44 100644 --- a/flake.nix +++ b/flake.nix @@ -152,19 +152,9 @@ ./system/steam.nix ] ++ common_modules; }; - rainbow = lib.nixosSystem { - inherit system specialArgs; - modules = [ - ./hosts/rainbow - ./system/rainbow-gitlab-runner.nix - ] ++ common_modules; - }; double-rainbow = lib.nixosSystem { inherit system specialArgs; - modules = [ - ./hosts/double-rainbow.nix - ./system/rainbow-gitlab-runner.nix - ] ++ common_modules; + modules = [ ./hosts/double-rainbow.nix ] ++ common_modules; }; pixie = lib.nixosSystem { inherit system specialArgs; diff --git a/hosts/rainbow/default.nix b/hosts/rainbow/default.nix deleted file mode 100644 index b977ee6..0000000 --- a/hosts/rainbow/default.nix +++ /dev/null @@ -1,85 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ - config, - lib, - pkgs, - modulesPath, - ... -}: -let - btrfs_options = [ - "compress=zstd:3" - "noatime" - "x-systemd.device-timeout=0" - ]; - btrfs_ssd = [ - "ssd" - "discard=async" - ]; -in -{ - imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - - boot.initrd.availableKernelModules = [ - "xhci_pci" - "ahci" - "usb_storage" - "usbhid" - "sd_mod" - ]; - boot.initrd.kernelModules = [ "i915" ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = { - device = "/dev/disk/by-label/BTRFS_ROOT"; - fsType = "btrfs"; - options = [ "subvol=@nixos" ] ++ btrfs_options ++ btrfs_ssd; - }; - - boot.initrd.luks.devices = { - "main" = { - bypassWorkqueues = true; - device = "/dev/disk/by-label/CRYPT_ROOT"; - }; - }; - - fileSystems."/home" = { - device = "/dev/disk/by-label/BTRFS_ROOT"; - fsType = "btrfs"; - options = [ "subvol=@home" ] ++ btrfs_options ++ btrfs_ssd; - }; - - boot.loader.efi.efiSysMountPoint = "/boot/efi"; - fileSystems."/boot/efi" = { - device = "/dev/disk/by-uuid/DC3B-5753"; - fsType = "vfat"; - }; - - fileSystems."/swap" = { - device = "/dev/disk/by-label/BTRFS_ROOT"; - fsType = "btrfs"; - options = [ "subvol=@swap" ] ++ btrfs_ssd; - }; - - swapDevices = [ - { - device = "/swap/swapfile"; - size = (1024 * 8); - } - ]; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp1s0.useDHCP = lib.mkDefault true; - - powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - - networking.hostName = "rainbow"; # Define your hostname. -} diff --git a/secrets/rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.age b/secrets/rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.age deleted file mode 100644 index 03118e3..0000000 --- a/secrets/rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.age +++ /dev/null @@ -1,13 +0,0 @@ -age-encryption.org/v1 --> ssh-rsa BwwxHg -KCVF4Sy49stOeQs2uunYKkvadqeimmWlJ4ucEJxfXy2z+OkkZpixUnWgJEH2nCa4 -NL/F0Wezbqvh+Texl4FlHN8PT2w/d5gdg/L+fI4jBYCvbbiHA4sdUgmXWigY8zrU -5H7Y9mgb1Y174fA6zfTCk2fHmk+KARoV27YrS2fzGoVQiPhnvv8ZT51eF1E+Zs4I -+YtXehxEOqYljJKYJJnF9ElzfNa8nypACGtcjTE8eEq0DlZu2U7qV+QWwQudHbcs -MbFR2VtkHWQaNdK1vVBGND1CMlfshSCqbUzGcexownMiCVSal1RKA2uAWnYdOEc/ -QSR8cKn8QQ5dyPFCqZ8RnlCMUegCVLg5cC0/rlTUD0C/Ti2SRBYTH3HvJjmSNk8k -3LdcNwK4YtG4d1gkqLVjwCM1Yg8I/UICb5nQYclvBz5VQ2drvL/gU/+Vc7Z5KUFI -0G/7uNmeJ16Eky+X9c73ZZxVqm0TzDENE2GzkPhBHEfXBR+4j6m8KKEWxQmA2ZSg - ---- Oq9wU0h90iU/8g1XTNI+LuAg7t09hngj9DCK91V1+pg -χvP}N,Wl ?y0)eVwAiŐSm>DQC-B0V|=X6 W>~-qI% \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 7b5fdd8..5582393 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -2,9 +2,6 @@ let main_ssh_public_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxR/w+38b2lX90yNBqhq3mUmkn1WGu6GAPhN1tVp2ZjYRJNV/+5gWCnTtOWYtDx35HmK/spQ2Qy8X9ttkzORa24fysNx1Iqn/TiXhD7eIJjbGPnrOpIKTkW5/uB3SD/P5NBSa06//BaqJU4sBlG79hoXRpod052hQtdpTVDiMCIV+iboWPKqopmJJfWdBtVnHXs9rep0htPRExxGslImFk7Z6xjcaHyCpIQZPlOGf+sGsmUU7jRqzvZFV8ucIdbnAlMHrU4pepNFhuraESyZVTa/bi9sw0iozXp5Q5+5thMebEslmT1Z771kI4sieDy+O4r8c0Sx2/VY1UAzcpq1faggc3YB01MTh+tiEC6xdMvZLrQGL1NBWjHleMyL53GU5ERluC0vXJF3Hv3BGGBDfXWbrEm5n06DHr2apRVJGC0LwiQ7Woud1X4V4X1pKSusxCVMjT2lmcOwV6YhKhB2sowJc1OdMx4+tL0UWE+YKSZgBHfolwk6ml0F4EO9nnUHc= lelgenio@i15"; in { - "rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.age".publicKeys = [ - main_ssh_public_key - ]; "monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.age".publicKeys = [ main_ssh_public_key ]; diff --git a/system/rainbow-gitlab-runner.nix b/system/rainbow-gitlab-runner.nix deleted file mode 100644 index 3230c8b..0000000 --- a/system/rainbow-gitlab-runner.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: -let - inherit (pkgs.callPackage ./gitlab-runner.nix { }) mkNixRunner; -in -{ - boot.kernel.sysctl."net.ipv4.ip_forward" = true; - virtualisation.docker.enable = true; - services.gitlab-runner = { - enable = true; - settings.concurrent = 1; - services = { - thoreb-telemetria-nix = mkNixRunner config.age.secrets.gitlab-runner-thoreb-telemetria-registrationConfigFile.path; - thoreb-itinerario-nix = mkNixRunner config.age.secrets.rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.path; - }; - }; - systemd.services.gitlab-runner.serviceConfig.Nice = 10; -} diff --git a/system/secrets.nix b/system/secrets.nix index ca11fb4..fdf14e8 100644 --- a/system/secrets.nix +++ b/system/secrets.nix @@ -6,7 +6,6 @@ secrets.monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.file = ../secrets/monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.age; secrets.gitlab-runner-thoreb-telemetria-registrationConfigFile.file = ../secrets/gitlab-runner-thoreb-telemetria-registrationConfigFile.age; secrets.monolith-forgejo-runner-token.file = ../secrets/monolith-forgejo-runner-token.age; - secrets.rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.file = ../secrets/rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.age; secrets.monolith-nix-serve-privkey.file = ../secrets/monolith-nix-serve-privkey.age; secrets.phantom-forgejo-mailer-password.file = ../secrets/phantom-forgejo-mailer-password.age; }; From 6b655dded4e607ec7c88a4e52b8ea65de3b45dc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 17 Oct 2024 20:31:28 -0300 Subject: [PATCH 274/404] monolith: use nproc as gitlab runner count --- system/monolith-gitlab-runner.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/monolith-gitlab-runner.nix b/system/monolith-gitlab-runner.nix index f17fbe3..3e63d98 100644 --- a/system/monolith-gitlab-runner.nix +++ b/system/monolith-gitlab-runner.nix @@ -12,7 +12,7 @@ in virtualisation.docker.enable = true; services.gitlab-runner = { enable = true; - settings.concurrent = 4; + settings.concurrent = 12; services = { # runner for building in docker via host's nix-daemon # nix store will be readable in runner, might be insecure From 56949d92382ee65e768a11b5058b3a4ced0ef334 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 18 Oct 2024 00:01:43 -0300 Subject: [PATCH 275/404] monolith: fix bluetooth dongle --- hosts/monolith/default.nix | 9 +++- ...b-Fix-regression-with-CSR-controllers.diff | 24 ++++++++++ pkgs/default.nix | 1 + pkgs/linux-bluetooth.nix | 47 +++++++++++++++++++ 4 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 patches/linux/v2-Bluetooth-btusb-Fix-regression-with-CSR-controllers.diff create mode 100644 pkgs/linux-bluetooth.nix diff --git a/hosts/monolith/default.nix b/hosts/monolith/default.nix index 3350e0d..ff2b193 100644 --- a/hosts/monolith/default.nix +++ b/hosts/monolith/default.nix @@ -38,7 +38,14 @@ in boot.kernelPackages = pkgs.linuxPackages_latest; - boot.extraModulePackages = with config.boot.kernelPackages; [ zenpower ]; + boot.extraModulePackages = with config.boot.kernelPackages; [ + zenpower + (pkgs.linux-bluetooth.override { + kernel = config.boot.kernelPackages.kernel; + patches = [ ../../patches/linux/v2-Bluetooth-btusb-Fix-regression-with-CSR-controllers.diff ]; + }) + ]; + boot.initrd.kernelModules = [ "amdgpu" ]; boot.kernelModules = [ "kvm-amd" diff --git a/patches/linux/v2-Bluetooth-btusb-Fix-regression-with-CSR-controllers.diff b/patches/linux/v2-Bluetooth-btusb-Fix-regression-with-CSR-controllers.diff new file mode 100644 index 0000000..ae1adeb --- /dev/null +++ b/patches/linux/v2-Bluetooth-btusb-Fix-regression-with-CSR-controllers.diff @@ -0,0 +1,24 @@ +diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c +index c0b6ef8ee5da..f72218c1037e 100644 +--- a/drivers/bluetooth/btusb.c ++++ b/drivers/bluetooth/btusb.c +@@ -1366,10 +1366,15 @@ static int btusb_submit_intr_urb(struct hci_dev *hdev, gfp_t mem_flags) + if (!urb) + return -ENOMEM; + +- /* Use maximum HCI Event size so the USB stack handles +- * ZPL/short-transfer automatically. +- */ +- size = HCI_MAX_EVENT_SIZE; ++ if (le16_to_cpu(data->udev->descriptor.idVendor) == 0x0a12 && ++ le16_to_cpu(data->udev->descriptor.idProduct) == 0x0001) ++ /* Fake CSR devices don't seem to support sort-transter */ ++ size = le16_to_cpu(data->intr_ep->wMaxPacketSize); ++ else ++ /* Use maximum HCI Event size so the USB stack handles ++ * ZPL/short-transfer automatically. ++ */ ++ size = HCI_MAX_EVENT_SIZE; + + buf = kmalloc(size, mem_flags); + if (!buf) { diff --git a/pkgs/default.nix b/pkgs/default.nix index b3f1b79..530d1cb 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -8,4 +8,5 @@ rec { emmet-cli = pkgs.callPackage ./emmet-cli.nix { }; material-wifi-icons = pkgs.callPackage ./material-wifi-icons.nix { }; gnome-pass-search-provider = pkgs.callPackage ./gnome-pass-search-provider.nix { }; + linux-bluetooth = pkgs.callPackage ./linux-bluetooth.nix { }; } diff --git a/pkgs/linux-bluetooth.nix b/pkgs/linux-bluetooth.nix new file mode 100644 index 0000000..609e775 --- /dev/null +++ b/pkgs/linux-bluetooth.nix @@ -0,0 +1,47 @@ +{ + pkgs, + lib, + kernel ? pkgs.linuxPackages_latest.kernel, + patches ? [ ], +}: + +pkgs.stdenv.mkDerivation { + pname = "bluetooth-kernel-module"; + inherit (kernel) + src + version + postPatch + nativeBuildInputs + ; + + inherit patches; + + kernel_dev = kernel.dev; + kernelVersion = kernel.modDirVersion; + + modulePath = "drivers/bluetooth"; + + buildPhase = '' + BUILT_KERNEL=$kernel_dev/lib/modules/$kernelVersion/build + + cp $BUILT_KERNEL/Module.symvers . + cp $BUILT_KERNEL/.config . + cp $kernel_dev/vmlinux . + + make "-j$NIX_BUILD_CORES" modules_prepare + make "-j$NIX_BUILD_CORES" M=$modulePath modules + ''; + + installPhase = '' + make \ + INSTALL_MOD_PATH="$out" \ + XZ="xz -T$NIX_BUILD_CORES" \ + M="$modulePath" \ + modules_install + ''; + + meta = { + description = "Bluetooth kernel module"; + license = lib.licenses.gpl3; + }; +} From 5da937fb46aea1ca5d204c57c554355e5f152cc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 5 Sep 2024 22:14:15 -0300 Subject: [PATCH 276/404] monolith: undervolt to -120 --- hosts/monolith/undervolt.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/monolith/undervolt.nix b/hosts/monolith/undervolt.nix index 1bd6c28..9f60aee 100644 --- a/hosts/monolith/undervolt.nix +++ b/hosts/monolith/undervolt.nix @@ -6,7 +6,7 @@ let echo "manual" > power_dpm_force_performance_level echo "1" > pp_power_profile_mode test -e pp_od_clk_voltage - echo "vo -100" > pp_od_clk_voltage + echo "vo -120" > pp_od_clk_voltage echo "c" > pp_od_clk_voltage ''; in From cc0ddda78a0bdbdd0dd4cdc238c705dc67bdd7fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 23 Oct 2024 12:35:07 -0300 Subject: [PATCH 277/404] kakoune: add pint as formatter --- scripts/default.nix | 1 + scripts/pint-fmt | 7 +++++++ user/kakoune/default.nix | 1 + user/kakoune/filetypes.kak | 4 ++++ 4 files changed, 13 insertions(+) create mode 100755 scripts/pint-fmt diff --git a/scripts/default.nix b/scripts/default.nix index 99b6635..79fe4c6 100644 --- a/scripts/default.nix +++ b/scripts/default.nix @@ -124,6 +124,7 @@ zbar wl-clipboard ]; + pint-fmt = [ ]; powerplay-led-idle = [ bash libinput diff --git a/scripts/pint-fmt b/scripts/pint-fmt new file mode 100755 index 0000000..85ea6cd --- /dev/null +++ b/scripts/pint-fmt @@ -0,0 +1,7 @@ +#!/bin/sh + +file="$(mktemp --tmpdir=/dev/shm).php" +cat - >"$file" +./vendor/bin/pint --quiet "$file" +cat "$file" +rm "$file" diff --git a/user/kakoune/default.nix b/user/kakoune/default.nix index 337e007..9963f26 100644 --- a/user/kakoune/default.nix +++ b/user/kakoune/default.nix @@ -133,6 +133,7 @@ in emmet-cli nodePackages.prettier + pint-fmt aspell aspellDicts.en diff --git a/user/kakoune/filetypes.kak b/user/kakoune/filetypes.kak index fd0b87c..293293c 100644 --- a/user/kakoune/filetypes.kak +++ b/user/kakoune/filetypes.kak @@ -30,6 +30,10 @@ hook global WinSetOption filetype=angular %[ add-highlighter buffer/angular ref html ] +hook global BufCreate .*\.php %{ + set buffer formatcmd 'pint-fmt' +} + hook global BufCreate .*\.js %{ set buffer formatcmd 'prettier --parser babel' } From a767f8a0a6ea2ffb232a80c50d2197717cb119c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 25 Oct 2024 16:33:21 -0300 Subject: [PATCH 278/404] docker: fix logging for bitbucket runner --- system/containers.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/system/containers.nix b/system/containers.nix index 19698e5..37844f7 100644 --- a/system/containers.nix +++ b/system/containers.nix @@ -12,6 +12,14 @@ "--volumes" ]; }; + daemon.settings = { + # needed by bitbucket runner ??? + log-driver = "json-file"; + log-opts = { + max-size = "10m"; + max-file = "3"; + }; + }; }; programs.extra-container.enable = true; From 569298b04a8f3b4172a2aaca305dde337a065cab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 25 Oct 2024 16:43:20 -0300 Subject: [PATCH 279/404] scripts: update pint-fmt --- scripts/pint-fmt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pint-fmt b/scripts/pint-fmt index 85ea6cd..4d84c88 100755 --- a/scripts/pint-fmt +++ b/scripts/pint-fmt @@ -1,6 +1,6 @@ #!/bin/sh -file="$(mktemp --tmpdir=/dev/shm).php" +file="$(mktemp)" cat - >"$file" ./vendor/bin/pint --quiet "$file" cat "$file" From f792fba54452ae6baaec198d1f1c564b2f7d6f06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 25 Oct 2024 16:43:53 -0300 Subject: [PATCH 280/404] ssh: include private configs --- user/ssh.nix | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/user/ssh.nix b/user/ssh.nix index 60649ba..4747bb4 100644 --- a/user/ssh.nix +++ b/user/ssh.nix @@ -1,26 +1,20 @@ -{ - config, - pkgs, - lib, - ... -}: -let - inherit (config.my) username mail; -in { config = { - programs.ssh.enable = true; - programs.ssh.matchBlocks = { - monolith = { - user = "lelgenio"; - hostname = "monolith.lelgenio.com"; - port = 9022; - }; - phantom = { - user = "root"; - hostname = "phantom.lelgenio.com"; - port = 9022; + programs.ssh = { + enable = true; + matchBlocks = { + monolith = { + user = "lelgenio"; + hostname = "monolith.lelgenio.com"; + port = 9022; + }; + phantom = { + user = "root"; + hostname = "phantom.lelgenio.com"; + port = 9022; + }; }; + includes = [ "~/Wopus/.ssh.config" ]; }; }; } From 0b7bb0a69b6fa811bffa6c45e1367e40a40dcbd0 Mon Sep 17 00:00:00 2001 From: lelgenio Date: Thu, 24 Oct 2024 16:15:32 -0300 Subject: [PATCH 281/404] rainbow: Partial Revert "rainbow: cleanup" This reverts commit feafc57514ec26979979a6c0d6627251f27b662b. --- flake.nix | 5 ++++- ...oreb-itinerario-registrationConfigFile.age | 13 +++++++++++ secrets/secrets.nix | 3 +++ system/rainbow-gitlab-runner.nix | 22 +++++++++++++++++++ system/secrets.nix | 1 + 5 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 secrets/rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.age create mode 100644 system/rainbow-gitlab-runner.nix diff --git a/flake.nix b/flake.nix index 54c9a44..e7f5813 100644 --- a/flake.nix +++ b/flake.nix @@ -154,7 +154,10 @@ }; double-rainbow = lib.nixosSystem { inherit system specialArgs; - modules = [ ./hosts/double-rainbow.nix ] ++ common_modules; + modules = [ + ./hosts/double-rainbow.nix + ./system/rainbow-gitlab-runner.nix + ] ++ common_modules; }; pixie = lib.nixosSystem { inherit system specialArgs; diff --git a/secrets/rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.age b/secrets/rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.age new file mode 100644 index 0000000..03118e3 --- /dev/null +++ b/secrets/rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.age @@ -0,0 +1,13 @@ +age-encryption.org/v1 +-> ssh-rsa BwwxHg +KCVF4Sy49stOeQs2uunYKkvadqeimmWlJ4ucEJxfXy2z+OkkZpixUnWgJEH2nCa4 +NL/F0Wezbqvh+Texl4FlHN8PT2w/d5gdg/L+fI4jBYCvbbiHA4sdUgmXWigY8zrU +5H7Y9mgb1Y174fA6zfTCk2fHmk+KARoV27YrS2fzGoVQiPhnvv8ZT51eF1E+Zs4I ++YtXehxEOqYljJKYJJnF9ElzfNa8nypACGtcjTE8eEq0DlZu2U7qV+QWwQudHbcs +MbFR2VtkHWQaNdK1vVBGND1CMlfshSCqbUzGcexownMiCVSal1RKA2uAWnYdOEc/ +QSR8cKn8QQ5dyPFCqZ8RnlCMUegCVLg5cC0/rlTUD0C/Ti2SRBYTH3HvJjmSNk8k +3LdcNwK4YtG4d1gkqLVjwCM1Yg8I/UICb5nQYclvBz5VQ2drvL/gU/+Vc7Z5KUFI +0G/7uNmeJ16Eky+X9c73ZZxVqm0TzDENE2GzkPhBHEfXBR+4j6m8KKEWxQmA2ZSg + +--- Oq9wU0h90iU/8g1XTNI+LuAg7t09hngj9DCK91V1+pg +χvP}N,Wl ?y0)eVwAiŐSm>DQC-B0V|=X6 W>~-qI% \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 5582393..7b5fdd8 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -2,6 +2,9 @@ let main_ssh_public_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxR/w+38b2lX90yNBqhq3mUmkn1WGu6GAPhN1tVp2ZjYRJNV/+5gWCnTtOWYtDx35HmK/spQ2Qy8X9ttkzORa24fysNx1Iqn/TiXhD7eIJjbGPnrOpIKTkW5/uB3SD/P5NBSa06//BaqJU4sBlG79hoXRpod052hQtdpTVDiMCIV+iboWPKqopmJJfWdBtVnHXs9rep0htPRExxGslImFk7Z6xjcaHyCpIQZPlOGf+sGsmUU7jRqzvZFV8ucIdbnAlMHrU4pepNFhuraESyZVTa/bi9sw0iozXp5Q5+5thMebEslmT1Z771kI4sieDy+O4r8c0Sx2/VY1UAzcpq1faggc3YB01MTh+tiEC6xdMvZLrQGL1NBWjHleMyL53GU5ERluC0vXJF3Hv3BGGBDfXWbrEm5n06DHr2apRVJGC0LwiQ7Woud1X4V4X1pKSusxCVMjT2lmcOwV6YhKhB2sowJc1OdMx4+tL0UWE+YKSZgBHfolwk6ml0F4EO9nnUHc= lelgenio@i15"; in { + "rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.age".publicKeys = [ + main_ssh_public_key + ]; "monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.age".publicKeys = [ main_ssh_public_key ]; diff --git a/system/rainbow-gitlab-runner.nix b/system/rainbow-gitlab-runner.nix new file mode 100644 index 0000000..3230c8b --- /dev/null +++ b/system/rainbow-gitlab-runner.nix @@ -0,0 +1,22 @@ +{ + config, + pkgs, + lib, + ... +}: +let + inherit (pkgs.callPackage ./gitlab-runner.nix { }) mkNixRunner; +in +{ + boot.kernel.sysctl."net.ipv4.ip_forward" = true; + virtualisation.docker.enable = true; + services.gitlab-runner = { + enable = true; + settings.concurrent = 1; + services = { + thoreb-telemetria-nix = mkNixRunner config.age.secrets.gitlab-runner-thoreb-telemetria-registrationConfigFile.path; + thoreb-itinerario-nix = mkNixRunner config.age.secrets.rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.path; + }; + }; + systemd.services.gitlab-runner.serviceConfig.Nice = 10; +} diff --git a/system/secrets.nix b/system/secrets.nix index fdf14e8..ca11fb4 100644 --- a/system/secrets.nix +++ b/system/secrets.nix @@ -6,6 +6,7 @@ secrets.monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.file = ../secrets/monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.age; secrets.gitlab-runner-thoreb-telemetria-registrationConfigFile.file = ../secrets/gitlab-runner-thoreb-telemetria-registrationConfigFile.age; secrets.monolith-forgejo-runner-token.file = ../secrets/monolith-forgejo-runner-token.age; + secrets.rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.file = ../secrets/rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.age; secrets.monolith-nix-serve-privkey.file = ../secrets/monolith-nix-serve-privkey.age; secrets.phantom-forgejo-mailer-password.file = ../secrets/phantom-forgejo-mailer-password.age; }; From 26993eadbc4fbe968687684da717b3374a50031f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 28 Oct 2024 12:02:31 -0300 Subject: [PATCH 282/404] monolith: extract amdgpu config --- hosts/monolith/amdgpu.nix | 37 ++++++++++++++++++++++++++++++++++++ hosts/monolith/default.nix | 20 ++----------------- hosts/monolith/undervolt.nix | 18 ------------------ 3 files changed, 39 insertions(+), 36 deletions(-) create mode 100644 hosts/monolith/amdgpu.nix delete mode 100644 hosts/monolith/undervolt.nix diff --git a/hosts/monolith/amdgpu.nix b/hosts/monolith/amdgpu.nix new file mode 100644 index 0000000..c02af7e --- /dev/null +++ b/hosts/monolith/amdgpu.nix @@ -0,0 +1,37 @@ +{ pkgs, ... }: +let + undervoltGpu = pkgs.writeShellScript "undervolt-gpu" '' + set -xe + cd $1 + echo "manual" > power_dpm_force_performance_level + echo "1" > pp_power_profile_mode + test -e pp_od_clk_voltage + echo "vo -120" > pp_od_clk_voltage + echo "c" > pp_od_clk_voltage + ''; +in +{ + boot.initrd.kernelModules = [ "amdgpu" ]; + boot.kernelParams = [ + "amdgpu.dcdebugmask=0x10" # amdgpu undervolting bug + "video=DP-1:1920x1080@144" + "amdgpu.ppfeaturemask=0xfffd7fff" # enable undervolting + ]; + + hardware.opengl.driSupport = true; + # # For 32 bit applications + hardware.opengl.driSupport32Bit = true; + + hardware.opengl.extraPackages = with pkgs; [ + libva + libvdpau + vaapiVdpau + rocm-opencl-icd + rocm-opencl-runtime + rocmPackages.rocm-smi + ]; + + services.udev.extraRules = '' + ACTION=="add", SUBSYSTEM=="hwmon", ATTR{name}=="amdgpu", ATTR{power1_cap}="186000000", RUN+="${undervoltGpu} %S%p/device" + ''; +} diff --git a/hosts/monolith/default.nix b/hosts/monolith/default.nix index ff2b193..962addc 100644 --- a/hosts/monolith/default.nix +++ b/hosts/monolith/default.nix @@ -23,7 +23,7 @@ in imports = [ (modulesPath + "/installer/scan/not-detected.nix") ./partition.nix - ./undervolt.nix + ./amdgpu.nix ]; boot.initrd.availableKernelModules = [ "nvme" @@ -52,28 +52,12 @@ in "amdgpu" "zenpower" ]; - boot.kernelParams = [ - "amdgpu.dcdebugmask=0x10" # amdgpu undervolting bug - "video=DP-1:1920x1080@144" - ]; + systemd.sleep.extraConfig = '' HibernateDelaySec=30s SuspendState=mem ''; - hardware.opengl.driSupport = true; - # # For 32 bit applications - hardware.opengl.driSupport32Bit = true; - - hardware.opengl.extraPackages = with pkgs; [ - libva - libvdpau - vaapiVdpau - rocm-opencl-icd - rocm-opencl-runtime - rocmPackages.rocm-smi - ]; - fileSystems."/mnt/old" = { device = "/dev/disk/by-label/BTRFS_ROOT"; fsType = "btrfs"; diff --git a/hosts/monolith/undervolt.nix b/hosts/monolith/undervolt.nix deleted file mode 100644 index 9f60aee..0000000 --- a/hosts/monolith/undervolt.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ pkgs, ... }: -let - undervoltGpu = pkgs.writeShellScript "undervolt-gpu" '' - set -xe - cd $1 - echo "manual" > power_dpm_force_performance_level - echo "1" > pp_power_profile_mode - test -e pp_od_clk_voltage - echo "vo -120" > pp_od_clk_voltage - echo "c" > pp_od_clk_voltage - ''; -in -{ - boot.kernelParams = [ "amdgpu.ppfeaturemask=0xfffd7fff" ]; - services.udev.extraRules = '' - ACTION=="add", SUBSYSTEM=="hwmon", ATTR{name}=="amdgpu", ATTR{power1_cap}="186000000", RUN+="${undervoltGpu} %S%p/device" - ''; -} From 356a886fb2a4ceb005680441c617b16dc7a2e3b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 30 Oct 2024 01:44:43 -0300 Subject: [PATCH 283/404] phantom: add factorio server --- hosts/phantom/default.nix | 1 + hosts/phantom/factorio-server.nix | 24 ++++++++++++++++++++++++ secrets/phantom-factorio-settings.age | Bin 0 -> 847 bytes secrets/secrets.nix | 1 + 4 files changed, 26 insertions(+) create mode 100644 hosts/phantom/factorio-server.nix create mode 100644 secrets/phantom-factorio-settings.age diff --git a/hosts/phantom/default.nix b/hosts/phantom/default.nix index e5570ee..6a246e4 100644 --- a/hosts/phantom/default.nix +++ b/hosts/phantom/default.nix @@ -21,6 +21,7 @@ ./invidious.nix ./davi.nix ./goofs.nix + ./factorio-server.nix ]; networking.hostName = "phantom"; diff --git a/hosts/phantom/factorio-server.nix b/hosts/phantom/factorio-server.nix new file mode 100644 index 0000000..a4b13b5 --- /dev/null +++ b/hosts/phantom/factorio-server.nix @@ -0,0 +1,24 @@ +{ config, pkgs, ... }: +{ + services.factorio = { + enable = true; + package = pkgs.unstable.factorio-headless.overrideAttrs (_: rec { + version = "2.0.12"; + src = pkgs.fetchurl { + name = "factorio_headless_x64-${version}.tar.xz"; + url = "https://www.factorio.com/get-download/${version}/headless/linux64"; + hash = "sha256-0vgg5eJ6ZEFO0TUixNsByCs8YyPGOArgqnXbT5RIjTE="; + }; + }); + public = true; + lan = true; + openFirewall = true; + admins = [ "lelgenio" ]; + extraSettingsFile = config.age.secrets.phantom-factorio-settings.path; + }; + + age.secrets.phantom-factorio-settings = { + file = ../../secrets/phantom-factorio-settings.age; + mode = "777"; + }; +} diff --git a/secrets/phantom-factorio-settings.age b/secrets/phantom-factorio-settings.age new file mode 100644 index 0000000000000000000000000000000000000000..77eb8bddbb17ce598bbd018de5232c281bc213e4 GIT binary patch literal 847 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!*`Do#{zDlf0_NaqSEF>&$JcCGNy z&n$2X3P?#TaHv&_x14AR!;GS5lX&&YHSb@UDjFD(nJbT4rFs-Qc zHFe4e&eYCKb20Xf^7J*!FR#=tOtVM~wlEJU<1+QNFf?>_O)f6?Eceed@=Pl%$%^nu zNzeAvcQG(`b*ZY12uvxdFfTB0^3e7U$ck{*Hcu-EDNe0O_l*jQu;k*>)zww7^zigc zcC7T$cTF@*cJy{BD)I7-Fe&p5@pIEpstgMB%&n*71%&$Rn^tA#L&$4QB zy@}&2VLov>){?RLtkr#Ufk$lnK8sIc6V1M{wPuU!T7Hj;EQXI6`}bL={+TJ3XQ#=P z?R#&@*Py@LvCa9NYlAn`efAQT-eux>d;V!}e- literal 0 HcmV?d00001 diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 7b5fdd8..65f495a 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -12,6 +12,7 @@ in "monolith-forgejo-runner-token.age".publicKeys = [ main_ssh_public_key ]; "lelgenio-cachix.age".publicKeys = [ main_ssh_public_key ]; "monolith-nix-serve-privkey.age".publicKeys = [ main_ssh_public_key ]; + "phantom-factorio-settings.age".publicKeys = [ main_ssh_public_key ]; "phantom-nextcloud.age".publicKeys = [ main_ssh_public_key ]; "phantom-writefreely.age".publicKeys = [ main_ssh_public_key ]; "phantom-renawiki.age".publicKeys = [ main_ssh_public_key ]; From 8a3046786cf96c8929d8ef9e1e9f3bd8d30b8da5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 30 Oct 2024 20:51:43 -0300 Subject: [PATCH 284/404] factorio: move hosting to monolith --- hosts/monolith/default.nix | 1 + hosts/{phantom => monolith}/factorio-server.nix | 6 +++--- hosts/phantom/default.nix | 1 - ...-factorio-settings.age => factorio-settings.age} | Bin secrets/secrets.nix | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename hosts/{phantom => monolith}/factorio-server.nix (75%) rename secrets/{phantom-factorio-settings.age => factorio-settings.age} (100%) diff --git a/hosts/monolith/default.nix b/hosts/monolith/default.nix index 962addc..8aa63b8 100644 --- a/hosts/monolith/default.nix +++ b/hosts/monolith/default.nix @@ -24,6 +24,7 @@ in (modulesPath + "/installer/scan/not-detected.nix") ./partition.nix ./amdgpu.nix + ./factorio-server.nix ]; boot.initrd.availableKernelModules = [ "nvme" diff --git a/hosts/phantom/factorio-server.nix b/hosts/monolith/factorio-server.nix similarity index 75% rename from hosts/phantom/factorio-server.nix rename to hosts/monolith/factorio-server.nix index a4b13b5..0de34b1 100644 --- a/hosts/phantom/factorio-server.nix +++ b/hosts/monolith/factorio-server.nix @@ -14,11 +14,11 @@ lan = true; openFirewall = true; admins = [ "lelgenio" ]; - extraSettingsFile = config.age.secrets.phantom-factorio-settings.path; + extraSettingsFile = config.age.secrets.factorio-settings.path; }; - age.secrets.phantom-factorio-settings = { - file = ../../secrets/phantom-factorio-settings.age; + age.secrets.factorio-settings = { + file = ../../secrets/factorio-settings.age; mode = "777"; }; } diff --git a/hosts/phantom/default.nix b/hosts/phantom/default.nix index 6a246e4..e5570ee 100644 --- a/hosts/phantom/default.nix +++ b/hosts/phantom/default.nix @@ -21,7 +21,6 @@ ./invidious.nix ./davi.nix ./goofs.nix - ./factorio-server.nix ]; networking.hostName = "phantom"; diff --git a/secrets/phantom-factorio-settings.age b/secrets/factorio-settings.age similarity index 100% rename from secrets/phantom-factorio-settings.age rename to secrets/factorio-settings.age diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 65f495a..f64fb4b 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -12,7 +12,7 @@ in "monolith-forgejo-runner-token.age".publicKeys = [ main_ssh_public_key ]; "lelgenio-cachix.age".publicKeys = [ main_ssh_public_key ]; "monolith-nix-serve-privkey.age".publicKeys = [ main_ssh_public_key ]; - "phantom-factorio-settings.age".publicKeys = [ main_ssh_public_key ]; + "factorio-settings.age".publicKeys = [ main_ssh_public_key ]; "phantom-nextcloud.age".publicKeys = [ main_ssh_public_key ]; "phantom-writefreely.age".publicKeys = [ main_ssh_public_key ]; "phantom-renawiki.age".publicKeys = [ main_ssh_public_key ]; From 672b963bcc7d016c1952acff3b870c7f80ec9791 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 31 Oct 2024 01:40:13 -0300 Subject: [PATCH 285/404] monolith: remove bluetooth dongle patch --- hosts/monolith/default.nix | 8 +--- ...b-Fix-regression-with-CSR-controllers.diff | 24 ---------- pkgs/default.nix | 1 - pkgs/linux-bluetooth.nix | 47 ------------------- 4 files changed, 1 insertion(+), 79 deletions(-) delete mode 100644 patches/linux/v2-Bluetooth-btusb-Fix-regression-with-CSR-controllers.diff delete mode 100644 pkgs/linux-bluetooth.nix diff --git a/hosts/monolith/default.nix b/hosts/monolith/default.nix index 8aa63b8..f4fde3a 100644 --- a/hosts/monolith/default.nix +++ b/hosts/monolith/default.nix @@ -39,13 +39,7 @@ in boot.kernelPackages = pkgs.linuxPackages_latest; - boot.extraModulePackages = with config.boot.kernelPackages; [ - zenpower - (pkgs.linux-bluetooth.override { - kernel = config.boot.kernelPackages.kernel; - patches = [ ../../patches/linux/v2-Bluetooth-btusb-Fix-regression-with-CSR-controllers.diff ]; - }) - ]; + boot.extraModulePackages = with config.boot.kernelPackages; [ zenpower ]; boot.initrd.kernelModules = [ "amdgpu" ]; boot.kernelModules = [ diff --git a/patches/linux/v2-Bluetooth-btusb-Fix-regression-with-CSR-controllers.diff b/patches/linux/v2-Bluetooth-btusb-Fix-regression-with-CSR-controllers.diff deleted file mode 100644 index ae1adeb..0000000 --- a/patches/linux/v2-Bluetooth-btusb-Fix-regression-with-CSR-controllers.diff +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c -index c0b6ef8ee5da..f72218c1037e 100644 ---- a/drivers/bluetooth/btusb.c -+++ b/drivers/bluetooth/btusb.c -@@ -1366,10 +1366,15 @@ static int btusb_submit_intr_urb(struct hci_dev *hdev, gfp_t mem_flags) - if (!urb) - return -ENOMEM; - -- /* Use maximum HCI Event size so the USB stack handles -- * ZPL/short-transfer automatically. -- */ -- size = HCI_MAX_EVENT_SIZE; -+ if (le16_to_cpu(data->udev->descriptor.idVendor) == 0x0a12 && -+ le16_to_cpu(data->udev->descriptor.idProduct) == 0x0001) -+ /* Fake CSR devices don't seem to support sort-transter */ -+ size = le16_to_cpu(data->intr_ep->wMaxPacketSize); -+ else -+ /* Use maximum HCI Event size so the USB stack handles -+ * ZPL/short-transfer automatically. -+ */ -+ size = HCI_MAX_EVENT_SIZE; - - buf = kmalloc(size, mem_flags); - if (!buf) { diff --git a/pkgs/default.nix b/pkgs/default.nix index 530d1cb..b3f1b79 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -8,5 +8,4 @@ rec { emmet-cli = pkgs.callPackage ./emmet-cli.nix { }; material-wifi-icons = pkgs.callPackage ./material-wifi-icons.nix { }; gnome-pass-search-provider = pkgs.callPackage ./gnome-pass-search-provider.nix { }; - linux-bluetooth = pkgs.callPackage ./linux-bluetooth.nix { }; } diff --git a/pkgs/linux-bluetooth.nix b/pkgs/linux-bluetooth.nix deleted file mode 100644 index 609e775..0000000 --- a/pkgs/linux-bluetooth.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - pkgs, - lib, - kernel ? pkgs.linuxPackages_latest.kernel, - patches ? [ ], -}: - -pkgs.stdenv.mkDerivation { - pname = "bluetooth-kernel-module"; - inherit (kernel) - src - version - postPatch - nativeBuildInputs - ; - - inherit patches; - - kernel_dev = kernel.dev; - kernelVersion = kernel.modDirVersion; - - modulePath = "drivers/bluetooth"; - - buildPhase = '' - BUILT_KERNEL=$kernel_dev/lib/modules/$kernelVersion/build - - cp $BUILT_KERNEL/Module.symvers . - cp $BUILT_KERNEL/.config . - cp $kernel_dev/vmlinux . - - make "-j$NIX_BUILD_CORES" modules_prepare - make "-j$NIX_BUILD_CORES" M=$modulePath modules - ''; - - installPhase = '' - make \ - INSTALL_MOD_PATH="$out" \ - XZ="xz -T$NIX_BUILD_CORES" \ - M="$modulePath" \ - modules_install - ''; - - meta = { - description = "Bluetooth kernel module"; - license = lib.licenses.gpl3; - }; -} From 4e1ca64d0e560249e46f3f19bb4eb15b63b4c937 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 31 Oct 2024 01:40:45 -0300 Subject: [PATCH 286/404] update --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 5e74698..54aac8d 100644 --- a/flake.lock +++ b/flake.lock @@ -213,11 +213,11 @@ ] }, "locked": { - "lastModified": 1728334376, - "narHash": "sha256-CTKEKPzD/j8FK6H4DO3EjyixZd3HHvgAgfnCwpGFP5c=", + "lastModified": 1730190761, + "narHash": "sha256-o5m5WzvY6cGIDupuOvjgNSS8AN6yP2iI9MtUC6q/uos=", "owner": "nix-community", "repo": "disko", - "rev": "d39ee334984fcdae6244f5a8e6ab857479cbaefe", + "rev": "3979285062d6781525cded0f6c4ff92e71376b55", "type": "github" }, "original": { @@ -489,11 +489,11 @@ ] }, "locked": { - "lastModified": 1728263287, - "narHash": "sha256-GJDtsxz2/zw6g/Nrp4XVWBS5IaZ7ZUkuvxPOBEDe7pg=", + "lastModified": 1729999765, + "narHash": "sha256-LYsavZXitFjjyETZoij8usXjTa7fa9AIF3Sk3MJSX+Y=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "5fce10c871bab6d7d5ac9e5e7efbb3a2783f5259", + "rev": "0e3a8778c2ee218eff8de6aacf3d2fa6c33b2d4f", "type": "github" }, "original": { @@ -531,11 +531,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728193676, - "narHash": "sha256-PbDWAIjKJdlVg+qQRhzdSor04bAPApDqIv2DofTyynk=", + "lastModified": 1730137625, + "narHash": "sha256-9z8oOgFZiaguj+bbi3k4QhAD6JabWrnv7fscC/mt0KE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ecbc1ca8ffd6aea8372ad16be9ebbb39889e55b6", + "rev": "64b80bfb316b57cdb8919a9110ef63393d74382a", "type": "github" }, "original": { @@ -546,11 +546,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1728018373, - "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", + "lastModified": 1729880355, + "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", + "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", "type": "github" }, "original": { @@ -837,11 +837,11 @@ }, "vpsadminos": { "locked": { - "lastModified": 1728335559, - "narHash": "sha256-95/KJBA449oAjf6bLwaCvDgys7yE8vKXY3wHe/uUkiw=", + "lastModified": 1730290190, + "narHash": "sha256-a+op2lnWrCytuEhLOE24SKR/irRfjwDEHkpLyAL5P90=", "owner": "vpsfreecz", "repo": "vpsadminos", - "rev": "c928bdec26484e99621cc76cb165abb73aa7d029", + "rev": "63ac771b9667b45ab2ea87363f69ca7f85668e9b", "type": "github" }, "original": { From 7ccbca83bcd903601927d4c5ce937db2a59db6eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 31 Oct 2024 19:59:35 -0300 Subject: [PATCH 287/404] factorio: automate updating server --- hosts/monolith/factorio-server.nix | 9 +-------- pkgs/default.nix | 3 +++ pkgs/factorio-headless/default.nix | 10 ++++++++++ pkgs/factorio-headless/update.sh | 14 ++++++++++++++ 4 files changed, 28 insertions(+), 8 deletions(-) create mode 100644 pkgs/factorio-headless/default.nix create mode 100755 pkgs/factorio-headless/update.sh diff --git a/hosts/monolith/factorio-server.nix b/hosts/monolith/factorio-server.nix index 0de34b1..3c893a5 100644 --- a/hosts/monolith/factorio-server.nix +++ b/hosts/monolith/factorio-server.nix @@ -2,14 +2,7 @@ { services.factorio = { enable = true; - package = pkgs.unstable.factorio-headless.overrideAttrs (_: rec { - version = "2.0.12"; - src = pkgs.fetchurl { - name = "factorio_headless_x64-${version}.tar.xz"; - url = "https://www.factorio.com/get-download/${version}/headless/linux64"; - hash = "sha256-0vgg5eJ6ZEFO0TUixNsByCs8YyPGOArgqnXbT5RIjTE="; - }; - }); + package = pkgs.factorio-headless; # I override this in ./pkgs public = true; lan = true; openFirewall = true; diff --git a/pkgs/default.nix b/pkgs/default.nix index b3f1b79..b702886 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -8,4 +8,7 @@ rec { emmet-cli = pkgs.callPackage ./emmet-cli.nix { }; material-wifi-icons = pkgs.callPackage ./material-wifi-icons.nix { }; gnome-pass-search-provider = pkgs.callPackage ./gnome-pass-search-provider.nix { }; + factorio-headless = pkgs.callPackage ./factorio-headless { + inherit (pkgs.unstable) factorio-headless; + }; } diff --git a/pkgs/factorio-headless/default.nix b/pkgs/factorio-headless/default.nix new file mode 100644 index 0000000..b6d34ef --- /dev/null +++ b/pkgs/factorio-headless/default.nix @@ -0,0 +1,10 @@ +{ factorio-headless, pkgs }: + +factorio-headless.overrideAttrs (_: rec { + version = "2.0.13"; + src = pkgs.fetchurl { + name = "factorio_headless_x64-${version}.tar.xz"; + url = "https://www.factorio.com/get-download/${version}/headless/linux64"; + hash = "sha256-J7NpAaOeWTrfKEGMAoYULGx6n4PRVpY8c2m9QFolx9E="; + }; +}) diff --git a/pkgs/factorio-headless/update.sh b/pkgs/factorio-headless/update.sh new file mode 100755 index 0000000..9f7bce9 --- /dev/null +++ b/pkgs/factorio-headless/update.sh @@ -0,0 +1,14 @@ +#!/bin/sh + +set -xe + +cd "$(dirname $0)" + +current_version="$(rg '^.*?version\s*=\s*"(.+)".*?$' --replace '$1' ./default.nix)" +current_hash="$(rg '^.*?hash\s*=\s*"(.+)".*?$' --replace '$1' ./default.nix)" + +new_version="$(curl https://factorio.com/api/latest-releases | jq -r .stable.headless)" +new_hash="$(nix-hash --to-sri --type sha256 $(nix-prefetch-url --type sha256 https://www.factorio.com/get-download/${new_version}/headless/linux64))" + +sd "$current_version" "$new_version" ./default.nix +sd "$current_hash" "$new_hash" ./default.nix From ee22f17dbef22cea9a849903bf0f55599ab0e4ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sun, 3 Nov 2024 04:17:56 -0300 Subject: [PATCH 288/404] amdgpu: add custom fan control --- hosts/monolith/amdgpu.nix | 9 ++++++- scripts/amd-fan-control | 50 +++++++++++++++++++++++++++++++++++++++ scripts/default.nix | 1 + 3 files changed, 59 insertions(+), 1 deletion(-) create mode 100755 scripts/amd-fan-control diff --git a/hosts/monolith/amdgpu.nix b/hosts/monolith/amdgpu.nix index c02af7e..f3cefaa 100644 --- a/hosts/monolith/amdgpu.nix +++ b/hosts/monolith/amdgpu.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, lib, ... }: let undervoltGpu = pkgs.writeShellScript "undervolt-gpu" '' set -xe @@ -18,6 +18,13 @@ in "amdgpu.ppfeaturemask=0xfffd7fff" # enable undervolting ]; + systemd.services.amd-fan-control = { + script = '' + ${lib.getExe pkgs.amd-fan-control} /sys/class/drm/card1/device 60 85 + ''; + wantedBy = [ "multi-user.target" ]; + }; + hardware.opengl.driSupport = true; # # For 32 bit applications hardware.opengl.driSupport32Bit = true; diff --git a/scripts/amd-fan-control b/scripts/amd-fan-control new file mode 100755 index 0000000..641c5cf --- /dev/null +++ b/scripts/amd-fan-control @@ -0,0 +1,50 @@ +#!/usr/bin/env bash + +set -e + +DEVICE="$1" # eg: /sys/class/drm/card1/device +HWMON=$(echo "$DEVICE"/hwmon/hwmon*) + +exit() { + echo "Setting controll to auto" >&2 + echo 2 > "$HWMON/pwm1_enable" +} + +trap exit EXIT INT + +bail() { + echo "Error: $@" >&2 + echo "Exiting..." >&2 + exit 1 +} + +if ! [ -d $HWMON ]; then + bail "Invalid HWMON" +fi + +TEMP_INPUT="$HWMON/temp2_input" + +if ! [ -f $TEMP_INPUT ]; then + bail "Invalid TEMP_INPUT" +fi + +MIN="$2" +MAX="$3" + +echo "Running..." >&2 +while true; do + TEMPERATURE_RAW=$(cat "$TEMP_INPUT") + TEMPERATURE="$(( $TEMPERATURE_RAW / 1000 ))" + # Remap from a number between 60_000..90_000 to 0..255 + PWM=$(( ($TEMPERATURE - $MIN) * 255 / ($MAX - $MIN) )) + + if [ "$PWM" -gt 255 ]; then + PWM=255 + elif [ "$PWM" -lt 0 ]; then + PWM=0 + fi + + echo 1 > "$HWMON/pwm1_enable" + echo "$PWM" > "$HWMON/pwm1" + sleep .1s +done diff --git a/scripts/default.nix b/scripts/default.nix index 79fe4c6..c621d47 100644 --- a/scripts/default.nix +++ b/scripts/default.nix @@ -23,6 +23,7 @@ in with final; createScripts { + amd-fan-control = [ bash ]; br = [ ]; bmenu = [ bemenu From fd32b735f6b941970bb3a99ebb855c37650bc97d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 7 Nov 2024 13:01:19 -0300 Subject: [PATCH 289/404] kak: add scss formatter --- user/kakoune/filetypes.kak | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/user/kakoune/filetypes.kak b/user/kakoune/filetypes.kak index 293293c..7ea774e 100644 --- a/user/kakoune/filetypes.kak +++ b/user/kakoune/filetypes.kak @@ -38,6 +38,10 @@ hook global BufCreate .*\.js %{ set buffer formatcmd 'prettier --parser babel' } +hook global BufCreate .*\.scss %{ + set buffer formatcmd 'prettier --parser scss' +} + hook global BufCreate .*\.vue %{ set buffer formatcmd 'prettier --parser vue' hook buffer InsertCompletionHide { From 8dd92bf641094467a55877f696a71db914782318 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sun, 10 Nov 2024 23:25:20 -0300 Subject: [PATCH 290/404] factorio: 2.0.13 -> 2.0.15 --- pkgs/factorio-headless/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/factorio-headless/default.nix b/pkgs/factorio-headless/default.nix index b6d34ef..9e940f0 100644 --- a/pkgs/factorio-headless/default.nix +++ b/pkgs/factorio-headless/default.nix @@ -1,10 +1,10 @@ { factorio-headless, pkgs }: factorio-headless.overrideAttrs (_: rec { - version = "2.0.13"; + version = "2.0.15"; src = pkgs.fetchurl { name = "factorio_headless_x64-${version}.tar.xz"; url = "https://www.factorio.com/get-download/${version}/headless/linux64"; - hash = "sha256-J7NpAaOeWTrfKEGMAoYULGx6n4PRVpY8c2m9QFolx9E="; + hash = "sha256-cLRBy4B4EaYFhsARBySMHY164EO9HyNnX8kk+6qlONg="; }; }) From 0faa8354ad8da46b9a88901a7159ad3e32b93005 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 23 Nov 2024 23:41:28 -0300 Subject: [PATCH 291/404] factorio: 2.0.15 -> 2.0.20 --- pkgs/factorio-headless/default.nix | 4 ++-- pkgs/factorio-headless/update.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/factorio-headless/default.nix b/pkgs/factorio-headless/default.nix index 9e940f0..01ff2cc 100644 --- a/pkgs/factorio-headless/default.nix +++ b/pkgs/factorio-headless/default.nix @@ -1,10 +1,10 @@ { factorio-headless, pkgs }: factorio-headless.overrideAttrs (_: rec { - version = "2.0.15"; + version = "2.0.20"; src = pkgs.fetchurl { name = "factorio_headless_x64-${version}.tar.xz"; url = "https://www.factorio.com/get-download/${version}/headless/linux64"; - hash = "sha256-cLRBy4B4EaYFhsARBySMHY164EO9HyNnX8kk+6qlONg="; + hash = "sha256-xKkB8vHb7btBZUVg20xvq2g6MMIDNOgF1O90DAQWUVo="; }; }) diff --git a/pkgs/factorio-headless/update.sh b/pkgs/factorio-headless/update.sh index 9f7bce9..2f57612 100755 --- a/pkgs/factorio-headless/update.sh +++ b/pkgs/factorio-headless/update.sh @@ -10,5 +10,5 @@ current_hash="$(rg '^.*?hash\s*=\s*"(.+)".*?$' --replace '$1' ./default.nix)" new_version="$(curl https://factorio.com/api/latest-releases | jq -r .stable.headless)" new_hash="$(nix-hash --to-sri --type sha256 $(nix-prefetch-url --type sha256 https://www.factorio.com/get-download/${new_version}/headless/linux64))" -sd "$current_version" "$new_version" ./default.nix -sd "$current_hash" "$new_hash" ./default.nix +sd --fixed-strings "$current_version" "$new_version" ./default.nix +sd --fixed-strings "$current_hash" "$new_hash" ./default.nix From 08b6907b45c685bae12871011caff5a5aee9a97a Mon Sep 17 00:00:00 2001 From: lelgenio Date: Wed, 4 Dec 2024 17:43:02 -0300 Subject: [PATCH 292/404] home: add slugify package --- user/home.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/user/home.nix b/user/home.nix index aef10ad..b380515 100644 --- a/user/home.nix +++ b/user/home.nix @@ -85,6 +85,7 @@ ripgrep translate-shell lipsum + python3Packages.python-slugify par mate.engrampa From 0603be4fe5e80c10336b093ef757dde301b27c39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 4 Dec 2024 21:55:37 -0300 Subject: [PATCH 293/404] factorio: 2.0.20 -> 2.0.23 --- pkgs/factorio-headless/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/factorio-headless/default.nix b/pkgs/factorio-headless/default.nix index 01ff2cc..aa84b01 100644 --- a/pkgs/factorio-headless/default.nix +++ b/pkgs/factorio-headless/default.nix @@ -1,10 +1,10 @@ { factorio-headless, pkgs }: factorio-headless.overrideAttrs (_: rec { - version = "2.0.20"; + version = "2.0.23"; src = pkgs.fetchurl { name = "factorio_headless_x64-${version}.tar.xz"; url = "https://www.factorio.com/get-download/${version}/headless/linux64"; - hash = "sha256-xKkB8vHb7btBZUVg20xvq2g6MMIDNOgF1O90DAQWUVo="; + hash = "sha256-6Bn8mtbfBhv51L/8kZiN0Y0OOYLIscIsBSXXi9o+8hY="; }; }) From 6596fe271201f2ed1be559ae3f3404689b653f20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sun, 8 Dec 2024 18:55:00 -0300 Subject: [PATCH 294/404] tablet: reduce drawing area --- user/sway/open-tablet-driver.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/user/sway/open-tablet-driver.json b/user/sway/open-tablet-driver.json index 3b388a1..632cd6c 100644 --- a/user/sway/open-tablet-driver.json +++ b/user/sway/open-tablet-driver.json @@ -10,8 +10,8 @@ "Filters": [], "AbsoluteModeSettings": { "Display": { - "Width": 1920.0, - "Height": 1080.0, + "Width": 960.0, + "Height": 540.0, "X": 960.0, "Y": 540.0, "Rotation": 0.0 @@ -111,4 +111,4 @@ "LockUsableAreaDisplay": true, "LockUsableAreaTablet": true, "Tools": [] -} +} \ No newline at end of file From 2c31e85b559afc0c92dfe3374b3485cfcb562f3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sun, 8 Dec 2024 18:55:43 -0300 Subject: [PATCH 295/404] firefox: remove mastodon simplified federation --- user/firefox.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/user/firefox.nix b/user/firefox.nix index 48c4fc9..063cd26 100644 --- a/user/firefox.nix +++ b/user/firefox.nix @@ -61,11 +61,6 @@ in hash = "sha256-ApCc+MNmW9Wd/5seV6npePQVEaszT/rhD9EB7HGiUb8="; }) - (pkgs.fetchFirefoxAddon { - name = "mastodon_simplified_federation"; - url = "https://addons.mozilla.org/firefox/downloads/file/4215691/mastodon_simplified_federation-2.2.xpi"; - hash = "sha256-4iU25chpjsdsMTPaa0yQOTWc9V9q1qFz6YV0lYtNjLA="; - }) (pkgs.fetchFirefoxAddon { name = "substitoot"; url = "https://addons.mozilla.org/firefox/downloads/file/4236602/substitoot-0.7.2.0.xpi"; From 1fe114cdcdd1d2458503fc8756eb3a8452dc1383 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sun, 8 Dec 2024 19:13:16 -0300 Subject: [PATCH 296/404] phantom: add lemmy --- hosts/phantom/default.nix | 1 + hosts/phantom/lemmy.nix | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 hosts/phantom/lemmy.nix diff --git a/hosts/phantom/default.nix b/hosts/phantom/default.nix index e5570ee..45c27d7 100644 --- a/hosts/phantom/default.nix +++ b/hosts/phantom/default.nix @@ -11,6 +11,7 @@ ../../system/nix.nix ./hardware-config.nix ./mastodon.nix + ./lemmy.nix ./nextcloud.nix ./nginx.nix ./syncthing.nix diff --git a/hosts/phantom/lemmy.nix b/hosts/phantom/lemmy.nix new file mode 100644 index 0000000..61bf2e4 --- /dev/null +++ b/hosts/phantom/lemmy.nix @@ -0,0 +1,15 @@ +{ + services.lemmy = { + enable = true; + settings = { + hostname = "lemmy.lelgenio.com"; + }; + database.createLocally = true; + nginx.enable = true; + }; + + services.nginx.virtualHosts."lemmy.lelgenio.com" = { + enableACME = true; + forceSSL = true; + }; +} From fbc3d6b96a7c2532756d4ae422975caf61fc7743 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 12 Dec 2024 20:11:34 -0300 Subject: [PATCH 297/404] update: 24.11 --- flake.lock | 234 +++++++++++++++++----------- flake.nix | 43 ++--- hosts/double-rainbow.nix | 3 +- hosts/monolith/amdgpu.nix | 9 +- hosts/monolith/default.nix | 6 +- hosts/phantom/lemmy.nix | 3 + hosts/phantom/nextcloud.nix | 2 +- pkgs/gnome-pass-search-provider.nix | 1 - system/configuration.nix | 2 +- system/fonts.nix | 2 +- system/nix.nix | 2 +- system/sound.nix | 1 - system/steam.nix | 3 +- user/firefox.nix | 1 + user/gnome.nix | 4 +- user/sway/sway-binds.nix | 3 +- user/vscode/default.nix | 9 +- 17 files changed, 183 insertions(+), 145 deletions(-) diff --git a/flake.lock b/flake.lock index 54aac8d..48adc6a 100644 --- a/flake.lock +++ b/flake.lock @@ -166,9 +166,7 @@ "advisory-db": "advisory-db", "crane": "crane", "flake-utils": "flake-utils_2", - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1693509848, @@ -188,9 +186,7 @@ "inputs": { "fenix": "fenix", "flake-utils": "flake-utils_3", - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1659395338, @@ -213,11 +209,11 @@ ] }, "locked": { - "lastModified": 1730190761, - "narHash": "sha256-o5m5WzvY6cGIDupuOvjgNSS8AN6yP2iI9MtUC6q/uos=", + "lastModified": 1733168902, + "narHash": "sha256-8dupm9GfK+BowGdQd7EHK5V61nneLfr9xR6sc5vtDi0=", "owner": "nix-community", "repo": "disko", - "rev": "3979285062d6781525cded0f6c4ff92e71376b55", + "rev": "785c1e02c7e465375df971949b8dcbde9ec362e5", "type": "github" }, "original": { @@ -228,16 +224,14 @@ }, "dzgui-nix": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1727831626, - "narHash": "sha256-Gvt5lapgNRRTL95gFH8vm48f8gjsk7GYM4Qo5aUOzzo=", + "lastModified": 1733974299, + "narHash": "sha256-fPvJ/ZsQGVqGJqYL2gKotalQUoG1wpUYTJkRKG2BrwA=", "owner": "lelgenio", "repo": "dzgui-nix", - "rev": "38cf2b507d75cc36ec127b21fc5a4144fc821525", + "rev": "580022e73efedb17ddf640115539cb9bd1423d44", "type": "github" }, "original": { @@ -371,7 +365,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1681202837, @@ -389,7 +383,7 @@ }, "flake-utils_6": { "inputs": { - "systems": "systems_7" + "systems": "systems_6" }, "locked": { "lastModified": 1681202837, @@ -407,7 +401,7 @@ }, "flake-utils_7": { "inputs": { - "systems": "systems_8" + "systems": "systems_7" }, "locked": { "lastModified": 1710146030, @@ -446,16 +440,16 @@ ] }, "locked": { - "lastModified": 1726989464, - "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", + "lastModified": 1733951536, + "narHash": "sha256-Zb5ZCa7Xj+0gy5XVXINTSr71fCfAv+IKtmIXNrykT54=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", + "rev": "1318c3f3b068cdcea922fa7c1a0a1f0c96c22f5f", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -464,9 +458,7 @@ "inputs": { "crane": "crane_2", "flake-utils": "flake-utils_4", - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1728159958, @@ -489,11 +481,11 @@ ] }, "locked": { - "lastModified": 1729999765, - "narHash": "sha256-LYsavZXitFjjyETZoij8usXjTa7fa9AIF3Sk3MJSX+Y=", + "lastModified": 1733629314, + "narHash": "sha256-U0vivjQFAwjNDYt49Krevs1murX9hKBFe2Ye0cHpgbU=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "0e3a8778c2ee218eff8de6aacf3d2fa6c33b2d4f", + "rev": "f1e477a7dd11e27e7f98b646349cd66bbabf2fb8", "type": "github" }, "original": { @@ -511,46 +503,46 @@ ], "nixpkgs-24_05": [ "nixpkgs" - ], - "utils": "utils" + ] }, "locked": { - "lastModified": 1718084203, - "narHash": "sha256-Cx1xoVfSMv1XDLgKg08CUd1EoTYWB45VmB9XIQzhmzI=", + "lastModified": 1722877200, + "narHash": "sha256-qgKDNJXs+od+1UbRy62uk7dYal3h98I4WojfIqMoGcg=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "29916981e7b3b5782dc5085ad18490113f8ff63b", + "rev": "af7d3bf5daeba3fc28089b015c0dd43f06b176f2", "type": "gitlab" }, "original": { "owner": "simple-nixos-mailserver", - "ref": "nixos-24.05", + "ref": "master", "repo": "nixos-mailserver", "type": "gitlab" } }, "nixpkgs": { "locked": { - "lastModified": 1730137625, - "narHash": "sha256-9z8oOgFZiaguj+bbi3k4QhAD6JabWrnv7fscC/mt0KE=", + "lastModified": 1684425776, + "narHash": "sha256-eXzSIXkzXa9EecoDF9xCsoim0vd++8dvYU7QOuQMO8A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "64b80bfb316b57cdb8919a9110ef63393d74382a", + "rev": "8dc174d8b768893172eb3e52008f10f48dfbd5cf", "type": "github" }, "original": { - "id": "nixpkgs", - "ref": "nixos-24.05", - "type": "indirect" + "owner": "NixOS", + "ref": "release-22.11", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1729880355, - "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", + "lastModified": 1733759999, + "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", + "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", "type": "github" }, "original": { @@ -559,6 +551,99 @@ "type": "indirect" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1659219666, + "narHash": "sha256-pzYr5fokQPHv7CmUXioOhhzDy/XyWOIXP4LZvv/T7Mk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7b9be38c7250b22d829ab6effdee90d5e40c6e5c", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1733749988, + "narHash": "sha256-+5qdtgXceqhK5ZR1YbP1fAUsweBIrhL38726oIEAtDs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "bc27f0fde01ce4e1bfec1ab122d72b7380278e68", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixpkgs-unstable", + "type": "indirect" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1719010183, + "narHash": "sha256-8HMWaqpyjbVeEsmy/A2H6VFtW/Wr71vkPLnpTiAXu+8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0f620ca71fa69abb411a6c78739a9b171a0a95a6", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1733808091, + "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-24.11", + "type": "indirect" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1719010183, + "narHash": "sha256-8HMWaqpyjbVeEsmy/A2H6VFtW/Wr71vkPLnpTiAXu+8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0f620ca71fa69abb411a6c78739a9b171a0a95a6", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { + "locked": { + "lastModified": 1714091391, + "narHash": "sha256-68n3GBvlm1MIeJXadPzQ3v8Y9sIW3zmv8gI5w5sliC8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4c86138ce486d601d956a165e2f7a0fc029a03c1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "plymouth-themes": { "flake": false, "locked": { @@ -578,11 +663,11 @@ "ranger-icons": { "flake": false, "locked": { - "lastModified": 1713564482, - "narHash": "sha256-sijO9leDXgnjgcVlh5fKYalhjOupwFMRyH0xh2g/rEQ=", + "lastModified": 1732436707, + "narHash": "sha256-sqqsWU5/zBwIpyJKEBiCfosqKNvISWCw8cFgzLcNjUY=", "owner": "alexanderjeurissen", "repo": "ranger_devicons", - "rev": "a8d626485ca83719e1d8d5e32289cd96a097c861", + "rev": "84db73d0a50a8c6085b3ec63f834c781b603e83e", "type": "github" }, "original": { @@ -604,7 +689,7 @@ "made-you-look": "made-you-look", "nix-index-database": "nix-index-database", "nixos-mailserver": "nixos-mailserver", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_5", "nixpkgs-unstable": "nixpkgs-unstable", "plymouth-themes": "plymouth-themes", "ranger-icons": "ranger-icons", @@ -765,21 +850,6 @@ "type": "github" } }, - "systems_8": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tlauncher": { "inputs": { "flake-utils": "flake-utils_5", @@ -788,11 +858,11 @@ ] }, "locked": { - "lastModified": 1684504342, - "narHash": "sha256-rJ0eH7BuPizvXPc+LjVtovse4gWEuxP2WiyNdXjPNL4=", + "lastModified": 1734044605, + "narHash": "sha256-CeCYv3JFJIySSf2eX9ceEOF1FqNGeJnzEuO5f+OvioQ=", "ref": "refs/heads/main", - "rev": "add4df7220bd0b85177a1938c02b60c966c5eb71", - "revCount": 3, + "rev": "6a68f2cda0aa2fbb399a4c43b445e8c1a2df0634", + "revCount": 4, "type": "git", "url": "https://git.lelgenio.xyz/lelgenio/tlauncher-nix" }, @@ -817,31 +887,13 @@ "url": "https://git.lelgenio.com/lelgenio/tomater" } }, - "utils": { - "inputs": { - "systems": "systems_5" - }, - "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "vpsadminos": { "locked": { - "lastModified": 1730290190, - "narHash": "sha256-a+op2lnWrCytuEhLOE24SKR/irRfjwDEHkpLyAL5P90=", + "lastModified": 1733157322, + "narHash": "sha256-lN6AY1zxZ0mQzpvLIfpdHdZ7oThHOlWFb2HUeOVcCJQ=", "owner": "vpsfreecz", "repo": "vpsadminos", - "rev": "63ac771b9667b45ab2ea87363f69ca7f85668e9b", + "rev": "8ba8b0885526f484da44c0aeb4894dbaf548e61f", "type": "github" }, "original": { @@ -854,9 +906,7 @@ "inputs": { "crane": "crane_3", "flake-utils": "flake-utils_6", - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1719076817, @@ -875,9 +925,7 @@ "wl-crosshair": { "inputs": { "flake-utils": "flake-utils_7", - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1715216838, diff --git a/flake.nix b/flake.nix index e7f5813..c580335 100644 --- a/flake.nix +++ b/flake.nix @@ -1,10 +1,10 @@ { description = "My system config"; inputs = { - nixpkgs.url = "nixpkgs/nixos-24.05"; + nixpkgs.url = "nixpkgs/nixos-24.11"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; - home-manager.url = "github:nix-community/home-manager/release-24.05"; + home-manager.url = "github:nix-community/home-manager/release-24.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; vpsadminos.url = "github:vpsfreecz/vpsadminos"; @@ -27,45 +27,29 @@ }; nixos-mailserver = { - url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05"; + url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master"; inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs-24_05.follows = "nixpkgs"; }; - dzgui-nix = { - url = "github:lelgenio/dzgui-nix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + dzgui-nix.url = "github:lelgenio/dzgui-nix"; tlauncher = { url = "git+https://git.lelgenio.xyz/lelgenio/tlauncher-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; - disko.url = "github:nix-community/disko"; - disko.inputs.nixpkgs.follows = "nixpkgs"; + disko = { + url = "github:nix-community/disko"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # my stuff - dhist = { - url = "github:lelgenio/dhist"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - demoji = { - url = "github:lelgenio/demoji"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - wl-crosshair = { - url = "github:lelgenio/wl-crosshair"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - warthunder-leak-counter = { - url = "git+https://git.lelgenio.com/lelgenio/warthunder-leak-counter"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - made-you-look = { - url = "git+https://git.lelgenio.com/lelgenio/made-you-look"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + dhist.url = "github:lelgenio/dhist"; + demoji.url = "github:lelgenio/demoji"; + wl-crosshair.url = "github:lelgenio/wl-crosshair"; + warthunder-leak-counter.url = "git+https://git.lelgenio.com/lelgenio/warthunder-leak-counter"; + made-you-look.url = "git+https://git.lelgenio.com/lelgenio/made-you-look"; catboy-spinner = { url = "git+https://git.lelgenio.com/lelgenio/catboy-spinner"; flake = false; @@ -115,7 +99,6 @@ { login-manager.greetd.enable = desktop == "sway"; } inputs.agenix.nixosModules.default - inputs.dzgui-nix.nixosModules.default inputs.home-manager.nixosModules.home-manager inputs.disko.nixosModules.disko { diff --git a/hosts/double-rainbow.nix b/hosts/double-rainbow.nix index 4c8636a..af8c5e4 100644 --- a/hosts/double-rainbow.nix +++ b/hosts/double-rainbow.nix @@ -37,7 +37,8 @@ in options = [ "subvol=@" ] ++ btrfs_options ++ btrfs_ssd; }; - boot.initrd.luks.devices."luks-d6573cf8-25f0-4ffc-8046-ac3a4db1e964".device = "/dev/disk/by-uuid/d6573cf8-25f0-4ffc-8046-ac3a4db1e964"; + boot.initrd.luks.devices."luks-d6573cf8-25f0-4ffc-8046-ac3a4db1e964".device = + "/dev/disk/by-uuid/d6573cf8-25f0-4ffc-8046-ac3a4db1e964"; fileSystems."/boot" = { device = "/dev/disk/by-uuid/97EB-7DB5"; diff --git a/hosts/monolith/amdgpu.nix b/hosts/monolith/amdgpu.nix index f3cefaa..0df9923 100644 --- a/hosts/monolith/amdgpu.nix +++ b/hosts/monolith/amdgpu.nix @@ -25,16 +25,13 @@ in wantedBy = [ "multi-user.target" ]; }; - hardware.opengl.driSupport = true; - # # For 32 bit applications - hardware.opengl.driSupport32Bit = true; + hardware.graphics.enable32Bit = true; - hardware.opengl.extraPackages = with pkgs; [ + hardware.graphics.extraPackages = with pkgs; [ libva libvdpau vaapiVdpau - rocm-opencl-icd - rocm-opencl-runtime + rocmPackages.clr rocmPackages.rocm-smi ]; diff --git a/hosts/monolith/default.nix b/hosts/monolith/default.nix index f4fde3a..77dfa50 100644 --- a/hosts/monolith/default.nix +++ b/hosts/monolith/default.nix @@ -35,7 +35,11 @@ in "sd_mod" ]; - hardware.opentabletdriver.enable = true; + hardware.opentabletdriver = { + enable = true; + # TODO: remove this once otd gets updated + package = pkgs.unstable.opentabletdriver; + }; boot.kernelPackages = pkgs.linuxPackages_latest; diff --git a/hosts/phantom/lemmy.nix b/hosts/phantom/lemmy.nix index 61bf2e4..0e6ee1a 100644 --- a/hosts/phantom/lemmy.nix +++ b/hosts/phantom/lemmy.nix @@ -1,3 +1,4 @@ +{ pkgs, ... }: { services.lemmy = { enable = true; @@ -8,6 +9,8 @@ nginx.enable = true; }; + services.pict-rs.package = pkgs.pict-rs; + services.nginx.virtualHosts."lemmy.lelgenio.com" = { enableACME = true; forceSSL = true; diff --git a/hosts/phantom/nextcloud.nix b/hosts/phantom/nextcloud.nix index 88f0b02..a7ef9f3 100644 --- a/hosts/phantom/nextcloud.nix +++ b/hosts/phantom/nextcloud.nix @@ -7,7 +7,7 @@ { services.nextcloud = { enable = true; - package = pkgs.nextcloud29; + package = pkgs.nextcloud30; hostName = "cloud.lelgenio.com"; https = true; config = { diff --git a/pkgs/gnome-pass-search-provider.nix b/pkgs/gnome-pass-search-provider.nix index e149505..ab2e94a 100644 --- a/pkgs/gnome-pass-search-provider.nix +++ b/pkgs/gnome-pass-search-provider.nix @@ -5,7 +5,6 @@ wrapGAppsHook, gtk3, gobject-introspection, - gnome, }: let diff --git a/system/configuration.nix b/system/configuration.nix index b905240..5db8efc 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -43,7 +43,7 @@ glib # gsettings usbutils # dracula-theme # gtk theme - gnome3.adwaita-icon-theme # default gnome cursors + adwaita-icon-theme # default gnome cursors ]; services.geoclue2.enable = true; diff --git a/system/fonts.nix b/system/fonts.nix index d8bff5a..2815563 100644 --- a/system/fonts.nix +++ b/system/fonts.nix @@ -3,7 +3,7 @@ fonts.enableDefaultPackages = true; fonts.packages = with pkgs; [ noto-fonts - noto-fonts-cjk + noto-fonts-cjk-sans noto-fonts-emoji nerdfonts_fira_hack ]; diff --git a/system/nix.nix b/system/nix.nix index c91e362..482bb93 100644 --- a/system/nix.nix +++ b/system/nix.nix @@ -44,7 +44,7 @@ in ]; }; extraOptions = '' - experimental-features = nix-command flakes repl-flake + experimental-features = nix-command flakes ''; }; } diff --git a/system/sound.nix b/system/sound.nix index 8ef55ab..f04e513 100644 --- a/system/sound.nix +++ b/system/sound.nix @@ -1,6 +1,5 @@ { pkgs, ... }: { - sound.enable = true; hardware.pulseaudio.enable = false; services.pipewire = { enable = true; diff --git a/system/steam.nix b/system/steam.nix index 1d8b412..f82c958 100644 --- a/system/steam.nix +++ b/system/steam.nix @@ -31,7 +31,6 @@ environment.systemPackages = with pkgs; [ protontricks bottles + inputs.dzgui-nix.packages.${pkgs.system}.default ]; - - programs.dzgui.enable = true; } diff --git a/user/firefox.nix b/user/firefox.nix index 063cd26..4b69ad2 100644 --- a/user/firefox.nix +++ b/user/firefox.nix @@ -123,6 +123,7 @@ in if desktop == "sway" then '' #titlebar { display: none !important; } + #TabsToolbar { display: none !important; } #sidebar-header { display: none !important; } '' else diff --git a/user/gnome.nix b/user/gnome.nix index 443f1fe..74951c7 100644 --- a/user/gnome.nix +++ b/user/gnome.nix @@ -10,7 +10,7 @@ lib.mkIf (config.my.desktop == "gnome") { home.pointerCursor = { name = "Adwaita"; size = 24; - package = pkgs.gnome.adwaita-icon-theme; + package = pkgs.adwaita-icon-theme; gtk.enable = true; }; @@ -42,7 +42,7 @@ lib.mkIf (config.my.desktop == "gnome") { qt6Packages.qtstyleplugin-kvantum ]; - services.gpg-agent.pinentryPackage = pkgs.pinentry-gnome3; + services.gpg-agent.pinentryPackage = pkgs.pinentry-gnome; xdg.defaultApplications = { enable = lib.mkForce false; diff --git a/user/sway/sway-binds.nix b/user/sway/sway-binds.nix index cd0ac9a..fd05236 100644 --- a/user/sway/sway-binds.nix +++ b/user/sway/sway-binds.nix @@ -166,7 +166,8 @@ let other_binds = { "${mod}+p" = "exec ${pkgs.wpass}/bin/wpass"; "${mod}+s" = "exec ${menu}"; - "${mod}+g" = "exec ${pkgs.demoji}/bin/demoji --lang pt --fallback --copy -- ${pkgs.wdmenu}/bin/wdmenu"; + "${mod}+g" = + "exec ${pkgs.demoji}/bin/demoji --lang pt --fallback --copy -- ${pkgs.wdmenu}/bin/wdmenu"; "${mod}+c" = "exec ${pkgs.color_picker}/bin/color_picker"; "${mod}+Return" = "exec ${terminal}"; "${mod}+Ctrl+Return" = "exec thunar"; diff --git a/user/vscode/default.nix b/user/vscode/default.nix index 35d972b..b8afdfd 100644 --- a/user/vscode/default.nix +++ b/user/vscode/default.nix @@ -12,8 +12,11 @@ }; home.file = { - "${config.home.homeDirectory}/.config/VSCodium/User/keybindings.json".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/projects/nixos-config/user/vscode/keybindings.json"; - "${config.home.homeDirectory}/.config/VSCodium/User/settings.json".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/projects/nixos-config/user/vscode/settings.json"; - "${config.home.homeDirectory}/.config/VSCodium/product.json".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/projects/nixos-config/user/vscode/product.json"; + "${config.home.homeDirectory}/.config/VSCodium/User/keybindings.json".source = + config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/projects/nixos-config/user/vscode/keybindings.json"; + "${config.home.homeDirectory}/.config/VSCodium/User/settings.json".source = + config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/projects/nixos-config/user/vscode/settings.json"; + "${config.home.homeDirectory}/.config/VSCodium/product.json".source = + config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/projects/nixos-config/user/vscode/product.json"; }; } From 3eb36a334d1f17aeb6775b4d1958dcb4af44152d Mon Sep 17 00:00:00 2001 From: lelgenio Date: Tue, 17 Dec 2024 16:12:37 -0300 Subject: [PATCH 298/404] git: add clean-deleted-remotes command --- scripts/default.nix | 6 ++++++ scripts/git_clean_remote_deleted | 6 ++++++ user/git.nix | 5 +++++ 3 files changed, 17 insertions(+) create mode 100755 scripts/git_clean_remote_deleted diff --git a/scripts/default.nix b/scripts/default.nix index c621d47..24eded1 100644 --- a/scripts/default.nix +++ b/scripts/default.nix @@ -125,6 +125,12 @@ zbar wl-clipboard ]; + git_clean_remote_deleted = [ + git + gnugrep + gawk + findutils + ]; pint-fmt = [ ]; powerplay-led-idle = [ bash diff --git a/scripts/git_clean_remote_deleted b/scripts/git_clean_remote_deleted new file mode 100755 index 0000000..99bc93d --- /dev/null +++ b/scripts/git_clean_remote_deleted @@ -0,0 +1,6 @@ +#!/bin/sh + +git branch -vv \ +| grep ': gone]' \ +| awk '{print $1}' \ +| xargs git branch -D diff --git a/user/git.nix b/user/git.nix index 94532f3..867b9a5 100644 --- a/user/git.nix +++ b/user/git.nix @@ -36,8 +36,13 @@ in alias = { graph = "log --graph --oneline --branches"; root = "rev-parse --show-toplevel"; + clean-deleted-remotes = "!" + (lib.getExe pkgs.git_clean_remote_deleted); }; }; }; + + home.packages = with pkgs; [ + git_clean_remote_deleted + ]; }; } From f41f9aa0a550afe4328b3548fcc569879ffdd6bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 20 Dec 2024 12:51:37 -0300 Subject: [PATCH 299/404] chat: switch do vesktop -> discordcanary --- user/chat.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user/chat.nix b/user/chat.nix index a68055f..fda61e3 100644 --- a/user/chat.nix +++ b/user/chat.nix @@ -9,14 +9,14 @@ wayland.windowManager.sway = { extraConfig = '' exec thunderbird - exec vesktop + exec discordcanary exec telegram-desktop ''; }; home.packages = with pkgs; [ tdesktop - vesktop + discord-canary thunderbird element-desktop-wayland ]; From 0a8ee31f4fc543d131eda575050901193ea0e9d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sun, 22 Dec 2024 01:21:36 -0300 Subject: [PATCH 300/404] factorio: 2.0.23 -> 2.0.28 --- pkgs/factorio-headless/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/factorio-headless/default.nix b/pkgs/factorio-headless/default.nix index aa84b01..2aaaba4 100644 --- a/pkgs/factorio-headless/default.nix +++ b/pkgs/factorio-headless/default.nix @@ -1,10 +1,10 @@ { factorio-headless, pkgs }: factorio-headless.overrideAttrs (_: rec { - version = "2.0.23"; + version = "2.0.28"; src = pkgs.fetchurl { name = "factorio_headless_x64-${version}.tar.xz"; url = "https://www.factorio.com/get-download/${version}/headless/linux64"; - hash = "sha256-6Bn8mtbfBhv51L/8kZiN0Y0OOYLIscIsBSXXi9o+8hY="; + hash = "sha256-6pk3tq3HoY4XpOHmSZLsOJQHSXs25oKAuxT83UyITdM="; }; }) From b6b6e68397588271160ac4540a546031e6143a67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sun, 22 Dec 2024 01:21:40 -0300 Subject: [PATCH 301/404] update --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 48adc6a..e166853 100644 --- a/flake.lock +++ b/flake.lock @@ -209,11 +209,11 @@ ] }, "locked": { - "lastModified": 1733168902, - "narHash": "sha256-8dupm9GfK+BowGdQd7EHK5V61nneLfr9xR6sc5vtDi0=", + "lastModified": 1734701201, + "narHash": "sha256-hk0roBX10j/hospoWIJIJj3i2skd7Oml6yKQBx7mTFk=", "owner": "nix-community", "repo": "disko", - "rev": "785c1e02c7e465375df971949b8dcbde9ec362e5", + "rev": "2ee76c861af3b895b3b104bae04777b61397485b", "type": "github" }, "original": { @@ -440,11 +440,11 @@ ] }, "locked": { - "lastModified": 1733951536, - "narHash": "sha256-Zb5ZCa7Xj+0gy5XVXINTSr71fCfAv+IKtmIXNrykT54=", + "lastModified": 1734366194, + "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=", "owner": "nix-community", "repo": "home-manager", - "rev": "1318c3f3b068cdcea922fa7c1a0a1f0c96c22f5f", + "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f", "type": "github" }, "original": { @@ -481,11 +481,11 @@ ] }, "locked": { - "lastModified": 1733629314, - "narHash": "sha256-U0vivjQFAwjNDYt49Krevs1murX9hKBFe2Ye0cHpgbU=", + "lastModified": 1734234111, + "narHash": "sha256-icEMqBt4HtGH52PU5FHidgBrNJvOfXH6VQKNtnD1aw8=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "f1e477a7dd11e27e7f98b646349cd66bbabf2fb8", + "rev": "311d6cf3ad3f56cb051ffab1f480b2909b3f754d", "type": "github" }, "original": { @@ -506,11 +506,11 @@ ] }, "locked": { - "lastModified": 1722877200, - "narHash": "sha256-qgKDNJXs+od+1UbRy62uk7dYal3h98I4WojfIqMoGcg=", + "lastModified": 1734370678, + "narHash": "sha256-a8zkti1QM5Oxkdfnzr/NjrFlyqI36/kYV/X8G1jOmB4=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "af7d3bf5daeba3fc28089b015c0dd43f06b176f2", + "rev": "c43d8c4a3ce84a7bebd110b06e69365484db6208", "type": "gitlab" }, "original": { @@ -538,11 +538,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1733759999, - "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", + "lastModified": 1734424634, + "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", + "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", "type": "github" }, "original": { @@ -568,11 +568,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1733749988, - "narHash": "sha256-+5qdtgXceqhK5ZR1YbP1fAUsweBIrhL38726oIEAtDs=", + "lastModified": 1732812356, + "narHash": "sha256-LNcgjOLArRlx2W6XSi0yc0xwLjrK3KF9LxAMqUgFDgw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bc27f0fde01ce4e1bfec1ab122d72b7380278e68", + "rev": "581d7e4d23b91daf2afa0005a5d3d01d6a8884fe", "type": "github" }, "original": { @@ -599,11 +599,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1733808091, - "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=", + "lastModified": 1734737257, + "narHash": "sha256-GIMyMt1pkkoXdCq9un859bX6YQZ/iYtukb9R5luazLM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e", + "rev": "1c6e20d41d6a9c1d737945962160e8571df55daa", "type": "github" }, "original": { @@ -889,11 +889,11 @@ }, "vpsadminos": { "locked": { - "lastModified": 1733157322, - "narHash": "sha256-lN6AY1zxZ0mQzpvLIfpdHdZ7oThHOlWFb2HUeOVcCJQ=", + "lastModified": 1734458258, + "narHash": "sha256-xZEbuwAAbxwujrGtuydDNBjzMLnE9YOcuLv3hdudZe4=", "owner": "vpsfreecz", "repo": "vpsadminos", - "rev": "8ba8b0885526f484da44c0aeb4894dbaf548e61f", + "rev": "83ddccf4462f155f12596af773e9291d7ebc37a3", "type": "github" }, "original": { From 0a7e40485940e3924825ef034564e6f8829b1eb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 30 Dec 2024 21:25:46 -0300 Subject: [PATCH 302/404] update --- flake.lock | 57 ++++++++++++++++++++++++---------------- flake.nix | 1 - user/chat.nix | 2 +- user/kakoune/default.nix | 2 +- 4 files changed, 37 insertions(+), 25 deletions(-) diff --git a/flake.lock b/flake.lock index e166853..9ec7057 100644 --- a/flake.lock +++ b/flake.lock @@ -209,11 +209,11 @@ ] }, "locked": { - "lastModified": 1734701201, - "narHash": "sha256-hk0roBX10j/hospoWIJIJj3i2skd7Oml6yKQBx7mTFk=", + "lastModified": 1735468753, + "narHash": "sha256-2dt1nOe9zf9pDkf5Kn7FUFyPRo581s0n90jxYXJ94l0=", "owner": "nix-community", "repo": "disko", - "rev": "2ee76c861af3b895b3b104bae04777b61397485b", + "rev": "84a5b93637cc16cbfcc61b6e1684d626df61eb21", "type": "github" }, "original": { @@ -440,11 +440,11 @@ ] }, "locked": { - "lastModified": 1734366194, - "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=", + "lastModified": 1735344290, + "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=", "owner": "nix-community", "repo": "home-manager", - "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f", + "rev": "613691f285dad87694c2ba1c9e6298d04736292d", "type": "github" }, "original": { @@ -481,11 +481,11 @@ ] }, "locked": { - "lastModified": 1734234111, - "narHash": "sha256-icEMqBt4HtGH52PU5FHidgBrNJvOfXH6VQKNtnD1aw8=", + "lastModified": 1735443188, + "narHash": "sha256-AydPpRBh8+NOkrLylG7vTsHrGO2b5L7XkMEL5HlzcA8=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "311d6cf3ad3f56cb051ffab1f480b2909b3f754d", + "rev": "55ab1e1df5daf2476e6b826b69a82862dcbd7544", "type": "github" }, "original": { @@ -501,16 +501,14 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-24_05": [ - "nixpkgs" - ] + "nixpkgs-24_11": "nixpkgs-24_11" }, "locked": { - "lastModified": 1734370678, - "narHash": "sha256-a8zkti1QM5Oxkdfnzr/NjrFlyqI36/kYV/X8G1jOmB4=", + "lastModified": 1735230346, + "narHash": "sha256-zgR8NTiNDPVNrfaiOlB9yHSmCqFDo7Ks2IavaJ2dZo4=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "c43d8c4a3ce84a7bebd110b06e69365484db6208", + "rev": "dc0569066e79ae96184541da6fa28f35a33fbf7b", "type": "gitlab" }, "original": { @@ -536,13 +534,28 @@ "type": "github" } }, - "nixpkgs-unstable": { + "nixpkgs-24_11": { "locked": { - "lastModified": 1734424634, - "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", + "lastModified": 1734083684, + "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", + "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-24.11", + "type": "indirect" + } + }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1735471104, + "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", "type": "github" }, "original": { @@ -599,11 +612,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1734737257, - "narHash": "sha256-GIMyMt1pkkoXdCq9un859bX6YQZ/iYtukb9R5luazLM=", + "lastModified": 1735531152, + "narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1c6e20d41d6a9c1d737945962160e8571df55daa", + "rev": "3ffbbdbac0566a0977da3d2657b89cbcfe9a173b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c580335..1e11ec6 100644 --- a/flake.nix +++ b/flake.nix @@ -29,7 +29,6 @@ nixos-mailserver = { url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master"; inputs.nixpkgs.follows = "nixpkgs"; - inputs.nixpkgs-24_05.follows = "nixpkgs"; }; dzgui-nix.url = "github:lelgenio/dzgui-nix"; diff --git a/user/chat.nix b/user/chat.nix index fda61e3..b42f6fd 100644 --- a/user/chat.nix +++ b/user/chat.nix @@ -18,6 +18,6 @@ tdesktop discord-canary thunderbird - element-desktop-wayland + element-desktop ]; } diff --git a/user/kakoune/default.nix b/user/kakoune/default.nix index 9963f26..a015bd0 100644 --- a/user/kakoune/default.nix +++ b/user/kakoune/default.nix @@ -127,7 +127,7 @@ in ranger bmenu kak-lsp - unstable.kak-tree-sitter + kak-tree-sitter kak-pager kak-man-pager From 565a970d34345defa4d78a2d35598fb199be470a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 8 Jan 2025 21:20:08 -0300 Subject: [PATCH 303/404] amdgpu: remove semingly useless configurations OBS was causing gpu panics --- hosts/monolith/amdgpu.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/hosts/monolith/amdgpu.nix b/hosts/monolith/amdgpu.nix index 0df9923..ac09b48 100644 --- a/hosts/monolith/amdgpu.nix +++ b/hosts/monolith/amdgpu.nix @@ -13,7 +13,6 @@ in { boot.initrd.kernelModules = [ "amdgpu" ]; boot.kernelParams = [ - "amdgpu.dcdebugmask=0x10" # amdgpu undervolting bug "video=DP-1:1920x1080@144" "amdgpu.ppfeaturemask=0xfffd7fff" # enable undervolting ]; @@ -29,10 +28,6 @@ in hardware.graphics.extraPackages = with pkgs; [ libva - libvdpau - vaapiVdpau - rocmPackages.clr - rocmPackages.rocm-smi ]; services.udev.extraRules = '' From b58b9b18448d941fcf628ca5bc75ea501a592928 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 8 Jan 2025 21:20:45 -0300 Subject: [PATCH 304/404] amdgpu: always restart the fan control script --- hosts/monolith/amdgpu.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hosts/monolith/amdgpu.nix b/hosts/monolith/amdgpu.nix index ac09b48..4c26afa 100644 --- a/hosts/monolith/amdgpu.nix +++ b/hosts/monolith/amdgpu.nix @@ -21,6 +21,10 @@ in script = '' ${lib.getExe pkgs.amd-fan-control} /sys/class/drm/card1/device 60 85 ''; + serviceConfig = { + Restart = "always"; + RestartSec = 10; + }; wantedBy = [ "multi-user.target" ]; }; From cf712901d204737ca78f99fe01baf06956189da4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 8 Jan 2025 21:21:11 -0300 Subject: [PATCH 305/404] factorio: wait for network connection before starting --- hosts/monolith/factorio-server.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hosts/monolith/factorio-server.nix b/hosts/monolith/factorio-server.nix index 3c893a5..211e746 100644 --- a/hosts/monolith/factorio-server.nix +++ b/hosts/monolith/factorio-server.nix @@ -10,6 +10,11 @@ extraSettingsFile = config.age.secrets.factorio-settings.path; }; + systemd.services.factorio = { + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; + }; + age.secrets.factorio-settings = { file = ../../secrets/factorio-settings.age; mode = "777"; From ce2e1c9c23d97a569baf889bd1f2da1f12f3df16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 8 Jan 2025 21:22:29 -0300 Subject: [PATCH 306/404] monolith: revert to LTS kernel --- hosts/monolith/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/hosts/monolith/default.nix b/hosts/monolith/default.nix index 77dfa50..c3764fd 100644 --- a/hosts/monolith/default.nix +++ b/hosts/monolith/default.nix @@ -41,8 +41,6 @@ in package = pkgs.unstable.opentabletdriver; }; - boot.kernelPackages = pkgs.linuxPackages_latest; - boot.extraModulePackages = with config.boot.kernelPackages; [ zenpower ]; boot.initrd.kernelModules = [ "amdgpu" ]; From e41b9c9bd853e360bfa0782ccb40889398e807db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 8 Jan 2025 21:23:18 -0300 Subject: [PATCH 307/404] sway: don't force steam into floating window --- user/sway/sway-assigns.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/user/sway/sway-assigns.nix b/user/sway/sway-assigns.nix index 65e1a97..8f073c7 100644 --- a/user/sway/sway-assigns.nix +++ b/user/sway/sway-assigns.nix @@ -58,7 +58,6 @@ in { app_id = "wdisplays"; } { app_id = "pavucontrol"; } { app_id = ".*[Hh]elvum.*"; } - { workspace = "9"; } ]; }; }; From d6fe39a775ea7e3c9531c21beeab1320bfb8859b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 8 Jan 2025 21:23:37 -0300 Subject: [PATCH 308/404] OpenTabletDriver: fix shortcuts and revert draw-area to fullscreen --- user/sway/open-tablet-driver.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/user/sway/open-tablet-driver.json b/user/sway/open-tablet-driver.json index 632cd6c..bf49af6 100644 --- a/user/sway/open-tablet-driver.json +++ b/user/sway/open-tablet-driver.json @@ -10,8 +10,8 @@ "Filters": [], "AbsoluteModeSettings": { "Display": { - "Width": 960.0, - "Height": 540.0, + "Width": 1920.0, + "Height": 1080.0, "X": 960.0, "Y": 540.0, "Rotation": 0.0 @@ -76,7 +76,7 @@ "Settings": [ { "Property": "Keys", - "Value": "Control+O" + "Value": "Control+Shift+Z" } ], "Enable": true From 7b670efc6739a79ed03dff0b2dc2dc1ccdf8d697 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 8 Jan 2025 21:25:01 -0300 Subject: [PATCH 309/404] update --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 9ec7057..b2c2019 100644 --- a/flake.lock +++ b/flake.lock @@ -209,11 +209,11 @@ ] }, "locked": { - "lastModified": 1735468753, - "narHash": "sha256-2dt1nOe9zf9pDkf5Kn7FUFyPRo581s0n90jxYXJ94l0=", + "lastModified": 1736199437, + "narHash": "sha256-TdU0a/x8048rbbJmkKWzSY1CtsbbGKNkIJcMdr8Zf4Q=", "owner": "nix-community", "repo": "disko", - "rev": "84a5b93637cc16cbfcc61b6e1684d626df61eb21", + "rev": "49f8aa791f81ff2402039b3efe0c35b9386c4bcf", "type": "github" }, "original": { @@ -227,11 +227,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1733974299, - "narHash": "sha256-fPvJ/ZsQGVqGJqYL2gKotalQUoG1wpUYTJkRKG2BrwA=", + "lastModified": 1735940463, + "narHash": "sha256-qrjv3UrlcFQf8zFjV4lMDmcBnlow/sqyyjGFAXp8mLk=", "owner": "lelgenio", "repo": "dzgui-nix", - "rev": "580022e73efedb17ddf640115539cb9bd1423d44", + "rev": "fccedf1386f484375570e0195c7a08d7687b1df6", "type": "github" }, "original": { @@ -481,11 +481,11 @@ ] }, "locked": { - "lastModified": 1735443188, - "narHash": "sha256-AydPpRBh8+NOkrLylG7vTsHrGO2b5L7XkMEL5HlzcA8=", + "lastModified": 1736047960, + "narHash": "sha256-hutd85FA1jUJhhqBRRJ+u7UHO9oFGD/RVm2x5w8WjVQ=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "55ab1e1df5daf2476e6b826b69a82862dcbd7544", + "rev": "816a6ae88774ba7e74314830546c29e134e0dffb", "type": "github" }, "original": { @@ -551,11 +551,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1735471104, - "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", + "lastModified": 1736012469, + "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", + "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", "type": "github" }, "original": { @@ -612,11 +612,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1735531152, - "narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=", + "lastModified": 1736061677, + "narHash": "sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3ffbbdbac0566a0977da3d2657b89cbcfe9a173b", + "rev": "cbd8ec4de4469333c82ff40d057350c30e9f7d36", "type": "github" }, "original": { From be3686db826b55a853fa4ebea7f6f6d375b26f4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 10 Jan 2025 11:06:58 -0300 Subject: [PATCH 310/404] docker: block external connections --- scripts/_docker-block-external-connections | 33 ++++++++++++++++++++++ scripts/default.nix | 6 ++++ system/containers.nix | 4 ++- 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100755 scripts/_docker-block-external-connections diff --git a/scripts/_docker-block-external-connections b/scripts/_docker-block-external-connections new file mode 100755 index 0000000..f22bc4f --- /dev/null +++ b/scripts/_docker-block-external-connections @@ -0,0 +1,33 @@ +#!/bin/sh + +# Create the DOCKER-USER chain if it doesn't exist +iptables -N DOCKER-USER || true + +# Flush existing rules in the DOCKER-USER chain +iptables -F DOCKER-USER + +# Get all external network interfaces +interfaces=$( + ip -o -f inet addr show | + awk '{print $2}' | + grep -E '^(enp|eth|wlan|wlp)' | + sort -u +) + +for iface in $interfaces; do + # Allow traffic from LAN + iptables -A DOCKER-USER -i "$iface" -s 127.0.0.1 -j ACCEPT + iptables -A DOCKER-USER -i "$iface" -s 10.0.0.0/8 -j ACCEPT + iptables -A DOCKER-USER -i "$iface" -s 192.168.0.0/16 -j ACCEPT + + # Allow established and related connections + iptables -A DOCKER-USER -i "$iface" -m state --state RELATED,ESTABLISHED -j ACCEPT + + # Drop all other traffic + iptables -A DOCKER-USER -i "$iface" -j DROP + + echo "iptables rules have been set up for interface: $iface" +done + +# Return to the previous chain +iptables -A DOCKER-USER -j RETURN diff --git a/scripts/default.nix b/scripts/default.nix index 24eded1..c2725ee 100644 --- a/scripts/default.nix +++ b/scripts/default.nix @@ -139,6 +139,12 @@ ]; vrr-fullscreen = [ ]; controller-battery = [ ]; + _docker-block-external-connections = [ + iptables + gawk + gnugrep + iproute2 + ]; } // lib.mapAttrs importScript { wdmenu = ./wdmenu.nix; diff --git a/system/containers.nix b/system/containers.nix index 37844f7..64383a6 100644 --- a/system/containers.nix +++ b/system/containers.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, lib, ... }: { services.flatpak.enable = true; @@ -22,6 +22,8 @@ }; }; + networking.firewall.extraCommands = lib.getExe pkgs._docker-block-external-connections; + programs.extra-container.enable = true; programs.firejail.enable = true; From 75da9cfb7bb63250783b9d3585560e9fa6cb84e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 17 Jan 2025 00:34:11 -0300 Subject: [PATCH 311/404] phantom: add mastodon storage device --- hosts/phantom/hardware-config.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/hosts/phantom/hardware-config.nix b/hosts/phantom/hardware-config.nix index 4df34c8..afea081 100644 --- a/hosts/phantom/hardware-config.nix +++ b/hosts/phantom/hardware-config.nix @@ -1,15 +1,14 @@ -{ - config, - pkgs, - inputs, - ... -}: { fileSystems."/var/lib/syncthing-data" = { device = "172.16.130.7:/nas/5749/syncthinng_data"; fsType = "nfs"; options = [ "nofail" ]; }; + fileSystems."/var/lib/mastodon" = { + device = "172.16.130.7:/nas/5749/mastodon"; + fsType = "nfs"; + options = [ "nofail" ]; + }; swapDevices = [ { From af4431b9efaff1dfa9c1e4a985c7e70d1d82b847 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 17 Jan 2025 20:29:22 -0300 Subject: [PATCH 312/404] amdgpu: update fan controller --- scripts/amd-fan-control | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/scripts/amd-fan-control b/scripts/amd-fan-control index 641c5cf..1f4c3e7 100755 --- a/scripts/amd-fan-control +++ b/scripts/amd-fan-control @@ -18,7 +18,7 @@ bail() { exit 1 } -if ! [ -d $HWMON ]; then +if ! [ -d "$HWMON" ]; then bail "Invalid HWMON" fi @@ -28,20 +28,31 @@ if ! [ -f $TEMP_INPUT ]; then bail "Invalid TEMP_INPUT" fi -MIN="$2" -MAX="$3" +TEMP_MIN="$2" +TEMP_MAX="$3" + +if [ -z "$TEMP_MIN" ];then + bail "No minimum temperature provided" +fi + +if [ -z "$TEMP_MAX" ];then + bail "No maximum temperature provided" +fi + +PWM_MIN=0 +PWM_MAX=255 echo "Running..." >&2 while true; do TEMPERATURE_RAW=$(cat "$TEMP_INPUT") TEMPERATURE="$(( $TEMPERATURE_RAW / 1000 ))" # Remap from a number between 60_000..90_000 to 0..255 - PWM=$(( ($TEMPERATURE - $MIN) * 255 / ($MAX - $MIN) )) + PWM=$(( ($TEMPERATURE - $TEMP_MIN) * $PWM_MAX / ($TEMP_MAX - $TEMP_MIN) )) - if [ "$PWM" -gt 255 ]; then - PWM=255 - elif [ "$PWM" -lt 0 ]; then - PWM=0 + if [ "$PWM" -gt $PWM_MAX ]; then + PWM=$PWM_MAX + elif [ "$PWM" -lt $PWM_MIN ]; then + PWM=$PWM_MIN fi echo 1 > "$HWMON/pwm1_enable" From b0d8ce885cf1a05741c21605684a6b6946eea5d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sun, 19 Jan 2025 23:40:19 -0300 Subject: [PATCH 313/404] update --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index b2c2019..d654964 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1723293904, - "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=", + "lastModified": 1736955230, + "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=", "owner": "ryantm", "repo": "agenix", - "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41", + "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c", "type": "github" }, "original": { @@ -209,11 +209,11 @@ ] }, "locked": { - "lastModified": 1736199437, - "narHash": "sha256-TdU0a/x8048rbbJmkKWzSY1CtsbbGKNkIJcMdr8Zf4Q=", + "lastModified": 1737038063, + "narHash": "sha256-rMEuiK69MDhjz1JgbaeQ9mBDXMJ2/P8vmOYRbFndXsk=", "owner": "nix-community", "repo": "disko", - "rev": "49f8aa791f81ff2402039b3efe0c35b9386c4bcf", + "rev": "bf0abfde48f469c256f2b0f481c6281ff04a5db2", "type": "github" }, "original": { @@ -227,11 +227,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1735940463, - "narHash": "sha256-qrjv3UrlcFQf8zFjV4lMDmcBnlow/sqyyjGFAXp8mLk=", + "lastModified": 1736891870, + "narHash": "sha256-JFHhj8jlWE4bAzWzceWJdyByq9VcUt7MMbs331xlxMY=", "owner": "lelgenio", "repo": "dzgui-nix", - "rev": "fccedf1386f484375570e0195c7a08d7687b1df6", + "rev": "2be703bfbc8cb9924d7afd9c4ecced9adff7647c", "type": "github" }, "original": { @@ -440,11 +440,11 @@ ] }, "locked": { - "lastModified": 1735344290, - "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=", + "lastModified": 1736373539, + "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", "owner": "nix-community", "repo": "home-manager", - "rev": "613691f285dad87694c2ba1c9e6298d04736292d", + "rev": "bd65bc3cde04c16755955630b344bc9e35272c56", "type": "github" }, "original": { @@ -481,11 +481,11 @@ ] }, "locked": { - "lastModified": 1736047960, - "narHash": "sha256-hutd85FA1jUJhhqBRRJ+u7UHO9oFGD/RVm2x5w8WjVQ=", + "lastModified": 1736652904, + "narHash": "sha256-8uolHABgroXqzs03QdulHp8H9e5kWQZnnhcda1MKbBM=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "816a6ae88774ba7e74314830546c29e134e0dffb", + "rev": "271e5bd7c57e1f001693799518b10a02d1123b12", "type": "github" }, "original": { @@ -551,11 +551,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1736012469, - "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", + "lastModified": 1737062831, + "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", + "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", "type": "github" }, "original": { @@ -612,11 +612,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1736061677, - "narHash": "sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60=", + "lastModified": 1736916166, + "narHash": "sha256-puPDoVKxkuNmYIGMpMQiK8bEjaACcCksolsG36gdaNQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cbd8ec4de4469333c82ff40d057350c30e9f7d36", + "rev": "e24b4c09e963677b1beea49d411cd315a024ad3a", "type": "github" }, "original": { @@ -676,11 +676,11 @@ "ranger-icons": { "flake": false, "locked": { - "lastModified": 1732436707, - "narHash": "sha256-sqqsWU5/zBwIpyJKEBiCfosqKNvISWCw8cFgzLcNjUY=", + "lastModified": 1736375293, + "narHash": "sha256-ck53eG+mGIQ706sUnEHbJ6vY1/LYnRcpq94JXzwnGTQ=", "owner": "alexanderjeurissen", "repo": "ranger_devicons", - "rev": "84db73d0a50a8c6085b3ec63f834c781b603e83e", + "rev": "f227f212e14996fbb366f945ec3ecaf5dc5f44b0", "type": "github" }, "original": { @@ -902,11 +902,11 @@ }, "vpsadminos": { "locked": { - "lastModified": 1734458258, - "narHash": "sha256-xZEbuwAAbxwujrGtuydDNBjzMLnE9YOcuLv3hdudZe4=", + "lastModified": 1737136524, + "narHash": "sha256-wMy7IbQs87VUxJOqRSbfFIdxRRTUBQh8G1L/zwI36vY=", "owner": "vpsfreecz", "repo": "vpsadminos", - "rev": "83ddccf4462f155f12596af773e9291d7ebc37a3", + "rev": "0af10d77ca146293b2ed19d5dcfd98474f1fc285", "type": "github" }, "original": { From 6d49b98e722851ac70cfd98a57ed4f131687298b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 20 Jan 2025 00:31:05 -0300 Subject: [PATCH 314/404] amdgpu: update fan controller --- hosts/monolith/amdgpu.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/monolith/amdgpu.nix b/hosts/monolith/amdgpu.nix index 4c26afa..0da64f0 100644 --- a/hosts/monolith/amdgpu.nix +++ b/hosts/monolith/amdgpu.nix @@ -19,7 +19,7 @@ in systemd.services.amd-fan-control = { script = '' - ${lib.getExe pkgs.amd-fan-control} /sys/class/drm/card1/device 60 85 + ${lib.getExe pkgs.amd-fan-control} /sys/class/drm/card1/device 60 100 ''; serviceConfig = { Restart = "always"; From 77adcf8951b49d8a24e4501f1429483d95708f10 Mon Sep 17 00:00:00 2001 From: lelgenio Date: Thu, 23 Jan 2025 16:07:09 -0300 Subject: [PATCH 315/404] rainbow: update gitlab concurrent runners --- system/rainbow-gitlab-runner.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/rainbow-gitlab-runner.nix b/system/rainbow-gitlab-runner.nix index 3230c8b..52e573a 100644 --- a/system/rainbow-gitlab-runner.nix +++ b/system/rainbow-gitlab-runner.nix @@ -12,7 +12,7 @@ in virtualisation.docker.enable = true; services.gitlab-runner = { enable = true; - settings.concurrent = 1; + settings.concurrent = 6; services = { thoreb-telemetria-nix = mkNixRunner config.age.secrets.gitlab-runner-thoreb-telemetria-registrationConfigFile.path; thoreb-itinerario-nix = mkNixRunner config.age.secrets.rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.path; From f8ee1952f84eda9ace68a5d7c92e0766cbdc283c Mon Sep 17 00:00:00 2001 From: lelgenio Date: Thu, 23 Jan 2025 17:45:35 -0300 Subject: [PATCH 316/404] kak-lsp: add intelephense stubs --- user/kakoune/kak-lsp.toml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/user/kakoune/kak-lsp.toml b/user/kakoune/kak-lsp.toml index b3a6c8e..9c195bd 100644 --- a/user/kakoune/kak-lsp.toml +++ b/user/kakoune/kak-lsp.toml @@ -104,6 +104,19 @@ files.exclude = [ "**/bower_components/**", "**/resources/views/**" ] +stubs = [ + "apache", "bcmath", "bz2", "calendar", "com_dotnet", "Core", "ctype", + "curl", "date", "dba", "dom", "enchant", "exif", "FFI", "fileinfo", "filter", + "fpm", "ftp", "gd", "gettext", "gmp", "hash", "iconv", "imagick", "imap", + "intl", "json", "ldap", "libxml", "mbstring", "meta", "mysqli", "oci8", + "odbc", "openssl", "pcntl", "pcre", "PDO", "pdo_ibm", "pdo_mysql", "pdo_pgsql", + "pdo_sqlite", "pgsql", "Phar", "posix", "pspell", "readline", "Reflection", + "session", "shmop", "SimpleXML", "snmp", "soap", "sockets", "sodium", + "SPL", "sqlite3", "standard", "superglobals", "sysvmsg", "sysvsem", "sysvshm", + "tidy", "tokenizer", "xml", "xmlreader", "xmlrpc", "xmlwriter", "xsl", + "Zend OPcache", "zip", "zlib", +] + [language_server.rust-analyzer] filetypes = ["rust"] From 3d612c91f63199b4f99e4b61fd35d37d71c2945a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 24 Jan 2025 08:24:42 -0300 Subject: [PATCH 317/404] flake: add treefmt --- flake.lock | 41 ++++++++++++++++++++++++++++++++++++++--- flake.nix | 5 ++++- treefmt.nix | 8 ++++++++ 3 files changed, 50 insertions(+), 4 deletions(-) create mode 100644 treefmt.nix diff --git a/flake.lock b/flake.lock index d654964..0ce37e0 100644 --- a/flake.lock +++ b/flake.lock @@ -626,6 +626,22 @@ } }, "nixpkgs_6": { + "locked": { + "lastModified": 1735554305, + "narHash": "sha256-zExSA1i/b+1NMRhGGLtNfFGXgLtgo+dcuzHzaWA6w3Q=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "0e82ab234249d8eee3e8c91437802b32c74bb3fd", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { "locked": { "lastModified": 1719010183, "narHash": "sha256-8HMWaqpyjbVeEsmy/A2H6VFtW/Wr71vkPLnpTiAXu+8=", @@ -641,7 +657,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1714091391, "narHash": "sha256-68n3GBvlm1MIeJXadPzQ3v8Y9sIW3zmv8gI5w5sliC8=", @@ -708,6 +724,7 @@ "ranger-icons": "ranger-icons", "tlauncher": "tlauncher", "tomater": "tomater", + "treefmt-nix": "treefmt-nix", "vpsadminos": "vpsadminos", "warthunder-leak-counter": "warthunder-leak-counter", "wl-crosshair": "wl-crosshair", @@ -900,6 +917,24 @@ "url": "https://git.lelgenio.com/lelgenio/tomater" } }, + "treefmt-nix": { + "inputs": { + "nixpkgs": "nixpkgs_6" + }, + "locked": { + "lastModified": 1737483750, + "narHash": "sha256-5An1wq5U8sNycOBBg3nsDDgpwBmR9liOpDGlhliA6Xo=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "f2cc121df15418d028a59c9737d38e3a90fbaf8f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "vpsadminos": { "locked": { "lastModified": 1737136524, @@ -919,7 +954,7 @@ "inputs": { "crane": "crane_3", "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1719076817, @@ -938,7 +973,7 @@ "wl-crosshair": { "inputs": { "flake-utils": "flake-utils_7", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1715216838, diff --git a/flake.nix b/flake.nix index 1e11ec6..49c3192 100644 --- a/flake.nix +++ b/flake.nix @@ -43,6 +43,8 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + treefmt-nix.url = "github:numtide/treefmt-nix"; + # my stuff dhist.url = "github:lelgenio/dhist"; demoji.url = "github:lelgenio/demoji"; @@ -176,6 +178,7 @@ packages.${system} = pkgs // packages; - formatter.${system} = pkgs.nixfmt-rfc-style; + # formatter.${system} = pkgs.nixfmt-rfc-style; + formatter.${system} = (inputs.treefmt-nix.lib.evalModule pkgs ./treefmt.nix).config.build.wrapper; }; } diff --git a/treefmt.nix b/treefmt.nix new file mode 100644 index 0000000..6c86ca2 --- /dev/null +++ b/treefmt.nix @@ -0,0 +1,8 @@ +{ pkgs, ... }: +{ + projectRootFile = "flake.nix"; + programs.nixfmt.enable = true; + programs.nixfmt.package = pkgs.nixfmt-rfc-style; + + settings.on-unmatched = "debug"; +} From 6c2aa3706f7aff8b9cd47b83585aebd6c823ff47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 25 Jan 2025 14:28:33 -0300 Subject: [PATCH 318/404] amdgpu: remove manual fan control --- hosts/monolith/amdgpu.nix | 13 +-------- scripts/amd-fan-control | 61 --------------------------------------- scripts/default.nix | 1 - 3 files changed, 1 insertion(+), 74 deletions(-) delete mode 100755 scripts/amd-fan-control diff --git a/hosts/monolith/amdgpu.nix b/hosts/monolith/amdgpu.nix index 0da64f0..8c42bf0 100644 --- a/hosts/monolith/amdgpu.nix +++ b/hosts/monolith/amdgpu.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: +{ pkgs, ... }: let undervoltGpu = pkgs.writeShellScript "undervolt-gpu" '' set -xe @@ -17,17 +17,6 @@ in "amdgpu.ppfeaturemask=0xfffd7fff" # enable undervolting ]; - systemd.services.amd-fan-control = { - script = '' - ${lib.getExe pkgs.amd-fan-control} /sys/class/drm/card1/device 60 100 - ''; - serviceConfig = { - Restart = "always"; - RestartSec = 10; - }; - wantedBy = [ "multi-user.target" ]; - }; - hardware.graphics.enable32Bit = true; hardware.graphics.extraPackages = with pkgs; [ diff --git a/scripts/amd-fan-control b/scripts/amd-fan-control deleted file mode 100755 index 1f4c3e7..0000000 --- a/scripts/amd-fan-control +++ /dev/null @@ -1,61 +0,0 @@ -#!/usr/bin/env bash - -set -e - -DEVICE="$1" # eg: /sys/class/drm/card1/device -HWMON=$(echo "$DEVICE"/hwmon/hwmon*) - -exit() { - echo "Setting controll to auto" >&2 - echo 2 > "$HWMON/pwm1_enable" -} - -trap exit EXIT INT - -bail() { - echo "Error: $@" >&2 - echo "Exiting..." >&2 - exit 1 -} - -if ! [ -d "$HWMON" ]; then - bail "Invalid HWMON" -fi - -TEMP_INPUT="$HWMON/temp2_input" - -if ! [ -f $TEMP_INPUT ]; then - bail "Invalid TEMP_INPUT" -fi - -TEMP_MIN="$2" -TEMP_MAX="$3" - -if [ -z "$TEMP_MIN" ];then - bail "No minimum temperature provided" -fi - -if [ -z "$TEMP_MAX" ];then - bail "No maximum temperature provided" -fi - -PWM_MIN=0 -PWM_MAX=255 - -echo "Running..." >&2 -while true; do - TEMPERATURE_RAW=$(cat "$TEMP_INPUT") - TEMPERATURE="$(( $TEMPERATURE_RAW / 1000 ))" - # Remap from a number between 60_000..90_000 to 0..255 - PWM=$(( ($TEMPERATURE - $TEMP_MIN) * $PWM_MAX / ($TEMP_MAX - $TEMP_MIN) )) - - if [ "$PWM" -gt $PWM_MAX ]; then - PWM=$PWM_MAX - elif [ "$PWM" -lt $PWM_MIN ]; then - PWM=$PWM_MIN - fi - - echo 1 > "$HWMON/pwm1_enable" - echo "$PWM" > "$HWMON/pwm1" - sleep .1s -done diff --git a/scripts/default.nix b/scripts/default.nix index c2725ee..78ccac8 100644 --- a/scripts/default.nix +++ b/scripts/default.nix @@ -23,7 +23,6 @@ in with final; createScripts { - amd-fan-control = [ bash ]; br = [ ]; bmenu = [ bemenu From 094841597ffde356c8a5646d0d3371cf7ee35352 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 25 Jan 2025 18:48:02 -0300 Subject: [PATCH 319/404] home: fix btop gpu support --- user/home.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/home.nix b/user/home.nix index b380515..e8ba81d 100644 --- a/user/home.nix +++ b/user/home.nix @@ -75,7 +75,7 @@ comma # System monitors - (btop.override { cudaSupport = true; }) + (btop.override { rocmSupport = true; }) amdgpu_top inxi dmidecode From 16604962effe4c54ea788cf2ac19423ee38c4b25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Tue, 28 Jan 2025 10:24:22 -0300 Subject: [PATCH 320/404] update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 0ce37e0..4fc266a 100644 --- a/flake.lock +++ b/flake.lock @@ -227,11 +227,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1736891870, - "narHash": "sha256-JFHhj8jlWE4bAzWzceWJdyByq9VcUt7MMbs331xlxMY=", + "lastModified": 1737831696, + "narHash": "sha256-+MiZ0DmokNycjvoFBddlzPw16GlSHEH7fARWB9RzTas=", "owner": "lelgenio", "repo": "dzgui-nix", - "rev": "2be703bfbc8cb9924d7afd9c4ecced9adff7647c", + "rev": "0f3bc9ab6a2d3afe93007ec742afb71bc8f03f75", "type": "github" }, "original": { @@ -481,11 +481,11 @@ ] }, "locked": { - "lastModified": 1736652904, - "narHash": "sha256-8uolHABgroXqzs03QdulHp8H9e5kWQZnnhcda1MKbBM=", + "lastModified": 1737861961, + "narHash": "sha256-LIRtMvAwLGb8pBoamzgEF67oKlNPz4LuXiRPVZf+TpE=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "271e5bd7c57e1f001693799518b10a02d1123b12", + "rev": "79b7b8eae3243fc5aa9aad34ba6b9bbb2266f523", "type": "github" }, "original": { @@ -504,11 +504,11 @@ "nixpkgs-24_11": "nixpkgs-24_11" }, "locked": { - "lastModified": 1735230346, - "narHash": "sha256-zgR8NTiNDPVNrfaiOlB9yHSmCqFDo7Ks2IavaJ2dZo4=", + "lastModified": 1737201600, + "narHash": "sha256-JBh5+g8oQteQdQqbO07dGHBRQo/NGI61JPlTjdfQ1pk=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "dc0569066e79ae96184541da6fa28f35a33fbf7b", + "rev": "ade37b2765032f83d2d4bd50b6204a40a4c05eb4", "type": "gitlab" }, "original": { @@ -551,11 +551,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1737062831, - "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", + "lastModified": 1737885589, + "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", + "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", "type": "github" }, "original": { @@ -612,11 +612,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1736916166, - "narHash": "sha256-puPDoVKxkuNmYIGMpMQiK8bEjaACcCksolsG36gdaNQ=", + "lastModified": 1737885640, + "narHash": "sha256-GFzPxJzTd1rPIVD4IW+GwJlyGwBDV1Tj5FLYwDQQ9sM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e24b4c09e963677b1beea49d411cd315a024ad3a", + "rev": "4e96537f163fad24ed9eb317798a79afc85b51b7", "type": "github" }, "original": { @@ -937,11 +937,11 @@ }, "vpsadminos": { "locked": { - "lastModified": 1737136524, - "narHash": "sha256-wMy7IbQs87VUxJOqRSbfFIdxRRTUBQh8G1L/zwI36vY=", + "lastModified": 1737943400, + "narHash": "sha256-2BqPlxdK4vvZYtYL+wVhch+U9/ZJrue5/t+VJsWqc+8=", "owner": "vpsfreecz", "repo": "vpsadminos", - "rev": "0af10d77ca146293b2ed19d5dcfd98474f1fc285", + "rev": "bced91cd0b47d61e648d1c254351206a3395c08a", "type": "github" }, "original": { From 43b501b261da43e7d506800b28b66989cc41815a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 29 Jan 2025 22:46:04 -0300 Subject: [PATCH 321/404] factorio: auto backup the game saves --- hosts/monolith/factorio-server.nix | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/hosts/monolith/factorio-server.nix b/hosts/monolith/factorio-server.nix index 211e746..8ed0324 100644 --- a/hosts/monolith/factorio-server.nix +++ b/hosts/monolith/factorio-server.nix @@ -1,4 +1,9 @@ -{ config, pkgs, ... }: +{ + config, + pkgs, + lib, + ... +}: { services.factorio = { enable = true; @@ -15,6 +20,28 @@ wants = [ "network-online.target" ]; }; + systemd.services.factorio-backup-save = { + description = "Backup factorio saves"; + script = '' + ${lib.getExe pkgs.rsync} \ + -av \ + --chown=lelgenio \ + /var/lib/factorio/saves/default.zip \ + ~lelgenio/Documentos/GameSaves/factorio_saves/space-age-$(date --iso=seconds).zip + ''; + serviceConfig.Type = "oneshot"; + wantedBy = [ "multi-user.target" ]; + }; + + systemd.timers.factorio-backup-save = { + timerConfig = { + OnCalendar = "*-*-* 18:00:00"; + Persistent = true; + Unit = "factorio-backup-save.service"; + }; + wantedBy = [ "timers.target" ]; + }; + age.secrets.factorio-settings = { file = ../../secrets/factorio-settings.age; mode = "777"; From 1c91c3700bf9612e65b5803879893c334f8b7d1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 1 Feb 2025 22:19:20 -0300 Subject: [PATCH 322/404] Revert "amdgpu: remove manual fan control" This reverts commit 1336203f529cdd6100c9f776f8d56b44f39252d9. --- hosts/monolith/amdgpu.nix | 13 ++++++++- scripts/amd-fan-control | 61 +++++++++++++++++++++++++++++++++++++++ scripts/default.nix | 1 + 3 files changed, 74 insertions(+), 1 deletion(-) create mode 100755 scripts/amd-fan-control diff --git a/hosts/monolith/amdgpu.nix b/hosts/monolith/amdgpu.nix index 8c42bf0..0da64f0 100644 --- a/hosts/monolith/amdgpu.nix +++ b/hosts/monolith/amdgpu.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, lib, ... }: let undervoltGpu = pkgs.writeShellScript "undervolt-gpu" '' set -xe @@ -17,6 +17,17 @@ in "amdgpu.ppfeaturemask=0xfffd7fff" # enable undervolting ]; + systemd.services.amd-fan-control = { + script = '' + ${lib.getExe pkgs.amd-fan-control} /sys/class/drm/card1/device 60 100 + ''; + serviceConfig = { + Restart = "always"; + RestartSec = 10; + }; + wantedBy = [ "multi-user.target" ]; + }; + hardware.graphics.enable32Bit = true; hardware.graphics.extraPackages = with pkgs; [ diff --git a/scripts/amd-fan-control b/scripts/amd-fan-control new file mode 100755 index 0000000..1f4c3e7 --- /dev/null +++ b/scripts/amd-fan-control @@ -0,0 +1,61 @@ +#!/usr/bin/env bash + +set -e + +DEVICE="$1" # eg: /sys/class/drm/card1/device +HWMON=$(echo "$DEVICE"/hwmon/hwmon*) + +exit() { + echo "Setting controll to auto" >&2 + echo 2 > "$HWMON/pwm1_enable" +} + +trap exit EXIT INT + +bail() { + echo "Error: $@" >&2 + echo "Exiting..." >&2 + exit 1 +} + +if ! [ -d "$HWMON" ]; then + bail "Invalid HWMON" +fi + +TEMP_INPUT="$HWMON/temp2_input" + +if ! [ -f $TEMP_INPUT ]; then + bail "Invalid TEMP_INPUT" +fi + +TEMP_MIN="$2" +TEMP_MAX="$3" + +if [ -z "$TEMP_MIN" ];then + bail "No minimum temperature provided" +fi + +if [ -z "$TEMP_MAX" ];then + bail "No maximum temperature provided" +fi + +PWM_MIN=0 +PWM_MAX=255 + +echo "Running..." >&2 +while true; do + TEMPERATURE_RAW=$(cat "$TEMP_INPUT") + TEMPERATURE="$(( $TEMPERATURE_RAW / 1000 ))" + # Remap from a number between 60_000..90_000 to 0..255 + PWM=$(( ($TEMPERATURE - $TEMP_MIN) * $PWM_MAX / ($TEMP_MAX - $TEMP_MIN) )) + + if [ "$PWM" -gt $PWM_MAX ]; then + PWM=$PWM_MAX + elif [ "$PWM" -lt $PWM_MIN ]; then + PWM=$PWM_MIN + fi + + echo 1 > "$HWMON/pwm1_enable" + echo "$PWM" > "$HWMON/pwm1" + sleep .1s +done diff --git a/scripts/default.nix b/scripts/default.nix index 78ccac8..c2725ee 100644 --- a/scripts/default.nix +++ b/scripts/default.nix @@ -23,6 +23,7 @@ in with final; createScripts { + amd-fan-control = [ bash ]; br = [ ]; bmenu = [ bemenu From dc6ecd34b663110efe2bed2dde9b3f3c453591e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 1 Feb 2025 22:51:38 -0300 Subject: [PATCH 323/404] Revert "amdgpu: update fan controller" This reverts commit ffd977ef394e5adf7a4f0476bd095919c8a9f9ab. --- hosts/monolith/amdgpu.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/monolith/amdgpu.nix b/hosts/monolith/amdgpu.nix index 0da64f0..4c26afa 100644 --- a/hosts/monolith/amdgpu.nix +++ b/hosts/monolith/amdgpu.nix @@ -19,7 +19,7 @@ in systemd.services.amd-fan-control = { script = '' - ${lib.getExe pkgs.amd-fan-control} /sys/class/drm/card1/device 60 100 + ${lib.getExe pkgs.amd-fan-control} /sys/class/drm/card1/device 60 85 ''; serviceConfig = { Restart = "always"; From 385fb59418777e33af9a8264e07f05f4951cad52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Tue, 4 Feb 2025 23:46:58 -0300 Subject: [PATCH 324/404] flake: add nix-output-monitor --- switch | 25 +++++++++++++++++++------ system/configuration.nix | 2 ++ 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/switch b/switch index 93bd80a..d341e87 100755 --- a/switch +++ b/switch @@ -1,12 +1,25 @@ #!/usr/bin/env bash +set -euo pipefail + nix fmt git --no-pager diff -nixos-rebuild \ - switch \ - --use-remote-sudo \ - --print-build-logs \ - --flake .# \ - "$@" +run() { + nixos-rebuild \ + switch \ + --use-remote-sudo \ + --print-build-logs \ + --flake .# \ + "$@" +} + +if which nom >/dev/null; then + run --verbose \ + --log-format internal-json \ + "$@" \ + |& nom --json +else + run "$@" +fi diff --git a/system/configuration.nix b/system/configuration.nix index 5db8efc..9b4bed3 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -44,6 +44,8 @@ usbutils # dracula-theme # gtk theme adwaita-icon-theme # default gnome cursors + + nix-output-monitor ]; services.geoclue2.enable = true; From 17019aef9d097a5e18cb70e753dc4897cb96932f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Tue, 4 Feb 2025 23:47:20 -0300 Subject: [PATCH 325/404] update --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 4fc266a..731f752 100644 --- a/flake.lock +++ b/flake.lock @@ -209,11 +209,11 @@ ] }, "locked": { - "lastModified": 1737038063, - "narHash": "sha256-rMEuiK69MDhjz1JgbaeQ9mBDXMJ2/P8vmOYRbFndXsk=", + "lastModified": 1738148035, + "narHash": "sha256-KYOATYEwaKysL3HdHdS5kbQMXvzS4iPJzJrML+3TKAo=", "owner": "nix-community", "repo": "disko", - "rev": "bf0abfde48f469c256f2b0f481c6281ff04a5db2", + "rev": "18d0a984cc2bc82cf61df19523a34ad463aa7f54", "type": "github" }, "original": { @@ -481,11 +481,11 @@ ] }, "locked": { - "lastModified": 1737861961, - "narHash": "sha256-LIRtMvAwLGb8pBoamzgEF67oKlNPz4LuXiRPVZf+TpE=", + "lastModified": 1738466368, + "narHash": "sha256-PZhUjtvQZOH3PO0EYdTpQvcqkgkq1NkP2A6w9SPHYsk=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "79b7b8eae3243fc5aa9aad34ba6b9bbb2266f523", + "rev": "46a8f5fc9552b776bfc5c5c96ea3bede33f68f52", "type": "github" }, "original": { @@ -504,11 +504,11 @@ "nixpkgs-24_11": "nixpkgs-24_11" }, "locked": { - "lastModified": 1737201600, - "narHash": "sha256-JBh5+g8oQteQdQqbO07dGHBRQo/NGI61JPlTjdfQ1pk=", + "lastModified": 1737736848, + "narHash": "sha256-VrUfCXBXYV+YmQ2OvVTeML9EnmaPRtH+POrNIcJp6yo=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "ade37b2765032f83d2d4bd50b6204a40a4c05eb4", + "rev": "6b425d13f5a9d73cb63973d3609acacef4d1e261", "type": "gitlab" }, "original": { @@ -551,11 +551,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1737885589, - "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", + "lastModified": 1738680400, + "narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", + "rev": "799ba5bffed04ced7067a91798353d360788b30d", "type": "github" }, "original": { @@ -612,11 +612,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1737885640, - "narHash": "sha256-GFzPxJzTd1rPIVD4IW+GwJlyGwBDV1Tj5FLYwDQQ9sM=", + "lastModified": 1738574474, + "narHash": "sha256-rvyfF49e/k6vkrRTV4ILrWd92W+nmBDfRYZgctOyolQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4e96537f163fad24ed9eb317798a79afc85b51b7", + "rev": "fecfeb86328381268e29e998ddd3ebc70bbd7f7c", "type": "github" }, "original": { @@ -922,11 +922,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1737483750, - "narHash": "sha256-5An1wq5U8sNycOBBg3nsDDgpwBmR9liOpDGlhliA6Xo=", + "lastModified": 1738680491, + "narHash": "sha256-8X7tR3kFGkE7WEF5EXVkt4apgaN85oHZdoTGutCFs6I=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "f2cc121df15418d028a59c9737d38e3a90fbaf8f", + "rev": "64dbb922d51a42c0ced6a7668ca008dded61c483", "type": "github" }, "original": { @@ -937,11 +937,11 @@ }, "vpsadminos": { "locked": { - "lastModified": 1737943400, - "narHash": "sha256-2BqPlxdK4vvZYtYL+wVhch+U9/ZJrue5/t+VJsWqc+8=", + "lastModified": 1738687007, + "narHash": "sha256-cCFjJCknS2eVxCo6A1H+cffq0+7m0s18wE//bQDS28g=", "owner": "vpsfreecz", "repo": "vpsadminos", - "rev": "bced91cd0b47d61e648d1c254351206a3395c08a", + "rev": "c9040809be5e730ff5488ec0c9ecc9cd46c75df8", "type": "github" }, "original": { From d1d4e2da8d6a38d58467a051cf610a98b52281ed Mon Sep 17 00:00:00 2001 From: lelgenio Date: Tue, 11 Feb 2025 16:51:28 -0300 Subject: [PATCH 326/404] fish: Don't show unpushed tags in status --- user/fish/fish_prompt.fish | 1 + 1 file changed, 1 insertion(+) diff --git a/user/fish/fish_prompt.fish b/user/fish/fish_prompt.fish index e5784bd..ec7774e 100644 --- a/user/fish/fish_prompt.fish +++ b/user/fish/fish_prompt.fish @@ -51,6 +51,7 @@ end function _fish_prompt_git_unpushed_branches timeout 5s git log \ --branches \ + --decorate-refs-exclude=refs/tags \ --simplify-by-decoration \ --not \ --remotes \ From 01d0985202ad824dec1f04c0382cc64ee82f058c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 14 Feb 2025 13:57:20 -0300 Subject: [PATCH 327/404] update --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 731f752..651e965 100644 --- a/flake.lock +++ b/flake.lock @@ -209,11 +209,11 @@ ] }, "locked": { - "lastModified": 1738148035, - "narHash": "sha256-KYOATYEwaKysL3HdHdS5kbQMXvzS4iPJzJrML+3TKAo=", + "lastModified": 1739353546, + "narHash": "sha256-YTqXhBZvCdZLMBupWlCDvRFaTEhaHa2/Xc/p1sUdSZU=", "owner": "nix-community", "repo": "disko", - "rev": "18d0a984cc2bc82cf61df19523a34ad463aa7f54", + "rev": "26ade1005191e0602a78b0f141970648445bafd9", "type": "github" }, "original": { @@ -227,11 +227,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1737831696, - "narHash": "sha256-+MiZ0DmokNycjvoFBddlzPw16GlSHEH7fARWB9RzTas=", + "lastModified": 1739502527, + "narHash": "sha256-KMLNOCWmqdDeAZV5O1ccRmVqRutDcy4IONJin3lzd0Q=", "owner": "lelgenio", "repo": "dzgui-nix", - "rev": "0f3bc9ab6a2d3afe93007ec742afb71bc8f03f75", + "rev": "06fcea9445b5a005b40469a69f57f2147398bc94", "type": "github" }, "original": { @@ -481,11 +481,11 @@ ] }, "locked": { - "lastModified": 1738466368, - "narHash": "sha256-PZhUjtvQZOH3PO0EYdTpQvcqkgkq1NkP2A6w9SPHYsk=", + "lastModified": 1739071773, + "narHash": "sha256-/Ak+Quinhmdxa9m3shjm4lwwwqmzG8zzGhhhhgR1k9I=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "46a8f5fc9552b776bfc5c5c96ea3bede33f68f52", + "rev": "895d81b6228bbd50a6ef22f5a58a504ca99763ea", "type": "github" }, "original": { @@ -504,11 +504,11 @@ "nixpkgs-24_11": "nixpkgs-24_11" }, "locked": { - "lastModified": 1737736848, - "narHash": "sha256-VrUfCXBXYV+YmQ2OvVTeML9EnmaPRtH+POrNIcJp6yo=", + "lastModified": 1739121270, + "narHash": "sha256-EmJhpy9U8sVlepl2QPjG019VfG67HcucsQNItTqW6cA=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "6b425d13f5a9d73cb63973d3609acacef4d1e261", + "rev": "8c1c4640b878c692dd3d8055e8cdea0a2bbd8cf3", "type": "gitlab" }, "original": { @@ -551,11 +551,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1738680400, - "narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=", + "lastModified": 1739446958, + "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "799ba5bffed04ced7067a91798353d360788b30d", + "rev": "2ff53fe64443980e139eaa286017f53f88336dd0", "type": "github" }, "original": { @@ -612,11 +612,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1738574474, - "narHash": "sha256-rvyfF49e/k6vkrRTV4ILrWd92W+nmBDfRYZgctOyolQ=", + "lastModified": 1739357830, + "narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fecfeb86328381268e29e998ddd3ebc70bbd7f7c", + "rev": "0ff09db9d034a04acd4e8908820ba0b410d7a33a", "type": "github" }, "original": { @@ -922,11 +922,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1738680491, - "narHash": "sha256-8X7tR3kFGkE7WEF5EXVkt4apgaN85oHZdoTGutCFs6I=", + "lastModified": 1738953846, + "narHash": "sha256-yrK3Hjcr8F7qS/j2F+r7C7o010eVWWlm4T1PrbKBOxQ=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "64dbb922d51a42c0ced6a7668ca008dded61c483", + "rev": "4f09b473c936d41582dd744e19f34ec27592c5fd", "type": "github" }, "original": { @@ -937,11 +937,11 @@ }, "vpsadminos": { "locked": { - "lastModified": 1738687007, - "narHash": "sha256-cCFjJCknS2eVxCo6A1H+cffq0+7m0s18wE//bQDS28g=", + "lastModified": 1739153939, + "narHash": "sha256-7z+4SMs1uD/mCruBasPeWeq1DGzzgACRHOSdLE+mHRk=", "owner": "vpsfreecz", "repo": "vpsadminos", - "rev": "c9040809be5e730ff5488ec0c9ecc9cd46c75df8", + "rev": "939254840fcd72bdd3cd52186171815c3f25403b", "type": "github" }, "original": { From 667bb740b82675697c3e66c26ddac95ccba6068c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 25 Jan 2025 14:28:33 -0300 Subject: [PATCH 328/404] amdgpu: remove manual fan control --- hosts/monolith/amdgpu.nix | 13 +-------- scripts/amd-fan-control | 61 --------------------------------------- scripts/default.nix | 1 - 3 files changed, 1 insertion(+), 74 deletions(-) delete mode 100755 scripts/amd-fan-control diff --git a/hosts/monolith/amdgpu.nix b/hosts/monolith/amdgpu.nix index 4c26afa..8c42bf0 100644 --- a/hosts/monolith/amdgpu.nix +++ b/hosts/monolith/amdgpu.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: +{ pkgs, ... }: let undervoltGpu = pkgs.writeShellScript "undervolt-gpu" '' set -xe @@ -17,17 +17,6 @@ in "amdgpu.ppfeaturemask=0xfffd7fff" # enable undervolting ]; - systemd.services.amd-fan-control = { - script = '' - ${lib.getExe pkgs.amd-fan-control} /sys/class/drm/card1/device 60 85 - ''; - serviceConfig = { - Restart = "always"; - RestartSec = 10; - }; - wantedBy = [ "multi-user.target" ]; - }; - hardware.graphics.enable32Bit = true; hardware.graphics.extraPackages = with pkgs; [ diff --git a/scripts/amd-fan-control b/scripts/amd-fan-control deleted file mode 100755 index 1f4c3e7..0000000 --- a/scripts/amd-fan-control +++ /dev/null @@ -1,61 +0,0 @@ -#!/usr/bin/env bash - -set -e - -DEVICE="$1" # eg: /sys/class/drm/card1/device -HWMON=$(echo "$DEVICE"/hwmon/hwmon*) - -exit() { - echo "Setting controll to auto" >&2 - echo 2 > "$HWMON/pwm1_enable" -} - -trap exit EXIT INT - -bail() { - echo "Error: $@" >&2 - echo "Exiting..." >&2 - exit 1 -} - -if ! [ -d "$HWMON" ]; then - bail "Invalid HWMON" -fi - -TEMP_INPUT="$HWMON/temp2_input" - -if ! [ -f $TEMP_INPUT ]; then - bail "Invalid TEMP_INPUT" -fi - -TEMP_MIN="$2" -TEMP_MAX="$3" - -if [ -z "$TEMP_MIN" ];then - bail "No minimum temperature provided" -fi - -if [ -z "$TEMP_MAX" ];then - bail "No maximum temperature provided" -fi - -PWM_MIN=0 -PWM_MAX=255 - -echo "Running..." >&2 -while true; do - TEMPERATURE_RAW=$(cat "$TEMP_INPUT") - TEMPERATURE="$(( $TEMPERATURE_RAW / 1000 ))" - # Remap from a number between 60_000..90_000 to 0..255 - PWM=$(( ($TEMPERATURE - $TEMP_MIN) * $PWM_MAX / ($TEMP_MAX - $TEMP_MIN) )) - - if [ "$PWM" -gt $PWM_MAX ]; then - PWM=$PWM_MAX - elif [ "$PWM" -lt $PWM_MIN ]; then - PWM=$PWM_MIN - fi - - echo 1 > "$HWMON/pwm1_enable" - echo "$PWM" > "$HWMON/pwm1" - sleep .1s -done diff --git a/scripts/default.nix b/scripts/default.nix index c2725ee..78ccac8 100644 --- a/scripts/default.nix +++ b/scripts/default.nix @@ -23,7 +23,6 @@ in with final; createScripts { - amd-fan-control = [ bash ]; br = [ ]; bmenu = [ bemenu From 3bb0b28ae3ba9488a68641d4ce76ff9719c4caeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 19 Feb 2025 08:49:12 -0300 Subject: [PATCH 329/404] update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 651e965..5a3f325 100644 --- a/flake.lock +++ b/flake.lock @@ -209,11 +209,11 @@ ] }, "locked": { - "lastModified": 1739353546, - "narHash": "sha256-YTqXhBZvCdZLMBupWlCDvRFaTEhaHa2/Xc/p1sUdSZU=", + "lastModified": 1739841949, + "narHash": "sha256-lSOXdgW/1zi/SSu7xp71v+55D5Egz8ACv0STkj7fhbs=", "owner": "nix-community", "repo": "disko", - "rev": "26ade1005191e0602a78b0f141970648445bafd9", + "rev": "15dbf8cebd8e2655a883b74547108e089f051bf0", "type": "github" }, "original": { @@ -440,11 +440,11 @@ ] }, "locked": { - "lastModified": 1736373539, - "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", + "lastModified": 1739757849, + "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=", "owner": "nix-community", "repo": "home-manager", - "rev": "bd65bc3cde04c16755955630b344bc9e35272c56", + "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe", "type": "github" }, "original": { @@ -481,11 +481,11 @@ ] }, "locked": { - "lastModified": 1739071773, - "narHash": "sha256-/Ak+Quinhmdxa9m3shjm4lwwwqmzG8zzGhhhhgR1k9I=", + "lastModified": 1739676768, + "narHash": "sha256-U1HQ7nzhJyVVXUgjU028UCkbLQLEIkg42+G7iIiBmlU=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "895d81b6228bbd50a6ef22f5a58a504ca99763ea", + "rev": "ae15068e79e22b76c344f0d7f8aed1bb1c5b0b63", "type": "github" }, "original": { @@ -551,11 +551,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1739446958, - "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=", + "lastModified": 1739736696, + "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2ff53fe64443980e139eaa286017f53f88336dd0", + "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f", "type": "github" }, "original": { @@ -612,11 +612,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1739357830, - "narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=", + "lastModified": 1739758141, + "narHash": "sha256-uq6A2L7o1/tR6VfmYhZWoVAwb3gTy7j4Jx30MIrH0rE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0ff09db9d034a04acd4e8908820ba0b410d7a33a", + "rev": "c618e28f70257593de75a7044438efc1c1fc0791", "type": "github" }, "original": { @@ -922,11 +922,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1738953846, - "narHash": "sha256-yrK3Hjcr8F7qS/j2F+r7C7o010eVWWlm4T1PrbKBOxQ=", + "lastModified": 1739829690, + "narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "4f09b473c936d41582dd744e19f34ec27592c5fd", + "rev": "3d0579f5cc93436052d94b73925b48973a104204", "type": "github" }, "original": { From 03dd6d96aab66074e719ed40321895c5723d6491 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 20 Feb 2025 20:23:01 -0300 Subject: [PATCH 330/404] git: add git forges cli --- user/git.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/user/git.nix b/user/git.nix index 867b9a5..bfc85c1 100644 --- a/user/git.nix +++ b/user/git.nix @@ -43,6 +43,9 @@ in home.packages = with pkgs; [ git_clean_remote_deleted + + gh + glab ]; }; } From 90125795a99662038a19f5fafcd3754afac6ed9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 20 Feb 2025 22:01:07 -0300 Subject: [PATCH 331/404] Revert "amdgpu: remove manual fan control" This reverts commit 38dfa39c6dc80963c461edddae9c18a555715ca9. --- hosts/monolith/amdgpu.nix | 13 ++++++++- scripts/amd-fan-control | 61 +++++++++++++++++++++++++++++++++++++++ scripts/default.nix | 1 + 3 files changed, 74 insertions(+), 1 deletion(-) create mode 100755 scripts/amd-fan-control diff --git a/hosts/monolith/amdgpu.nix b/hosts/monolith/amdgpu.nix index 8c42bf0..4c26afa 100644 --- a/hosts/monolith/amdgpu.nix +++ b/hosts/monolith/amdgpu.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, lib, ... }: let undervoltGpu = pkgs.writeShellScript "undervolt-gpu" '' set -xe @@ -17,6 +17,17 @@ in "amdgpu.ppfeaturemask=0xfffd7fff" # enable undervolting ]; + systemd.services.amd-fan-control = { + script = '' + ${lib.getExe pkgs.amd-fan-control} /sys/class/drm/card1/device 60 85 + ''; + serviceConfig = { + Restart = "always"; + RestartSec = 10; + }; + wantedBy = [ "multi-user.target" ]; + }; + hardware.graphics.enable32Bit = true; hardware.graphics.extraPackages = with pkgs; [ diff --git a/scripts/amd-fan-control b/scripts/amd-fan-control new file mode 100755 index 0000000..1f4c3e7 --- /dev/null +++ b/scripts/amd-fan-control @@ -0,0 +1,61 @@ +#!/usr/bin/env bash + +set -e + +DEVICE="$1" # eg: /sys/class/drm/card1/device +HWMON=$(echo "$DEVICE"/hwmon/hwmon*) + +exit() { + echo "Setting controll to auto" >&2 + echo 2 > "$HWMON/pwm1_enable" +} + +trap exit EXIT INT + +bail() { + echo "Error: $@" >&2 + echo "Exiting..." >&2 + exit 1 +} + +if ! [ -d "$HWMON" ]; then + bail "Invalid HWMON" +fi + +TEMP_INPUT="$HWMON/temp2_input" + +if ! [ -f $TEMP_INPUT ]; then + bail "Invalid TEMP_INPUT" +fi + +TEMP_MIN="$2" +TEMP_MAX="$3" + +if [ -z "$TEMP_MIN" ];then + bail "No minimum temperature provided" +fi + +if [ -z "$TEMP_MAX" ];then + bail "No maximum temperature provided" +fi + +PWM_MIN=0 +PWM_MAX=255 + +echo "Running..." >&2 +while true; do + TEMPERATURE_RAW=$(cat "$TEMP_INPUT") + TEMPERATURE="$(( $TEMPERATURE_RAW / 1000 ))" + # Remap from a number between 60_000..90_000 to 0..255 + PWM=$(( ($TEMPERATURE - $TEMP_MIN) * $PWM_MAX / ($TEMP_MAX - $TEMP_MIN) )) + + if [ "$PWM" -gt $PWM_MAX ]; then + PWM=$PWM_MAX + elif [ "$PWM" -lt $PWM_MIN ]; then + PWM=$PWM_MIN + fi + + echo 1 > "$HWMON/pwm1_enable" + echo "$PWM" > "$HWMON/pwm1" + sleep .1s +done diff --git a/scripts/default.nix b/scripts/default.nix index 78ccac8..c2725ee 100644 --- a/scripts/default.nix +++ b/scripts/default.nix @@ -23,6 +23,7 @@ in with final; createScripts { + amd-fan-control = [ bash ]; br = [ ]; bmenu = [ bemenu From 1fcf1ecd5239783497f0d273a3904a16cf7aa15f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 21 Feb 2025 00:35:24 -0300 Subject: [PATCH 332/404] remove fullscreen only vrr --- scripts/default.nix | 1 - scripts/vrr-fullscreen | 28 ---------------------------- user/sway/default.nix | 15 --------------- 3 files changed, 44 deletions(-) delete mode 100755 scripts/vrr-fullscreen diff --git a/scripts/default.nix b/scripts/default.nix index c2725ee..d9824b5 100644 --- a/scripts/default.nix +++ b/scripts/default.nix @@ -137,7 +137,6 @@ libinput libratbag ]; - vrr-fullscreen = [ ]; controller-battery = [ ]; _docker-block-external-connections = [ iptables diff --git a/scripts/vrr-fullscreen b/scripts/vrr-fullscreen deleted file mode 100755 index 8413923..0000000 --- a/scripts/vrr-fullscreen +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env bash - -# List of supported outputs for VRR -output_vrr_whitelist=( - "DP-1" - "DP-2" -) - -# Toggle VRR for fullscreened apps in prespecified displays to avoid stutters while in desktop -swaymsg -t subscribe -m '[ "window" ]' | while read window_json; do - window_event=$(echo ${window_json} | jq -r '.change') - - # Process only focus change and fullscreen toggle - if [[ $window_event = "focus" || $window_event = "fullscreen_mode" ]]; then - output_json=$(swaymsg -t get_outputs | jq -r '.[] | select(.focused == true)') - output_name=$(echo ${output_json} | jq -r '.name') - - # Use only VRR in whitelisted outputs - if [[ ${output_vrr_whitelist[*]} =~ ${output_name} ]]; then - output_vrr_status=$(echo ${output_json} | jq -r '.adaptive_sync_status') - window_fullscreen_status=$(echo ${window_json} | jq -r '.container.fullscreen_mode') - - # Only update output if nesseccary to avoid flickering - [[ $output_vrr_status = "disabled" && $window_fullscreen_status = "1" ]] && swaymsg output "${output_name}" adaptive_sync 1 - [[ $output_vrr_status = "enabled" && $window_fullscreen_status = "0" ]] && swaymsg output "${output_name}" adaptive_sync 0 - fi - fi -done diff --git a/user/sway/default.nix b/user/sway/default.nix index 6679134..2633c23 100644 --- a/user/sway/default.nix +++ b/user/sway/default.nix @@ -122,21 +122,6 @@ in indicator = true; }; - systemd.user.services.vrr-fullscreen = { - Unit = { - Description = "Enable VRR for fullscreen windows"; - PartOf = [ "graphical-session.target" ]; - After = [ "graphical-session.target" ]; - }; - Service = { - ExecStart = "${lib.getExe pkgs.vrr-fullscreen}"; - Restart = "on-failure"; - }; - Install = { - WantedBy = [ "sway-session.target" ]; - }; - }; - services.gpg-agent.pinentryPackage = pkgs.pinentry-all; xdg.configFile."OpenTabletDriver/settings.json".source = ./open-tablet-driver.json; From d469c5fa796411840a3d09ef86c1c6976adbeae7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 21 Feb 2025 19:46:33 -0300 Subject: [PATCH 333/404] remove cachix config --- system/cachix.nix | 18 ------------------ system/configuration.nix | 1 - 2 files changed, 19 deletions(-) delete mode 100644 system/cachix.nix diff --git a/system/cachix.nix b/system/cachix.nix deleted file mode 100644 index 7ff9b29..0000000 --- a/system/cachix.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ - pkgs, - lib, - config, - ... -}: -{ - services.cachix-watch-store = { - enable = true; - cacheName = "lelgenio"; - cachixTokenFile = config.age.secrets.lelgenio-cachix.path; - }; - systemd.services.cachix-watch-store-agent = { - serviceConfig.TimeoutStopSec = 3; - # If we don't do this, cachix tends to timeout - serviceConfig.KillMode = lib.mkForce "control-group"; - }; -} diff --git a/system/configuration.nix b/system/configuration.nix index 9b4bed3..f4bfabf 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -10,7 +10,6 @@ { imports = [ ./gamemode.nix - ./cachix.nix ./media-packages.nix ./boot.nix ./thunar.nix From 0a387960a2c5e730a39cf7d160027528811dd0dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 20 Feb 2025 22:01:03 -0300 Subject: [PATCH 334/404] treewide: cleanup config with enable options --- flake.nix | 32 +++++---- hosts/monolith/default.nix | 2 + settings/default.nix | 14 +++- system/android.nix | 17 +++++ system/boot.nix | 1 - system/configuration.nix | 32 +++------ system/containers.nix | 55 +++++++++------- system/gamemode.nix | 27 -------- system/gaming.nix | 63 ++++++++++++++++++ system/media-packages.nix | 4 +- system/network.nix | 13 +++- system/steam.nix | 36 ---------- user/dummy.nix | 8 +++ user/fish/default.nix | 5 +- user/fzf.nix | 8 +-- user/gaming.nix | 24 +++++++ user/helix.nix | 6 +- user/home.nix | 18 ++--- user/mangohud.nix | 132 +++++++++++++++++-------------------- user/mpd.nix | 7 +- user/pass.nix | 8 ++- user/sway/default.nix | 29 ++++---- user/sway/kanshi.nix | 20 ++---- user/sway/mako.nix | 84 ++++++++++++----------- user/sway/swayidle.nix | 15 ++--- user/sway/swaylock.nix | 20 ++---- user/waybar/default.nix | 6 +- user/zathura.nix | 92 +++++++++++++------------- 28 files changed, 420 insertions(+), 358 deletions(-) create mode 100644 system/android.nix delete mode 100644 system/gamemode.nix create mode 100644 system/gaming.nix delete mode 100644 system/steam.nix create mode 100644 user/dummy.nix create mode 100644 user/gaming.nix diff --git a/flake.nix b/flake.nix index 49c3192..0126f65 100644 --- a/flake.nix +++ b/flake.nix @@ -102,17 +102,25 @@ inputs.agenix.nixosModules.default inputs.home-manager.nixosModules.home-manager inputs.disko.nixosModules.disko - { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users.lelgenio = import ./user/home.nix; - home-manager.backupFileExtension = "bkp"; - # Optionally, use home-manager.extraSpecialArgs to pass - # arguments to home.nix - home-manager.extraSpecialArgs = { - inherit inputs; - }; - } + ( + { config, ... }: + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.lelgenio = { + my = config.my; + imports = [ + ./user/home.nix + ]; + }; + home-manager.backupFileExtension = "bkp"; + # Optionally, use home-manager.extraSpecialArgs to pass + # arguments to home.nix + home-manager.extraSpecialArgs = { + inherit inputs; + }; + } + ) ] ++ lib.optional (desktop == "gnome") ./system/gnome.nix ++ lib.optional (desktop == "kde") ./system/kde.nix; @@ -133,7 +141,6 @@ ./system/monolith-gitlab-runner.nix ./system/monolith-forgejo-runner.nix ./system/nix-serve.nix - ./system/steam.nix ] ++ common_modules; }; double-rainbow = lib.nixosSystem { @@ -151,7 +158,6 @@ ++ [ { packages.media-packages.enable = lib.mkOverride 0 false; - programs.steam.enable = lib.mkOverride 0 false; services.flatpak.enable = lib.mkOverride 0 false; } ]; diff --git a/hosts/monolith/default.nix b/hosts/monolith/default.nix index c3764fd..410300e 100644 --- a/hosts/monolith/default.nix +++ b/hosts/monolith/default.nix @@ -41,6 +41,8 @@ in package = pkgs.unstable.opentabletdriver; }; + my.gaming.enable = true; + boot.extraModulePackages = with config.boot.kernelPackages; [ zenpower ]; boot.initrd.kernelModules = [ "amdgpu" ]; diff --git a/settings/default.nix b/settings/default.nix index 2a2ca08..1cf90df 100644 --- a/settings/default.nix +++ b/settings/default.nix @@ -1,6 +1,18 @@ { lib, ... }: { options = { - my = lib.mkOption { }; + my = { + themes = lib.mkOption { }; + key = lib.mkOption { }; + theme = lib.mkOption { }; + accent = lib.mkOption { }; + font = lib.mkOption { }; + username = lib.mkOption { type = lib.types.str; }; + mail = lib.mkOption { }; + dmenu = lib.mkOption { type = lib.types.str; }; + desktop = lib.mkOption { type = lib.types.str; }; + browser = lib.mkOption { type = lib.types.str; }; + editor = lib.mkOption { type = lib.types.str; }; + }; }; } diff --git a/system/android.nix b/system/android.nix new file mode 100644 index 0000000..3cce4af --- /dev/null +++ b/system/android.nix @@ -0,0 +1,17 @@ +{ + config, + pkgs, + lib, + ... +}: +{ + options.my.android.enable = lib.mkEnableOption { }; + + config = lib.mkIf config.my.android.enable { + # Open kde connect ports + programs.kdeconnect.enable = true; + + programs.adb.enable = true; + services.udev.packages = [ pkgs.android-udev-rules ]; + }; +} diff --git a/system/boot.nix b/system/boot.nix index fa1ed8d..3e0151d 100644 --- a/system/boot.nix +++ b/system/boot.nix @@ -2,7 +2,6 @@ config, pkgs, lib, - inputs, ... }: { diff --git a/system/configuration.nix b/system/configuration.nix index f4bfabf..a227e36 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -1,15 +1,11 @@ # Edit this configuration file to define what should be installed on # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ - config, - pkgs, - inputs, - ... -}: +{ pkgs, ... }: { imports = [ - ./gamemode.nix + ./android.nix + ./gaming.nix ./media-packages.nix ./boot.nix ./thunar.nix @@ -25,39 +21,27 @@ ../settings ]; - my = import ../user/variables.nix; + my = import ../user/variables.nix // { + android.enable = true; + media-packages.enable = true; + containers.enable = true; + }; zramSwap.enable = true; - programs.adb.enable = true; - services.udev.packages = [ pkgs.android-udev-rules ]; - # Enable touchpad support (enabled default in most desktopManager). services.libinput.enable = true; - packages.media-packages.enable = true; environment.systemPackages = with pkgs; [ pavucontrol glib # gsettings usbutils - # dracula-theme # gtk theme adwaita-icon-theme # default gnome cursors - - nix-output-monitor ]; services.geoclue2.enable = true; - # Workaround for nm-wait-online hanging?? - # Ref: https://github.com/NixOS/nixpkgs/issues/180175 - systemd.services.NetworkManager-wait-online = { - serviceConfig.ExecStart = [ - "" - "${pkgs.networkmanager}/bin/nm-online -q" - ]; - }; - systemd.extraConfig = '' DefaultTimeoutStopSec=10s ''; diff --git a/system/containers.nix b/system/containers.nix index 64383a6..9032a6c 100644 --- a/system/containers.nix +++ b/system/containers.nix @@ -1,30 +1,39 @@ -{ pkgs, lib, ... }: { - services.flatpak.enable = true; + pkgs, + lib, + config, + ... +}: +{ + options.my.containers.enable = lib.mkEnableOption { }; - virtualisation.docker = { - enable = true; - autoPrune = { + config = lib.mkIf config.my.containers.enable { + services.flatpak.enable = true; + + virtualisation.docker = { enable = true; - dates = "monthly"; - flags = [ - "--all" - "--volumes" - ]; - }; - daemon.settings = { - # needed by bitbucket runner ??? - log-driver = "json-file"; - log-opts = { - max-size = "10m"; - max-file = "3"; + autoPrune = { + enable = true; + dates = "monthly"; + flags = [ + "--all" + "--volumes" + ]; + }; + daemon.settings = { + # needed by bitbucket runner ??? + log-driver = "json-file"; + log-opts = { + max-size = "10m"; + max-file = "3"; + }; }; }; + + networking.firewall.extraCommands = lib.getExe pkgs._docker-block-external-connections; + + programs.extra-container.enable = true; + + programs.firejail.enable = true; }; - - networking.firewall.extraCommands = lib.getExe pkgs._docker-block-external-connections; - - programs.extra-container.enable = true; - - programs.firejail.enable = true; } diff --git a/system/gamemode.nix b/system/gamemode.nix deleted file mode 100644 index 92207cd..0000000 --- a/system/gamemode.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - config, - pkgs, - inputs, - ... -}: -{ - programs.gamemode.enable = true; - programs.gamemode.enableRenice = true; - programs.gamemode.settings = { - general = { - renice = 10; - }; - - # Warning: GPU optimisations have the potential to damage hardware - gpu = { - apply_gpu_optimisations = "accept-responsibility"; - gpu_device = 0; - amd_performance_level = "high"; - }; - - custom = { - start = "${pkgs.libnotify}/bin/notify-send 'GameMode started'"; - end = "${pkgs.libnotify}/bin/notify-send 'GameMode ended'"; - }; - }; -} diff --git a/system/gaming.nix b/system/gaming.nix new file mode 100644 index 0000000..e32c640 --- /dev/null +++ b/system/gaming.nix @@ -0,0 +1,63 @@ +{ + config, + pkgs, + lib, + inputs, + ... +}: +{ + options.my.gaming.enable = lib.mkEnableOption { }; + + config = lib.mkIf config.my.gaming.enable { + programs.steam.enable = true; + programs.steam.extraPackages = + config.fonts.packages + ++ (with pkgs; [ + capitaine-cursors + bibata-cursors + mangohud + xdg-user-dirs + gamescope + + # gamescope compatibility?? + xorg.libXcursor + xorg.libXi + xorg.libXinerama + xorg.libXScrnSaver + libpng + libpulseaudio + libvorbis + stdenv.cc.cc.lib + libkrb5 + keyutils + ]); + + environment.systemPackages = with pkgs; [ + protontricks + bottles + inputs.dzgui-nix.packages.${pkgs.system}.default + ]; + + programs.gamemode = { + enable = true; + enableRenice = true; + settings = { + general = { + renice = 10; + }; + + # Warning: GPU optimisations have the potential to damage hardware + gpu = { + apply_gpu_optimisations = "accept-responsibility"; + gpu_device = 0; + amd_performance_level = "high"; + }; + + custom = { + start = "${pkgs.libnotify}/bin/notify-send 'GameMode started'"; + end = "${pkgs.libnotify}/bin/notify-send 'GameMode ended'"; + }; + }; + }; + }; +} diff --git a/system/media-packages.nix b/system/media-packages.nix index 8458087..dec98a2 100644 --- a/system/media-packages.nix +++ b/system/media-packages.nix @@ -5,10 +5,10 @@ ... }: let - cfg = config.packages.media-packages; + cfg = config.my.media-packages; in { - options.packages.media-packages = { + options.my.media-packages = { enable = lib.mkEnableOption "media packages"; }; config = lib.mkIf cfg.enable { diff --git a/system/network.nix b/system/network.nix index 682639d..e280ff5 100644 --- a/system/network.nix +++ b/system/network.nix @@ -6,8 +6,6 @@ # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; # Enable networking networking.networkmanager.enable = true; - # Open kde connect ports - programs.kdeconnect.enable = true; networking.firewall = { enable = true; @@ -15,7 +13,7 @@ }; # Enable CUPS to print documents. - # services.printing.enable = true; + services.printing.enable = true; security.rtkit.enable = true; services.openssh = { @@ -27,4 +25,13 @@ KbdInteractiveAuthentication = false; }; }; + + # Workaround for nm-wait-online hanging?? + # Ref: https://github.com/NixOS/nixpkgs/issues/180175 + systemd.services.NetworkManager-wait-online = { + serviceConfig.ExecStart = [ + "" + "${pkgs.networkmanager}/bin/nm-online -q" + ]; + }; } diff --git a/system/steam.nix b/system/steam.nix deleted file mode 100644 index f82c958..0000000 --- a/system/steam.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - config, - pkgs, - inputs, - ... -}: -{ - programs.steam.enable = true; - programs.steam.extraPackages = - config.fonts.packages - ++ (with pkgs; [ - capitaine-cursors - bibata-cursors - mangohud - xdg-user-dirs - gamescope - - # gamescope compatibility?? - xorg.libXcursor - xorg.libXi - xorg.libXinerama - xorg.libXScrnSaver - libpng - libpulseaudio - libvorbis - stdenv.cc.cc.lib - libkrb5 - keyutils - ]); - - environment.systemPackages = with pkgs; [ - protontricks - bottles - inputs.dzgui-nix.packages.${pkgs.system}.default - ]; -} diff --git a/user/dummy.nix b/user/dummy.nix new file mode 100644 index 0000000..39043dd --- /dev/null +++ b/user/dummy.nix @@ -0,0 +1,8 @@ +{ lib, ... }: +{ + options.my = { + android.enable = lib.mkEnableOption { }; + media-packages.enable = lib.mkEnableOption { }; + containers.enable = lib.mkEnableOption { }; + }; +} diff --git a/user/fish/default.nix b/user/fish/default.nix index 30893ee..830d716 100644 --- a/user/fish/default.nix +++ b/user/fish/default.nix @@ -6,9 +6,12 @@ }: let inherit (config.my) accent editor desktop; + cfg = config.my.fish; in { - config = { + options.my.fish.enable = lib.mkEnableOption { }; + + config = lib.mkIf cfg.enable { programs.fish = { enable = true; shellInit = '' diff --git a/user/fzf.nix b/user/fzf.nix index df16adb..468cae5 100644 --- a/user/fzf.nix +++ b/user/fzf.nix @@ -2,16 +2,10 @@ config, pkgs, lib, - inputs, ... }: let - inherit (config.my) - key - theme - accent - font - ; + inherit (config.my) theme accent; inherit (theme) color; colors = { diff --git a/user/gaming.nix b/user/gaming.nix new file mode 100644 index 0000000..3e89361 --- /dev/null +++ b/user/gaming.nix @@ -0,0 +1,24 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.my.gaming; +in +{ + options.my.gaming.enable = lib.mkEnableOption { }; + config = lib.mkIf cfg.enable { + my.mangohud.enable = true; + + home.packages = with pkgs; [ + # lutris-unwrapped + # steam # It's enabled in the system config + tlauncher + gamescope + glxinfo + vulkan-tools + ]; + }; +} diff --git a/user/helix.nix b/user/helix.nix index b711055..15250b4 100644 --- a/user/helix.nix +++ b/user/helix.nix @@ -7,9 +7,13 @@ let inherit (config.my) accent theme editor; inherit (theme) color; + + cfg = config.my.helix; in { - config = { + options.my.helix.enable = lib.mkEnableOption "Enable helix config"; + + config = lib.mkIf cfg.enable { programs.helix = { enable = true; settings = { diff --git a/user/home.nix b/user/home.nix index e8ba81d..c384c60 100644 --- a/user/home.nix +++ b/user/home.nix @@ -8,6 +8,7 @@ }: { imports = [ + ./dummy.nix ./waybar ./helix.nix ./kakoune @@ -21,6 +22,7 @@ ./rofi.nix ./mpv.nix ./mangohud.nix + ./gaming.nix ./pipewire.nix ./mimeapps.nix ./desktop-entries.nix @@ -44,7 +46,11 @@ ./powerplay-led-idle.nix ]; - my = import ./variables.nix; + my = import ./variables.nix // { + sway.enable = true; + pass.enable = true; + fish.enable = true; + }; # Home Manager needs a bit of information about you and the # paths it should manage. @@ -91,14 +97,6 @@ mate.engrampa # gnome.nautilus - ## games - # lutris-unwrapped - # steam # It's enabled in the system config - tlauncher - gamescope - glxinfo - vulkan-tools - ## Theming orchis_theme_compact papirus_red @@ -130,6 +128,8 @@ unstable.blade-formatter nixfmt-rfc-style + + nix-output-monitor ]; fonts.fontconfig.enable = true; diff --git a/user/mangohud.nix b/user/mangohud.nix index 440b750..fa0c8ff 100644 --- a/user/mangohud.nix +++ b/user/mangohud.nix @@ -1,80 +1,68 @@ -{ - config, - pkgs, - lib, - font, - ... -}: +{ config, lib, ... }: let - inherit (config.my) - key - theme - color - accent - font - ; + cfg = config.my.mangohud; in { - config = { - programs.mangohud = { - enable = true; - enableSessionWide = true; - settings = { - full = true; - # histogram = true; - no_display = true; - fps_limit = "0,30,60,72,90,120,144,240,288,320"; - toggle_fps_limit = "Shift_R+F10"; - toggle_preset = "Control_R+F9"; - fps_metrics = "Control_R+F8"; + options.my.mangohud.enable = lib.mkEnableOption { }; - # legacy_layout = "false"; - # gpu_stats = true; - # gpu_temp = true; - # gpu_core_clock = true; - # gpu_mem_clock = true; - # gpu_power = true; - # gpu_load_change = true; - # gpu_load_value = "50,90"; - gpu_load_color = "FFFFFF,FFAA7F,CC0000"; - # gpu_text = "GPU"; - # cpu_stats = true; - # cpu_temp = true; - # cpu_power = true; - # cpu_mhz = true; - # cpu_load_change = true; - # core_load_change = true; - # cpu_load_value = "50,90"; - cpu_load_color = "FFFFFF,FFAA7F,CC0000"; - cpu_color = "2e97cb"; - # cpu_text = "CPU"; - # io_stats = true; - # io_read = true; - # io_write = true; - io_color = "a491d3"; - # swap = true; - # vram = true; - vram_color = "ad64c1"; - # ram = true; - ram_color = "c26693"; - # fps = true; - engine_color = "eb5b5b"; - gpu_color = "2e9762"; - wine_color = "eb5b5b"; - # frame_timing = "1"; - frametime_color = "00ff00"; - media_player_color = "ffffff"; - background_alpha = "0.8"; - font_size = "24"; + config.programs.mangohud = lib.mkIf cfg.enable { + enable = true; + enableSessionWide = true; + settings = { + full = true; + # histogram = true; + no_display = true; + fps_limit = "0,30,60,72,90,120,144,240,288,320"; + toggle_fps_limit = "Shift_R+F10"; + toggle_preset = "Control_R+F9"; + fps_metrics = "Control_R+F8"; - background_color = "020202"; - position = "top-left"; - # text_color = "ffffff"; - round_corners = "10"; - toggle_hud = "Shift_R+F12"; - # toggle_logging = "Shift_L+F12"; - # output_folder = "/home/lelgenio"; - }; + # legacy_layout = "false"; + # gpu_stats = true; + # gpu_temp = true; + # gpu_core_clock = true; + # gpu_mem_clock = true; + # gpu_power = true; + # gpu_load_change = true; + # gpu_load_value = "50,90"; + gpu_load_color = "FFFFFF,FFAA7F,CC0000"; + # gpu_text = "GPU"; + # cpu_stats = true; + # cpu_temp = true; + # cpu_power = true; + # cpu_mhz = true; + # cpu_load_change = true; + # core_load_change = true; + # cpu_load_value = "50,90"; + cpu_load_color = "FFFFFF,FFAA7F,CC0000"; + cpu_color = "2e97cb"; + # cpu_text = "CPU"; + # io_stats = true; + # io_read = true; + # io_write = true; + io_color = "a491d3"; + # swap = true; + # vram = true; + vram_color = "ad64c1"; + # ram = true; + ram_color = "c26693"; + # fps = true; + engine_color = "eb5b5b"; + gpu_color = "2e9762"; + wine_color = "eb5b5b"; + # frame_timing = "1"; + frametime_color = "00ff00"; + media_player_color = "ffffff"; + background_alpha = "0.8"; + font_size = "24"; + + background_color = "020202"; + position = "top-left"; + # text_color = "ffffff"; + round_corners = "10"; + toggle_hud = "Shift_R+F12"; + # toggle_logging = "Shift_L+F12"; + # output_folder = "/home/lelgenio"; }; }; } diff --git a/user/mpd.nix b/user/mpd.nix index f4cca16..b4bdad3 100644 --- a/user/mpd.nix +++ b/user/mpd.nix @@ -4,8 +4,13 @@ config, ... }: +let + cfg = config.my.mpd; +in { - config = lib.mkIf (config.my.desktop != "gnome") { + options.my.mpd.enable = lib.mkEnableOption { }; + + config = lib.mkIf cfg.enable { services.mpd = { enable = true; musicDirectory = config.home.homeDirectory + "/Música"; diff --git a/user/pass.nix b/user/pass.nix index 4a69d12..c3b56c6 100644 --- a/user/pass.nix +++ b/user/pass.nix @@ -2,11 +2,15 @@ config, pkgs, lib, - inputs, ... }: +let + cfg = config.my.pass; +in { - config = { + options.my.pass.enable = lib.mkEnableOption { }; + + config = lib.mkIf cfg.enable { programs.password-store = { enable = true; package = pkgs.pass.withExtensions ( diff --git a/user/sway/default.nix b/user/sway/default.nix index 2633c23..325cad5 100644 --- a/user/sway/default.nix +++ b/user/sway/default.nix @@ -5,13 +5,10 @@ ... }: let - inherit (config.my) - key - accent - font - theme - ; + inherit (config.my) accent font theme; inherit (theme) color; + + cfg = config.my.sway; in { imports = [ @@ -24,10 +21,17 @@ in ./swaylock.nix ./theme.nix ]; - config = lib.mkIf (config.my.desktop == "sway") { - services.mako.enable = true; - services.swayidle.enable = true; - services.kanshi.enable = true; + + options.my.sway.enable = lib.mkEnableOption { }; + + config = lib.mkIf cfg.enable { + my.mako.enable = true; + my.kanshi.enable = true; + my.swayidle.enable = true; + my.swaylock.enable = true; + my.mpd.enable = true; + my.zathura.enable = true; + my.waybar.enable = true; wayland.windowManager.sway = { enable = true; @@ -36,7 +40,7 @@ in bars = [ ]; floating.modifier = "Mod4"; - terminal = pkgs.alacritty.executable; + terminal = lib.getExe pkgs.alacritty; window.titlebar = false; gaps = { @@ -69,7 +73,7 @@ in }; output = { "*" = { - adaptive_sync = "off"; + adaptive_sync = "on"; bg = "${theme.background} fill"; mode = "1920x1080@144.000Hz"; }; @@ -132,7 +136,6 @@ in swaylock wdisplays - waybar dhist demoji bmenu diff --git a/user/sway/kanshi.nix b/user/sway/kanshi.nix index c0a584b..486a209 100644 --- a/user/sway/kanshi.nix +++ b/user/sway/kanshi.nix @@ -1,20 +1,12 @@ -{ - config, - pkgs, - lib, - ... -}: +{ config, lib, ... }: let - inherit (config.my) - key - accent - font - theme - ; - inherit (theme) color; + cfg = config.my.kanshi; in { - services.kanshi = { + options.my.kanshi.enable = lib.mkEnableOption { }; + + config.services.kanshi = lib.mkIf cfg.enable { + enable = true; settings = [ { profile = { diff --git a/user/sway/mako.nix b/user/sway/mako.nix index 4f43734..af6c673 100644 --- a/user/sway/mako.nix +++ b/user/sway/mako.nix @@ -6,60 +6,66 @@ }: let inherit (config.my) - key accent font theme ; inherit (theme) color; + + cfg = config.my.mako; in { - services.mako = { - borderSize = 2; - padding = "5"; - margin = "15"; - layer = "overlay"; + options.my.mako.enable = lib.mkEnableOption { }; - font = "${font.interface} ${toString font.size.small}"; - textColor = color.txt; + config = lib.mkIf cfg.enable { + services.mako = { + enable = true; + borderSize = 2; + padding = "5"; + margin = "15"; + layer = "overlay"; - backgroundColor = color.bg; - borderColor = accent.color; - progressColor = "over ${accent.color}88"; + font = "${font.interface} ${toString font.size.small}"; + textColor = color.txt; - defaultTimeout = 10000; + backgroundColor = color.bg; + borderColor = accent.color; + progressColor = "over ${accent.color}88"; - extraConfig = '' - [app-name=volumesh] - default-timeout=5000 - group-by=app-name - format=%s\n%b - ''; + defaultTimeout = 10000; - # # {{@@ header() @@}} - # # text + extraConfig = '' + [app-name=volumesh] + default-timeout=5000 + group-by=app-name + format=%s\n%b + ''; - # # features - # icons=1 - # markup=1 - # actions=1 - # default-timeout=10000 + # # {{@@ header() @@}} + # # text - # # position - # layer=overlay - }; - systemd.user.services.mako = lib.mkIf (config.services.mako.enable) { - Unit = { - Description = "Notification daemon"; - PartOf = [ "graphical-session.target" ]; - After = [ "graphical-session.target" ]; + # # features + # icons=1 + # markup=1 + # actions=1 + # default-timeout=10000 + + # # position + # layer=overlay }; - Service = { - ExecStart = "${pkgs.mako}/bin/mako"; - Restart = "on-failure"; - }; - Install = { - WantedBy = [ "sway-session.target" ]; + systemd.user.services.mako = lib.mkIf (config.services.mako.enable) { + Unit = { + Description = "Notification daemon"; + PartOf = [ "graphical-session.target" ]; + After = [ "graphical-session.target" ]; + }; + Service = { + ExecStart = "${pkgs.mako}/bin/mako"; + Restart = "on-failure"; + }; + Install = { + WantedBy = [ "sway-session.target" ]; + }; }; }; } diff --git a/user/sway/swayidle.nix b/user/sway/swayidle.nix index 2c5384f..b6541f3 100644 --- a/user/sway/swayidle.nix +++ b/user/sway/swayidle.nix @@ -5,18 +5,15 @@ ... }: let - inherit (config.my) - key - accent - font - theme - ; - inherit (theme) color; - asScript = filename: text: toString (pkgs.writeShellScript filename text); + + cfg = config.my.swayidle; in { - services.swayidle = { + options.my.swayidle.enable = lib.mkEnableOption { }; + + config.services.swayidle = { + enable = cfg.enable; timeouts = [ { timeout = 360; diff --git a/user/sway/swaylock.nix b/user/sway/swaylock.nix index e46b5d9..8d0a195 100644 --- a/user/sway/swaylock.nix +++ b/user/sway/swaylock.nix @@ -1,20 +1,14 @@ -{ - config, - pkgs, - lib, - ... -}: +{ config, lib, ... }: let - inherit (config.my) - key - accent - font - theme - ; + inherit (config.my) accent font theme; inherit (theme) color; + + cfg = config.my.swaylock; in { - programs.swaylock.settings = { + options.my.swaylock.enable = lib.mkEnableOption { }; + + config.programs.swaylock.settings = lib.mkIf cfg.enable { image = toString theme.background; font = font.interface; font-size = font.size.medium; diff --git a/user/waybar/default.nix b/user/waybar/default.nix index b36dfce..fc95ff1 100644 --- a/user/waybar/default.nix +++ b/user/waybar/default.nix @@ -14,9 +14,13 @@ let font ; inherit (theme) color; + + cfg = config.my.waybar; in { - config = { + options.my.waybar.enable = lib.mkEnableOption { }; + + config = lib.mkIf cfg.enable { programs.waybar = { enable = true; systemd.enable = true; diff --git a/user/zathura.nix b/user/zathura.nix index 70e1c23..ae8e003 100644 --- a/user/zathura.nix +++ b/user/zathura.nix @@ -1,10 +1,4 @@ -{ - config, - pkgs, - lib, - font, - ... -}: +{ config, lib, ... }: let inherit (config.my) key @@ -13,56 +7,62 @@ let theme ; inherit (theme) color; + + cfg = config.my.zathura; in { - config = { - programs.zathura.enable = true; - programs.zathura.options = { - font = "${font.mono} ${toString font.size.small}"; - guioptions = "s"; + options.my.zathura.enable = lib.mkEnableOption { }; - selection-clipboard = "clipboard"; + config = lib.mkIf cfg.enable { + programs.zathura = { + enable = true; + options = { + font = "${font.mono} ${toString font.size.small}"; + guioptions = "s"; - recolor = true; - # Turn images grayscale, so they don't look weird - recolor-keephue = false; - recolor-lightcolor = "rgba(0,0,0,0)"; - recolor-darkcolor = color.txt; + selection-clipboard = "clipboard"; - default-bg = color.bg_dark; + recolor = true; + # Turn images grayscale, so they don't look weird + recolor-keephue = false; + recolor-lightcolor = "rgba(0,0,0,0)"; + recolor-darkcolor = color.txt; - inputbar-bg = color.bg_dark; - inputbar-fg = color.txt; + default-bg = color.bg_dark; - statusbar-bg = color.bg; - statusbar-fg = color.txt; + inputbar-bg = color.bg_dark; + inputbar-fg = color.txt; - completion-bg = color.bg; - completion-fg = color.txt; + statusbar-bg = color.bg; + statusbar-fg = color.txt; - completion-group-bg = color.bg_dark; - completion-group-fg = color.txt; + completion-bg = color.bg; + completion-fg = color.txt; - completion-highlight-bg = accent.color; - completion-highlight-fg = accent.fg; + completion-group-bg = color.bg_dark; + completion-group-fg = color.txt; - index-active-bg = accent.color; - index-active-fg = accent.fg; - }; - programs.zathura.mappings = { - "" = "toggle_statusbar"; - ${key.left} = "scroll left"; - ${key.down} = "scroll down"; - ${key.up} = "scroll up"; - ${key.right} = "scroll right"; - "[index] ${key.left}" = "navigate_index collapse"; - "[index] ${key.down}" = "navigate_index down"; - "[index] ${key.up}" = "navigate_index up"; - "[index] ${key.right}" = "navigate_index expand"; - ${lib.toUpper key.down} = "navigate next"; - ${lib.toUpper key.up} = "navigate previous"; - ${key.next} = "search forward"; - ${lib.toUpper key.next} = "search backward"; + completion-highlight-bg = accent.color; + completion-highlight-fg = accent.fg; + + index-active-bg = accent.color; + index-active-fg = accent.fg; + }; + mappings = { + "" = "toggle_statusbar"; + ${key.left} = "scroll left"; + ${key.down} = "scroll down"; + ${key.up} = "scroll up"; + ${key.right} = "scroll right"; + "[index] ${key.left}" = "navigate_index collapse"; + "[index] ${key.down}" = "navigate_index down"; + "[index] ${key.up}" = "navigate_index up"; + "[index] ${key.right}" = "navigate_index expand"; + ${lib.toUpper key.down} = "navigate next"; + ${lib.toUpper key.up} = "navigate previous"; + ${key.next} = "search forward"; + ${lib.toUpper key.next} = "search backward"; + }; }; }; } From 212c586c5c2107e15c950315e9ddec3e368116b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Tue, 25 Feb 2025 23:20:46 -0300 Subject: [PATCH 335/404] update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 5a3f325..f62cca1 100644 --- a/flake.lock +++ b/flake.lock @@ -209,11 +209,11 @@ ] }, "locked": { - "lastModified": 1739841949, - "narHash": "sha256-lSOXdgW/1zi/SSu7xp71v+55D5Egz8ACv0STkj7fhbs=", + "lastModified": 1740485968, + "narHash": "sha256-WK+PZHbfDjLyveXAxpnrfagiFgZWaTJglewBWniTn2Y=", "owner": "nix-community", "repo": "disko", - "rev": "15dbf8cebd8e2655a883b74547108e089f051bf0", + "rev": "19c1140419c4f1cdf88ad4c1cfb6605597628940", "type": "github" }, "original": { @@ -481,11 +481,11 @@ ] }, "locked": { - "lastModified": 1739676768, - "narHash": "sha256-U1HQ7nzhJyVVXUgjU028UCkbLQLEIkg42+G7iIiBmlU=", + "lastModified": 1740281615, + "narHash": "sha256-dZWcbAQ1sF8oVv+zjSKkPVY0ebwENQEkz5vc6muXbKY=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "ae15068e79e22b76c344f0d7f8aed1bb1c5b0b63", + "rev": "465792533d03e6bb9dc849d58ab9d5e31fac9023", "type": "github" }, "original": { @@ -504,11 +504,11 @@ "nixpkgs-24_11": "nixpkgs-24_11" }, "locked": { - "lastModified": 1739121270, - "narHash": "sha256-EmJhpy9U8sVlepl2QPjG019VfG67HcucsQNItTqW6cA=", + "lastModified": 1740437053, + "narHash": "sha256-exPTta4qI1ka9sk+jPcLogGffJ1OVXnAsTRqpeAXeNw=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "8c1c4640b878c692dd3d8055e8cdea0a2bbd8cf3", + "rev": "c8ec4d5e432f5df4838eacd39c11828d23ce66ec", "type": "gitlab" }, "original": { @@ -551,11 +551,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1739736696, - "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=", + "lastModified": 1740367490, + "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f", + "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", "type": "github" }, "original": { @@ -612,11 +612,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1739758141, - "narHash": "sha256-uq6A2L7o1/tR6VfmYhZWoVAwb3gTy7j4Jx30MIrH0rE=", + "lastModified": 1740339700, + "narHash": "sha256-cbrw7EgQhcdFnu6iS3vane53bEagZQy/xyIkDWpCgVE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c618e28f70257593de75a7044438efc1c1fc0791", + "rev": "04ef94c4c1582fd485bbfdb8c4a8ba250e359195", "type": "github" }, "original": { @@ -937,11 +937,11 @@ }, "vpsadminos": { "locked": { - "lastModified": 1739153939, - "narHash": "sha256-7z+4SMs1uD/mCruBasPeWeq1DGzzgACRHOSdLE+mHRk=", + "lastModified": 1740082937, + "narHash": "sha256-HcTWGIzG2leM0gZabg9lkY7iLwvAe49lqXEzez/Rp/s=", "owner": "vpsfreecz", "repo": "vpsadminos", - "rev": "939254840fcd72bdd3cd52186171815c3f25403b", + "rev": "521427c69173bc443de940ba88d4f58d5fa8d8e2", "type": "github" }, "original": { From b5e6127bb365913eb8f34812759b783aa422aed1 Mon Sep 17 00:00:00 2001 From: lelgenio Date: Wed, 19 Feb 2025 17:04:03 -0300 Subject: [PATCH 336/404] rainbow: remove gitlab runner --- flake.nix | 1 - secrets/secrets.nix | 3 --- system/rainbow-gitlab-runner.nix | 22 ---------------------- system/secrets.nix | 1 - 4 files changed, 27 deletions(-) delete mode 100644 system/rainbow-gitlab-runner.nix diff --git a/flake.nix b/flake.nix index 0126f65..636724e 100644 --- a/flake.nix +++ b/flake.nix @@ -147,7 +147,6 @@ inherit system specialArgs; modules = [ ./hosts/double-rainbow.nix - ./system/rainbow-gitlab-runner.nix ] ++ common_modules; }; pixie = lib.nixosSystem { diff --git a/secrets/secrets.nix b/secrets/secrets.nix index f64fb4b..6504054 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -2,9 +2,6 @@ let main_ssh_public_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxR/w+38b2lX90yNBqhq3mUmkn1WGu6GAPhN1tVp2ZjYRJNV/+5gWCnTtOWYtDx35HmK/spQ2Qy8X9ttkzORa24fysNx1Iqn/TiXhD7eIJjbGPnrOpIKTkW5/uB3SD/P5NBSa06//BaqJU4sBlG79hoXRpod052hQtdpTVDiMCIV+iboWPKqopmJJfWdBtVnHXs9rep0htPRExxGslImFk7Z6xjcaHyCpIQZPlOGf+sGsmUU7jRqzvZFV8ucIdbnAlMHrU4pepNFhuraESyZVTa/bi9sw0iozXp5Q5+5thMebEslmT1Z771kI4sieDy+O4r8c0Sx2/VY1UAzcpq1faggc3YB01MTh+tiEC6xdMvZLrQGL1NBWjHleMyL53GU5ERluC0vXJF3Hv3BGGBDfXWbrEm5n06DHr2apRVJGC0LwiQ7Woud1X4V4X1pKSusxCVMjT2lmcOwV6YhKhB2sowJc1OdMx4+tL0UWE+YKSZgBHfolwk6ml0F4EO9nnUHc= lelgenio@i15"; in { - "rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.age".publicKeys = [ - main_ssh_public_key - ]; "monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.age".publicKeys = [ main_ssh_public_key ]; diff --git a/system/rainbow-gitlab-runner.nix b/system/rainbow-gitlab-runner.nix deleted file mode 100644 index 52e573a..0000000 --- a/system/rainbow-gitlab-runner.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: -let - inherit (pkgs.callPackage ./gitlab-runner.nix { }) mkNixRunner; -in -{ - boot.kernel.sysctl."net.ipv4.ip_forward" = true; - virtualisation.docker.enable = true; - services.gitlab-runner = { - enable = true; - settings.concurrent = 6; - services = { - thoreb-telemetria-nix = mkNixRunner config.age.secrets.gitlab-runner-thoreb-telemetria-registrationConfigFile.path; - thoreb-itinerario-nix = mkNixRunner config.age.secrets.rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.path; - }; - }; - systemd.services.gitlab-runner.serviceConfig.Nice = 10; -} diff --git a/system/secrets.nix b/system/secrets.nix index ca11fb4..fdf14e8 100644 --- a/system/secrets.nix +++ b/system/secrets.nix @@ -6,7 +6,6 @@ secrets.monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.file = ../secrets/monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.age; secrets.gitlab-runner-thoreb-telemetria-registrationConfigFile.file = ../secrets/gitlab-runner-thoreb-telemetria-registrationConfigFile.age; secrets.monolith-forgejo-runner-token.file = ../secrets/monolith-forgejo-runner-token.age; - secrets.rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.file = ../secrets/rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.age; secrets.monolith-nix-serve-privkey.file = ../secrets/monolith-nix-serve-privkey.age; secrets.phantom-forgejo-mailer-password.file = ../secrets/phantom-forgejo-mailer-password.age; }; From 00c686512c2d724d1a2f9632b361bd12a0dd6518 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 28 Feb 2025 17:58:29 -0300 Subject: [PATCH 337/404] gaming: add corectrl --- hosts/monolith/amdgpu.nix | 1 - system/gaming.nix | 8 ++++++++ user/sway/default.nix | 1 - 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/hosts/monolith/amdgpu.nix b/hosts/monolith/amdgpu.nix index 4c26afa..765e081 100644 --- a/hosts/monolith/amdgpu.nix +++ b/hosts/monolith/amdgpu.nix @@ -14,7 +14,6 @@ in boot.initrd.kernelModules = [ "amdgpu" ]; boot.kernelParams = [ "video=DP-1:1920x1080@144" - "amdgpu.ppfeaturemask=0xfffd7fff" # enable undervolting ]; systemd.services.amd-fan-control = { diff --git a/system/gaming.nix b/system/gaming.nix index e32c640..e79353e 100644 --- a/system/gaming.nix +++ b/system/gaming.nix @@ -59,5 +59,13 @@ }; }; }; + + programs.corectrl = { + enable = true; + gpuOverclock = { + enable = true; + ppfeaturemask = "0xffffffff"; + }; + }; }; } diff --git a/user/sway/default.nix b/user/sway/default.nix index 325cad5..04193aa 100644 --- a/user/sway/default.nix +++ b/user/sway/default.nix @@ -113,7 +113,6 @@ in for_window [title=.*] inhibit_idle fullscreen exec swaymsg workspace 2 exec_always systemctl --user restart waybar.service - exec corectrl --minimize-systray ''; }; services.gammastep = { From 57f6eb38348f0581e2b493631884c0e6563f1f11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 1 Mar 2025 12:11:18 -0300 Subject: [PATCH 338/404] update --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index f62cca1..573ab5e 100644 --- a/flake.lock +++ b/flake.lock @@ -551,11 +551,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1740367490, - "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", + "lastModified": 1740560979, + "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", + "rev": "5135c59491985879812717f4c9fea69604e7f26f", "type": "github" }, "original": { @@ -612,11 +612,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1740339700, - "narHash": "sha256-cbrw7EgQhcdFnu6iS3vane53bEagZQy/xyIkDWpCgVE=", + "lastModified": 1740603184, + "narHash": "sha256-t+VaahjQAWyA+Ctn2idyo1yxRIYpaDxMgHkgCNiMJa4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "04ef94c4c1582fd485bbfdb8c4a8ba250e359195", + "rev": "f44bd8ca21e026135061a0a57dcf3d0775b67a49", "type": "github" }, "original": { @@ -937,11 +937,11 @@ }, "vpsadminos": { "locked": { - "lastModified": 1740082937, - "narHash": "sha256-HcTWGIzG2leM0gZabg9lkY7iLwvAe49lqXEzez/Rp/s=", + "lastModified": 1740754923, + "narHash": "sha256-o7Qo5kkjVgBL9CVqNJKnkcDbRkpD0UAp82G/mJ086Xw=", "owner": "vpsfreecz", "repo": "vpsadminos", - "rev": "521427c69173bc443de940ba88d4f58d5fa8d8e2", + "rev": "3a9df8fbe84b680ad0a38ec85e8e9c8a4f095ca3", "type": "github" }, "original": { From 9fd65b02bae1adf71deb7b8c9cdbaeda1db3596e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 1 Mar 2025 12:11:23 -0300 Subject: [PATCH 339/404] factorio: update --- pkgs/factorio-headless/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/factorio-headless/default.nix b/pkgs/factorio-headless/default.nix index 2aaaba4..531e69b 100644 --- a/pkgs/factorio-headless/default.nix +++ b/pkgs/factorio-headless/default.nix @@ -1,10 +1,10 @@ { factorio-headless, pkgs }: factorio-headless.overrideAttrs (_: rec { - version = "2.0.28"; + version = "2.0.32"; src = pkgs.fetchurl { name = "factorio_headless_x64-${version}.tar.xz"; url = "https://www.factorio.com/get-download/${version}/headless/linux64"; - hash = "sha256-6pk3tq3HoY4XpOHmSZLsOJQHSXs25oKAuxT83UyITdM="; + hash = "sha256-KmECrkLcxej+kjvWi80yalaeNZEqzeEhMB5dTS2FZBc="; }; }) From 553ea251faa56dd49ed37e40e81788c3d499f9a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 5 Mar 2025 14:53:07 -0300 Subject: [PATCH 340/404] secrets: add sops --- .sops.yaml | 18 ++++++++++ flake.lock | 21 ++++++++++++ flake.nix | 7 ++++ hosts/phantom/default.nix | 13 ++++++++ secrets/phantom/default.yaml | 30 +++++++++++++++++ secrets/test.yaml | 65 ++++++++++++++++++++++++++++++++++++ system/configuration.nix | 10 +++++- system/secrets.nix | 2 +- system/sops.nix | 12 +++++++ 9 files changed, 176 insertions(+), 2 deletions(-) create mode 100644 .sops.yaml create mode 100644 secrets/phantom/default.yaml create mode 100644 secrets/test.yaml create mode 100644 system/sops.nix diff --git a/.sops.yaml b/.sops.yaml new file mode 100644 index 0000000..699e3c1 --- /dev/null +++ b/.sops.yaml @@ -0,0 +1,18 @@ +keys: + - &lelgenio-gpg 0FECE8316E74BA6F44EFC21A2F8F21CE8721456B + - &lelgenio-ssh ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxR/w+38b2lX90yNBqhq3mUmkn1WGu6GAPhN1tVp2ZjYRJNV/+5gWCnTtOWYtDx35HmK/spQ2Qy8X9ttkzORa24fysNx1Iqn/TiXhD7eIJjbGPnrOpIKTkW5/uB3SD/P5NBSa06//BaqJU4sBlG79hoXRpod052hQtdpTVDiMCIV+iboWPKqopmJJfWdBtVnHXs9rep0htPRExxGslImFk7Z6xjcaHyCpIQZPlOGf+sGsmUU7jRqzvZFV8ucIdbnAlMHrU4pepNFhuraESyZVTa/bi9sw0iozXp5Q5+5thMebEslmT1Z771kI4sieDy+O4r8c0Sx2/VY1UAzcpq1faggc3YB01MTh+tiEC6xdMvZLrQGL1NBWjHleMyL53GU5ERluC0vXJF3Hv3BGGBDfXWbrEm5n06DHr2apRVJGC0LwiQ7Woud1X4V4X1pKSusxCVMjT2lmcOwV6YhKhB2sowJc1OdMx4+tL0UWE+YKSZgBHfolwk6ml0F4EO9nnUHc= lelgenio@i15 + - &monolith-ssh age1ecyynwv93lfu7crjjp8l47defv07quzfzaktwurpep7jc9eha5pscg7lrw + - &phantom-ssh age1m4mqcd2kmuhfr8a22rvh02c68jkakhdfmuqgtusuv0czk4jvna7sz79p3y + +creation_rules: + - path_regex: secrets/[^/]+\.(yaml|json|env|ini)$ + key_groups: + - pgp: + - *lelgenio-gpg + age: + - *lelgenio-ssh + - *monolith-ssh + - path_regex: secrets/phantom/[^/]+\.(yaml|json|env|ini)$ + key_groups: + - age: + - *phantom-ssh diff --git a/flake.lock b/flake.lock index 573ab5e..cabf4cf 100644 --- a/flake.lock +++ b/flake.lock @@ -722,6 +722,7 @@ "nixpkgs-unstable": "nixpkgs-unstable", "plymouth-themes": "plymouth-themes", "ranger-icons": "ranger-icons", + "sops-nix": "sops-nix", "tlauncher": "tlauncher", "tomater": "tomater", "treefmt-nix": "treefmt-nix", @@ -775,6 +776,26 @@ "type": "github" } }, + "sops-nix": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1741043164, + "narHash": "sha256-9lfmSZLz6eq9Ygr6cCmvQiiBEaPb54pUBcjvbEMPORc=", + "owner": "Mic92", + "repo": "sops-nix", + "rev": "3f2412536eeece783f0d0ad3861417f347219f4d", + "type": "github" + }, + "original": { + "owner": "Mic92", + "repo": "sops-nix", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, diff --git a/flake.nix b/flake.nix index 636724e..90ef37e 100644 --- a/flake.nix +++ b/flake.nix @@ -26,6 +26,11 @@ inputs.home-manager.follows = "home-manager"; }; + sops-nix = { + url = "github:Mic92/sops-nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nixos-mailserver = { url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master"; inputs.nixpkgs.follows = "nixpkgs"; @@ -96,10 +101,12 @@ { nixpkgs.pkgs = pkgs; } ./system/configuration.nix ./system/secrets.nix + ./system/sops.nix ./system/greetd.nix { login-manager.greetd.enable = desktop == "sway"; } inputs.agenix.nixosModules.default + inputs.sops-nix.nixosModules.default inputs.home-manager.nixosModules.home-manager inputs.disko.nixosModules.disko ( diff --git a/hosts/phantom/default.nix b/hosts/phantom/default.nix index 45c27d7..9111434 100644 --- a/hosts/phantom/default.nix +++ b/hosts/phantom/default.nix @@ -2,12 +2,16 @@ config, pkgs, inputs, + lib, ... }: { imports = [ inputs.vpsadminos.nixosConfigurations.container inputs.agenix.nixosModules.default + inputs.sops-nix.nixosModules.default + + ../../system/sops.nix ../../system/nix.nix ./hardware-config.nix ./mastodon.nix @@ -57,6 +61,15 @@ identityPaths = [ "/root/.ssh/id_rsa" ]; }; + sops = { + secrets.hello = { }; + defaultSopsFile = lib.mkForce ../../secrets/phantom/default.yaml; + }; + + environment.etc."teste-sops" = { + text = config.sops.secrets.hello.path; + }; + virtualisation.docker = { enable = true; daemon.settings = { diff --git a/secrets/phantom/default.yaml b/secrets/phantom/default.yaml new file mode 100644 index 0000000..a299b34 --- /dev/null +++ b/secrets/phantom/default.yaml @@ -0,0 +1,30 @@ +hello: ENC[AES256_GCM,data:UJAAdOL7wzQ1LduTyW+XK2NtXyw/u/Yz28Bmd7OoBe41FVLKwVfvdI1nAwYuNQ==,iv:7kPT2HF5T498bUJ9hUlz5Ez/jn1g7YIUVbJOTW/CHhQ=,tag:KJhJPg8AStyW4roEbEUJ2g==,type:str] +example_key: ENC[AES256_GCM,data:DcLN+C1BQ6WZg5fRiA==,iv:JC3GTWn4a4RekAHdOQB3YV5+eGa4cUK1JjyTPe8eNHY=,tag:W9CV4rsgHuXyqpWpUxlIQg==,type:str] +#ENC[AES256_GCM,data:RjdYJNz6qGfbsU/AiBeLlQ==,iv:LjRzSjBXp44cGSqUUfRDNLC9cW4Vd7lfsqDWINt31VA=,tag:NzVm1h9CVKE2XXt300aR/g==,type:comment] +example_array: + - ENC[AES256_GCM,data:K9j/t8MDibYO8Frhu1M=,iv:YnrxRnJJwTH6DJC6Bv/d1NUnX2ZPFwsjoji7L1Z+d7s=,tag:Dm7xCUlnjKdXHCuk8lwY8w==,type:str] + - ENC[AES256_GCM,data:0g6ACJzEHBtukwQYYTY=,iv:xLBJWfOYkX7Y28N01CX2+d5QOr9VGAhInH6pa1hNSGE=,tag:tCkCigo4yhi6YKVMe3Z3lQ==,type:str] +example_number: ENC[AES256_GCM,data:R+/m/QVBH9/3DA==,iv:FumBUj97ICrRQmyh5fg8Gu9Lba9oITD1pdsr1I/PCf0=,tag:hguw1gpPI3w64fG1WLnJqA==,type:float] +example_booleans: + - ENC[AES256_GCM,data:VvI5ag==,iv:koMzyWcua75sK19vuk65oywCD61lMyH3xUwue8LTqy4=,tag:2ym1M0FTwevLm7wefTUWAw==,type:bool] + - ENC[AES256_GCM,data:lFEC/S8=,iv:cJWbnmseP/AqJzyORM+VI5y7rK8axVeh7EXoLP7mT/Q=,tag:BaS5HyecokdLCq+LzQxGkg==,type:bool] +sops: + kms: [] + gcp_kms: [] + azure_kv: [] + hc_vault: [] + age: + - recipient: age1m4mqcd2kmuhfr8a22rvh02c68jkakhdfmuqgtusuv0czk4jvna7sz79p3y + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxQkRWWmYweUNpcDRNbzRW + NnQ4R3JPK0oydm9iL0owS0d6Nm92eTFJZldFCnZpUVUvWi9FYTBDSGNvUUJRZHNz + QStPT0hCc08xUmh4dEdJdmVPRm01V2cKLS0tIEZPMmNKdGUvNnVWYXZNTHA3SkE3 + ZTNJbW9EWktPb2M5TVBNekUrZXVoUFkKLEsQVYVp7fTBRDA7RO8Kjpc5MUPb5U7I + WKZtNhsMZsP+SLgZWBF1PpvcjlDlNA2Z+Hqsrw6vsq6DYpnxToxfZQ== + -----END AGE ENCRYPTED FILE----- + lastmodified: "2025-03-05T22:27:18Z" + mac: ENC[AES256_GCM,data:WSopSnWZ+uOllywd7difaZtJcfxkL7eIf9Kr3GajZKO0+rP6pEHIS+5AbXZy6oKRlCLUPecY/WXFvk3//akpvvXHbf6Jp4fQ/YSuTcYKRQupbDBpOXSlc33QyRl6oEyiMOjxMxa2N2tmq8dmA0NbF9wSDMa5a4eNDoiL5T/sUZ8=,iv:QqbVRApzFF6q24rk8KfKuthj656nEczD9Si4INj+N9A=,tag:tMRNYo+u/jIQ6iX3KqKJdA==,type:str] + pgp: [] + unencrypted_suffix: _unencrypted + version: 3.9.4-unstable diff --git a/secrets/test.yaml b/secrets/test.yaml new file mode 100644 index 0000000..a2a8ee9 --- /dev/null +++ b/secrets/test.yaml @@ -0,0 +1,65 @@ +hello: ENC[AES256_GCM,data:ADXdQUkrnh9lDrsHyInYsPBo21u/mIAH47KhGQsxuz5OshT6CoK+89CILEi9tQ==,iv:b/rnM77z69+pVO3kxQZxI2YzTCRiBwwO5fhcwCB2/CI=,tag:A0FOXIfgIkJawV3QhlJPWQ==,type:str] +example_key: ENC[AES256_GCM,data:gXXl6hhdYNLC1Grmyw==,iv:miSL7Wdewd5zs4A86/r8OW6gK+PGZJ+gaqZRHHxvZos=,tag:Ty+IaoXdMSEThNPRjwhqTA==,type:str] +#ENC[AES256_GCM,data:FLhydTaiOqLRFk+ZrgGx9Q==,iv:TqhX2ylJKFQjdOpmwCER1+gRe4iR+I0hkVkNnYH4ESo=,tag:1BSk9TKqTma4MVUMswwmog==,type:comment] +example_array: + - ENC[AES256_GCM,data:1sIEL3xGDAygUKoodBA=,iv:1DumVv8vDvhT/K0jXM1vHdrFTE7dIxqqjS8CIpWdnc8=,tag:WSs+3a816zVOaGCTElxgFQ==,type:str] + - ENC[AES256_GCM,data:tFi1czQnVgX/nlWrJrs=,iv:isH65ldilVe3EjsKNP/dOKgtWZtHQPw364fPHBI+LEw=,tag:Ka5ywriFptKg3+lIHPEIyA==,type:str] +example_number: ENC[AES256_GCM,data:sxSM8a9oAp+u6g==,iv:KRLfIxZuBsnK+QE4mqm3pyhJmE7Fsd4ykJA++KrOnEQ=,tag:F5EkVUzw06ulr5jZvlTJdg==,type:float] +example_booleans: + - ENC[AES256_GCM,data:PDts2Q==,iv:qtfKg5gmUw2aERJe3gfT15Pk7mWocXwKdJhAzSic1o0=,tag:gn1sWsgt9ihYF8bHAkAQwQ==,type:bool] + - ENC[AES256_GCM,data:o9as7T0=,iv:YXyTB2X9PmTsOd37+BAp2xnT/+Yzyajcn5y1GE1O5rE=,tag:hyXA43jpyAbgH2hg1ivloQ==,type:bool] +sops: + shamir_threshold: 1 + kms: [] + gcp_kms: [] + azure_kv: [] + hc_vault: [] + age: + - recipient: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxR/w+38b2lX90yNBqhq3mUmkn1WGu6GAPhN1tVp2ZjYRJNV/+5gWCnTtOWYtDx35HmK/spQ2Qy8X9ttkzORa24fysNx1Iqn/TiXhD7eIJjbGPnrOpIKTkW5/uB3SD/P5NBSa06//BaqJU4sBlG79hoXRpod052hQtdpTVDiMCIV+iboWPKqopmJJfWdBtVnHXs9rep0htPRExxGslImFk7Z6xjcaHyCpIQZPlOGf+sGsmUU7jRqzvZFV8ucIdbnAlMHrU4pepNFhuraESyZVTa/bi9sw0iozXp5Q5+5thMebEslmT1Z771kI4sieDy+O4r8c0Sx2/VY1UAzcpq1faggc3YB01MTh+tiEC6xdMvZLrQGL1NBWjHleMyL53GU5ERluC0vXJF3Hv3BGGBDfXWbrEm5n06DHr2apRVJGC0LwiQ7Woud1X4V4X1pKSusxCVMjT2lmcOwV6YhKhB2sowJc1OdMx4+tL0UWE+YKSZgBHfolwk6ml0F4EO9nnUHc= lelgenio@i15 + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1yc2EgQnd3eEhnCm4zQnZFV2hJ + cFR0Z0hGeFlQd1Rtb2dDUDRJOVc3dmtWT3FIa2xOV0hRREE4LzVKQ01FTHd6M3kz + M0JLeEtXTXoKZkhnMTNETnZVc2tEbU84NWlGWk5YaUg5NjJDdk9yb01QMTVCOHlh + SDE3c0c0dUV3bXQ4MjAxYWJjYUFscmlORwplOFZLc1JzUzdjU0lCZGUyQWl4b3d0 + L3hmekNSUUZia2FOR0k3TWcyQm9xZytCakFpSGRidEJUZHQzaC9sVlppCmJBSnl0 + VW9Tb2hRME9MdmFlcUw5Z3MyV0k3V1FKQTNQZ3M0UTRLK0FvL3NOUTZ3RDBQY0M5 + UHdnLzU3VkFCME0KWTV4c29NbmIvLzl3WXJvMkhnT1gwTTBRNzV3RVVnRTdiMkpn + WmVWanB5VFpnTmhQMWRibXc4VGdhblAwWkQ1WQo0YnFjcnpnYTZITnVueTlZYzhW + OGs3MmlPcmhtaWZoU3h1T3FkbmpoMFFUN0UwQ1FDTGs5L1hGUHdJbmU5Q3haCjJG + bXAyd1lycGhELzY4ZWR2cEtmcWt4NnhXcjIyREw3cTR5d3ZoQlZySlg4Z2lwRmQ1 + cEF1VGthTkV0ekg4M2UKZS9aN0IxazdjUWhUMnBFSmYrOEdYQWdocWtQcFhtYlpN + M3FyTDdMSmpESncydnFFd3lTcE1FMEg5a1ZoTXVIRgoKLS0tIEsvb090WDRBZFdV + dFRUUms3S0J2b201OExwTy9DZERhZVlqVEdtaThkTE0KFT1RB8s+hEOJk7XGjSak + 34qTDcoBnaF0jPZ5Z0HsUx84G4Nu5teRVeHgVKyC7Iv7Gi9TkYtsdgM+q/3rdSvn + aA== + -----END AGE ENCRYPTED FILE----- + - recipient: age1ecyynwv93lfu7crjjp8l47defv07quzfzaktwurpep7jc9eha5pscg7lrw + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5eVFsWHZZYkNrdjNraW5q + OTdmbWF6Tm02elk3NGt0TGQ3ZUoxaHp3VGdBCnVqSDRIMlRSOXdTSER2U0tDcjR1 + Tk5FcURQOW90bENWL2Nyck1CU3RBR1UKLS0tIFRZZzlNNWRtUkJmVzBHWTA3L21K + VCsyS0x4Rk83eC9UTHJvM1NJZG9DbTQKbGp6n/45qGA3rgmdxUJQKZdA1zen5kfZ + pXnExsrIhfPDx0oE2jIWGW0N8cizkCJA4k7ROGu56GqIqga9h55VTw== + -----END AGE ENCRYPTED FILE----- + lastmodified: "2025-03-05T21:02:24Z" + mac: ENC[AES256_GCM,data:QfyrJrLERhs14KnuBJ0eCEUqKIBwhmQHROflBAArGlPmyVZU6KLvvOOANv+PJWk9Kt9yPU9Avwt6/e2q0jq9u2OUrvxHbqF4SWvkwhvSoSD3EOe27NGPjDLkVHOdszObo/fT8xglvc6LY8NqL9dXnUoLl58IrY7SE18F7EjrYuE=,iv:rjonQvZQjsr0oC5p3pjh1FAH/7B8SnHpAQ/qFxxfhQs=,tag:/DgHviNrSIzLyjj6ndwY0w==,type:str] + pgp: + - created_at: "2025-03-05T21:28:21Z" + enc: |- + -----BEGIN PGP MESSAGE----- + + hQEMAzy6JxafzLr5AQf/aiSW1yeJJ3VLiJ6I+vafWPVe702+6IstICKNdTz4AFgo + 2yUkY/alpgkcH1ybAiRQK0lOs63NBL51Pe2XsKAWXTlHVgFU0B6e+7YoDuwPWnTP + dyTASd+++EAbf0l7bIVQbx28Ib5F5DZyB1VMhhGAZXQqURJGQpLrSqzaoMFPGodg + V7whjtOaEmtFKNhNeRIdrnTW2raeKO0J3mQ5nawCekeIHnx22NxCIbhBMsKpF8EH + 3SZSCNiGrrfbLZFHcM/P5N5qEPc53r9Zvpxcwc8NayIS3kUPwLqKmvhCbRW3WOr0 + 2fc8TQgHTWEYSRSYIVw5vPHWs4+3T4cjdGb0atJ4rtJeAUnGlwchAvxLfFFG096r + SDdiJBBZ03r31EJqnplNwwitKyR4jj+HaM/CNmtSFo7c99iA91A7C1PBri+NpuCK + Fr0JVEom4Fm9WY7BMPduiLN77XLB0aaYN7zu7pwdYA== + =4URT + -----END PGP MESSAGE----- + fp: 0FECE8316E74BA6F44EFC21A2F8F21CE8721456B + unencrypted_suffix: _unencrypted + version: 3.9.4 diff --git a/system/configuration.nix b/system/configuration.nix index a227e36..11f327e 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -1,7 +1,7 @@ # Edit this configuration file to define what should be installed on # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ pkgs, ... }: +{ pkgs, config, ... }: { imports = [ ./android.nix @@ -29,6 +29,14 @@ zramSwap.enable = true; + sops = { + secrets.hello = { }; + }; + + environment.etc."teste-sops" = { + text = config.sops.secrets.hello.path; + }; + # Enable touchpad support (enabled default in most desktopManager). services.libinput.enable = true; diff --git a/system/secrets.nix b/system/secrets.nix index fdf14e8..588dfe4 100644 --- a/system/secrets.nix +++ b/system/secrets.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, config, ... }: { age = { identityPaths = [ "/root/.ssh/id_rsa" ]; diff --git a/system/sops.nix b/system/sops.nix new file mode 100644 index 0000000..673d1c1 --- /dev/null +++ b/system/sops.nix @@ -0,0 +1,12 @@ +{ pkgs, ... }: +{ + environment.systemPackages = with pkgs; [ + sops-master + gnupg + ]; + + sops = { + defaultSopsFile = ../secrets/test.yaml; + age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; + }; +} From 0bc125c944a18b65b5f390b313b74860375ed9b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 7 Mar 2025 13:11:42 -0300 Subject: [PATCH 341/404] monolith: add docker-images gitlab runner --- .sops.yaml | 12 ++++++- secrets/monolith/default.yaml | 56 +++++++++++++++++++++++++++++++ secrets/phantom/default.yaml | 46 +++++++++++++++++++++---- system/configuration.nix | 8 ----- system/monolith-gitlab-runner.nix | 14 ++++++++ 5 files changed, 121 insertions(+), 15 deletions(-) create mode 100644 secrets/monolith/default.yaml diff --git a/.sops.yaml b/.sops.yaml index 699e3c1..20a8640 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -12,7 +12,17 @@ creation_rules: age: - *lelgenio-ssh - *monolith-ssh + - path_regex: secrets/monolith/[^/]+\.(yaml|json|env|ini)$ + key_groups: + - pgp: + - *lelgenio-gpg + age: + - *lelgenio-ssh + - *monolith-ssh - path_regex: secrets/phantom/[^/]+\.(yaml|json|env|ini)$ key_groups: - - age: + - pgp: + - *lelgenio-gpg + age: + - *lelgenio-ssh - *phantom-ssh diff --git a/secrets/monolith/default.yaml b/secrets/monolith/default.yaml new file mode 100644 index 0000000..857bc5d --- /dev/null +++ b/secrets/monolith/default.yaml @@ -0,0 +1,56 @@ +gitlab-runners: + docker-images-token: ENC[AES256_GCM,data:GGB/KSkjdAyhFKEspAh91ItbqEDf7K/LZSGSn+Jp7SxRfXpDzHIiMD8XJ9PTkGLeQGN4ug1i2nTYPS7d/P5OALWDU+1NPiV9nPdG0w7GERfu4g==,iv:6roabdOKX9xFMf0hWlECd73+943R+hFLos0e2dOpzns=,tag:LrASFc4DtN7aQ+3oOW/p/w==,type:str] +sops: + kms: [] + gcp_kms: [] + azure_kv: [] + hc_vault: [] + age: + - recipient: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxR/w+38b2lX90yNBqhq3mUmkn1WGu6GAPhN1tVp2ZjYRJNV/+5gWCnTtOWYtDx35HmK/spQ2Qy8X9ttkzORa24fysNx1Iqn/TiXhD7eIJjbGPnrOpIKTkW5/uB3SD/P5NBSa06//BaqJU4sBlG79hoXRpod052hQtdpTVDiMCIV+iboWPKqopmJJfWdBtVnHXs9rep0htPRExxGslImFk7Z6xjcaHyCpIQZPlOGf+sGsmUU7jRqzvZFV8ucIdbnAlMHrU4pepNFhuraESyZVTa/bi9sw0iozXp5Q5+5thMebEslmT1Z771kI4sieDy+O4r8c0Sx2/VY1UAzcpq1faggc3YB01MTh+tiEC6xdMvZLrQGL1NBWjHleMyL53GU5ERluC0vXJF3Hv3BGGBDfXWbrEm5n06DHr2apRVJGC0LwiQ7Woud1X4V4X1pKSusxCVMjT2lmcOwV6YhKhB2sowJc1OdMx4+tL0UWE+YKSZgBHfolwk6ml0F4EO9nnUHc= lelgenio@i15 + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1yc2EgQnd3eEhnCldST3lPZXBV + cTVNK3R3RjlFcDQ4UldRT0tsSVJ2N2FkN0hiOVllT2Rrc2NjVWtMbnMrWHVMN1k5 + dExsVHFhMHMKRVVzR1pzeG01Y2FidWNrQ0xjK1FUZktnWTZaWWlWalM5cWhZWE9U + TFU3ZXV3aGp6QkRIZkl4MDFJN2RRQVkrdwpqQlE5ajFTVW15MVVyTkNaS3JiOFph + cGthWWZ4R3Rldjh0a2lnd1dSbUcvSVpDdHJKVk5GVy8vR05WbmhUWFhuCkZsaWk5 + L2dnNE4rNTV6VWpIZlNIMENzZVlKS2NEOFdmSFhsYkFNSHRlTENYeGNtekpDaUN4 + V3l2VWtta3hSVFIKblVDZ1hOdzZQbWswTDB5MXd3dXpXQW44MFhFR0hGZkxjbzlU + WkR5dFhhbVpTUGZwQVR3WXNCUjJWYlAyTU1VeQpkWEdXQjVUemlRdXVxZVE4SGVU + TFlPS0FEV1dRRWU0K1d1ZTRrZGU1MHVKQ0lCemJmcUhOaWtON3ZDbUtad2lXCklt + aFREN3BmdEo1TUw2V2NtQ0QvbE1EQ25OeW5ZaldOY04zQjFQbWRnWjhJaWZKWXJn + UlBTTjV0VkpEY0FhZjQKTURjT004dHEvS24rNGVBSE1KK0ZabTBKb0Z4QTJvS2Fi + czdnWEpUTXJsRVMvdWFzVlJLT281a3JwQi9PMGVDcQoKLS0tIFgvSE14blgvVkxQ + b3N5WWlzdG5hajZaVFVkWVlhOXNZKytmZEZrZVprRHMKXqPgDpKG42KsfKfIAflT + 1meea416Af+WeFhWnw8fBBhApKrMMmYMMjDi1lIOGDz57ydNqtlFqdFtkiQsUC0f + wA== + -----END AGE ENCRYPTED FILE----- + - recipient: age1ecyynwv93lfu7crjjp8l47defv07quzfzaktwurpep7jc9eha5pscg7lrw + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzTWVYNXNQcHhHSzVBQmhU + ejlOQzJMZ0xEVFVkbzNPQ0hMVHBQWEgzQTFJCkF6ZDNaZ29UM29vWGZqVW10dmlQ + YjNFNXJVMlcxT1ZsMU55cE8vc3VjaXMKLS0tIDZYQTRjMWp5a3hKc2N4alZKZHFt + TGNwNUQxN0VQMHErMGVZbG5CZW9kSGMK9TRcgSJQT73dYoQxrrqFW/FkKExLGT4T + Xagi6Eq4rhT7pvaL4h3vglwbqkLPsHrWRSyhh0sAEIJ1WpvD+cFEMA== + -----END AGE ENCRYPTED FILE----- + lastmodified: "2025-03-07T14:47:44Z" + mac: ENC[AES256_GCM,data:k0yhfVhDmtU8wOZIylaxmmd+8TIXCzCbGhlaQnyeLplH2BDHVnpzAxBJVizS/VtVpAkjMAESndXqW7N6pnGnRWdZPtCxE8KNtz/nUxCZA44cn+mjC+ghKgsgaLuxe4smu0f4u4TK2uFsJqw5J0VGFgMtyKe4AaHujoXWL80zTR0=,iv:xiDrOtto246oPjMw5+ny0qB8HjdMpkzZyPNi3csgMVE=,tag:2xioMXxERDSePdIwPpP7hg==,type:str] + pgp: + - created_at: "2025-03-07T14:42:24Z" + enc: |- + -----BEGIN PGP MESSAGE----- + + hQEMAzy6JxafzLr5AQf/Y0QIIBN0uY3RUj88u5L0tJqypnKOAlfLOMYPkZ0oomAd + ZowogLWJgWyFC6NTdZRj84GoF2EAMDZqDAwh7shrZSpuhr0rwT7bGMQ4/VSx/Sxs + uCgkzXGMT0DsGjDOw6h17dDLNAnnvViamL1Br3ZXG7gZJXmUhPavL1YXeQciPqjh + FyJLAKeb9sQAFUp0Aexo4fKZSJh//O8jTiz7vl5klpQnDHWzpkcuxqIajIoYFdcL + ioP1GnrsUDfyXh2zfLcggxs/WHU24/C8DZqWai9WqRA08kJpw+aj1835vmUIWM0W + E5TF9h/tOEGw+PGhvwNiEvONhv/tpyLpjoXylbisjtJeAY6Fntxcrssw2cKMimFV + UjBuf2vSmQlNBqU+LE0JOICmRsmnLZTEPXnPqpqBTRV4gj4kTLCJYcaEIFP7uSEd + WlCyyX28ACGThorQEoQ/W2bFfNT/Mi7CNQ8EOckmKg== + =6Qin + -----END PGP MESSAGE----- + fp: 0FECE8316E74BA6F44EFC21A2F8F21CE8721456B + unencrypted_suffix: _unencrypted + version: 3.9.4-unstable diff --git a/secrets/phantom/default.yaml b/secrets/phantom/default.yaml index a299b34..2d744c9 100644 --- a/secrets/phantom/default.yaml +++ b/secrets/phantom/default.yaml @@ -14,17 +14,51 @@ sops: azure_kv: [] hc_vault: [] age: + - recipient: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxR/w+38b2lX90yNBqhq3mUmkn1WGu6GAPhN1tVp2ZjYRJNV/+5gWCnTtOWYtDx35HmK/spQ2Qy8X9ttkzORa24fysNx1Iqn/TiXhD7eIJjbGPnrOpIKTkW5/uB3SD/P5NBSa06//BaqJU4sBlG79hoXRpod052hQtdpTVDiMCIV+iboWPKqopmJJfWdBtVnHXs9rep0htPRExxGslImFk7Z6xjcaHyCpIQZPlOGf+sGsmUU7jRqzvZFV8ucIdbnAlMHrU4pepNFhuraESyZVTa/bi9sw0iozXp5Q5+5thMebEslmT1Z771kI4sieDy+O4r8c0Sx2/VY1UAzcpq1faggc3YB01MTh+tiEC6xdMvZLrQGL1NBWjHleMyL53GU5ERluC0vXJF3Hv3BGGBDfXWbrEm5n06DHr2apRVJGC0LwiQ7Woud1X4V4X1pKSusxCVMjT2lmcOwV6YhKhB2sowJc1OdMx4+tL0UWE+YKSZgBHfolwk6ml0F4EO9nnUHc= lelgenio@i15 + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1yc2EgQnd3eEhnCm9xWXdTQjZU + Znpiak1xdE1kTm56NWI3bUNlQXBFcjhNNFlwbDVUcGhrS2J4Y1M3aXFydjVGYmVI + UmNKVmkrb3cKWHNsa2FZaE4zbnJWYVo1SDhTOEZxM0JMRWJ0ckpySk11V09LMkd5 + bjhQRkpSZG0xYko3aTFqQmVFU3JhSWo1Ugo2Nk0rNzJBNzJvbVJkU0VhSmRRWE5B + RUt4S3h1cFZkZHkxOU5VUTcxN1JBNFlaYTkyZTNSM3JVUjhCUStNODRMCjdJRWlv + d0g4bnlQMzhWSGUxY04vRnUvbTlyWVQ0eWsvbnk4UmxxOHVZblM3bVFETXJiVjRE + b2s1ZFVHaEFNc3EKSDJTYUVSNWtKQS81bUdOcDA0SnZGeE4vQkt6bFZWY1dxNm9S + YVhRdjVCb3RGaC94djZZeFhXaTZSVVYzaUJ6KwoxQXNKcU9Dbk8xYWRvaGJwSXdu + Zzk4Y09zbW54elJHdjJ6OTNyeURwZ3JJL0gvaFVRUmgyRnNBbXFJU1l5U2FwCm56 + bzc0TkVWdnNoWnBMMjlKbnZicmRxdXIwd2hCZGp5dEQ2TnBtdTZCdnJRbzIyZFhV + L1ZpVW9nZmNqQW45c0cKYnIxQTc2aEowTUprZ1pYVCt3L2NsVHJ5SWF1aHZUR1E5 + eGVrcUphWk1vVURBL2J4UlZLQXluNC82YnNhQUFOQgoKLS0tICtOTXVyUzZldUJO + QkN0eUVRSDlDWmthU0VrRUZDb0VBTVFhL24raHJDcGsKcspICwz+f6y21yogiXO3 + Qp7evIuOzfWe6pMtge5BjxWTlzIdi2btFTzuTjgZaOiQd8FIB3iTqBkepUVD49jN + RQ== + -----END AGE ENCRYPTED FILE----- - recipient: age1m4mqcd2kmuhfr8a22rvh02c68jkakhdfmuqgtusuv0czk4jvna7sz79p3y enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxQkRWWmYweUNpcDRNbzRW - NnQ4R3JPK0oydm9iL0owS0d6Nm92eTFJZldFCnZpUVUvWi9FYTBDSGNvUUJRZHNz - QStPT0hCc08xUmh4dEdJdmVPRm01V2cKLS0tIEZPMmNKdGUvNnVWYXZNTHA3SkE3 - ZTNJbW9EWktPb2M5TVBNekUrZXVoUFkKLEsQVYVp7fTBRDA7RO8Kjpc5MUPb5U7I - WKZtNhsMZsP+SLgZWBF1PpvcjlDlNA2Z+Hqsrw6vsq6DYpnxToxfZQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB3TklEaUl2QkVtVVN5UXlC + cW9RaHNoSnRkV0lKTmtYS0VZQnhyM0o0cUFNCmZWemJuOFVyK1ZFbkR1RUZOTEVB + WmJFemRrd0xIUW43cElkdVJOM052N2cKLS0tIFJpRTNtQ1hjWGJwSFJLRDNRSm4z + WW9MbmZoTllLalpWcFdOa3JpaThPMjQKa5vVGp+L1V2/ScyUe0EaOVw4TB8paS2w + 79VgplKN6HL+f6bL/0rIUOwJ6PDW944bOioKDYvbUCpBnSRYIHnYoQ== -----END AGE ENCRYPTED FILE----- lastmodified: "2025-03-05T22:27:18Z" mac: ENC[AES256_GCM,data:WSopSnWZ+uOllywd7difaZtJcfxkL7eIf9Kr3GajZKO0+rP6pEHIS+5AbXZy6oKRlCLUPecY/WXFvk3//akpvvXHbf6Jp4fQ/YSuTcYKRQupbDBpOXSlc33QyRl6oEyiMOjxMxa2N2tmq8dmA0NbF9wSDMa5a4eNDoiL5T/sUZ8=,iv:QqbVRApzFF6q24rk8KfKuthj656nEczD9Si4INj+N9A=,tag:tMRNYo+u/jIQ6iX3KqKJdA==,type:str] - pgp: [] + pgp: + - created_at: "2025-03-07T16:05:59Z" + enc: |- + -----BEGIN PGP MESSAGE----- + + hQEMAzy6JxafzLr5AQf/djnT5hse11QoFPbmuu5rmc/0vpOQ79G6MYZtHlXL/HbP + hx0r25yTI6ICayFiO7luovz58saN0BY5K1dCbGB7+nZ8lrKoGE4GhX4k5Cc/KJIO + BTEbTqMJLezkb34FsuXgD9o2udNysC3Bpi/3NbPCYsJkVeCmx1wyEWzWhz51RO4M + WEyKkE0DyJfOpTuY2fofGhaA866firFDrS2SeiU4Dox4au3iR4VYqt6IITmgZdDE + M9LRp3AzOPOUZzpeRcer4ksh8WVDIWPEEL+w+OGo8QpUL3kqHIMVPgXY0kBOR+5s + tVTCLVe7yoimK/oSYkEx9Z3TYRwKV6ggJWahX7VHaNJeAVxIon8Qs8W2L+f1gclK + tPbaE+jCg6AH3apD3ICisxCj0Vvm+NsWMo2skeN2YGyWBCOoeGcG5OhgJtD0cQiw + QxCzywMXujxYYAXJEvhk4YRhaCOMkTTMGNoloWMugg== + =CHH0 + -----END PGP MESSAGE----- + fp: 0FECE8316E74BA6F44EFC21A2F8F21CE8721456B unencrypted_suffix: _unencrypted version: 3.9.4-unstable diff --git a/system/configuration.nix b/system/configuration.nix index 11f327e..f515e43 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -29,14 +29,6 @@ zramSwap.enable = true; - sops = { - secrets.hello = { }; - }; - - environment.etc."teste-sops" = { - text = config.sops.secrets.hello.path; - }; - # Enable touchpad support (enabled default in most desktopManager). services.libinput.enable = true; diff --git a/system/monolith-gitlab-runner.nix b/system/monolith-gitlab-runner.nix index 3e63d98..ce0dc6f 100644 --- a/system/monolith-gitlab-runner.nix +++ b/system/monolith-gitlab-runner.nix @@ -18,7 +18,21 @@ in # nix store will be readable in runner, might be insecure thoreb-telemetria-nix = mkNixRunner config.age.secrets.gitlab-runner-thoreb-telemetria-registrationConfigFile.path; thoreb-itinerario-nix = mkNixRunner config.age.secrets.monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.path; + + default = { + # File should contain at least these two variables: + # `CI_SERVER_URL` + # `CI_SERVER_TOKEN` + authenticationTokenConfigFile = config.sops.secrets."gitlab-runners/docker-images-token".path; + dockerImage = "debian:stable"; + }; }; }; systemd.services.gitlab-runner.serviceConfig.Nice = 10; + + sops.secrets = { + "gitlab-runners/docker-images-token" = { + sopsFile = ../secrets/monolith/default.yaml; + }; + }; } From b52a8868069bc4662d9da0c1b55d9a4fb29e2751 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 7 Mar 2025 14:56:02 -0300 Subject: [PATCH 342/404] monolith: migrate ci secrets to sops --- secrets/monolith/default.yaml | 8 ++++++-- system/monolith-gitlab-runner.nix | 11 ++++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/secrets/monolith/default.yaml b/secrets/monolith/default.yaml index 857bc5d..46cc388 100644 --- a/secrets/monolith/default.yaml +++ b/secrets/monolith/default.yaml @@ -1,4 +1,8 @@ +forgejo-runners: + git.lelgenio.com-default: ENC[AES256_GCM,data:sEfpBZvgQUkyXPWY4RI0RPJWUbsYK/RGqiYJ5wDSVY9a0EYenyt96QYq6815evq2iQ==,iv:rSWnCOdhfKH4TM9R0/IParYd9laYhWxR+iUhgkVvqfc=,tag:mBcSH/oGDMBgBScvCdn3Zg==,type:str] gitlab-runners: + thoreb-telemetria-nix: ENC[AES256_GCM,data:zrZvG4be08ulpo7itbrprKK5csCMLvzZjrszfMw1XiJP0FyRTUd9nHgHpbAzbjj2KyT7kKngoZAyengvaTEhkT9sUi1pdGnvajAH8BDDOD0g4LJIHFl4,iv:3bSsTzU7gHx+MchuPg9kmb5xEDugmGPje8Jw74NpRJI=,tag:zffRr77lWbyLt7o/mywb5A==,type:str] + thoreb-itinerario-nix: ENC[AES256_GCM,data:UdAAD0V895sFoEYR56sCG2LlpZugJ0K/nwkTygzWOnbTSmBRAcIQ8qVFPZGw+K+XMSLiCyio6Jp7k8AYP0K1VYm+6aEP3OkqR9FCLQTJgXo=,iv:UGUby50BYkn13OzItk6zZmxc5+SnbZZa4bebQHIow2A=,tag:LjDg3deWwdH2T71EtPo6jA==,type:str] docker-images-token: ENC[AES256_GCM,data:GGB/KSkjdAyhFKEspAh91ItbqEDf7K/LZSGSn+Jp7SxRfXpDzHIiMD8XJ9PTkGLeQGN4ug1i2nTYPS7d/P5OALWDU+1NPiV9nPdG0w7GERfu4g==,iv:6roabdOKX9xFMf0hWlECd73+943R+hFLos0e2dOpzns=,tag:LrASFc4DtN7aQ+3oOW/p/w==,type:str] sops: kms: [] @@ -34,8 +38,8 @@ sops: TGNwNUQxN0VQMHErMGVZbG5CZW9kSGMK9TRcgSJQT73dYoQxrrqFW/FkKExLGT4T Xagi6Eq4rhT7pvaL4h3vglwbqkLPsHrWRSyhh0sAEIJ1WpvD+cFEMA== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-03-07T14:47:44Z" - mac: ENC[AES256_GCM,data:k0yhfVhDmtU8wOZIylaxmmd+8TIXCzCbGhlaQnyeLplH2BDHVnpzAxBJVizS/VtVpAkjMAESndXqW7N6pnGnRWdZPtCxE8KNtz/nUxCZA44cn+mjC+ghKgsgaLuxe4smu0f4u4TK2uFsJqw5J0VGFgMtyKe4AaHujoXWL80zTR0=,iv:xiDrOtto246oPjMw5+ny0qB8HjdMpkzZyPNi3csgMVE=,tag:2xioMXxERDSePdIwPpP7hg==,type:str] + lastmodified: "2025-03-07T16:48:32Z" + mac: ENC[AES256_GCM,data:vyO1MMSRCoc8CK1wqXdgvvAiNP4NUXxpF1MPNsz2z9ioeu15ue2AYV+kWH3I94qUOZ93UM+Nbfx1sqN+JKpkbQ7iS8vY1NNwovEYtrp4FInr6esYOIJXSvvf/3wlWoquSaNACQnbjKJKgV05m24+hu/meIXMYs9sn2SxlnetTmg=,iv:W1jokO9Shhle0cWZpR5bonVdLPZAOo76h8sClMUYZbE=,tag:1Pg5f6q6TmBrAmYWuhKaKQ==,type:str] pgp: - created_at: "2025-03-07T14:42:24Z" enc: |- diff --git a/system/monolith-gitlab-runner.nix b/system/monolith-gitlab-runner.nix index ce0dc6f..28a0ecd 100644 --- a/system/monolith-gitlab-runner.nix +++ b/system/monolith-gitlab-runner.nix @@ -1,7 +1,6 @@ { config, pkgs, - lib, ... }: let @@ -16,8 +15,8 @@ in services = { # runner for building in docker via host's nix-daemon # nix store will be readable in runner, might be insecure - thoreb-telemetria-nix = mkNixRunner config.age.secrets.gitlab-runner-thoreb-telemetria-registrationConfigFile.path; - thoreb-itinerario-nix = mkNixRunner config.age.secrets.monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.path; + thoreb-telemetria-nix = mkNixRunner config.sops.secrets."gitlab-runners/thoreb-telemetria-nix".path; + thoreb-itinerario-nix = mkNixRunner config.sops.secrets."gitlab-runners/thoreb-itinerario-nix".path; default = { # File should contain at least these two variables: @@ -31,6 +30,12 @@ in systemd.services.gitlab-runner.serviceConfig.Nice = 10; sops.secrets = { + "gitlab-runners/thoreb-telemetria-nix" = { + sopsFile = ../secrets/monolith/default.yaml; + }; + "gitlab-runners/thoreb-itinerario-nix" = { + sopsFile = ../secrets/monolith/default.yaml; + }; "gitlab-runners/docker-images-token" = { sopsFile = ../secrets/monolith/default.yaml; }; From 21d747cb71f0c3358c0af8c3279fe62f399f45a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 7 Mar 2025 18:33:59 -0300 Subject: [PATCH 343/404] monolith: add declarative bitbucket runners --- flake.nix | 1 + secrets/monolith/default.yaml | 9 +++-- system/monolith-bitbucket-runner.nix | 50 ++++++++++++++++++++++++++++ 3 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 system/monolith-bitbucket-runner.nix diff --git a/flake.nix b/flake.nix index 90ef37e..fd1bac2 100644 --- a/flake.nix +++ b/flake.nix @@ -146,6 +146,7 @@ modules = [ ./hosts/monolith ./system/monolith-gitlab-runner.nix + ./system/monolith-bitbucket-runner.nix ./system/monolith-forgejo-runner.nix ./system/nix-serve.nix ] ++ common_modules; diff --git a/secrets/monolith/default.yaml b/secrets/monolith/default.yaml index 46cc388..3e1c99c 100644 --- a/secrets/monolith/default.yaml +++ b/secrets/monolith/default.yaml @@ -4,6 +4,11 @@ gitlab-runners: thoreb-telemetria-nix: ENC[AES256_GCM,data:zrZvG4be08ulpo7itbrprKK5csCMLvzZjrszfMw1XiJP0FyRTUd9nHgHpbAzbjj2KyT7kKngoZAyengvaTEhkT9sUi1pdGnvajAH8BDDOD0g4LJIHFl4,iv:3bSsTzU7gHx+MchuPg9kmb5xEDugmGPje8Jw74NpRJI=,tag:zffRr77lWbyLt7o/mywb5A==,type:str] thoreb-itinerario-nix: ENC[AES256_GCM,data:UdAAD0V895sFoEYR56sCG2LlpZugJ0K/nwkTygzWOnbTSmBRAcIQ8qVFPZGw+K+XMSLiCyio6Jp7k8AYP0K1VYm+6aEP3OkqR9FCLQTJgXo=,iv:UGUby50BYkn13OzItk6zZmxc5+SnbZZa4bebQHIow2A=,tag:LjDg3deWwdH2T71EtPo6jA==,type:str] docker-images-token: ENC[AES256_GCM,data:GGB/KSkjdAyhFKEspAh91ItbqEDf7K/LZSGSn+Jp7SxRfXpDzHIiMD8XJ9PTkGLeQGN4ug1i2nTYPS7d/P5OALWDU+1NPiV9nPdG0w7GERfu4g==,iv:6roabdOKX9xFMf0hWlECd73+943R+hFLos0e2dOpzns=,tag:LrASFc4DtN7aQ+3oOW/p/w==,type:str] +bitbucket-runners: + wopus-runner-1: ENC[AES256_GCM,data:gtH0T5n8qMYpvSv5ciN8+ScGlFDf9xE0FTxNP97vT/qsOCcaItTE+5P+DFcWw46onLED+1c+u0sArFbEsT3f8lyco9b+0l99uOQAxLZQzAXYH8zGye1UnwUtytkci2PHu5c8kTpIWHXyZ1IOYNGWkermeab57ANzOkM1LbkHyAjS6VTh0I60LfAOdHOw5FDFL8d1d9oWxLloOe9USLPqHjC023EpCUT2YuyHoPCTpBu8Kb/2HfV0wkAKaB3dvVrKwXCj+bfP6+bjQ3uMzVO/7jxPmnSGBfvyZ+Hlg5goJ6bSAqQWmnPPnQ96FgQfe8su5ML9qNIp9/7eNiL6Rv6Vhxe0hHbE5wsZ/58grcg/LrugeWJvUJ9THhwcTwO8Pkvwlq0XM9seUY2NV+LCK3bLQ4IWDjWkU1IHg6+nihTcvl1iD6UIGMgqGoB/v05WVzHb+GcE2fFuSuhVHfa5RMyboELOJoFrqZiXGhY=,iv:ZakLafxYQCDd1Zw8T83Xfj+YwAQKna9LC6ognJqtifA=,tag:bwBObfdMIvJfRrOG04NtxA==,type:str] + wopus-runner-2: ENC[AES256_GCM,data:gg8merZMFbf396hdJY7zmKQndT3GzB7NeGZAs3C0au8Zd7OFAg9vcQcFcxNA3kZGJZqmFTR/ycWJwhYr9fhlfFuPhDynVvgJAqoYtvC2MUDiOMD/d3DlfwFjQ6cOGTrvFuY1kkgSFb4OFdrVC1eiTDrGygFmYnYcqTKn/t5Ttqi+cHZNzFzVzdVLvaLCYxltM5g45zn+fXYxYwCfqyb32/M1XTnnwIGiataGxEX5oWhVV4zqeLO4ZIYPSby5AVvIMJ/zqvqaeVVY52GLDcTKrj3thbZxMQLWN3/lOA0uYhi3L/WM8Gx+JMEIbSICcuT7QXu4w4PA+opcx9GnsMCK2/egzS+cNPJ4vGZCdVD/jh6A9zVEJAgXdsHXNXFHmMPt7DcgrCQiub62og4kBY4G/Rcg4UN7sb3v3qyBpGbCGHGRjCFc+wdHpom0yDOG2cwcqfN49pC2R7Ag2BisFQ/5A+DPmKnvGG3kt9s=,iv:5g5XiDecYqi4JNRkZubgPJECBQdZ6rBeojgFe6Etebk=,tag:HRy5bFSbfxKTb5e13lGtgg==,type:str] + wopus-runner-3: ENC[AES256_GCM,data:f9pLYR8t51HtPpLyXysIVaDAhxDrmktJH93E7rb7imtKwK7hRhR8usnvHTcknLfD7BMvStAIYefdGt19u7PrQu6vqc19bEcNbnK5OH4KBP6+X47oMgBYtbIGXH+t3dSDt22fSIoppTwdX7/Kf4vqesfN8K7EunETvFR86oyyKdy15mvXr0XUO4us4HZjnIOBEnOm1P/V8hk5JcCpRuo+8ZYmBe5gzq5pTnqnYlPE1EovM7eDMg72J7ev07h50qvySrAqmNiqDcXfTPQ2TzuHx3XxAYqFybf1L6P9OnLB6RDAlpoFJ0h8dSg2tzC2+amYsBP0UIBK/ZhWvvAjpX+MZrTASjenh/tefDcNdbsXDOr7A4i/261z4rC0r+97INglCN1N/SZg51iBHiRAVV1zibDLfioR5+eBIykWAtjILMoYU+zOcr0E8K0I9jQGMtpnYmvHJqV0DVcdfZpJptrPUUy+lQ/iZVcPpLs=,iv:grzvVsfpUzywjNE4jvTxXKG3TYajrvSsQgfOgtafvIo=,tag:K1B6crN0ckLk0EYBtGHDkw==,type:str] + wopus-runner-4: ENC[AES256_GCM,data:D1Zq0BtPuACnutAbUcj3gYSMLuIZcMuqc/1mEFmitEG0tBFMWhkabS+8lXcp8sb1DM0LTDMEwgMB9FVyFb670MKQNEncqQtaNJtY1BxS3SolovDAM/I+i6YGvd4X8jX99d+7ZNR6xGBWJ/dW8rz4QnIM8Eh3FDOqaFa/ltfyPKP9IZ2uZi67C/n8Q/OSdgMQkt+QxhgJfSghE1iruPwxyGlqv+E4SZNI/fQQMjX0Lh7z02ms58yyMtjO71YbukV/JXFRsdJrqY2wfH/6NlZbsKideoSxluBRVqmbW6KQd7dUT819KbOSu9CFdgThtVCU8qiv3jbAbn8D5xRy4AAOEfSqRLXJoj7otCqr47R/8+0BdS3aztFBjL3lDmprMWZ4+LD55fvczfpxUF9ox1mhcjIvCvZJJL06XsST1XRXa7i2fr4/a/XhCmQgIzar5IYxSC9OjuHp6jLsTaY3ZUgid5W1L1n8uWSmA98=,iv:O9caRG//brERiIhuMrsFdTz6TnPY0rdQnvHEu0P42yM=,tag:hrmwLX/CRhZfammJ2nfTPw==,type:str] sops: kms: [] gcp_kms: [] @@ -38,8 +43,8 @@ sops: TGNwNUQxN0VQMHErMGVZbG5CZW9kSGMK9TRcgSJQT73dYoQxrrqFW/FkKExLGT4T Xagi6Eq4rhT7pvaL4h3vglwbqkLPsHrWRSyhh0sAEIJ1WpvD+cFEMA== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-03-07T16:48:32Z" - mac: ENC[AES256_GCM,data:vyO1MMSRCoc8CK1wqXdgvvAiNP4NUXxpF1MPNsz2z9ioeu15ue2AYV+kWH3I94qUOZ93UM+Nbfx1sqN+JKpkbQ7iS8vY1NNwovEYtrp4FInr6esYOIJXSvvf/3wlWoquSaNACQnbjKJKgV05m24+hu/meIXMYs9sn2SxlnetTmg=,iv:W1jokO9Shhle0cWZpR5bonVdLPZAOo76h8sClMUYZbE=,tag:1Pg5f6q6TmBrAmYWuhKaKQ==,type:str] + lastmodified: "2025-03-07T21:28:04Z" + mac: ENC[AES256_GCM,data:4lOafZQ6PP38CByulzA/J86sw+TpQhj40s1lTRXqUtpt72yH8nQK8dXpw0dNYvDBtDpKRvNTHZubzalEua6n2lCQL7rsZ2+fo6FJ4ht2Kb70dddDcWEyrfyZQ2FaKC5L/QjqM0SbIfPszNvyQ8wIaOoMfNJBis5QOjRSGDAcJm8=,iv:LLT0oJW+3KNe1nKphCK0c5FPIuh8GfnDrvNDCFhP4NM=,tag:rPbVY7L1qxNc3aCfv77FAg==,type:str] pgp: - created_at: "2025-03-07T14:42:24Z" enc: |- diff --git a/system/monolith-bitbucket-runner.nix b/system/monolith-bitbucket-runner.nix new file mode 100644 index 0000000..17d462b --- /dev/null +++ b/system/monolith-bitbucket-runner.nix @@ -0,0 +1,50 @@ +{ + config, + pkgs, + ... +}: + +let + mkRunner = secret: { + image = "docker-public.packages.atlassian.com/sox/atlassian/bitbucket-pipelines-runner:latest"; + volumes = [ + "/tmp:/tmp" + "/var/run/docker.sock:/var/run/docker.sock" + "/var/lib/docker/containers:/var/lib/docker/containers:ro" + ]; + environmentFiles = [ secret ]; + }; + + secretConf = { + sopsFile = ../secrets/monolith/default.yaml; + }; +in +{ + virtualisation.docker = { + enable = true; + daemon.settings = { + # needed by bitbucket runner ??? + log-driver = "json-file"; + log-opts = { + max-size = "10m"; + max-file = "3"; + }; + }; + }; + + virtualisation.oci-containers.backend = "docker"; + + virtualisation.oci-containers.containers = { + bitbucket-runner-1 = mkRunner config.sops.secrets."bitbucket-runners/wopus-runner-1".path; + bitbucket-runner-2 = mkRunner config.sops.secrets."bitbucket-runners/wopus-runner-2".path; + bitbucket-runner-3 = mkRunner config.sops.secrets."bitbucket-runners/wopus-runner-3".path; + bitbucket-runner-4 = mkRunner config.sops.secrets."bitbucket-runners/wopus-runner-4".path; + }; + + sops.secrets = { + "bitbucket-runners/wopus-runner-1" = secretConf; + "bitbucket-runners/wopus-runner-2" = secretConf; + "bitbucket-runners/wopus-runner-3" = secretConf; + "bitbucket-runners/wopus-runner-4" = secretConf; + }; +} From 1a4fd195961977b5b87d218a349205fb8b8e3181 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 7 Mar 2025 19:50:22 -0300 Subject: [PATCH 344/404] sops: switch to id_ed25519 keys --- .sops.yaml | 2 +- secrets/monolith/default.yaml | 52 +++++++++++++------------------- secrets/phantom/default.yaml | 52 +++++++++++++------------------- secrets/test.yaml | 56 ++++++++++++++--------------------- system/sops.nix | 7 +++-- 5 files changed, 71 insertions(+), 98 deletions(-) diff --git a/.sops.yaml b/.sops.yaml index 20a8640..7aa3d88 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -1,6 +1,6 @@ keys: - &lelgenio-gpg 0FECE8316E74BA6F44EFC21A2F8F21CE8721456B - - &lelgenio-ssh ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxR/w+38b2lX90yNBqhq3mUmkn1WGu6GAPhN1tVp2ZjYRJNV/+5gWCnTtOWYtDx35HmK/spQ2Qy8X9ttkzORa24fysNx1Iqn/TiXhD7eIJjbGPnrOpIKTkW5/uB3SD/P5NBSa06//BaqJU4sBlG79hoXRpod052hQtdpTVDiMCIV+iboWPKqopmJJfWdBtVnHXs9rep0htPRExxGslImFk7Z6xjcaHyCpIQZPlOGf+sGsmUU7jRqzvZFV8ucIdbnAlMHrU4pepNFhuraESyZVTa/bi9sw0iozXp5Q5+5thMebEslmT1Z771kI4sieDy+O4r8c0Sx2/VY1UAzcpq1faggc3YB01MTh+tiEC6xdMvZLrQGL1NBWjHleMyL53GU5ERluC0vXJF3Hv3BGGBDfXWbrEm5n06DHr2apRVJGC0LwiQ7Woud1X4V4X1pKSusxCVMjT2lmcOwV6YhKhB2sowJc1OdMx4+tL0UWE+YKSZgBHfolwk6ml0F4EO9nnUHc= lelgenio@i15 + - &lelgenio-ssh age1zrgu7w8059xydagm60phnffghvfe9h2ca58cx8qwagqpyfuvs9fqw79c8h - &monolith-ssh age1ecyynwv93lfu7crjjp8l47defv07quzfzaktwurpep7jc9eha5pscg7lrw - &phantom-ssh age1m4mqcd2kmuhfr8a22rvh02c68jkakhdfmuqgtusuv0czk4jvna7sz79p3y diff --git a/secrets/monolith/default.yaml b/secrets/monolith/default.yaml index 3e1c99c..8bd8e12 100644 --- a/secrets/monolith/default.yaml +++ b/secrets/monolith/default.yaml @@ -15,50 +15,40 @@ sops: azure_kv: [] hc_vault: [] age: - - recipient: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxR/w+38b2lX90yNBqhq3mUmkn1WGu6GAPhN1tVp2ZjYRJNV/+5gWCnTtOWYtDx35HmK/spQ2Qy8X9ttkzORa24fysNx1Iqn/TiXhD7eIJjbGPnrOpIKTkW5/uB3SD/P5NBSa06//BaqJU4sBlG79hoXRpod052hQtdpTVDiMCIV+iboWPKqopmJJfWdBtVnHXs9rep0htPRExxGslImFk7Z6xjcaHyCpIQZPlOGf+sGsmUU7jRqzvZFV8ucIdbnAlMHrU4pepNFhuraESyZVTa/bi9sw0iozXp5Q5+5thMebEslmT1Z771kI4sieDy+O4r8c0Sx2/VY1UAzcpq1faggc3YB01MTh+tiEC6xdMvZLrQGL1NBWjHleMyL53GU5ERluC0vXJF3Hv3BGGBDfXWbrEm5n06DHr2apRVJGC0LwiQ7Woud1X4V4X1pKSusxCVMjT2lmcOwV6YhKhB2sowJc1OdMx4+tL0UWE+YKSZgBHfolwk6ml0F4EO9nnUHc= lelgenio@i15 + - recipient: age1zrgu7w8059xydagm60phnffghvfe9h2ca58cx8qwagqpyfuvs9fqw79c8h enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1yc2EgQnd3eEhnCldST3lPZXBV - cTVNK3R3RjlFcDQ4UldRT0tsSVJ2N2FkN0hiOVllT2Rrc2NjVWtMbnMrWHVMN1k5 - dExsVHFhMHMKRVVzR1pzeG01Y2FidWNrQ0xjK1FUZktnWTZaWWlWalM5cWhZWE9U - TFU3ZXV3aGp6QkRIZkl4MDFJN2RRQVkrdwpqQlE5ajFTVW15MVVyTkNaS3JiOFph - cGthWWZ4R3Rldjh0a2lnd1dSbUcvSVpDdHJKVk5GVy8vR05WbmhUWFhuCkZsaWk5 - L2dnNE4rNTV6VWpIZlNIMENzZVlKS2NEOFdmSFhsYkFNSHRlTENYeGNtekpDaUN4 - V3l2VWtta3hSVFIKblVDZ1hOdzZQbWswTDB5MXd3dXpXQW44MFhFR0hGZkxjbzlU - WkR5dFhhbVpTUGZwQVR3WXNCUjJWYlAyTU1VeQpkWEdXQjVUemlRdXVxZVE4SGVU - TFlPS0FEV1dRRWU0K1d1ZTRrZGU1MHVKQ0lCemJmcUhOaWtON3ZDbUtad2lXCklt - aFREN3BmdEo1TUw2V2NtQ0QvbE1EQ25OeW5ZaldOY04zQjFQbWRnWjhJaWZKWXJn - UlBTTjV0VkpEY0FhZjQKTURjT004dHEvS24rNGVBSE1KK0ZabTBKb0Z4QTJvS2Fi - czdnWEpUTXJsRVMvdWFzVlJLT281a3JwQi9PMGVDcQoKLS0tIFgvSE14blgvVkxQ - b3N5WWlzdG5hajZaVFVkWVlhOXNZKytmZEZrZVprRHMKXqPgDpKG42KsfKfIAflT - 1meea416Af+WeFhWnw8fBBhApKrMMmYMMjDi1lIOGDz57ydNqtlFqdFtkiQsUC0f - wA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBlaFFtOHRBNjZqOXJOV1Bk + SXRhZTdNWklKaTZST2JhU3VFLzBGSWY0QlMwCldwS1hhMDEyZDAxWUlRRXZtTWts + Ti9IOUR2OFdGYkJ4cFRsV0lkbWJvb1EKLS0tIEJUS1ZCZ1M4ZUs5cDhiam5JaEk1 + U1VjNFprNHZWeDhwU3owRXh0MlBFYkUKHPgxz9/w3+JEtOljfyWBPSshfFlVWVys + f15yxlAeWIZVEGqoau7DegVdZiYYIJR2dFBXV1RkKbAwLrbUxAQidg== -----END AGE ENCRYPTED FILE----- - recipient: age1ecyynwv93lfu7crjjp8l47defv07quzfzaktwurpep7jc9eha5pscg7lrw enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzTWVYNXNQcHhHSzVBQmhU - ejlOQzJMZ0xEVFVkbzNPQ0hMVHBQWEgzQTFJCkF6ZDNaZ29UM29vWGZqVW10dmlQ - YjNFNXJVMlcxT1ZsMU55cE8vc3VjaXMKLS0tIDZYQTRjMWp5a3hKc2N4alZKZHFt - TGNwNUQxN0VQMHErMGVZbG5CZW9kSGMK9TRcgSJQT73dYoQxrrqFW/FkKExLGT4T - Xagi6Eq4rhT7pvaL4h3vglwbqkLPsHrWRSyhh0sAEIJ1WpvD+cFEMA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5OWk0cTJ4d25Qd0hrdkFD + a2Fzd1lrMDREclkvRmxUSjFpYXZvRGs2Rm13Cm5aRVZDWE5ZUVR1K2hkZkdKWjYw + K3lKNndBNGFveGVGVWplaHA0MVlYUG8KLS0tIFlVeXhCTGJGUm1HK2RCSFg1RnI3 + aFVxcDFhaGdYekRWRVFIWnRsZndtZFkKgsvxOFHOcO306Z9FkucA1fDOpZA8N1/h + jYmIgcKTFgWoSCvux67lK30jFsYp7sm5z6WxxDYsGcoQ/+pxoUX2jQ== -----END AGE ENCRYPTED FILE----- lastmodified: "2025-03-07T21:28:04Z" mac: ENC[AES256_GCM,data:4lOafZQ6PP38CByulzA/J86sw+TpQhj40s1lTRXqUtpt72yH8nQK8dXpw0dNYvDBtDpKRvNTHZubzalEua6n2lCQL7rsZ2+fo6FJ4ht2Kb70dddDcWEyrfyZQ2FaKC5L/QjqM0SbIfPszNvyQ8wIaOoMfNJBis5QOjRSGDAcJm8=,iv:LLT0oJW+3KNe1nKphCK0c5FPIuh8GfnDrvNDCFhP4NM=,tag:rPbVY7L1qxNc3aCfv77FAg==,type:str] pgp: - - created_at: "2025-03-07T14:42:24Z" + - created_at: "2025-03-07T22:49:16Z" enc: |- -----BEGIN PGP MESSAGE----- - hQEMAzy6JxafzLr5AQf/Y0QIIBN0uY3RUj88u5L0tJqypnKOAlfLOMYPkZ0oomAd - ZowogLWJgWyFC6NTdZRj84GoF2EAMDZqDAwh7shrZSpuhr0rwT7bGMQ4/VSx/Sxs - uCgkzXGMT0DsGjDOw6h17dDLNAnnvViamL1Br3ZXG7gZJXmUhPavL1YXeQciPqjh - FyJLAKeb9sQAFUp0Aexo4fKZSJh//O8jTiz7vl5klpQnDHWzpkcuxqIajIoYFdcL - ioP1GnrsUDfyXh2zfLcggxs/WHU24/C8DZqWai9WqRA08kJpw+aj1835vmUIWM0W - E5TF9h/tOEGw+PGhvwNiEvONhv/tpyLpjoXylbisjtJeAY6Fntxcrssw2cKMimFV - UjBuf2vSmQlNBqU+LE0JOICmRsmnLZTEPXnPqpqBTRV4gj4kTLCJYcaEIFP7uSEd - WlCyyX28ACGThorQEoQ/W2bFfNT/Mi7CNQ8EOckmKg== - =6Qin + hQEMAzy6JxafzLr5AQgAjwQqdeESOfrOuCjfjALdoy3AnNYC+slusdlra58CoRu6 + YFDAivwPHJBRiuVy43Lo7SWnKXMKvLOry589GBY3JGjNV5U1cPWBhMlTubYZmZWl + iel8Bvw4IF5JksMIvLFdDgexLN7wETzzZP9S8750BCgpSrncrw1k/dUedhv5HUjo + N10x6BPjPSmgolA8uxsISHLAUrKcQoeaWvcZFU1ofKywq08HgIySphy6z3Gmv3Qs + 86saZp1rFm5+qHkrDRgL6Oe3Xx30jVkzn9MHPWzZCDPCEvYGJgXX34NGzbX+/nd3 + JB9XkT2YTFi4BLhdHY3EE7e9//PJc5G9RVDZyAF1e9JeAXH2yR5blXbogoy+VMnS + Yn74Uvs+fnYFTDOiuequro5i0uAyxtrCx8fdfwjuh+9SC5p3N2cBv2eT7zLQwQHi + czHlwxmpi/dMB/u83fR4FzuCUt98VXiezIC4yGn25g== + =Yqqx -----END PGP MESSAGE----- fp: 0FECE8316E74BA6F44EFC21A2F8F21CE8721456B unencrypted_suffix: _unencrypted diff --git a/secrets/phantom/default.yaml b/secrets/phantom/default.yaml index 2d744c9..962c6ba 100644 --- a/secrets/phantom/default.yaml +++ b/secrets/phantom/default.yaml @@ -14,50 +14,40 @@ sops: azure_kv: [] hc_vault: [] age: - - recipient: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxR/w+38b2lX90yNBqhq3mUmkn1WGu6GAPhN1tVp2ZjYRJNV/+5gWCnTtOWYtDx35HmK/spQ2Qy8X9ttkzORa24fysNx1Iqn/TiXhD7eIJjbGPnrOpIKTkW5/uB3SD/P5NBSa06//BaqJU4sBlG79hoXRpod052hQtdpTVDiMCIV+iboWPKqopmJJfWdBtVnHXs9rep0htPRExxGslImFk7Z6xjcaHyCpIQZPlOGf+sGsmUU7jRqzvZFV8ucIdbnAlMHrU4pepNFhuraESyZVTa/bi9sw0iozXp5Q5+5thMebEslmT1Z771kI4sieDy+O4r8c0Sx2/VY1UAzcpq1faggc3YB01MTh+tiEC6xdMvZLrQGL1NBWjHleMyL53GU5ERluC0vXJF3Hv3BGGBDfXWbrEm5n06DHr2apRVJGC0LwiQ7Woud1X4V4X1pKSusxCVMjT2lmcOwV6YhKhB2sowJc1OdMx4+tL0UWE+YKSZgBHfolwk6ml0F4EO9nnUHc= lelgenio@i15 + - recipient: age1zrgu7w8059xydagm60phnffghvfe9h2ca58cx8qwagqpyfuvs9fqw79c8h enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1yc2EgQnd3eEhnCm9xWXdTQjZU - Znpiak1xdE1kTm56NWI3bUNlQXBFcjhNNFlwbDVUcGhrS2J4Y1M3aXFydjVGYmVI - UmNKVmkrb3cKWHNsa2FZaE4zbnJWYVo1SDhTOEZxM0JMRWJ0ckpySk11V09LMkd5 - bjhQRkpSZG0xYko3aTFqQmVFU3JhSWo1Ugo2Nk0rNzJBNzJvbVJkU0VhSmRRWE5B - RUt4S3h1cFZkZHkxOU5VUTcxN1JBNFlaYTkyZTNSM3JVUjhCUStNODRMCjdJRWlv - d0g4bnlQMzhWSGUxY04vRnUvbTlyWVQ0eWsvbnk4UmxxOHVZblM3bVFETXJiVjRE - b2s1ZFVHaEFNc3EKSDJTYUVSNWtKQS81bUdOcDA0SnZGeE4vQkt6bFZWY1dxNm9S - YVhRdjVCb3RGaC94djZZeFhXaTZSVVYzaUJ6KwoxQXNKcU9Dbk8xYWRvaGJwSXdu - Zzk4Y09zbW54elJHdjJ6OTNyeURwZ3JJL0gvaFVRUmgyRnNBbXFJU1l5U2FwCm56 - bzc0TkVWdnNoWnBMMjlKbnZicmRxdXIwd2hCZGp5dEQ2TnBtdTZCdnJRbzIyZFhV - L1ZpVW9nZmNqQW45c0cKYnIxQTc2aEowTUprZ1pYVCt3L2NsVHJ5SWF1aHZUR1E5 - eGVrcUphWk1vVURBL2J4UlZLQXluNC82YnNhQUFOQgoKLS0tICtOTXVyUzZldUJO - QkN0eUVRSDlDWmthU0VrRUZDb0VBTVFhL24raHJDcGsKcspICwz+f6y21yogiXO3 - Qp7evIuOzfWe6pMtge5BjxWTlzIdi2btFTzuTjgZaOiQd8FIB3iTqBkepUVD49jN - RQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpSXhsMHQvb0NyUXRkRDE3 + TjVjb2orQktDMGs4U2JUS3hWdmtMdnhuYnhBCi9VU1RVblZPaW14VGxMcjM0N20z + R1pOdUJZc1ZGcjBsTnNaZGhleVR6L1kKLS0tIE5vQkFhVXd0R3ZQSzZkNmVqN1Vj + NERXdlJhVHF0NWpNT29CNlRid2NYMVUKxg7kbP6dOZDUz0uxdC45DZCAa6GQTQ1x + nIb7lvPW4xFIb0bOZuvc7cAbHjf4So+8zvA0MM4mkTmIDpnwGD5Clg== -----END AGE ENCRYPTED FILE----- - recipient: age1m4mqcd2kmuhfr8a22rvh02c68jkakhdfmuqgtusuv0czk4jvna7sz79p3y enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB3TklEaUl2QkVtVVN5UXlC - cW9RaHNoSnRkV0lKTmtYS0VZQnhyM0o0cUFNCmZWemJuOFVyK1ZFbkR1RUZOTEVB - WmJFemRrd0xIUW43cElkdVJOM052N2cKLS0tIFJpRTNtQ1hjWGJwSFJLRDNRSm4z - WW9MbmZoTllLalpWcFdOa3JpaThPMjQKa5vVGp+L1V2/ScyUe0EaOVw4TB8paS2w - 79VgplKN6HL+f6bL/0rIUOwJ6PDW944bOioKDYvbUCpBnSRYIHnYoQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrcTJGVmZUenNwYVNjRFlU + VXNBeDdpVFVtSTN5TG9VN0Q1WjRFbjlHd0Z3CjFsU1BsNkZ1a1ZkY2lva3lBUWZ3 + YUpqeEo0Tys1bDk0TEpwQTJ2U29kbjgKLS0tIFJDYWpNemY4NXZ0MkM0YWNldDBE + RU1HSUhldHpzeURaUWQvcjBCQ3pMY2cKYL87Njs4e68zu5AXKNF/hxiB3HduS8wz + o0kmGI58DZx17+Cdipw0ab9a9wiu9C9Fn+LaiCcdM/ESXtS79RzdbQ== -----END AGE ENCRYPTED FILE----- lastmodified: "2025-03-05T22:27:18Z" mac: ENC[AES256_GCM,data:WSopSnWZ+uOllywd7difaZtJcfxkL7eIf9Kr3GajZKO0+rP6pEHIS+5AbXZy6oKRlCLUPecY/WXFvk3//akpvvXHbf6Jp4fQ/YSuTcYKRQupbDBpOXSlc33QyRl6oEyiMOjxMxa2N2tmq8dmA0NbF9wSDMa5a4eNDoiL5T/sUZ8=,iv:QqbVRApzFF6q24rk8KfKuthj656nEczD9Si4INj+N9A=,tag:tMRNYo+u/jIQ6iX3KqKJdA==,type:str] pgp: - - created_at: "2025-03-07T16:05:59Z" + - created_at: "2025-03-07T22:49:19Z" enc: |- -----BEGIN PGP MESSAGE----- - hQEMAzy6JxafzLr5AQf/djnT5hse11QoFPbmuu5rmc/0vpOQ79G6MYZtHlXL/HbP - hx0r25yTI6ICayFiO7luovz58saN0BY5K1dCbGB7+nZ8lrKoGE4GhX4k5Cc/KJIO - BTEbTqMJLezkb34FsuXgD9o2udNysC3Bpi/3NbPCYsJkVeCmx1wyEWzWhz51RO4M - WEyKkE0DyJfOpTuY2fofGhaA866firFDrS2SeiU4Dox4au3iR4VYqt6IITmgZdDE - M9LRp3AzOPOUZzpeRcer4ksh8WVDIWPEEL+w+OGo8QpUL3kqHIMVPgXY0kBOR+5s - tVTCLVe7yoimK/oSYkEx9Z3TYRwKV6ggJWahX7VHaNJeAVxIon8Qs8W2L+f1gclK - tPbaE+jCg6AH3apD3ICisxCj0Vvm+NsWMo2skeN2YGyWBCOoeGcG5OhgJtD0cQiw - QxCzywMXujxYYAXJEvhk4YRhaCOMkTTMGNoloWMugg== - =CHH0 + hQEMAzy6JxafzLr5AQf/Zw+EB0lFpbul4KmHL3ndbhQCHzhkMgG6vEyj7EpjHQxE + nwf9kRrTcRh9YdrgR+5PFRnFJ8+L+gZhk+V/GaEPcEUyskOX/YGTSp1u6pXKGEem + TGojrIx0WwcmeCZUn+qCehbC7ZU64NDDmb7VeWnRkMbboU6UVooHUub88VsbnYw2 + XXtXh4G8isrbyAKzUyypnJnEVbKlVqPOL67BYczjyBqMYc1JVLmBy6nP+sv6q/yo + QyDzlunmZtu52dwAL0L6wJF+novLr4W9cso4K5UVv2sp5M8gucuiY2obiB3vNfgO + q9GZTlMWnyDGflM1w+tzpZ/Ke+sM4dSy3cXpZd+MFNJeAaBJ1owjolb4tPUXlt+W + cJ+SFLWxzH8MsPb+Hfxrt8PPCcv67uch/k50PLYs/V/EM59+mgEJe5LY4rMbUSFw + REGL3LA6Cnkl2bUeHlfG7XlztHd/ehmZM2RPKof+Qw== + =htZl -----END PGP MESSAGE----- fp: 0FECE8316E74BA6F44EFC21A2F8F21CE8721456B unencrypted_suffix: _unencrypted diff --git a/secrets/test.yaml b/secrets/test.yaml index a2a8ee9..0f9b6e7 100644 --- a/secrets/test.yaml +++ b/secrets/test.yaml @@ -15,50 +15,40 @@ sops: azure_kv: [] hc_vault: [] age: - - recipient: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxR/w+38b2lX90yNBqhq3mUmkn1WGu6GAPhN1tVp2ZjYRJNV/+5gWCnTtOWYtDx35HmK/spQ2Qy8X9ttkzORa24fysNx1Iqn/TiXhD7eIJjbGPnrOpIKTkW5/uB3SD/P5NBSa06//BaqJU4sBlG79hoXRpod052hQtdpTVDiMCIV+iboWPKqopmJJfWdBtVnHXs9rep0htPRExxGslImFk7Z6xjcaHyCpIQZPlOGf+sGsmUU7jRqzvZFV8ucIdbnAlMHrU4pepNFhuraESyZVTa/bi9sw0iozXp5Q5+5thMebEslmT1Z771kI4sieDy+O4r8c0Sx2/VY1UAzcpq1faggc3YB01MTh+tiEC6xdMvZLrQGL1NBWjHleMyL53GU5ERluC0vXJF3Hv3BGGBDfXWbrEm5n06DHr2apRVJGC0LwiQ7Woud1X4V4X1pKSusxCVMjT2lmcOwV6YhKhB2sowJc1OdMx4+tL0UWE+YKSZgBHfolwk6ml0F4EO9nnUHc= lelgenio@i15 + - recipient: age1zrgu7w8059xydagm60phnffghvfe9h2ca58cx8qwagqpyfuvs9fqw79c8h enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1yc2EgQnd3eEhnCm4zQnZFV2hJ - cFR0Z0hGeFlQd1Rtb2dDUDRJOVc3dmtWT3FIa2xOV0hRREE4LzVKQ01FTHd6M3kz - M0JLeEtXTXoKZkhnMTNETnZVc2tEbU84NWlGWk5YaUg5NjJDdk9yb01QMTVCOHlh - SDE3c0c0dUV3bXQ4MjAxYWJjYUFscmlORwplOFZLc1JzUzdjU0lCZGUyQWl4b3d0 - L3hmekNSUUZia2FOR0k3TWcyQm9xZytCakFpSGRidEJUZHQzaC9sVlppCmJBSnl0 - VW9Tb2hRME9MdmFlcUw5Z3MyV0k3V1FKQTNQZ3M0UTRLK0FvL3NOUTZ3RDBQY0M5 - UHdnLzU3VkFCME0KWTV4c29NbmIvLzl3WXJvMkhnT1gwTTBRNzV3RVVnRTdiMkpn - WmVWanB5VFpnTmhQMWRibXc4VGdhblAwWkQ1WQo0YnFjcnpnYTZITnVueTlZYzhW - OGs3MmlPcmhtaWZoU3h1T3FkbmpoMFFUN0UwQ1FDTGs5L1hGUHdJbmU5Q3haCjJG - bXAyd1lycGhELzY4ZWR2cEtmcWt4NnhXcjIyREw3cTR5d3ZoQlZySlg4Z2lwRmQ1 - cEF1VGthTkV0ekg4M2UKZS9aN0IxazdjUWhUMnBFSmYrOEdYQWdocWtQcFhtYlpN - M3FyTDdMSmpESncydnFFd3lTcE1FMEg5a1ZoTXVIRgoKLS0tIEsvb090WDRBZFdV - dFRUUms3S0J2b201OExwTy9DZERhZVlqVEdtaThkTE0KFT1RB8s+hEOJk7XGjSak - 34qTDcoBnaF0jPZ5Z0HsUx84G4Nu5teRVeHgVKyC7Iv7Gi9TkYtsdgM+q/3rdSvn - aA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBvUURIQmZvSVp3aXlFT0RR + VHVBR0drN2JyV1hNUk5sakxGRXl6SEJuOUUwClQ1Q1lRZTR5R3Z4dlZyb29OaTNW + UVcwV3h6UlhtZkg2aFhrUUtIT0tQRmsKLS0tIDlnckhHWXRKcmRwTGUzdHZxWEVh + a3ZSWk0wNm1raXdMYXdKY1hDd2dZWUEK+IFU/9vsHu70XbSJ7sKqFncrZO3NAH8/ + X/XF1VUmIuDfQZYJsDa4HaXe52xvDWTw3/4frG9HutEI2NcvvRpxlw== -----END AGE ENCRYPTED FILE----- - recipient: age1ecyynwv93lfu7crjjp8l47defv07quzfzaktwurpep7jc9eha5pscg7lrw enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5eVFsWHZZYkNrdjNraW5q - OTdmbWF6Tm02elk3NGt0TGQ3ZUoxaHp3VGdBCnVqSDRIMlRSOXdTSER2U0tDcjR1 - Tk5FcURQOW90bENWL2Nyck1CU3RBR1UKLS0tIFRZZzlNNWRtUkJmVzBHWTA3L21K - VCsyS0x4Rk83eC9UTHJvM1NJZG9DbTQKbGp6n/45qGA3rgmdxUJQKZdA1zen5kfZ - pXnExsrIhfPDx0oE2jIWGW0N8cizkCJA4k7ROGu56GqIqga9h55VTw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNRGxFWXJVcDZOdzVxaFJG + LzdhN3JKaFhPOVBlblRPNWpDdERPaWhDNkM0CmcvUGxNQ09tNTJndWZTdjFia2pl + RnNWQ0ZKSFhEN0FNbVZlKzlFUlh5QTgKLS0tIFkwc1pJajlyOGNHSTdaM3FQZWFK + NUJpRDlLNXlGOTNBbVRTU0ZMVkhqdUUK1koXmGDGTKoNx1wp4c9EknY9LQ5a7dQP + Zx6OzvtpsxL6KGjH7BeNNcm2zOR4YqnklLq09UsPHElz2upJQzECAQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-03-05T21:02:24Z" - mac: ENC[AES256_GCM,data:QfyrJrLERhs14KnuBJ0eCEUqKIBwhmQHROflBAArGlPmyVZU6KLvvOOANv+PJWk9Kt9yPU9Avwt6/e2q0jq9u2OUrvxHbqF4SWvkwhvSoSD3EOe27NGPjDLkVHOdszObo/fT8xglvc6LY8NqL9dXnUoLl58IrY7SE18F7EjrYuE=,iv:rjonQvZQjsr0oC5p3pjh1FAH/7B8SnHpAQ/qFxxfhQs=,tag:/DgHviNrSIzLyjj6ndwY0w==,type:str] + lastmodified: "2025-03-07T22:49:01Z" + mac: ENC[AES256_GCM,data:yma+7wtzVjCzlLOVpqiicjQ9YN1ttzoh8CpcAtjdtVl6gu7/3FXUKYyAWJd+1NUUpK7vN435gOq9/nsig0FRrn0Hgq0+cjFUGS6+6+SPmL97eFvti89gCOeIFhPvBnJQYJLiyVkUcBek4xW+vnt6UgrTy+sD9AT3KHdBlfu3pzY=,iv:ioswFO5KDAL3Bv7MI8V0aWXXxZZIz1M1PyMUbIMnCRI=,tag:5fUBtqz9J2qvY4fUT2ueoQ==,type:str] pgp: - - created_at: "2025-03-05T21:28:21Z" + - created_at: "2025-03-07T22:49:20Z" enc: |- -----BEGIN PGP MESSAGE----- - hQEMAzy6JxafzLr5AQf/aiSW1yeJJ3VLiJ6I+vafWPVe702+6IstICKNdTz4AFgo - 2yUkY/alpgkcH1ybAiRQK0lOs63NBL51Pe2XsKAWXTlHVgFU0B6e+7YoDuwPWnTP - dyTASd+++EAbf0l7bIVQbx28Ib5F5DZyB1VMhhGAZXQqURJGQpLrSqzaoMFPGodg - V7whjtOaEmtFKNhNeRIdrnTW2raeKO0J3mQ5nawCekeIHnx22NxCIbhBMsKpF8EH - 3SZSCNiGrrfbLZFHcM/P5N5qEPc53r9Zvpxcwc8NayIS3kUPwLqKmvhCbRW3WOr0 - 2fc8TQgHTWEYSRSYIVw5vPHWs4+3T4cjdGb0atJ4rtJeAUnGlwchAvxLfFFG096r - SDdiJBBZ03r31EJqnplNwwitKyR4jj+HaM/CNmtSFo7c99iA91A7C1PBri+NpuCK - Fr0JVEom4Fm9WY7BMPduiLN77XLB0aaYN7zu7pwdYA== - =4URT + hQEMAzy6JxafzLr5AQf/Xok7aBMNT6W3LV2Ekx/ccxEZaZ0aVNKHE9aFTz5kBSpu + cXVohu5mEgeXr++HbrsCI821/gfchQ1yzVSLJsSrmZdJ586c3a7pWx2Eo4pcngmy + vb5UWtTBNogABnLz4iTjVQYLjZeNcNhkzW6s3m9PiaX3AvJP9irPcmwIyYpzd9pt + hngnBsdTis52fmvZ6+wOuMyTZU0Iksknom1De8xqgR5ZuO0Vitt19RGbpVhx96AC + t1CUkb5WMFTdpbCFORa/ta9Z7UcKxXTAPsfPkPVG9DnHQ1jSmsJWPDQZxoIJLHuH + SVV+qfRGndOo9fjExCInX6I5wBlrHrdpGtL7VLczV9JeAXYlMJwH63eOyi8hxxtr + KfTJEIALC25uFhoK8bmr30yVZe7thUPMXfht+R5dlHne7+FcBb4k7YLpeN/M40me + CSKk+9YaG7gQIdrfvEXlHSPCPppcKev6ZUspHewhmQ== + =IMON -----END PGP MESSAGE----- fp: 0FECE8316E74BA6F44EFC21A2F8F21CE8721456B unencrypted_suffix: _unencrypted diff --git a/system/sops.nix b/system/sops.nix index 673d1c1..d868153 100644 --- a/system/sops.nix +++ b/system/sops.nix @@ -1,12 +1,15 @@ { pkgs, ... }: { environment.systemPackages = with pkgs; [ - sops-master + sops gnupg ]; sops = { defaultSopsFile = ../secrets/test.yaml; - age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; + age.sshKeyPaths = [ + "/etc/ssh/ssh_host_ed25519_key" + "/home/lelgenio/.ssh/id_ed25519" + ]; }; } From 5a5b544caa6e5f16d064a3c22e16a7895554739f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 7 Mar 2025 19:57:53 -0300 Subject: [PATCH 345/404] swaylock: fix cache miss --- user/sway/swaylock.nix | 2 +- user/variables.nix | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/user/sway/swaylock.nix b/user/sway/swaylock.nix index 8d0a195..ceb2e6b 100644 --- a/user/sway/swaylock.nix +++ b/user/sway/swaylock.nix @@ -9,7 +9,7 @@ in options.my.swaylock.enable = lib.mkEnableOption { }; config.programs.swaylock.settings = lib.mkIf cfg.enable { - image = toString theme.background; + image = theme.backgroundPath; font = font.interface; font-size = font.size.medium; indicator-thickness = 20; diff --git a/user/variables.nix b/user/variables.nix index cb35123..84823d3 100644 --- a/user/variables.nix +++ b/user/variables.nix @@ -28,6 +28,7 @@ let cursor_theme = "Bibata-Modern-Classic"; background = ./backgrounds/nixos-dark-pattern.png; + backgroundPath = "~/.local/share/backgrounds/nixos-dark-pattern.png"; opacity = 95; opacityHex = "ee"; color = { @@ -59,6 +60,7 @@ let cursor_theme = "Bibata-Modern-Classic"; background = ./backgrounds/nixos-light-pattern.png; + backgroundPath = "~/.local/share/backgrounds/nixos-light-pattern.png"; opacity = 95; opacityHex = "ee"; color = { From 36ec5ef63cd7169df5f4fc52d486ce6999206d83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 8 Mar 2025 01:19:28 -0300 Subject: [PATCH 346/404] git: update config --- user/git.nix | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/user/git.nix b/user/git.nix index bfc85c1..9e76e01 100644 --- a/user/git.nix +++ b/user/git.nix @@ -18,15 +18,40 @@ in email = mail.personal.user; }; init.defaultBranch = "main"; + core = { + fsmonitor = true; + untrackedCache = true; + }; commit.verbose = true; - push.autoSetupRemote = true; + fetch = { + prune = true; + pruneTags = true; + all = true; + }; + push = { + autoSetupRemote = true; + default = "simple"; + followTags = true; + }; pull.rebase = true; - merge.conflictStyle = "diff3"; - rerere.enabled = true; + tag.sort = "version:refname"; + merge.conflictStyle = "zdiff3"; + rerere = { + enabled = true; + autoupdate = true; + }; + branch.sort = "-committerdate"; + diff = { + algorithm = "histogram"; + colorMoved = "plain"; + mnemonicPrefix = true; + renames = true; + }; rebase = { abbreviateCommands = true; autoSquash = true; autoStash = true; + updateRefs = true; }; pager = { log = "${pkgs._diffr}/bin/_diffr | ${pkgs.kak-pager}/bin/kak-pager"; From fac1976c9c19eb51a9fb68746fb51b8265fa606d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 12 Mar 2025 11:37:29 -0300 Subject: [PATCH 347/404] phantom: fix mastodon data mount --- hosts/phantom/hardware-config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/phantom/hardware-config.nix b/hosts/phantom/hardware-config.nix index afea081..7eebde8 100644 --- a/hosts/phantom/hardware-config.nix +++ b/hosts/phantom/hardware-config.nix @@ -5,7 +5,7 @@ options = [ "nofail" ]; }; fileSystems."/var/lib/mastodon" = { - device = "172.16.130.7:/nas/5749/mastodon"; + device = "172.16.131.19:/nas/5749/mastodon"; fsType = "nfs"; options = [ "nofail" ]; }; From 6e5eebe3c18de474f0c0ebbc3fe51794428ba53b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 12 Mar 2025 11:38:39 -0300 Subject: [PATCH 348/404] amdgpu: limit fan speed --- hosts/monolith/amdgpu.nix | 2 +- scripts/amd-fan-control | 33 +++++++++++++++++++++++++++++---- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/hosts/monolith/amdgpu.nix b/hosts/monolith/amdgpu.nix index 765e081..2554500 100644 --- a/hosts/monolith/amdgpu.nix +++ b/hosts/monolith/amdgpu.nix @@ -18,7 +18,7 @@ in systemd.services.amd-fan-control = { script = '' - ${lib.getExe pkgs.amd-fan-control} /sys/class/drm/card1/device 60 85 + ${lib.getExe pkgs.amd-fan-control} /sys/class/drm/card1/device 60 90 0 80 ''; serviceConfig = { Restart = "always"; diff --git a/scripts/amd-fan-control b/scripts/amd-fan-control index 1f4c3e7..5b0d7a9 100755 --- a/scripts/amd-fan-control +++ b/scripts/amd-fan-control @@ -39,10 +39,31 @@ if [ -z "$TEMP_MAX" ];then bail "No maximum temperature provided" fi -PWM_MIN=0 -PWM_MAX=255 +PWM_MIN_PCT="$4" +PWM_MAX_PCT="$5" + +if [ -z "$PWM_MIN_PCT" ];then + bail "No minimum fan speed % not provided" +fi + +if [ -z "$PWM_MAX_PCT" ];then + bail "No maximum fan speed % not provided" +fi + +PWM_MIN="$(( $PWM_MIN_PCT * 255 / 100))" +PWM_MAX="$(( $PWM_MAX_PCT * 255 / 100))" echo "Running..." >&2 + +echo "TEMP_MIN=$TEMP_MIN°C" +echo "TEMP_MAX=$TEMP_MAX°C" +echo "FAN_MIN=$PWM_MIN_PCT%" +echo "FAN_MAX=$PWM_MAX_PCT%" + +echo 1 > "$HWMON/pwm1_enable" + +PREV=0 + while true; do TEMPERATURE_RAW=$(cat "$TEMP_INPUT") TEMPERATURE="$(( $TEMPERATURE_RAW / 1000 ))" @@ -55,7 +76,11 @@ while true; do PWM=$PWM_MIN fi - echo 1 > "$HWMON/pwm1_enable" - echo "$PWM" > "$HWMON/pwm1" + AVG="$(( ($PWM * 20 + $PREV * 80) / 100 ))" + + echo "$AVG" + + echo "$AVG" > "$HWMON/pwm1" + PREV="$AVG" sleep .1s done From cef96416d86f962ad52aa996a15815ef455a6ef9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 12 Mar 2025 23:29:31 -0300 Subject: [PATCH 349/404] factorio: 2.0.32 -> 2.0.39 --- pkgs/factorio-headless/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/factorio-headless/default.nix b/pkgs/factorio-headless/default.nix index 531e69b..46064b5 100644 --- a/pkgs/factorio-headless/default.nix +++ b/pkgs/factorio-headless/default.nix @@ -1,10 +1,10 @@ { factorio-headless, pkgs }: factorio-headless.overrideAttrs (_: rec { - version = "2.0.32"; + version = "2.0.39"; src = pkgs.fetchurl { name = "factorio_headless_x64-${version}.tar.xz"; url = "https://www.factorio.com/get-download/${version}/headless/linux64"; - hash = "sha256-KmECrkLcxej+kjvWi80yalaeNZEqzeEhMB5dTS2FZBc="; + hash = "sha256-D4o9DkN5e1/02LhdfDNLCVo/B9mqf4Cx6H+Uk5qT3zQ="; }; }) From 7d15904e7c2a5274287ce480c8ffefa0e6fdea94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 15 Mar 2025 01:03:19 -0300 Subject: [PATCH 350/404] git: sign commits --- user/git.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/user/git.nix b/user/git.nix index 9e76e01..d411d35 100644 --- a/user/git.nix +++ b/user/git.nix @@ -16,13 +16,17 @@ in user = { name = username; email = mail.personal.user; + signingkey = "2F8F21CE8721456B"; }; init.defaultBranch = "main"; core = { fsmonitor = true; untrackedCache = true; }; - commit.verbose = true; + commit = { + verbose = true; + gpgsign = true; + }; fetch = { prune = true; pruneTags = true; From c51d9ee3f11bbb2bb9ab1dfa67d4754b44fc14e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 19 Mar 2025 11:47:36 -0300 Subject: [PATCH 351/404] system: add nix-ld --- hosts/monolith/default.nix | 1 + system/configuration.nix | 1 + system/nix-ld.nix | 21 +++++++++++++++++++++ user/dummy.nix | 1 + 4 files changed, 24 insertions(+) create mode 100644 system/nix-ld.nix diff --git a/hosts/monolith/default.nix b/hosts/monolith/default.nix index 410300e..280cc3f 100644 --- a/hosts/monolith/default.nix +++ b/hosts/monolith/default.nix @@ -42,6 +42,7 @@ in }; my.gaming.enable = true; + my.nix-ld.enable = true; boot.extraModulePackages = with config.boot.kernelPackages; [ zenpower ]; diff --git a/system/configuration.nix b/system/configuration.nix index f515e43..2380d22 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -17,6 +17,7 @@ ./locale.nix ./users.nix ./containers.nix + ./nix-ld.nix ./network.nix ../settings ]; diff --git a/system/nix-ld.nix b/system/nix-ld.nix new file mode 100644 index 0000000..33afa69 --- /dev/null +++ b/system/nix-ld.nix @@ -0,0 +1,21 @@ +{ + pkgs, + lib, + config, + ... +}: +{ + options.my.nix-ld.enable = lib.mkEnableOption { }; + + config = lib.mkIf (config.my.nix-ld.enable) { + programs.nix-ld = { + enable = true; + libraries = + with pkgs; + # run appimages + linux games natively + [ fuse ] + ++ (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) + ++ (appimageTools.defaultFhsEnvArgs.targetPkgs pkgs); + }; + }; +} diff --git a/user/dummy.nix b/user/dummy.nix index 39043dd..91e66cc 100644 --- a/user/dummy.nix +++ b/user/dummy.nix @@ -1,6 +1,7 @@ { lib, ... }: { options.my = { + nix-ld.enable = lib.mkEnableOption { }; android.enable = lib.mkEnableOption { }; media-packages.enable = lib.mkEnableOption { }; containers.enable = lib.mkEnableOption { }; From 35ba974c1b27d54a1b1348412829c440b5a361f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 19 Mar 2025 11:48:00 -0300 Subject: [PATCH 352/404] system: install aditional appimage support --- system/containers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/system/containers.nix b/system/containers.nix index 9032a6c..ddd3e38 100644 --- a/system/containers.nix +++ b/system/containers.nix @@ -9,6 +9,7 @@ config = lib.mkIf config.my.containers.enable { services.flatpak.enable = true; + programs.appimage.enable = true; virtualisation.docker = { enable = true; From ca9e0d8653e2f0e1d531bae5b71b3808a6a79bb0 Mon Sep 17 00:00:00 2001 From: lelgenio Date: Thu, 20 Mar 2025 16:40:47 -0300 Subject: [PATCH 353/404] double-rainbow: use nix-ld --- hosts/double-rainbow.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/double-rainbow.nix b/hosts/double-rainbow.nix index af8c5e4..2270198 100644 --- a/hosts/double-rainbow.nix +++ b/hosts/double-rainbow.nix @@ -19,6 +19,8 @@ in { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; + my.nix-ld.enable = true; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" From d2654ca5bc27fc20439915be4eacaf834a2735a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 21 Mar 2025 23:23:52 -0300 Subject: [PATCH 354/404] phantom: add travel counter goof --- flake.lock | 17 +++++++++++++++++ flake.nix | 4 ++++ hosts/phantom/goofs.nix | 5 +++++ 3 files changed, 26 insertions(+) diff --git a/flake.lock b/flake.lock index cabf4cf..c1f716c 100644 --- a/flake.lock +++ b/flake.lock @@ -73,6 +73,22 @@ "url": "https://git.lelgenio.com/lelgenio/catboy-spinner" } }, + "contador-da-viagem": { + "flake": false, + "locked": { + "lastModified": 1742597480, + "narHash": "sha256-aN+Kioc4AWPMyJxfz/zFCo2YdP4YxcPqoUcp46z9KcA=", + "ref": "refs/heads/main", + "rev": "29dde9d1965b1f8c1b870185a95859c050ba847d", + "revCount": 3, + "type": "git", + "url": "https://git.lelgenio.com/lelgenio/contador-da-viagem" + }, + "original": { + "type": "git", + "url": "https://git.lelgenio.com/lelgenio/contador-da-viagem" + } + }, "crane": { "inputs": { "flake-compat": "flake-compat", @@ -709,6 +725,7 @@ "inputs": { "agenix": "agenix", "catboy-spinner": "catboy-spinner", + "contador-da-viagem": "contador-da-viagem", "demoji": "demoji", "dhist": "dhist", "disko": "disko", diff --git a/flake.nix b/flake.nix index fd1bac2..8994009 100644 --- a/flake.nix +++ b/flake.nix @@ -56,6 +56,10 @@ wl-crosshair.url = "github:lelgenio/wl-crosshair"; warthunder-leak-counter.url = "git+https://git.lelgenio.com/lelgenio/warthunder-leak-counter"; made-you-look.url = "git+https://git.lelgenio.com/lelgenio/made-you-look"; + contador-da-viagem = { + url = "git+https://git.lelgenio.com/lelgenio/contador-da-viagem"; + flake = false; + }; catboy-spinner = { url = "git+https://git.lelgenio.com/lelgenio/catboy-spinner"; flake = false; diff --git a/hosts/phantom/goofs.nix b/hosts/phantom/goofs.nix index c0b670a..dfb5736 100644 --- a/hosts/phantom/goofs.nix +++ b/hosts/phantom/goofs.nix @@ -43,4 +43,9 @@ forceSSL = true; root = inputs.hello-fonts; }; + services.nginx.virtualHosts."contador-da-viagem.lelgenio.com" = { + enableACME = true; + forceSSL = true; + root = inputs.contador-da-viagem; + }; } From 3c7da418dffaa36c150970d74e20351f9da7f676 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 20 Mar 2025 20:31:27 -0300 Subject: [PATCH 355/404] gnome: install menulibre --- user/gnome.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/user/gnome.nix b/user/gnome.nix index 74951c7..776f095 100644 --- a/user/gnome.nix +++ b/user/gnome.nix @@ -35,6 +35,7 @@ lib.mkIf (config.my.desktop == "gnome") { amberol pitivi keepassxc + menulibre libsForQt5.qt5ct libsForQt5.qtstyleplugin-kvantum From 0f161863fc8eef929aec742ab1c89e1f79293e43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 20 Mar 2025 20:51:33 -0300 Subject: [PATCH 356/404] firefox: remove header styling --- user/firefox.nix | 41 +---------------------------------------- 1 file changed, 1 insertion(+), 40 deletions(-) diff --git a/user/firefox.nix b/user/firefox.nix index 4b69ad2..7d8d65f 100644 --- a/user/firefox.nix +++ b/user/firefox.nix @@ -127,46 +127,7 @@ in #sidebar-header { display: none !important; } '' else - '' - /* Element | chrome://browser/content/browser.xhtml */ - - #navigator-toolbox { - display: grid; - grid-template-columns: 1fr 50px; - overflow: hidden; - } - - /* Element | chrome://browser/content/browser.xhtml */ - - #nav-bar { - flex: 1; - width: 100%; - grid-column: 1 / 3; - grid-row: 1; - z-index: 0; - padding-right: 29px !important; - } - - /* Element | chrome://browser/content/browser.xhtml */ - - .toolbar-items { - display: none; - } - - /* Element | chrome://browser/content/browser.xhtml */ - - #TabsToolbar { - max-width: 50px; - } - - /* Element | chrome://browser/content/browser.xhtml */ - - #titlebar { - max-width: 50px; - grid-area: 1 / 2; - z-index: 10; - } - ''; + ""; }; }; }; From a432569595c9300db6e882037bd3f1cb1f9623dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 21 Mar 2025 00:55:53 -0300 Subject: [PATCH 357/404] update --- flake.lock | 60 +++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index c1f716c..e0843d6 100644 --- a/flake.lock +++ b/flake.lock @@ -225,11 +225,11 @@ ] }, "locked": { - "lastModified": 1740485968, - "narHash": "sha256-WK+PZHbfDjLyveXAxpnrfagiFgZWaTJglewBWniTn2Y=", + "lastModified": 1741786315, + "narHash": "sha256-VT65AE2syHVj6v/DGB496bqBnu1PXrrzwlw07/Zpllc=", "owner": "nix-community", "repo": "disko", - "rev": "19c1140419c4f1cdf88ad4c1cfb6605597628940", + "rev": "0d8c6ad4a43906d14abd5c60e0ffe7b587b213de", "type": "github" }, "original": { @@ -243,11 +243,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1739502527, - "narHash": "sha256-KMLNOCWmqdDeAZV5O1ccRmVqRutDcy4IONJin3lzd0Q=", + "lastModified": 1742179690, + "narHash": "sha256-s/q3OWRe5m7kwDcAs1BhJEj6aHc5bsBxRnLP7DM77xE=", "owner": "lelgenio", "repo": "dzgui-nix", - "rev": "06fcea9445b5a005b40469a69f57f2147398bc94", + "rev": "a6d68720c932ac26d549b24f17c776bd2aeb73b4", "type": "github" }, "original": { @@ -456,11 +456,11 @@ ] }, "locked": { - "lastModified": 1739757849, - "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=", + "lastModified": 1742234739, + "narHash": "sha256-zFL6zsf/5OztR1NSNQF33dvS1fL/BzVUjabZq4qrtY4=", "owner": "nix-community", "repo": "home-manager", - "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe", + "rev": "f6af7280a3390e65c2ad8fd059cdc303426cbd59", "type": "github" }, "original": { @@ -497,11 +497,11 @@ ] }, "locked": { - "lastModified": 1740281615, - "narHash": "sha256-dZWcbAQ1sF8oVv+zjSKkPVY0ebwENQEkz5vc6muXbKY=", + "lastModified": 1742174123, + "narHash": "sha256-pDNzMoR6m1ZSJToZQ6XDTLVSdzIzmFl1b8Pc3f7iV6Y=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "465792533d03e6bb9dc849d58ab9d5e31fac9023", + "rev": "2cfb4e1ca32f59dd2811d7a6dd5d4d1225f0955c", "type": "github" }, "original": { @@ -520,11 +520,11 @@ "nixpkgs-24_11": "nixpkgs-24_11" }, "locked": { - "lastModified": 1740437053, - "narHash": "sha256-exPTta4qI1ka9sk+jPcLogGffJ1OVXnAsTRqpeAXeNw=", + "lastModified": 1742413977, + "narHash": "sha256-NkhM9GVu3HL+MiXtGD0TjuPCQ4GFVJPBZ8KyI2cFDGU=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "c8ec4d5e432f5df4838eacd39c11828d23ce66ec", + "rev": "b4fbffe79c00f19be94b86b4144ff67541613659", "type": "gitlab" }, "original": { @@ -567,11 +567,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1740560979, - "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", + "lastModified": 1742422364, + "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5135c59491985879812717f4c9fea69604e7f26f", + "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", "type": "github" }, "original": { @@ -628,11 +628,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1740603184, - "narHash": "sha256-t+VaahjQAWyA+Ctn2idyo1yxRIYpaDxMgHkgCNiMJa4=", + "lastModified": 1742388435, + "narHash": "sha256-GheQGRNYAhHsvPxWVOhAmg9lZKkis22UPbEHlmZMthg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f44bd8ca21e026135061a0a57dcf3d0775b67a49", + "rev": "b75693fb46bfaf09e662d09ec076c5a162efa9f6", "type": "github" }, "original": { @@ -800,11 +800,11 @@ ] }, "locked": { - "lastModified": 1741043164, - "narHash": "sha256-9lfmSZLz6eq9Ygr6cCmvQiiBEaPb54pUBcjvbEMPORc=", + "lastModified": 1742406979, + "narHash": "sha256-r0aq70/3bmfjTP+JZs4+XV5SgmCtk1BLU4CQPWGtA7o=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3f2412536eeece783f0d0ad3861417f347219f4d", + "rev": "1770be8ad89e41f1ed5a60ce628dd10877cb3609", "type": "github" }, "original": { @@ -960,11 +960,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1739829690, - "narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=", + "lastModified": 1742370146, + "narHash": "sha256-XRE8hL4vKIQyVMDXykFh4ceo3KSpuJF3ts8GKwh5bIU=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "3d0579f5cc93436052d94b73925b48973a104204", + "rev": "adc195eef5da3606891cedf80c0d9ce2d3190808", "type": "github" }, "original": { @@ -975,11 +975,11 @@ }, "vpsadminos": { "locked": { - "lastModified": 1740754923, - "narHash": "sha256-o7Qo5kkjVgBL9CVqNJKnkcDbRkpD0UAp82G/mJ086Xw=", + "lastModified": 1742222981, + "narHash": "sha256-EDhfWimpzUnpH5h/FQ3oYw/Kaq4Cx1E5nRofDQyI3aE=", "owner": "vpsfreecz", "repo": "vpsadminos", - "rev": "3a9df8fbe84b680ad0a38ec85e8e9c8a4f095ca3", + "rev": "14da38b9a49bf156e06f20ed02533a0549e6d487", "type": "github" }, "original": { From 4ebfaca007c8b77d3942979ae49528258d6339d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sun, 23 Mar 2025 16:30:08 -0300 Subject: [PATCH 358/404] factorio: update backup script filename to fix syncthing integration --- hosts/monolith/factorio-server.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hosts/monolith/factorio-server.nix b/hosts/monolith/factorio-server.nix index 8ed0324..9648de3 100644 --- a/hosts/monolith/factorio-server.nix +++ b/hosts/monolith/factorio-server.nix @@ -23,11 +23,12 @@ systemd.services.factorio-backup-save = { description = "Backup factorio saves"; script = '' + FILENAME="space-age-$(date --iso=seconds | tr ':' '_').zip" ${lib.getExe pkgs.rsync} \ -av \ --chown=lelgenio \ /var/lib/factorio/saves/default.zip \ - ~lelgenio/Documentos/GameSaves/factorio_saves/space-age-$(date --iso=seconds).zip + ~lelgenio/Documentos/GameSaves/factorio_saves/$FILENAME ''; serviceConfig.Type = "oneshot"; wantedBy = [ "multi-user.target" ]; From 0f61393bf36b14ee0293c191fdefb1b3845c387e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 26 Mar 2025 21:58:24 -0300 Subject: [PATCH 359/404] refactor: move rm-target service and timer to separate file --- user/home.nix | 25 +------------------------ user/rm-target.nix | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 24 deletions(-) create mode 100644 user/rm-target.nix diff --git a/user/home.nix b/user/home.nix index c384c60..271ceee 100644 --- a/user/home.nix +++ b/user/home.nix @@ -44,6 +44,7 @@ inputs.nix-index-database.hmModules.nix-index ../settings ./powerplay-led-idle.nix + ./rm-target.nix ]; my = import ./variables.nix // { @@ -169,30 +170,6 @@ exec nicotine ''; - systemd.user.services.rm-target = { - Unit = { - Description = "Remove directories named 'target'"; - }; - Service = { - Type = "oneshot"; - ExecStart = pkgs.writeShellScript "rm-target" '' - sudo ${pkgs.fd}/bin/fd -td -u '^\.?target$' "$HOME" -x rm -vrf -- - ''; - }; - }; - systemd.user.timers.rm-target = { - Unit = { - Description = "Remove directories named 'target'"; - }; - Timer = { - OnCalendar = "weekly"; - Unit = "rm-target.service"; - }; - Install = { - WantedBy = [ "timers.target" ]; - }; - }; - # This value determines the Home Manager release that your # configuration is compatible with. This helps avoid breakage # when a new Home Manager release introduces backwards diff --git a/user/rm-target.nix b/user/rm-target.nix new file mode 100644 index 0000000..93c6058 --- /dev/null +++ b/user/rm-target.nix @@ -0,0 +1,26 @@ +{ pkgs, lib, ... }: +{ + systemd.user.services.rm-target = { + Unit = { + Description = "Remove directories named 'target'"; + }; + Service = { + Type = "oneshot"; + ExecStart = pkgs.writeShellScript "rm-target" '' + sudo ${pkgs.fd}/bin/fd -td -u '^\.?target$' "$HOME" -x rm -vrf -- + ''; + }; + }; + systemd.user.timers.rm-target = { + Unit = { + Description = "Remove directories named 'target'"; + }; + Timer = { + OnCalendar = "weekly"; + Unit = "rm-target.service"; + }; + Install = { + WantedBy = [ "timers.target" ]; + }; + }; +} From 8cae611cd5612135263723cb8321f6c11340556a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 27 Mar 2025 01:07:27 -0300 Subject: [PATCH 360/404] home: add automatic home-manager cleanup service --- user/home-manager.nix | 28 ++++++++++++++++++++++++++++ user/home.nix | 3 +-- 2 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 user/home-manager.nix diff --git a/user/home-manager.nix b/user/home-manager.nix new file mode 100644 index 0000000..9c8452a --- /dev/null +++ b/user/home-manager.nix @@ -0,0 +1,28 @@ +{ pkgs, lib, ... }: +{ + programs.home-manager.enable = true; + + systemd.user.services.home-manager-expire = { + Unit = { + Description = "Remove old home-manager generations"; + }; + Service = { + Type = "oneshot"; + ExecStart = pkgs.writeShellScript "home-manager-expire" '' + ${lib.getExe pkgs.home-manager} expire-generations 7d + ''; + }; + }; + systemd.user.timers.home-manager-expire = { + Unit = { + Description = "Remove old home-manager generations"; + }; + Timer = { + OnCalendar = "daily"; + Unit = "home-manager-expire.service"; + }; + Install = { + WantedBy = [ "timers.target" ]; + }; + }; +} diff --git a/user/home.nix b/user/home.nix index 271ceee..31e3871 100644 --- a/user/home.nix +++ b/user/home.nix @@ -9,6 +9,7 @@ { imports = [ ./dummy.nix + ./home-manager.nix ./waybar ./helix.nix ./kakoune @@ -58,8 +59,6 @@ home.username = "lelgenio"; home.homeDirectory = "/home/lelgenio"; - # Let Home Manager install and manage itself. - programs.home-manager.enable = true; home.packages = with pkgs; [ terminal From 0a0b8f9e610867fdac84722befd9b13f35f0104e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 27 Mar 2025 21:09:14 -0300 Subject: [PATCH 361/404] gammastep: extract config --- user/sway/default.nix | 6 ++---- user/sway/gammastep.nix | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 user/sway/gammastep.nix diff --git a/user/sway/default.nix b/user/sway/default.nix index 04193aa..046ae07 100644 --- a/user/sway/default.nix +++ b/user/sway/default.nix @@ -20,6 +20,7 @@ in ./swayidle.nix ./swaylock.nix ./theme.nix + ./gammastep.nix ]; options.my.sway.enable = lib.mkEnableOption { }; @@ -32,6 +33,7 @@ in my.mpd.enable = true; my.zathura.enable = true; my.waybar.enable = true; + my.gammastep.enable = true; wayland.windowManager.sway = { enable = true; @@ -115,10 +117,6 @@ in exec_always systemctl --user restart waybar.service ''; }; - services.gammastep = { - enable = true; - provider = "geoclue2"; - }; services.kdeconnect = { enable = true; diff --git a/user/sway/gammastep.nix b/user/sway/gammastep.nix new file mode 100644 index 0000000..a5b6917 --- /dev/null +++ b/user/sway/gammastep.nix @@ -0,0 +1,19 @@ +{ config, lib, ... }: +let + cfg = config.my.gammastep; +in +{ + options.my.gammastep.enable = lib.mkEnableOption { }; + + config = lib.mkIf cfg.enable { + services.gammastep = { + enable = true; + dawnTime = "6:00-7:45"; + duskTime = "18:35-20:15"; + temperature = { + day = 6500; + night = 4500; + }; + }; + }; +} From 921413f545403e2ea91e19602831dd9fe5bed020 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 28 Mar 2025 20:22:34 -0300 Subject: [PATCH 362/404] firefox: update userchrome --- user/firefox.nix | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/user/firefox.nix b/user/firefox.nix index 7d8d65f..5e38a56 100644 --- a/user/firefox.nix +++ b/user/firefox.nix @@ -2,15 +2,22 @@ config, pkgs, lib, - font, ... }: let - inherit (config.my) desktop browser; + inherit (config.my) desktop; + inherit (config.my.theme) color; + bugfixedFirefox = pkgs.firefox-devedition-unwrapped // { requireSigning = false; allowAddonSideload = true; }; + + swayCustomization = '' + #titlebar { display: none !important; } + #TabsToolbar { display: none !important; } + #sidebar-header { display: none !important; } + ''; in { config = { @@ -119,15 +126,17 @@ in "devtools.chrome.enabled" = true; "devtools.debugger.remote-enabled" = true; }; - userChrome = - if desktop == "sway" then - '' - #titlebar { display: none !important; } - #TabsToolbar { display: none !important; } - #sidebar-header { display: none !important; } - '' - else - ""; + userChrome = '' + ${lib.optionalString (desktop == "sway") swayCustomization} + + #sidebar-main { + background-color: ${color.bg}; + } + + #tabbrowser-tabbox { + outline-width: 0 !important; + } + ''; }; }; }; From 9239cbef77d1e3312eb7a8d076cc0d4f671d1fe0 Mon Sep 17 00:00:00 2001 From: lelgenio Date: Wed, 2 Apr 2025 17:11:01 -0300 Subject: [PATCH 363/404] kakoune: add json and yaml formatter --- user/kakoune/filetypes.kak | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/user/kakoune/filetypes.kak b/user/kakoune/filetypes.kak index 7ea774e..01b0175 100644 --- a/user/kakoune/filetypes.kak +++ b/user/kakoune/filetypes.kak @@ -15,6 +15,14 @@ hook global WinSetOption filetype=nix %{ set buffer formatcmd 'nixfmt' } +hook global BufCreate .*\.json %{ + set buffer formatcmd 'prettier --parser json' +} + +hook global BufCreate .*\.ya?ml %{ + set buffer formatcmd 'prettier --parser yaml' +} + hook global BufCreate .*\.html %{ set buffer formatcmd 'prettier --parser html' } From 1054e831d8d48099895bb2edc30fb51662281c11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 31 Mar 2025 08:05:09 -0300 Subject: [PATCH 364/404] update --- flake.lock | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/flake.lock b/flake.lock index e0843d6..69ae3c0 100644 --- a/flake.lock +++ b/flake.lock @@ -76,11 +76,11 @@ "contador-da-viagem": { "flake": false, "locked": { - "lastModified": 1742597480, - "narHash": "sha256-aN+Kioc4AWPMyJxfz/zFCo2YdP4YxcPqoUcp46z9KcA=", + "lastModified": 1742610036, + "narHash": "sha256-sY1iheemazmIVJAnoFtut6cN7HX/C5OMDY54UrmCoqE=", "ref": "refs/heads/main", - "rev": "29dde9d1965b1f8c1b870185a95859c050ba847d", - "revCount": 3, + "rev": "efe5ac4a16de7f78824ac89dc987ef635afa5267", + "revCount": 4, "type": "git", "url": "https://git.lelgenio.com/lelgenio/contador-da-viagem" }, @@ -456,11 +456,11 @@ ] }, "locked": { - "lastModified": 1742234739, - "narHash": "sha256-zFL6zsf/5OztR1NSNQF33dvS1fL/BzVUjabZq4qrtY4=", + "lastModified": 1742655702, + "narHash": "sha256-jbqlw4sPArFtNtA1s3kLg7/A4fzP4GLk9bGbtUJg0JQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "f6af7280a3390e65c2ad8fd059cdc303426cbd59", + "rev": "0948aeedc296f964140d9429223c7e4a0702a1ff", "type": "github" }, "original": { @@ -497,11 +497,11 @@ ] }, "locked": { - "lastModified": 1742174123, - "narHash": "sha256-pDNzMoR6m1ZSJToZQ6XDTLVSdzIzmFl1b8Pc3f7iV6Y=", + "lastModified": 1742701275, + "narHash": "sha256-AulwPVrS9859t+eJ61v24wH/nfBEIDSXYxlRo3fL/SA=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "2cfb4e1ca32f59dd2811d7a6dd5d4d1225f0955c", + "rev": "36dc43cb50d5d20f90a28d53abb33a32b0a2aae6", "type": "github" }, "original": { @@ -567,11 +567,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1742422364, - "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", + "lastModified": 1743095683, + "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", + "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", "type": "github" }, "original": { @@ -628,11 +628,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1742388435, - "narHash": "sha256-GheQGRNYAhHsvPxWVOhAmg9lZKkis22UPbEHlmZMthg=", + "lastModified": 1742937945, + "narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b75693fb46bfaf09e662d09ec076c5a162efa9f6", + "rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7", "type": "github" }, "original": { @@ -800,11 +800,11 @@ ] }, "locked": { - "lastModified": 1742406979, - "narHash": "sha256-r0aq70/3bmfjTP+JZs4+XV5SgmCtk1BLU4CQPWGtA7o=", + "lastModified": 1742700801, + "narHash": "sha256-ZGlpUDsuBdeZeTNgoMv+aw0ByXT2J3wkYw9kJwkAS4M=", "owner": "Mic92", "repo": "sops-nix", - "rev": "1770be8ad89e41f1ed5a60ce628dd10877cb3609", + "rev": "67566fe68a8bed2a7b1175fdfb0697ed22ae8852", "type": "github" }, "original": { @@ -960,11 +960,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1742370146, - "narHash": "sha256-XRE8hL4vKIQyVMDXykFh4ceo3KSpuJF3ts8GKwh5bIU=", + "lastModified": 1743081648, + "narHash": "sha256-WRAylyYptt6OX5eCEBWyTwOEqEtD6zt33rlUkr6u3cE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "adc195eef5da3606891cedf80c0d9ce2d3190808", + "rev": "29a3d7b768c70addce17af0869f6e2bd8f5be4b7", "type": "github" }, "original": { @@ -975,11 +975,11 @@ }, "vpsadminos": { "locked": { - "lastModified": 1742222981, - "narHash": "sha256-EDhfWimpzUnpH5h/FQ3oYw/Kaq4Cx1E5nRofDQyI3aE=", + "lastModified": 1743047409, + "narHash": "sha256-WTUW2GZqHknVwEbzF/TeX2eg52414gfl6hXloDDwEsQ=", "owner": "vpsfreecz", "repo": "vpsadminos", - "rev": "14da38b9a49bf156e06f20ed02533a0549e6d487", + "rev": "cf9324b9ff855172bd9de8aa3b8215071c4a0c6f", "type": "github" }, "original": { From caffa85ba020a5f18755c2647224145dd1dbb671 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 4 Apr 2025 21:01:39 -0300 Subject: [PATCH 365/404] ranger: disable preview scripts and vcs support, making it very fast --- user/ranger/rc.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/user/ranger/rc.conf b/user/ranger/rc.conf index 3936f36..ad71849 100644 --- a/user/ranger/rc.conf +++ b/user/ranger/rc.conf @@ -27,10 +27,10 @@ set confirm_on_delete multiple # Use non-default path for file preview script? # ranger ships with scope.sh, a script that calls external programs (see # README.md for dependencies) to preview images, archives, etc. -set preview_script ~/.config/ranger/scope.sh +# set preview_script ~/.config/ranger/scope.sh # Use the external preview script or display simple plain text or image previews? -set use_preview_script true +# set use_preview_script true # Automatically count files in the directory, even before entering them? set automatically_count_files true @@ -40,7 +40,7 @@ set automatically_count_files true set open_all_images true # Be aware of version control systems and display information. -set vcs_aware true +set vcs_aware false # State of the four backends git, hg, bzr, svn. The possible states are # disabled, local (only show local info), enabled (show local and remote From 2d2c3d20075b4b30b96c5970e0ce4582269d9191 Mon Sep 17 00:00:00 2001 From: lelgenio Date: Sat, 5 Apr 2025 14:02:55 -0300 Subject: [PATCH 366/404] kak: fix multiline-edit extension --- user/kakoune/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/user/kakoune/default.nix b/user/kakoune/default.nix index a015bd0..fa63e6b 100644 --- a/user/kakoune/default.nix +++ b/user/kakoune/default.nix @@ -82,6 +82,9 @@ in rev = "1cc6baeb14b773916eb9209469aa77b3cfa67a0a"; sha256 = "sha256-3PLxG9UtT0MMSibvTviXQIgTH3rApZ3WSbNCEH3c7HE="; }; + buildInputs = with pkgs; [ + python3Minimal + ]; }) ]; extraConfig = From 310f3b192c157bbac4595a25a7c8e844a20543fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Tue, 8 Apr 2025 21:42:08 -0300 Subject: [PATCH 367/404] qt: cleanup theme config --- user/sway/theme.nix | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/user/sway/theme.nix b/user/sway/theme.nix index 731d12a..0a8a38a 100644 --- a/user/sway/theme.nix +++ b/user/sway/theme.nix @@ -55,7 +55,7 @@ lib.mkIf (desktop == "sway") { qt = { enable = true; platformTheme.name = "gtk3"; - style.name = "qt5ct"; + style.name = "kvantum"; }; dconf.settings = { @@ -70,28 +70,6 @@ lib.mkIf (desktop == "sway") { }; }; - # fonts.fontconfig.enable = true; - xdg.configFile = { - "qt5ct/qt5ct.conf".text = '' - [Appearance] - # color_scheme_path=/nix/store/f07mk0vrm47jxw3y5v99hxncy0w4vcyq-qt5ct-1.5/share/qt5ct/colors/darker.conf - custom_palette=false - icon_theme=${icon_theme} - standard_dialogs=default - style=kvantum-dark - - # [Fonts] - # fixed=@Variant(\0\0\0@\0\0\0\x1c\0H\0\x61\0\x63\0k\0 \0N\0\x65\0r\0\x64\0 \0\x46\0o\0n\0t@(\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10) - # general=@Variant(\0\0\0@\0\0\0\x1e\0L\0i\0\x62\0\x65\0r\0\x61\0t\0i\0o\0n\0 \0S\0\x61\0n\0s@(\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10) - ''; - "kdedefaults/kdeglobals".text = '' - [General] - ColorScheme=BreezeDark - - [Icons] - Theme=${icon_theme} - ''; - }; services.xsettingsd = { enable = true; settings = { @@ -105,11 +83,6 @@ lib.mkIf (desktop == "sway") { }; home.packages = with pkgs; [ - libsForQt5.qt5ct - libsForQt5.qtstyleplugin-kvantum - qt6Packages.qt6ct - qt6Packages.qtstyleplugin-kvantum - pkgs.bibata-cursors pkgs.orchis_theme_compact pkgs.papirus_red From 7eeb06fbb753b0bf91d8b8b5c4d80a6fd3a6ba16 Mon Sep 17 00:00:00 2001 From: lelgenio Date: Tue, 8 Apr 2025 17:58:25 -0300 Subject: [PATCH 368/404] firefox: remove buggy config --- user/firefox.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/user/firefox.nix b/user/firefox.nix index 5e38a56..3f58fa6 100644 --- a/user/firefox.nix +++ b/user/firefox.nix @@ -114,8 +114,6 @@ in "media.ffmpeg.vaapi.enabled" = true; "media.ffvpx.enabled" = true; - "gfx.webrender.all" = true; - # Enable installing non signed extensions "extensions.langpacks.signatures.required" = false; "xpinstall.signatures.required" = false; @@ -145,9 +143,5 @@ in exec firefox ''; }; - home.sessionVariables = { - MOZ_ENABLE_WAYLAND = "1"; - MOZ_DISABLE_RDD_SANDBOX = "1"; - }; }; } From fde4835a77ee84ba6dc37323e2a04fc2b270e3e3 Mon Sep 17 00:00:00 2001 From: lelgenio Date: Mon, 12 May 2025 17:58:13 -0300 Subject: [PATCH 369/404] update --- flake.lock | 72 +++++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index 69ae3c0..0213291 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1736955230, - "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=", + "lastModified": 1745630506, + "narHash": "sha256-bHCFgGeu8XjWlVuaWzi3QONjDW3coZDqSHvnd4l7xus=", "owner": "ryantm", "repo": "agenix", - "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c", + "rev": "96e078c646b711aee04b82ba01aefbff87004ded", "type": "github" }, "original": { @@ -163,11 +163,11 @@ ] }, "locked": { - "lastModified": 1700795494, - "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", + "lastModified": 1744478979, + "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", + "rev": "43975d782b418ebf4969e9ccba82466728c2851b", "type": "github" }, "original": { @@ -225,11 +225,11 @@ ] }, "locked": { - "lastModified": 1741786315, - "narHash": "sha256-VT65AE2syHVj6v/DGB496bqBnu1PXrrzwlw07/Zpllc=", + "lastModified": 1746729224, + "narHash": "sha256-9R4sOLAK1w3Bq54H3XOJogdc7a6C2bLLmatOQ+5pf5w=", "owner": "nix-community", "repo": "disko", - "rev": "0d8c6ad4a43906d14abd5c60e0ffe7b587b213de", + "rev": "85555d27ded84604ad6657ecca255a03fd878607", "type": "github" }, "original": { @@ -456,11 +456,11 @@ ] }, "locked": { - "lastModified": 1742655702, - "narHash": "sha256-jbqlw4sPArFtNtA1s3kLg7/A4fzP4GLk9bGbtUJg0JQ=", + "lastModified": 1746171682, + "narHash": "sha256-EyXUNSa+H+YvGVuQJP1nZskXAowxKYp79RNUsNdQTj4=", "owner": "nix-community", "repo": "home-manager", - "rev": "0948aeedc296f964140d9429223c7e4a0702a1ff", + "rev": "50eee705bbdbac942074a8c120e8194185633675", "type": "github" }, "original": { @@ -497,11 +497,11 @@ ] }, "locked": { - "lastModified": 1742701275, - "narHash": "sha256-AulwPVrS9859t+eJ61v24wH/nfBEIDSXYxlRo3fL/SA=", + "lastModified": 1746330942, + "narHash": "sha256-ShizFaJCAST23tSrHHtFFGF0fwd72AG+KhPZFFQX/0o=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "36dc43cb50d5d20f90a28d53abb33a32b0a2aae6", + "rev": "137fd2bd726fff343874f85601b51769b48685cc", "type": "github" }, "original": { @@ -520,11 +520,11 @@ "nixpkgs-24_11": "nixpkgs-24_11" }, "locked": { - "lastModified": 1742413977, - "narHash": "sha256-NkhM9GVu3HL+MiXtGD0TjuPCQ4GFVJPBZ8KyI2cFDGU=", + "lastModified": 1746740198, + "narHash": "sha256-Sbcl1MkJBOMg9BBENRm++clDuk6SihqBNOkPcKt+EF4=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "b4fbffe79c00f19be94b86b4144ff67541613659", + "rev": "1feca020084017b47bcbf893b33e76585785a840", "type": "gitlab" }, "original": { @@ -567,11 +567,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1743095683, - "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", + "lastModified": 1746663147, + "narHash": "sha256-Ua0drDHawlzNqJnclTJGf87dBmaO/tn7iZ+TCkTRpRc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", + "rev": "dda3dcd3fe03e991015e9a74b22d35950f264a54", "type": "github" }, "original": { @@ -628,11 +628,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1742937945, - "narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=", + "lastModified": 1746557022, + "narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7", + "rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860", "type": "github" }, "original": { @@ -643,11 +643,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1735554305, - "narHash": "sha256-zExSA1i/b+1NMRhGGLtNfFGXgLtgo+dcuzHzaWA6w3Q=", + "lastModified": 1745377448, + "narHash": "sha256-jhZDfXVKdD7TSEGgzFJQvEEZ2K65UMiqW5YJ2aIqxMA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0e82ab234249d8eee3e8c91437802b32c74bb3fd", + "rev": "507b63021ada5fee621b6ca371c4fca9ca46f52c", "type": "github" }, "original": { @@ -800,11 +800,11 @@ ] }, "locked": { - "lastModified": 1742700801, - "narHash": "sha256-ZGlpUDsuBdeZeTNgoMv+aw0ByXT2J3wkYw9kJwkAS4M=", + "lastModified": 1746485181, + "narHash": "sha256-PxrrSFLaC7YuItShxmYbMgSuFFuwxBB+qsl9BZUnRvg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "67566fe68a8bed2a7b1175fdfb0697ed22ae8852", + "rev": "e93ee1d900ad264d65e9701a5c6f895683433386", "type": "github" }, "original": { @@ -960,11 +960,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1743081648, - "narHash": "sha256-WRAylyYptt6OX5eCEBWyTwOEqEtD6zt33rlUkr6u3cE=", + "lastModified": 1746216483, + "narHash": "sha256-4h3s1L/kKqt3gMDcVfN8/4v2jqHrgLIe4qok4ApH5x4=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "29a3d7b768c70addce17af0869f6e2bd8f5be4b7", + "rev": "29ec5026372e0dec56f890e50dbe4f45930320fd", "type": "github" }, "original": { @@ -975,11 +975,11 @@ }, "vpsadminos": { "locked": { - "lastModified": 1743047409, - "narHash": "sha256-WTUW2GZqHknVwEbzF/TeX2eg52414gfl6hXloDDwEsQ=", + "lastModified": 1746798207, + "narHash": "sha256-KGvQoBdrOCEaxSnvQrQcbDzu4x2aP8ik6RiRxBj43dg=", "owner": "vpsfreecz", "repo": "vpsadminos", - "rev": "cf9324b9ff855172bd9de8aa3b8215071c4a0c6f", + "rev": "29ee8947bda07185e21388a414df88501c3ce83f", "type": "github" }, "original": { From 5dcf7259ed7d383a57f9b4295d93482d6f240035 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 12 May 2025 22:19:33 -0300 Subject: [PATCH 370/404] update --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 0213291..970c204 100644 --- a/flake.lock +++ b/flake.lock @@ -456,11 +456,11 @@ ] }, "locked": { - "lastModified": 1746171682, - "narHash": "sha256-EyXUNSa+H+YvGVuQJP1nZskXAowxKYp79RNUsNdQTj4=", + "lastModified": 1747020534, + "narHash": "sha256-D/6rkiC6w2p+4SwRiVKrWIeYzun8FBg7NlMKMwQMxO0=", "owner": "nix-community", "repo": "home-manager", - "rev": "50eee705bbdbac942074a8c120e8194185633675", + "rev": "b4bbdc6fde16fc2051fcde232f6e288cd22007ca", "type": "github" }, "original": { @@ -497,11 +497,11 @@ ] }, "locked": { - "lastModified": 1746330942, - "narHash": "sha256-ShizFaJCAST23tSrHHtFFGF0fwd72AG+KhPZFFQX/0o=", + "lastModified": 1746934494, + "narHash": "sha256-3n6i+F0sDASjkhbvgFDpPDZGp7z19IrRtjfF9TwJpCA=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "137fd2bd726fff343874f85601b51769b48685cc", + "rev": "e9b21b01e4307176b9718a29ac514838e7f6f4ff", "type": "github" }, "original": { @@ -520,11 +520,11 @@ "nixpkgs-24_11": "nixpkgs-24_11" }, "locked": { - "lastModified": 1746740198, - "narHash": "sha256-Sbcl1MkJBOMg9BBENRm++clDuk6SihqBNOkPcKt+EF4=", + "lastModified": 1746937334, + "narHash": "sha256-7g2GSePdYbpD1v5BxEVSCJ2Ogf4K5rc9sBB81FervUY=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "1feca020084017b47bcbf893b33e76585785a840", + "rev": "da66510f688b7eac54e3cac7c75be4b8dd78ce8b", "type": "gitlab" }, "original": { @@ -567,11 +567,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1746663147, - "narHash": "sha256-Ua0drDHawlzNqJnclTJGf87dBmaO/tn7iZ+TCkTRpRc=", + "lastModified": 1746904237, + "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dda3dcd3fe03e991015e9a74b22d35950f264a54", + "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", "type": "github" }, "original": { @@ -628,11 +628,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1746557022, - "narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=", + "lastModified": 1746957726, + "narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860", + "rev": "a39ed32a651fdee6842ec930761e31d1f242cb94", "type": "github" }, "original": { @@ -960,11 +960,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1746216483, - "narHash": "sha256-4h3s1L/kKqt3gMDcVfN8/4v2jqHrgLIe4qok4ApH5x4=", + "lastModified": 1746989248, + "narHash": "sha256-uoQ21EWsAhyskNo8QxrTVZGjG/dV4x5NM1oSgrmNDJY=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "29ec5026372e0dec56f890e50dbe4f45930320fd", + "rev": "708ec80ca82e2bbafa93402ccb66a35ff87900c5", "type": "github" }, "original": { @@ -975,11 +975,11 @@ }, "vpsadminos": { "locked": { - "lastModified": 1746798207, - "narHash": "sha256-KGvQoBdrOCEaxSnvQrQcbDzu4x2aP8ik6RiRxBj43dg=", + "lastModified": 1746967427, + "narHash": "sha256-lTI7Bg9zgDDWX0kFdR4OoK+I3kAaYt6Jo6jGRvSCn9U=", "owner": "vpsfreecz", "repo": "vpsadminos", - "rev": "29ee8947bda07185e21388a414df88501c3ce83f", + "rev": "cad317d0c2eacd36beb4fce60d6dcced50b71173", "type": "github" }, "original": { From 4c67c260a7deee7f8501c69363970703a560a2d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 15 May 2025 12:57:15 -0300 Subject: [PATCH 371/404] kakoune: fix prettier formatter config --- user/kakoune/filetypes.kak | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/user/kakoune/filetypes.kak b/user/kakoune/filetypes.kak index 01b0175..9fa33a6 100644 --- a/user/kakoune/filetypes.kak +++ b/user/kakoune/filetypes.kak @@ -16,15 +16,15 @@ hook global WinSetOption filetype=nix %{ } hook global BufCreate .*\.json %{ - set buffer formatcmd 'prettier --parser json' + set buffer formatcmd "prettier --stdin-filepath=%val{buffile}" } hook global BufCreate .*\.ya?ml %{ - set buffer formatcmd 'prettier --parser yaml' + set buffer formatcmd "prettier --stdin-filepath=%val{buffile}" } hook global BufCreate .*\.html %{ - set buffer formatcmd 'prettier --parser html' + set buffer formatcmd "prettier --stdin-filepath=%val{buffile}" } hook global BufCreate .*\.component\.html %{ @@ -43,11 +43,15 @@ hook global BufCreate .*\.php %{ } hook global BufCreate .*\.js %{ - set buffer formatcmd 'prettier --parser babel' + set buffer formatcmd "prettier --stdin-filepath=%val{buffile}" +} + +hook global BufCreate .*\.ts %{ + set buffer formatcmd "prettier --stdin-filepath=%val{buffile}" } hook global BufCreate .*\.scss %{ - set buffer formatcmd 'prettier --parser scss' + set buffer formatcmd "prettier --stdin-filepath=%val{buffile}" } hook global BufCreate .*\.vue %{ From bce7c36693fb088e68db528d38cff47a47987eab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 21 May 2025 20:14:08 -0300 Subject: [PATCH 372/404] factorio: update server --- pkgs/factorio-headless/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/factorio-headless/default.nix b/pkgs/factorio-headless/default.nix index 46064b5..8d81f1d 100644 --- a/pkgs/factorio-headless/default.nix +++ b/pkgs/factorio-headless/default.nix @@ -1,10 +1,10 @@ { factorio-headless, pkgs }: factorio-headless.overrideAttrs (_: rec { - version = "2.0.39"; + version = "2.0.47"; src = pkgs.fetchurl { name = "factorio_headless_x64-${version}.tar.xz"; url = "https://www.factorio.com/get-download/${version}/headless/linux64"; - hash = "sha256-D4o9DkN5e1/02LhdfDNLCVo/B9mqf4Cx6H+Uk5qT3zQ="; + hash = "sha256-8PMgx3YWpHlCJ+tjenC1VxCPMUGkYzJ2WTIgp2j0miY="; }; }) From e4b2f1cb143bc892e6d653ca6650b1b1c68c2040 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 24 May 2025 00:02:46 -0300 Subject: [PATCH 373/404] tablet: force replacing OpenTabletDriver config --- user/sway/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/user/sway/default.nix b/user/sway/default.nix index 046ae07..596fdde 100644 --- a/user/sway/default.nix +++ b/user/sway/default.nix @@ -125,7 +125,10 @@ in services.gpg-agent.pinentryPackage = pkgs.pinentry-all; - xdg.configFile."OpenTabletDriver/settings.json".source = ./open-tablet-driver.json; + xdg.configFile."OpenTabletDriver/settings.json" = { + force = true; + source = ./open-tablet-driver.json; + }; home.packages = with pkgs; [ mySway From 6102f2283a3c624d97fb752c8d6125c8cf89d665 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 24 May 2025 00:03:16 -0300 Subject: [PATCH 374/404] firefox: remove pinned extensions --- user/firefox.nix | 70 +----------------------------------------------- 1 file changed, 1 insertion(+), 69 deletions(-) diff --git a/user/firefox.nix b/user/firefox.nix index 3f58fa6..29d7f07 100644 --- a/user/firefox.nix +++ b/user/firefox.nix @@ -8,11 +8,6 @@ let inherit (config.my) desktop; inherit (config.my.theme) color; - bugfixedFirefox = pkgs.firefox-devedition-unwrapped // { - requireSigning = false; - allowAddonSideload = true; - }; - swayCustomization = '' #titlebar { display: none !important; } #TabsToolbar { display: none !important; } @@ -23,70 +18,7 @@ in config = { programs.firefox = { enable = true; - package = pkgs.wrapFirefox bugfixedFirefox { - nixExtensions = [ - (pkgs.fetchFirefoxAddon { - name = "darkreader"; - url = "https://addons.mozilla.org/firefox/downloads/file/4205543/darkreader-4.9.73.xpi"; - hash = "sha256-fDmf8yVhiGu4Da0Mr6+PYpeSsLcf8e/PEmZ+BaKzjxo="; - }) - (pkgs.fetchFirefoxAddon { - name = "sponsorblock"; - url = "https://addons.mozilla.org/firefox/downloads/file/4202411/sponsorblock-5.4.29.xpi"; - hash = "sha256-7Xqc8cyQNylMe5/dgDOx1f2QDVmz3JshDlTueu6AcSg="; - }) - (pkgs.fetchFirefoxAddon { - name = "tree-style-tab"; - url = "https://addons.mozilla.org/firefox/downloads/file/4197314/tree_style_tab-3.9.19.xpi"; - hash = "sha256-u2f0elVPj5N/QXa+5hRJResPJAYwuT9z0s/0nwmFtVo="; - }) - (pkgs.fetchFirefoxAddon { - name = "ublock-origin"; - url = "https://addons.mozilla.org/firefox/downloads/file/4290466/ublock_origin-1.58.0.xpi"; - hash = "sha256-RwxWmUpxdNshV4rc5ZixWKXcCXDIfFz+iJrGMr0wheo="; - }) - (pkgs.fetchFirefoxAddon { - name = "user_agent_string_switcher"; - url = "https://addons.mozilla.org/firefox/downloads/file/4098688/user_agent_string_switcher-0.5.0.xpi"; - hash = "sha256-ncjaPIxG1PBNEv14nGNQH6ai9QL4WbKGk5oJDbY+rjM="; - }) - - (pkgs.fetchFirefoxAddon { - name = "i-still-dont-care-about-cookies"; - url = "https://github.com/OhMyGuus/I-Still-Dont-Care-About-Cookies/releases/download/v1.1.4/istilldontcareaboutcookies-1.1.4.xpi"; - hash = "sha256-yt6yRiLTuaK4K/QwgkL9gCVGsSa7ndFOHqZvKqIGZ5U="; - }) - - (pkgs.fetchFirefoxAddon { - name = "vimium_ff"; - url = "https://addons.mozilla.org/firefox/downloads/file/4191523/vimium_ff-2.0.6.xpi"; - hash = "sha256-lKLX6IWWtliRdH1Ig33rVEB4DVfbeuMw0dfUPV/mSSI="; - }) - (pkgs.fetchFirefoxAddon { - name = "invidious_redirect"; - url = "https://addons.mozilla.org/firefox/downloads/file/4292924/invidious_redirect_2-1.16.xpi"; - hash = "sha256-ApCc+MNmW9Wd/5seV6npePQVEaszT/rhD9EB7HGiUb8="; - }) - - (pkgs.fetchFirefoxAddon { - name = "substitoot"; - url = "https://addons.mozilla.org/firefox/downloads/file/4236602/substitoot-0.7.2.0.xpi"; - hash = "sha256-1auSqEjkebwRSbmAVUsYwy77dl7TQCOnqgozpoVnqgI="; - }) - - # Locale - (pkgs.fetchFirefoxAddon { - name = "firefox_br"; - url = "https://addons.mozilla.org/firefox/downloads/file/4144369/firefox_br-115.0.20230726.201356.xpi"; - hash = "sha256-8zkqfdW0lX0b62+gAJeq4FFlQ06nXGFAexpH+wg2Cr0="; - }) - (pkgs.fetchFirefoxAddon { - name = "corretor"; - url = "https://addons.mozilla.org/firefox/downloads/file/1176165/corretor-65.2018.12.8.xpi"; - hash = "sha256-/rFQtJHdgemMkGAd+KWuWxVA/BwSIkn6sk0XZE0LrGk="; - }) - ]; - }; + package = pkgs.firefox-devedition; profiles = { dev-edition-default = { isDefault = true; From 18ec0369d7df43df83e4d79937255a6bd34db391 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 24 May 2025 00:05:30 -0300 Subject: [PATCH 375/404] flake: mark flake.lock as binary to git, don't show diffs --- .gitattributes | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..da8c15f --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +flake.lock binary From 8c5847ff33f7680b5b1a1f342adbf454294bb19a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 24 May 2025 00:08:40 -0300 Subject: [PATCH 376/404] update --- flake.lock | 132 ++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 91 insertions(+), 41 deletions(-) diff --git a/flake.lock b/flake.lock index 970c204..0821cf8 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1745630506, - "narHash": "sha256-bHCFgGeu8XjWlVuaWzi3QONjDW3coZDqSHvnd4l7xus=", + "lastModified": 1747575206, + "narHash": "sha256-NwmAFuDUO/PFcgaGGr4j3ozG9Pe5hZ/ogitWhY+D81k=", "owner": "ryantm", "repo": "agenix", - "rev": "96e078c646b711aee04b82ba01aefbff87004ded", + "rev": "4835b1dc898959d8547a871ef484930675cb47f1", "type": "github" }, "original": { @@ -225,11 +225,11 @@ ] }, "locked": { - "lastModified": 1746729224, - "narHash": "sha256-9R4sOLAK1w3Bq54H3XOJogdc7a6C2bLLmatOQ+5pf5w=", + "lastModified": 1747742835, + "narHash": "sha256-kYL4GCwwznsypvsnA20oyvW8zB/Dvn6K5G/tgMjVMT4=", "owner": "nix-community", "repo": "disko", - "rev": "85555d27ded84604ad6657ecca255a03fd878607", + "rev": "df522e787fdffc4f32ed3e1fca9ed0968a384d62", "type": "github" }, "original": { @@ -297,11 +297,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -433,6 +433,54 @@ "type": "github" } }, + "git-hooks": { + "inputs": { + "flake-compat": [ + "nixos-mailserver", + "flake-compat" + ], + "gitignore": "gitignore", + "nixpkgs": [ + "nixos-mailserver", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1742649964, + "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "nixos-mailserver", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "hello-fonts": { "flake": false, "locked": { @@ -456,11 +504,11 @@ ] }, "locked": { - "lastModified": 1747020534, - "narHash": "sha256-D/6rkiC6w2p+4SwRiVKrWIeYzun8FBg7NlMKMwQMxO0=", + "lastModified": 1747688870, + "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=", "owner": "nix-community", "repo": "home-manager", - "rev": "b4bbdc6fde16fc2051fcde232f6e288cd22007ca", + "rev": "d5f1f641b289553927b3801580598d200a501863", "type": "github" }, "original": { @@ -497,11 +545,11 @@ ] }, "locked": { - "lastModified": 1746934494, - "narHash": "sha256-3n6i+F0sDASjkhbvgFDpPDZGp7z19IrRtjfF9TwJpCA=", + "lastModified": 1747540584, + "narHash": "sha256-cxCQ413JTUuRv9Ygd8DABJ1D6kuB/nTfQqC0Lu9C0ls=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "e9b21b01e4307176b9718a29ac514838e7f6f4ff", + "rev": "ec179dd13fb7b4c6844f55be91436f7857226dce", "type": "github" }, "original": { @@ -514,17 +562,18 @@ "inputs": { "blobs": "blobs", "flake-compat": "flake-compat_2", + "git-hooks": "git-hooks", "nixpkgs": [ "nixpkgs" ], - "nixpkgs-24_11": "nixpkgs-24_11" + "nixpkgs-25_05": "nixpkgs-25_05" }, "locked": { - "lastModified": 1746937334, - "narHash": "sha256-7g2GSePdYbpD1v5BxEVSCJ2Ogf4K5rc9sBB81FervUY=", + "lastModified": 1747965231, + "narHash": "sha256-BW3ktviEhfCN/z3+kEyzpDKAI8qFTwO7+S0NVA0C90o=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "da66510f688b7eac54e3cac7c75be4b8dd78ce8b", + "rev": "53007af63fade28853408370c4c600a63dd97f41", "type": "gitlab" }, "original": { @@ -550,28 +599,29 @@ "type": "github" } }, - "nixpkgs-24_11": { + "nixpkgs-25_05": { "locked": { - "lastModified": 1734083684, - "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=", + "lastModified": 1747610100, + "narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", + "rev": "ca49c4304acf0973078db0a9d200fd2bae75676d", "type": "github" }, "original": { - "id": "nixpkgs", - "ref": "nixos-24.11", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1746904237, - "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", + "lastModified": 1747744144, + "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", + "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", "type": "github" }, "original": { @@ -628,11 +678,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1746957726, - "narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=", + "lastModified": 1747862697, + "narHash": "sha256-U4HaNZ1W26cbOVm0Eb5OdGSnfQVWQKbLSPrSSa78KC0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a39ed32a651fdee6842ec930761e31d1f242cb94", + "rev": "2baa12ff69913392faf0ace833bc54bba297ea95", "type": "github" }, "original": { @@ -800,11 +850,11 @@ ] }, "locked": { - "lastModified": 1746485181, - "narHash": "sha256-PxrrSFLaC7YuItShxmYbMgSuFFuwxBB+qsl9BZUnRvg=", + "lastModified": 1747603214, + "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e93ee1d900ad264d65e9701a5c6f895683433386", + "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd", "type": "github" }, "original": { @@ -960,11 +1010,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1746989248, - "narHash": "sha256-uoQ21EWsAhyskNo8QxrTVZGjG/dV4x5NM1oSgrmNDJY=", + "lastModified": 1747912973, + "narHash": "sha256-XgxghfND8TDypxsMTPU2GQdtBEsHTEc3qWE6RVEk8O0=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "708ec80ca82e2bbafa93402ccb66a35ff87900c5", + "rev": "020cb423808365fa3f10ff4cb8c0a25df35065a3", "type": "github" }, "original": { @@ -975,11 +1025,11 @@ }, "vpsadminos": { "locked": { - "lastModified": 1746967427, - "narHash": "sha256-lTI7Bg9zgDDWX0kFdR4OoK+I3kAaYt6Jo6jGRvSCn9U=", + "lastModified": 1748016252, + "narHash": "sha256-P/h9BTZv6r5br/MKkXyEdUdDTU446UaAZzGLQMCMSIw=", "owner": "vpsfreecz", "repo": "vpsadminos", - "rev": "cad317d0c2eacd36beb4fce60d6dcced50b71173", + "rev": "4756a2ecc603c347e3d983663d663e96f22225a9", "type": "github" }, "original": { From 68568255cbb534f779c0dcaa61f184f571dde06a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 24 May 2025 01:08:45 -0300 Subject: [PATCH 377/404] update: 24.11 -> 25.05 --- flake.lock | 18 +++++++++--------- flake.nix | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 0821cf8..78b8ed1 100644 --- a/flake.lock +++ b/flake.lock @@ -504,16 +504,16 @@ ] }, "locked": { - "lastModified": 1747688870, - "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=", + "lastModified": 1747556831, + "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=", "owner": "nix-community", "repo": "home-manager", - "rev": "d5f1f641b289553927b3801580598d200a501863", + "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -578,7 +578,7 @@ }, "original": { "owner": "simple-nixos-mailserver", - "ref": "master", + "ref": "nixos-25.05", "repo": "nixos-mailserver", "type": "gitlab" } @@ -678,16 +678,16 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1747862697, - "narHash": "sha256-U4HaNZ1W26cbOVm0Eb5OdGSnfQVWQKbLSPrSSa78KC0=", + "lastModified": 1747953325, + "narHash": "sha256-y2ZtlIlNTuVJUZCqzZAhIw5rrKP4DOSklev6c8PyCkQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2baa12ff69913392faf0ace833bc54bba297ea95", + "rev": "55d1f923c480dadce40f5231feb472e81b0bab48", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "type": "indirect" } }, diff --git a/flake.nix b/flake.nix index 8994009..05332a4 100644 --- a/flake.nix +++ b/flake.nix @@ -1,10 +1,10 @@ { description = "My system config"; inputs = { - nixpkgs.url = "nixpkgs/nixos-24.11"; + nixpkgs.url = "nixpkgs/nixos-25.05"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; - home-manager.url = "github:nix-community/home-manager/release-24.11"; + home-manager.url = "github:nix-community/home-manager/release-25.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; vpsadminos.url = "github:vpsfreecz/vpsadminos"; @@ -32,7 +32,7 @@ }; nixos-mailserver = { - url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master"; + url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; From ce66f177fb4b59d2ae3c839abf454ab830d1b84e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 24 May 2025 01:09:18 -0300 Subject: [PATCH 378/404] 25.05: split nerd fonts --- overlays/default.nix | 8 -------- system/fonts.nix | 3 ++- user/sway/theme.nix | 1 - 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/overlays/default.nix b/overlays/default.nix index 8886897..a032271 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -28,14 +28,6 @@ rec { ]; } ); - nerdfonts_fira_hack = ( - final.nerdfonts.override { - fonts = [ - "FiraCode" - "Hack" - ]; - } - ); } ); diff --git a/system/fonts.nix b/system/fonts.nix index 2815563..73aa8f7 100644 --- a/system/fonts.nix +++ b/system/fonts.nix @@ -5,6 +5,7 @@ noto-fonts noto-fonts-cjk-sans noto-fonts-emoji - nerdfonts_fira_hack + nerd-fonts.fira-code + nerd-fonts.hack ]; } diff --git a/user/sway/theme.nix b/user/sway/theme.nix index 0a8a38a..600f596 100644 --- a/user/sway/theme.nix +++ b/user/sway/theme.nix @@ -92,7 +92,6 @@ lib.mkIf (desktop == "sway") { hack-font font-awesome_5 fira-code - nerdfonts_fira_hack material-wifi-icons ]; } From 707e8143a03ca4b78ed008a4e390cc2175227c7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 24 May 2025 01:09:54 -0300 Subject: [PATCH 379/404] 25.05: fix defaultLocale string --- hosts/phantom/default.nix | 2 +- system/locale.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/phantom/default.nix b/hosts/phantom/default.nix index 9111434..1b0d3cb 100644 --- a/hosts/phantom/default.nix +++ b/hosts/phantom/default.nix @@ -53,7 +53,7 @@ # Set your time zone. time.timeZone = "America/Sao_Paulo"; # Select internationalisation properties. - i18n.defaultLocale = "pt_BR.utf8"; + i18n.defaultLocale = "pt_BR.UTF-8"; boot.kernel.sysctl."fs.inotify.max_user_watches" = 1048576; diff --git a/system/locale.nix b/system/locale.nix index 07e7175..e2c7e81 100644 --- a/system/locale.nix +++ b/system/locale.nix @@ -2,7 +2,7 @@ { time.timeZone = "America/Sao_Paulo"; environment.variables.TZ = config.time.timeZone; - i18n.defaultLocale = "pt_BR.utf8"; + i18n.defaultLocale = "pt_BR.UTF-8"; # Configure keymap in X11 services.xserver.xkb = { From d353be3ce81476dba4327c10be990794afc0c5f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 24 May 2025 01:10:18 -0300 Subject: [PATCH 380/404] 25.05: j4-dmenu-desktop use '--i3-ipc' flag --- scripts/bmenu | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/scripts/bmenu b/scripts/bmenu index c793269..8abad08 100755 --- a/scripts/bmenu +++ b/scripts/bmenu @@ -8,13 +8,10 @@ if test "$argv[1]" = "run" test -n "$argv[2]" && set t "$argv[2]" || set t "terminal" - test -n "$i3SOCK" && set wrapper 'i3-msg exec --' - test -n "$SWAYSOCK" && set wrapper 'swaymsg exec --' - exec j4-dmenu-desktop \ --dmenu="bmenu start -p Iniciar:" \ --term "$t" \ - --wrapper="$wrapper" \ + --i3-ipc \ --no-generic end From dc734b6d62c7624cad55a587f3c290878582c810 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 24 May 2025 01:11:08 -0300 Subject: [PATCH 381/404] 25.05: fix firefox search engine names --- user/firefox.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/firefox.nix b/user/firefox.nix index 29d7f07..3e5c9df 100644 --- a/user/firefox.nix +++ b/user/firefox.nix @@ -23,7 +23,7 @@ in dev-edition-default = { isDefault = true; search.force = true; - search.default = "DuckDuckGo"; + search.default = "ddg"; settings = { "devtools.theme" = "auto"; "toolkit.legacyUserProfileCustomizations.stylesheets" = true; From 2c70a0e7dec1f64488051586dc09846dbca6a340 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 24 May 2025 01:11:26 -0300 Subject: [PATCH 382/404] 25.05: mako use settings instead of extraConfig --- user/sway/mako.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/user/sway/mako.nix b/user/sway/mako.nix index af6c673..28b5eb4 100644 --- a/user/sway/mako.nix +++ b/user/sway/mako.nix @@ -34,12 +34,13 @@ in defaultTimeout = 10000; - extraConfig = '' - [app-name=volumesh] - default-timeout=5000 - group-by=app-name - format=%s\n%b - ''; + settings = { + "app-name=volumesh" = { + "default-timeout" = "5000"; + "group-by" = "app-name"; + "format" = "%s\\n%b"; + }; + }; # # {{@@ header() @@}} # # text From fba64d38633230de8e3516e5acfc73e130efe6b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 24 May 2025 01:46:00 -0300 Subject: [PATCH 383/404] firefox: remove unused config --- user/firefox.nix | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/user/firefox.nix b/user/firefox.nix index 3e5c9df..1c891ae 100644 --- a/user/firefox.nix +++ b/user/firefox.nix @@ -1,18 +1,10 @@ { config, pkgs, - lib, ... }: let - inherit (config.my) desktop; inherit (config.my.theme) color; - - swayCustomization = '' - #titlebar { display: none !important; } - #TabsToolbar { display: none !important; } - #sidebar-header { display: none !important; } - ''; in { config = { @@ -27,7 +19,6 @@ in settings = { "devtools.theme" = "auto"; "toolkit.legacyUserProfileCustomizations.stylesheets" = true; - "browser.tabs.inTitlebar" = if desktop == "sway" then 0 else 1; "sidebar.position_start" = false; # Move sidebar to the right # enable media RDD to allow gpu acceleration @@ -57,8 +48,6 @@ in "devtools.debugger.remote-enabled" = true; }; userChrome = '' - ${lib.optionalString (desktop == "sway") swayCustomization} - #sidebar-main { background-color: ${color.bg}; } From 451aeb6725c2b24559b90d38ca653948c2b27a45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 24 May 2025 19:10:54 -0300 Subject: [PATCH 384/404] 25.05: firefox-devedition fix executable and .desktop name --- user/firefox.nix | 2 +- user/home.nix | 2 +- user/variables.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/user/firefox.nix b/user/firefox.nix index 1c891ae..28ba913 100644 --- a/user/firefox.nix +++ b/user/firefox.nix @@ -61,7 +61,7 @@ in }; wayland.windowManager.sway = { extraConfig = '' - exec firefox + exec firefox-devedition ''; }; }; diff --git a/user/home.nix b/user/home.nix index 31e3871..334e260 100644 --- a/user/home.nix +++ b/user/home.nix @@ -152,7 +152,7 @@ text-editor = lib.mkDefault "kak.desktop"; image-viewer = lib.mkDefault "pqiv.desktop"; video-player = lib.mkDefault "mpv.desktop"; - web-browser = lib.mkDefault "firefox.desktop"; + web-browser = lib.mkDefault "firefox-devedition.desktop"; document-viewer = lib.mkDefault "org.pwmt.zathura.desktop"; file-manager = lib.mkDefault "thunar.desktop"; archive-manager = "engrampa.desktop"; diff --git a/user/variables.nix b/user/variables.nix index 84823d3..65bc69a 100644 --- a/user/variables.nix +++ b/user/variables.nix @@ -116,6 +116,6 @@ rec { dmenu = "bmenu"; desktop = "sway"; - browser = "firefox"; + browser = "firefox-devedition"; editor = "kakoune"; } From a4b900582aa71695bc628a1b063334c5e892af85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 24 May 2025 19:11:26 -0300 Subject: [PATCH 385/404] 25.05: fix nextcloud dbtype --- hosts/phantom/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/phantom/nextcloud.nix b/hosts/phantom/nextcloud.nix index a7ef9f3..28d76a1 100644 --- a/hosts/phantom/nextcloud.nix +++ b/hosts/phantom/nextcloud.nix @@ -1,7 +1,6 @@ { config, pkgs, - inputs, ... }: { @@ -11,6 +10,7 @@ hostName = "cloud.lelgenio.com"; https = true; config = { + dbtype = "sqlite"; # TODO: move to single postgres db adminpassFile = config.age.secrets.phantom-nextcloud.path; }; }; From 72ddcec77ef098c6204a951f1ef963c6f089e8d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 28 May 2025 00:07:44 -0300 Subject: [PATCH 386/404] monolith: add wopus gitlab runners --- secrets/monolith/default.yaml | 12 +++++------- system/gitlab-runner.nix | 6 ++++-- system/monolith-gitlab-runner.nix | 17 +++++++++++++++++ 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/secrets/monolith/default.yaml b/secrets/monolith/default.yaml index 8bd8e12..f354335 100644 --- a/secrets/monolith/default.yaml +++ b/secrets/monolith/default.yaml @@ -4,16 +4,14 @@ gitlab-runners: thoreb-telemetria-nix: ENC[AES256_GCM,data:zrZvG4be08ulpo7itbrprKK5csCMLvzZjrszfMw1XiJP0FyRTUd9nHgHpbAzbjj2KyT7kKngoZAyengvaTEhkT9sUi1pdGnvajAH8BDDOD0g4LJIHFl4,iv:3bSsTzU7gHx+MchuPg9kmb5xEDugmGPje8Jw74NpRJI=,tag:zffRr77lWbyLt7o/mywb5A==,type:str] thoreb-itinerario-nix: ENC[AES256_GCM,data:UdAAD0V895sFoEYR56sCG2LlpZugJ0K/nwkTygzWOnbTSmBRAcIQ8qVFPZGw+K+XMSLiCyio6Jp7k8AYP0K1VYm+6aEP3OkqR9FCLQTJgXo=,iv:UGUby50BYkn13OzItk6zZmxc5+SnbZZa4bebQHIow2A=,tag:LjDg3deWwdH2T71EtPo6jA==,type:str] docker-images-token: ENC[AES256_GCM,data:GGB/KSkjdAyhFKEspAh91ItbqEDf7K/LZSGSn+Jp7SxRfXpDzHIiMD8XJ9PTkGLeQGN4ug1i2nTYPS7d/P5OALWDU+1NPiV9nPdG0w7GERfu4g==,iv:6roabdOKX9xFMf0hWlECd73+943R+hFLos0e2dOpzns=,tag:LrASFc4DtN7aQ+3oOW/p/w==,type:str] + wopus-gitlab-nix: ENC[AES256_GCM,data:asE7J0d58x9VfQFWc07f5T4s5NZ+/VqMQo66EX93J0LbJ4iI5YjvrrIE4pSI1e4Nz/SRQhltaJ0DfSH0+qgjD4wnAONPRi3UlFbSdGWS2bwwRtWe+Nci2krrUFxV2i/ZVE3CwCkNe4mqtII=,iv:gKrD/LhzI+jnDnX6CdxoHfjpiRdrsuRYJF9rTc8SffM=,tag:TczDGSU3gdKmERjBJ7tP/A==,type:str] + wopus-gitlab-docker-images: ENC[AES256_GCM,data:aGbCjQr1VKgg5n4f8vZKgdXcDw/M5JHez9E2TqipBXQ8D0jXdfPg6laNOJUOD+uPBOIGKUBMEg4OtLblCZFVw/V6wJN16wVbwkDU3uELQ8tPmlYSt4fcy4+5sC6+tV4YeMSKA6yIjD+xpkk=,iv:ojBhf2WdkWHruvTbABAAvuGDVOnsUl+qnhvH09L+lgA=,tag:gWhEkvL1qlcge3bSKVDSIg==,type:str] bitbucket-runners: wopus-runner-1: ENC[AES256_GCM,data:gtH0T5n8qMYpvSv5ciN8+ScGlFDf9xE0FTxNP97vT/qsOCcaItTE+5P+DFcWw46onLED+1c+u0sArFbEsT3f8lyco9b+0l99uOQAxLZQzAXYH8zGye1UnwUtytkci2PHu5c8kTpIWHXyZ1IOYNGWkermeab57ANzOkM1LbkHyAjS6VTh0I60LfAOdHOw5FDFL8d1d9oWxLloOe9USLPqHjC023EpCUT2YuyHoPCTpBu8Kb/2HfV0wkAKaB3dvVrKwXCj+bfP6+bjQ3uMzVO/7jxPmnSGBfvyZ+Hlg5goJ6bSAqQWmnPPnQ96FgQfe8su5ML9qNIp9/7eNiL6Rv6Vhxe0hHbE5wsZ/58grcg/LrugeWJvUJ9THhwcTwO8Pkvwlq0XM9seUY2NV+LCK3bLQ4IWDjWkU1IHg6+nihTcvl1iD6UIGMgqGoB/v05WVzHb+GcE2fFuSuhVHfa5RMyboELOJoFrqZiXGhY=,iv:ZakLafxYQCDd1Zw8T83Xfj+YwAQKna9LC6ognJqtifA=,tag:bwBObfdMIvJfRrOG04NtxA==,type:str] wopus-runner-2: ENC[AES256_GCM,data:gg8merZMFbf396hdJY7zmKQndT3GzB7NeGZAs3C0au8Zd7OFAg9vcQcFcxNA3kZGJZqmFTR/ycWJwhYr9fhlfFuPhDynVvgJAqoYtvC2MUDiOMD/d3DlfwFjQ6cOGTrvFuY1kkgSFb4OFdrVC1eiTDrGygFmYnYcqTKn/t5Ttqi+cHZNzFzVzdVLvaLCYxltM5g45zn+fXYxYwCfqyb32/M1XTnnwIGiataGxEX5oWhVV4zqeLO4ZIYPSby5AVvIMJ/zqvqaeVVY52GLDcTKrj3thbZxMQLWN3/lOA0uYhi3L/WM8Gx+JMEIbSICcuT7QXu4w4PA+opcx9GnsMCK2/egzS+cNPJ4vGZCdVD/jh6A9zVEJAgXdsHXNXFHmMPt7DcgrCQiub62og4kBY4G/Rcg4UN7sb3v3qyBpGbCGHGRjCFc+wdHpom0yDOG2cwcqfN49pC2R7Ag2BisFQ/5A+DPmKnvGG3kt9s=,iv:5g5XiDecYqi4JNRkZubgPJECBQdZ6rBeojgFe6Etebk=,tag:HRy5bFSbfxKTb5e13lGtgg==,type:str] wopus-runner-3: ENC[AES256_GCM,data:f9pLYR8t51HtPpLyXysIVaDAhxDrmktJH93E7rb7imtKwK7hRhR8usnvHTcknLfD7BMvStAIYefdGt19u7PrQu6vqc19bEcNbnK5OH4KBP6+X47oMgBYtbIGXH+t3dSDt22fSIoppTwdX7/Kf4vqesfN8K7EunETvFR86oyyKdy15mvXr0XUO4us4HZjnIOBEnOm1P/V8hk5JcCpRuo+8ZYmBe5gzq5pTnqnYlPE1EovM7eDMg72J7ev07h50qvySrAqmNiqDcXfTPQ2TzuHx3XxAYqFybf1L6P9OnLB6RDAlpoFJ0h8dSg2tzC2+amYsBP0UIBK/ZhWvvAjpX+MZrTASjenh/tefDcNdbsXDOr7A4i/261z4rC0r+97INglCN1N/SZg51iBHiRAVV1zibDLfioR5+eBIykWAtjILMoYU+zOcr0E8K0I9jQGMtpnYmvHJqV0DVcdfZpJptrPUUy+lQ/iZVcPpLs=,iv:grzvVsfpUzywjNE4jvTxXKG3TYajrvSsQgfOgtafvIo=,tag:K1B6crN0ckLk0EYBtGHDkw==,type:str] wopus-runner-4: ENC[AES256_GCM,data:D1Zq0BtPuACnutAbUcj3gYSMLuIZcMuqc/1mEFmitEG0tBFMWhkabS+8lXcp8sb1DM0LTDMEwgMB9FVyFb670MKQNEncqQtaNJtY1BxS3SolovDAM/I+i6YGvd4X8jX99d+7ZNR6xGBWJ/dW8rz4QnIM8Eh3FDOqaFa/ltfyPKP9IZ2uZi67C/n8Q/OSdgMQkt+QxhgJfSghE1iruPwxyGlqv+E4SZNI/fQQMjX0Lh7z02ms58yyMtjO71YbukV/JXFRsdJrqY2wfH/6NlZbsKideoSxluBRVqmbW6KQd7dUT819KbOSu9CFdgThtVCU8qiv3jbAbn8D5xRy4AAOEfSqRLXJoj7otCqr47R/8+0BdS3aztFBjL3lDmprMWZ4+LD55fvczfpxUF9ox1mhcjIvCvZJJL06XsST1XRXa7i2fr4/a/XhCmQgIzar5IYxSC9OjuHp6jLsTaY3ZUgid5W1L1n8uWSmA98=,iv:O9caRG//brERiIhuMrsFdTz6TnPY0rdQnvHEu0P42yM=,tag:hrmwLX/CRhZfammJ2nfTPw==,type:str] sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] age: - recipient: age1zrgu7w8059xydagm60phnffghvfe9h2ca58cx8qwagqpyfuvs9fqw79c8h enc: | @@ -33,8 +31,8 @@ sops: aFVxcDFhaGdYekRWRVFIWnRsZndtZFkKgsvxOFHOcO306Z9FkucA1fDOpZA8N1/h jYmIgcKTFgWoSCvux67lK30jFsYp7sm5z6WxxDYsGcoQ/+pxoUX2jQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-03-07T21:28:04Z" - mac: ENC[AES256_GCM,data:4lOafZQ6PP38CByulzA/J86sw+TpQhj40s1lTRXqUtpt72yH8nQK8dXpw0dNYvDBtDpKRvNTHZubzalEua6n2lCQL7rsZ2+fo6FJ4ht2Kb70dddDcWEyrfyZQ2FaKC5L/QjqM0SbIfPszNvyQ8wIaOoMfNJBis5QOjRSGDAcJm8=,iv:LLT0oJW+3KNe1nKphCK0c5FPIuh8GfnDrvNDCFhP4NM=,tag:rPbVY7L1qxNc3aCfv77FAg==,type:str] + lastmodified: "2025-05-28T03:04:52Z" + mac: ENC[AES256_GCM,data:THwZcK7nJnCYEUR8CiaQKZ8dQpYbDqnshBBWFzEzPXEWLgFB9+7d6aRh9ZDjZs0rhBTChta3H7YxDJdFh5nAJQy532FJp4S4tBOLHWFZARlKhXngujd0SvxPER55uvxImNFIYX0RDSHUck5jDXCA0tBCmE/Q7DuY7v0+cmRgOV8=,iv:1p3kFMSg0k1n00P6UY5Tttuqvpsb4Se8km5zA9GhAu4=,tag:cDxbHZ+eScDQacwV1sYGIA==,type:str] pgp: - created_at: "2025-03-07T22:49:16Z" enc: |- @@ -52,4 +50,4 @@ sops: -----END PGP MESSAGE----- fp: 0FECE8316E74BA6F44EFC21A2F8F21CE8721456B unencrypted_suffix: _unencrypted - version: 3.9.4-unstable + version: 3.10.2 diff --git a/system/gitlab-runner.nix b/system/gitlab-runner.nix index c50e1b9..b998d17 100644 --- a/system/gitlab-runner.nix +++ b/system/gitlab-runner.nix @@ -1,18 +1,19 @@ { pkgs, lib, ... }: { mkNixRunner = - authenticationTokenConfigFile: with lib; rec { + authenticationTokenConfigFile: with lib; { # File should contain at least these two variables: # `CI_SERVER_URL` # `REGISTRATION_TOKEN` inherit authenticationTokenConfigFile; # 2 dockerImage = "alpine:3.18.2"; - dockerAllowedImages = [ dockerImage ]; dockerVolumes = [ "/etc/nix/nix.conf:/etc/nix/nix.conf:ro" "/nix/store:/nix/store:ro" "/nix/var/nix/db:/nix/var/nix/db:ro" "/nix/var/nix/daemon-socket:/nix/var/nix/daemon-socket:ro" + "/var/run/docker.sock:/var/run/docker.sock" + "/cache" ]; dockerDisableCache = true; preBuildScript = pkgs.writeScript "setup-container" '' @@ -36,6 +37,7 @@ cacert git openssh + docker ] ) } diff --git a/system/monolith-gitlab-runner.nix b/system/monolith-gitlab-runner.nix index 28a0ecd..dd80627 100644 --- a/system/monolith-gitlab-runner.nix +++ b/system/monolith-gitlab-runner.nix @@ -18,6 +18,8 @@ in thoreb-telemetria-nix = mkNixRunner config.sops.secrets."gitlab-runners/thoreb-telemetria-nix".path; thoreb-itinerario-nix = mkNixRunner config.sops.secrets."gitlab-runners/thoreb-itinerario-nix".path; + wopus-gitlab-nix = mkNixRunner config.sops.secrets."gitlab-runners/wopus-gitlab-nix".path; + default = { # File should contain at least these two variables: # `CI_SERVER_URL` @@ -25,6 +27,15 @@ in authenticationTokenConfigFile = config.sops.secrets."gitlab-runners/docker-images-token".path; dockerImage = "debian:stable"; }; + + wopus-gitlab-docker-images = { + # File should contain at least these two variables: + # `CI_SERVER_URL` + # `CI_SERVER_TOKEN` + authenticationTokenConfigFile = + config.sops.secrets."gitlab-runners/wopus-gitlab-docker-images".path; + dockerImage = "debian:stable"; + }; }; }; systemd.services.gitlab-runner.serviceConfig.Nice = 10; @@ -39,5 +50,11 @@ in "gitlab-runners/docker-images-token" = { sopsFile = ../secrets/monolith/default.yaml; }; + "gitlab-runners/wopus-gitlab-nix" = { + sopsFile = ../secrets/monolith/default.yaml; + }; + "gitlab-runners/wopus-gitlab-docker-images" = { + sopsFile = ../secrets/monolith/default.yaml; + }; }; } From 93c88db929bb1072b4b7cf16b2750bd72ba0a808 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 28 May 2025 11:45:38 -0300 Subject: [PATCH 387/404] home: don't set CARGO_HOME and RUSTUP_HOME This was causing issues with using different rust versions in different projects --- user/xdg-dirs.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/user/xdg-dirs.nix b/user/xdg-dirs.nix index a9e1c9b..c4036c2 100644 --- a/user/xdg-dirs.nix +++ b/user/xdg-dirs.nix @@ -1,8 +1,5 @@ { config, - pkgs, - lib, - inputs, ... }: let @@ -24,9 +21,4 @@ in videos = "${HOME}/Vídeos"; }; }; - - home.sessionVariables = { - CARGO_HOME = "${config.xdg.dataHome}/cargo"; - RUSTUP_HOME = "${config.xdg.dataHome}/rustup"; - }; } From 53a3cb0a0eb245c25aaa4df1900ea84c7a1b9f53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 28 May 2025 20:56:59 -0300 Subject: [PATCH 388/404] monolith: fix gitlab-runner config to not override PATH --- system/gitlab-runner.nix | 100 ++++++++++++++++++++------------------- 1 file changed, 51 insertions(+), 49 deletions(-) diff --git a/system/gitlab-runner.nix b/system/gitlab-runner.nix index b998d17..e450b5e 100644 --- a/system/gitlab-runner.nix +++ b/system/gitlab-runner.nix @@ -1,53 +1,55 @@ { pkgs, lib, ... }: +let + installNixScript = pkgs.writeScriptBin "install-nix" '' + mkdir -p -m 0755 /nix/var/log/nix/drvs + mkdir -p -m 0755 /nix/var/nix/gcroots + mkdir -p -m 0755 /nix/var/nix/profiles + mkdir -p -m 0755 /nix/var/nix/temproots + mkdir -p -m 0755 /nix/var/nix/userpool + mkdir -p -m 1777 /nix/var/nix/gcroots/per-user + mkdir -p -m 1777 /nix/var/nix/profiles/per-user + mkdir -p -m 0755 /nix/var/nix/profiles/per-user/root + mkdir -p -m 0700 "$HOME/.nix-defexpr" + + . ${pkgs.nix}/etc/profile.d/nix.sh + + ${pkgs.nix}/bin/nix-env -i ${ + lib.concatStringsSep " " ( + with pkgs; + [ + nix + cacert + git + openssh + docker + ] + ) + } + ''; +in { - mkNixRunner = - authenticationTokenConfigFile: with lib; { - # File should contain at least these two variables: - # `CI_SERVER_URL` - # `REGISTRATION_TOKEN` - inherit authenticationTokenConfigFile; # 2 - dockerImage = "alpine:3.18.2"; - dockerVolumes = [ - "/etc/nix/nix.conf:/etc/nix/nix.conf:ro" - "/nix/store:/nix/store:ro" - "/nix/var/nix/db:/nix/var/nix/db:ro" - "/nix/var/nix/daemon-socket:/nix/var/nix/daemon-socket:ro" - "/var/run/docker.sock:/var/run/docker.sock" - "/cache" - ]; - dockerDisableCache = true; - preBuildScript = pkgs.writeScript "setup-container" '' - mkdir -p -m 0755 /nix/var/log/nix/drvs - mkdir -p -m 0755 /nix/var/nix/gcroots - mkdir -p -m 0755 /nix/var/nix/profiles - mkdir -p -m 0755 /nix/var/nix/temproots - mkdir -p -m 0755 /nix/var/nix/userpool - mkdir -p -m 1777 /nix/var/nix/gcroots/per-user - mkdir -p -m 1777 /nix/var/nix/profiles/per-user - mkdir -p -m 0755 /nix/var/nix/profiles/per-user/root - mkdir -p -m 0700 "$HOME/.nix-defexpr" - - . ${pkgs.nix}/etc/profile.d/nix.sh - - ${pkgs.nix}/bin/nix-env -i ${ - concatStringsSep " " ( - with pkgs; - [ - nix - cacert - git - openssh - docker - ] - ) - } - ''; - environmentVariables = { - ENV = "/etc/profile"; - USER = "root"; - NIX_REMOTE = "daemon"; - PATH = "/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/bin:/sbin:/usr/bin:/usr/sbin"; - NIX_SSL_CERT_FILE = "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt"; - }; + mkNixRunner = authenticationTokenConfigFile: { + # File should contain at least these two variables: + # `CI_SERVER_URL` + # `REGISTRATION_TOKEN` + inherit authenticationTokenConfigFile; # 2 + dockerImage = "alpine:3.18.2"; + dockerVolumes = [ + "/etc/nix/nix.conf:/etc/nix/nix.conf:ro" + "/nix/store:/nix/store:ro" + "/nix/var/nix/db:/nix/var/nix/db:ro" + "/nix/var/nix/daemon-socket:/nix/var/nix/daemon-socket:ro" + "/tmp:/tmp" + "/var/run/docker.sock:/var/run/docker.sock" + "/var/lib/docker/containers:/var/lib/docker/containers" + "/cache" + ]; + preBuildScript = "\". ${lib.getExe installNixScript}\""; + environmentVariables = { + ENV = "/etc/profile"; + USER = "root"; + NIX_REMOTE = "daemon"; + NIX_SSL_CERT_FILE = "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt"; }; + }; } From 218d32153f794affb95996f77bae6455a58bf5d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 28 May 2025 23:29:28 -0300 Subject: [PATCH 389/404] Revert "firefox: remove pinned extensions" This reverts commit 6102f2283a3c624d97fb752c8d6125c8cf89d665. --- user/firefox.nix | 77 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 1 deletion(-) diff --git a/user/firefox.nix b/user/firefox.nix index 28ba913..0403a14 100644 --- a/user/firefox.nix +++ b/user/firefox.nix @@ -5,12 +5,85 @@ }: let inherit (config.my.theme) color; + + bugfixedFirefox = pkgs.firefox-devedition-unwrapped // { + requireSigning = false; + allowAddonSideload = true; + }; in { config = { programs.firefox = { enable = true; - package = pkgs.firefox-devedition; + package = pkgs.wrapFirefox bugfixedFirefox { + nixExtensions = [ + (pkgs.fetchFirefoxAddon { + name = "darkreader"; + url = "https://addons.mozilla.org/firefox/downloads/file/4205543/darkreader-4.9.73.xpi"; + hash = "sha256-fDmf8yVhiGu4Da0Mr6+PYpeSsLcf8e/PEmZ+BaKzjxo="; + }) + (pkgs.fetchFirefoxAddon { + name = "sponsorblock"; + url = "https://addons.mozilla.org/firefox/downloads/file/4202411/sponsorblock-5.4.29.xpi"; + hash = "sha256-7Xqc8cyQNylMe5/dgDOx1f2QDVmz3JshDlTueu6AcSg="; + }) + # (pkgs.fetchFirefoxAddon { + # name = "tree-style-tab"; + # url = "https://addons.mozilla.org/firefox/downloads/file/4197314/tree_style_tab-3.9.19.xpi"; + # hash = "sha256-u2f0elVPj5N/QXa+5hRJResPJAYwuT9z0s/0nwmFtVo="; + # }) + (pkgs.fetchFirefoxAddon { + name = "ublock-origin"; + url = "https://addons.mozilla.org/firefox/downloads/file/4290466/ublock_origin-1.58.0.xpi"; + hash = "sha256-RwxWmUpxdNshV4rc5ZixWKXcCXDIfFz+iJrGMr0wheo="; + }) + (pkgs.fetchFirefoxAddon { + name = "user_agent_string_switcher"; + url = "https://addons.mozilla.org/firefox/downloads/file/4098688/user_agent_string_switcher-0.5.0.xpi"; + hash = "sha256-ncjaPIxG1PBNEv14nGNQH6ai9QL4WbKGk5oJDbY+rjM="; + }) + + (pkgs.fetchFirefoxAddon { + name = "i-still-dont-care-about-cookies"; + url = "https://github.com/OhMyGuus/I-Still-Dont-Care-About-Cookies/releases/download/v1.1.4/istilldontcareaboutcookies-1.1.4.xpi"; + hash = "sha256-yt6yRiLTuaK4K/QwgkL9gCVGsSa7ndFOHqZvKqIGZ5U="; + }) + + (pkgs.fetchFirefoxAddon { + name = "vimium_ff"; + url = "https://addons.mozilla.org/firefox/downloads/file/4191523/vimium_ff-2.0.6.xpi"; + hash = "sha256-lKLX6IWWtliRdH1Ig33rVEB4DVfbeuMw0dfUPV/mSSI="; + }) + (pkgs.fetchFirefoxAddon { + name = "unhook"; + url = "https://addons.mozilla.org/firefox/downloads/file/4263531/youtube_recommended_videos-1.6.7.xpi"; + hash = "sha256-u21ouN9IyOzkTkFSeDz+QBp9psJ1F2Nmsvqp6nh0DRU="; + }) + # (pkgs.fetchFirefoxAddon { + # name = "invidious_redirect"; + # url = "https://addons.mozilla.org/firefox/downloads/file/4292924/invidious_redirect_2-1.16.xpi"; + # hash = "sha256-ApCc+MNmW9Wd/5seV6npePQVEaszT/rhD9EB7HGiUb8="; + # }) + + (pkgs.fetchFirefoxAddon { + name = "substitoot"; + url = "https://addons.mozilla.org/firefox/downloads/file/4236602/substitoot-0.7.2.0.xpi"; + hash = "sha256-1auSqEjkebwRSbmAVUsYwy77dl7TQCOnqgozpoVnqgI="; + }) + + # Locale + (pkgs.fetchFirefoxAddon { + name = "firefox_br"; + url = "https://addons.mozilla.org/firefox/downloads/file/4144369/firefox_br-115.0.20230726.201356.xpi"; + hash = "sha256-8zkqfdW0lX0b62+gAJeq4FFlQ06nXGFAexpH+wg2Cr0="; + }) + (pkgs.fetchFirefoxAddon { + name = "corretor"; + url = "https://addons.mozilla.org/firefox/downloads/file/1176165/corretor-65.2018.12.8.xpi"; + hash = "sha256-/rFQtJHdgemMkGAd+KWuWxVA/BwSIkn6sk0XZE0LrGk="; + }) + ]; + }; profiles = { dev-edition-default = { isDefault = true; @@ -21,6 +94,8 @@ in "toolkit.legacyUserProfileCustomizations.stylesheets" = true; "sidebar.position_start" = false; # Move sidebar to the right + "browser.tabs.groups.enabled" = true; + # enable media RDD to allow gpu acceleration "media.rdd-ffmpeg.enabled" = true; "media.rdd-ffvpx.enabled" = true; From 1d7c1bf0e9762b3919a5fb3d1491c51f566287bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 30 May 2025 01:31:19 -0300 Subject: [PATCH 390/404] monolith: switch to kyber io scheduler --- hosts/monolith/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/monolith/default.nix b/hosts/monolith/default.nix index 280cc3f..753047a 100644 --- a/hosts/monolith/default.nix +++ b/hosts/monolith/default.nix @@ -144,7 +144,7 @@ in ACTION=="add" SUBSYSTEM=="usb" ATTR{idVendor}=="046d" ATTR{idProduct}=="c547" ATTR{power/wakeup}="disabled" # Force all disks to use mq-deadline scheduler # For some reason "noop" is used by default which is kinda bad when io is saturated - ACTION=="add|change", KERNEL=="sd[a-z]*[0-9]*|mmcblk[0-9]*p[0-9]*|nvme[0-9]*n[0-9]*p[0-9]*", ATTR{../queue/scheduler}="mq-deadline" + ACTION=="add|change", KERNEL=="sd[a-z]*[0-9]*|mmcblk[0-9]*p[0-9]*|nvme[0-9]*n[0-9]*p[0-9]*", ATTR{../queue/scheduler}="kyber" ''; boot.tmp = { From 22dc422b6308e54973c3fa33a70ba39cd0096e6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 30 May 2025 17:05:29 -0300 Subject: [PATCH 391/404] gitlab-runner: fix broken cache config --- system/gitlab-runner.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/gitlab-runner.nix b/system/gitlab-runner.nix index e450b5e..8db526f 100644 --- a/system/gitlab-runner.nix +++ b/system/gitlab-runner.nix @@ -42,8 +42,8 @@ in "/tmp:/tmp" "/var/run/docker.sock:/var/run/docker.sock" "/var/lib/docker/containers:/var/lib/docker/containers" - "/cache" ]; + dockerDisableCache = true; preBuildScript = "\". ${lib.getExe installNixScript}\""; environmentVariables = { ENV = "/etc/profile"; From 51fd376c1bbe0124f9d5c41485ded91a718d77d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 4 Jun 2025 00:18:23 -0300 Subject: [PATCH 392/404] kak: add formatter for tsx and jsx --- user/kakoune/filetypes.kak | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/user/kakoune/filetypes.kak b/user/kakoune/filetypes.kak index 9fa33a6..b9d19f5 100644 --- a/user/kakoune/filetypes.kak +++ b/user/kakoune/filetypes.kak @@ -46,10 +46,18 @@ hook global BufCreate .*\.js %{ set buffer formatcmd "prettier --stdin-filepath=%val{buffile}" } +hook global BufCreate .*\.jsx %{ + set buffer formatcmd "prettier --stdin-filepath=%val{buffile}" +} + hook global BufCreate .*\.ts %{ set buffer formatcmd "prettier --stdin-filepath=%val{buffile}" } +hook global BufCreate .*\.tsx %{ + set buffer formatcmd "prettier --stdin-filepath=%val{buffile}" +} + hook global BufCreate .*\.scss %{ set buffer formatcmd "prettier --stdin-filepath=%val{buffile}" } From 61040aa0a76b4fd9a8ee3e9b457f6cc87c20090c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 16 Jun 2025 00:04:32 -0300 Subject: [PATCH 393/404] firefox: update ublock --- user/firefox.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user/firefox.nix b/user/firefox.nix index 0403a14..d15e569 100644 --- a/user/firefox.nix +++ b/user/firefox.nix @@ -34,8 +34,8 @@ in # }) (pkgs.fetchFirefoxAddon { name = "ublock-origin"; - url = "https://addons.mozilla.org/firefox/downloads/file/4290466/ublock_origin-1.58.0.xpi"; - hash = "sha256-RwxWmUpxdNshV4rc5ZixWKXcCXDIfFz+iJrGMr0wheo="; + url = "https://addons.mozilla.org/firefox/downloads/file/4492375/ublock_origin-1.64.0.xpi"; + hash = "sha256-ueHIaL0awd78q/LgF3bRqQ7/ujSwf+aiE1DUXwIuDp8="; }) (pkgs.fetchFirefoxAddon { name = "user_agent_string_switcher"; From 6f4642531c946c3a1e2be51db5c543610492e352 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 16 Jun 2025 00:41:58 -0300 Subject: [PATCH 394/404] update --- flake.lock | 66 +++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index 78b8ed1..6e77084 100644 --- a/flake.lock +++ b/flake.lock @@ -225,11 +225,11 @@ ] }, "locked": { - "lastModified": 1747742835, - "narHash": "sha256-kYL4GCwwznsypvsnA20oyvW8zB/Dvn6K5G/tgMjVMT4=", + "lastModified": 1749436314, + "narHash": "sha256-CqmqU5FRg5AadtIkxwu8ulDSOSoIisUMZRLlcED3Q5w=", "owner": "nix-community", "repo": "disko", - "rev": "df522e787fdffc4f32ed3e1fca9ed0968a384d62", + "rev": "dfa4d1b9c39c0342ef133795127a3af14598017a", "type": "github" }, "original": { @@ -243,11 +243,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1742179690, - "narHash": "sha256-s/q3OWRe5m7kwDcAs1BhJEj6aHc5bsBxRnLP7DM77xE=", + "lastModified": 1749410315, + "narHash": "sha256-5H8MuMMSq1WnQcvb1FiDNkKP+uyeZ8HX5GRTMfEOyLI=", "owner": "lelgenio", "repo": "dzgui-nix", - "rev": "a6d68720c932ac26d549b24f17c776bd2aeb73b4", + "rev": "49adbb1edfb3c25b0cd8256d35673394386065e7", "type": "github" }, "original": { @@ -504,11 +504,11 @@ ] }, "locked": { - "lastModified": 1747556831, - "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=", + "lastModified": 1749154018, + "narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=", "owner": "nix-community", "repo": "home-manager", - "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33", + "rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111", "type": "github" }, "original": { @@ -545,11 +545,11 @@ ] }, "locked": { - "lastModified": 1747540584, - "narHash": "sha256-cxCQ413JTUuRv9Ygd8DABJ1D6kuB/nTfQqC0Lu9C0ls=", + "lastModified": 1749355504, + "narHash": "sha256-L17CdJMD+/FCBOHjREQLXbe2VUnc3rjffenBbu2Kwpc=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "ec179dd13fb7b4c6844f55be91436f7857226dce", + "rev": "40a6e15e44b11fbf8f2b1df9d64dbfc117625e94", "type": "github" }, "original": { @@ -617,11 +617,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1747744144, - "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", + "lastModified": 1749285348, + "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", + "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f", "type": "github" }, "original": { @@ -678,11 +678,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1747953325, - "narHash": "sha256-y2ZtlIlNTuVJUZCqzZAhIw5rrKP4DOSklev6c8PyCkQ=", + "lastModified": 1749727998, + "narHash": "sha256-mHv/yeUbmL91/TvV95p+mBVahm9mdQMJoqaTVTALaFw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "55d1f923c480dadce40f5231feb472e81b0bab48", + "rev": "fd487183437963a59ba763c0cc4f27e3447dd6dd", "type": "github" }, "original": { @@ -693,11 +693,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1745377448, - "narHash": "sha256-jhZDfXVKdD7TSEGgzFJQvEEZ2K65UMiqW5YJ2aIqxMA=", + "lastModified": 1747958103, + "narHash": "sha256-qmmFCrfBwSHoWw7cVK4Aj+fns+c54EBP8cGqp/yK410=", "owner": "nixos", "repo": "nixpkgs", - "rev": "507b63021ada5fee621b6ca371c4fca9ca46f52c", + "rev": "fe51d34885f7b5e3e7b59572796e1bcb427eccb1", "type": "github" }, "original": { @@ -758,11 +758,11 @@ "ranger-icons": { "flake": false, "locked": { - "lastModified": 1736375293, - "narHash": "sha256-ck53eG+mGIQ706sUnEHbJ6vY1/LYnRcpq94JXzwnGTQ=", + "lastModified": 1749128401, + "narHash": "sha256-qvWqKVS4C5OO6bgETBlVDwcv4eamGlCUltjsBU3gAbA=", "owner": "alexanderjeurissen", "repo": "ranger_devicons", - "rev": "f227f212e14996fbb366f945ec3ecaf5dc5f44b0", + "rev": "1bcaff0366a9d345313dc5af14002cfdcddabb82", "type": "github" }, "original": { @@ -850,11 +850,11 @@ ] }, "locked": { - "lastModified": 1747603214, - "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=", + "lastModified": 1749592509, + "narHash": "sha256-VunQzfZFA+Y6x3wYi2UE4DEQ8qKoAZZCnZPUlSoqC+A=", "owner": "Mic92", "repo": "sops-nix", - "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd", + "rev": "50754dfaa0e24e313c626900d44ef431f3210138", "type": "github" }, "original": { @@ -1010,11 +1010,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1747912973, - "narHash": "sha256-XgxghfND8TDypxsMTPU2GQdtBEsHTEc3qWE6RVEk8O0=", + "lastModified": 1749194973, + "narHash": "sha256-eEy8cuS0mZ2j/r/FE0/LYBSBcIs/MKOIVakwHVuqTfk=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "020cb423808365fa3f10ff4cb8c0a25df35065a3", + "rev": "a05be418a1af1198ca0f63facb13c985db4cb3c5", "type": "github" }, "original": { @@ -1025,11 +1025,11 @@ }, "vpsadminos": { "locked": { - "lastModified": 1748016252, - "narHash": "sha256-P/h9BTZv6r5br/MKkXyEdUdDTU446UaAZzGLQMCMSIw=", + "lastModified": 1749716966, + "narHash": "sha256-aF+YOXv07qI7Q267gqapUcAsoQkI3+EcmZczatq6wkg=", "owner": "vpsfreecz", "repo": "vpsadminos", - "rev": "4756a2ecc603c347e3d983663d663e96f22225a9", + "rev": "2d991bb5109350801a381bff097809b76ee962f5", "type": "github" }, "original": { From 96e9fd098f0734e11292abca05a655c35979f363 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 16 Jun 2025 00:05:13 -0300 Subject: [PATCH 395/404] monolith: remove docker-images gitlab runner --- secrets/monolith/default.yaml | 5 ++--- system/monolith-gitlab-runner.nix | 12 ------------ 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/secrets/monolith/default.yaml b/secrets/monolith/default.yaml index f354335..5ca1383 100644 --- a/secrets/monolith/default.yaml +++ b/secrets/monolith/default.yaml @@ -5,7 +5,6 @@ gitlab-runners: thoreb-itinerario-nix: ENC[AES256_GCM,data:UdAAD0V895sFoEYR56sCG2LlpZugJ0K/nwkTygzWOnbTSmBRAcIQ8qVFPZGw+K+XMSLiCyio6Jp7k8AYP0K1VYm+6aEP3OkqR9FCLQTJgXo=,iv:UGUby50BYkn13OzItk6zZmxc5+SnbZZa4bebQHIow2A=,tag:LjDg3deWwdH2T71EtPo6jA==,type:str] docker-images-token: ENC[AES256_GCM,data:GGB/KSkjdAyhFKEspAh91ItbqEDf7K/LZSGSn+Jp7SxRfXpDzHIiMD8XJ9PTkGLeQGN4ug1i2nTYPS7d/P5OALWDU+1NPiV9nPdG0w7GERfu4g==,iv:6roabdOKX9xFMf0hWlECd73+943R+hFLos0e2dOpzns=,tag:LrASFc4DtN7aQ+3oOW/p/w==,type:str] wopus-gitlab-nix: ENC[AES256_GCM,data:asE7J0d58x9VfQFWc07f5T4s5NZ+/VqMQo66EX93J0LbJ4iI5YjvrrIE4pSI1e4Nz/SRQhltaJ0DfSH0+qgjD4wnAONPRi3UlFbSdGWS2bwwRtWe+Nci2krrUFxV2i/ZVE3CwCkNe4mqtII=,iv:gKrD/LhzI+jnDnX6CdxoHfjpiRdrsuRYJF9rTc8SffM=,tag:TczDGSU3gdKmERjBJ7tP/A==,type:str] - wopus-gitlab-docker-images: ENC[AES256_GCM,data:aGbCjQr1VKgg5n4f8vZKgdXcDw/M5JHez9E2TqipBXQ8D0jXdfPg6laNOJUOD+uPBOIGKUBMEg4OtLblCZFVw/V6wJN16wVbwkDU3uELQ8tPmlYSt4fcy4+5sC6+tV4YeMSKA6yIjD+xpkk=,iv:ojBhf2WdkWHruvTbABAAvuGDVOnsUl+qnhvH09L+lgA=,tag:gWhEkvL1qlcge3bSKVDSIg==,type:str] bitbucket-runners: wopus-runner-1: ENC[AES256_GCM,data:gtH0T5n8qMYpvSv5ciN8+ScGlFDf9xE0FTxNP97vT/qsOCcaItTE+5P+DFcWw46onLED+1c+u0sArFbEsT3f8lyco9b+0l99uOQAxLZQzAXYH8zGye1UnwUtytkci2PHu5c8kTpIWHXyZ1IOYNGWkermeab57ANzOkM1LbkHyAjS6VTh0I60LfAOdHOw5FDFL8d1d9oWxLloOe9USLPqHjC023EpCUT2YuyHoPCTpBu8Kb/2HfV0wkAKaB3dvVrKwXCj+bfP6+bjQ3uMzVO/7jxPmnSGBfvyZ+Hlg5goJ6bSAqQWmnPPnQ96FgQfe8su5ML9qNIp9/7eNiL6Rv6Vhxe0hHbE5wsZ/58grcg/LrugeWJvUJ9THhwcTwO8Pkvwlq0XM9seUY2NV+LCK3bLQ4IWDjWkU1IHg6+nihTcvl1iD6UIGMgqGoB/v05WVzHb+GcE2fFuSuhVHfa5RMyboELOJoFrqZiXGhY=,iv:ZakLafxYQCDd1Zw8T83Xfj+YwAQKna9LC6ognJqtifA=,tag:bwBObfdMIvJfRrOG04NtxA==,type:str] wopus-runner-2: ENC[AES256_GCM,data:gg8merZMFbf396hdJY7zmKQndT3GzB7NeGZAs3C0au8Zd7OFAg9vcQcFcxNA3kZGJZqmFTR/ycWJwhYr9fhlfFuPhDynVvgJAqoYtvC2MUDiOMD/d3DlfwFjQ6cOGTrvFuY1kkgSFb4OFdrVC1eiTDrGygFmYnYcqTKn/t5Ttqi+cHZNzFzVzdVLvaLCYxltM5g45zn+fXYxYwCfqyb32/M1XTnnwIGiataGxEX5oWhVV4zqeLO4ZIYPSby5AVvIMJ/zqvqaeVVY52GLDcTKrj3thbZxMQLWN3/lOA0uYhi3L/WM8Gx+JMEIbSICcuT7QXu4w4PA+opcx9GnsMCK2/egzS+cNPJ4vGZCdVD/jh6A9zVEJAgXdsHXNXFHmMPt7DcgrCQiub62og4kBY4G/Rcg4UN7sb3v3qyBpGbCGHGRjCFc+wdHpom0yDOG2cwcqfN49pC2R7Ag2BisFQ/5A+DPmKnvGG3kt9s=,iv:5g5XiDecYqi4JNRkZubgPJECBQdZ6rBeojgFe6Etebk=,tag:HRy5bFSbfxKTb5e13lGtgg==,type:str] @@ -31,8 +30,8 @@ sops: aFVxcDFhaGdYekRWRVFIWnRsZndtZFkKgsvxOFHOcO306Z9FkucA1fDOpZA8N1/h jYmIgcKTFgWoSCvux67lK30jFsYp7sm5z6WxxDYsGcoQ/+pxoUX2jQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-05-28T03:04:52Z" - mac: ENC[AES256_GCM,data:THwZcK7nJnCYEUR8CiaQKZ8dQpYbDqnshBBWFzEzPXEWLgFB9+7d6aRh9ZDjZs0rhBTChta3H7YxDJdFh5nAJQy532FJp4S4tBOLHWFZARlKhXngujd0SvxPER55uvxImNFIYX0RDSHUck5jDXCA0tBCmE/Q7DuY7v0+cmRgOV8=,iv:1p3kFMSg0k1n00P6UY5Tttuqvpsb4Se8km5zA9GhAu4=,tag:cDxbHZ+eScDQacwV1sYGIA==,type:str] + lastmodified: "2025-06-16T13:05:35Z" + mac: ENC[AES256_GCM,data:i8HOA7JSVSkxpoXJpFYrENodySyEEupYLNjuezRpd+PQWmxE7igonFyweUblmkSyBgy1FpmN+llwoP0Cokka5QyJse9jq9hR6dFATpZC9qPzSlAb+RpdSzp4QXjryOzP/23RJ7WhhBOC2DRw8OkDBPDJINBnCtu1ticpiuXKoHs=,iv:WEEdZDbrrkhip0ZkpqQfg6fwV+OzP/bBBrExyvOhqng=,tag:6iLMsJtenKdU/lJU/+HnCg==,type:str] pgp: - created_at: "2025-03-07T22:49:16Z" enc: |- diff --git a/system/monolith-gitlab-runner.nix b/system/monolith-gitlab-runner.nix index dd80627..6f1f7b3 100644 --- a/system/monolith-gitlab-runner.nix +++ b/system/monolith-gitlab-runner.nix @@ -27,15 +27,6 @@ in authenticationTokenConfigFile = config.sops.secrets."gitlab-runners/docker-images-token".path; dockerImage = "debian:stable"; }; - - wopus-gitlab-docker-images = { - # File should contain at least these two variables: - # `CI_SERVER_URL` - # `CI_SERVER_TOKEN` - authenticationTokenConfigFile = - config.sops.secrets."gitlab-runners/wopus-gitlab-docker-images".path; - dockerImage = "debian:stable"; - }; }; }; systemd.services.gitlab-runner.serviceConfig.Nice = 10; @@ -53,8 +44,5 @@ in "gitlab-runners/wopus-gitlab-nix" = { sopsFile = ../secrets/monolith/default.yaml; }; - "gitlab-runners/wopus-gitlab-docker-images" = { - sopsFile = ../secrets/monolith/default.yaml; - }; }; } From ffe90ab90d9a395d6b837c86070de6ef31a6e497 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 16 Jun 2025 13:03:20 -0300 Subject: [PATCH 396/404] kak: work around for rust-analyzer currupting ~/.cargo --- user/kakoune/kak-lsp.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/user/kakoune/kak-lsp.toml b/user/kakoune/kak-lsp.toml index 9c195bd..818c737 100644 --- a/user/kakoune/kak-lsp.toml +++ b/user/kakoune/kak-lsp.toml @@ -135,6 +135,7 @@ args = [ [language_server.rust-analyzer.settings.rust-analyzer] # See https://rust-analyzer.github.io/manual.html#configuration # cargo.features = [] +cargo.buildScripts.useRustcWrapper = false checkOnSave.command = "clippy" hoverActions.enable = false # kak-lsp doesn't support this at the moment From f410503e669729aac9096c08c5fcee24c2ea825a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sun, 22 Jun 2025 21:55:46 -0300 Subject: [PATCH 397/404] phantom: add support for managing email filters (managesieve) --- hosts/phantom/email.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hosts/phantom/email.nix b/hosts/phantom/email.nix index 1951629..105113b 100644 --- a/hosts/phantom/email.nix +++ b/hosts/phantom/email.nix @@ -36,6 +36,8 @@ hashedPassword = "$2b$05$DcA9xMdvHqqQMZw2.zybI.vfKsQAJtaQ/JB.t9AHu6psstWq97m2C"; }; }; + + enableManageSieve = true; }; # Prefer ipv4 and use main ipv6 to avoid reverse DNS issues @@ -52,7 +54,7 @@ $config['smtp_host'] = "tls://${config.mailserver.fqdn}:587"; $config['smtp_user'] = "%u"; $config['smtp_pass'] = "%p"; - $config['plugins'] = [ "carddav", "archive" ]; + $config['plugins'] = [ "carddav", "archive", "managesieve" ]; ''; }; } From 0fa0d0b7a92b3bd1d95d5f52d9982a3ae90455fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sun, 22 Jun 2025 23:56:09 -0300 Subject: [PATCH 398/404] satty: add config --- user/home.nix | 1 + user/satty/config.toml | 63 ++++++++++++++++++++++++++++++++++++++++ user/satty/default.nix | 22 ++++++++++++++ user/sway/default.nix | 1 + user/sway/sway-binds.nix | 2 +- 5 files changed, 88 insertions(+), 1 deletion(-) create mode 100644 user/satty/config.toml create mode 100644 user/satty/default.nix diff --git a/user/home.nix b/user/home.nix index 334e260..1778052 100644 --- a/user/home.nix +++ b/user/home.nix @@ -36,6 +36,7 @@ ./pass.nix ./pqiv.nix ./zathura.nix + ./satty ./man.nix ./mpd.nix ./sway diff --git a/user/satty/config.toml b/user/satty/config.toml new file mode 100644 index 0000000..84075cb --- /dev/null +++ b/user/satty/config.toml @@ -0,0 +1,63 @@ +[general] +# Start Satty in fullscreen mode +fullscreen = true +# Exit directly after copy/save action +early-exit = true +# Draw corners of rectangles round if the value is greater than 0 (0 disables rounded corners) +corner-roundness = 12 +# Select the tool on startup [possible values: pointer, crop, line, arrow, rectangle, text, marker, blur, brush] +initial-tool = "brush" +# Configure the command to be called on copy, for example `wl-copy` +copy-command = "wl-copy" +# Increase or decrease the size of the annotations +# annotation-size-factor = 2 +# Filename to use for saving action. Omit to disable saving to file. Might contain format specifiers: https://docs.rs/chrono/latest/chrono/format/strftime/index.html +# output-filename = "/tmp/test-%Y-%m-%d_%H:%M:%S.png" +# After copying the screenshot, save it to a file as well +# save-after-copy = false +# Hide toolbars by default +# default-hide-toolbars = false +# Experimental: whether window focus shows/hides toolbars. This does not affect initial state of toolbars, see default-hide-toolbars. +# focus-toggles-toolbars = false +# The primary highlighter to use, the other is accessible by holding CTRL at the start of a highlight [possible values: block, freehand] +primary-highlighter = "block" +# Disable notifications +disable-notifications = true +# Actions to trigger on right click (order is important) +# [possible values: save-to-clipboard, save-to-file, exit] +# actions-on-right-click = [] +# Actions to trigger on Enter key (order is important) +# [possible values: save-to-clipboard, save-to-file, exit] +# actions-on-enter = ["save-to-clipboard"] +# Actions to trigger on Escape key (order is important) +# [possible values: save-to-clipboard, save-to-file, exit] +# actions-on-escape = ["exit"] +# Action to perform when the Enter key is pressed [possible values: save-to-clipboard, save-to-file] +# Deprecated: use actions-on-enter instead +action-on-enter = "save-to-clipboard" +# Right click to copy +# Deprecated: use actions-on-right-click instead +# right-click-copy = false +# request no window decoration. Please note that the compositor has the final say in this. At this point. requires xdg-decoration-unstable-v1. +# no-window-decoration = true +# experimental feature: adjust history size for brush input smooting (0: disabled, default: 0, try e.g. 5 or 10) +# brush-smooth-history-size = 10 + +# Font to use for text annotations +[font] +family = "Roboto" +style = "Bold" + +# Custom colours for the colour palette +[color-palette] +# These will be shown in the toolbar for quick selection +palette = [ + "#ff0000", + "#00ffff", + "#a52a2a", + "#dc143c", + "#ff1493", + "#ffd700", + "#008000", +] + diff --git a/user/satty/default.nix b/user/satty/default.nix new file mode 100644 index 0000000..5709b77 --- /dev/null +++ b/user/satty/default.nix @@ -0,0 +1,22 @@ +{ + pkgs, + lib, + config, + ... +}: +let + cfg = config.my.satty; +in +{ + options.my.satty.enable = lib.mkEnableOption { }; + + config = lib.mkIf cfg.enable { + xdg.configFile."satty/config.toml" = { + source = ./config.toml; + }; + + home.packages = with pkgs; [ + satty + ]; + }; +} diff --git a/user/sway/default.nix b/user/sway/default.nix index 596fdde..7a2825f 100644 --- a/user/sway/default.nix +++ b/user/sway/default.nix @@ -32,6 +32,7 @@ in my.swaylock.enable = true; my.mpd.enable = true; my.zathura.enable = true; + my.satty.enable = true; my.waybar.enable = true; my.gammastep.enable = true; diff --git a/user/sway/sway-binds.nix b/user/sway/sway-binds.nix index fd05236..ae71cf4 100644 --- a/user/sway/sway-binds.nix +++ b/user/sway/sway-binds.nix @@ -172,7 +172,7 @@ let "${mod}+Return" = "exec ${terminal}"; "${mod}+Ctrl+Return" = "exec thunar"; "${mod}+Shift+s" = '' - exec grim - | satty --filename - --fullscreen --output-filename "$(xdg-user-dir PICTURES)"/Screenshots/satty-$(date '+%Y%m%d-%H:%M:%S').png + exec grim - | satty --filename - --output-filename "$(xdg-user-dir PICTURES)"/Screenshots/satty-$(date '+%Y%m%d-%H:%M:%S').png ''; "${mod}+Ctrl+v" = "exec wl-paste | tesseract -l por - - | wl-copy"; "${mod}+k" = "exec showkeys"; From 6ff8646af3eedad9c5f41713039c371b2c724e1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sun, 22 Jun 2025 23:56:31 -0300 Subject: [PATCH 399/404] 25.05: update renamed options --- system/sound.nix | 2 +- user/gnome.nix | 2 +- user/sway/default.nix | 2 +- user/vscode/default.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/system/sound.nix b/system/sound.nix index f04e513..40dd701 100644 --- a/system/sound.nix +++ b/system/sound.nix @@ -1,6 +1,6 @@ { pkgs, ... }: { - hardware.pulseaudio.enable = false; + services.pulseaudio.enable = false; services.pipewire = { enable = true; wireplumber.enable = true; diff --git a/user/gnome.nix b/user/gnome.nix index 776f095..9a3562b 100644 --- a/user/gnome.nix +++ b/user/gnome.nix @@ -43,7 +43,7 @@ lib.mkIf (config.my.desktop == "gnome") { qt6Packages.qtstyleplugin-kvantum ]; - services.gpg-agent.pinentryPackage = pkgs.pinentry-gnome; + services.gpg-agent.pinentry.package = pkgs.pinentry-gnome; xdg.defaultApplications = { enable = lib.mkForce false; diff --git a/user/sway/default.nix b/user/sway/default.nix index 7a2825f..5fbd379 100644 --- a/user/sway/default.nix +++ b/user/sway/default.nix @@ -124,7 +124,7 @@ in indicator = true; }; - services.gpg-agent.pinentryPackage = pkgs.pinentry-all; + services.gpg-agent.pinentry.package = pkgs.pinentry-all; xdg.configFile."OpenTabletDriver/settings.json" = { force = true; diff --git a/user/vscode/default.nix b/user/vscode/default.nix index b8afdfd..e9a97cb 100644 --- a/user/vscode/default.nix +++ b/user/vscode/default.nix @@ -4,7 +4,7 @@ programs.vscode = { enable = true; package = pkgs.vscodium; - extensions = with pkgs.vscode-extensions; [ + profiles.default.extensions = with pkgs.vscode-extensions; [ jnoortheen.nix-ide github.github-vscode-theme rust-lang.rust-analyzer From 48ca243d3b230f11f3746a8024af67c2ee06a8ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sun, 22 Jun 2025 23:56:58 -0300 Subject: [PATCH 400/404] make: update to new settings format --- user/sway/mako.nix | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/user/sway/mako.nix b/user/sway/mako.nix index 28b5eb4..6c78c9f 100644 --- a/user/sway/mako.nix +++ b/user/sway/mako.nix @@ -20,21 +20,22 @@ in config = lib.mkIf cfg.enable { services.mako = { enable = true; - borderSize = 2; - padding = "5"; - margin = "15"; - layer = "overlay"; - - font = "${font.interface} ${toString font.size.small}"; - textColor = color.txt; - - backgroundColor = color.bg; - borderColor = accent.color; - progressColor = "over ${accent.color}88"; - - defaultTimeout = 10000; settings = { + border-size = 2; + padding = "5"; + margin = "15"; + layer = "overlay"; + + font = "${font.interface} ${toString font.size.small}"; + text-color = color.txt; + + background-color = color.bg; + border-color = accent.color; + progress-color = "over ${accent.color}88"; + + default-timeout = 10000; + "app-name=volumesh" = { "default-timeout" = "5000"; "group-by" = "app-name"; From dc89b61ff7ee76cd6a89abf4b4d7f05bbd385795 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sun, 22 Jun 2025 23:57:12 -0300 Subject: [PATCH 401/404] waybar: fix use of deprecated function substituteAll --- user/waybar/default.nix | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/user/waybar/default.nix b/user/waybar/default.nix index fc95ff1..5af72bc 100644 --- a/user/waybar/default.nix +++ b/user/waybar/default.nix @@ -234,23 +234,19 @@ in }; } ]; - style = builtins.readFile ( - pkgs.substituteAll { - src = ./style.css; + style = pkgs.replaceVars ./style.css { + accent_color = accent.color; - accent_color = accent.color; + color_bg = color.bg; + color_bg_dark = color.bg_dark; + color_bg_light = color.bg_light; + color_txt = color.txt; - color_bg = color.bg; - color_bg_dark = color.bg_dark; - color_bg_light = color.bg_light; - color_txt = color.txt; + font_interface = font.interface; - font_interface = font.interface; - - font_size_big = "${toString font.size.big}px"; - font_size_medium = "${toString font.size.medium}px"; - } - ); + font_size_big = "${toString font.size.big}px"; + font_size_medium = "${toString font.size.medium}px"; + }; }; home.packages = with pkgs; [ waybar ]; }; From d531c24808193f1b0c7eb19d7e27d7906315f6a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 23 Jun 2025 11:21:48 -0300 Subject: [PATCH 402/404] Revert "kak: work around for rust-analyzer currupting ~/.cargo" This reverts commit ffe90ab90d9a395d6b837c86070de6ef31a6e497. --- user/kakoune/kak-lsp.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/user/kakoune/kak-lsp.toml b/user/kakoune/kak-lsp.toml index 818c737..9c195bd 100644 --- a/user/kakoune/kak-lsp.toml +++ b/user/kakoune/kak-lsp.toml @@ -135,7 +135,6 @@ args = [ [language_server.rust-analyzer.settings.rust-analyzer] # See https://rust-analyzer.github.io/manual.html#configuration # cargo.features = [] -cargo.buildScripts.useRustcWrapper = false checkOnSave.command = "clippy" hoverActions.enable = false # kak-lsp doesn't support this at the moment From 211b5b41a984b30d9fec99b8f7aa0d7d44b2fa52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Tue, 24 Jun 2025 08:53:42 -0300 Subject: [PATCH 403/404] monolith: remove bitbucket runners --- flake.nix | 1 - secrets/monolith/default.yaml | 9 ++--- system/monolith-bitbucket-runner.nix | 50 ---------------------------- 3 files changed, 2 insertions(+), 58 deletions(-) delete mode 100644 system/monolith-bitbucket-runner.nix diff --git a/flake.nix b/flake.nix index 05332a4..0818b6a 100644 --- a/flake.nix +++ b/flake.nix @@ -150,7 +150,6 @@ modules = [ ./hosts/monolith ./system/monolith-gitlab-runner.nix - ./system/monolith-bitbucket-runner.nix ./system/monolith-forgejo-runner.nix ./system/nix-serve.nix ] ++ common_modules; diff --git a/secrets/monolith/default.yaml b/secrets/monolith/default.yaml index 5ca1383..0dbc4ae 100644 --- a/secrets/monolith/default.yaml +++ b/secrets/monolith/default.yaml @@ -5,11 +5,6 @@ gitlab-runners: thoreb-itinerario-nix: ENC[AES256_GCM,data:UdAAD0V895sFoEYR56sCG2LlpZugJ0K/nwkTygzWOnbTSmBRAcIQ8qVFPZGw+K+XMSLiCyio6Jp7k8AYP0K1VYm+6aEP3OkqR9FCLQTJgXo=,iv:UGUby50BYkn13OzItk6zZmxc5+SnbZZa4bebQHIow2A=,tag:LjDg3deWwdH2T71EtPo6jA==,type:str] docker-images-token: ENC[AES256_GCM,data:GGB/KSkjdAyhFKEspAh91ItbqEDf7K/LZSGSn+Jp7SxRfXpDzHIiMD8XJ9PTkGLeQGN4ug1i2nTYPS7d/P5OALWDU+1NPiV9nPdG0w7GERfu4g==,iv:6roabdOKX9xFMf0hWlECd73+943R+hFLos0e2dOpzns=,tag:LrASFc4DtN7aQ+3oOW/p/w==,type:str] wopus-gitlab-nix: ENC[AES256_GCM,data:asE7J0d58x9VfQFWc07f5T4s5NZ+/VqMQo66EX93J0LbJ4iI5YjvrrIE4pSI1e4Nz/SRQhltaJ0DfSH0+qgjD4wnAONPRi3UlFbSdGWS2bwwRtWe+Nci2krrUFxV2i/ZVE3CwCkNe4mqtII=,iv:gKrD/LhzI+jnDnX6CdxoHfjpiRdrsuRYJF9rTc8SffM=,tag:TczDGSU3gdKmERjBJ7tP/A==,type:str] -bitbucket-runners: - wopus-runner-1: ENC[AES256_GCM,data:gtH0T5n8qMYpvSv5ciN8+ScGlFDf9xE0FTxNP97vT/qsOCcaItTE+5P+DFcWw46onLED+1c+u0sArFbEsT3f8lyco9b+0l99uOQAxLZQzAXYH8zGye1UnwUtytkci2PHu5c8kTpIWHXyZ1IOYNGWkermeab57ANzOkM1LbkHyAjS6VTh0I60LfAOdHOw5FDFL8d1d9oWxLloOe9USLPqHjC023EpCUT2YuyHoPCTpBu8Kb/2HfV0wkAKaB3dvVrKwXCj+bfP6+bjQ3uMzVO/7jxPmnSGBfvyZ+Hlg5goJ6bSAqQWmnPPnQ96FgQfe8su5ML9qNIp9/7eNiL6Rv6Vhxe0hHbE5wsZ/58grcg/LrugeWJvUJ9THhwcTwO8Pkvwlq0XM9seUY2NV+LCK3bLQ4IWDjWkU1IHg6+nihTcvl1iD6UIGMgqGoB/v05WVzHb+GcE2fFuSuhVHfa5RMyboELOJoFrqZiXGhY=,iv:ZakLafxYQCDd1Zw8T83Xfj+YwAQKna9LC6ognJqtifA=,tag:bwBObfdMIvJfRrOG04NtxA==,type:str] - wopus-runner-2: ENC[AES256_GCM,data:gg8merZMFbf396hdJY7zmKQndT3GzB7NeGZAs3C0au8Zd7OFAg9vcQcFcxNA3kZGJZqmFTR/ycWJwhYr9fhlfFuPhDynVvgJAqoYtvC2MUDiOMD/d3DlfwFjQ6cOGTrvFuY1kkgSFb4OFdrVC1eiTDrGygFmYnYcqTKn/t5Ttqi+cHZNzFzVzdVLvaLCYxltM5g45zn+fXYxYwCfqyb32/M1XTnnwIGiataGxEX5oWhVV4zqeLO4ZIYPSby5AVvIMJ/zqvqaeVVY52GLDcTKrj3thbZxMQLWN3/lOA0uYhi3L/WM8Gx+JMEIbSICcuT7QXu4w4PA+opcx9GnsMCK2/egzS+cNPJ4vGZCdVD/jh6A9zVEJAgXdsHXNXFHmMPt7DcgrCQiub62og4kBY4G/Rcg4UN7sb3v3qyBpGbCGHGRjCFc+wdHpom0yDOG2cwcqfN49pC2R7Ag2BisFQ/5A+DPmKnvGG3kt9s=,iv:5g5XiDecYqi4JNRkZubgPJECBQdZ6rBeojgFe6Etebk=,tag:HRy5bFSbfxKTb5e13lGtgg==,type:str] - wopus-runner-3: ENC[AES256_GCM,data:f9pLYR8t51HtPpLyXysIVaDAhxDrmktJH93E7rb7imtKwK7hRhR8usnvHTcknLfD7BMvStAIYefdGt19u7PrQu6vqc19bEcNbnK5OH4KBP6+X47oMgBYtbIGXH+t3dSDt22fSIoppTwdX7/Kf4vqesfN8K7EunETvFR86oyyKdy15mvXr0XUO4us4HZjnIOBEnOm1P/V8hk5JcCpRuo+8ZYmBe5gzq5pTnqnYlPE1EovM7eDMg72J7ev07h50qvySrAqmNiqDcXfTPQ2TzuHx3XxAYqFybf1L6P9OnLB6RDAlpoFJ0h8dSg2tzC2+amYsBP0UIBK/ZhWvvAjpX+MZrTASjenh/tefDcNdbsXDOr7A4i/261z4rC0r+97INglCN1N/SZg51iBHiRAVV1zibDLfioR5+eBIykWAtjILMoYU+zOcr0E8K0I9jQGMtpnYmvHJqV0DVcdfZpJptrPUUy+lQ/iZVcPpLs=,iv:grzvVsfpUzywjNE4jvTxXKG3TYajrvSsQgfOgtafvIo=,tag:K1B6crN0ckLk0EYBtGHDkw==,type:str] - wopus-runner-4: ENC[AES256_GCM,data:D1Zq0BtPuACnutAbUcj3gYSMLuIZcMuqc/1mEFmitEG0tBFMWhkabS+8lXcp8sb1DM0LTDMEwgMB9FVyFb670MKQNEncqQtaNJtY1BxS3SolovDAM/I+i6YGvd4X8jX99d+7ZNR6xGBWJ/dW8rz4QnIM8Eh3FDOqaFa/ltfyPKP9IZ2uZi67C/n8Q/OSdgMQkt+QxhgJfSghE1iruPwxyGlqv+E4SZNI/fQQMjX0Lh7z02ms58yyMtjO71YbukV/JXFRsdJrqY2wfH/6NlZbsKideoSxluBRVqmbW6KQd7dUT819KbOSu9CFdgThtVCU8qiv3jbAbn8D5xRy4AAOEfSqRLXJoj7otCqr47R/8+0BdS3aztFBjL3lDmprMWZ4+LD55fvczfpxUF9ox1mhcjIvCvZJJL06XsST1XRXa7i2fr4/a/XhCmQgIzar5IYxSC9OjuHp6jLsTaY3ZUgid5W1L1n8uWSmA98=,iv:O9caRG//brERiIhuMrsFdTz6TnPY0rdQnvHEu0P42yM=,tag:hrmwLX/CRhZfammJ2nfTPw==,type:str] sops: age: - recipient: age1zrgu7w8059xydagm60phnffghvfe9h2ca58cx8qwagqpyfuvs9fqw79c8h @@ -30,8 +25,8 @@ sops: aFVxcDFhaGdYekRWRVFIWnRsZndtZFkKgsvxOFHOcO306Z9FkucA1fDOpZA8N1/h jYmIgcKTFgWoSCvux67lK30jFsYp7sm5z6WxxDYsGcoQ/+pxoUX2jQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-06-16T13:05:35Z" - mac: ENC[AES256_GCM,data:i8HOA7JSVSkxpoXJpFYrENodySyEEupYLNjuezRpd+PQWmxE7igonFyweUblmkSyBgy1FpmN+llwoP0Cokka5QyJse9jq9hR6dFATpZC9qPzSlAb+RpdSzp4QXjryOzP/23RJ7WhhBOC2DRw8OkDBPDJINBnCtu1ticpiuXKoHs=,iv:WEEdZDbrrkhip0ZkpqQfg6fwV+OzP/bBBrExyvOhqng=,tag:6iLMsJtenKdU/lJU/+HnCg==,type:str] + lastmodified: "2025-06-24T11:51:22Z" + mac: ENC[AES256_GCM,data:onyjWlFsH/9YGSi2nGsPmZjhE4nFVQ5Jiwfi4s9KC7NetKD7Reyz2JY6i3YuZspBn3Jvbq8nOKVPGzttMAG+IrqQEv6+MxrCOEnJZXZcqocDNg7dACOXmJB5iwpFVdKscesTH2SScf7Pl/q6l9KOFjFuaZeBB7dlxHVA5zzCVOU=,iv:lEbxg2HfxU6ikgWSpUNAGIfgaz7DnZjXnLWcmsvt0A4=,tag:/Ag37QuJj9Xy/u20Nhy05Q==,type:str] pgp: - created_at: "2025-03-07T22:49:16Z" enc: |- diff --git a/system/monolith-bitbucket-runner.nix b/system/monolith-bitbucket-runner.nix deleted file mode 100644 index 17d462b..0000000 --- a/system/monolith-bitbucket-runner.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ - config, - pkgs, - ... -}: - -let - mkRunner = secret: { - image = "docker-public.packages.atlassian.com/sox/atlassian/bitbucket-pipelines-runner:latest"; - volumes = [ - "/tmp:/tmp" - "/var/run/docker.sock:/var/run/docker.sock" - "/var/lib/docker/containers:/var/lib/docker/containers:ro" - ]; - environmentFiles = [ secret ]; - }; - - secretConf = { - sopsFile = ../secrets/monolith/default.yaml; - }; -in -{ - virtualisation.docker = { - enable = true; - daemon.settings = { - # needed by bitbucket runner ??? - log-driver = "json-file"; - log-opts = { - max-size = "10m"; - max-file = "3"; - }; - }; - }; - - virtualisation.oci-containers.backend = "docker"; - - virtualisation.oci-containers.containers = { - bitbucket-runner-1 = mkRunner config.sops.secrets."bitbucket-runners/wopus-runner-1".path; - bitbucket-runner-2 = mkRunner config.sops.secrets."bitbucket-runners/wopus-runner-2".path; - bitbucket-runner-3 = mkRunner config.sops.secrets."bitbucket-runners/wopus-runner-3".path; - bitbucket-runner-4 = mkRunner config.sops.secrets."bitbucket-runners/wopus-runner-4".path; - }; - - sops.secrets = { - "bitbucket-runners/wopus-runner-1" = secretConf; - "bitbucket-runners/wopus-runner-2" = secretConf; - "bitbucket-runners/wopus-runner-3" = secretConf; - "bitbucket-runners/wopus-runner-4" = secretConf; - }; -} From 412388a5a26716991a2739a1647eebe91181c27e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 25 Jun 2025 13:07:14 -0300 Subject: [PATCH 404/404] wpass: fix duplicate password fields being incorrectly filled --- scripts/default.nix | 1 + scripts/wpass | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/default.nix b/scripts/default.nix index d9824b5..9b0b728 100644 --- a/scripts/default.nix +++ b/scripts/default.nix @@ -74,6 +74,7 @@ ]; wpass = [ wdmenu + ripgrep fd myPass sd diff --git a/scripts/wpass b/scripts/wpass index 97e4671..52bcdff 100755 --- a/scripts/wpass +++ b/scripts/wpass @@ -29,7 +29,7 @@ main() { test -n "$entry" || exit 0 - username=`pass show "$entry" 2>/dev/null | perl -ne 'print $2 if /^(login|user|email): (.*)/'` + username=`pass show "$entry" 2>/dev/null | rg -m1 '(login|user|email): (.*)' -r '$2'` password=`pass show "$entry" 2>/dev/null | head -n 1` otp=`pass otp "$entry" 2>/dev/null` || true