[NixOS] Move xmonad config into its own module

This commit is contained in:
Ivan Malison 2023-07-12 17:29:01 -06:00
parent a427ca2dca
commit 891f8de735
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
4 changed files with 41 additions and 26 deletions

View File

@ -4,12 +4,6 @@
./fonts.nix ./fonts.nix
inputs.home-manager.nixosModule inputs.home-manager.nixosModule
]; ];
nixpkgs.overlays = with inputs; [
xmonad.overlay
xmonad-contrib.overlay
notifications-tray-icon.overlay
(import ../dotfiles/config/xmonad/overlay.nix)
] ++ taffybar.overlays;
services.autorandr.enable = true; services.autorandr.enable = true;
@ -20,17 +14,6 @@
desktopManager = { desktopManager = {
plasma5.enable = true; plasma5.enable = true;
}; };
windowManager = {
session = [
{
name = "xmonad";
start = ''
/usr/bin/env imalison-xmonad &
waitPID=$!
'';
}
];
};
displayManager = { displayManager = {
sddm = { sddm = {
enable = true; enable = true;
@ -64,14 +47,6 @@
xorg.xwininfo xorg.xwininfo
xsettingsd xsettingsd
# Haskell Desktop
haskellPackages.xmonad
haskellPackages.imalison-xmonad
haskellPackages.notifications-tray-icon
haskellPackages.gtk-sni-tray
haskellPackages.status-notifier-item
haskellPackages.dbus-hslogger
# Desktop # Desktop
alacritty alacritty
betterlockscreen betterlockscreen

View File

@ -5,6 +5,7 @@
./arm-incompatible.nix ./arm-incompatible.nix
./games.nix ./games.nix
./desktop.nix ./desktop.nix
./xmonad.nix
./code.nix ./code.nix
./extra.nix ./extra.nix
./internet-computer.nix ./internet-computer.nix

View File

@ -2,6 +2,9 @@
imports = [ imports = [
../internet-computer.nix ../internet-computer.nix
../raspberry-pi.nix ../raspberry-pi.nix
../desktop.nix
../xmonad.nix
../code.nix
]; ];
services.xrdp.enable = true; services.xrdp.enable = true;
@ -23,7 +26,6 @@
}; };
networking.hostName = "biskcomp"; networking.hostName = "biskcomp";
# hardware.video.hidpi.enable = true;
system.stateVersion = "21.05"; system.stateVersion = "21.05";
} }

37
nixos/xmonad.nix Normal file
View File

@ -0,0 +1,37 @@
{ config, pkgs, options, inputs, ... }:
{
nixpkgs.overlays = with inputs; [
xmonad.overlay
xmonad-contrib.overlay
notifications-tray-icon.overlay
(import ../dotfiles/config/xmonad/overlay.nix)
] ++ taffybar.overlays;
services.xserver = {
windowManager = {
session = [
{
name = "xmonad";
start = ''
/usr/bin/env imalison-xmonad &
waitPID=$!
'';
}
];
};
};
environment.systemPackages = with pkgs; [
# Haskell Desktop
haskellPackages.xmonad
haskellPackages.imalison-xmonad
haskellPackages.notifications-tray-icon
haskellPackages.gtk-sni-tray
haskellPackages.status-notifier-item
haskellPackages.dbus-hslogger
];
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.imalison = (import ./home-manager.nix) inputs;
}