From 031934047c71b381a765fdbed26e8d12375a764b Mon Sep 17 00:00:00 2001 From: coolneng Date: Sat, 16 May 2020 05:20:59 +0200 Subject: [PATCH] Migrate to firefox and update Readme --- README.org | 17 +++++++++++------ modules/gui.nix | 2 +- modules/software.nix | 3 ++- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/README.org b/README.org index d6a1da3..cd0d6ca 100644 --- a/README.org +++ b/README.org @@ -1,13 +1,18 @@ * NixOS Laptop - Configuration files for my personal machine, powered by [[https://nixos.org/][NixOS]]. +Configuration files for my personal machine, powered by [[https://nixos.org/][NixOS]]. ** Modules - The configuration is sliced into different files, per category: +The configuration is sliced into different files, per category: - - ZFS pool configuration: hardware-configuration.nix - - Network configuration: networking.nix - - Printing and scanner client: printing.nix +- Globally installed packages: software.nix +- Network and VPN configuration: networking.nix +- Window manager and userland services: gui.nix +- Synchronization and backup services: datasync.nix +- Sound and music setup: audio.nix +- Development tools: development.nix +- Printing and scanner client: printing.nix +- ZFS pool configuration: hardware-configuration.nix - All the modules are imported in *configuration.nix* +All the modules are imported in *configuration.nix* diff --git a/modules/gui.nix b/modules/gui.nix index 51cca14..4d779e5 100644 --- a/modules/gui.nix +++ b/modules/gui.nix @@ -35,13 +35,13 @@ kitty ]; extraSessionCommands = '' + export MOZ_ENABLE_WAYLAND=1 export MOZ_DBUS_REMOTE=1 export GRIM_DEFAULT_DIR=/home/coolneng/Photos/Screenshots export _JAVA_AWT_WM_NONREPARENTING=1 export QT_QPA_PLATFORM=wayland export QT_WAYLAND_DISABLE_WINDOWDECORATION="1" export SDL_VIDEODRIVER=wayland - export GTK_THEME=Adapta-Eta export WLR_DRM_NO_ATOMIC=1 ''; wrapperFeatures.gtk = true; diff --git a/modules/software.nix b/modules/software.nix index e8d801e..0d859f2 100644 --- a/modules/software.nix +++ b/modules/software.nix @@ -11,7 +11,7 @@ passff-host gitAndTools.pass-git-helper # Browsers - (firefox-wayland.override { extraNativeMessagingHosts = [ passff-host ]; }) + (firefox.override { extraNativeMessagingHosts = [ passff-host ]; }) chromium # LaTeX texlive.combined.scheme-full @@ -33,6 +33,7 @@ lorri nixfmt podman-compose + shellcheck # Rice adapta-gtk-theme paper-icon-theme