commit a9b146853a52ec0a3004a992ba209af6b01d78d8
parent 987bfb2e0ae8962b185d4009d237d6c97994a3df
Author: Toni Brown <me@tb148.net>
Date: Thu, 9 Apr 2026 13:59:57 +0800
organize everything a little
Diffstat:
| M | configuration.nix | | | 11 | +++++++++-- |
| M | flake.lock | | | 140 | ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------- |
| M | flake.nix | | | 12 | ++++++++++++ |
| M | home.nix | | | 56 | ++++++++++++++++++++++++++++++++------------------------ |
4 files changed, 182 insertions(+), 37 deletions(-)
diff --git a/configuration.nix b/configuration.nix
@@ -169,13 +169,20 @@
sops.secrets.doggygo = {};
environment.systemPackages = with pkgs; [
- catppuccin-cursors.mochaMauve
git
helix
inputs.run0-sudo-shim.packages.x86_64-linux.default
- sarasa-gothic
wget
];
+
+ fonts.packages = with pkgs; [
+ inter
+ iosevka
+ nerd-fonts.iosevka
+ sarasa-gothic
+ ];
+
+ catppuccin.cursors.enable = true;
catppuccin.sddm = {
font = "等距更纱黑体 SC";
fontSize = "12";
diff --git a/flake.lock b/flake.lock
@@ -1,5 +1,28 @@
{
"nodes": {
+ "betterfox": {
+ "inputs": {
+ "flake-parts": "flake-parts",
+ "import-tree": "import-tree",
+ "nixpkgs": [
+ "nixpkgs"
+ ],
+ "systems": "systems"
+ },
+ "locked": {
+ "lastModified": 1774983044,
+ "narHash": "sha256-XfoC6wpoDN3CNVY8U6tqpPa0oiHoKpE9G9xYNfI1ZME=",
+ "owner": "HeitorAugustoLN",
+ "repo": "betterfox-nix",
+ "rev": "a18e05401186690925d5c493240908852cdb43ea",
+ "type": "github"
+ },
+ "original": {
+ "owner": "HeitorAugustoLN",
+ "repo": "betterfox-nix",
+ "type": "github"
+ }
+ },
"catppuccin": {
"inputs": {
"nixpkgs": [
@@ -20,9 +43,51 @@
"type": "github"
}
},
+ "flake-parts": {
+ "inputs": {
+ "nixpkgs-lib": [
+ "betterfox",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1763759067,
+ "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
+ "type": "github"
+ },
+ "original": {
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "type": "github"
+ }
+ },
+ "flake-parts_2": {
+ "inputs": {
+ "nixpkgs-lib": [
+ "nur",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1733312601,
+ "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
+ "type": "github"
+ },
+ "original": {
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "type": "github"
+ }
+ },
"flake-utils": {
"inputs": {
- "systems": "systems"
+ "systems": "systems_2"
},
"locked": {
"lastModified": 1731533236,
@@ -60,11 +125,11 @@
]
},
"locked": {
- "lastModified": 1775622785,
- "narHash": "sha256-/yFxO+7oS1SymDfJ2iVO7K5vJKcYfe9XGIJ+quLqz0Q=",
+ "lastModified": 1775683737,
+ "narHash": "sha256-oBYyowo6yfgb95Z78s3uTnAd9KkpJpwzjJbfnpLaM2Y=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "527e47b78fe67213072f706bf933a9705a8c4974",
+ "rev": "7ba4ee4228ed36123c7cb75d50524b43514ef992",
"type": "github"
},
"original": {
@@ -73,14 +138,29 @@
"type": "github"
}
},
+ "import-tree": {
+ "locked": {
+ "lastModified": 1763762820,
+ "narHash": "sha256-ZvYKbFib3AEwiNMLsejb/CWs/OL/srFQ8AogkebEPF0=",
+ "owner": "vic",
+ "repo": "import-tree",
+ "rev": "3c23749d8013ec6daa1d7255057590e9ca726646",
+ "type": "github"
+ },
+ "original": {
+ "owner": "vic",
+ "repo": "import-tree",
+ "type": "github"
+ }
+ },
"lix": {
"flake": false,
"locked": {
- "lastModified": 1775552573,
- "narHash": "sha256-FpQ0GTjQKGtg2/TD/8PCUkIy0gcX6LlCrPtxkHTNXZw=",
- "rev": "cbeb4fcd69cfdfecbcb60e033129fde94c7ba1d4",
+ "lastModified": 1775619372,
+ "narHash": "sha256-bONRPjhk5OZdnkQZexZNJzlvwIPg31Gy7fNiwGoX3BQ=",
+ "rev": "bc9fb560ac2d36cd317a856ee96785ea2055fbff",
"type": "tarball",
- "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/cbeb4fcd69cfdfecbcb60e033129fde94c7ba1d4.tar.gz?rev=cbeb4fcd69cfdfecbcb60e033129fde94c7ba1d4"
+ "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/bc9fb560ac2d36cd317a856ee96785ea2055fbff.tar.gz?rev=bc9fb560ac2d36cd317a856ee96785ea2055fbff"
},
"original": {
"type": "tarball",
@@ -147,13 +227,36 @@
"type": "github"
}
},
+ "nur": {
+ "inputs": {
+ "flake-parts": "flake-parts_2",
+ "nixpkgs": [
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1775712653,
+ "narHash": "sha256-AX8AJBVPtgiYUTNh5jEiI0Y0QNB+myQ45NDWFQLvQ0A=",
+ "owner": "nix-community",
+ "repo": "NUR",
+ "rev": "2c61fba1a0b6eb23c54de96b83142ce5d637432a",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-community",
+ "repo": "NUR",
+ "type": "github"
+ }
+ },
"root": {
"inputs": {
+ "betterfox": "betterfox",
"catppuccin": "catppuccin",
"home-manager": "home-manager",
"lix": "lix",
"lix-module": "lix-module",
"nixpkgs": "nixpkgs",
+ "nur": "nur",
"run0-sudo-shim": "run0-sudo-shim",
"sops-nix": "sops-nix"
}
@@ -187,11 +290,11 @@
]
},
"locked": {
- "lastModified": 1775619836,
- "narHash": "sha256-VcC/+MMMldwQKcST2y/QTndGLusSxjeUvYwFwzZKKko=",
+ "lastModified": 1775682595,
+ "narHash": "sha256-0E9PohY/VuESLq0LR4doaH7hTag513sDDW5n5qmHd1Q=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "de5f2d596eb896a5728afcd15f823f59cb9ecfdb",
+ "rev": "d2e8438d5886e92bc5e7c40c035ab6cae0c41f76",
"type": "github"
},
"original": {
@@ -215,6 +318,21 @@
"type": "github"
}
},
+ "systems_2": {
+ "locked": {
+ "lastModified": 1681028828,
+ "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+ "owner": "nix-systems",
+ "repo": "default",
+ "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-systems",
+ "repo": "default",
+ "type": "github"
+ }
+ },
"treefmt-nix": {
"inputs": {
"nixpkgs": [
diff --git a/flake.nix b/flake.nix
@@ -3,6 +3,10 @@
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+ nur = {
+ url = "github:nix-community/NUR";
+ inputs.nixpkgs.follows = "nixpkgs";
+ };
lix = {
url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";
flake = false;
@@ -12,6 +16,10 @@
inputs.nixpkgs.follows = "nixpkgs";
inputs.lix.follows = "lix";
};
+ betterfox = {
+ url = "github:HeitorAugustoLN/betterfox-nix";
+ inputs.nixpkgs.follows = "nixpkgs";
+ };
catppuccin = {
url = "github:catppuccin/nix";
inputs.nixpkgs.follows = "nixpkgs";
@@ -33,8 +41,10 @@
outputs = {
self,
nixpkgs,
+ nur,
lix,
lix-module,
+ betterfox,
catppuccin,
home-manager,
run0-sudo-shim,
@@ -47,6 +57,7 @@
specialArgs = {inherit inputs;};
modules = [
./configuration.nix
+ nur.modules.nixos.default
lix-module.nixosModules.default
catppuccin.nixosModules.catppuccin
home-manager.nixosModules.home-manager
@@ -58,6 +69,7 @@
home-manager.users.tb148 = {
imports = [
./home.nix
+ betterfox.homeModules.betterfox
catppuccin.homeModules.catppuccin
];
};
diff --git a/home.nix b/home.nix
@@ -4,8 +4,6 @@
...
}: {
imports = [
- # ./starship.nix
- # ./vesktop.nix
./zed-editor.nix
];
@@ -40,35 +38,21 @@
flavor = "mocha";
accent = "mauve";
})
- catppuccinifier-cli
- catppuccinifier-gui
ffmpeg
- gtkwave
inkscape
- iosevka-bin
jetbrains.idea
jupyter
krita
libreoffice-qt-fresh
- logisim
- logisim-evolution
- mars-mips
- nerd-fonts.iosevka
- obs-studio
onlyoffice-desktopeditors
osu-lazer-bin
ponysay
proton-pass
protonmail-bridge
qalculate-qt
- # sageWithDoc
- sarasa-gothic
sequoia-sq
- sillytavern
- thunderbird
unrar
vlc
- vokoscreen-ng
];
programs.alacritty.enable = true;
@@ -88,6 +72,34 @@
programs.fd.enable = true;
+ programs.firefox = {
+ enable = true;
+ betterfox = {
+ enable = true;
+ profiles.default = {
+ enableAllSections = true;
+ };
+ };
+ nativeMessagingHosts = [pkgs.kdePackages.plasma-browser-integration];
+ profiles.default = {
+ extensions = {
+ force = true;
+ packages = with pkgs.nur.repos.rycee.firefox-addons; [
+ bitwarden
+ firefox-color
+ plasma-integration
+ stylus
+ ublock-origin
+ ];
+ };
+ settings = {
+ "signon.rememberSignons" = false;
+ "extensions.formautofill.addresses.enabled" = false;
+ "extensions.formautofill.creditCards.enabled" = false;
+ };
+ };
+ };
+
programs.fish.enable = true;
programs.git = {
@@ -140,15 +152,14 @@
user.email = "me@tb148.net";
};
- programs.librewolf.enable = true;
- programs.librewolf.languagePacks = ["zh-CN"];
- programs.librewolf.nativeMessagingHosts = [pkgs.kdePackages.plasma-browser-integration];
-
programs.nushell.enable = true;
programs.nushell.configFile.source = ./config.nu;
programs.pay-respects.enable = true;
+ programs.thunderbird.enable = true;
+ programs.thunderbird.profiles.default.isDefault = true;
+
programs.zoxide.enable = true;
programs.zsh.enable = true;
@@ -174,10 +185,7 @@
];
})
];
- settings.addons.classicui.globalSection = {
- Theme = "catppuccin-mocha-mauve";
- Font = "等距更纱黑体 SC 10";
- };
+ settings.addons.classicui.globalSection.Font = "等距更纱黑体 SC 10";
waylandFrontend = true;
};
};
