commit 0b3d629d2c382a7f5fee443b99c8d664add0286b parent 08c429c2c3a4d610d5153ec7eae3f744bdfd8bd8 Author: Toni Brown <me@tb148.net> Date: Fri, 1 May 2026 20:52:19 +0800 restructure local config Diffstat:
19 files changed, 49 insertions(+), 54 deletions(-)
diff --git a/local/catppuccin/default.nix b/local/catppuccin/default.nix @@ -1,13 +0,0 @@ -{config, ...}: { - catppuccin.enable = true; - catppuccin.flavor = "mocha"; - catppuccin.accent = "mauve"; - - catppuccin.cursors.enable = true; - xdg.icons.fallbackCursorThemes = ["catppuccin-${config.catppuccin.flavor}-${config.catppuccin.accent}-cursors"]; - - catppuccin.sddm = { - font = "等距更纱黑体 SC"; - fontSize = "12"; - }; -} diff --git a/local/default.nix b/local/default.nix @@ -1,26 +1,11 @@ # Edit this configuration file to define what should be installed on # 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, - pkgs, - inputs, - ... -}: { +{...}: { imports = [ - ./boot/. - ./catppuccin/. - ./desktop/. - ./filesystem/. - ./font/. - ./hardware/. - ./localization/. - ./networking/. - ./nix/. ./program/. - ./security/. ./service/. - ./user/. + ./system/. ./hardware-configuration.nix ]; diff --git a/local/desktop/default.nix b/local/desktop/default.nix @@ -1,7 +0,0 @@ -{...}: { - services.desktopManager.plasma6.enable = true; - services.displayManager.sddm = { - enable = true; - wayland.enable = true; - }; -} diff --git a/local/localization/default.nix b/local/localization/default.nix @@ -1,4 +0,0 @@ -{...}: { - i18n.defaultLocale = "zh_CN.UTF-8"; - services.xserver.xkb.layout = "cn(altgr-pinyin)"; -} diff --git a/local/security/default.nix b/local/security/default.nix @@ -1,4 +0,0 @@ -{inputs, ...}: { - security.sudo.enable = false; - security.sudo-rs.enable = true; -} diff --git a/local/boot/default.nix b/local/system/boot/default.nix diff --git a/local/boot/limine/default.nix b/local/system/boot/limine/default.nix diff --git a/local/system/catppuccin/default.nix b/local/system/catppuccin/default.nix @@ -0,0 +1,8 @@ +{config, ...}: { + catppuccin.enable = true; + catppuccin.flavor = "mocha"; + catppuccin.accent = "mauve"; + + catppuccin.cursors.enable = true; + xdg.icons.fallbackCursorThemes = ["catppuccin-${config.catppuccin.flavor}-${config.catppuccin.accent}-cursors"]; +} diff --git a/local/system/default.nix b/local/system/default.nix @@ -0,0 +1,19 @@ +{...}: { + imports = [ + ./boot/. + ./catppuccin/. + ./desktop/. + ./filesystem/. + ./font/. + ./hardware/. + ./networking/. + ./nix/. + ./user/. + ]; + + i18n.defaultLocale = "zh_CN.UTF-8"; + services.xserver.xkb.layout = "cn(altgr-pinyin)"; + + security.sudo.enable = false; + security.sudo-rs.enable = true; +} diff --git a/local/system/desktop/default.nix b/local/system/desktop/default.nix @@ -0,0 +1,11 @@ +{...}: { + services.desktopManager.plasma6.enable = true; + services.displayManager.sddm = { + enable = true; + wayland.enable = true; + }; + catppuccin.sddm = { + font = "等距更纱黑体 SC"; + fontSize = "12"; + }; +} diff --git a/local/filesystem/default.nix b/local/system/filesystem/default.nix diff --git a/local/font/default.nix b/local/system/font/default.nix diff --git a/local/hardware/default.nix b/local/system/hardware/default.nix diff --git a/local/hardware/nvidia/default.nix b/local/system/hardware/nvidia/default.nix diff --git a/local/networking/default.nix b/local/system/networking/default.nix diff --git a/local/networking/mihomo/default.nix b/local/system/networking/mihomo/default.nix diff --git a/local/nix/default.nix b/local/system/nix/default.nix diff --git a/local/system/user/default.nix b/local/system/user/default.nix @@ -0,0 +1,9 @@ +{...}: { + services.userborn.enable = true; + users.users.tb148 = { + isNormalUser = true; + home = "/home/tb148"; + description = "Toni Brown"; + extraGroups = ["wheel" "boinc" "docker"]; + }; +} diff --git a/local/user/default.nix b/local/user/default.nix @@ -1,9 +0,0 @@ -{pkgs, ...}: { - services.userborn.enable = true; - users.users.tb148 = { - isNormalUser = true; - home = "/home/tb148"; - description = "Toni Brown"; - extraGroups = ["wheel" "boinc" "docker"]; - }; -}