feat(de): switch to gnome

This commit is contained in:
dusk 2021-01-17 18:34:34 +03:00
parent 23c986f8f3
commit 3b31438f06
Signed by: dusk
GPG Key ID: 1D8F8FAF2294D6EA
2 changed files with 21 additions and 22 deletions

View File

@ -30,18 +30,15 @@
}; };
}; };
/*services = { security.pam.services.patriot.enableGnomeKeyring = true;
services = {
gnome3 = {
gnome-keyring.enable = true;
};
xserver = { xserver = {
enable = true; enable = true;
desktopManager.plasma5.enable = true; desktopManager.gnome3.enable = true;
displayManager = { displayManager.gdm.enable = true;
autoLogin = {
enable = true;
user = "patriot";
};
sddm.enable = true;
};
}; };
}; };
environment.systemPackages = [ pkgs.kde-gtk-config ];*/
} }

View File

@ -213,6 +213,8 @@ in
font-awesome font-awesome
(nerdfonts.override { fonts = [ "Iosevka" ]; }) (nerdfonts.override { fonts = [ "Iosevka" ]; })
# Programs # Programs
gnome3.gnome-tweaks
gnome3.seahorse
wine-staging wine-staging
cachix cachix
plasma5.plasma-browser-integration plasma5.plasma-browser-integration
@ -253,7 +255,7 @@ in
inherit font; inherit font;
}; };
sway = { sway = {
enable = true; enable = false;
extraSessionCommands = '' extraSessionCommands = ''
export SDL_VIDEODRIVER=wayland export SDL_VIDEODRIVER=wayland
# needs qt5.qtwayland in systemPackages # needs qt5.qtwayland in systemPackages
@ -338,7 +340,7 @@ in
programs = { programs = {
alacritty = { alacritty = {
enable = true; enable = false;
settings = { settings = {
font = { font = {
normal = { family = font; }; normal = { family = font; };
@ -481,15 +483,15 @@ in
# use this if they aren't displayed properly: # use this if they aren't displayed properly:
export _JAVA_AWT_WM_NONREPARENTING=1 export _JAVA_AWT_WM_NONREPARENTING=1
''; '';
loginExtra = # loginExtra =
let # let
deCmd = if config.wayland.windowManager.sway.enable then "sway" else (if config.wayland.windowManager.hikari.enable then "hikari" else throw "Need a window manager to start!"); # deCmd = if config.wayland.windowManager.sway.enable then "sway" else (if config.wayland.windowManager.hikari.enable then "hikari" else throw "Need a window manager to start!");
in # in
'' # ''
if [ "$(${pkgs.coreutils}/bin/tty)" = "/dev/tty1" ]; then # if [ "$(${pkgs.coreutils}/bin/tty)" = "/dev/tty1" ]; then
exec ${pkgBin deCmd} # exec ${pkgBin deCmd}
fi # fi
''; # '';
initExtra = '' initExtra = ''
bindkey "$terminfo[kRIT5]" forward-word bindkey "$terminfo[kRIT5]" forward-word
bindkey "$terminfo[kLFT5]" backward-word bindkey "$terminfo[kLFT5]" backward-word
@ -528,7 +530,7 @@ in
acc = "#${acColor}"; acc = "#${acColor}";
in in
{ {
enable = true; enable = false;
colors = { colors = {
window = { window = {
background = bgc; background = bgc;