modularize desktop components

This commit is contained in:
2024-04-13 16:42:51 +02:00
parent d3da8ba3ac
commit e0176ec2d9
14 changed files with 141 additions and 96 deletions

View File

@@ -16,7 +16,6 @@
../../modules/hardware/bluetooth.nix
../../modules/hardware/printing.nix
../../modules/hardware/sound.nix
../../modules/desktop/x11-plasma.nix
../../modules/services/docker.nix
];
@@ -29,7 +28,7 @@
users.users.jonas = {
isNormalUser = true;
description = "Jonas";
extraGroups = [ "networkmanager" "wheel" ];
extraGroups = [ "networkmanager" "wheel" "docker"];
packages = with pkgs; [ ];
};
users.defaultUserShell = pkgs.zsh;

View File

@@ -2,7 +2,7 @@
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help).
{ config, pkgs, inputs, ... }:
{ pkgs, inputs, ... }:
{
imports =
@@ -16,11 +16,15 @@
../../modules/hardware/bluetooth.nix
../../modules/hardware/printing.nix
../../modules/hardware/sound.nix
../../modules/desktop/hyprland.nix
../../modules/services/docker.nix
../../modules/desktop/dm
../../modules/desktop/de
];
nix.settings.experimental-features = [ "nix-command" "flakes" ];
desktop.dm.name = "sddm";
desktop.dm.autologin = "jonas";
desktop.de.plasma.enable = true;
# Enable touchpad support (enabled default in most desktopManager).
# services.xserver.libinput.enable = true;
@@ -29,7 +33,7 @@
users.users.jonas = {
isNormalUser = true;
description = "Jonas";
extraGroups = [ "networkmanager" "wheel" ];
extraGroups = [ "networkmanager" "wheel" "docker"];
packages = with pkgs; [ ];
};
users.defaultUserShell = pkgs.zsh;

View File

@@ -6,18 +6,18 @@
{
imports = [ ];
boot.initrd.availableKernelModules = [ "sd_mod" "sr_mod" ];
boot.initrd.availableKernelModules = [ "ata_piix" "ohci_pci" "ehci_pci" "ahci" "sd_mod" "sr_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/0bbdc54a-243c-4b40-8566-c12adff1417a";
{ device = "/dev/disk/by-uuid/a28cd2c0-67f3-4492-9cd9-996fdbe2b8ef";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/5DE9-BA20";
{ device = "/dev/disk/by-uuid/0134-2DF5";
fsType = "vfat";
};
@@ -28,8 +28,8 @@
# still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true;
# networking.interfaces.eth0.useDHCP = lib.mkDefault true;
# networking.interfaces.enp0s3.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
virtualisation.hypervGuest.enable = true;
virtualisation.virtualbox.guest.enable = true;
}