[NixOS] Move desktop stuff out of base.nix

This commit is contained in:
Ivan Malison 2023-06-28 21:45:08 -06:00
parent a05cb56d60
commit 31494a27fb
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
4 changed files with 47 additions and 35 deletions

View File

@ -16,11 +16,8 @@
nixpkgs.overlays = with inputs; [
nix.overlays.default
xmonad.overlay
xmonad-contrib.overlay
notifications-tray-icon.overlay
(import ./overlay.nix)
] ++ taffybar.overlays;
];
# Allow all the things
nixpkgs.config.allowUnfree = true;
@ -72,7 +69,7 @@
services.blueman.enable = true;
# Printing
# services.printing.enable = true;
services.printing.enable = true;
# Keyboard/Keymap
console.keyMap = "us";
@ -91,8 +88,6 @@
services.openssh.enable = true;
services.autorandr.enable = true;
services.locate.enable = true;
virtualisation.docker.enable = true;
@ -102,32 +97,4 @@
services.logind.extraConfig = "RuntimeDirectorySize=5G";
services.dbus.packages = [ pkgs.gcr ];
services.xserver = {
exportConfiguration = true;
enable = true;
layout = "us";
desktopManager = {
plasma5.enable = true;
};
windowManager = {
session = [
{
name = "xmonad";
start = ''
/usr/bin/env imalison-xmonad &
waitPID=$!
'';
}
];
};
displayManager = {
sddm = {
enable = true;
};
sessionCommands = ''
systemctl --user import-environment GDK_PIXBUF_MODULE_FILE DBUS_SESSION_BUS_ADDRESS PATH
'';
};
};
}

41
nixos/desktop.nix Normal file
View File

@ -0,0 +1,41 @@
{ config, pkgs, options, inputs, ... }:
{
imports = [
./fonts.nix
];
nixpkgs.overlays = with inputs; [
xmonad.overlay
xmonad-contrib.overlay
notifications-tray-icon.overlay
] ++ taffybar.overlays;
services.autorandr.enable = true;
services.xserver = {
exportConfiguration = true;
enable = true;
layout = "us";
desktopManager = {
plasma5.enable = true;
};
windowManager = {
session = [
{
name = "xmonad";
start = ''
/usr/bin/env imalison-xmonad &
waitPID=$!
'';
}
];
};
displayManager = {
sddm = {
enable = true;
};
sessionCommands = ''
systemctl --user import-environment GDK_PIXBUF_MODULE_FILE DBUS_SESSION_BUS_ADDRESS PATH
'';
};
};
}

View File

@ -10,6 +10,8 @@
../essential-no-arm.nix
../essential.nix
../code.nix
../essential.nix
../desktop.nix
];
hardware.enableRedistributableFirmware = true;

View File

@ -6,6 +6,8 @@
../full.nix
../dfinity.nix
../games.nix
../essential.nix
../desktop.nix
];
environment.systemPackages = with pkgs; [