commit 38df6e4e44ff30402cbf7b0d9100ac5bcef9fb6d
parent 9c482ecc8391250204c097fa1ce72197c9d0fa98
Author: Toni Brown <me@tb148.net>
Date: Tue, 13 Jan 2026 19:14:48 +0800
Switch indentation from spaces to tabs
Diffstat:
| M | alejandra.toml | | | 2 | +- |
| M | configuration.nix | | | 364 | ++++++++++++++++++++++++++++++++++++++++--------------------------------------- |
| M | flake.lock | | | 204 | +++++++++++++++++++++++++++++++++++++++---------------------------------------- |
| M | flake.nix | | | 85 | ++++++++++++++++++++++++++++++++++++++++--------------------------------------- |
| M | hardware-configuration.nix | | | 110 | ++++++++++++++++++++++++++++++++++++++++---------------------------------------- |
| M | home.nix | | | 2 | ++ |
| M | starship.nix | | | 79 | ++++++++++++++++++++++++++++++++++++++++--------------------------------------- |
| M | vesktop.nix | | | 110 | ++++++++++++++++++++++++++++++++++++++++---------------------------------------- |
| M | zed-editor.nix | | | 1 | + |
9 files changed, 480 insertions(+), 477 deletions(-)
diff --git a/alejandra.toml b/alejandra.toml
@@ -1 +1 @@
-indentation = "FourSpaces"
+indentation = "Tabs"
diff --git a/configuration.nix b/configuration.nix
@@ -2,186 +2,188 @@
# your system. Help is available in the configuration.nix(5) man page, on
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
{
- config,
- lib,
- pkgs,
- inputs,
- ...
+ config,
+ lib,
+ pkgs,
+ inputs,
+ ...
}: {
- imports = [
- ./hardware-configuration.nix
- ];
-
- fileSystems."/".options = [
- "subvol=root"
- "compress=zstd"
- ];
- fileSystems."/home".options = [
- "subvol=home"
- "compress=zstd"
- ];
- fileSystems."/nix".options = [
- "subvol=nix"
- "compress=zstd"
- "noatime"
- ];
- boot.loader.grub = {
- enable = true;
- efiSupport = true;
- device = "nodev";
- };
- boot.loader.efi.canTouchEfiVariables = true;
- boot.kernelPackages = pkgs.linuxPackages_latest;
-
- nixpkgs.config.allowUnfree = true;
-
- hardware.graphics.enable = true;
- services.xserver.videoDrivers = ["nvidia"];
- hardware.nvidia.open = true;
- hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.stable;
- hardware.nvidia.powerManagement.enable = true;
- hardware.nvidia.powerManagement.finegrained = true;
- hardware.nvidia.prime = {
- offload.enable = true;
- intelBusId = "PCI:0:2:0";
- nvidiaBusId = "PCI:1:0:0";
- };
-
- hardware.bluetooth.enable = true;
-
- nix.settings.experimental-features = [
- "nix-command"
- "flakes"
- ];
-
- environment.systemPackages = with pkgs; [
- catppuccin-cursors.mochaMauve
- doas-sudo-shim
- git
- helix
- sarasa-gothic
- wget
- ];
-
- services = {
- desktopManager.plasma6.enable = true;
- displayManager.sddm = {
- enable = true;
- wayland.enable = true;
- };
- };
- catppuccin.sddm = {
- font = "等距更纱黑体 SC";
- fontSize = "12";
- };
-
- services.pipewire = {
- enable = true;
- pulse.enable = true;
- };
-
- services.printing.enable = true;
-
- networking.hostName = "nixosion";
- networking.networkmanager.enable = true;
- networking.nftables.enable = true;
- networking.firewall.enable = false;
-
- services.mihomo = {
- enable = true;
- tunMode = true;
- webui = pkgs.metacubexd;
- configFile = "/home/tb148/mihomo.yaml";
- };
- # programs.clash-verge = {
- # enable = true;
- # tunMode = true;
- # serviceMode = true;
- # };
-
- nix.settings.substituters = ["https://mirrors.tuna.tsinghua.edu.cn/nix-channels/store"];
- nix.extraOptions = ''
- extra-substituters = https://devenv.cachix.org
- extra-trusted-public-keys = devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw=
- '';
-
- time.timeZone = "Asia/Shanghai";
- services.timesyncd = {
- enable = true;
- servers = ["ntp.ntsc.ac.cn"];
- };
-
- i18n.defaultLocale = "zh_CN.UTF-8";
- services.xserver.xkb.layout = "cn(altgr-pinyin)";
-
- services.userborn.enable = true;
- users.users.tb148 = {
- isNormalUser = true;
- home = "/home/tb148";
- description = "Toni Brown";
- extraGroups = ["wheel"];
- };
-
- security.sudo.enable = false;
- security.doas.enable = true;
- security.doas.extraRules = lib.mkAfter [
- {
- groups = ["wheel"];
- persist = true;
- setEnv = [
- "SUDO_UID=$UID"
- "LANG"
- ];
- }
- ];
-
- catppuccin.enable = true;
- catppuccin.flavor = "mocha";
- catppuccin.accent = "mauve";
- xdg.icons.fallbackCursorThemes = ["catppuccin-mocha-mauve-cursors"];
-
- services.searx = {
- enable = true;
- environmentFile = "/home/tb148/.searxng.env";
- };
-
- programs.nix-ld = {
- enable = true;
- libraries = [
- ## Put here any library that is required when running a package
- ## ...
- ## Uncomment if you want to use the libraries provided by default in the steam distribution
- ## but this is quite far from being exhaustive
- ## https://github.com/NixOS/nixpkgs/issues/354513
- (pkgs.runCommand "steamrun-lib" {} "mkdir $out; ln -s ${pkgs.steam-run.fhsenv}/usr/lib64 $out/lib")
- ];
- };
-
- programs.steam.enable = true;
-
- virtualisation.waydroid.enable = true;
-
- # Copy the NixOS configuration file and link it from the resulting system
- # (/run/current-system/configuration.nix). This is useful in case you
- # accidentally delete configuration.nix.
- # system.copySystemConfiguration = true;
-
- # This option defines the first version of NixOS you have installed on this particular machine,
- # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.
- #
- # Most users should NEVER change this value after the initial install, for any reason,
- # even if you've upgraded your system to a new NixOS release.
- #
- # This value does NOT affect the Nixpkgs version your packages and OS are pulled from,
- # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how
- # to actually do that.
- #
- # This value being lower than the current NixOS release does NOT mean your system is
- # out of date, out of support, or vulnerable.
- #
- # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration,
- # and migrated your data accordingly.
- #
- # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
- system.stateVersion = "25.05"; # Did you read the comment?
+ imports = [
+ ./hardware-configuration.nix
+ ];
+
+ fileSystems."/".options = [
+ "subvol=root"
+ "compress=zstd"
+ ];
+ fileSystems."/home".options = [
+ "subvol=home"
+ "compress=zstd"
+ ];
+ fileSystems."/nix".options = [
+ "subvol=nix"
+ "compress=zstd"
+ "noatime"
+ ];
+ boot.loader.grub = {
+ enable = true;
+ efiSupport = true;
+ device = "nodev";
+ };
+ boot.loader.efi.canTouchEfiVariables = true;
+ boot.kernelPackages = pkgs.linuxPackages_latest;
+
+ nixpkgs.config.allowUnfree = true;
+
+ hardware.graphics.enable = true;
+ services.xserver.videoDrivers = ["nvidia"];
+ hardware.nvidia.open = true;
+ hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.stable;
+ hardware.nvidia.powerManagement.enable = true;
+ hardware.nvidia.powerManagement.finegrained = true;
+ hardware.nvidia.prime = {
+ offload.enable = true;
+ intelBusId = "PCI:0:2:0";
+ nvidiaBusId = "PCI:1:0:0";
+ };
+
+ hardware.bluetooth.enable = true;
+
+ nix.settings.experimental-features = [
+ "nix-command"
+ "flakes"
+ ];
+
+ environment.systemPackages = with pkgs; [
+ catppuccin-cursors.mochaMauve
+ doas-sudo-shim
+ git
+ helix
+ sarasa-gothic
+ wget
+ ];
+
+ services = {
+ desktopManager.plasma6.enable = true;
+ displayManager.sddm = {
+ enable = true;
+ wayland.enable = true;
+ };
+ };
+ catppuccin.sddm = {
+ font = "等距更纱黑体 SC";
+ fontSize = "12";
+ };
+
+ services.pipewire = {
+ enable = true;
+ pulse.enable = true;
+ };
+
+ services.printing.enable = true;
+
+ networking.hostName = "nixosion";
+ networking.networkmanager.enable = true;
+ networking.nftables.enable = true;
+ networking.firewall.enable = false;
+
+ services.mihomo = {
+ enable = true;
+ tunMode = true;
+ webui = pkgs.metacubexd;
+ configFile = "/home/tb148/mihomo.yaml";
+ };
+ # programs.clash-verge = {
+ # enable = true;
+ # tunMode = true;
+ # serviceMode = true;
+ # };
+
+ nix.settings.substituters = ["https://mirrors.tuna.tsinghua.edu.cn/nix-channels/store"];
+ nix.extraOptions =
+ lib.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 = {
+ enable = true;
+ servers = ["ntp.ntsc.ac.cn"];
+ };
+
+ i18n.defaultLocale = "zh_CN.UTF-8";
+ services.xserver.xkb.layout = "cn(altgr-pinyin)";
+
+ services.userborn.enable = true;
+ users.users.tb148 = {
+ isNormalUser = true;
+ home = "/home/tb148";
+ description = "Toni Brown";
+ extraGroups = ["wheel"];
+ };
+
+ security.sudo.enable = false;
+ security.doas.enable = true;
+ security.doas.extraRules =
+ lib.mkAfter [
+ {
+ groups = ["wheel"];
+ persist = true;
+ setEnv = [
+ "SUDO_UID=$UID"
+ "LANG"
+ ];
+ }
+ ];
+
+ catppuccin.enable = true;
+ catppuccin.flavor = "mocha";
+ catppuccin.accent = "mauve";
+ xdg.icons.fallbackCursorThemes = ["catppuccin-mocha-mauve-cursors"];
+
+ services.searx = {
+ enable = true;
+ environmentFile = "/home/tb148/.searxng.env";
+ };
+
+ programs.nix-ld = {
+ enable = true;
+ libraries = [
+ ## Put here any library that is required when running a package
+ ## ...
+ ## Uncomment if you want to use the libraries provided by default in the steam distribution
+ ## but this is quite far from being exhaustive
+ ## https://github.com/NixOS/nixpkgs/issues/354513
+ (pkgs.runCommand "steamrun-lib" {} "mkdir $out; ln -s ${pkgs.steam-run.fhsenv}/usr/lib64 $out/lib")
+ ];
+ };
+
+ programs.steam.enable = true;
+
+ virtualisation.waydroid.enable = true;
+
+ # Copy the NixOS configuration file and link it from the resulting system
+ # (/run/current-system/configuration.nix). This is useful in case you
+ # accidentally delete configuration.nix.
+ # system.copySystemConfiguration = true;
+
+ # This option defines the first version of NixOS you have installed on this particular machine,
+ # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.
+ #
+ # Most users should NEVER change this value after the initial install, for any reason,
+ # even if you've upgraded your system to a new NixOS release.
+ #
+ # This value does NOT affect the Nixpkgs version your packages and OS are pulled from,
+ # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how
+ # to actually do that.
+ #
+ # This value being lower than the current NixOS release does NOT mean your system is
+ # out of date, out of support, or vulnerable.
+ #
+ # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration,
+ # and migrated your data accordingly.
+ #
+ # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
+ system.stateVersion = "25.05"; # Did you read the comment?
}
diff --git a/flake.lock b/flake.lock
@@ -1,106 +1,102 @@
{
- "nodes": {
- "catppuccin": {
- "inputs": {
- "nixpkgs": [
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1767967164,
- "narHash": "sha256-Cx4VETh9dGoQYDtWhre7g66d7SAr+h1h6f+SSHxVrck=",
- "owner": "catppuccin",
- "repo": "nix",
- "rev": "e973584280e3b0e1d5b5a1a5e9948dc222c54af7",
- "type": "github"
- },
- "original": {
- "owner": "catppuccin",
- "repo": "nix",
- "type": "github"
- }
- },
- "home-manager": {
- "inputs": {
- "nixpkgs": [
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1768248913,
- "narHash": "sha256-Kr45H5StnR9hgEhpKD8/BDZLvEpLVJb51lvIDQ9EC7U=",
- "owner": "nix-community",
- "repo": "home-manager",
- "rev": "360620ec9d5ffc186b5b1fca4c5f5b2e1634a5cf",
- "type": "github"
- },
- "original": {
- "owner": "nix-community",
- "repo": "home-manager",
- "type": "github"
- }
- },
- "nixpkgs": {
- "locked": {
- "lastModified": 1768127708,
- "narHash": "sha256-1Sm77VfZh3mU0F5OqKABNLWxOuDeHIlcFjsXeeiPazs=",
- "ref": "nixos-unstable",
- "rev": "ffbc9f8cbaacfb331b6017d5a5abb21a492c9a38",
- "shallow": true,
- "type": "git",
- "url": "https://mirrors.tuna.tsinghua.edu.cn/git/nixpkgs.git"
- },
- "original": {
- "ref": "nixos-unstable",
- "shallow": true,
- "type": "git",
- "url": "https://mirrors.tuna.tsinghua.edu.cn/git/nixpkgs.git"
- }
- },
- "nixpkgs-stable": {
- "locked": {
- "lastModified": 1768028080,
- "narHash": "sha256-50aDK+8eLvsLK39TzQhKNq50/HcXyP4hyxOYoPoVxjo=",
- "ref": "nixos-25.11",
- "rev": "d03088749a110d52a4739348f39a63f84bb0be14",
- "shallow": true,
- "type": "git",
- "url": "https://mirrors.tuna.tsinghua.edu.cn/git/nixpkgs.git"
- },
- "original": {
- "ref": "nixos-25.11",
- "shallow": true,
- "type": "git",
- "url": "https://mirrors.tuna.tsinghua.edu.cn/git/nixpkgs.git"
- }
- },
- "nixpkgs-staging": {
- "locked": {
- "lastModified": 1768259000,
- "narHash": "sha256-K/dsw/r5QBzejvWxV+nS9x6m1Cv/IdNoQM7zPOT/z2E=",
- "ref": "staging",
- "rev": "4f3be6e36fddf57b39000ab1cbaddcfcf7795e3b",
- "shallow": true,
- "type": "git",
- "url": "https://mirrors.tuna.tsinghua.edu.cn/git/nixpkgs.git"
- },
- "original": {
- "ref": "staging",
- "shallow": true,
- "type": "git",
- "url": "https://mirrors.tuna.tsinghua.edu.cn/git/nixpkgs.git"
- }
- },
- "root": {
- "inputs": {
- "catppuccin": "catppuccin",
- "home-manager": "home-manager",
- "nixpkgs": "nixpkgs",
- "nixpkgs-stable": "nixpkgs-stable",
- "nixpkgs-staging": "nixpkgs-staging"
- }
- }
- },
- "root": "root",
- "version": 7
+ "nodes": {
+ "catppuccin": {
+ "inputs": {
+ "nixpkgs": ["nixpkgs"]
+ },
+ "locked": {
+ "lastModified": 1767967164,
+ "narHash": "sha256-Cx4VETh9dGoQYDtWhre7g66d7SAr+h1h6f+SSHxVrck=",
+ "owner": "catppuccin",
+ "repo": "nix",
+ "rev": "e973584280e3b0e1d5b5a1a5e9948dc222c54af7",
+ "type": "github"
+ },
+ "original": {
+ "owner": "catppuccin",
+ "repo": "nix",
+ "type": "github"
+ }
+ },
+ "home-manager": {
+ "inputs": {
+ "nixpkgs": ["nixpkgs"]
+ },
+ "locked": {
+ "lastModified": 1768248913,
+ "narHash": "sha256-Kr45H5StnR9hgEhpKD8/BDZLvEpLVJb51lvIDQ9EC7U=",
+ "owner": "nix-community",
+ "repo": "home-manager",
+ "rev": "360620ec9d5ffc186b5b1fca4c5f5b2e1634a5cf",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-community",
+ "repo": "home-manager",
+ "type": "github"
+ }
+ },
+ "nixpkgs": {
+ "locked": {
+ "lastModified": 1768127708,
+ "narHash": "sha256-1Sm77VfZh3mU0F5OqKABNLWxOuDeHIlcFjsXeeiPazs=",
+ "ref": "nixos-unstable",
+ "rev": "ffbc9f8cbaacfb331b6017d5a5abb21a492c9a38",
+ "shallow": true,
+ "type": "git",
+ "url": "https://mirrors.tuna.tsinghua.edu.cn/git/nixpkgs.git"
+ },
+ "original": {
+ "ref": "nixos-unstable",
+ "shallow": true,
+ "type": "git",
+ "url": "https://mirrors.tuna.tsinghua.edu.cn/git/nixpkgs.git"
+ }
+ },
+ "nixpkgs-stable": {
+ "locked": {
+ "lastModified": 1768028080,
+ "narHash": "sha256-50aDK+8eLvsLK39TzQhKNq50/HcXyP4hyxOYoPoVxjo=",
+ "ref": "nixos-25.11",
+ "rev": "d03088749a110d52a4739348f39a63f84bb0be14",
+ "shallow": true,
+ "type": "git",
+ "url": "https://mirrors.tuna.tsinghua.edu.cn/git/nixpkgs.git"
+ },
+ "original": {
+ "ref": "nixos-25.11",
+ "shallow": true,
+ "type": "git",
+ "url": "https://mirrors.tuna.tsinghua.edu.cn/git/nixpkgs.git"
+ }
+ },
+ "nixpkgs-staging": {
+ "locked": {
+ "lastModified": 1768259000,
+ "narHash": "sha256-K/dsw/r5QBzejvWxV+nS9x6m1Cv/IdNoQM7zPOT/z2E=",
+ "ref": "staging",
+ "rev": "4f3be6e36fddf57b39000ab1cbaddcfcf7795e3b",
+ "shallow": true,
+ "type": "git",
+ "url": "https://mirrors.tuna.tsinghua.edu.cn/git/nixpkgs.git"
+ },
+ "original": {
+ "ref": "staging",
+ "shallow": true,
+ "type": "git",
+ "url": "https://mirrors.tuna.tsinghua.edu.cn/git/nixpkgs.git"
+ }
+ },
+ "root": {
+ "inputs": {
+ "catppuccin": "catppuccin",
+ "home-manager": "home-manager",
+ "nixpkgs": "nixpkgs",
+ "nixpkgs-stable": "nixpkgs-stable",
+ "nixpkgs-staging": "nixpkgs-staging"
+ }
+ }
+ },
+ "root": "root",
+ "version": 7
}
diff --git a/flake.nix b/flake.nix
@@ -1,46 +1,47 @@
{
- description = "A simple NixOS flake";
+ description = "A simple NixOS flake";
- inputs = {
- nixpkgs.url = "git+https://mirrors.tuna.tsinghua.edu.cn/git/nixpkgs.git?ref=nixos-unstable&shallow=1";
- nixpkgs-stable.url = "git+https://mirrors.tuna.tsinghua.edu.cn/git/nixpkgs.git?ref=nixos-25.11&shallow=1";
- nixpkgs-staging.url = "git+https://mirrors.tuna.tsinghua.edu.cn/git/nixpkgs.git?ref=staging&shallow=1";
- home-manager.url = "github:nix-community/home-manager";
- home-manager.inputs.nixpkgs.follows = "nixpkgs";
- catppuccin.url = "github:catppuccin/nix";
- catppuccin.inputs.nixpkgs.follows = "nixpkgs";
- };
+ inputs = {
+ nixpkgs.url = "git+https://mirrors.tuna.tsinghua.edu.cn/git/nixpkgs.git?ref=nixos-unstable&shallow=1";
+ nixpkgs-stable.url = "git+https://mirrors.tuna.tsinghua.edu.cn/git/nixpkgs.git?ref=nixos-25.11&shallow=1";
+ nixpkgs-staging.url = "git+https://mirrors.tuna.tsinghua.edu.cn/git/nixpkgs.git?ref=staging&shallow=1";
+ home-manager.url = "github:nix-community/home-manager";
+ home-manager.inputs.nixpkgs.follows = "nixpkgs";
+ catppuccin.url = "github:catppuccin/nix";
+ catppuccin.inputs.nixpkgs.follows = "nixpkgs";
+ };
- outputs = {
- self,
- nixpkgs,
- home-manager,
- catppuccin,
- ...
- } @ inputs: {
- nixosConfigurations.nixosion = nixpkgs.lib.nixosSystem {
- system = "x86_64-linux";
- specialArgs = {inherit inputs;};
- modules = [
- # 这里导入之前我们使用的 configuration.nix，
- # 这样旧的配置文件仍然能生效
- ./configuration.nix
- catppuccin.nixosModules.catppuccin
- home-manager.nixosModules.home-manager
- {
- home-manager.useGlobalPkgs = true;
- home-manager.useUserPackages = true;
- home-manager.users.tb148 = {
- imports = [
- ./home.nix
- catppuccin.homeModules.catppuccin
- ];
- };
- # Optionally, use home-manager.extraSpecialArgs to pass
- # arguments to home.nix
- home-manager.extraSpecialArgs = {inherit inputs;};
- }
- ];
- };
- };
+ outputs = {
+ self,
+ nixpkgs,
+ home-manager,
+ catppuccin,
+ ...
+ } @ inputs: {
+ nixosConfigurations.nixosion =
+ nixpkgs.lib.nixosSystem {
+ system = "x86_64-linux";
+ specialArgs = {inherit inputs;};
+ modules = [
+ # 这里导入之前我们使用的 configuration.nix，
+ # 这样旧的配置文件仍然能生效
+ ./configuration.nix
+ catppuccin.nixosModules.catppuccin
+ home-manager.nixosModules.home-manager
+ {
+ home-manager.useGlobalPkgs = true;
+ home-manager.useUserPackages = true;
+ home-manager.users.tb148 = {
+ imports = [
+ ./home.nix
+ catppuccin.homeModules.catppuccin
+ ];
+ };
+ # Optionally, use home-manager.extraSpecialArgs to pass
+ # arguments to home.nix
+ home-manager.extraSpecialArgs = {inherit inputs;};
+ }
+ ];
+ };
+ };
}
diff --git a/hardware-configuration.nix b/hardware-configuration.nix
@@ -2,68 +2,68 @@
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{
- config,
- lib,
- pkgs,
- modulesPath,
- ...
+ config,
+ lib,
+ pkgs,
+ modulesPath,
+ ...
}: {
- imports = [
- (modulesPath + "/installer/scan/not-detected.nix")
- ];
+ imports = [
+ (modulesPath + "/installer/scan/not-detected.nix")
+ ];
- boot.initrd.availableKernelModules = [
- "xhci_pci"
- "thunderbolt"
- "vmd"
- "nvme"
- "usbhid"
- "usb_storage"
- "sd_mod"
- ];
- boot.initrd.kernelModules = [];
- boot.kernelModules = ["kvm-intel"];
- boot.extraModulePackages = [];
+ boot.initrd.availableKernelModules = [
+ "xhci_pci"
+ "thunderbolt"
+ "vmd"
+ "nvme"
+ "usbhid"
+ "usb_storage"
+ "sd_mod"
+ ];
+ boot.initrd.kernelModules = [];
+ boot.kernelModules = ["kvm-intel"];
+ boot.extraModulePackages = [];
- fileSystems."/" = {
- device = "/dev/disk/by-uuid/18af5e11-1470-4fa6-9577-8e8ba513857c";
- fsType = "btrfs";
- options = ["subvol=root"];
- };
+ fileSystems."/" = {
+ device = "/dev/disk/by-uuid/18af5e11-1470-4fa6-9577-8e8ba513857c";
+ fsType = "btrfs";
+ options = ["subvol=root"];
+ };
- fileSystems."/home" = {
- device = "/dev/disk/by-uuid/18af5e11-1470-4fa6-9577-8e8ba513857c";
- fsType = "btrfs";
- options = ["subvol=home"];
- };
+ fileSystems."/home" = {
+ device = "/dev/disk/by-uuid/18af5e11-1470-4fa6-9577-8e8ba513857c";
+ fsType = "btrfs";
+ options = ["subvol=home"];
+ };
- fileSystems."/nix" = {
- device = "/dev/disk/by-uuid/18af5e11-1470-4fa6-9577-8e8ba513857c";
- fsType = "btrfs";
- options = ["subvol=nix"];
- };
+ fileSystems."/nix" = {
+ device = "/dev/disk/by-uuid/18af5e11-1470-4fa6-9577-8e8ba513857c";
+ fsType = "btrfs";
+ options = ["subvol=nix"];
+ };
- fileSystems."/boot" = {
- device = "/dev/disk/by-uuid/7498-1041";
- fsType = "vfat";
- options = [
- "fmask=0022"
- "dmask=0022"
- ];
- };
+ fileSystems."/boot" = {
+ device = "/dev/disk/by-uuid/7498-1041";
+ fsType = "vfat";
+ options = [
+ "fmask=0022"
+ "dmask=0022"
+ ];
+ };
- swapDevices = [
- {device = "/dev/disk/by-uuid/3a9c8feb-74f7-47f3-8736-82f3b9d35791";}
- ];
+ swapDevices = [
+ {device = "/dev/disk/by-uuid/3a9c8feb-74f7-47f3-8736-82f3b9d35791";}
+ ];
- # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
- # (the default) this is the recommended approach. When using systemd-networkd it's
- # still possible to use this option, but it's recommended to use it in conjunction
- # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
- networking.useDHCP = lib.mkDefault true;
- # networking.interfaces.enp44s0.useDHCP = lib.mkDefault true;
- # networking.interfaces.wlo1.useDHCP = lib.mkDefault true;
+ # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+ # (the default) this is the recommended approach. When using systemd-networkd it's
+ # still possible to use this option, but it's recommended to use it in conjunction
+ # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+ networking.useDHCP = lib.mkDefault true;
+ # networking.interfaces.enp44s0.useDHCP = lib.mkDefault true;
+ # networking.interfaces.wlo1.useDHCP = lib.mkDefault true;
- nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
- hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+ hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}
diff --git a/home.nix b/home.nix
@@ -32,6 +32,7 @@
};
home.packages = with pkgs; [
+ cargo
(catppuccin-kde.override {
flavour = ["mocha"];
accents = ["mauve"];
@@ -70,6 +71,7 @@
proton-pass
protonmail-bridge
qalculate-qt
+ rustc
sageWithDoc
sarasa-gothic
sequoia-sq
diff --git a/starship.nix b/starship.nix
@@ -1,42 +1,43 @@
{
- config,
- lib,
- pkgs,
- ...
+ config,
+ lib,
+ pkgs,
+ ...
}: {
- programs.starship = {
- enable = true;
- settings = {
- format = lib.concatStrings [
- "$username"
- "$line_break"
- "$character"
- ];
- right_format = "$git_branch$directory";
- continuation_prompt = "[> ](fg:overlay1)";
- username = {
- format = "[$user]($style) says:";
- style_user = "bold fg:mauve";
- style_root = "bold fg:mauve";
- show_always = true;
- };
- character = {
- success_symbol = "[>](bold fg:green)";
- error_symbol = "[>](bold fg:red)";
- vimcmd_symbol = "[<](bold fg:green)";
- vimcmd_replace_one_symbol = "[<](bold fg:lavender)";
- vimcmd_replace_symbol = "[<](bold fg:lavender)";
- vimcmd_visual_symbol = "[<](bold fg:yellow)";
- };
- git_branch = {
- format = "[( $branch of)]($style)";
- style = "fg:overlay1";
- };
- directory = {
- format = "[ $path]($style)[( $read_only)]($read_only_style)";
- style = "fg:overlay1";
- read_only_style = "fg:overlay1";
- };
- };
- };
+ programs.starship = {
+ enable = true;
+ settings = {
+ format =
+ lib.concatStrings [
+ "$username"
+ "$line_break"
+ "$character"
+ ];
+ right_format = "$git_branch$directory";
+ continuation_prompt = "[> ](fg:overlay1)";
+ username = {
+ format = "[$user]($style) says:";
+ style_user = "bold fg:mauve";
+ style_root = "bold fg:mauve";
+ show_always = true;
+ };
+ character = {
+ success_symbol = "[>](bold fg:green)";
+ error_symbol = "[>](bold fg:red)";
+ vimcmd_symbol = "[<](bold fg:green)";
+ vimcmd_replace_one_symbol = "[<](bold fg:lavender)";
+ vimcmd_replace_symbol = "[<](bold fg:lavender)";
+ vimcmd_visual_symbol = "[<](bold fg:yellow)";
+ };
+ git_branch = {
+ format = "[( $branch of)]($style)";
+ style = "fg:overlay1";
+ };
+ directory = {
+ format = "[ $path]($style)[( $read_only)]($read_only_style)";
+ style = "fg:overlay1";
+ read_only_style = "fg:overlay1";
+ };
+ };
+ };
}
diff --git a/vesktop.nix b/vesktop.nix
@@ -1,58 +1,58 @@
{
- config,
- lib,
- pkgs,
- inputs,
- ...
+ 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;
+ 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
@@ -26,6 +26,7 @@
package-version-server
prettier
ruff
+ rust-analyzer
svelte-language-server
tailwindcss-language-server
taplo
