servostar/NixOS
servostar
/
NixOS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: servostar:d2db42180d3eabe4ec1b23017fb8383382dee4aa
Branches Tags
servostar:main
servostar:nixos-flex
servostar:dedicated-settings-file
..
compare: servostar:9ff402fd1293dc607b7cfd14940e9f09e8d8ae78
Branches Tags
servostar:nixos-flex
servostar:main
servostar:dedicated-settings-file

No commits in common. "d2db42180d3eabe4ec1b23017fb8383382dee4aa" and "9ff402fd1293dc607b7cfd14940e9f09e8d8ae78" have entirely different histories.
d2db42180d ... 9ff402fd12

14 changed files with 110 additions and 222 deletions
Show Stats Expand all files Collapse all files

15
system/grub.nix → boot.nix
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;

114
configuration.nix
View File

@ -1,32 +1,40 @@
{ config, pkgs, lib, ... }:
let
settings = import ./settings.nix;
in
{
imports = [
./hardware-configuration.nix # Include the results of the hardware scan.
./nix-settings.nix # nix related config
./users
./.luks-swap.nix
./fonts.nix # system wide font settings
./extra # extra packages
./core # core system components
./dev # development stuff
./games # games
./hardware # hardware specific settings
./system # system components such as kernel
];
{ config, pkgs, lib, ... }: {
imports = [
# Include the results of the hardware scan.
./hardware-configuration.nix
./nix-settings.nix
./boot.nix
./users
./.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;
networking.firewall.checkReversePath = false;
networking.hostName = "servostar-nixos-flex"; # Define your hostname.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
# 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;
# Set your time zone.
time.timeZone = "Europe/Berlin";
@ -55,11 +63,48 @@ in
# Configure console keymap
console.keyMap = "de";
################################################
# ____ _ _
# | _ \(_)_ __ _____ _(_)_ __ ___
# | |_) | | '_ \ / _ \ \ /\ / / | '__/ _ \
# | __/| | |_) | __/\ 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; [
distrobox
go
nodejs
sass
devbox
filelight
ffmpeg-full
openssl
imagemagick
@ -83,8 +128,27 @@ in
# 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";

4
core/plasma5.nix
View File

@ -23,8 +23,4 @@ in
programs.dconf.enable = settings.plasma5.dconf;
programs.xwayland.enable = settings.plasma5.xwayland;
environment.systemPackages = (with pkgs; [
filelight
])
}

21
dev/arduino.nix
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
]);
})
];
}

4
dev/default.nix
View File

@ -10,7 +10,5 @@ in
++ 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.virtualisation.waydroid [ ./waydroid.nix ];
}

31
dev/wine.nix
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
]);
})
];
}

1
nixos-build.sh
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..."

28
settings.nix
View File

@ -1,7 +1,4 @@
with import <nixpkgs> {};
{
stateVersion = "23.11";
with import <nixpkgs> {}; {
hardware = {
# support for GPUs
amdgpu = true;
@ -45,11 +42,6 @@ with import <nixpkgs> {};
virt-manager = true;
};
waydroid = false;
wine = {
enable = true;
wayland = false;
winetricks = true;
};
};
dev = {
platformio = true;
@ -70,10 +62,7 @@ with import <nixpkgs> {};
scipy
];
};
arduino = {
enable = false; # enable arduino development platform
ide2 = true; # wether to use IDE 2.x or deprecated 1.x
};
lsp = {
enable = true;
# various language server
@ -103,23 +92,10 @@ with import <nixpkgs> {};
networking = {
wireguard = true; # enable wireguard protocol
hostname = "servostar-nixos-desktop";
};
games = {
prismlauncher = true;
steam = true;
};
sound = {
pipewire = {
enable = true;
alsa = true;
pulse = true;
jack = true;
};
pulseaudio = {
enable = false;
};
};
}

12
system/default.nix
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 ];
}

20
system/kernel.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"
];
}

15
system/networking.nix
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;
}

22
system/pipewire.nix
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;
};
};
}

8
system/pulseaudio.nix
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.
}

37
users/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;
@ -26,8 +24,8 @@
"plugdev"
"docker"
];
shell = pkgs.zsh;
# use fish
shell = pkgs.fish;
# ------------------------------------------------------
# user packages
@ -109,10 +107,6 @@
xournalpp
jetbrains-toolbox
chroma # general purpose syntax highlighter (for ohmyzsh/colorize)
fzf
thefuck
];
};
@ -190,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 = {