karaolidis/nix
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Housekeeping

Browse Source 
- Update README
- Run shellcheck on .sh files
- Add helper scripts
- Remove eirene vm variant
- Add post-install checklist

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
This commit is contained in:
Nick Karaolidis
2024-08-23 01:22:08 +02:00
parent a048be5c51
commit 78a862bd2e
29 changed files with 582 additions and 434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
hosts/eirene/README.md Normal file
View File

@@ -0,0 +1,14 @@
# eirene
## Post-Install Checklist
### Networking
- [ ] Add NetworkManager connections
- [ ] Connect Bluetooth devices
- [ ] Add printers
### Third-party Services
- [ ] Firefox
- [ ] Spotify

10
hosts/eirene/base/card.sh
View File

@@ -1,10 +0,0 @@
AMD=/dev/dri/by-path/pci-0000:06:00.0-card
NVIDIA=/dev/dri/by-path/pci-0000:01:00.0-card
if [ -e $AMD ]; then
CARD=$AMD
else
CARD=$NVIDIA
fi
ln -sf $CARD $HOME/.config/hypr/card

101
hosts/eirene/base/default.nix
View File

@@ -1,101 +0,0 @@
{
config,
inputs,
lib,
pkgs,
...
}:
{
imports = [
inputs.disko.nixosModules.disko
(import ../format.nix {
device = "/dev/disk/by-id/nvme-SAMSUNG_MZVL22T0HBLB-00BL2_S64RNE0R602762";
})
./hardware-configuration.nix
../../common/system/configs/tlp
../.
];
networking.hostName = "eirene";
# https://github.com/NixOS/nixos-hardware/tree/master/lenovo/legion/16achg6
hardware = {
enableAllFirmware = true;
cpu = {
cores = 8;
threads = 16;
amd.updateMicrocode = true;
};
nvidia = {
modesetting.enable = true;
powerManagement.enable = true;
open = false;
prime = {
offload = {
enable = true;
enableOffloadCmd = true;
};
nvidiaBusId = "PCI:1:0:0";
amdgpuBusId = "PCI:6:0:0";
};
};
graphics = {
enable32Bit = true;
extraPackages = with pkgs; [
amdvlk
driversi686Linux.amdvlk
rocmPackages.clr
rocmPackages.clr.icd
];
};
};
services = {
xserver.videoDrivers = [ "nvidia" ];
fstrim.enable = true;
tlp.settings.DISK_DEVICES = "nvme0n1 nvme1n1";
};
boot = {
kernelParams = [
"amd_pstate=active"
"video=eDP-1:2560x1600@165"
];
initrd.kernelModules = [ "amdgpu" ];
};
home-manager.sharedModules = lib.mkIf config.programs.hyprland.enable [
{
wayland.windowManager.hyprland.settings = {
monitor = "eDP-1, 2560x1600@165, 0x0, 1.25";
env = [ "WLR_DRM_DEVICES,$HOME/.config/hypr/card" ];
device = [
{
name = "syna2ba6:00-06cb:ce44-touchpad";
sensitivity = 0.5;
}
];
gestures.workspace_swipe_distance = 600;
};
programs = {
zsh.loginExtra = lib.mkBefore (builtins.readFile ./card.sh);
# VSCode does not play well with fractional scaling
vscode.userSettings."window.zoomLevel" = (1.25 - 1) / 0.2;
};
theme = {
cursor.size = 24;
};
}
];
nixpkgs.config = {
cudaSupport = true;
rocmSupport = true;
};
}

94
hosts/eirene/default.nix
View File

@@ -1,5 +1,14 @@
{
inputs,
lib,
pkgs,
...
}:
{
imports = [
inputs.disko.nixosModules.disko
(import ./format.nix { device = "/dev/disk/by-id/nvme-SAMSUNG_MZVL22T0HBLB-00BL2_S64RNE0R602762"; })
./hardware-configuration.nix
../common/system/configs/bluetooth
../common/system/configs/boot
../common/system/configs/brightnessctl
@@ -27,15 +36,98 @@
../common/system/configs/ssh
../common/system/configs/system
../common/system/configs/timezone
../common/system/configs/tlp
../common/system/configs/tmux
../common/system/configs/tree
../common/system/configs/users
../common/system/configs/wget
../common/system/configs/zsh
../common/system/scripts/cleanup
./nick.nix
./users/nick.nix
];
# https://github.com/NixOS/nixos-hardware/tree/master/lenovo/legion/16achg6
hardware = {
enableAllFirmware = true;
cpu = {
cores = 8;
threads = 16;
amd.updateMicrocode = true;
};
nvidia = {
modesetting.enable = true;
powerManagement.enable = true;
open = false;
prime = {
offload = {
enable = true;
enableOffloadCmd = true;
};
nvidiaBusId = "PCI:1:0:0";
amdgpuBusId = "PCI:6:0:0";
};
};
graphics = {
enable32Bit = true;
extraPackages = with pkgs; [
amdvlk
driversi686Linux.amdvlk
rocmPackages.clr
rocmPackages.clr.icd
];
};
};
networking.hostName = "eirene";
i18n.defaultLocale = "en_US.UTF-8";
sops.defaultSopsFile = ./secrets/secrets.yaml;
services = {
xserver.videoDrivers = [ "nvidia" ];
fstrim.enable = true;
tlp.settings.DISK_DEVICES = "nvme0n1 nvme1n1";
};
boot = {
kernelParams = [
"amd_pstate=active"
"video=eDP-1:2560x1600@165"
];
initrd.kernelModules = [ "amdgpu" ];
};
nixpkgs.config = {
cudaSupport = true;
rocmSupport = true;
};
home-manager.sharedModules = [
{
wayland.windowManager.hyprland.settings = {
monitor = "eDP-1, 2560x1600@165, 0x0, 1.25";
env = [ "WLR_DRM_DEVICES,$HOME/.config/hypr/card" ];
device = [
{
name = "syna2ba6:00-06cb:ce44-touchpad";
sensitivity = 0.5;
}
];
gestures.workspace_swipe_distance = 600;
};
programs = {
zsh.loginExtra = lib.mkBefore (builtins.readFile ./scripts/card.sh);
# VSCode does not play well with fractional scaling
vscode.userSettings."window.zoomLevel" = (1.25 - 1) / 0.2;
};
theme = {
cursor.size = 24;
};
}
];
}

0
hosts/eirene/base/hardware-configuration.nix → hosts/eirene/hardware-configuration.nix
View File

115
hosts/eirene/nick.nix
View File

@@ -1,115 +0,0 @@
{ config, ... }:
let
# https://github.com/NixOS/nixpkgs/issues/24570
# https://github.com/NixOS/nixpkgs/issues/305643
user = "nick";
home = "/home/nick";
in
{
imports = [
../common/user/configs/options.nix
(import ../common/user/configs/console/android { inherit user home; })
(import ../common/user/configs/console/bluetooth { inherit user home; })
(import ../common/user/configs/console/brightnessctl { inherit user home; })
(import ../common/user/configs/console/btop { inherit user home; })
(import ../common/user/configs/console/docker { inherit user home; })
(import ../common/user/configs/console/fastfetch { inherit user home; })
(import ../common/user/configs/console/ffmpeg { inherit user home; })
(import ../common/user/configs/console/git { inherit user home; })
(import ../common/user/configs/console/gpg-agent { inherit user home; })
(import ../common/user/configs/console/home-manager { inherit user home; })
(import ../common/user/configs/console/imagemagick { inherit user home; })
(import ../common/user/configs/console/ncdu { inherit user home; })
(import ../common/user/configs/console/neovim { inherit user home; })
(import ../common/user/configs/console/nixpkgs { inherit user home; })
(import ../common/user/configs/console/pipewire { inherit user home; })
(import ../common/user/configs/console/ranger { inherit user home; })
(import ../common/user/configs/console/sops { inherit user home; })
(import ../common/user/configs/console/syncthing { inherit user home; })
(import ../common/user/configs/console/tmux { inherit user home; })
(import ../common/user/configs/console/tree { inherit user home; })
(import ../common/user/configs/console/wget { inherit user home; })
(import ../common/user/configs/console/xdg { inherit user home; })
(import ../common/user/configs/console/yt-dlp { inherit user home; })
(import ../common/user/configs/console/zsh { inherit user home; })
(import ../common/user/configs/gui/ags { inherit user home; })
(import ../common/user/configs/gui/bluetooth { inherit user home; })
(import ../common/user/configs/gui/brightnessctl { inherit user home; })
(import ../common/user/configs/gui/btop { inherit user home; })
(import ../common/user/configs/gui/chromium { inherit user home; })
(import ../common/user/configs/gui/cliphist { inherit user home; })
(import ../common/user/configs/gui/emoji { inherit user home; })
(import ../common/user/configs/gui/firefox { inherit user home; })
(import ../common/user/configs/gui/gtk { inherit user home; })
(import ../common/user/configs/gui/hyprland { inherit user home; })
(import ../common/user/configs/gui/hyprshot { inherit user home; })
(import ../common/user/configs/gui/kitty { inherit user home; })
(import ../common/user/configs/gui/libreoffice { inherit user home; })
(import ../common/user/configs/gui/networking { inherit user home; })
(import ../common/user/configs/gui/obsidian { inherit user home; })
(import ../common/user/configs/gui/pipewire { inherit user home; })
(import ../common/user/configs/gui/qalculate { inherit user home; })
(import ../common/user/configs/gui/qt { inherit user home; })
(import ../common/user/configs/gui/rofi { inherit user home; })
(import ../common/user/configs/gui/spicetify { inherit user home; })
(import ../common/user/configs/gui/swww { inherit user home; })
(import ../common/user/configs/gui/theme { inherit user home; })
(import ../common/user/configs/gui/transmission { inherit user home; })
(import ../common/user/configs/gui/vscode { inherit user home; })
(import ../common/user/configs/gui/wev { inherit user home; })
(import ../common/user/configs/gui/x11 { inherit user home; })
];
sops.secrets."${user}-password" = {
sopsFile = ../../users/${user}/secrets/secrets.yaml;
key = "password";
neededForUsers = true;
};
users.users.${user} = {
inherit home;
isNormalUser = true;
email = "nick@karaolidis.com";
fullName = "Nikolaos Karaolidis";
description = "Nikolaos Karaolidis";
hashedPasswordFile = config.sops.secrets."${user}-password".path;
extraGroups = [ "wheel" ];
linger = true;
uid = 1000;
};
services.getty.autologinUser = user;
home-manager.users.${user} = {
home = {
username = user;
homeDirectory = home;
};
sops.defaultSopsFile = ../../users/${user}/secrets/secrets.yaml;
theme.wallpaper = ../../users/${user}/secrets/wallpapers/clouds.png;
programs.obsidian.vaults."Documents/Obsidian/master".enable = true;
services.syncthing.settings.folders = {
obsidian = {
label = "Obsidian";
path = "Documents/Obsidian";
devices = [
"amalthea"
"ganymede"
];
};
official = {
label = "Official";
path = "Documents/Official";
devices = [
"amalthea"
"ganymede"
];
};
};
home.file."Documents/Obsidian/.stignore".source = ../common/user/configs/gui/obsidian/config/.stignore;
};
}

10
hosts/eirene/scripts/card.sh Normal file
View File

@@ -0,0 +1,10 @@
AMD=/dev/dri/by-path/pci-0000:06:00.0-card
NVIDIA=/dev/dri/by-path/pci-0000:01:00.0-card
if [[ -e "${AMD}" ]]; then
CARD=${AMD}
else
CARD=${NVIDIA}
fi
ln -sf "${CARD}" "${HOME}"/.config/hypr/card

115
hosts/eirene/users/nick.nix Normal file
View File

@@ -0,0 +1,115 @@
{ config, ... }:
let
# https://github.com/NixOS/nixpkgs/issues/24570
# https://github.com/NixOS/nixpkgs/issues/305643
user = "nick";
home = "/home/nick";
in
{
imports = [
../../common/user/configs/options.nix
(import ../../common/user/configs/console/android { inherit user home; })
(import ../../common/user/configs/console/bluetooth { inherit user home; })
(import ../../common/user/configs/console/brightnessctl { inherit user home; })
(import ../../common/user/configs/console/btop { inherit user home; })
(import ../../common/user/configs/console/docker { inherit user home; })
(import ../../common/user/configs/console/fastfetch { inherit user home; })
(import ../../common/user/configs/console/ffmpeg { inherit user home; })
(import ../../common/user/configs/console/git { inherit user home; })
(import ../../common/user/configs/console/gpg-agent { inherit user home; })
(import ../../common/user/configs/console/home-manager { inherit user home; })
(import ../../common/user/configs/console/imagemagick { inherit user home; })
(import ../../common/user/configs/console/ncdu { inherit user home; })
(import ../../common/user/configs/console/neovim { inherit user home; })
(import ../../common/user/configs/console/nixpkgs { inherit user home; })
(import ../../common/user/configs/console/pipewire { inherit user home; })
(import ../../common/user/configs/console/ranger { inherit user home; })
(import ../../common/user/configs/console/sops { inherit user home; })
(import ../../common/user/configs/console/syncthing { inherit user home; })
(import ../../common/user/configs/console/tmux { inherit user home; })
(import ../../common/user/configs/console/tree { inherit user home; })
(import ../../common/user/configs/console/wget { inherit user home; })
(import ../../common/user/configs/console/xdg { inherit user home; })
(import ../../common/user/configs/console/yt-dlp { inherit user home; })
(import ../../common/user/configs/console/zsh { inherit user home; })
(import ../../common/user/configs/gui/ags { inherit user home; })
(import ../../common/user/configs/gui/bluetooth { inherit user home; })
(import ../../common/user/configs/gui/brightnessctl { inherit user home; })
(import ../../common/user/configs/gui/btop { inherit user home; })
(import ../../common/user/configs/gui/chromium { inherit user home; })
(import ../../common/user/configs/gui/cliphist { inherit user home; })
(import ../../common/user/configs/gui/emoji { inherit user home; })
(import ../../common/user/configs/gui/firefox { inherit user home; })
(import ../../common/user/configs/gui/gtk { inherit user home; })
(import ../../common/user/configs/gui/hyprland { inherit user home; })
(import ../../common/user/configs/gui/hyprshot { inherit user home; })
(import ../../common/user/configs/gui/kitty { inherit user home; })
(import ../../common/user/configs/gui/libreoffice { inherit user home; })
(import ../../common/user/configs/gui/networking { inherit user home; })
(import ../../common/user/configs/gui/obsidian { inherit user home; })
(import ../../common/user/configs/gui/pipewire { inherit user home; })
(import ../../common/user/configs/gui/qalculate { inherit user home; })
(import ../../common/user/configs/gui/qt { inherit user home; })
(import ../../common/user/configs/gui/rofi { inherit user home; })
(import ../../common/user/configs/gui/spicetify { inherit user home; })
(import ../../common/user/configs/gui/swww { inherit user home; })
(import ../../common/user/configs/gui/theme { inherit user home; })
(import ../../common/user/configs/gui/transmission { inherit user home; })
(import ../../common/user/configs/gui/vscode { inherit user home; })
(import ../../common/user/configs/gui/wev { inherit user home; })
(import ../../common/user/configs/gui/x11 { inherit user home; })
];
sops.secrets."${user}-password" = {
sopsFile = ../../../users/${user}/secrets/secrets.yaml;
key = "password";
neededForUsers = true;
};
users.users.${user} = {
inherit home;
isNormalUser = true;
email = "nick@karaolidis.com";
fullName = "Nikolaos Karaolidis";
description = "Nikolaos Karaolidis";
hashedPasswordFile = config.sops.secrets."${user}-password".path;
extraGroups = [ "wheel" ];
linger = true;
uid = 1000;
};
services.getty.autologinUser = user;
home-manager.users.${user} = {
home = {
username = user;
homeDirectory = home;
};
sops.defaultSopsFile = ../../../users/${user}/secrets/secrets.yaml;
theme.wallpaper = ../../../users/${user}/secrets/wallpapers/clouds.png;
programs.obsidian.vaults."Documents/Obsidian/master".enable = true;
services.syncthing.settings.folders = {
obsidian = {
label = "Obsidian";
path = "Documents/Obsidian";
devices = [
"amalthea"
"ganymede"
];
};
official = {
label = "Official";
path = "Documents/Official";
devices = [
"amalthea"
"ganymede"
];
};
};
home.file."Documents/Obsidian/.stignore".source = ../../common/user/configs/gui/obsidian/config/.stignore;
};
}

27
hosts/eirene/vm/default.nix
View File

@@ -1,27 +0,0 @@
{
config,
inputs,
lib,
...
}:
{
imports = [
inputs.disko.nixosModules.disko
(import ../format.nix { device = "/dev/vda"; })
./hardware-configuration.nix
../.
];
networking.hostName = "eirene-vm";
boot.kernelParams = [ "video=Virtual-1:2560x1600@60" ];
fileSystems."/host" = {
device = "host";
fsType = "virtiofs";
};
home-manager.sharedModules = lib.mkIf config.programs.hyprland.enable [
{ wayland.windowManager.hyprland.settings.monitor = "Virtual-1, 2560x1600@60, 0x0, 1"; }
];
}

18
hosts/eirene/vm/hardware-configuration.nix
View File

@@ -1,18 +0,0 @@
{ lib, modulesPath, ... }:
{
imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
boot = {
initrd.availableKernelModules = [
"ahci"
"xhci_pci"
"virtio_pci"
"virtio_scsi"
"sr_mod"
"virtio_blk"
];
kernelModules = [ "kvm-amd" ];
};
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
}