refactoring
This commit is contained in:
parent
4311082a72
commit
c9804239d3
10 changed files with 214 additions and 268 deletions
|
|
@ -6,7 +6,7 @@
|
|||
...
|
||||
}: {
|
||||
environment.systemPackages = with pkgs; [
|
||||
# xorg.xkill
|
||||
# macchina
|
||||
bat
|
||||
bottom
|
||||
cifs-utils
|
||||
|
|
@ -14,64 +14,22 @@
|
|||
exfatprogs
|
||||
git
|
||||
inputs.helix.packages.${pkgs.system}.default
|
||||
# libthai
|
||||
localsend
|
||||
# macchina
|
||||
neofetch
|
||||
mesa
|
||||
neofetch
|
||||
ouch
|
||||
pueue
|
||||
ripgrep
|
||||
rustdesk
|
||||
screen
|
||||
skim
|
||||
tree
|
||||
wezterm
|
||||
# wget
|
||||
# yt-dlp
|
||||
# zellij
|
||||
pueue
|
||||
wget
|
||||
zstd
|
||||
];
|
||||
programs.partition-manager.enable = lib.mkDefault true;
|
||||
|
||||
services.tailscale.enable = true;
|
||||
services.tailscale.package = pkgs.tailscale;
|
||||
services.resolved.enable = true;
|
||||
|
||||
services.openssh.enable = true;
|
||||
services.flatpak.enable = lib.mkDefault true;
|
||||
services.printing.enable = lib.mkDefault true;
|
||||
|
||||
services.smartd.enable = true;
|
||||
services.btrfs.autoScrub.enable = lib.mkDefault true;
|
||||
|
||||
environment.variables = {
|
||||
EDITOR = "hx";
|
||||
VISUAL = "hx";
|
||||
PAGER = "bat";
|
||||
SKIM_DEFAULT_COMMAND = "rg --files";
|
||||
};
|
||||
|
||||
environment.sessionVariables = {
|
||||
EDITOR = "hx";
|
||||
VISUAL = "hx";
|
||||
PAGER = "bat";
|
||||
SKIM_DEFAULT_COMMAND = "rg --files";
|
||||
};
|
||||
|
||||
hardware.enableAllFirmware = true;
|
||||
hardware.bluetooth.enable = lib.mkDefault true;
|
||||
|
||||
boot.loader.systemd-boot.enable = lib.mkDefault true;
|
||||
boot.loader.efi.canTouchEfiVariables = lib.mkDefault true;
|
||||
boot.loader.timeout = 1;
|
||||
boot.supportedFilesystems = ["ntfs"];
|
||||
|
||||
networking.networkmanager.enable = true;
|
||||
|
||||
# TODO check why this???
|
||||
# networking.firewall.enable = true;
|
||||
|
||||
services.xserver.enable = lib.mkDefault true;
|
||||
services.xserver.xkb.layout = "us";
|
||||
systemd.services.display-manager.restartIfChanged = false;
|
||||
|
|
@ -83,6 +41,20 @@
|
|||
gwenview
|
||||
];
|
||||
|
||||
services.openssh.enable = true;
|
||||
# services.flatpak.enable = lib.mkDefault true;
|
||||
services.printing.enable = lib.mkDefault true;
|
||||
|
||||
networking.networkmanager.enable = true;
|
||||
services.tailscale.enable = true;
|
||||
services.tailscale.package = pkgs.tailscale;
|
||||
services.resolved.enable = true;
|
||||
networking.interfaces.tailscale0.useDHCP = false;
|
||||
|
||||
services.smartd.enable = true;
|
||||
services.btrfs.autoScrub.enable = lib.mkDefault true;
|
||||
|
||||
hardware.pulseaudio.enable = lib.mkDefault false;
|
||||
security.rtkit.enable = true;
|
||||
services.pipewire = {
|
||||
enable = lib.mkDefault true;
|
||||
|
|
@ -91,7 +63,6 @@
|
|||
pulse.enable = true;
|
||||
wireplumber.enable = lib.mkDefault true;
|
||||
};
|
||||
hardware.pulseaudio.enable = lib.mkDefault false;
|
||||
|
||||
security.sudo-rs.enable = true;
|
||||
# security.sudo-rs.extraRules = [{
|
||||
|
|
@ -101,25 +72,6 @@
|
|||
# groups = [ "wheel" ];
|
||||
# }];
|
||||
|
||||
nix.settings = {
|
||||
experimental-features = "nix-command flakes";
|
||||
auto-optimise-store = true;
|
||||
trusted-users = ["root" "@wheel"];
|
||||
};
|
||||
nixpkgs.config = {allowUnfree = true;};
|
||||
|
||||
systemd.extraConfig = ''
|
||||
DefaultTimeoutStopSec=15s
|
||||
'';
|
||||
|
||||
time.timeZone = "US/Pacific";
|
||||
i18n.defaultLocale = "en_US.utf8";
|
||||
i18n.supportedLocales = ["all"];
|
||||
i18n.extraLocaleSettings = {
|
||||
LC_CTYPE = "en_US.UTF-8";
|
||||
LC_MESSAGES = "en_US.UTF-8";
|
||||
LC_ALL = "en_US.UTF-8";
|
||||
};
|
||||
i18n.inputMethod = {
|
||||
enabled = "fcitx5";
|
||||
fcitx5.addons = with pkgs; [
|
||||
|
|
@ -129,8 +81,49 @@
|
|||
];
|
||||
};
|
||||
|
||||
environment.variables = {
|
||||
EDITOR = "hx";
|
||||
VISUAL = "hx";
|
||||
PAGER = "bat";
|
||||
SKIM_DEFAULT_COMMAND = "rg --files";
|
||||
};
|
||||
environment.sessionVariables = {
|
||||
EDITOR = "hx";
|
||||
VISUAL = "hx";
|
||||
PAGER = "bat";
|
||||
SKIM_DEFAULT_COMMAND = "rg --files";
|
||||
};
|
||||
|
||||
# time.timeZone = "US/Pacific";
|
||||
services.automatic-timezoned.enable = lib.mkDefault true;
|
||||
i18n.defaultLocale = "en_US.utf8";
|
||||
i18n.supportedLocales = ["all"];
|
||||
i18n.extraLocaleSettings = {
|
||||
LC_CTYPE = "en_US.UTF-8";
|
||||
LC_MESSAGES = "en_US.UTF-8";
|
||||
LC_ALL = "en_US.UTF-8";
|
||||
};
|
||||
|
||||
boot.loader.systemd-boot.enable = lib.mkDefault true;
|
||||
boot.loader.efi.canTouchEfiVariables = lib.mkDefault true;
|
||||
boot.loader.timeout = 1;
|
||||
boot.supportedFilesystems = ["ntfs"];
|
||||
systemd.extraConfig = ''
|
||||
DefaultTimeoutStopSec=15s
|
||||
'';
|
||||
|
||||
hardware.enableAllFirmware = true;
|
||||
hardware.bluetooth.enable = lib.mkDefault true;
|
||||
|
||||
imports = [(modulesPath + "/installer/scan/not-detected.nix")];
|
||||
|
||||
nix.settings = {
|
||||
experimental-features = "nix-command flakes";
|
||||
auto-optimise-store = true;
|
||||
trusted-users = ["root" "@wheel"];
|
||||
};
|
||||
nixpkgs.config = {allowUnfree = true;};
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
system.stateVersion = lib.mkDefault "23.05";
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue