add gnome3

This commit is contained in:
Grigory Shipunov 2022-06-14 21:34:00 +02:00
parent f422ad701c
commit fc611d6083
Signed by: 0xa
GPG key ID: 91FA5E5BF9AA901C
5 changed files with 118 additions and 57 deletions

View file

@ -24,16 +24,19 @@
./hosts/microwave/secrets.nix ./hosts/microwave/secrets.nix
./hosts/microwave/hardware-configuration.nix ./hosts/microwave/hardware-configuration.nix
./modules/graphical.nix ./modules/graphical.nix
./modules/basic-tools.nix
./modules/gnupg.nix
./modules/hw-accel-intel.nix ./modules/hw-accel-intel.nix
./modules/kernel-latest.nix ./modules/kernel-latest.nix
./modules/virtualization.nix ./modules/virtualization.nix
./modules/emacs.nix ./modules/emacs.nix
./modules/radio.nix ./modules/radio.nix
./modules/tlp.nix ./modules/tlp.nix
# ./modules/chromium.nix ./modules/chromium.nix
./modules/wireguard.nix ./modules/wireguard.nix
./modules/binary-caches.nix ./modules/binary-caches.nix
./modules/science.nix ./modules/science.nix
./modules/gnome.nix
]; ];
}; };
}; };

View file

@ -5,6 +5,8 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
# services.xserver.videoDrivers = [ "displaylink" "modesetting" ];
# SWAP # SWAP
zramSwap = { zramSwap = {
enable = true; enable = true;

52
modules/gnome.nix Normal file
View file

@ -0,0 +1,52 @@
{ config, pkgs, ... }: {
environment.systemPackages = with pkgs; [
celluloid
gnome.gnome-boxes
gnome.gnome-tweaks
nextcloud-client
];
environment.gnome.excludePackages = with pkgs; [
gnome.totem
gnome.geary
gnome-console
epiphany
];
services.gnome = {
evolution-data-server.enable = true;
gnome-keyring.enable = true;
gnome-online-accounts.enable = true;
games.enable = true;
};
programs = {
seahorse.enable = true;
evolution = {
enable = true;
plugins = [ pkgs.evolution-ews ];
};
gnome-terminal.enable = true;
};
qt5 = {
enable = true;
platformTheme = "gnome";
style = "adwaita-dark";
};
programs.gnupg.agent.pinentryFlavor = "gnome3";
services.xserver = {
enable = true;
desktopManager.gnome.enable = true;
displayManager.gdm = {
enable = true;
wayland = true;
};
};
}

View file

@ -2,37 +2,16 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = [
./basic-tools.nix
./gnupg.nix
];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
firefox-wayland firefox-wayland
dino dino
alacritty
xclip
flameshot flameshot
wl-clipboard wl-clipboard
brightnessctl
feh
mpv
zathura
pulsemixer
pulseaudioFull pulseaudioFull
screen-message screen-message
cmus
gtk-engine-murrine
gtk_engines
gsettings-desktop-schemas
pamixer
qbittorrent qbittorrent
xdg-utils
]; ];
services.acpid.enable = true;
programs.light.enable = true;
#on the desktop, we need nice fonts ^^ #on the desktop, we need nice fonts ^^
fonts.fonts = with pkgs; [ fonts.fonts = with pkgs; [
dejavu_fonts dejavu_fonts
@ -74,9 +53,9 @@
}; };
# Enable sound. # Enable sound.
sound.enable = true;
security.rtkit.enable = true; security.rtkit.enable = true;
hardware.pulseaudio = { hardware.pulseaudio = {
enable = false;
zeroconf.discovery.enable = true; zeroconf.discovery.enable = true;
extraClientConf = '' extraClientConf = ''
autospawn=yes autospawn=yes
@ -94,32 +73,6 @@
package = pkgs.bluezFull; package = pkgs.bluezFull;
}; };
services.blueman.enable = true;
services.xserver.enable = false;
programs.xwayland.enable = true;
programs.sway = {
enable = true;
wrapperFeatures.gtk = true;
extraPackages = with pkgs; [
swaylock
swayidle
wl-clipboard
mako
alacritty
wofi
waybar
gnome3.adwaita-icon-theme
i3status-rust
];
};
environment.sessionVariables = { GTK_THEME = "Adwaita:dark"; };
environment.loginShellInit = ''
if [ -z $DISPLAY ] && [ "$(tty)" = "/dev/tty1" ]; then
exec sway
fi
'';
xdg.portal.wlr.enable = true;
nix = { nix = {
binaryCaches = [ binaryCaches = [
@ -132,12 +85,4 @@
programs.zsh.vteIntegration = true; programs.zsh.vteIntegration = true;
programs.bash.vteIntegration = true; programs.bash.vteIntegration = true;
services.upower.enable = true; services.upower.enable = true;
services.udisks2.enable = true;
environment.shellAliases = {
mnt = "udisksctl mount -b";
umnt = "udisksctl unmount -b";
};
qt5.platformTheme = "gnome";
} }

59
modules/sway.nix Normal file
View file

@ -0,0 +1,59 @@
{ config, pkgs, ... }: {
environment.systemPackages = with pkgs; [
firefox-wayland
dino
feh
mpv
zathura
brightnessctl
alacritty
pulsemixer
cmus
gtk-engine-murrine
gtk_engines
gsettings-desktop-schemas
xdg-utils
];
services.acpid.enable = true;
programs.light.enable = true;
services.blueman.enable = true;
services.xserver.enable = false;
programs.xwayland.enable = true;
programs.sway = {
enable = true;
wrapperFeatures.gtk = true;
extraPackages = with pkgs; [
swaylock
swayidle
wl-clipboard
mako
alacritty
wofi
waybar
gnome3.adwaita-icon-theme
i3status-rust
];
};
environment.sessionVariables = { GTK_THEME = "Adwaita:dark"; };
environment.loginShellInit = ''
if [ -z $DISPLAY ] && [ "$(tty)" = "/dev/tty1" ]; then
exec sway
fi
'';
xdg.portal.wlr.enable = true;
services.udisks2.enable = true;
environment.shellAliases = {
mnt = "udisksctl mount -b";
umnt = "udisksctl unmount -b";
unlock = "udisksctl unlock -b";
lock = "udisksctl lock -b";
};
qt5.platformTheme = "gnome";
}