diff --git a/flake.lock b/flake.lock index df1d710..86e6e76 100644 --- a/flake.lock +++ b/flake.lock @@ -76,6 +76,22 @@ "type": "github" } }, + "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -138,11 +154,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -178,11 +194,11 @@ ] }, "locked": { - "lastModified": 1703887061, - "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", "type": "github" }, "original": { @@ -198,11 +214,11 @@ ] }, "locked": { - "lastModified": 1710714957, - "narHash": "sha256-eZCxuF58YWgaJMMRrn8oRkwRhxooe5kBS/s2wRVr9PA=", + "lastModified": 1710820906, + "narHash": "sha256-2bNMraoRB4pdw/HtxgYTFeMhEekBZeQ53/a8xkqpbZc=", "owner": "nix-community", "repo": "home-manager", - "rev": "7b3fca5adcf6c709874a8f2e0c364fe9c58db989", + "rev": "022464438a85450abb23d93b91aa82e0addd71fb", "type": "github" }, "original": { @@ -219,11 +235,11 @@ ] }, "locked": { - "lastModified": 1710281778, - "narHash": "sha256-bvWr9vvBrAxb44kHM3H3cY/uQg+4pYP1BM/Nu3e/7V8=", + "lastModified": 1710820906, + "narHash": "sha256-2bNMraoRB4pdw/HtxgYTFeMhEekBZeQ53/a8xkqpbZc=", "owner": "nix-community", "repo": "home-manager", - "rev": "49a266d2ca59df8a03249550e73a54626181b65d", + "rev": "022464438a85450abb23d93b91aa82e0addd71fb", "type": "github" }, "original": { @@ -240,11 +256,11 @@ ] }, "locked": { - "lastModified": 1710281379, - "narHash": "sha256-uFo9hxt982L3nFJeweW4Gip2esiGrIQlbvEGrNTh4AY=", + "lastModified": 1710717205, + "narHash": "sha256-Wf3gHh5uV6W1TV/A8X8QJf99a5ypDSugY4sNtdJDe0A=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "d9ea313bc4851670dc99c5cc979cb79750e7d670", + "rev": "bcc8afd06e237df060c85bad6af7128e05fd61a3", "type": "github" }, "original": { @@ -253,6 +269,22 @@ "type": "github" } }, + "nixos-hardware": { + "locked": { + "lastModified": 1710783728, + "narHash": "sha256-eIsfu3c9JUBgm3cURSKTXLEI9Dlk1azo+MWKZVqrmkc=", + "owner": "NixOS", + "repo": "nixos-hardware", + "rev": "1e679b9a9970780cd5d4dfe755a74a8f96d33388", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "master", + "repo": "nixos-hardware", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1696375444, @@ -287,11 +319,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1710631334, - "narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=", + "lastModified": 1710806803, + "narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a", + "rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3", "type": "github" }, "original": { @@ -317,6 +349,22 @@ "type": "github" } }, + "nixpkgs_4": { + "locked": { + "lastModified": 1704538339, + "narHash": "sha256-1734d3mQuux9ySvwf6axRWZRBhtcZA9Q8eftD6EZg6U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "46ae0210ce163b3cba6c7da08840c1d63de9c701", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "devshell": "devshell", @@ -330,11 +378,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1710754605, - "narHash": "sha256-VOhYPECGNy7vBvnIE63z284OjUA5CRbbR6VUYopqn0Q=", + "lastModified": 1710936779, + "narHash": "sha256-ecYnUzSWqRae10pp7J6ZE2BznTPJ9f8sLiIoDBQtRBw=", "owner": "nix-community", "repo": "nixvim", - "rev": "97415d4f0c514e4cfd089165d6f6c425626b7887", + "rev": "4f6e90212c7ec56d7c03611fb86befa313e7f61f", "type": "github" }, "original": { @@ -370,11 +418,11 @@ ] }, "locked": { - "lastModified": 1708018599, - "narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=", + "lastModified": 1710843117, + "narHash": "sha256-b6iKQeHegzpc697rxTPA3bpwGN3m50eLCgdQOmceFuE=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431", + "rev": "e8dc1b4fe80c6fcededde7700e6a23bcdf7f3347", "type": "github" }, "original": { @@ -387,10 +435,12 @@ "inputs": { "apple-fonts": "apple-fonts", "home-manager": "home-manager", + "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", "nixvim": "nixvim", "sops-nix": "sops-nix", - "spicetify-nix": "spicetify-nix" + "spicetify-nix": "spicetify-nix", + "waybar": "waybar" } }, "sf-arabic": { @@ -540,6 +590,25 @@ "repo": "default", "type": "github" } + }, + "waybar": { + "inputs": { + "flake-compat": "flake-compat_3", + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1710927250, + "narHash": "sha256-gPmcSpuIN6+94MOcczg43smhoVwvjSa8JiF2CAEnQ2U=", + "owner": "Alexays", + "repo": "Waybar", + "rev": "b9688eb067656d79662203db0230f2fc894a536f", + "type": "github" + }, + "original": { + "owner": "Alexays", + "repo": "Waybar", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index c7759ee..e85bb13 100644 --- a/flake.nix +++ b/flake.nix @@ -17,14 +17,18 @@ url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; + nixos-hardware.url = "github:NixOS/nixos-hardware/master"; + waybar.url = + "github:Alexays/Waybar"; # Fix broken waybar on current nixpkgs-unstable }; - outputs = - inputs@{ nixpkgs, home-manager, sops-nix, nixvim, spicetify-nix, ... }: { + outputs = inputs@{ nixpkgs, waybar, home-manager, sops-nix, nixvim + , spicetify-nix, nixos-hardware, ... }: { nixosConfigurations = { nixy = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ + nixos-hardware.nixosModules.omen-16-n0005ne # REMOVE ./nixos/configuration.nix ./hosts { _module.args = { inherit inputs; }; } @@ -38,6 +42,7 @@ inherit inputs; inherit spicetify-nix; inherit sops-nix; + inherit waybar; }; }; } diff --git a/home/home.nix b/home/home.nix index 8cb72e1..e7537ad 100644 --- a/home/home.nix +++ b/home/home.nix @@ -4,7 +4,7 @@ ./hyprland ./nvim ./homepage - ./waybar + ./waybar # BROKEN ./kitty ./dunst ./wlogout @@ -13,7 +13,6 @@ ./git ./shell ./misc - ./nextcloud ./scripts ./neofetch ./spicetify @@ -35,6 +34,7 @@ btop xfce.thunar bitwarden + vlc # Dev go diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix index d4187e8..67e829a 100644 --- a/home/hyprland/default.nix +++ b/home/hyprland/default.nix @@ -31,6 +31,7 @@ "$shiftMod" = "SUPER_SHIFT"; exec-once = [ + "startup" "${pkgs.hypridle}/bin/hypridle" "${pkgs.hyprpaper}/bin/hyprpaper" "${pkgs.bitwarden}/bin/bitwarden" diff --git a/home/lf/default.nix b/home/lf/default.nix index 9b813bf..6d0cbc0 100644 --- a/home/lf/default.nix +++ b/home/lf/default.nix @@ -3,6 +3,19 @@ programs.lf = { enable = true; + + commands = { + dragon-out = ''%${pkgs.xdragon}/bin/xdragon -a -x "$fx"''; + editor-open = "$$EDITOR $f"; + mkdir = '' + ''${{ + printf "Directory Name: " + read DIR + mkdir $DIR + }} + ''; + }; + keybindings = { d = "delete"; x = "cut"; @@ -10,19 +23,54 @@ "" = "quit"; "" = "quit"; "H" = "set hidden!"; + "\\\"" = ""; + o = ""; + c = "mkdir"; + "." = "set hidden!"; + "`" = "mark-load"; + "\\'" = "mark-load"; + "g~" = "cd"; + do = "dragon-out"; + gh = "cd"; + "g/" = "/"; + ee = "editor-open"; + V = ''$''${pkgs.bat}/bin/bat --paging=always "$f"''; }; - settings = { ratios = [ 1 1 2 ]; }; + settings = { + ratios = [ 1 1 2 ]; + preview = true; + hidden = true; + drawbox = true; + icons = true; + ignorecase = true; + incsearch = true; + }; previewer.source = "${pkgs.pistol}/bin/pistol"; - extraConfig = '' - set nodirfirst - set incsearch - set icons - set drawbox - ''; + extraConfig = let + previewer = pkgs.writeShellScriptBin "pv.sh" '' + file=$1 + w=$2 + h=$3 + x=$4 + y=$5 + if [[ "$( ${pkgs.file}/bin/file -Lb --mime-type "$file")" =~ ^image ]]; then + ${pkgs.kitty}/bin/kitty +kitten icat --silent --stdin no --transfer-mode file --place "''${w}x''${h}@''${x}x''${y}" "$file" < /dev/null > /dev/tty + exit 1 + fi + + ${pkgs.pistol}/bin/pistol "$file" + ''; + cleaner = pkgs.writeShellScriptBin "clean.sh" '' + ${pkgs.kitty}/bin/kitty +kitten icat --clear --stdin no --silent --transfer-mode file < /dev/null > /dev/tty + ''; + in '' + set cleaner ${cleaner}/bin/clean.sh + set previewer ${previewer}/bin/pv.sh + ''; }; xdg.configFile."lf" = { diff --git a/home/nextcloud/default.nix b/home/nextcloud/default.nix deleted file mode 100644 index 6d6bc7c..0000000 --- a/home/nextcloud/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - services.nextcloud-client = { - enable = true; - startInBackground = true; - }; -} diff --git a/home/nvim/lsp.nix b/home/nvim/lsp.nix index 3a9f8ca..475575f 100644 --- a/home/nvim/lsp.nix +++ b/home/nvim/lsp.nix @@ -10,6 +10,8 @@ nixd.enable = true; tailwindcss.enable = true; html.enable = true; + svelte.enable = true; + typescript.enable = true; }; keymaps.lspBuf = { "gd" = "definition"; diff --git a/home/qutebrowser/default.nix b/home/qutebrowser/default.nix index 9872612..a2fd561 100644 --- a/home/qutebrowser/default.nix +++ b/home/qutebrowser/default.nix @@ -17,6 +17,7 @@ }; quickmarks = { + home = "${config.home.homeDirectory}/.config/startpage/index.html"; mynixos = "https://mynixos.com"; github = "https://github.com"; outlook = "https://outlook.office.com/mail/"; @@ -107,7 +108,7 @@ }; }; - webpage.darkmode.enabled = true; + #webpage.darkmode.enabled = true; }; fonts = { default_family = "${config.theme.font}"; }; diff --git a/home/scripts/default.nix b/home/scripts/default.nix index 9c64678..5719c4f 100644 --- a/home/scripts/default.nix +++ b/home/scripts/default.nix @@ -1,6 +1,6 @@ { imports = [ - ./scripts.nix + ./misc.nix ./nerdfetch.nix ./nixy.nix ./sounds.nix @@ -8,5 +8,6 @@ ./caffeine.nix ./night-shift.nix ./screenshot.nix + ./startup.nix ]; } diff --git a/home/scripts/scripts.nix b/home/scripts/misc.nix similarity index 100% rename from home/scripts/scripts.nix rename to home/scripts/misc.nix diff --git a/home/scripts/nixy.nix b/home/scripts/nixy.nix index 706ed56..c76df1e 100644 --- a/home/scripts/nixy.nix +++ b/home/scripts/nixy.nix @@ -11,6 +11,10 @@ let $EDITOR ${homedir}/.config/nixos/ ''; + nixy-upgrade = pkgs.writeShellScriptBin "nixy-upgrade" '' + sudo nixos-rebuild switch --upgrade --flake ${homedir}/.config/nixos#nixy + ''; + nixy-update = pkgs.writeShellScriptBin "nixy-update" '' cd ${homedir}/.config/nixos && sudo nix flake update ''; @@ -27,6 +31,7 @@ in { home.packages = with pkgs; [ nixy-rebuild nixy-edit + nixy-upgrade nixy-update nixy-gc nixy-cb diff --git a/home/scripts/screenshot.nix b/home/scripts/screenshot.nix index 0143eb9..c64fbb2 100644 --- a/home/scripts/screenshot.nix +++ b/home/scripts/screenshot.nix @@ -18,7 +18,7 @@ let mode="output" fi - ${pkgs.hyprshot}/bin/hyprshot -m $mode -o $folder -f $filename -s + ${pkgs.hyprshot}/bin/hyprshot -m $mode -o $folder -f $filename -s || exit 1 if [[ $2 == "swappy" ]];then ${pkgs.swappy}/bin/swappy -f "$folder/$filename" -o "$HOME/Pictures/screenshots/$filename" diff --git a/home/scripts/startup.nix b/home/scripts/startup.nix new file mode 100644 index 0000000..29090f2 --- /dev/null +++ b/home/scripts/startup.nix @@ -0,0 +1,60 @@ +# File runned at startup by Hyprland +{ pkgs, config, ... }: +let + homedir = config.home.homeDirectory; + + battery-notif = pkgs.writeShellScriptBin "battery-notif" '' + # Send notifications when low on battery and not in charge + while true; do + battery_level=$(cat /sys/class/power_supply/BAT*/capacity) + battery_status=$(cat /sys/class/power_supply/BAT*/status) + if [[ $battery_level -le 20 ]] && [[ $battery_status == "Discharging" ]]; then + ${pkgs.libnotify}/bin/notify-send "󰁻 Low battery" "Battery level is $battery_level%" + elif [[ $battery_level -le 10 ]] && [[ $battery_status == "Discharging" ]]; then + ${pkgs.libnotify}/bin/notify-send --urgency=critical "󰁺 Very low battery" "Battery level is $battery_level%" + fi + sleep 60 + done + ''; + + nextcloud-watch = pkgs.writeShellScriptBin "nextcloud-watch" '' + # Start nextcloud if I'm on my networks + while true;do + ssid=$(nmcli -t -f name connection show --active | head -n1) + status=$(pgrep -n nextcloud) + if [[ -z $status ]]; then + service_status="inactive" + else + service_status="active" + fi + + if [[ $ssid == "inthecloud" || $ssid == "Wired connection 2" ]]; then + if [[ $service_status == "inactive" ]]; then + ${pkgs.nextcloud-client}/bin/nextcloud --background + fi + else + if [[ $service_status == "active" ]]; then + pkill nextcloud + fi + fi + sleep 120 + done + ''; + + startup = pkgs.writeShellScriptBin "startup" '' + # Because HM enabling services suck. + + systemctl --user start sops-nix + + nextcloud-watch & + battery-notif & + ''; + +in { + home.packages = with pkgs; [ + startup + battery-notif + nextcloud-watch + nextcloud-client + ]; +} diff --git a/home/sops/default.nix b/home/sops/default.nix index 8350e82..d2faf7e 100644 --- a/home/sops/default.nix +++ b/home/sops/default.nix @@ -4,13 +4,13 @@ sops = { age.keyFile = "/home/hadi/.config/sops/age/keys.txt"; defaultSopsFile = ../../secrets/secrets.yaml; - secrets = { sshconfig = { path = "/home/hadi/.ssh/config"; }; }; + secrets = { + sshconfig = { path = "/home/hadi/.ssh/config"; }; + oxk = { path = "/home/hadi/.ssh/oxserver"; }; + gk = { path = "/home/hadi/.ssh/github"; }; + glk = { path = "/home/hadi/.ssh/gitlab"; }; + }; }; systemd.user.services.mbsync.Unit.After = [ "sops-nix.service" ]; - - # Make home-manager crash on boot, dafuk ? - # home.activation.setupEtc = config.lib.dag.entryAfter [ "writeBoundary" ] '' - # /run/current-system/sw/bin/systemctl start --user sops-nix - # ''; } diff --git a/home/waybar/default.nix b/home/waybar/default.nix index e785f98..2ab960c 100644 --- a/home/waybar/default.nix +++ b/home/waybar/default.nix @@ -1,4 +1,4 @@ -{ pkgs, config, lib, ... }: { +{ pkgs, config, lib, waybar, ... }: { services = { blueman-applet.enable = true; network-manager-applet.enable = true; @@ -6,6 +6,7 @@ programs.waybar = { enable = true; + package = waybar.packages."${pkgs.system}".waybar; systemd.enable = true; settings = { mainBar = { diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml index 6adeef9..9d35c86 100644 --- a/secrets/secrets.yaml +++ b/secrets/secrets.yaml @@ -1,4 +1,7 @@ -sshconfig: ENC[AES256_GCM,data:SqIBwkLFebb5pDC4CIuvazDDAJ/bKFZ+IXfgkKngCSAVkS8DHxidpbAbOcxC2R/kAQDVL5OYKIbUSGVhOSWO57glipPkhtByv0dfelKLD13C/FiGk9vmvHEcF+U9/1h1vM4MqLp3Sl1UjPPd7Yv7taNlo+HkqA9Eql5uRBnlbnQDjo6Rq2hOK4gSu8uDBPKgc7l043MdDlmtZgGr1rljt26W6eWTT6VSIg/Lu4lWT2gWQigM9czLcQHlMRI10sEN2Q3GkhrFFc/s8dNn1yGUy2Rfi9aMp12plhPAmukzUUR4KBVknCUYGGdiLcpCUUOQhywODsAoBE9z3KWaG0oy8q0CG7vvlov/78eAo+07i8kbUq49DkUy8PRP8+dzITwT5Si5D+LMj3dUt3ybMqNeSyLInDJLNBJ3cQ2f1TGzTVo8KmSf5snqIj35umGFDpwXeVODsnAY7XC9IIOdkUdX5kzfksSihKUs6NT49WSHe8N6Vg==,iv:qF3JxL/znIdrgjTctfp8y2mVPFP40J3b3S0vrX1Di3o=,tag:odbEYMyAYUp0xKclge+jkQ==,type:str] +sshconfig: ENC[AES256_GCM,data:8Py74wNMCbaXWtnp0bAf7I+u2KwDI/yuzStKvPwB9MUtrvKeCLDxtDfTkemDUm7yENTvOErJavHQQGhsNfPqO4mbhm5w3xSGn9IJ+/p0QrSmKLsE789WPC+UJhGo/FtSk3SHPue8um4N8AB7u/+RaSaqd8n9RRplKcU0xuqn8t5TgONbsExb9ad5F3gcSSv2mutcFRde2OXqI0GU+xyrlsxkTTn6I3/YR51bvsUtk97iRz1e9My/EbhTSY30J8DNB2p8MxqaGLY3O/3o8IfUBHpgrhqghdXfP5HunhCV/xWn9c6WvbMNZ8tP3/SVTv9uvzDvDzdxtw6vFHZETZ6RIDQG1DLj2TEsNnV5xqMAI3pQyMgQRLZr/rqcorhYKvVzrwLiiG66KS/caW35U2I2UXr+WEdrb/6yiJifyfPEzduG8mndAUNaUJXprUsnUeJHxru1Dv4gqbX6JzBh3PXRs1W4bhWF//3/KtuUuQxd1dK0Batk5T3NGwzwiIwHdE6EkfUGiViDU5iP/K8k8QfiLaUMDDHSByVDnEKMRolvBMDx6dFQXVYewnP3CcN4Om9QLI7IS+Sqan4bzxojZDSDELSquQrp7yDUu1m2yNc0EsDSnLO+fQrFH+ismj7w1Y0WnbEczzm++G7zYHko4LLXVKm/N60=,iv:64bp52rf/7m5elXZwWAUjhVW9La4jPYVcnrN6FpEEQM=,tag:SzhPN1Tx05l5M1XrRxzFzA==,type:str] +gk: ENC[AES256_GCM,data:cDNhKne49s23V/ew0BqSmR6G0yGcKWHLljZreKbgGqkuhuHzTyVK//Ac0N4mAY8iT91TKXVAeEkXnyKCo+aCAasABm0+zWGf5KOHInYuay8fSXbMeZdu1Me+IjAWnKeNrR3A7Ji+oFGMuHVzOBSt29Iz5NwwRdDbrTprtjPWzNMu+pg6d8n1+bxqaUoKkFzoR7QDjOUkJQfzeEsMplm84rTSXVDri2p2OqvtD9ZcvmzBeQtc0BCYhsLBkq98o7bxdqAHBoFiri+EVusYynAQ/GuMY8vGlP9hCXzJhg9zMUSuLhk8Vs4mgkfKzfllsr+FeVA/AOU041yCt2tbjRZQT3arqWNFy07uvB+mues4c5kX88wZMxA1E0/r7aktdhTVAgVCLxAr5w643LHRbnGkqzYabqCkpxC2A9IR4nMBVDchIdGjLw2NlTE9Y0c26fZkver6H9r+d1WXdNVaekF0jTzTOOziEftVI8ocNBY3HKiXK1jUZV1rre3OBn3T/eT+zEkTaB83z4Ytmpps6U8U,iv:YXS2maDUgxVZI8BhJjJ4MuvnyDKVMGEtmnkiLw61NB8=,tag:A/8xH24bXbDsndM9LbG+Ig==,type:str] +oxk: ENC[AES256_GCM,data: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,iv:wvGN3wh+t3vhepc8FQRcuFnHWnde9Gw97YvGsTjge0c=,tag:ILrkx/cGPbhXjVLFkAnhcQ==,type:str] +glk: ENC[AES256_GCM,data:N/ius8Rd2q6BeaCGqaI9TIYEvSmYwqMroxnyWr4xYa+cZONhAGPS4qS9CMwy18JcwEJlUj38gW9e3/X1RbLnjAFGlN5KTsWYOsmn9Jqk+PsF6NHOvUyw+rUxYFPwX5C3ZVLKjP/OK+mX5R/JwxrgsMkn0CDs6GCe4GupB39DaJq4KXGfjQSqDT/ZCVBOKPeHhzg/0Izt3U5yw7vW51nBQKlgazo54WSxq+/AX0zSf3TufMm26UMQBRbsRWPkeUrh8bO9cjpFlYUx5svzSAIRYuZR2FTqlkPdVuNpFWjHoERyw0jMy5jt59i9pQNztZ7kBjxAcMbjW6FIMxGMJGRPJUuq87oWBmS0NowSfN+Khz/szbrkrClrTNM9kIIzugB0KtagEO3wKcAkHBUs85OQep6H3hkCp1gBk8g0UPfuUdgncr41vliJDqgMhaNc+DVGOnMPnxYyyEDkyySpC+ApkgrwMBQVarNWWw8v/r4ADWQiaMZJv3Uk0x7uNa62Cn9vohHA8rmYsyACAW1xFnwH,iv:Dr9SRsZ5I9nOCJFMHp+EIJ4w0I9gqHo7KBbPruo2thw=,tag:SvwkXGWGQZChauXYaKUZQw==,type:str] sops: kms: [] gcp_kms: [] @@ -14,8 +17,8 @@ sops: cmVxVC8rVDlWMUdZaGw3bmdOaWZGS1EKYahBlc8XpB5UdKZQkvxbLcKQ/xkFJjWo FSfQWnjhe/a7BJtJEcKZkjOQU0mYqlSu+uT2RA9diCQeRUJPRF+nAw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-03-16T21:23:14Z" - mac: ENC[AES256_GCM,data:41M08cu9wU0KQSFAES0yAqC54Fjjvv0FWWSYOYU1tgOexHlqwX8cm3WPz/83MCkAq9NC//0VRuFEejxAfAOBq5hmv74UT3sUDVxN03dmzLqVH7+QMFAd4qr/E5ixmXpBj6YX2OjcQUNhBTTthQlZ6j0T5rCwpfSA9Jeg6t+0JoE=,iv:jOH69GdeX182zl4eA7f4W7txdVym2YRviPgpJh38vlY=,tag:0aVO6TdgH5TurDu57NLNbw==,type:str] + lastmodified: "2024-03-19T19:11:30Z" + mac: ENC[AES256_GCM,data:hcccEa3TD9cV3DYaZe+xFTYDiT0DbvmxZNXfwAnPeL+WBr0kVUs/haQibftY+t1GtMSVdH46kfvgsmtayFU0Z0h7kGajUCA1J1UXEAQyJ0REEnifZcUGGIvZ9aiCNCe87KWjH09Xc6nNarvgkX/XuVQbuQPsn3RNW5i8tUVLNUY=,iv:+hc0SauaqsnXZYpMwfQVvRJsh6z0F+tLMZm7g7cZS0s=,tag:oxZIEZlVoW/HQsX842b5gA==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.1