diff --git a/flake.lock b/flake.lock index 0fa7afe..c750089 100644 --- a/flake.lock +++ b/flake.lock @@ -778,32 +778,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1734978744, - "narHash": "sha256-R80xsDCKZOPJv5T+fB5G1ZVgS/51tJgUenGmGFjZat4=", + "lastModified": 1735834308, + "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b74a56e2acce8fe88a575287a20ac196d8d01938", + "rev": "6df24922a1400241dae323af55f30e4318a6ca65", "type": "github" }, "original": { "owner": "nixos", - "repo": "nixpkgs", - "rev": "b74a56e2acce8fe88a575287a20ac196d8d01938", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1735268880, - "narHash": "sha256-7QEFnKkzD13SPxs+UFR5bUFN2fRw+GlL0am72ZjNre4=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "7cc0bff31a3a705d3ac4fdceb030a17239412210", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -1176,7 +1160,9 @@ "viminal": { "inputs": { "nixCats": "nixCats", - "nixpkgs": "nixpkgs_3", + "nixpkgs": [ + "nixpkgs" + ], "plugins-blink-ripgrep": "plugins-blink-ripgrep", "plugins-pomo-nvim": "plugins-pomo-nvim" }, diff --git a/flake.nix b/flake.nix index 5ae6d02..1b3c5fd 100755 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "System configuration flake."; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/b74a56e2acce8fe88a575287a20ac196d8d01938"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; # stablepkgs.url = "github:nixos/nixpkgs/nixos-24.05"; # bleedingpkgs.url = "github:nixos/nixpkgs/master"; # nixpkgs-unstable-small.url = "github:nixos/nixpkgs/nixos-unstable-small"; @@ -67,6 +67,7 @@ viminal = { url = "git+https://code.youwen.dev/youwen5/viminal2"; + inputs.nixpkgs.follows = "nixpkgs"; }; vesktop-bin = { @@ -140,9 +141,13 @@ ./reference/hosts/callisto ]; }; - adrastea = buildLiminalOS { - inherit inputs nixpkgs; - systemModule = ./reference/hosts/adrastea; + adrastea = nixpkgs.lib.nixosSystem { + specialArgs = { + inherit inputs self; + }; + modules = [ + ./reference/hosts/adrastea + ]; }; cassini = buildLiminalOS { inherit inputs nixpkgs; diff --git a/hm/modules/linux/desktop-environment/waybar/default.nix b/hm/modules/linux/desktop-environment/waybar/default.nix index aac16d5..756b4cf 100644 --- a/hm/modules/linux/desktop-environment/waybar/default.nix +++ b/hm/modules/linux/desktop-environment/waybar/default.nix @@ -251,39 +251,54 @@ in "hyprland/workspaces" = { show-special = true; - # persistent-workspaces = { - # "*" = [ - # 1 - # 2 - # 3 - # 4 - # 5 - # 6 - # 7 - # 8 - # 9 - # 10 - # ]; - # }; format = "{icon}"; on-click = "activate"; - format-icons = { - "1" = ""; - "2" = ""; - "3" = "󰰊"; - "4" = "󰰍"; - "5" = ""; - "6" = ""; - "7" = "󰰨"; - "8" = ""; - "9" = ""; - "10" = ""; - active = ""; - empty = ""; - default = ""; - urgent = ""; - special = "󰠱"; - }; + format-icons = + { + "1" = ""; + "2" = ""; + "3" = "󰯵"; + "4" = "󰯻"; + "5" = "󰯾"; + "6" = "󰰴"; + "7" = "󰰨"; + "8" = "󰰄"; + "9" = ""; + "10" = ""; + active = ""; + empty = ""; + default = ""; + urgent = ""; + special = "󰠱"; + } + // ( + if (config.liminalOS.desktop.hyprland.useAdvancedBindings) then + { + "1" = ""; + "2" = ""; + "3" = "󰯵"; + "4" = "󰯻"; + "5" = "󰯾"; + "6" = "󰰴"; + "7" = "󰰨"; + "8" = ""; + "9" = ""; + "10" = ""; + } + else + { + "1" = ""; + "2" = ""; + "3" = "󰰊"; + "4" = "󰰍"; + "5" = ""; + "6" = ""; + "7" = "󰰨"; + "8" = ""; + "9" = ""; + "10" = ""; + } + ); sort-by-number = true; }; diff --git a/reference/hosts/adrastea/configuration.nix b/reference/hosts/adrastea/configuration.nix index 13483a2..4099128 100755 --- a/reference/hosts/adrastea/configuration.nix +++ b/reference/hosts/adrastea/configuration.nix @@ -3,61 +3,50 @@ # and in the NixOS manual (accessible by running ‘nixos-help’). { config, - inputs, pkgs, - lib, + inputs, ... }: { - imports = [ - # Include the results of the hardware scan. - ./hardware-configuration.nix - ]; + imports = [ ./hardware-configuration.nix ]; - # Bootloader. + networking.hostName = "adrastea"; + + liminalOS = { + flakeLocation = "/home/youwen/.config/liminalOS"; + config.allowUnfree = true; + defaultEditor = inputs.viminal.packages.${pkgs.system}.default; + formFactor = "desktop"; + system = { + audio.prod.enable = true; + networking = { + firewallPresets.vite = true; + cloudflareNameservers.enable = true; + }; + graphics.nvidia.enable = true; + }; + extras.gaming = { + enable = true; + roblox.enable = true; + utilities.gamemode = { + enable = true; + gamemodeUsers = [ "youwen" ]; + }; + }; + extras.distrobox.enable = true; + }; boot = { - plymouth = { - enable = true; - # theme = "rings"; - # themePackages = with pkgs; [ - # # By default we would install all themes - # (adi1090x-plymouth-themes.override { - # selected_themes = [ "rings" ]; - # }) - # ]; - font = "${config.stylix.fonts.monospace.package}/share/fonts/truetype/NerdFonts/CaskaydiaCove/CaskaydiaCoveNerdFontMono-Regular.ttf"; - }; - - # Enable "Silent Boot" - consoleLogLevel = 3; - initrd.verbose = false; - kernelParams = [ - "quiet" - "splash" - "boot.shell_on_fail" - "rd.systemd.show_status=false" - "rd.udev.log_level=3" - "udev.log_priority=3" - # "display=HDMI-A-1:2560x1440@144D" - ]; - # Hide the OS choice for bootloaders. - # It's still possible to open the bootloader list by pressing any key - # It will just not appear on screen unless a key is pressed loader = { efi.canTouchEfiVariables = true; - # timeout = 15; - # Lanzaboote currently replaces the systemd-boot module. - # This setting is usually set to true in configuration.nix - # generated at installation time. So we force it to false - # for now. - # timeout = 0; systemd-boot = { enable = true; consoleMode = "auto"; }; }; - initrd.systemd.enable = true; + kernelPackages = pkgs.linuxPackages_zen; + initrd.luks.devices."luks-52d1be6d-b32f-41e0-a6d7-2ff52599fe7c".device = + "/dev/disk/by-uuid/52d1be6d-b32f-41e0-a6d7-2ff52599fe7c"; }; services.ucodenix = { @@ -65,101 +54,28 @@ cpuModelId = "00A50F00"; }; - # boot.lanzaboote = { - # enable = false; - # pkiBundle = "/etc/secureboot"; - # }; - - # services.keyd = { - # enable = true; - # keyboards = { - # default = { - # ids = [ "*" ]; - # settings = { - # main = { - # capslock = "esc"; - # leftalt = "leftcontrol"; - # leftcontrol = "leftalt"; - # }; - # }; - # }; - # }; - # }; - - boot.initrd.luks.devices."luks-52d1be6d-b32f-41e0-a6d7-2ff52599fe7c".device = - "/dev/disk/by-uuid/52d1be6d-b32f-41e0-a6d7-2ff52599fe7c"; - services.tlp.enable = true; - powerManagement = { - powerDownCommands = "pidof hyprlock || ${pkgs.hyprlock}/bin/hyprlock"; - cpuFreqGovernor = "performance"; - }; + powerManagement.cpuFreqGovernor = "performance"; - networking.hostName = "adrastea"; # Define your hostname. - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - - # select kernel - boot.kernelPackages = pkgs.linuxPackages_zen; - - # 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; - - # Set your time zone. time.timeZone = "America/Los_Angeles"; - # Select internationalisation properties. - i18n.defaultLocale = "en_US.UTF-8"; - - i18n.extraLocaleSettings = { - LC_ADDRESS = "en_US.UTF-8"; - LC_IDENTIFICATION = "en_US.UTF-8"; - LC_MEASUREMENT = "en_US.UTF-8"; - LC_MONETARY = "en_US.UTF-8"; - LC_NAME = "en_US.UTF-8"; - LC_NUMERIC = "en_US.UTF-8"; - LC_PAPER = "en_US.UTF-8"; - LC_TELEPHONE = "en_US.UTF-8"; - LC_TIME = "en_US.UTF-8"; - }; - - systemd.services = { - NetworkManager-wait-online.enable = false; - }; - - # Enable the X11 windowing system. - # You can disable this if you're only using the Wayland session. - services.xserver.enable = false; - - programs.nix-ld = { - enable = true; - libraries = with pkgs; [ - icu - xorg.libXtst - xorg.libXi - ]; - }; - - hardware.nvidia = { - modesetting.enable = true; - powerManagement.enable = true; - powerManagement.finegrained = false; - nvidiaSettings = true; - open = true; - # prime = { - # amdgpuBusId = "PCI:4:0:0"; - # nvidiaBusId = "PCI:1:0:0"; - # # offload = { - # # enable = true; - # # enableOffloadCmd = true; - # # }; - # sync.enable = true; - # }; - }; + # hardware.nvidia = { + # modesetting.enable = true; + # powerManagement.enable = true; + # powerManagement.finegrained = false; + # nvidiaSettings = true; + # open = true; + # # prime = { + # # amdgpuBusId = "PCI:4:0:0"; + # # nvidiaBusId = "PCI:1:0:0"; + # # # offload = { + # # # enable = true; + # # # enableOffloadCmd = true; + # # # }; + # # sync.enable = true; + # # }; + # }; hardware.graphics.enable = true; @@ -167,61 +83,8 @@ services.xserver.videoDrivers = [ "nvidia" ]; - # services.desktopManager.plasma6.enable = true; - - # Configure keymap in X11 - services.xserver = { - xkb.layout = "us"; - xkb.variant = ""; - }; - - # Enable touchpad support (enabled default in most desktopManager). - # services.xserver.libinput.enable = true; - - # Define a user account. Don't forget to set a password with ‘passwd’. - users.users.youwen = { - isNormalUser = true; - description = "Youwen Wu"; - extraGroups = [ "networkmanager" ]; - }; - - nix.settings = { - trusted-users = [ - "root" - "youwen" - ]; - }; - - services.udev.extraRules = '' - KERNEL=="cpu_dma_latency", GROUP="realtime" - ''; - - # Allow unfree packages nixpkgs.config.allowUnfree = true; - # List packages installed in system profile. To search, run: - # $ nix search wget - environment.systemPackages = with pkgs; [ - wget - git - curl - ]; - - # Some programs need SUID wrappers, can be configured further or are - # started in user sessions. - # programs.mtr.enable = true; - programs.gnupg.agent = { - enable = true; - enableSSHSupport = true; - }; - - programs.dconf.enable = true; - - programs.hyprland.enable = true; - - programs.zsh.enable = false; - programs.fish.enable = true; - users.users.youwen.shell = pkgs.fish; # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It‘s perfectly fine and recommended to leave diff --git a/reference/hosts/adrastea/default.nix b/reference/hosts/adrastea/default.nix index 927177b..d571dd7 100644 --- a/reference/hosts/adrastea/default.nix +++ b/reference/hosts/adrastea/default.nix @@ -1,50 +1,24 @@ { inputs, + self, ... }: { imports = [ ./configuration.nix - ../../modules/linux/gaming - ../../modules/linux/audio - ../../modules/linux/networking - ../../modules/linux/fonts - ../../modules/linux/greeter - ../../modules/linux/core - ../../modules/linux/desktop-portal - ../../modules/linux/audio-prod - ../../modules/linux/wine - ../../modules/linux/stylix - ../../modules/linux/distrobox - ../../modules/linux/flatpak - ../../overlays + ../../modules + self.nixosModules.liminalOS { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.backupFileExtension = "backup"; - home-manager.extraSpecialArgs = { - inherit inputs; - }; home-manager.users.youwen = { - imports = - [ - ./home-manager-extras - ../../users/youwen/linux/laptop - ../../users/youwen/linux/packages/x86_64 - ../../users/youwen/linux/programs - ../../users/youwen/common - ../../users/youwen/linux/spicetify - (import ../../users/youwen/common/fastfetch { }) - ] - ++ (with inputs; [ - nix-index-database.hmModules.nix-index - ]); + imports = [ + ./home.nix + self.homeManagerModules.default + ]; }; } ] ++ (with inputs; [ - home-manager.nixosModules.home-manager ucode.nixosModules.default ]); } diff --git a/reference/hosts/adrastea/home-manager-extras/default.nix b/reference/hosts/adrastea/home.nix similarity index 69% rename from reference/hosts/adrastea/home-manager-extras/default.nix rename to reference/hosts/adrastea/home.nix index c80b8fe..4bb0337 100644 --- a/reference/hosts/adrastea/home-manager-extras/default.nix +++ b/reference/hosts/adrastea/home.nix @@ -1,11 +1,16 @@ -{ pkgs, lib, ... }: +{ lib, ... }: { - wayland.windowManager.hyprland.settings.monitor = pkgs.lib.mkForce [ + imports = [ + ../../users/youwen/hm.nix + ]; + + home.stateVersion = "24.05"; + + wayland.windowManager.hyprland.settings.monitor = lib.mkForce [ # "eDP-1,2560x1440@165,0x0,1.6" "eDP-1, disable" "HDMI-A-1,2560x1440@144,0x0,1.0" ]; - wayland.windowManager.hyprland.settings.cursor.no_hardware_cursors = true; # since we are using this as a "desktop" of sorts, we have no need to save # power by using optimus. poor performance on external display, so we add @@ -16,5 +21,6 @@ ]; programs.waybar.settings.mainBar.output = "HDMI-A-1"; - programs.hyprlock.settings.background.monitor = lib.mkForce "HDMI-A-1"; + + liminalOS.desktop.hyprland.screenlocker.monitor = "HDMI-A-1"; } diff --git a/reference/secrets/authorized_keys.nix b/reference/secrets/authorized_keys.nix index dd9c65a..37fd2af 100644 --- a/reference/secrets/authorized_keys.nix +++ b/reference/secrets/authorized_keys.nix @@ -4,6 +4,8 @@ rec { "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIwqDFdb/cs5K9gsgP0ogyuq5pv9hSxsyPnDcWc5wRKs"; "youwen@callisto" = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA+0w7l4jWN+b3Cqs9pjzjxUt2tRXk8HPIB3sqfUQMdx"; + "youwen@adrastea" = + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPX6RaulzFkoS4bqH3ngtOsRyZkWZyaBErhC1ZoE6wz7"; runner = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEEBFBqlbHn3gMuV0i8U48xctZUWXkmHsCK1O6LRpXpj"; }; @@ -11,6 +13,7 @@ rec { demeter = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP4BRdoxPnmlhMD1kI7qXwVE//6h1XWUnkwpzDuJaAyC"; gallium = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJzDKscmZIz7GF0nfKpnKHq63/fwzx2PXir0mUtRDOgu"; callisto = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM7CqpsBe6+pAQa5CC8m2quJdDg6hRCJlTbVEcHN2xxV"; + adrastea = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPzbEyvHr8aXbga6zg6bY+8ad/d+fHIKKD/Qpr8N440P"; }; all = users ++ systems; diff --git a/reference/secrets/nixos/github_ssh_priv_key.age b/reference/secrets/nixos/github_ssh_priv_key.age index 24dde10..4b67bf5 100644 Binary files a/reference/secrets/nixos/github_ssh_priv_key.age and b/reference/secrets/nixos/github_ssh_priv_key.age differ diff --git a/reference/secrets/nixos/nix_config_github_pat.age b/reference/secrets/nixos/nix_config_github_pat.age index f88bd1d..480829b 100644 Binary files a/reference/secrets/nixos/nix_config_github_pat.age and b/reference/secrets/nixos/nix_config_github_pat.age differ diff --git a/reference/users/youwen/hm.nix b/reference/users/youwen/hm.nix index a4467e3..4319f7a 100644 --- a/reference/users/youwen/hm.nix +++ b/reference/users/youwen/hm.nix @@ -81,7 +81,7 @@ end ''; - alexa = '' + ale = '' set vault_dir $HOME/Documents/alexandria/content if test -d $vault_dir diff --git a/reference/users/youwen/secrets/gallium_server_ssh.age b/reference/users/youwen/secrets/gallium_server_ssh.age index 1c94071..edd79dc 100644 --- a/reference/users/youwen/secrets/gallium_server_ssh.age +++ b/reference/users/youwen/secrets/gallium_server_ssh.age @@ -1,12 +1,26 @@ -age-encryption.org/v1 --> ssh-ed25519 ouRmYQ Oq5tmnpqpsHQWUzTAGQx4fILRx37H37+bvp/LKTURmo -odIZBDn724I2980yVFU1cc/YIgo+PxVpIK9Ir8aSn6A --> ssh-ed25519 T+8d9Q Qb+zzkxUGwSp3/etMORdosrOJxDf+wEKXKcqgV3p22M -FC6uixXld1qKv5bB5upITUhtia+6Vf/iOFTVP0XxCas --> ssh-ed25519 lpWvhA ZCd0HMrCf0dnwWEbAlSd84nkqi1JLEWR3f8y+0ui20I -UPT5u+zrFGPKON2Akxcf0bha1MQMFsbUNFy1W32ut9I ---- DfTM37B+lqx+Ohucv/YjZKtsyO6CyBEF9YA2TXhnzo0 -$dQP2TLeHv967lw U?*0IT%`Kvp-ͽ(*΋pL67XoqӔ}3˴~9Gᑮy?X\\e`Ya8e8VdbZ#~E GUT良ёu -8tK_eڕj{~Ӆ]p E:zwggV@zL }2  -}u_]IDѰuWli/,bRˮA:&=@cb36o䗫h'>tBR77Iӝ/ዬbC`ߦb)X -'#g8_/Kζ|2m#~R#xl.P `OTZl@U`ʞ"6H|Zv'=B%-sk8*#^C?8@5"/A ŢX% \ No newline at end of file +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IG91Um1ZUSBrcTJN +Q1FjMWlHTEY0aU5NUFZ6NVFQOTlYem9PZ052T25OWWNTTit3VGhvClpKWDYyOWlq +VmgrOTF5a2NRRWxRUi8vbUdXODZSd3Q5ZWF3aFBNVkJrOTQKLT4gc3NoLWVkMjU1 +MTkgQUk3S1Z3IHA4RHBUT3JnY09aejFsNHovT0x4SWxpa2I4OXdodERSdzExY0sz +TlluWGsKVW1XcWN5WmxnZXZoUTJPQ1FodXBkTWdSRU9WdzR5TzFiOW5PVnUwRHFk +RQotPiBzc2gtZWQyNTUxOSBUKzhkOVEgRXpxR0lLQXVDYmVZaGdmN1FDUE01dGpu +RDhzM1JxcEVkRnlDTFJRU3JFSQovekl1RytDU2pRS1MyZEdISmdOdTd6SDNXR0dr +Y2c3RDlUaGxsN3NNZXdNCi0+IHNzaC1lZDI1NTE5IGxwV3ZoQSBCSmQwd1JxNDhi +QXViT0xhaDhDMlRBbGtWRmdmRitvT3U2aVhGMWhqL213ClNCb29hWVhsdmRLYnJE +b0hqcm52VmhiVUhFZnBaekxySzFweG5LSTVGNDQKLT4gX2lkfD0tZ3JlYXNlCmgx +WVZrbFRkMnViSEcrdnRsNDZwR1ZlVEttS3hNV1FLd3FYSVVyS0ljWGhxcE1vZmxX +SFU3MnNYdGl5UTlvSFcKL25pcUJ3cTNnaTNlR0JXSkppaFlLZwotLS0geXJuQUtB +bEJuVXRNOEJsQzB2cU9jYUlFdjA2S3RRcDNkOVpsYmJPRW5URQpuHYZgoJ+4eVUv +VdLIPy/KEFfBbjI9qrMCoRHYawLHYhIYwUNgKEj38Hy8KBp9Zgag3eLvKBpnFQfI +LFekughiTWVacAw7W3OhBy3Z6C7zFMXWIDQGIdYHY8NehH9mNPUPG6pPBJh2eQBx +C00IIHlBm4u1eFHwos845dlhtqzdd9xTH3VV3+/REbOHQ1/nI2uRIm9HX0YmU2P+ +ANfk9TW4JwO1DE11A/aNogVN3BkAYeVeGzif0H4mTGL+mx5eqkeH0fBPQzunkx4Z +eoAMNhp3+YltyUnrkB3OBVZyGS9YtAG1Dc3P5ljvnyvo5pNzh0BginhVbZ/7T/A9 +2UEuLIXFTeMuZ6EUOjrj+GT7GwjBeCf+vXAbyJzI3ZGvHLTlUzi3JykHvzVKeUP1 +C5+lnB9DxVas/X9dAQhlezkJ1rGqSO+w3lCrRaNN2gI2FY6/qFJPrQLQl6MMK9Pz +1T3ukiNXqZ4Hs36GaZSLybgPfVRMizSibuAaoa2oNg4S+VNS4f8McjIfLR2nhgc3 +tgMAIuIfiOYVKnyF61NL/vWLr1Z/8J1AjX+cYYXwxxIntcO8sQao67lMbIxhCpR/ +JTlbv22qCSY4WIV7ul8Q15YUgXQbs18je0OLrjQSOE+VN4kppCGZnUPBm11+m8o7 +Y8CvOz2A +-----END AGE ENCRYPTED FILE----- diff --git a/reference/users/youwen/secrets/github_cli_secret_config.age b/reference/users/youwen/secrets/github_cli_secret_config.age index 2489298..ca10436 100644 Binary files a/reference/users/youwen/secrets/github_cli_secret_config.age and b/reference/users/youwen/secrets/github_cli_secret_config.age differ diff --git a/reference/users/youwen/secrets/github_ssh_priv_key.age b/reference/users/youwen/secrets/github_ssh_priv_key.age index a0c1321..6818e90 100644 Binary files a/reference/users/youwen/secrets/github_ssh_priv_key.age and b/reference/users/youwen/secrets/github_ssh_priv_key.age differ diff --git a/reference/users/youwen/secrets/tincan_app_password.age b/reference/users/youwen/secrets/tincan_app_password.age index c333b3c..3a4a32b 100644 --- a/reference/users/youwen/secrets/tincan_app_password.age +++ b/reference/users/youwen/secrets/tincan_app_password.age @@ -1,9 +1,16 @@ -age-encryption.org/v1 --> ssh-ed25519 ouRmYQ z1+svKMUnI1N5eewzBIW9bE+qvZCWn6RpdOdnrpug1Q -zne0Xho17J5xNXxYxtlM5co615IQ8QDaE+PfJn32Uz0 --> ssh-ed25519 T+8d9Q kjEffTlxGdcnb70nXSHdTPSvklzB8Cjhx/3/3Jh6WR4 -gK3jX9r0sZjVjEGfPwvZpNo0NroMZkeBj7rNj3khkGg --> ssh-ed25519 lpWvhA B7oq1HTF93sZRuxkbgUWl9WszHFHPP75Ibjx/r2RnmU -odWZzhkSGf5kDdN7Rk/EIKIi42feWMSv+ZnT4+NXJFI ---- ASffGuHTVEG5QGbe0KETZyi+TfoxV9IqxZs3cLbSZWg -gAWOЌB݊;D6Ja&f}㭩YU:5 \ No newline at end of file +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IG91Um1ZUSBYdXF3 +dFBmc2lXUG16MEtVMnlSdUVwZHcrbVlseDNCM2ZBMzQ1ZVRQY1RrCjJpd0lZZXI3 +TFBIQ1ppN0VSMFp5N3c0TlhWbDlFZGh2bXR0VHpwN3FXWm8KLT4gc3NoLWVkMjU1 +MTkgQUk3S1Z3IER6U3BvRGR5cHgzNUhtN2VydFFVNC9Gb2cwNWczalBsenFXUXRo +Z3BoZ0UKbUI1Y3YvUjhNaUtHcTQ2NXZ0VGdaTXp0dTFsR3NrMnJMejR6NFRnOVhn +awotPiBzc2gtZWQyNTUxOSBUKzhkOVEgMDRBejZXY0NVRnZYN3FKa3cxRXhXOXFE +MDNnUlNWcno0YUFsRExVKzkyVQp0NjZYU1BPUW1oeituK3BNazh2Q2RsdTlST0FH +cnNMV2RPbGNOanhCWTBrCi0+IHNzaC1lZDI1NTE5IGxwV3ZoQSB0dHZmb2Z3N2Yy +T09qU0lrcHVJbXNtbHE3TmthK1BqS1NrUlZrWXUvd1VVCnpGNjVhb3lxN0hvbWlw +eXY5YlNCQ1hYenMyNk04WUNlbEFRbnVxUlRIMlUKLT4gMzs6JSsiWC1ncmVhc2Ug +egptSS9XOVFUc25UVFRzejJuUFVvNm5DMEtGcFBKL2EzM2lqc3pQbW9oclRrd0da +dUJYNXBhZlFldUxMakR0bmdTCmxPVWc5b2NQL3dLRUZKVlp1V3dxSUEKLS0tIDda +N1FnMGxIZWRXQmIwY1A3eEVOaVYxa2REVW5kZEhZQy8wT3Y0amtqNW8KfZtPqD8R +E45F18wrFcuhdoVPnUhLD6iI5E2FqC6qadSNW/NI0aFNkr4um2OEBQZQVSup7Q== +-----END AGE ENCRYPTED FILE----- diff --git a/reference/users/youwen/secrets/wakatime_cfg.age b/reference/users/youwen/secrets/wakatime_cfg.age index ff19a37..d225cc1 100644 Binary files a/reference/users/youwen/secrets/wakatime_cfg.age and b/reference/users/youwen/secrets/wakatime_cfg.age differ diff --git a/reference/users/youwen/secrets/youwen_dev_ssh_priv_key.age b/reference/users/youwen/secrets/youwen_dev_ssh_priv_key.age index 4055155..dc925f5 100644 Binary files a/reference/users/youwen/secrets/youwen_dev_ssh_priv_key.age and b/reference/users/youwen/secrets/youwen_dev_ssh_priv_key.age differ diff --git a/reference/users/youwen/secrets/youwen_ucsb_client_id.age b/reference/users/youwen/secrets/youwen_ucsb_client_id.age index 863920a..00ad1d6 100644 Binary files a/reference/users/youwen/secrets/youwen_ucsb_client_id.age and b/reference/users/youwen/secrets/youwen_ucsb_client_id.age differ diff --git a/reference/users/youwen/secrets/youwen_ucsb_client_secret.age b/reference/users/youwen/secrets/youwen_ucsb_client_secret.age index 3926835..495903b 100644 --- a/reference/users/youwen/secrets/youwen_ucsb_client_secret.age +++ b/reference/users/youwen/secrets/youwen_ucsb_client_secret.age @@ -1,9 +1,17 @@ -age-encryption.org/v1 --> ssh-ed25519 ouRmYQ wTfEjois29npFhLpSxvIQV5tCZ2JwISnauU4TYupNAM -9iUvGSHq/lCrpHv7WR6Jz9ukZdiOx0ZM2pDGUKIVNQQ --> ssh-ed25519 T+8d9Q SAiJq5ojy/SGH3kEYX3IQUZdYkdiMvGYdu88W9I8fV0 -OqeyOakmHteRAZbcYptwu6BGXDOa/v4a+8uVY5wia28 --> ssh-ed25519 lpWvhA 4BPe70ZFYdfH9Etuq46XutSKo4tP7B66Kg8s8t04+Qk -nX+9QWUgtzaYtXwjuw4PRIpOxQslP0DJzVPbHCo4++Y ---- Xgm7UZUBQMN0HdcqSwLwDustfDUOkyF2Plzobm0Anfw -oYC%L([~GN-0-ﾠPr%ĩwW;.S;PTlbo&UL:! \ No newline at end of file +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IG91Um1ZUSBuSnNZ +NFdBV1JUbGNidnlFRExSU0pYUVJ4UDYzRE9pc2lMaDFjbUxpSDBjCmFOUUo1d3lB +TGxUYmUzSCswSzBlOTBTbVdRdXBxb1RZeVZ5d0xuKys0a3cKLT4gc3NoLWVkMjU1 +MTkgQUk3S1Z3IEpTTzA0VThyeDI4Mm5WOGc2MG82YUk5c3FBK2E1YytCektHcTR5 +cC9GQVUKU2pvQ3EvZnVTZ2hKQ3g5VWpYQUlUREVlUThJYUJpaDJpVjdoVHl0M1Rx +TQotPiBzc2gtZWQyNTUxOSBUKzhkOVEgOVB5cklzNHY4cERtbHFIcDEwQmJaYmFi +OHRWVXVOYXJXVGtNd3FZZkdIRQowaWJPS3RZSVJ0TWlPYlNodTgzT2NWRTdYY1dE +SzdmWHBoVjFGbXVQZ0NzCi0+IHNzaC1lZDI1NTE5IGxwV3ZoQSBRUUk2eFNyZXZ0 +R2RkU1VlNzgyeWkvbzlLYmNNWWs0TUJQZGFXUVNNVVRrCkNjazl1Z0ovc0sxaEpj +T2ExYnp3TVI5K25iYUtWbW5URGtWVGcxRTlRb1EKLT4gWygmP1tCWS1ncmVhc2Ug +a3NHUzJhICkyY2IicApEcmQ1YUVrYXhJV2ZlVFEzanBJVUZTVGNWSlVIMkYxMjkx +c25MVG5tZXRpanZ4Mld4VHBESW9DL0UwSjlQTndMCm9KT3AxSlN3RUZRQmZ0K2pt +azlQUUFIUVZLZk1xaEk0bENqVFI1SQotLS0gUVR6VHAxMTFTMEtUdUtTMVVQb0dw +SjE3ekpISFRqRmpFVDBSb2tKclVaNArEYURvve80HWRWrn805d1au1Awo/whCz5c +uqqlsuCMliGASMNebPJ7omfr97E4YASyw+v/vK0VYQDwpuMGNjLjCO7xsA== +-----END AGE ENCRYPTED FILE----- diff --git a/reference/users/youwen/secrets/youwenw_app_password.age b/reference/users/youwen/secrets/youwenw_app_password.age index aa8115c..07ae932 100644 --- a/reference/users/youwen/secrets/youwenw_app_password.age +++ b/reference/users/youwen/secrets/youwenw_app_password.age @@ -1,9 +1,17 @@ -age-encryption.org/v1 --> ssh-ed25519 ouRmYQ tbwaMoL5eIqWyB4W/iREdxLEkdZ86pvf5x2aFYVDsEo -fnm2IQKdTJznUOQWIWALoBSA07PRL1oQ6EmrwQNQysI --> ssh-ed25519 T+8d9Q 47ulo/C+9MkBKv7+kRG2agjApE+R64daXDX2Q99IAAE -V7Jx/+oI7GcebYKbFYr0IuZSf8fUZwHLyAwwW9yK3eY --> ssh-ed25519 lpWvhA RZr1XWsdWZQA0ggAoxW0Qr70ji8fc67Wb53HHOJu/y0 -L1+1zFnWNMGFTlCNmnHtsIcj03C8Grk2V+BoqXnH5P4 ---- n0pdCgIvJ79wLetQ1bGU6+gpZ4UwoN3XhbilyOREuDk -bƖH CL