tweak: shuffled options around
This commit is contained in:
parent
fc17614ea6
commit
bfec5470bd
4 changed files with 82 additions and 111 deletions
|
|
@ -23,88 +23,30 @@
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|
||||||
# Boot/GRUB options
|
# polkit
|
||||||
boot = {
|
security.polkit = {
|
||||||
#bootspec.enable = true;
|
|
||||||
consoleLogLevel = 3;
|
|
||||||
initrd = {
|
|
||||||
verbose = false;
|
|
||||||
systemd = {
|
|
||||||
enable = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
kernelParams = [
|
|
||||||
# grub kernel parameters, set to prevent excessive output on boot
|
|
||||||
"vga=current" # use current video adapater
|
|
||||||
"splash" # unsure ?
|
|
||||||
"quiet" # quiet log level
|
|
||||||
"loglevel=3" # minimal output on boot
|
|
||||||
"udev.log_priority=3" # more minimising of output on boot
|
|
||||||
"rd.systemd.show_status=false" # unsure ?
|
|
||||||
"rd.udev.log_level=0" # more minimising of output on boot
|
|
||||||
"boot.shell_on_fail" # reboots to basic uefi shell on boot failure
|
|
||||||
"i915.fastboot=1" # unsure ?
|
|
||||||
"plymouth.debug" # I NEED ANSWERS
|
|
||||||
"plymouth.use-simpledrm" # tweak to allow plymouth animations to run smoother
|
|
||||||
"plymouth.ignore-serial-consoles" # unsure ?
|
|
||||||
];
|
|
||||||
loader = {
|
|
||||||
timeout = lib.mkDefault 5; # 5 second timeout to default selection
|
|
||||||
};
|
|
||||||
plymouth = {
|
|
||||||
# enables plymouth boot animations
|
|
||||||
enable = true;
|
|
||||||
extraConfig = "ShowDelay=0";
|
|
||||||
themePackages = with pkgs; [
|
|
||||||
(adi1090x-plymouth-themes.override {
|
|
||||||
selected_themes = [ "circle" ];
|
|
||||||
})
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# login manager
|
|
||||||
services.displayManager.regreet = {
|
|
||||||
enable = true;
|
enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
# polkit
|
# session management
|
||||||
security.polkit = {
|
environment.variables = {
|
||||||
|
XDG_SESSION_TYPE = "wayland";
|
||||||
|
};
|
||||||
|
services.displayManager.regreet = {
|
||||||
enable = true;
|
enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
# disk management
|
# disk management
|
||||||
services.udisks2.enable = true;
|
services.udisks2.enable = true;
|
||||||
programs.gnome-disks.enable = true;
|
programs.gnome-disks.enable = true;
|
||||||
|
environment.systemPackages = with pkgs; [ gparted ];
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
|
|
||||||
# disk management pkgs
|
|
||||||
gparted
|
|
||||||
udiskie
|
|
||||||
|
|
||||||
];
|
|
||||||
|
|
||||||
environment.variables = {
|
|
||||||
XDG_SESSION_TYPE = "wayland";
|
|
||||||
};
|
|
||||||
|
|
||||||
home-manager.users.serenity = {
|
home-manager.users.serenity = {
|
||||||
|
|
||||||
# password prompts
|
# password prompts
|
||||||
services.gnome-keyring.enable = true;
|
services.gnome-keyring.enable = true;
|
||||||
|
|
||||||
# disk automount
|
# more desktop applications
|
||||||
services.udiskie = {
|
|
||||||
enable = true;
|
|
||||||
tray = "always";
|
|
||||||
notify = true;
|
|
||||||
automount = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
|
|
||||||
# more desktop applications
|
|
||||||
gnome-calculator # simple calculator
|
gnome-calculator # simple calculator
|
||||||
gnome-secrets # password manager
|
gnome-secrets # password manager
|
||||||
file-roller # archive manager
|
file-roller # archive manager
|
||||||
|
|
@ -112,10 +54,10 @@
|
||||||
nautilus # file manager
|
nautilus # file manager
|
||||||
swayimg # image viewer
|
swayimg # image viewer
|
||||||
zathura # pdf viewer
|
zathura # pdf viewer
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -49,23 +49,23 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
||||||
# other modules to import
|
|
||||||
imports = [ ];
|
|
||||||
|
|
||||||
# set hostname
|
# set hostname
|
||||||
networking.hostName = "hades";
|
networking.hostName = "hades";
|
||||||
|
|
||||||
# bootloader settings
|
# bootloader settings
|
||||||
boot.loader = {
|
boot = {
|
||||||
systemd-boot.enable = true;
|
loader = {
|
||||||
efi.canTouchEfiVariables = true;
|
systemd-boot.enable = true;
|
||||||
|
efi.canTouchEfiVariables = true;
|
||||||
|
timeout = lib.mkDefault 5;
|
||||||
|
};
|
||||||
|
initrd.systemd.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
# supported filesystems at boot
|
# supported filesystems at boot
|
||||||
boot.supportedFilesystems = [
|
boot.supportedFilesystems = [
|
||||||
"vfat"
|
"vfat"
|
||||||
"ext4"
|
"ext4"
|
||||||
#"ntfs"
|
|
||||||
];
|
];
|
||||||
|
|
||||||
# enable printing support
|
# enable printing support
|
||||||
|
|
|
||||||
|
|
@ -31,17 +31,10 @@
|
||||||
# host module declaration
|
# host module declaration
|
||||||
flake.nixosModules.usb-configuration =
|
flake.nixosModules.usb-configuration =
|
||||||
|
|
||||||
{
|
{ pkgs, lib, ... }:
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
||||||
# other modules to import
|
|
||||||
imports = [ ];
|
|
||||||
|
|
||||||
# set hostname
|
# set hostname
|
||||||
networking.hostName = "serenityos";
|
networking.hostName = "serenityos";
|
||||||
|
|
||||||
|
|
@ -49,7 +42,9 @@
|
||||||
boot.loader = {
|
boot.loader = {
|
||||||
systemd-boot.enable = true;
|
systemd-boot.enable = true;
|
||||||
efi.canTouchEfiVariables = true;
|
efi.canTouchEfiVariables = true;
|
||||||
|
timeout = lib.mkDefault 5;
|
||||||
};
|
};
|
||||||
|
boot.initrd.systemd.enable = true;
|
||||||
|
|
||||||
# supported filesystems at boot
|
# supported filesystems at boot
|
||||||
boot.supportedFilesystems = [
|
boot.supportedFilesystems = [
|
||||||
|
|
@ -58,9 +53,8 @@
|
||||||
"ntfs"
|
"ntfs"
|
||||||
];
|
];
|
||||||
|
|
||||||
# specifies x64 uArch
|
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -10,22 +10,67 @@
|
||||||
{
|
{
|
||||||
|
|
||||||
# other modules to load
|
# other modules to load
|
||||||
imports = [ ];
|
imports = [ inputs.home-manager.nixosModules.home-manager ];
|
||||||
|
|
||||||
|
# don't touch this
|
||||||
|
system.stateVersion = lib.mkDefault "24.11";
|
||||||
|
documentation.dev.enable = true;
|
||||||
|
|
||||||
|
# plymouth settings
|
||||||
|
boot = {
|
||||||
|
plymouth = {
|
||||||
|
enable = true;
|
||||||
|
extraConfig = "ShowDelay=0";
|
||||||
|
themePackages = with pkgs; [
|
||||||
|
(adi1090x-plymouth-themes.override {
|
||||||
|
selected_themes = [ "circle" ];
|
||||||
|
})
|
||||||
|
];
|
||||||
|
};
|
||||||
|
# kernel and boot settings for plymouth
|
||||||
|
initrd.verbose = false;
|
||||||
|
consoleLogLevel = 3;
|
||||||
|
kernelParams = [
|
||||||
|
# grub kernel parameters, set to prevent excessive output on boot
|
||||||
|
"vga=current" # use current video adapater
|
||||||
|
"splash" # unsure ?
|
||||||
|
"quiet" # quiet log level
|
||||||
|
"loglevel=3" # minimal output on boot
|
||||||
|
"udev.log_priority=3" # more minimising of output on boot
|
||||||
|
"rd.systemd.show_status=false" # unsure ?
|
||||||
|
"rd.udev.log_level=0" # more minimising of output on boot
|
||||||
|
"boot.shell_on_fail" # reboots to basic uefi shell on boot failure
|
||||||
|
"i915.fastboot=1" # unsure ?
|
||||||
|
"plymouth.debug" # I NEED ANSWERS
|
||||||
|
"plymouth.use-simpledrm" # tweak to allow plymouth animations to run smoother
|
||||||
|
"plymouth.ignore-serial-consoles" # unsure ?
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
# extra features
|
# extra features
|
||||||
nix.settings.experimental-features = [
|
nix.settings.experimental-features = [
|
||||||
|
|
||||||
# flake based config requires flakes
|
# flake based config requires flakes
|
||||||
"flakes"
|
"flakes"
|
||||||
|
|
||||||
#fancier nix usage
|
#fancier nix usage
|
||||||
"nix-command"
|
"nix-command"
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|
||||||
# compresses half the ram for use as swap
|
# compresses half the ram for use as swap
|
||||||
zramSwap.enable = true;
|
zramSwap.enable = true;
|
||||||
|
|
||||||
|
# configures disk automount service
|
||||||
|
home-manager.users.serenity = {
|
||||||
|
services.udiskie = {
|
||||||
|
enable = true;
|
||||||
|
tray = "always";
|
||||||
|
notify = true;
|
||||||
|
automount = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
# meanjin time
|
||||||
|
time.timeZone = lib.mkDefault "Australia/Brisbane";
|
||||||
|
|
||||||
# locale settings
|
# locale settings
|
||||||
i18n = {
|
i18n = {
|
||||||
defaultLocale = "en_AU.UTF-8";
|
defaultLocale = "en_AU.UTF-8";
|
||||||
|
|
@ -35,13 +80,6 @@
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
# meanjin time
|
|
||||||
time.timeZone = lib.mkDefault "Australia/Brisbane";
|
|
||||||
|
|
||||||
# don't touch this
|
|
||||||
system.stateVersion = lib.mkDefault "24.11";
|
|
||||||
documentation.dev.enable = true;
|
|
||||||
|
|
||||||
# nixpkgs settings
|
# nixpkgs settings
|
||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
# allows broken and ideologically impure packages
|
# allows broken and ideologically impure packages
|
||||||
|
|
@ -53,26 +91,23 @@
|
||||||
overlays = [ ];
|
overlays = [ ];
|
||||||
};
|
};
|
||||||
|
|
||||||
programs = {
|
# for encryption
|
||||||
# necessary terminal programs
|
programs.gnupg.agent = {
|
||||||
gnupg.agent = {
|
enable = true;
|
||||||
enable = true;
|
enableSSHSupport = true;
|
||||||
enableSSHSupport = true;
|
#pinentryPackage = [ ];
|
||||||
#pinentryPackage = [ ];
|
|
||||||
};
|
|
||||||
# binary support
|
|
||||||
nix-ld.enable = true;
|
|
||||||
appimage = {
|
|
||||||
enable = true;
|
|
||||||
binfmt = true;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# binary support
|
||||||
# installs a stub elf loader to print an error
|
# installs a stub elf loader to print an error
|
||||||
# message in the event that a user attempts
|
# message in the event that a user attempts
|
||||||
# to run an elf binary not compiled for nixos.
|
# to run an elf binary not compiled for nixos.
|
||||||
environment.stub-ld.enable = true;
|
environment.stub-ld.enable = true;
|
||||||
|
programs.nix-ld.enable = true;
|
||||||
|
programs.appimage = {
|
||||||
|
enable = true;
|
||||||
|
binfmt = true;
|
||||||
|
};
|
||||||
# core packages to include in base system
|
# core packages to include in base system
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue