feat: rearrange nix modules

This commit is contained in:
Felix Schröter 2020-03-13 18:45:29 +01:00 committed by Felix Schroeter
parent 572d1d43c0
commit 89f6ab94b4
17 changed files with 28 additions and 28 deletions

View file

@ -1,8 +0,0 @@
{ config, pkgs, ... }:
{
# Enable xmonad
services.xserver.displayManager.lightdm.enable = true;
services.xserver.windowManager.default = "xmonad";
services.xserver.windowManager.xmonad.enable = true;
}

9
desktop/default.nix Normal file
View file

@ -0,0 +1,9 @@
{ config, pkgs, ... }:
{
imports = [
./x11.nix
./gtk.nix
./gnome.nix
];
}

View file

@ -1,6 +1,10 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = [
./planck.nix
];
boot.initrd.luks.devices = { boot.initrd.luks.devices = {
root = { root = {
device = "/dev/disk/by-partlabel/nixos"; device = "/dev/disk/by-partlabel/nixos";

View file

@ -4,16 +4,11 @@
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
<home-manager/nixos> <home-manager/nixos>
./common/base-hardware.nix ./hardware/base.nix
./common/gpu-nvidia.nix ./hardware/gpu-nvidia.nix
./common/ledger.nix ./hardware/ledger.nix
./common/planck.nix ./system
./common/system.nix ./desktop
./common/nix.nix
./common/i18n.nix
./common/x11.nix
./common/gtk.nix
./common/gnome.nix
]; ];
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;

View file

@ -1,6 +1,11 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = [
./i18n.nix
./nix.nix
];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
wget wget
curl curl

View file

@ -4,16 +4,11 @@
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
<home-manager/nixos> <home-manager/nixos>
./common/base-hardware.nix ./hardware/base.nix
./common/gpu-bumblebee.nix ./hardware/gpu-bumblebee.nix
./common/planck.nix ./system
./common/system.nix ./desktop
./common/nix.nix ./virtualisaiton/docker.nix
./common/i18n.nix
./common/x11.nix
./common/gtk.nix
./common/gnome.nix
./common/docker.nix
]; ];
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;