Mirror/nix-git
Mirror/nix-git
1
0
Fork 0
mirror of https://codeberg.org/privacy1st/nix-git synced 2025-02-11 08:50:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor

Browse Source
This commit is contained in:
Daniel Langbein 2025-02-02 11:23:32 +01:00
parent 5cdfccdc41
commit e4510488ab
Signed by: langfingaz
GPG Key ID: 6C47C753F0823002
9 changed files with 74 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hosts/yodaGaming/configuration.nix
View File

@ -7,18 +7,8 @@
../../modules/base.nix ../../modules/base.nix
../../modules/base-bios-grub.nix ../../modules/base-bios-grub.nix
../../modules/power-management.nix ../../modules/base-graphical.nix
../../modules/ntfs.nix
#../../modules/ssh-fde-unlock.nix
../../modules/nitrokey-gpg-smartcard.nix
../../modules/ssh-client.nix
../../modules/ssh-server.nix
#../../modules/headless.nix
#
#../../modules/kde.nix
#../../modules/programs-kde.nix
#
../../modules/gnome-base.nix ../../modules/gnome-base.nix
../../modules/fwupd-gnome.nix ../../modules/fwupd-gnome.nix
../../modules/programs-gnome.nix ../../modules/programs-gnome.nix
@ -26,13 +16,20 @@
../../modules/programs-base.nix ../../modules/programs-base.nix
#../../modules/programs.nix #../../modules/programs.nix
../../modules/flatpak.nix ../../modules/flatpak.nix
../../modules/signal-desktop.nix
../../modules/firefox.nix
#../../modules/games.nix #../../modules/games.nix
#../../modules/dosbox-x.nix #../../modules/dosbox-x.nix
../../modules/steam.nix ../../modules/steam.nix
#
# Development
#
../../modules/git.nix
../../modules/nitrokey-gpg-smartcard.nix
../../modules/ssh-client.nix
../../modules/ssh-server.nix
../../modules/jetbrains-ide.nix ../../modules/jetbrains-ide.nix
]; ];

1
hosts/yodaNas/configuration.nix
View File

@ -10,7 +10,6 @@
../../modules/headless.nix ../../modules/headless.nix
../../modules/ssh-fde-unlock.nix ../../modules/ssh-fde-unlock.nix
#../../modules/git.nix
#../../modules/ssh-client.nix #../../modules/ssh-client.nix
../../modules/ssh-server.nix ../../modules/ssh-server.nix

24
hosts/yodaTab/configuration.nix
View File

@ -6,21 +6,11 @@
../../modules/base.nix ../../modules/base.nix
../../modules/base-efi-systemd.nix ../../modules/base-efi-systemd.nix
../../modules/xdg.nix ../../modules/base-graphical.nix
../../modules/power-management.nix ../../modules/power-management.nix
../../modules/usb-mtp-ptp.nix ../../modules/usb-mtp-ptp.nix
../../modules/ntfs.nix
../../modules/git.nix
../../modules/nitrokey-gpg-smartcard.nix
../../modules/ssh-client.nix
../../modules/ssh-server.nix
../../modules/lid-switch-handling.nix ../../modules/lid-switch-handling.nix
#../../modules/headless.nix
#
#../../modules/kde.nix
#../../modules/programs-kde.nix
#
../../modules/gnome-base.nix ../../modules/gnome-base.nix
# Not required as display scale is set 2.0 (multiple of 1). # Not required as display scale is set 2.0 (multiple of 1).
#../../modules/gnome-fractional-scaling.nix #../../modules/gnome-fractional-scaling.nix
@ -34,11 +24,8 @@
../../modules/ausweisapp.nix ../../modules/ausweisapp.nix
../../modules/nextcloud-client.nix ../../modules/nextcloud-client.nix
../../modules/syncthing.nix ../../modules/syncthing.nix
../../modules/signal-desktop.nix
../../modules/element-desktop.nix ../../modules/element-desktop.nix
../../modules/obsidian.nix ../../modules/obsidian.nix
../../modules/vlc-dvd-blu-ray.nix
../../modules/firefox.nix
../../modules/tor-browser.nix ../../modules/tor-browser.nix
#../../modules/tor.nix #../../modules/tor.nix
#../../modules/digikam-rawtherapee-hugin-gimp.nix #../../modules/digikam-rawtherapee-hugin-gimp.nix
@ -50,6 +37,15 @@
../../modules/autostart.nix ../../modules/autostart.nix
#
# Development
#
../../modules/git.nix
../../modules/nitrokey-gpg-smartcard.nix
../../modules/ssh-client.nix
../../modules/ssh-server.nix
../../modules/jetbrains-ide.nix ../../modules/jetbrains-ide.nix
#../../modules/vscodium.nix #../../modules/vscodium.nix
#../../modules/android.nix #../../modules/android.nix

21
hosts/yodaTux/configuration.nix
View File

@ -26,19 +26,12 @@
../../modules/base.nix ../../modules/base.nix
../../modules/base-efi-systemd.nix ../../modules/base-efi-systemd.nix
../../modules/xdg.nix ../../modules/base-graphical.nix
../../modules/power-management.nix ../../modules/power-management.nix
../../modules/usb-mtp-ptp.nix ../../modules/usb-mtp-ptp.nix
../../modules/ntfs.nix
../../modules/git.nix
../../modules/nitrokey-gpg-smartcard.nix
../../modules/ssh-client.nix
../../modules/ssh-server.nix
../../modules/lid-switch-handling.nix ../../modules/lid-switch-handling.nix
#../../modules/package-list.nix #../../modules/package-list.nix
#../../modules/headless.nix
#
#../../modules/kde.nix #../../modules/kde.nix
#../../modules/programs-kde.nix #../../modules/programs-kde.nix
# #
@ -54,11 +47,8 @@
../../modules/ausweisapp.nix ../../modules/ausweisapp.nix
../../modules/nextcloud-client.nix ../../modules/nextcloud-client.nix
../../modules/syncthing.nix ../../modules/syncthing.nix
../../modules/signal-desktop.nix
../../modules/element-desktop.nix ../../modules/element-desktop.nix
../../modules/obsidian.nix ../../modules/obsidian.nix
../../modules/vlc-dvd-blu-ray.nix
../../modules/firefox.nix
../../modules/tor-browser.nix ../../modules/tor-browser.nix
#../../modules/tor.nix #../../modules/tor.nix
../../modules/digikam-rawtherapee-hugin-gimp.nix ../../modules/digikam-rawtherapee-hugin-gimp.nix
@ -75,6 +65,15 @@
#../../modules/autostart.nix #../../modules/autostart.nix
#
# Development
#
../../modules/git.nix
../../modules/nitrokey-gpg-smartcard.nix
../../modules/ssh-client.nix
../../modules/ssh-server.nix
../../modules/jetbrains-ide.nix ../../modules/jetbrains-ide.nix
#../../modules/vscodium.nix #../../modules/vscodium.nix
../../modules/android.nix ../../modules/android.nix

13
hosts/yodaYoga/host-specific.nix → hosts/yodaYoga/BikeTripPlanner.nix
View File

@ -1,6 +1,17 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = [
../../modules/headless.nix
../../modules/ssh-fde-unlock.nix
../../modules/ssh-server.nix
../../modules/docker.nix
../../modules/lid-switch-handling.nix
../../modules/sendmail-mta.nix
../../modules/journalwatch.nix
];
# Download BikeTripPlanner Git repository. # Download BikeTripPlanner Git repository.
home-manager.users.yoda = { osConfig, config, pkgs, ... }: { home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
home.file."readonly-git/BikeTripPlanner".source = (builtins.fetchGit { home.file."readonly-git/BikeTripPlanner".source = (builtins.fetchGit {

21
hosts/yodaYoga/configuration.nix
View File

@ -1,24 +1,25 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = imports = [
[
./hardware-configuration.nix ./hardware-configuration.nix
./host-specific.nix
../../modules/base.nix ../../modules/base.nix
../../modules/base-efi-systemd.nix ../../modules/base-efi-systemd.nix
../../modules/headless.nix ../../modules/base-graphical.nix
# Remote unlock
../../modules/ssh-fde-unlock.nix ../../modules/ssh-fde-unlock.nix
# Remote deployment
../../modules/ssh-server.nix ../../modules/ssh-server.nix
../../modules/docker.nix
../../modules/lid-switch-handling.nix ../../modules/gnome-base.nix
../../modules/sendmail-mta.nix ../../modules/gnome-fractional-scaling.nix
../../modules/journalwatch.nix ../../modules/fwupd-gnome.nix
../../modules/programs-gnome.nix
../../modules/programs-base.nix
../../modules/print-and-scan.nix
]; ];
#foo = throw "NixOS rebuild boot required to update to 24.05";
networking.hostName = "yodaYoga"; networking.hostName = "yodaYoga";
boot.initrd.luks.devices."luks-a8521407-e25b-4f26-8e7a-a56fcbfd2e35".allowDiscards = true; boot.initrd.luks.devices."luks-a8521407-e25b-4f26-8e7a-a56fcbfd2e35".allowDiscards = true;
yoda.btrfsFileSystems = ["/"]; yoda.btrfsFileSystems = ["/"];

7
modules/base-graphical.nix Normal file
View File

@ -0,0 +1,7 @@
{ pkgs, ... }:
{
imports = [
./xdg.nix
./ntfs.nix
];
}

2
modules/headless.nix
View File

@ -2,7 +2,7 @@
{ {
users.users.yoda = { users.users.yoda = {
packages = with pkgs; [ packages = with pkgs; [
zenith # Terminal resource monitor / task manager #zenith # Terminal resource monitor / task manager
btop # Terminal resource monitor / task manager btop # Terminal resource monitor / task manager
htop # Terminal resource monitor / task manager htop # Terminal resource monitor / task manager
]; ];

10
modules/programs-base.nix
View File

@ -1,14 +1,20 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = [
./vlc-dvd-blu-ray.nix
./firefox.nix
./signal-desktop.nix
];
users.users.yoda = { users.users.yoda = {
packages = with pkgs; [ packages = with pkgs; [
zenith # Terminal resource monitor / task manager #zenith # Terminal resource monitor / task manager
btop # Terminal resource monitor / task manager btop # Terminal resource monitor / task manager
htop # Terminal resource monitor / task manager htop # Terminal resource monitor / task manager
niv # NixOS dependency management niv # NixOS dependency management
colmena # NixOS config deployment colmena # NixOS config deployment
keepassxc # Password manager. TODO Wayland: Maybe QT_QPA_PLATFORM defined in ghostwriter.nix fixed blurry fonts? keepassxc # Password manager.
warp # Fast and secure file transfer warp # Fast and secure file transfer
]; ];
}; };