From 4d870ead213f469a98798d7664c87298a004d626 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 7 Sep 2017 06:34:30 +0200 Subject: machines: Unify most options for brawndo and tyree Both machines are using Plasma along with a few common KDE applications, so let's actually be more aggressive about deduplicating the options, because after all whenever these machines start to deviate more from each other, we can still either override those options or move them out. I've also cleaned up a few packages, so instead of having mpv *and* vlc we now have mpv and bomi for both machines. The latter is mostly about figuring out whether it's actually a good GUI video player, as it is basically a front-end for mpv. With this unification this means that some packages which are generally useful, such as okular and gwenview are now not only available to tyree but brawndo as well. Signed-off-by: aszlig Cc: @dwenola, @BrokkoliBerta --- machines/aszlig/managed/brawndo.nix | 79 +++++-------------------------------- machines/aszlig/managed/tyree.nix | 53 ++----------------------- 2 files changed, 12 insertions(+), 120 deletions(-) (limited to 'machines/aszlig/managed') diff --git a/machines/aszlig/managed/brawndo.nix b/machines/aszlig/managed/brawndo.nix index 9db99f1c..ea6d26ce 100644 --- a/machines/aszlig/managed/brawndo.nix +++ b/machines/aszlig/managed/brawndo.nix @@ -1,4 +1,4 @@ -{ config, pkgs, unfreePkgs, unfreeAndNonDistributablePkgs, lib, ... }: +{ config, pkgs, unfreePkgs, lib, ... }: let mainDisk = "ata-WDC_WD5000LPVX-22V0TT0_WD-WXG1E2559AYH"; @@ -13,8 +13,6 @@ in { kernelModules = [ "kvm-intel" "wl" ]; kernelPackages = pkgs.linuxPackages_latest; extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ]; - loader.systemd-boot.enable = true; - loader.efi.canTouchEfiVariables = true; }; fileSystems."/" = { @@ -28,89 +26,30 @@ in { fsType = "vfat"; }; - hardware = { - cpu.intel.updateMicrocode = true; - enableAllFirmware = true; - opengl.s3tcSupport = true; - opengl.driSupport32Bit = true; - pulseaudio.enable = true; - }; + hardware.enableAllFirmware = true; - networking = { - firewall.enable = false; - hostName = "brawndo"; - networkmanager.enable = true; - }; + networking.hostName = "brawndo"; - nix = { - maxJobs = 4; - useSandbox = true; - readOnlyStore = true; - buildCores = 0; - }; + nix.maxJobs = 4; - nixpkgs.config = { - allowUnfree = true; # XXX: More granularity! - chromium.enablePepperFlash = true; - pulseaudio = true; - }; + nixpkgs.config.allowUnfree = true; # XXX: More granularity! environment.systemPackages = with pkgs; [ - vuizvui.aszlig.axbo - chromium - file - vuizvui.aszlig.gajim - gimp - git - gpodder - htop - kdeApplications.gwenview - kdeApplications.okular - libreoffice - mpv - opentyrian - pavucontrol - pulseaudioFull - samba - unfreePkgs.steam - unfreeAndNonDistributablePkgs.skype - thunderbird - vuizvui.aszlig.vim - wine - xpdf - youtubeDL + vuizvui.aszlig.axbo gpodder opentyrian unfreePkgs.steam ]; - i18n = { - consoleFont = "lat9w-16"; - consoleKeyMap = "de"; - defaultLocale = "en_US.UTF-8"; - }; + i18n.defaultLocale = "en_US.UTF-8"; services = { deluge.enable = true; printing.drivers = [ pkgs.cups-bjnp ]; - tlp.enable = true; - xserver = { - enable = true; - layout = "de"; - xkbOptions = "eurosign:e"; - - synaptics.enable = true; - synaptics.twoFingerScroll = true; - - displayManager.sddm.enable = true; - desktopManager.plasma5.enable = true; - }; + xserver.synaptics.enable = true; + xserver.synaptics.twoFingerScroll = true; }; swapDevices = lib.singleton { label = "swap"; }; - time.timeZone = "Europe/Berlin"; - vuizvui.user.aszlig.profiles.managed.enable = true; vuizvui.user.aszlig.profiles.managed.mainUser = "dwenola"; - - vuizvui.enableGlobalNixpkgsConfig = true; } diff --git a/machines/aszlig/managed/tyree.nix b/machines/aszlig/managed/tyree.nix index 691a93e4..954e9edf 100644 --- a/machines/aszlig/managed/tyree.nix +++ b/machines/aszlig/managed/tyree.nix @@ -1,26 +1,10 @@ -{ config, pkgs, unfreeAndNonDistributablePkgs, lib, ... }: +{ pkgs, lib, ... }: { boot.initrd.availableKernelModules = [ "usbhid" ]; boot.kernelModules = [ "kvm-intel" ]; - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - - environment.systemPackages = with pkgs; [ - calibre cdparanoia chromium figlet vuizvui.aszlig.gajim gimp htop inkscape - thunderbird krita libreoffice mosh mpv pciutils vuizvui.aszlig.vim vlc wget - wine youtubeDL unfreeAndNonDistributablePkgs.skype - - kdeApplications.gwenview - kdeApplications.kaddressbook - kdeApplications.kate - kdeApplications.kleopatra - kdeApplications.kmail - kdeApplications.kmix - kdeApplications.korganizer - kdeApplications.okular - ]; + environment.systemPackages = with pkgs; [ krita mosh wget ]; fileSystems."/boot".device = "/dev/disk/by-uuid/A0D5-269D"; fileSystems."/boot".fsType = "vfat"; @@ -39,52 +23,21 @@ label = "tyree-swap"; }; - hardware.cpu.intel.updateMicrocode = true; - hardware.pulseaudio.enable = true; - hardware.pulseaudio.package = pkgs.pulseaudioFull; - - i18n.consoleUseXkbConfig = true; i18n.defaultLocale = "de_DE.UTF-8"; networking.hostName = "tyree"; - networking.firewall.enable = false; - networking.wireless.enable = false; - networking.networkmanager.enable = true; networking.useNetworkd = true; - # Temporary, seems to be a bug in NetworkManager: - networking.usePredictableInterfaceNames = false; - nix.maxJobs = 4; - nix.useSandbox = true; - nix.readOnlyStore = true; - nix.buildCores = 0; - nix.extraOptions = '' - auto-optimise-store = true - ''; - - nixpkgs.config = { - pulseaudio = true; - chromium.enablePepperFlash = true; - }; - programs.bash.enableCompletion = true; + # English within the shell, German otherwise (like in KDE). programs.bash.interactiveShellInit = lib.mkBefore '' export LANG=en_US.UTF-8 ''; - services.tlp.enable = true; - - services.xserver.enable = true; - services.xserver.layout = "de"; services.xserver.xkbOptions = "eurosign:e,caps:none"; - services.xserver.displayManager.sddm.enable = true; - services.xserver.desktopManager.plasma5.enable = true; - services.xserver.desktopManager.xterm.enable = false; services.xserver.wacom.enable = true; - time.timeZone = "Europe/Berlin"; - vuizvui.user.aszlig.profiles.managed.enable = true; vuizvui.user.aszlig.profiles.managed.mainUser = "bla"; -- cgit 1.4.1