diff options
| -rw-r--r-- | flake.nix | 5 | ||||
| -rw-r--r-- | hosts/microwave/configuration.nix | 2 | ||||
| -rw-r--r-- | modules/gnome.nix | 52 | ||||
| -rw-r--r-- | modules/graphical.nix | 57 | ||||
| -rw-r--r-- | modules/sway.nix | 59 |
5 files changed, 118 insertions, 57 deletions
@@ -24,16 +24,19 @@ ./hosts/microwave/secrets.nix ./hosts/microwave/hardware-configuration.nix ./modules/graphical.nix + ./modules/basic-tools.nix + ./modules/gnupg.nix ./modules/hw-accel-intel.nix ./modules/kernel-latest.nix ./modules/virtualization.nix ./modules/emacs.nix ./modules/radio.nix ./modules/tlp.nix - # ./modules/chromium.nix + ./modules/chromium.nix ./modules/wireguard.nix ./modules/binary-caches.nix ./modules/science.nix + ./modules/gnome.nix ]; }; }; diff --git a/hosts/microwave/configuration.nix b/hosts/microwave/configuration.nix index e3a629c..70ccc9c 100644 --- a/hosts/microwave/configuration.nix +++ b/hosts/microwave/configuration.nix @@ -5,6 +5,8 @@ { config, pkgs, ... }: { + # services.xserver.videoDrivers = [ "displaylink" "modesetting" ]; + # SWAP zramSwap = { enable = true; diff --git a/modules/gnome.nix b/modules/gnome.nix new file mode 100644 index 0000000..13ebba3 --- /dev/null +++ b/modules/gnome.nix @@ -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; + }; + }; +} diff --git a/modules/graphical.nix b/modules/graphical.nix index 9c86493..fd0e6aa 100644 --- a/modules/graphical.nix +++ b/modules/graphical.nix @@ -2,37 +2,16 @@ { config, pkgs, ... }: { - imports = [ - ./basic-tools.nix - ./gnupg.nix - ]; - environment.systemPackages = with pkgs; [ firefox-wayland dino - alacritty - xclip flameshot wl-clipboard - brightnessctl - feh - mpv - zathura - pulsemixer pulseaudioFull screen-message - cmus - gtk-engine-murrine - gtk_engines - gsettings-desktop-schemas - pamixer qbittorrent - xdg-utils ]; - services.acpid.enable = true; - programs.light.enable = true; - #on the desktop, we need nice fonts ^^ fonts.fonts = with pkgs; [ dejavu_fonts @@ -74,9 +53,9 @@ }; # Enable sound. - sound.enable = true; security.rtkit.enable = true; hardware.pulseaudio = { + enable = false; zeroconf.discovery.enable = true; extraClientConf = '' autospawn=yes @@ -94,32 +73,6 @@ 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 = { binaryCaches = [ @@ -132,12 +85,4 @@ programs.zsh.vteIntegration = true; programs.bash.vteIntegration = true; services.upower.enable = true; - - services.udisks2.enable = true; - environment.shellAliases = { - mnt = "udisksctl mount -b"; - umnt = "udisksctl unmount -b"; - }; - - qt5.platformTheme = "gnome"; } diff --git a/modules/sway.nix b/modules/sway.nix new file mode 100644 index 0000000..173a308 --- /dev/null +++ b/modules/sway.nix @@ -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"; + +} |