albert/nix
albert/nix
1
0
Fork 0
Code Issues Pull requests Activity Actions

Reorg base NixOS configs

Browse source
This commit is contained in:
albert 2024-05-01 11:11:13 +09:00
parent 971a150b52
commit f6c51505c3
No known key found for this signature in database
GPG key ID: 64F6C4EB46C4543A
5 changed files with 65 additions and 210 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
nixos/common/modules/nixos.nix
View file

@ -1,4 +1,4 @@
{ ... }: { { pkgs, system, stateVersion, ... }: {
nix = { nix = {
settings = { settings = {
auto-optimise-store = true; auto-optimise-store = true;
@ -14,4 +14,28 @@
options = "--delete-older-than 30d"; options = "--delete-older-than 30d";
}; };
}; };
# Select internationalisation properties.
i18n.defaultLocale = "en_US.UTF-8";
i18n.extraLocaleSettings = {
LC_ADDRESS = "en_US.UTF-8";
LC_IDENTIFICATION = "en_US.UTF-8";
LC_MEASUREMENT = "en_US.UTF-8";
LC_MONETARY = "en_US.UTF-8";
LC_NAME = "en_US.UTF-8";
LC_NUMERIC = "en_US.UTF-8";
LC_PAPER = "en_US.UTF-8";
LC_TELEPHONE = "en_US.UTF-8";
LC_TIME = "en_US.UTF-8";
};
# https://github.com/NixOS/nixpkgs/issues/180175#issuecomment-1658731959
systemd.services.NetworkManager-wait-online = {
serviceConfig = {
ExecStart = [ "" "${pkgs.networkmanager}/bin/nm-online -q" ];
};
};
system.stateVersion = stateVersion;
nixpkgs.hostPlatform = system;
} }

47
nixos/common/software/packages.nix
View file

@ -1,47 +0,0 @@
{ pkgs, ... }: {
# List packages installed in system profile
environment.systemPackages = with pkgs; [
tmux # terminal multiplexer
rbw # CLI app for Bitwarden
nfs-utils # nfs network share tools
nixfmt # Formatting nix output
dconf # Required for stylix
ripgrep # Better grep
sbctl # Secureboot Control
wget # WebGet
killall # Killall
curl # Curl - For web requests
neofetch # system information viewer
rsync # copy/sync
git # git!
duf # replacement / prettier UI for df
ncdu # ncurses style browser for du/dust
du-dust # better UI for 'du"
home-manager # manage dotfiles
btop # like htop, but prettier
iftop # interface top - network usage
nload # network load - Network usage graphs
iotop # I/O top viewer - disk r/w, etc
sops # manage secrets
gnupg # GNU Privacy Guard
fx # Pretty print JSON
nodejs # Required by fx
eza # like ls, but prettier
cryptsetup # used to open LUKS devices
parted # Disk partitioner / Formatter
screen # Terminal screen manager
e2fsprogs # disk format utilities, like mkfs.ext4
bat # Like cat, but with syntax highlighting
openssl # Used to generate certs, random strings, etc
tree # CLI directory display software
nmap # network mapping / discovery software
busybox # General linux commands, nslookup, dig, etc
sshpass # ssh password helper
cbonsai # ncurses bonsai tree
busybox # Linux utilities
ethtool # Ethernet troubleshooting
fd # alternative to "Find"
lazygit # Decent Git TUI
fish # Shell
];
}

27
nixos/default.nix
View file

@ -13,9 +13,8 @@
./common/services/opensnitch.nix ./common/services/opensnitch.nix
# Software # Software
./common/software/cli/weechat.nix
./common/software/cli/clean-hm.nix ./common/software/cli/clean-hm.nix
./common/software/packages.nix ./common/software/packages
# NixOS Modules # NixOS Modules
./common/modules/fonts.nix # Font Configs ./common/modules/fonts.nix # Font Configs
@ -28,28 +27,4 @@
] ++ lib.optional (builtins.isString desktop) ./common/desktops/${desktop}; ] ++ lib.optional (builtins.isString desktop) ./common/desktops/${desktop};
programs.fish.enable = true; programs.fish.enable = true;
# Select internationalisation properties.
i18n.defaultLocale = "en_US.UTF-8";
i18n.extraLocaleSettings = {
LC_ADDRESS = "en_US.UTF-8";
LC_IDENTIFICATION = "en_US.UTF-8";
LC_MEASUREMENT = "en_US.UTF-8";
LC_MONETARY = "en_US.UTF-8";
LC_NAME = "en_US.UTF-8";
LC_NUMERIC = "en_US.UTF-8";
LC_PAPER = "en_US.UTF-8";
LC_TELEPHONE = "en_US.UTF-8";
LC_TIME = "en_US.UTF-8";
};
# https://github.com/NixOS/nixpkgs/issues/180175#issuecomment-1658731959
systemd.services.NetworkManager-wait-online = {
serviceConfig = {
ExecStart = [ "" "${pkgs.networkmanager}/bin/nm-online -q" ];
};
};
system.stateVersion = stateVersion;
nixpkgs.hostPlatform = system;
} }

89
nixos/minimal.nix
View file

@ -1,77 +1,22 @@
{ lib, inputs, pkgs, hostname, stateVersion, username, desktop, system, ... }: { { pkgs, hostname, stateVersion, username, inputs, system, ... }: {
imports = [ imports = [
# Modules # Modules
inputs.disko.nixosModules.disko inputs.disko.nixosModules.disko
# Services
./common/services/openssh.nix
./common/services/fail2ban.nix
# Software
./common/software/packages/small.nix
# Services # NixOS Modules
./common/services/openssh.nix ./common/modules/networking.nix # Initial Networking configs
./common/services/fail2ban.nix ./common/modules/nixos.nix # Common NixOS Configurations
# Software
./common/software/cli/clean-hm.nix
# NixOS Modules
./common/modules/networking.nix # Initial Networking configs
./common/modules/nixos.nix # NixOS related items
./common/modules/remote-builders.nix # Add remote builders
./users/${username}
./hosts/${hostname}
] ++ lib.optional (builtins.isString desktop) ./common/desktops/${desktop};
# List packages installed in system profile
environment.systemPackages = with pkgs; [
tmux
dconf
ripgrep
sbctl
wget
killall
curl
rsync
git
bat
duf
ncdu
du-dust
btop
iftop
nload
iotop
sops
gnupg
cryptsetup
parted
screen
sshpass
fd
eza
fish
];
./users/${username}
./hosts/${hostname}
] ++ lib.optional (builtins.isString desktop) ./common/desktops/${desktop};
programs.fish.enable = true; programs.fish.enable = true;
# Select internationalisation properties.
i18n.defaultLocale = "en_US.UTF-8";
i18n.extraLocaleSettings = {
LC_ADDRESS = "en_US.UTF-8";
LC_IDENTIFICATION = "en_US.UTF-8";
LC_MEASUREMENT = "en_US.UTF-8";
LC_MONETARY = "en_US.UTF-8";
LC_NAME = "en_US.UTF-8";
LC_NUMERIC = "en_US.UTF-8";
LC_PAPER = "en_US.UTF-8";
LC_TELEPHONE = "en_US.UTF-8";
LC_TIME = "en_US.UTF-8";
};
# https://github.com/NixOS/nixpkgs/issues/180175#issuecomment-1658731959
systemd.services.NetworkManager-wait-online = {
serviceConfig = {
ExecStart = [ "" "${pkgs.networkmanager}/bin/nm-online -q" ];
};
};
system.stateVersion = stateVersion;
nixpkgs.hostPlatform = system;
} }

86
nixos/small.nix
View file

@ -1,70 +1,28 @@
{ pkgs, hostname, stateVersion, username, inputs, system, ... }: { { pkgs, hostname, stateVersion, username, inputs, system, ... }: {
imports = [ imports = [
# Modules # Modules
inputs.disko.nixosModules.disko inputs.disko.nixosModules.disko
# Services # Services
./common/services/openssh.nix ./common/services/openssh.nix
./common/services/fail2ban.nix ./common/services/fail2ban.nix
./common/services/tailscale.nix ./common/services/tailscale.nix
./common/services/promtail.nix ./common/services/promtail.nix
./common/services/telegraf.nix ./common/services/telegraf.nix
./common/services/gnupg-agent.nix ./common/services/gnupg-agent.nix
# Software # Software
./common/software/cli/clean-hm.nix ./common/software/cli/clean-hm.nix
./common/software/packages/small.nix
# NixOS Modules # NixOS Modules
./common/modules/networking.nix # Initial Networking configs ./common/modules/networking.nix # Initial Networking configs
./common/modules/nixos.nix # Common NixOS Configurations ./common/modules/nixos.nix # Common NixOS Configurations
./common/modules/remote-builders.nix # Add remote builders ./common/modules/remote-builders.nix # Add remote builders
./users/${username}
./hosts/${hostname}
];
# List packages installed in system profile
environment.systemPackages = with pkgs; [
tmux
rbw
dconf
ripgrep
git
bat
eza
duf
gnupg
screen
btop
sshpass
cryptsetup
fd
fish
];
./users/${username}
./hosts/${hostname}
] ++ lib.optional (builtins.isString desktop) ./common/desktops/${desktop};
programs.fish.enable = true; programs.fish.enable = true;
# Select internationalisation properties.
i18n.defaultLocale = "en_US.UTF-8";
i18n.extraLocaleSettings = {
LC_ADDRESS = "en_US.UTF-8";
LC_IDENTIFICATION = "en_US.UTF-8";
LC_MEASUREMENT = "en_US.UTF-8";
LC_MONETARY = "en_US.UTF-8";
LC_NAME = "en_US.UTF-8";
LC_NUMERIC = "en_US.UTF-8";
LC_PAPER = "en_US.UTF-8";
LC_TELEPHONE = "en_US.UTF-8";
LC_TIME = "en_US.UTF-8";
};
# https://github.com/NixOS/nixpkgs/issues/180175#issuecomment-1658731959
systemd.services.NetworkManager-wait-online = {
serviceConfig = {
ExecStart = [ "" "${pkgs.networkmanager}/bin/nm-online -q" ];
};
};
system.stateVersion = stateVersion;
nixpkgs.hostPlatform = system;
} }