Compare commits

..

No commits in common. "main" and "dedicated-settings-file" have entirely different histories.

25 changed files with 256 additions and 413 deletions

View File

@ -27,6 +27,21 @@
};
};
boot.kernelPackages = pkgs.linuxPackages_latest;
# extra enabled kernel modules
boot.kernelModules = [
"sg" # for generic SCSI devices such as /dev/sg0
];
# Kernel parameter on boot
boot.kernelParams = [
"quiet"
"splash"
"psi=1"
"boot_delay=0"
];
# Setup keyfile
boot.initrd.secrets = {
"/crypto_keyfile.bin" = null;

View File

@ -1,44 +1,228 @@
{ config, pkgs, lib, ... }:
let
settings = import ./settings.nix;
home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/release-23.11.tar.gz";
# python packages to include with python3
python-packages = import ./python-packages.nix;
in
{
imports = [
./hardware-configuration.nix # Include the results of the hardware scan.
./core # core system components
./system # system components such as kernel
./nix-settings.nix # nix related config
./users
./.luks-swap.nix
./fonts.nix # system wide font settings
./extra # extra packages
./dev # development stuff
./games # games
./hardware # hardware specific settings
];
imports = [
# Include the results of the hardware scan.
./hardware-configuration.nix
(import "${home-manager}/nixos")
./nix-settings.nix
./boot.nix
./users/servostar/user.nix
./.luks-swap.nix
./fonts.nix
./extra
./core
./dev
./games
./hardware
];
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
# on your system were taken. It's perfectly fine and recommended to leave
# this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = settings.stateVersion; # Did you read the comment?
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
# on your system were taken. It's perfectly fine and recommended to leave
# this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "23.11"; # Did you read the comment?
hardware.opengl.enable = true;
hardware.bluetooth.enable = true;
hardware.opengl.enable = true;
# for rotation sensors
hardware.sensor.iio.enable = true;
# screen and keybord backlight
hardware.acpilight.enable = true;
# Set your time zone.
time.timeZone = settings.system.timeZone;
networking.firewall.checkReversePath = false;
networking.hostName = "servostar-nixos-flex"; # Define your hostname.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
# Select internationalisation properties.
i18n.defaultLocale = settings.system.defaultLocale;
i18n.extraLocaleSettings = settings.system.extraLocales;
# Configure network proxy if necessary
# networking.proxy.default = "http://user:password@proxy:port/";
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
# use bash shell for other users
environment.shells = with pkgs; [ bash ];
# Enable networking
networking.networkmanager.enable = true;
# Configure console keymap
console.keyMap = settings.system.ttykeymap;
# Set your time zone.
time.timeZone = "Europe/Berlin";
environment.systemPackages = settings.system.pkgs;
# Select internationalisation properties.
i18n.defaultLocale = "en_US.UTF-8";
i18n.extraLocaleSettings = {
LC_ADDRESS = "de_DE.UTF-8";
LC_IDENTIFICATION = "de_DE.UTF-8";
LC_MEASUREMENT = "de_DE.UTF-8";
LC_MONETARY = "de_DE.UTF-8";
LC_NAME = "de_DE.UTF-8";
LC_NUMERIC = "de_DE.UTF-8";
LC_PAPER = "de_DE.UTF-8";
LC_TELEPHONE = "de_DE.UTF-8";
LC_TIME = "de_DE.UTF-8";
};
# Enable the X11 windowing system.
services.xserver.enable = true;
services.rpcbind.enable = true; # needed for NFS
# Enable the KDE Plasma Desktop Environment.
services.xserver.displayManager.sddm.enable = true;
services.xserver.desktopManager.plasma5.enable = true;
# set wayland as default session
services.xserver.displayManager.defaultSession = "plasmawayland";
programs.partition-manager.enable = true;
programs.fish.enable = true;
# use bash shell for other users
environment.shells = with pkgs; [ bash ];
programs.dconf.enable = true;
programs.xwayland.enable = true;
# exclude packages from plasma5
environment.plasma5.excludePackages = with pkgs.libsForQt5; [
elisa
oxygen
khelpcenter
kcolorpicker
];
# Configure keymap in X11
services.xserver = {
layout = "de";
xkbVariant = "";
};
# Configure console keymap
console.keyMap = "de";
################################################
# __ ___ _ _ _ _ _
# \ \ / (_)_ __| |_ _ _ __ _| (_)___ __ _| |_(_) ___ _ __
# \ \ / /| | '__| __| | | |/ _` | | / __|/ _` | __| |/ _ \| '_ \
# \ V / | | | | |_| |_| | (_| | | \__ \ (_| | |_| | (_) | | | |
# \_/ |_|_| \__|\__,_|\__,_|_|_|___/\__,_|\__|_|\___/|_| |_|
#
# This sections enbales host virtualisation for:
# - KVM
# - Waydroid (android based on LineageOS)
# - Docker
################################################
# android container
virtualisation.waydroid.enable = true;
################################################
# ____ _ _
# | _ \(_)_ __ _____ _(_)_ __ ___
# | |_) | | '_ \ / _ \ \ /\ / / | '__/ _ \
# | __/| | |_) | __/\ V V /| | | | __/
# |_| |_| .__/ \___| \_/\_/ |_|_| \___|
# |_|
################################################
# Enable sound with pipewire.
sound.enable = true;
hardware.pulseaudio.enable = false;
security.rtkit.enable = true;
services.pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
# If you want to use JACK applications, uncomment this
#jack.enable = true;
# use the example session manager (no others are packaged yet so this is enabled by default,
# no need to redefine it in your config for now)
#media-session.enable = true;
};
# Enable touchpad support (enabled default in most desktopManager).
# services.xserver.libinput.enable = true;
# List packages installed in system profile. To search, run:
# $ nix search wget
environment.systemPackages = (with pkgs; [
(python3.withPackages(python-packages))
fishPlugins.done # notifications for background process finished
fishPlugins.fzf-fish
fishPlugins.forgit
fzf
fishPlugins.grc
grc
fishPlugins.tide # asynchronous prompt for fish shell
fishPlugins.autopair
distrobox
go
nodejs
sass
devbox
filelight
ffmpeg-full
openssl
imagemagick
gnumake
cmake
# Clipboard support for Wayland Session
# used by Vim/Neovim and etc.
wl-clipboard
# GNU Compiler Collection and toolchain
glibc
gcc
gdb
stdenv.cc
stdenv.cc.libc
stdenv.cc.libc_dev
pkg-config
fontconfig
# SCSI driver
sg3_utils
wineWowPackages.stable
winetricks
]);
# Some programs need SUID wrappers, can be configured further or are
# started in user sessions.
# programs.mtr.enable = true;
# programs.gnupg.agent = {
# enable = true;
# enableSSHSupport = true;
# };
# List services that you want to enable:
# Enable the OpenSSH daemon.
# services.openssh.enable = true;
# Or disable the firewall altogether.
# networking.firewall.enable = false;
environment.sessionVariables = rec {
# rust
CARGO_TERM_COLOR = "always";
RUST_BACKTRACE = "1";
# Wayland for electron Ozone
NIXOS_OZONE_WL = "1";
GTK_THEME = "Breeze-Dark";
};
}

View File

@ -3,11 +3,8 @@ let
settings = import ./../settings.nix;
in
{
imports = [ ./fonts.nix ]
++ lib.optionals settings.fish [ ./fish.nix ]
++ lib.optionals settings.printing.enable [ ./printing.nix ]
imports = lib.optionals settings.printing.enable [ ./printing.nix ]
++ lib.optionals settings.xdg.enable [ ./xdg.nix ]
++ lib.optionals settings.java [ ./java.nix ]
++ lib.optionals settings.dotnet [ ./dotnet.nix ]
++ lib.optionals settings.plasma5.enable [ ./plasma5.nix ];
++ lib.optionals settings.dotnet [ ./dotnet.nix ];
}

View File

@ -1,18 +0,0 @@
{ pkgs, lib, config, ... }:
let
settings = import ./../settings.nix;
in
{
programs.fish.enable = true;
environment.systemPackages = (with pkgs; [
fishPlugins.done # notifications for background process finished
fishPlugins.fzf-fish
fishPlugins.forgit
fzf
fishPlugins.grc
grc
fishPlugins.tide # asynchronous prompt for fish shell
fishPlugins.autopair
]);
}

View File

@ -1,38 +0,0 @@
{ pkgs, lib, config, ... }:
let
settings = import ./../settings.nix;
in
{
# Enable the X11 windowing system.
services.xserver.enable = true;
# Configure keymap in X11
services.xserver = {
layout = "de";
xkbVariant = "";
};
# SDDM
services.xserver.displayManager.sddm.enable = true;
services.xserver.displayManager.sddm.wayland.enable = true;
services.xserver.displayManager.defaultSession = "plasmawayland"; # set wayland as default session
# Enable the KDE Plasma Desktop Environment.
services.xserver.desktopManager.plasma5.enable = true;
# exclude packages from plasma5
environment.plasma5.excludePackages = settings.plasma5.excludePackages;
programs.dconf.enable = settings.plasma5.dconf;
programs.xwayland.enable = settings.plasma5.xwayland;
environment.systemPackages = (with pkgs; [
filelight
]);
programs.partition-manager.enable = true;
environment.sessionVariables = rec {
GTK_THEME = "Breeze-Dark";
};
}

View File

@ -1,11 +0,0 @@
{ pkgs, lib, config, ... }:
let
settings = import ./../settings.nix;
in
{
programs.adb.enable = true;
services.udev.packages = [
pkgs.android-udev-rules
];
}

View File

@ -1,21 +0,0 @@
{ pkgs, lib, config, ... }:
let
settings = import ./../settings.nix;
in
{
config = lib.mkMerge [
# Arduino IDE 1.x
(lib.mkIf (!settings.dev.arduino.ide2) {
environment.systemPackages = (with pkgs; [
arduino
]);
})
# Arduino IDE 2.x
(lib.mkIf settings.dev.arduino.ide2 {
environment.systemPackages = (with pkgs; [
arduino-ide
]);
})
];
}

View File

@ -1,9 +0,0 @@
{ pkgs, lib, config, ... }:
let
settings = import ./../settings.nix;
in
{
environment.systemPackages = (with pkgs;
lib.optionals settings.dev.devbox [ devbox ]
);
}

View File

@ -8,10 +8,5 @@ in
++ lib.optionals settings.virtualisation.qemu.enable [ ./qemu.nix ]
++ lib.optionals settings.dev.platformio [ ./platformio.nix ]
++ lib.optionals settings.dev.latex [ ./latex.nix ]
++ lib.optionals settings.dev.dotnet [ ./dotnet.nix ]
++ lib.optionals settings.dev.python3.enable [ ./python3.nix ]
++ lib.optionals settings.virtualisation.waydroid [ ./waydroid.nix ]
++ lib.optionals settings.virtualisation.wine.enable [ ./wine.nix ]
++ lib.optionals settings.dev.arduino.enable [ ./arduino.nix ]
++ lib.optionals settings.dev.android.enable [ ./android.nix ];
++ lib.optionals settings.dev.dotnet [ ./dotnet.nix ];
}

View File

@ -1,9 +0,0 @@
{ pkgs, config, lib, ... }:
let
settings = import ./../settings.nix;
in
{
environment.systemPackages = with pkgs; [
(python3.withPackages(settings.dev.python3.packages))
];
}

View File

@ -1,4 +0,0 @@
{ pkgs, config, ... }: {
# android container
virtualisation.waydroid.enable = true;
}

View File

@ -1,31 +0,0 @@
{ pkgs, lib, config, ... }:
let
settings = import ./../settings.nix;
in
{
config = lib.mkMerge [
# optionally enable native wine for wayland
(lib.mkIf settings.virtualisation.wine.wayland {
environment.systemPackages = (with pkgs; [
# native wayland support (unstable)
wineWowPackages.waylandFull
]);
})
# if wayland is off, use package for Xorg
(lib.mkIf (!settings.virtualisation.wine.wayland) {
environment.systemPackages = (with pkgs; [
# support both 32- and 64-bit applications
wineWowPackages.stagingFull
]);
})
# winetricks
(lib.mkIf settings.virtualisation.wine.winetricks {
environment.systemPackages = (with pkgs; [
# winetricks (works for all versions of wine)
winetricks
]);
})
];
}

View File

@ -1,12 +0,0 @@
{ pkgs, lib, ... }:
let
settings = import ./../settings.nix;
in
{
hardware.bluetooth.enable = settings.hardware.bluetooth;
# for rotation sensors
hardware.sensor.iio.enable = settings.hardware.iio;
# screen and keybord backlight
hardware.acpilight.enable = settings.hardware.acpilight;
}

View File

@ -4,8 +4,8 @@ let
in
{
# Optionally import modules for specific hardware
imports = [ ./common.nix ]
++ lib.optionals settings.hardware.amdgpu [ ./amdgpu.nix ]
imports =
lib.optionals settings.hardware.amdgpu [ ./amdgpu.nix ]
++ lib.optionals settings.hardware.intelgpu [ ./intelgpu.nix ]
++ lib.optionals settings.hardware.nvidiagpu [ ./nvidiagpu.nix ];
}

View File

@ -13,7 +13,6 @@ case "$choice" in
cp -rv *.nix /etc/nixos/
cp -rv games /etc/nixos/
cp -rv hardware /etc/nixos/
cp -rv system /etc/nixos/
;;
n|N )
echo "aborting..."

14
python-packages.nix Normal file
View File

@ -0,0 +1,14 @@
ps: with ps;
[
pandas
requests
pygments
tkinter
numpy
setuptools
youtube-dl
pip
setuptools
ipykernel
scipy
]

View File

@ -1,40 +1,10 @@
with import <nixpkgs> {};
{
stateVersion = "23.11";
system = {
ttykeymap = "de";
timeZone = "Europe/Berlin";
defaultLocale = "en_US.UTF-8";
extraLocales = {
LC_ADDRESS = "de_DE.UTF-8";
LC_IDENTIFICATION = "de_DE.UTF-8";
LC_MEASUREMENT = "de_DE.UTF-8";
LC_MONETARY = "de_DE.UTF-8";
LC_NAME = "de_DE.UTF-8";
LC_NUMERIC = "en_US.UTF-8";
LC_PAPER = "de_DE.UTF-8";
LC_TELEPHONE = "de_DE.UTF-8";
LC_TIME = "de_DE.UTF-8";
};
pkgs = [
ffmpeg-full
openssl
imagemagick
];
};
with import <nixpkgs> {}; {
hardware = {
# support for GPUs
amdgpu = true;
intelgpu = false;
nvidiagpu = false;
bluetooth = true;
acpilight = false;
iio = true;
# support for yubikey and additional software
yubikey = {
enable = true;
@ -44,21 +14,6 @@ with import <nixpkgs> {};
};
};
fish = false;
plasma5 = {
enable = true;
dconf = true;
xwayland = true;
excludePackages = with pkgs.libsForQt5; [
elisa
oxygen
khelpcenter
kcolorpicker
konsole
];
};
virtualisation = {
docker-rootless = {
enable = true;
@ -66,42 +21,14 @@ with import <nixpkgs> {};
};
qemu = {
enable = true;
virt-manager = false;
};
waydroid = false;
wine = {
enable = true;
wayland = false;
winetricks = true;
virt-manager = true;
};
};
dev = {
devbox = true;
platformio = true;
latex = true;
dotnet = false;
python3 = {
enable = true;
packages = ps: with ps; [
pandas
requests
pygments
tkinter
numpy
setuptools
youtube-dl
pip
ipykernel
scipy
];
};
arduino = {
enable = false; # enable arduino development platform
ide2 = true; # wether to use IDE 2.x or deprecated 1.x
};
android = {
enable = true;
};
lsp = {
enable = true;
# various language server
@ -131,23 +58,10 @@ with import <nixpkgs> {};
networking = {
wireguard = true; # enable wireguard protocol
hostname = "servostar-nixos-flex";
};
games = {
prismlauncher = true;
steam = true;
};
sound = {
pipewire = {
enable = true;
alsa = true;
pulse = true;
jack = true;
};
pulseaudio = {
enable = false;
};
};
}

View File

@ -1,12 +0,0 @@
{ lib, ... }:
let
settings = import ./../settings.nix;
in
{
imports = [
./grub.nix
./kernel.nix
./networking.nix
] ++ lib.optionals settings.sound.pipewire.enable [ ./pipewire.nix ]
++ lib.optionals settings.sound.pulseaudio.enable [ ./pulseaudio.nix ];
}

View File

@ -1,20 +0,0 @@
{ pkgs, ... }:
{
boot.kernelPackages = pkgs.linuxPackages_latest;
# extra enabled kernel modules
boot.kernelModules = [
"sg" # for generic SCSI devices such as /dev/sg0
];
boot.consoleLogLevel = 0;
# Kernel parameter on boot
boot.kernelParams = [
"quiet"
"udev.log_level=3"
"splash"
"psi=1"
"boot_delay=0"
];
}

View File

@ -1,15 +0,0 @@
{ pkgs, lib, ... }:
let
settings = import ./../settings.nix;
in
{
networking.firewall.checkReversePath = false;
networking.hostName = settings.networking.hostname; # Define your hostname.
# Configure network proxy if necessary
# networking.proxy.default = "http://user:password@proxy:port/";
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
# Enable networking
networking.networkmanager.enable = true;
}

View File

@ -1,22 +0,0 @@
{ pkgs, lib, ... }:
let
settings = import ./../settings.nix;
in
{
# Remove sound.enable or set it to false if you had it set previously, as sound.enable is only meant for ALSA-based configurations
sound.enable = false;
# rtkit is optional but recommended
security.rtkit.enable = true;
services.pipewire = {
enable = settings.sound.pipewire.enable;
audio.enable = settings.sound.pipewire.enable;
pulse.enable = settings.sound.pipewire.pulse;
jack.enable = settings.sound.pipewire.jack;
alsa = {
enable = settings.sound.pipewire.alsa;
support32Bit = true;
};
};
}

View File

@ -1,8 +0,0 @@
{ pkgs, lib, ... }:
let
settings = import ./../settings.nix;
in
{
hardware.pulseaudio.enable = true;
hardware.pulseaudio.support32Bit = true; ## If compatibility with 32-bit applications is desired.
}

View File

@ -1,9 +0,0 @@
let
home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/release-23.11.tar.gz";
in
{
imports = [
(import "${home-manager}/nixos")
./servostar/user.nix
];
}

View File

@ -9,8 +9,6 @@
#
# Configuration for user servostar
programs.zsh.enable = true;
# Define a user account. Don't forget to set a password with passwd.
users.users.servostar = {
isNormalUser = true;
@ -25,10 +23,9 @@
"uucp"
"plugdev"
"docker"
"adbusers"
];
shell = pkgs.zsh;
# use fish
shell = pkgs.fish;
# ------------------------------------------------------
# user packages
@ -110,14 +107,6 @@
xournalpp
jetbrains-toolbox
# Clipboard support for Wayland Session
# used by Vim/Neovim and etc.
wl-clipboard
chroma # general purpose syntax highlighter (for ohmyzsh/colorize)
fzf
thefuck
];
};
@ -195,34 +184,9 @@
];
};
programs.zsh = {
enable = true;
shellAliases = { };
oh-my-zsh = {
enable = true;
plugins = [
"git"
"thefuck"
"colored-man-pages"
"colorize"
"command-not-found"
"docker"
"docker-compose"
"fzf"
];
theme = "robbyrussell";
};
enableAutosuggestions = true;
syntaxHighlighting = {
enable = true;
};
autocd = true;
defaultKeymap = "emacs";
};
programs.starship = {
enable = true;
enableZshIntegration = true;
enableFishIntegration = true;
};
programs.eza = {