From db1348014e4f847062360d669edc7cac4832038a Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Fri, 25 Sep 2020 18:31:43 +0200 Subject: [PATCH] Update to 20.09 MPV is disabled since the override options no longer work. This also applies updated formatting. --- machines/nunotaba/hardware-configuration.nix | 2 +- modules/base.nix | 2 +- modules/cli-tools.nix | 4 +- modules/creative.nix | 2 +- modules/docker.nix | 42 ++++++++++---------- modules/fonts.nix | 6 +-- modules/gui-tools.nix | 2 +- modules/libvirt.nix | 2 +- modules/media.nix | 4 +- modules/mpd.nix | 1 - modules/prometheus/node_exporter.nix | 1 - modules/restic.nix | 3 +- modules/ssh.nix | 1 - modules/sway.nix | 6 +-- shell.nix | 2 +- users/simon/base.nix | 3 +- 16 files changed, 40 insertions(+), 43 deletions(-) diff --git a/machines/nunotaba/hardware-configuration.nix b/machines/nunotaba/hardware-configuration.nix index d637a6f..507879c 100644 --- a/machines/nunotaba/hardware-configuration.nix +++ b/machines/nunotaba/hardware-configuration.nix @@ -9,7 +9,7 @@ boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" "rtsx_pci_sdmmc" ]; boot.initrd.kernelModules = [ "dm-snapshot" ]; boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = []; + boot.extraModulePackages = [ ]; fileSystems."/" = { diff --git a/modules/base.nix b/modules/base.nix index f6c2c4d..c4a7096 100644 --- a/modules/base.nix +++ b/modules/base.nix @@ -7,7 +7,7 @@ git-crypt # used to store secrets in configuration git-lfs # not so essential, but required to clone config htop - (unstable.neovim.override { vimAlias = true; }) # FIXME unstable is for python-msgpack 1.0; use stable once python-msgpack 1.0 is in stable + (neovim.override { vimAlias = true; }) tmux ]; diff --git a/modules/cli-tools.nix b/modules/cli-tools.nix index d39c4a8..3d61018 100644 --- a/modules/cli-tools.nix +++ b/modules/cli-tools.nix @@ -79,7 +79,7 @@ (pass-wayland.withExtensions (es: with es; [ pass-otp ])) # password manager pwgen pwgen-secure # password generator - unstable.xkcdpass # memorable password generator + xkcdpass # memorable password generator # misc toilet # free figlet @@ -94,7 +94,7 @@ nix-direnv # per-directory environment for nix # git - unstable.gitAndTools.git-annex + gitAndTools.git-annex gitAndTools.git-annex-remote-rclone # git for non source files gitAndTools.pre-commit # pre-commit hook for git ]; diff --git a/modules/creative.nix b/modules/creative.nix index ab53334..3df3256 100644 --- a/modules/creative.nix +++ b/modules/creative.nix @@ -8,6 +8,6 @@ gimpPlugins.gmic # bitmap editor krita # drawing openscad # parametric/procedural 3d modelling - unstable.inkscape # vector graphics editor + inkscape # vector graphics editor ]; } diff --git a/modules/docker.nix b/modules/docker.nix index 35a2fc9..7596119 100644 --- a/modules/docker.nix +++ b/modules/docker.nix @@ -6,27 +6,29 @@ docker-ls ]; - virtualisation.docker = { - enable = true; - logDriver = "journald"; - extraOptions = builtins.concatStringsSep " " [ - "--ipv6" - "--fixed-cidr-v6=fd00:d0ce:d0ce:d0ce::/64" - ]; - }; + virtualisation = { + docker = { + enable = true; + logDriver = "journald"; + extraOptions = builtins.concatStringsSep " " [ + "--ipv6" + "--fixed-cidr-v6=fd00:d0ce:d0ce:d0ce::/64" + ]; + }; - docker-containers.ipv6nat = { - image = "robbertkl/ipv6nat"; - volumes = [ - "/var/run/docker.sock:/var/run/docker.sock:ro" - ]; - extraDockerOptions = [ - "--network=host" - "--cap-drop=ALL" - "--cap-add=NET_ADMIN" - "--cap-add=NET_RAW" - "--cap-add=SYS_MODULE" - ]; + oci-containers.containers.ipv6nat = { + image = "robbertkl/ipv6nat"; + volumes = [ + "/var/run/docker.sock:/var/run/docker.sock:ro" + ]; + extraOptions = [ + "--network=host" + "--cap-drop=ALL" + "--cap-add=NET_ADMIN" + "--cap-add=NET_RAW" + "--cap-add=SYS_MODULE" + ]; + }; }; environment.etc."modules-load.d/ipv6nat.conf".text = "ip6_tables\n"; diff --git a/modules/fonts.nix b/modules/fonts.nix index 1a65bca..4d7e2fc 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -5,10 +5,10 @@ fonts = with pkgs; [ corefonts # good ol’ microsoft fonts google-fonts # google font collection (free) - (unstable.nerdfonts.override { fonts = [ "Iosevka" ]; }) + (nerdfonts.override { fonts = [ "Iosevka" ]; }) #roboto # standalone roboto has awful kerning - unstable.source-han-sans - unstable.source-han-serif # CJK fonts + source-han-sans + source-han-serif # CJK fonts vistafonts # newer microsoft fonts ]; diff --git a/modules/gui-tools.nix b/modules/gui-tools.nix index fe4a67d..ad4a4a7 100644 --- a/modules/gui-tools.nix +++ b/modules/gui-tools.nix @@ -6,7 +6,7 @@ filezilla # ftp client gparted # gui for parted qalculate-gtk # flexible calculator - unstable.antimicroX # gamepad to keyboard/mouse mapping + antimicroX # gamepad to keyboard/mouse mapping wl-clipboard # not really gui, but cli tool to manage wayland clipboard wxhexeditor # hex editor xfce.thunar # graphical file manager diff --git a/modules/libvirt.nix b/modules/libvirt.nix index c4307fb..c4f1490 100644 --- a/modules/libvirt.nix +++ b/modules/libvirt.nix @@ -3,5 +3,5 @@ { virtualisation.libvirtd.enable = true; - environment.systemPackages = if gui then [ pkgs.virt-manager ] else []; + environment.systemPackages = if gui then [ pkgs.virt-manager ] else [ ]; } diff --git a/modules/media.nix b/modules/media.nix index 176becf..2065a15 100644 --- a/modules/media.nix +++ b/modules/media.nix @@ -32,7 +32,7 @@ # Audio + Video ffmpeg-full # A/V multitool mkvtoolnix # matroska (de-)muxing - (mpv.override { archiveSupport = true; vapoursynthSupport = true; }) # media player + #(mpv.override { archiveSupport = true; vapoursynthSupport = true; }) # media player # Literature calibre # ebook library @@ -45,5 +45,5 @@ hardware.opengl.extraPackages = with pkgs; if gui then [ pkgs.vaapiIntel - ] else []; + ] else [ ]; } diff --git a/modules/mpd.nix b/modules/mpd.nix index bc0a786..9fea4db 100644 --- a/modules/mpd.nix +++ b/modules/mpd.nix @@ -1,5 +1,4 @@ { pkgs, ... }: - let mpdConf = pkgs.writeText "mpd.conf" '' music_directory "~/Music" diff --git a/modules/prometheus/node_exporter.nix b/modules/prometheus/node_exporter.nix index c82505e..491856a 100644 --- a/modules/prometheus/node_exporter.nix +++ b/modules/prometheus/node_exporter.nix @@ -1,5 +1,4 @@ { config, ... }: - let vpnNetRanges = config.networking.wireguard.interfaces.wg-home.ips; vpnNetRange = builtins.elemAt vpnNetRanges 0; diff --git a/modules/restic.nix b/modules/restic.nix index bc6d36b..d13f0cf 100644 --- a/modules/restic.nix +++ b/modules/restic.nix @@ -1,5 +1,4 @@ { pkgs, config, lib, ... }: - let excludes = [ # General @@ -47,7 +46,7 @@ in s3CredentialsFile = toString ../secrets/s3_credentials; repository = "s3:https://s3.eu-central-1.wasabisys.com/sbruder-restic"; paths = lib.mkDefault ( - [] + [ ] ++ maybePath /data ++ maybePath /home ++ maybePath /srv diff --git a/modules/ssh.nix b/modules/ssh.nix index 3cb6d86..b55abdd 100644 --- a/modules/ssh.nix +++ b/modules/ssh.nix @@ -1,5 +1,4 @@ { ... }: - let pubkeys = import ./pubkeys.nix; in diff --git a/modules/sway.nix b/modules/sway.nix index 7532e4e..2f4e35a 100644 --- a/modules/sway.nix +++ b/modules/sway.nix @@ -10,11 +10,11 @@ (waybar.override { pulseSupport = true; }) # better status bar mako # notification daemon #kanshi # autorandr - unstable.alacritty # temrinal - unstable.dmenu-wayland # launcher + alacritty # temrinal + dmenu-wayland # launcher brightnessctl # control screen brightness #redshift-wlr # natural color temperature - unstable.sway-contrib.grimshot # screenshots + sway-contrib.grimshot # screenshots ]; extraSessionCommands = '' export CLUTTER_BACKEND=wayland diff --git a/shell.nix b/shell.nix index f66cc9d..60f4829 100644 --- a/shell.nix +++ b/shell.nix @@ -1,4 +1,4 @@ -{ pkgs ? import {} }: +{ pkgs ? import { } }: pkgs.mkShell { nativeBuildInputs = with pkgs; [ diff --git a/users/simon/base.nix b/users/simon/base.nix index 7609f64..58c350c 100644 --- a/users/simon/base.nix +++ b/users/simon/base.nix @@ -1,11 +1,10 @@ { pkgs, ... }: - let pubkeys = import ../../modules/pubkeys.nix; in { imports = [ - (import "${builtins.fetchTarball https://github.com/rycee/home-manager/archive/master.tar.gz}/nixos") # FIXME: pin to release + (import "${builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/master.tar.gz"}/nixos") # FIXME: pin to 20.09 ]; users.users.simon = {