re-added desktop environment

This commit is contained in:
Nicholas Young 2023-02-16 12:57:57 -08:00
parent cd8a862b4e
commit 3d5da21c15
4 changed files with 39 additions and 58 deletions

View file

@ -6,8 +6,41 @@
{ {
boot.supportedFilesystems = [ "nfts" ]; networking.networkmanager.enable = true;
security.pam.services.kwallet = {
name = "kdewallet";
enableKwallet = true;
};
services.xserver = {
enable = true;
layout = "us";
xkbOptions = "caps:super";
desktopManager.plasma5.enable = true;
desktopManager.default = "none";
displayManager = {
sddm.enable = true;
};
libinput = {
enable = true;
touchpad = {
tapping = true;
naturalScrolling = true;
disableWhileTyping = true;
tappingDragLock = true;
additionalOptions = ''
Option "TappingButtonMap" "lmr"
'';
};
};
};
boot.supportedFilesystems = [ "nfts" ];
boot.loader.systemd-boot.configurationLimit = 5; boot.loader.systemd-boot.configurationLimit = 5;
nix.settings.auto-optimise-store = true; nix.settings.auto-optimise-store = true;

View file

@ -1,43 +0,0 @@
{ config, pkgs, ... }:
{
networking.networkmanager.enable = true;
security.pam.services.kwallet = {
name = "kdewallet";
enableKwallet = true;
};
#environment.systemPackages = with pkgs; [
# KWallet
# pkgs.libsForQt5.kwallet
# pkgs.libsForQt5.kwallet-pam
# pkgs.libsForQt5.kwalletmanager
#];
services.xserver = {
enable = true;
layout = "us";
xkbOptions = "caps:super";
desktopManager.plasma5.enable = true;
displayManager = {
sddm.enable = true;
};
libinput = {
enable = true;
touchpad = {
tapping = true;
naturalScrolling = true;
disableWhileTyping = true;
tappingDragLock = true;
additionalOptions = ''
Option "TappingButtonMap" "lmr"
'';
};
};
};
}

View file

@ -47,7 +47,6 @@ in
packages = with pkgs; [ packages = with pkgs; [
# utilities # utilities
ffmpeg-full ffmpeg-full
frei0r # kdenlive video plugins
pandoc pandoc
fontpreview fontpreview
@ -59,8 +58,6 @@ in
rmtrash rmtrash
ripgrep ripgrep
fd fd
neofetch
ranger
exa exa
xdotool xdotool
vhs vhs
@ -68,25 +65,14 @@ in
nodejs # required for coc-nvim nodejs # required for coc-nvim
# Gui application # Gui application
darktable # RAW processing
firefox # Internet access firefox # Internet access
inkscape # Vector drawing
jellyfin-media-player # plex-like media player client
kicad # PCB design
krita # Raster drawing
libreoffice # Office editing libreoffice # Office editing
obsidian # Markdown and notes
qalculate-gtk # unit-friendly calculator qalculate-gtk # unit-friendly calculator
vscodium # when vim isn't enough vscodium # when vim isn't enough
libsForQt5.kate # kate/kwrite libsForQt5.kate # kate/kwrite
libsForQt5.ark # kde archive manager libsForQt5.ark # kde archive manager
# Kdenlive and deps
libsForQt5.kdenlive
mediainfo
mlt
# Drawing tablet driver # Drawing tablet driver
opentabletdriver opentabletdriver
]; ];

View file

@ -91,6 +91,11 @@ in
opentabletdriver opentabletdriver
]; ];
xsession = {
enable = true;
windowManager.command = "plasma5-session";
};
sessionVariables = { sessionVariables = {
NIX_SHELL_PRESERVE_PROMPT = 1; NIX_SHELL_PRESERVE_PROMPT = 1;
}; };