fern/flock
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move config to common.nix

Browse source
This commit is contained in:
Fern Garden 2025-07-02 14:46:40 +08:00
parent 4dfa79ae28
commit e553273437
2 changed files with 15 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

73
configuration/desktop.nix
View file

@ -7,18 +7,6 @@
}:
{
# NixOS version.
system.stateVersion = "25.05";
# Enable flakes.
nix.settings.experimental-features = [
"nix-command"
"flakes"
];
# Allow unfree packages.
nixpkgs.config.allowUnfree = true;
# Configure the bootloader.
boot = {
# Enable secure boot.
@ -54,36 +42,9 @@
# Enable smart card support (for YubiKey).
services.pcscd.enable = true;
# Define hostname.
networking.hostName = "muskduck";
# Enable networking.
networking.networkmanager.enable = true;
# Set time zone.
time.timeZone = "Australia/Perth";
# Select internationalisation properties.
i18n.defaultLocale = "en_AU.UTF-8";
i18n.extraLocaleSettings = {
LC_ADDRESS = "en_AU.UTF-8";
LC_IDENTIFICATION = "en_AU.UTF-8";
LC_MEASUREMENT = "en_AU.UTF-8";
LC_MONETARY = "en_AU.UTF-8";
LC_NAME = "en_AU.UTF-8";
LC_NUMERIC = "en_AU.UTF-8";
LC_PAPER = "en_AU.UTF-8";
LC_TELEPHONE = "en_AU.UTF-8";
LC_TIME = "en_AU.UTF-8";
};
# Configure keymap in X11.
services.xserver.xkb = {
layout = "us";
variant = "";
};
# Define a user account.
users.users.fern = {
isNormalUser = true;
@ -150,35 +111,21 @@
# Install some packages.
programs.steam.enable = true;
programs.git.enable = true;
programs.firefox.enable = true;
programs.neovim = {
enable = true;
defaultEditor = true; # Use neovim as default terminal editor.
configure = {
customRC = ''
set expandtab
set shiftwidth=2
set tabstop=8
set softtabstop=2
set number
colorscheme kanagawa-dragon
'';
packages.myVimPackage = with pkgs.vimPlugins; {
start = [ kanagawa-nvim ];
};
};
};
environment.systemPackages = with pkgs; [
adwsteamgtk
ansible
celluloid
discord
feishin0_16_0.feishin
ghostty
gimp3
glabels-qt
gnome-tweaks
gnomeExtensions.auto-move-windows
gnomeExtensions.rounded-window-corners-reborn
gnomeExtensions.smile-complementary-extension
jellyfin-media-player
libreoffice
nixd # nix language server
@ -187,13 +134,8 @@
protonmail-desktop
signal-desktop
smile
yubioath-flutter
gnomeExtensions.rounded-window-corners-reborn
gnomeExtensions.smile-complementary-extension
gnomeExtensions.auto-move-windows
gnome-tweaks
vscodium
ghostty
yubioath-flutter
# PrismLauncher with temurin jre.
(prismlauncher.override {
@ -215,9 +157,6 @@
# Enable gamemode service
programs.gamemode.enable = true;
# Enable avahi hostname resolution.
services.avahi.nssmdns4 = true;
# Enable CUPS to print documents.
services.printing.enable = true;

75
configuration/vm.nix
View file

@ -1,51 +1,10 @@
{
pkgs,
...
}:
{
# NixOS version.
system.stateVersion = "25.05";
# Enable flakes.
nix.settings.experimental-features = [
"nix-command"
"flakes"
];
# Allow unfree packages.
nixpkgs.config.allowUnfree = true;
# Configure the bootloader.
boot.loader.grub = {
enable = true;
device = "/dev/sda";
};
# Set time zone.
time.timeZone = "Australia/Perth";
# Select internationalisation properties.
i18n.defaultLocale = "en_AU.UTF-8";
i18n.extraLocaleSettings = {
LC_ADDRESS = "en_AU.UTF-8";
LC_IDENTIFICATION = "en_AU.UTF-8";
LC_MEASUREMENT = "en_AU.UTF-8";
LC_MONETARY = "en_AU.UTF-8";
LC_NAME = "en_AU.UTF-8";
LC_NUMERIC = "en_AU.UTF-8";
LC_PAPER = "en_AU.UTF-8";
LC_TELEPHONE = "en_AU.UTF-8";
LC_TIME = "en_AU.UTF-8";
};
# Configure keymap in X11.
services.xserver.xkb = {
layout = "us";
variant = "";
};
# Define a user account.
users.users.docker = {
isNormalUser = true;
@ -53,35 +12,19 @@
"wheel"
"docker"
];
};
# Install some packages.
programs.git.enable = true;
programs.neovim = {
enable = true;
defaultEditor = true; # Use neovim as default terminal editor.
configure = {
customRC = ''
set expandtab
set shiftwidth=2
set tabstop=8
set softtabstop=2
set number
colorscheme kanagawa-dragon
'';
packages.myVimPackage = with pkgs.vimPlugins; {
start = [ kanagawa-nvim ];
};
};
openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIETPyuxUVEmYyEW6PVC6BXqkhULHd/RvMm8fMbYhjTMV fern@muskduck"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKzW4epTmK01kGVXcuAXUNJQPltnogf4uab9FA5m8S3n fern@pardalote"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBEJYq1fMxVOzCMfE/td6DtWS8nUk76U9seYD3Z9RYAz u0_a399@fairywren"
"sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIMoJvPcUJDVVzO4dHROCFNlgJdDZSP5xyPx2s40zcx5QAAAABHNzaDo= YubiKey5NFC"
];
};
# Enable SSH server
services.openssh.enable = true;
# Enable avahi hostname resolution.
services.avahi = {
# Enable docker
virtualisation.docker = {
enable = true;
nssmdns4 = true;
};
}