diff --git a/flake.lock b/flake.lock index cf1c7aa..945a126 100644 --- a/flake.lock +++ b/flake.lock @@ -876,11 +876,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1763964548, - "narHash": "sha256-JTRoaEWvPsVIMFJWeS4G2isPo15wqXY/otsiHPN0zww=", + "lastModified": 1772441848, + "narHash": "sha256-H3W5PSJQTh8Yp51PGU3GUoGCcrD+y7nCsxYHQr+Orvw=", "owner": "nix-community", "repo": "nixd", - "rev": "d4bf15e56540422e2acc7bc26b20b0a0934e3f5e", + "rev": "c896f916addae5b133ee0f4f01f9cd93906f62ea", "type": "github" }, "original": { @@ -1095,11 +1095,11 @@ }, "nixpkgs_14": { "locked": { - "lastModified": 1771612669, - "narHash": "sha256-NWCFzQPkU7YVZ5ILQxjrgAkJN2ggHwF8YMSEFTvmlh8=", + "lastModified": 1772963539, + "narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "58877e1d22288f5ce74a21d3c119d86395d837f2", + "rev": "9dcb002ca1690658be4a04645215baea8b95f31d", "type": "github" }, "original": { @@ -1317,18 +1317,40 @@ "type": "github" } }, - "noctalia-shell": { + "noctalia-qs": { "inputs": { "nixpkgs": [ + "noctalia-shell", "nixpkgs" ] }, "locked": { - "lastModified": 1771640976, - "narHash": "sha256-quTSp+f5kT0TGjbP6h88G4f7/eBaNrdMcOAScKySh94=", + "lastModified": 1772227064, + "narHash": "sha256-f821ZSoGpa/aXrWq0gPpea9qBnX8KDyavGKkptz2Mog=", + "owner": "noctalia-dev", + "repo": "noctalia-qs", + "rev": "0741d27d2f7db567270f139c5d1684614ecf9863", + "type": "github" + }, + "original": { + "owner": "noctalia-dev", + "repo": "noctalia-qs", + "type": "github" + } + }, + "noctalia-shell": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "noctalia-qs": "noctalia-qs" + }, + "locked": { + "lastModified": 1772319635, + "narHash": "sha256-ZVrtz08Fyp6knPEAbcD2+OYvs0T4pTII/xMElHpi31M=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "f240a7ca2c9133ac338ac23c9b57c16489ad0fc2", + "rev": "5d03c56f4c8d7243e6ae97c045afa44aaac2bf0e", "type": "github" }, "original": { diff --git a/home/programs/coding/R.nix b/home/programs/coding/R.nix index 841c159..a2e6821 100644 --- a/home/programs/coding/R.nix +++ b/home/programs/coding/R.nix @@ -48,6 +48,15 @@ let vegan plotly ggiraph + caret + randomForest + ranger + doParallel + tidyLPA + ggpattern + kernlab + qgraph + NetworkComparisonTest (buildRPackage { name = "eegUtils"; src = fetchFromGitHub { diff --git a/home/programs/desktop/niri/override-config.nix b/home/programs/desktop/niri/override-config.nix index 3fbe883..fa28b42 100644 --- a/home/programs/desktop/niri/override-config.nix +++ b/home/programs/desktop/niri/override-config.nix @@ -31,7 +31,11 @@ let } } layer-rule { - match namespace="noctalia-bar-content-*" + match namespace="noctalia-*" + exclude namespace="noctalia-bar-exclusion*" + exclude namespace="noctalia-desktop*" + exclude namespace="noctalia-osd*" + exclude namespace="noctalia-notifications*" background-effect { xray false blur true diff --git a/home/programs/shell/fish.nix b/home/programs/shell/fish.nix index 87a8457..c3ac1da 100644 --- a/home/programs/shell/fish.nix +++ b/home/programs/shell/fish.nix @@ -17,6 +17,12 @@ shellInit = '' zoxide init fish | source export PATH="$HOME/.local/bin:$HOME/.juliaup/bin:$PATH" + + if test -n "$container" + export PATH="$HOME/.local/bin:$HOME/.juliaup/bin:$HOME/.npm-global/bin:$PATH" + eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv fish)" + end + set -g fish_color_command = blue --italics set -g fish_color_quote = yellow --italics ''; diff --git a/home/programs/utils/ai.nix b/home/programs/utils/ai.nix index ee9210c..84dc84e 100644 --- a/home/programs/utils/ai.nix +++ b/home/programs/utils/ai.nix @@ -16,6 +16,8 @@ ANTHROPIC_AUTH_TOKEN = "$(cat ${config.age.secrets.anyrouter_token.path})"; ANTHROPIC_BASE_URL = "https://anyrouter.top"; SILICONFLOW_API_KEY = "$(cat ${config.age.secrets.siliconflow_token.path})"; + MOONSHOT_API_KEY = "$(cat ${config.age.secrets.kimi_token.path})"; + TELEGRAM_BOT_TOKEN = "$(cat ${config.age.secrets.telegram_bot_token.path})"; }; home.packages = with pkgs; [ inputs.kimi-cli.packages.${pkgs.stdenv.hostPlatform.system}.default diff --git a/secrets/age.nix b/secrets/age.nix index 391b4e6..ef5ff85 100644 --- a/secrets/age.nix +++ b/secrets/age.nix @@ -8,5 +8,7 @@ zjuconnect_password.file = ./zjuconnect_password.age; linkai_token.file = ./linkai_token.age; anyrouter_token.file = ./anyrouter_token.age; + kimi_token.file = ./kimi_token.age; + telegram_bot_token.file = ./telegram_bot_token.age; }; } diff --git a/secrets/kimi_token.age b/secrets/kimi_token.age new file mode 100644 index 0000000..42e886d Binary files /dev/null and b/secrets/kimi_token.age differ diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 3d089f4..483755a 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -10,6 +10,8 @@ let "zjuconnect_password" "linkai_token" "anyrouter_token" + "kimi_token" + "telegram_bot_token" ]; in builtins.listToAttrs ( diff --git a/secrets/telegram_bot_token.age b/secrets/telegram_bot_token.age new file mode 100644 index 0000000..56e2968 --- /dev/null +++ b/secrets/telegram_bot_token.age @@ -0,0 +1,7 @@ +age-encryption.org/v1 +-> ssh-ed25519 MpnI9A owwKjh4rthl70p4PbFH0QcXvQijCXUOnELb+LH1eQGU +55p0xBIpi35SC2fkAS3eLpIiN0242AU5xH3co06XhP0 +-> ssh-ed25519 6VlDkQ sgc86ojhyp5vHI3rODSNMBtBmCzD02zeYS5KJnsHZBM +4FDg2wiQo9FDCJgf8NkixPk4IWaHclSUS0LOiIv/aHM +--- aQBvEpHW9O+1cZMAN28j72kK1TAcGZ9yy7/eagsd4GM +Y/ ˂de2Pj5z~2=YzGbMW`QH1ݣ(<+1N!{§= \ No newline at end of file