commit 82dcb60e0d08439f688bdf538994629c2691a458
parent 9bc05a85192cc74fa611bb6a747c9ad9aab0ea18
Author: Toni Brown <me@tb148.net>
Date: Thu, 19 Feb 2026 09:12:56 +0800
do a lot of things at once
Diffstat:
7 files changed, 60 insertions(+), 191 deletions(-)
diff --git a/configuration.nix b/configuration.nix
@@ -5,7 +5,6 @@
config,
lib,
pkgs,
- inputs,
...
}: {
imports = [
@@ -103,11 +102,6 @@
webui = pkgs.metacubexd;
configFile = "${config.sops.templates."mihomo.yaml".path}";
};
- # programs.clash-verge = {
- # enable = true;
- # tunMode = true;
- # serviceMode = true;
- # };
nix.package = pkgs.lixPackageSets.latest.lix;
nix.settings.experimental-features = [
@@ -115,11 +109,6 @@
"flakes"
];
nix.settings.substituters = ["https://mirrors.tuna.tsinghua.edu.cn/nix-channels/store"];
- nix.extraOptions =
- builtins.concatStringsSep "\n" [
- "extra-substituters = https://devenv.cachix.org"
- "extra-trusted-public-keys = devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw="
- ];
time.timeZone = "Asia/Shanghai";
services.timesyncd = {
@@ -134,6 +123,7 @@
users.users.tb148 = {
isNormalUser = true;
home = "/home/tb148";
+ shell = pkgs.zsh;
description = "Toni Brown";
extraGroups = ["wheel"];
};
@@ -162,6 +152,10 @@
environmentFile = "${config.users.users.tb148.home}/.searxng.env";
};
+ services.syncthing.enable = true;
+
+ programs.zsh.enable = true;
+
programs.nix-ld = {
enable = true;
libraries = [
diff --git a/flake.lock b/flake.lock
@@ -7,11 +7,11 @@
]
},
"locked": {
- "lastModified": 1769784115,
- "narHash": "sha256-QIZLsan8c+Kje4rqlXUd9KW/Rmpss5p5GNqV0V12OY8=",
+ "lastModified": 1770551880,
+ "narHash": "sha256-+cS5yXWsSLiK36+PP/+dcQdxpXSclx2d65p7l6Dis+A=",
"ref": "main",
- "rev": "d745dab3172e426fef9767f46651ba073db4d04b",
- "revCount": 595,
+ "rev": "db4dfe3f2a80e9c33492d839accd49f75c7324c2",
+ "revCount": 599,
"type": "git",
"url": "ssh://git@github.com/catppuccin/nix.git"
},
@@ -28,11 +28,11 @@
]
},
"locked": {
- "lastModified": 1769812714,
- "narHash": "sha256-fqUiHXCkB0XSlbTUeNC0wWhM0itGEdEPvVk6x+wHnRY=",
+ "lastModified": 1770818644,
+ "narHash": "sha256-DYS4jIRpRoKOzJjnR/QqEd/MlT4OZZpt8CrBLv+cjsE=",
"ref": "master",
- "rev": "1a7b0c4315c800d44d6953c2393d5c5127a99ad4",
- "revCount": 6175,
+ "rev": "0acbd1180697de56724821184ad2c3e6e7202cd7",
+ "revCount": 6213,
"type": "git",
"url": "ssh://git@github.com/nix-community/home-manager.git"
},
@@ -44,11 +44,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1769461804,
- "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
+ "lastModified": 1770562336,
+ "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=",
"ref": "nixos-unstable",
- "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d",
- "revCount": 935279,
+ "rev": "d6c71932130818840fc8fe9509cf50be8c64634f",
+ "revCount": 942779,
"type": "git",
"url": "https://mirrors.tuna.tsinghua.edu.cn/git/nixpkgs.git"
},
@@ -73,11 +73,11 @@
]
},
"locked": {
- "lastModified": 1769469829,
- "narHash": "sha256-wFcr32ZqspCxk4+FvIxIL0AZktRs6DuF8oOsLt59YBU=",
+ "lastModified": 1770683991,
+ "narHash": "sha256-xVfPvXDf9QN3Eh9dV+Lw6IkWG42KSuQ1u2260HKvpnc=",
"ref": "refs/heads/master",
- "rev": "c5eebd4eb2e3372fe12a8d70a248a6ee9dd02eff",
- "revCount": 1128,
+ "rev": "8b89f44c2cc4581e402111d928869fe7ba9f7033",
+ "revCount": 1141,
"type": "git",
"url": "ssh://git@github.com/Mic92/sops-nix"
},
diff --git a/home.nix b/home.nix
@@ -1,9 +1,6 @@
{
config,
- lib,
pkgs,
- inputs,
- osConfig,
...
}: {
imports = [
@@ -33,7 +30,7 @@
};
home.packages = with pkgs; [
- cargo
+ brave
(catppuccin-kde.override {
flavour = ["mocha"];
accents = ["mauve"];
@@ -45,16 +42,11 @@
})
catppuccinifier-cli
catppuccinifier-gui
- clang
- devenv
- dprint
- eslint
ffmpeg
fish
gtkwave
+ inkscape
iosevka-bin
- iverilog
- jdk21
jetbrains.idea
jupyter
krita
@@ -62,23 +54,18 @@
logisim
logisim-evolution
mars-mips
- neocities
nerd-fonts.iosevka
- nodejs
obs-studio
osu-lazer-bin
- pnpm
ponysay
proton-pass
protonmail-bridge
qalculate-qt
- rustc
sageWithDoc
sarasa-gothic
sequoia-sq
thunderbird
unrar
- virtualenv
vlc
vokoscreen-ng
];
@@ -97,14 +84,16 @@
"en-US"
];
- programs.git.enable = true;
- programs.git.settings = {
- init.defaultBranch = "trunk";
- user.name = "Toni Brown";
- user.email = "me@tb148.net";
+ programs.git = {
+ enable = true;
+ settings = {
+ init.defaultBranch = "trunk";
+ user.name = "Toni Brown";
+ user.email = "me@tb148.net";
+ };
+ signing.signByDefault = true;
+ signing.key = "53187AD414FDFBCC";
};
- programs.git.signing.signByDefault = true;
- programs.git.signing.key = "53187AD414FDFBCC";
programs.gpg.enable = true;
programs.gpg.package = with pkgs;
@@ -133,6 +122,17 @@
programs.hyfetch.enable = true;
+ programs.jujutsu.enable = true;
+ programs.jujutsu.settings = {
+ git.sign-on-push = true;
+ signing.behavior = "drop";
+ signing.backend = "gpg";
+ snapshot.max-new-file-size = 33554432;
+ ui.show-cryptographic-signatures = true;
+ user.name = "Toni Brown";
+ user.email = "me@tb148.net";
+ };
+
programs.librewolf.enable = true;
programs.librewolf.languagePacks = ["en" "zh-CN"];
programs.librewolf.nativeMessagingHosts = [pkgs.kdePackages.plasma-browser-integration];
@@ -143,19 +143,18 @@
programs.pay-respects.enable = true;
- programs.ssh = {
- enable = true;
- enableDefaultConfig = false;
- matchBlocks."ssh.tb148.net".proxyCommand = "${pkgs.cloudflared}/bin/cloudflared access ssh --hostname %h";
- };
-
programs.wezterm.enable = true;
programs.wezterm.extraConfig = builtins.readFile ./wezterm.lua;
programs.zoxide.enable = true;
- # services.protonmail-bridge.enable = true;
- # services.protonmail-bridge.extraPackages = [pkgs.kdePackages.kwallet];
+ programs.zsh.enable = true;
+ programs.zsh.syntaxHighlighting.enable = true;
+
+ home.shell.enableZshIntegration = true;
+
+ services.protonmail-bridge.enable = true;
+ services.protonmail-bridge.extraPackages = [pkgs.kdePackages.kwallet];
i18n.inputMethod = {
enable = true;
diff --git a/mihomo.nix b/mihomo.nix
@@ -1,10 +1,4 @@
-{
- config,
- lib,
- pkgs,
- inputs,
- ...
-}: {
+{config, ...}: {
sops.templates."mihomo.yaml".content =
builtins.toJSON {
allow-lan = false;
diff --git a/starship.nix b/starship.nix
@@ -1,9 +1,4 @@
-{
- config,
- lib,
- pkgs,
- ...
-}: {
+{lib, ...}: {
programs.starship = {
enable = true;
settings = {
diff --git a/vesktop.nix b/vesktop.nix
@@ -1,58 +0,0 @@
-{
- config,
- lib,
- pkgs,
- inputs,
- ...
-}: {
- programs.vesktop = {
- enable = true;
- vencord = {
- settings.plugins = {
- AlwaysAnimate.enabled = true;
- AlwaysTrust.enabled = true;
- BetterFolders = {
- enabled = true;
- closeAllFolders = true;
- closeAllHomeButton = true;
- closeOthers = true;
- forceOpen = true;
- showFolderIcon = 0;
- };
- BetterUploadButton.enabled = true;
- BlurNSFW.enabled = true;
- ClearURLs.enabled = true;
- CtrlEnterSend.enabled = true;
- CopyFileContents.enabled = true;
- ImageFilename.enabled = true;
- MentionAvatars = {
- enabled = true;
- showAtSymbol = false;
- };
- RoleColorEverywhere = {
- enabled = true;
- colorChatMessages = true;
- };
- ShikiCodeblocks = {
- enabled = true;
- customTheme = "https://raw.githubusercontent.com/shikijs/textmate-grammars-themes/main/packages/tm-themes/themes/catppuccin-mocha.json";
- };
- ServerInfo.enabled = true;
- ShowHiddenChannels.enabled = true;
- ShowMeYourName = {
- enabled = true;
- mode = "nick-user";
- inReplies = true;
- };
- TypingTweaks.enabled = true;
- WhoReacted.enabled = true;
- };
- settings.enabledThemes = [
- "midnight-catppuccin-mocha.theme.css"
- ];
- themes."midnight-catppuccin-mocha.theme" =
- builtins.readFile "${inputs.midnight}/themes/flavors/midnight-catppuccin-mocha.theme.css";
- };
- };
- xdg.configFile."vesktop/settings/quickCss.css".source = ./quickCss.css;
-}
diff --git a/zed-editor.nix b/zed-editor.nix
@@ -1,52 +1,16 @@
-{
- config,
- lib,
- pkgs,
- inputs,
- ...
-}: {
+{pkgs, ...}: {
programs.zed-editor = {
enable = true;
extraPackages = with pkgs; [
alejandra
- astro-language-server
- basedpyright
- clang-tools
- eslint
- jdt-language-server
- lua-language-server
+ dprint
nil
- package-version-server
+ nixd
prettier
- ruff
- rust-analyzer
- svelte-language-server
- tailwindcss-language-server
- taplo
- verible
- (veridian.overrideAttrs {
- src =
- fetchFromGitHub {
- owner = "vivekmalneedi";
- repo = "veridian";
- rev = "0c5776a4a4e08fd00b90d91ad3cd2ec10315d2bd";
- hash = "sha256-TQ1qyKQesk0eOArhvfGxOHtIwpyM7iUOgNI1VA1riPE=";
- };
- })
+ tombi
vscode-json-languageserver
yaml-language-server
];
- extensions = [
- "astro"
- "git-firefly"
- "java"
- "lua"
- "nix"
- "nu"
- "svelte"
- "toml"
- "verilog"
- ];
userSettings = {
preferred_line_length = 64;
buffer_font_family = "Sarasa Mono SC";
@@ -56,35 +20,16 @@
hard_tabs = true;
tab_size = 4;
disable_ai = false;
- languages = {
- Nix.language_servers = [
- "nil"
- "!nixd"
- ];
- SystemVerilog = {
- hard_tabs = false;
- formatter = {
- language_server = {
- name = "verible";
- };
- };
- language_servers = [
- "veridian"
- "verible"
- "!slang"
- ];
- };
- };
+ languages.Nix.language_servers = [
+ "nil"
+ "nixd"
+ ];
lsp.nil.initialization_options = {
formatting.command = [
"alejandra"
"--quiet"
"--"
];
- diagnostics.ignored = ["unused_binding"];
- };
- lsp.ruff.initialization_options.settings.configuration = {
- format.indent-style = "tab";
};
};
};
