start converting modules to options

This commit is contained in:
Kopatz
2024-04-16 15:01:48 +02:00
parent 859e4c4b4e
commit ec12a6b917
14 changed files with 100 additions and 52 deletions

View File

@@ -65,6 +65,7 @@
inherit inputs outputs; inherit inputs outputs;
}; };
modules = [ modules = [
./modules
./users/kopatz ./users/kopatz
./modules/collections/desktop.nix ./modules/collections/desktop.nix
./systems/pc/configuration.nix ./systems/pc/configuration.nix

View File

@@ -1,10 +1,9 @@
{pkgs, ...}: {pkgs, config, ...}:
{ {
imports = [ imports = [
#../graphical/lxqt.nix
../cli-tools.nix ../cli-tools.nix
../docker.nix ../docker.nix
../fh/scanning.nix #../fh/scanning.nix
../flatpak.nix ../flatpak.nix
../gpg.nix ../gpg.nix
../graphical/audio.nix ../graphical/audio.nix
@@ -20,7 +19,6 @@
../hardware/firmware.nix ../hardware/firmware.nix
../hardware/nvidia.nix ../hardware/nvidia.nix
../hardware/ssd.nix ../hardware/ssd.nix
../hardware/wooting.nix
../kernel.nix # use latest kernel ../kernel.nix # use latest kernel
../nftables.nix ../nftables.nix
../nix/index.nix ../nix/index.nix
@@ -33,8 +31,10 @@
../tmpfs.nix ../tmpfs.nix
../virt-manager.nix ../virt-manager.nix
../wireshark.nix ../wireshark.nix
#../fh/forensik.nix
#../graphical/hyprland.nix
#../hardware/vfio.nix too stupid for this
]; ];
kop.wooting.enable = true;
#kop.tmpfs.enabled = true;
#kop.wireshark.enabled = true;
#kop.virt-manager.enabled = true;
} }

12
modules/default.nix Normal file
View File

@@ -0,0 +1,12 @@
{ pkgs, config, ...}:
{
imports = [
./fh
./games
./graphical
./hardware
./nix
./services
./support
];
}

6
modules/fh/default.nix Normal file
View File

@@ -0,0 +1,6 @@
{ pkgs, config, ...}:
{
imports = [
];
}

View File

@@ -0,0 +1,6 @@
{ pkgs, config, ...}:
{
imports = [
];
}

View File

@@ -0,0 +1,6 @@
{ pkgs, config, ...}:
{
imports = [
];
}

View File

@@ -8,10 +8,12 @@
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
taisei taisei
tetrio
osu-lazer-bin osu-lazer-bin
wineWowPackages.unstableFull wineWowPackages.unstableFull
winetricks winetricks
lutris lutris
mangohud
prismlauncher prismlauncher
#libs #libs
]; ];

View File

@@ -41,15 +41,12 @@ in
keepassxc keepassxc
xfce.thunar xfce.thunar
remmina remmina
#nextcloud-client
thunderbird thunderbird
rofi rofi
localsend localsend
element-desktop #element-desktop
tetrio
krita krita
libreoffice-fresh libreoffice-fresh
mangohud
screenshot screenshot
anki anki
mpv mpv

View File

@@ -0,0 +1,6 @@
{ pkgs, config, ...}:
{
imports = [
./wooting.nix
];
}

View File

@@ -1,5 +1,14 @@
{ pkgs, lib, ...}: { config, pkgs, lib, ...}:
with lib;
let let
cfg = config.kop.wooting;
in
{
options.kop.wooting = {
enable = mkEnableOption "Enable wooting hardware support";
};
config = let
wooting-udev = pkgs.stdenv.mkDerivation rec { wooting-udev = pkgs.stdenv.mkDerivation rec {
pname = "wooting-udev-rules"; pname = "wooting-udev-rules";
version = "unstable-2023-03-31"; version = "unstable-2023-03-31";
@@ -21,11 +30,11 @@ let
maintainers = with maintainers; [ davidtwco ]; maintainers = with maintainers; [ davidtwco ];
}; };
}; };
in in mkIf cfg.enable {
{
services.udev.packages = [ wooting-udev ]; services.udev.packages = [ wooting-udev ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
wootility wootility
]; ];
};
} }

6
modules/nix/default.nix Normal file
View File

@@ -0,0 +1,6 @@
{ pkgs, config, ...}:
{
imports = [
];
}

View File

@@ -0,0 +1,6 @@
{ pkgs, config, ...}:
{
imports = [
];
}

View File

@@ -0,0 +1,6 @@
{ pkgs, config, ...}:
{
imports = [
];
}

View File

@@ -27,9 +27,6 @@
boot.initrd.systemd.network.wait-online.enable = false; boot.initrd.systemd.network.wait-online.enable = false;
systemd.network.wait-online.enable = false; systemd.network.wait-online.enable = false;
nix.settings.trusted-substituters = [ "https://ai.cachix.org" ];
nix.settings.trusted-public-keys = [ "ai.cachix.org-1:N9dzRK+alWwoKXQlnn0H6aUx0lU/mspIoz8hMvGvbbc=" ];
services.nscd.enableNsncd = false; services.nscd.enableNsncd = false;
#disable firewall when doing ipv6 vm stuff #disable firewall when doing ipv6 vm stuff
#networking.firewall.enable = lib.mkForce false; #networking.firewall.enable = lib.mkForce false;
@@ -61,11 +58,6 @@
# Enable CUPS to print documents. # Enable CUPS to print documents.
services.printing.enable = true; services.printing.enable = true;
# Enable touchpad support (enabled default in most desktopManager).
# services.xserver.libinput.enable = true;
# Enable automatic login for the user. # Enable automatic login for the user.
#services.xserver.displayManager.autoLogin.enable = true; #services.xserver.displayManager.autoLogin.enable = true;
#services.xserver.displayManager.autoLogin.user = "kopatz"; #services.xserver.displayManager.autoLogin.user = "kopatz";
@@ -73,13 +65,6 @@
# Allow unfree packages # Allow unfree packages
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
# List packages installed in system profile. To search, run:
# $ nix search wget
environment.systemPackages = with pkgs; [
# vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
# wget
];
security.pki.certificates = [ '' security.pki.certificates = [ ''
-----BEGIN CERTIFICATE----- -----BEGIN CERTIFICATE-----
MIIBjTCCATKgAwIBAgIRAMVH2+JHZ3wm2fLUlKjTYDswCgYIKoZIzj0EAwIwJDEM MIIBjTCCATKgAwIBAgIRAMVH2+JHZ3wm2fLUlKjTYDswCgYIKoZIzj0EAwIwJDEM