diff --git a/flake.lock b/flake.lock index 99d26ad..4f0c26c 100644 --- a/flake.lock +++ b/flake.lock @@ -247,11 +247,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1768661221, - "narHash": "sha256-MJwOjrIISfOpdI9x4C+5WFQXvHtOuj5mqLZ4TMEtk1M=", + "lastModified": 1773628058, + "narHash": "sha256-hpXH0z3K9xv0fHaje136KY872VT2T5uwxtezlAskQgY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3327b113f2ef698d380df83fbccefad7e83d7769", + "rev": "f8573b9c935cfaa162dd62cc9e75ae2db86f85df", "type": "github" }, "original": { diff --git a/home/common/optional/desktop/hyprland/hyprland.nix b/home/common/optional/desktop/hyprland/hyprland.nix index 9b03add..9ffb2e4 100644 --- a/home/common/optional/desktop/hyprland/hyprland.nix +++ b/home/common/optional/desktop/hyprland/hyprland.nix @@ -29,6 +29,7 @@ }; }) hyprlandPlugins.hyprscrolling + hyprlandPlugins.hyprbars ]; settings = { @@ -124,7 +125,7 @@ animation = [ "global, 1, 10, default" - "border, 1, 5.39, easeOutQuint" + "border, 0, 5.39, easeOutQuint" "windows, 1, 4.79, easeOutQuint" "windowsIn, 1, 4.1, easeOutQuint, popin 87%" "windowsOut, 1, 1.49, linear, popin 87%" @@ -342,6 +343,10 @@ hyprscrolling = { fullscreen_on_one_column = true; }; + + hyprbars = { + enabled = false; + }; }; }; }; diff --git a/host/ark/service/auth.nix b/host/ark/service/auth.nix index f339e33..f6089ec 100644 --- a/host/ark/service/auth.nix +++ b/host/ark/service/auth.nix @@ -9,6 +9,11 @@ UI_CONFIG_DISABLED = true; APP_NAME = config.oauth.name; + + }; + + credentials = { + ENCRYPTION_KEY = config.sops.secrets."pocket-id-encryption-key".path; }; }; } diff --git a/host/ark/sops.nix b/host/ark/sops.nix index c06699d..e615980 100644 --- a/host/ark/sops.nix +++ b/host/ark/sops.nix @@ -20,6 +20,10 @@ "tunnel-credentials" = {}; "admin-password" = {}; + "pocket-id-encryption-key" = { + owner = config.services.pocket-id.user; + }; + "waka-password-salt" = { owner = config.users.users.wakapi.name; }; diff --git a/host/max/default.nix b/host/max/default.nix index 1c5dd53..9f13f7d 100644 --- a/host/max/default.nix +++ b/host/max/default.nix @@ -73,7 +73,7 @@ libreoffice-qt - pkgs-unstable.signal-desktop-bin + pkgs-unstable.signal-desktop pkgs-unstable.gurk-rs gnupg @@ -84,6 +84,8 @@ pinentry-qt fzf + zip + jq ffmpeg ripgrep unzip diff --git a/host/max/home/nvim.nix b/host/max/home/nvim.nix index cd10676..c58782b 100644 --- a/host/max/home/nvim.nix +++ b/host/max/home/nvim.nix @@ -128,19 +128,19 @@ enable = true; servers = { - ts_ls.enable = true; + tsgo.enable = true; + tailwindcss.enable = false; + biome.enable = false; rust_analyzer = { enable = true; installCargo = true; installRustc = true; }; clangd.enable = true; - tailwindcss.enable = true; phpactor.enable = true; pylsp.enable = true; pyright.enable = true; nixd.enable = true; - biome.enable = true; }; keymaps = { diff --git a/justfile b/justfile index f99f688..e92ec57 100644 --- a/justfile +++ b/justfile @@ -29,7 +29,7 @@ rebuild-ark: just add-secrets git add . - nixos-rebuild --flake '.?submodules=1#ark' --build-host admin@100.98.252.15 --target-host admin@100.98.252.15 --use-remote-sudo --fast switch + nixos-rebuild --flake '.?submodules=1#ark' --build-host admin@192.168.1.192 --target-host admin@192.168.1.192 --use-remote-sudo --fast switch push-secrets: just add-secrets diff --git a/secrets b/secrets index b5647c0..78d7d95 160000 --- a/secrets +++ b/secrets @@ -1 +1 @@ -Subproject commit b5647c00944ba45f00db6de52d3b29c085c67974 +Subproject commit 78d7d95fd0990a2d840f3a06f2ddb1ee82ccf651