diff --git a/flake.lock b/flake.lock index 19bdd7c..8445aa9 100644 --- a/flake.lock +++ b/flake.lock @@ -144,11 +144,11 @@ ] }, "locked": { - "lastModified": 1752603129, - "narHash": "sha256-S+wmHhwNQ5Ru689L2Gu8n1OD6s9eU9n9mD827JNR+kw=", + "lastModified": 1765682243, + "narHash": "sha256-yeCxFV/905Wr91yKt5zrVvK6O2CVXWRMSrxqlAZnLp0=", "owner": "nix-community", "repo": "home-manager", - "rev": "e8c19a3cec2814c754f031ab3ae7316b64da085b", + "rev": "58bf3ecb2d0bba7bdf363fc8a6c4d49b4d509d03", "type": "github" }, "original": { @@ -459,11 +459,11 @@ }, "unstable": { "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "lastModified": 1763835633, + "narHash": "sha256-HzxeGVID5MChuCPESuC0dlQL1/scDKu+MmzoVBJxulM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "rev": "050e09e091117c3d7328c7b2b7b577492c43c134", "type": "github" }, "original": { @@ -481,11 +481,11 @@ ] }, "locked": { - "lastModified": 1759724568, - "narHash": "sha256-i/+YcMMMFXeUKWbR683eoxyz+4Jcb01MHVCjj6OHl0Y=", + "lastModified": 1765764138, + "narHash": "sha256-Nb5y5xSDQLMeUYiA1bQkbmHffGm0d/XXWoJjFu8ovw0=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "b63e1644c96baaaccb78f8d3101f39fbfee733cb", + "rev": "bd8815d0a686267386268e7cc70315124e21362b", "type": "github" }, "original": { diff --git a/host/ark/service/money.nix b/host/ark/service/money.nix index 7b0e3e3..0fc2d58 100644 --- a/host/ark/service/money.nix +++ b/host/ark/service/money.nix @@ -4,7 +4,7 @@ src = pkgs.fetchgit { url = "https://git.koon.us/max/money.git"; - hash = "sha256-HG7R/rv6H7jIBp0qK3azy1x1myjOBJCQqI+K0ydztKs="; + hash = "sha256-TPUeYuffR8U0M3Wnc3yGmqDhEjWIhRRFaKDkhTBsNG8="; }; expoWeb = pkgs.stdenv.mkDerivation (finalAttrs: { @@ -151,6 +151,7 @@ DEBUG = "*"; NODE_OPTIONS = "--trace-warnings --trace-uncaught"; OAUTH_DISCOVERY_URL = "https://auth.koon.us/.well-known/openid-configuration"; + PLAID_ENV = "production"; }; serviceConfig = { diff --git a/host/common/optional/browser.nix b/host/common/optional/browser.nix index 1080cfe..9478be3 100644 --- a/host/common/optional/browser.nix +++ b/host/common/optional/browser.nix @@ -1,4 +1,9 @@ { lib, ... }: { + + programs.chromium = { + enable = true; + }; + programs.firefox = let lock-false = { Value = false; diff --git a/host/common/optional/locale.nix b/host/common/optional/locale.nix index 525ce99..98f1d17 100644 --- a/host/common/optional/locale.nix +++ b/host/common/optional/locale.nix @@ -2,7 +2,8 @@ i18n.defaultLocale = "en_US.UTF-8"; i18n.supportedLocales = [ "en_US.UTF-8/UTF-8" "zh_CN.UTF-8/UTF-8" ]; i18n.inputMethod = { - enabled = "fcitx5"; + enable = true; + type = "fcitx5"; fcitx5.addons = with pkgs; [ # fcitx5-gtk # alternatively, kdePackages.fcitx5-qt kdePackages.fcitx5-qt # alternatively, kdePackages.fcitx5-qt diff --git a/host/max/default.nix b/host/max/default.nix index 1467292..ff26a5f 100644 --- a/host/max/default.nix +++ b/host/max/default.nix @@ -60,6 +60,7 @@ in GSK_RENDERER = "ngl"; EDITOR = "nvim"; }; + environment.sessionVariables.NIXOS_OZONE_WL = "1"; # programs.adb.enable = true; @@ -76,7 +77,7 @@ in libreoffice-qt # ncmpcpp - signal-desktop + pkgs-unstable.signal-desktop gnupg (pass.withExtensions (exts: [ exts.pass-otp ])) @@ -108,9 +109,8 @@ in gimp inkscape - mysql-workbench + ungoogled-chromium - pkgs-unstable.brave # arm support pkgs-unstable.sparrow @@ -140,6 +140,22 @@ in enableSSHSupport = true; }; + + services.keyd = { + enable = true; + + keyboards.default = { + ids = [ "*" ]; + + settings = { + main = { + pageup = "leftmouse"; + pagedown = "rightmouse"; + }; + }; + }; + }; + system.stateVersion = "25.05"; } diff --git a/host/max/home/nvim.nix b/host/max/home/nvim.nix index 3bc3651..0593656 100644 --- a/host/max/home/nvim.nix +++ b/host/max/home/nvim.nix @@ -84,12 +84,21 @@ } ]; + autoCmd = [ + { + event = [ "BufWritePre" ]; + pattern = "*"; + command = "lua vim.lsp.buf.format()"; + } + ]; + diagnostic.settings.virtual_text = true; userCommands.W.command = "w"; plugins = { + web-devicons.enable = true; sleuth.enable = true; lastplace.enable = true; @@ -127,6 +136,7 @@ pylsp.enable = true; pyright.enable = true; nixd.enable = true; + biome.enable = true; }; keymaps = { diff --git a/secrets b/secrets index fdda3b7..1fd5856 160000 --- a/secrets +++ b/secrets @@ -1 +1 @@ -Subproject commit fdda3b7b10726888505da9dab1aeae28a8be9ae0 +Subproject commit 1fd5856d0bf1e1b7eccfbbae1edc44df38a752c7