worble/nixos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor and modularize base.nix futher; use default.nix when possible

Browse Source
This commit is contained in:
worble
2025-09-26 11:49:00 +01:00
parent db9826339f
commit 6a45fca8d5
15 changed files with 152 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
configuration/base/default.nix Normal file
View File

@@ -0,0 +1,13 @@
{ ... }:
{
imports = [
./fonts.nix
./kde.nix
./location-time.nix
./networking.nix
./nix-settings.nix
./pipewire.nix
./programs.nix
];
}

14
configuration/base/location-time.nix Normal file
View File

@@ -0,0 +1,14 @@
{ ... }:
{
# Set your time zone.
# time.timeZone = "Europe/London";
services.automatic-timezoned.enable = true;
services.chrony = {
enable = true;
};
services.geoclue2 = {
enable = true;
geoProviderUrl = "https://api.beacondb.net/v1/geolocate";
};
}

26
configuration/base/networking.nix Normal file
View File

@@ -0,0 +1,26 @@
{ pkgs, ... }:
{
# networking.hostName = "nixos"; # Define your hostname.
# Pick only one of the below networking options.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
networking.networkmanager = {
# Easiest to use and most distros use this by default.
enable = true;
wifi.powersave = false;
};
# Configure network proxy if necessary
# networking.proxy.default = "http://user:password@proxy:port/";
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
# Enable CUPS to print documents.
# services.printing.enable = true;
services.mullvad-vpn = {
enable = true;
package = pkgs.mullvad-vpn;
};
# services.resolved.enable = true;
}

35
configuration/base/pipewire.nix Normal file
View File

@@ -0,0 +1,35 @@
{ ... }:
{
# Enable sound.
# hardware.pulseaudio.enable = true;
# OR
services.pipewire = {
enable = true;
pulse.enable = true;
extraConfig.pipewire-pulse = {
"10-prevent-agc" = {
"pulse.rules" = [
{
matches = [
{ "application.process.binary" = "chrome"; }
{ "application.process.binary" = "Discord"; }
{ "application.process.binary" = "teams"; }
{ "application.process.binary" = "electron"; }
{ "application.process.binary" = "skypeforlinux"; }
{ "application.process.binary" = "telegram-desktop"; }
{ "application.process.binary" = "vivaldi"; }
{ "application.process.binary" = "chromium"; }
{ "application.process.binary" = "zoom"; }
];
actions = {
quirks = [
"block-source-volume"
];
};
}
];
};
};
};
}

37
configuration/base/programs.nix Normal file
View File

@@ -0,0 +1,37 @@
{ pkgs, ... }:
{
security.sudo-rs.enable = true;
services.fwupd.enable = true;
services.flatpak.enable = true;
programs.bash.blesh.enable = true;
programs.fish.enable = true;
# List packages installed in system profile. To search, run:
# $ nix search wget
environment.systemPackages = with pkgs;
[
# utils
uutils-coreutils-noprefix
vim
curl
inetutils
dig
rar
zstd
xz
p7zip
libva-utils
smartmontools
appimage-run
# dicts
nuspell
hunspellDicts.en-gb-large
# For cursor in steam?
xsettingsd
xorg.xrdb
];
}

118
configuration/base.nix → configuration/default.nix
View File

@@ -5,130 +5,24 @@
{ pkgs, ... }:
{
imports =
[
./base/nix-settings.nix
./base/fonts.nix
./base/kde.nix
];
imports = [ ./base ];
# Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
boot.kernelPackages = pkgs.linuxPackages_latest;
hardware.bluetooth.enable = true;
hardware.enableRedistributableFirmware = true;
hardware.enableAllFirmware = true;
# Disks / Swap / etc
# swapDevices = [{
# device = "/var/lib/swapfile";
# size = 16 * 1024; # 16 GB
# }];
zramSwap.enable = true; # Creates a zram block device and uses it as a swap device
hardware.bluetooth.enable = true;
hardware.enableRedistributableFirmware = true;
hardware.enableAllFirmware = true;
security.sudo-rs.enable = true;
# networking.hostName = "nixos"; # Define your hostname.
# Pick only one of the below networking options.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
networking.networkmanager = {
# Easiest to use and most distros use this by default.
enable = true;
wifi.powersave = false;
};
# Configure network proxy if necessary
# networking.proxy.default = "http://user:password@proxy:port/";
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
# Enable CUPS to print documents.
# services.printing.enable = true;
# Enable sound.
# hardware.pulseaudio.enable = true;
# OR
services.pipewire = {
enable = true;
pulse.enable = true;
extraConfig.pipewire-pulse = {
"10-prevent-agc" = {
"pulse.rules" = [
{
matches = [
{ "application.process.binary" = "chrome"; }
{ "application.process.binary" = "Discord"; }
{ "application.process.binary" = "teams"; }
{ "application.process.binary" = "electron"; }
{ "application.process.binary" = "skypeforlinux"; }
{ "application.process.binary" = "telegram-desktop"; }
{ "application.process.binary" = "vivaldi"; }
{ "application.process.binary" = "chromium"; }
{ "application.process.binary" = "zoom"; }
];
actions = {
quirks = [
"block-source-volume"
];
};
}
];
};
};
};
services.fstrim.enable = true;
# services.resolved.enable = true;
services.mullvad-vpn = {
enable = true;
package = pkgs.mullvad-vpn;
};
# Set your time zone.
# time.timeZone = "Europe/London";
services.automatic-timezoned.enable = true;
services.chrony = {
enable = true;
};
services.fwupd.enable = true;
services.geoclue2 = {
enable = true;
geoProviderUrl = "https://api.beacondb.net/v1/geolocate";
};
services.flatpak.enable = true;
programs.bash.blesh.enable = true;
programs.fish.enable = true;
# List packages installed in system profile. To search, run:
# $ nix search wget
environment.systemPackages = with pkgs;
[
# utils
uutils-coreutils-noprefix
vim
curl
inetutils
dig
rar
zstd
xz
p7zip
libva-utils
smartmontools
appimage-run
# dicts
nuspell
hunspellDicts.en-gb-large
# For cursor in steam?
xsettingsd
xorg.xrdb
];
# Some programs need SUID wrappers, can be configured further or are
# started in user sessions.

2
devices/deck/home.nix
View File

@@ -5,7 +5,7 @@ let
in
{
imports = [
../../home-manager/base.nix
../../home-manager
../../home-manager/gaming.nix
../../home-manager/development/vscode.nix
];

2
devices/starlite/configuration.nix
View File

@@ -7,7 +7,7 @@
{
imports =
[
../../configuration/base.nix
../../configuration
# Include the results of the hardware scan.
./hardware-configuration.nix
inputs.disko.nixosModules.default

2
devices/starlite/home.nix
View File

@@ -2,7 +2,7 @@
{
imports = [
../../home-manager/base.nix
../../home-manager
../../home-manager/development/vscode.nix
];

2
devices/tuxedo/configuration.nix
View File

@@ -7,7 +7,7 @@
{
imports =
[
../../configuration/base.nix
../../configuration
# Include the results of the hardware scan.
./hardware-configuration.nix
inputs.disko.nixosModules.default

6
devices/tuxedo/home.nix
View File

@@ -2,8 +2,8 @@
{
imports = [
../../home-manager/base.nix
../../home-manager/development/all.nix
../../home-manager
../../home-manager/development
../../home-manager/gaming.nix
../../home-manager/streamlink.nix
];
@@ -79,7 +79,7 @@
gpu-api = "auto";
gpu-context = "auto";
hwdec = "auto";
# screenshot-directory = "/mnt/HDD2/Pictures/";
screenshot-directory = "/mnt/HDD2/Pictures/";
glsl-shaders = "~~/shaders/Anime4K_Clamp_Highlights.glsl:~~/shaders/Anime4K_Restore_CNN_VL.glsl:~~/shaders/Anime4K_Upscale_CNN_x2_VL.glsl:~~/shaders/Anime4K_AutoDownscalePre_x2.glsl:~~/shaders/Anime4K_AutoDownscalePre_x4.glsl:~~/shaders/Anime4K_Upscale_CNN_x2_M.glsl";
};
extraInput = ''

9
home-manager/base/default.nix Normal file
View File

@@ -0,0 +1,9 @@
{ ... }:
{
imports = [
./fonts.nix
./mpv.nix
./terminal.nix
];
}

6
home-manager/base.nix → home-manager/default.nix
View File

@@ -2,10 +2,8 @@
{
imports = [
./base/fonts.nix
./base/terminal.nix
./base/mpv.nix
./firefox/firefox.nix
./base
./firefox
];
home.packages = with pkgs;[

6
home-manager/development/all.nix → home-manager/development/default.nix
View File

@@ -2,10 +2,10 @@
{
imports = [
./vscode.nix
./helix.nix
./dotnet.nix
./sql.nix
./games.nix
./helix.nix
./sql.nix
./vscode.nix
];
}

0
home-manager/firefox/firefox.nix → home-manager/firefox/default.nix
View File