[NixOS] Tweaks for kat

This commit is contained in:
Kat Huang 2020-07-10 12:33:10 -07:00
parent e045ee33ee
commit f072eb4b18
2 changed files with 5 additions and 35 deletions

View File

@ -25,7 +25,6 @@ in
{ {
nixpkgs.overlays = [ nixpkgs.overlays = [
(import ./overlays.nix) (import ./overlays.nix)
(import ../dotfiles/config/taffybar/taffybar/environment.nix)
]; ];
# Allow all the things # Allow all the things
@ -141,14 +140,6 @@ in
plasma5.breeze-gtk plasma5.breeze-gtk
plasma5.breeze-qt5 plasma5.breeze-qt5
# Haskell Desktop
(import ../dotfiles/config/taffybar/default.nix)
(import ../dotfiles/config/xmonad/default.nix)
# notifications-tray-icon
haskellPackages.status-notifier-item
haskellPackages.xmonad
haskellPackages.dbus-hslogger
# Desktop # Desktop
autorandr autorandr
betterlockscreen betterlockscreen
@ -156,6 +147,7 @@ in
clipit clipit
feh feh
gnome3.gpaste gnome3.gpaste
gnome3.gnome-tweaks
kdeconnect kdeconnect
libnotify libnotify
lxqt.lxqt-powermanagement lxqt.lxqt-powermanagement
@ -334,36 +326,14 @@ in
desktopManager = { desktopManager = {
plasma5.enable = true; plasma5.enable = true;
}; };
windowManager = {
session = [
{
name = "xmonad";
start = ''
/usr/bin/env imalison-xmonad &
waitPID=$!
'';
}
{
name = "waymonad";
start = ''
/usr/bin/env waymonad
waitPID=$!
'';
}
];
};
displayManager = { displayManager = {
sddm = { sddm.enable = true;
enable = true;
};
sessionCommands = '' sessionCommands = ''
systemctl --user import-environment GDK_PIXBUF_MODULE_FILE DBUS_SESSION_BUS_ADDRESS PATH systemctl --user import-environment GDK_PIXBUF_MODULE_FILE DBUS_SESSION_BUS_ADDRESS PATH
''; '';
}; };
}; };
virtualisation.docker.enable = true;
users.extraUsers = let users.extraUsers = let
extraGroups = [ extraGroups = [
"audio" "audio"
@ -385,16 +355,14 @@ in
in { in {
imalison = userDefaults // { imalison = userDefaults // {
name = "imalison"; name = "imalison";
uid = 1000;
home = "/home/imalison"; home = "/home/imalison";
shell = pkgs.zsh; shell = pkgs.zsh;
}; };
kat = userDefaults // { kat = userDefaults // {
name = "kat"; name = "kat";
uid = 1001;
home = "/home/kat"; home = "/home/kat";
shell = pkgs.zsh; shell = pkgs.zsh;
}; };
}; };
nix.trustedUsers = ["imalison"]; nix.trustedUsers = ["imalison" "kat"];
} }

View File

@ -9,6 +9,8 @@
../configuration.nix ../configuration.nix
]; ];
system.stateVersion = "20.03";
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];