From 776f46612ba839b23fcb4a0133ed1cc7ece30779 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Wed, 27 Sep 2017 17:37:11 +0200 Subject: [PATCH 01/14] Hotfix for cifs multiuser breakage with linux 4.13 --- common-headless.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common-headless.nix b/common-headless.nix index ded8328..3bc9b2d 100644 --- a/common-headless.nix +++ b/common-headless.nix @@ -56,19 +56,19 @@ fileSystems."/mnt/vaccaria" = { device = "//vaccaria.mtlaa.gebner.org/export"; fsType = "cifs"; - options = [ "noauto" "x-systemd.automount" "credentials=/etc/smbcredentials/vaccaria" ]; + options = [ "noauto" "x-systemd.automount" "credentials=/etc/smbcredentials/vaccaria" "vers=1.0" ]; }; fileSystems."/mnt/aplysia" = { device = "//aplysia.mtlaa.gebner.org/export"; fsType = "cifs"; - options = [ "noauto" "x-systemd.automount" "credentials=/etc/smbcredentials/aplysia" ]; + options = [ "noauto" "x-systemd.automount" "credentials=/etc/smbcredentials/aplysia" "vers=1.0" ]; }; fileSystems."/mnt/aruanus" = { device = "//aruanus.htdf.gebner.org/export"; fsType = "cifs"; - options = [ "noauto" "x-systemd.automount" "credentials=/etc/smbcredentials/aruanus" ]; + options = [ "noauto" "x-systemd.automount" "credentials=/etc/smbcredentials/aruanus" "vers=1.0" ]; }; users.extraUsers.gebner = { From c2a2306dad78e195705cc2983ee80d58954a8823 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 6 Oct 2017 11:50:36 +0200 Subject: [PATCH 02/14] Remove theba config. --- theba.nix | 74 ------------------------------------------------------- 1 file changed, 74 deletions(-) delete mode 100644 theba.nix diff --git a/theba.nix b/theba.nix deleted file mode 100644 index cad88ac..0000000 --- a/theba.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ config, pkgs, ... }: - -{ - imports = - [ - ./common.nix - ./large-sw.nix - ./uefi.nix - ./fstrim.nix - ]; - - environment.etc."lvm/lvm.conf".text = '' - devices { - issue_discards = 1 - } - ''; - boot.initrd.luks.devices = [ - { - name = "sda2_crypt"; - device = "/dev/disk/by-uuid/a7482f34-1d7b-4181-9f3c-f6bbbdb8679d"; - preLVM = true; - allowDiscards = true; - } - ]; - - services.xserver = { - libinput.enable = true; - config = '' - Section "InputClass" - Identifier "touchpad" - Driver "libinput" - MatchDevicePath "/dev/input/event*" - MatchIsPointer "true" - EndSection - ''; - - videoDrivers = [ "modesetting" ]; - useGlamor = true; - }; - programs.light.enable = true; - - services.tlp.enable = true; - - networking.hostName = "theba"; # Define your hostname. - networking.hostId = "b29b900f"; - - # services.colord.enable = true; - - systemd.services.ModemManager.enable = true; - - hardware.opengl.extraPackages = [ pkgs.vaapiIntel ]; - - nixpkgs.config.packageOverrides = pkgs: rec { - }; - - environment.systemPackages = with pkgs; [ - unison - ]; - - virtualisation.docker = { - enable = true; - storageDriver = "overlay2"; - }; - users.extraUsers.gebner.extraGroups = [ "docker" ]; - - # virtualisation.virtualbox.host.enable = true; - - # boot.kernelPackages = pkgs.lib.mkOverride 10 pkgs.linuxPackages; - - # time.timeZone = pkgs.lib.mkOverride 10 "Europe/London"; - - services.avahi.nssmdns = true; - -} From 4d38965ad795a6362c998604545116baf837bdb5 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 13 Oct 2017 16:09:43 +0200 Subject: [PATCH 03/14] More neovim stuff. --- basic-tools.nix | 1 + common-sw.nix | 3 +++ 2 files changed, 4 insertions(+) diff --git a/basic-tools.nix b/basic-tools.nix index b978a84..17178bd 100644 --- a/basic-tools.nix +++ b/basic-tools.nix @@ -6,6 +6,7 @@ # nox wget neovim + neovim-remote zsh gitFull gitAndTools.hub tig gnumake diff --git a/common-sw.nix b/common-sw.nix index 6483cb6..fc7a94d 100644 --- a/common-sw.nix +++ b/common-sw.nix @@ -30,6 +30,9 @@ imagemagick mercurial + alacritty + neovim-qt + androidenv.platformTools # adb & fastboot lm_sensors From 370434f673f9f21075dbecbf1584c40c596eb63d Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Tue, 17 Oct 2017 17:37:58 +0200 Subject: [PATCH 04/14] archachatina: enable tearfree option --- archachatina.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/archachatina.nix b/archachatina.nix index 671a739..f4b5461 100644 --- a/archachatina.nix +++ b/archachatina.nix @@ -85,7 +85,9 @@ services.xserver = { videoDrivers = [ "amdgpu" ]; - # useGlamor = true; + deviceSection = '' + Option "TearFree" "on" + ''; }; services.transmission.enable = true; From 29ac6bc68982ef38fa064bdf10d502f6c3a836c9 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Tue, 17 Oct 2017 17:45:06 +0200 Subject: [PATCH 05/14] use newer nodejs --- common-sw.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common-sw.nix b/common-sw.nix index fc7a94d..875000c 100644 --- a/common-sw.nix +++ b/common-sw.nix @@ -52,7 +52,7 @@ ghostscript # for auctex aspell - nodejs + nodejs-8_x mediainfo From df64d06b7ece02fd92d4725fdaf7921a4b7120f7 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Wed, 1 Nov 2017 15:07:12 +0100 Subject: [PATCH 06/14] petalius: use current nix --- petalius.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/petalius.nix b/petalius.nix index 11cbbe5..da28b37 100644 --- a/petalius.nix +++ b/petalius.nix @@ -86,4 +86,6 @@ #services.avahi.nssmdns = true; + nix.package = pkgs.nixUnstable; + } From 90ace13369a436daf8207bcc265c33cb1d3f64a2 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Thu, 2 Nov 2017 08:54:25 +0100 Subject: [PATCH 07/14] decoysnail: switch to nix 1.12 --- decoysnail.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/decoysnail.nix b/decoysnail.nix index 0a0c58f..4ec197e 100644 --- a/decoysnail.nix +++ b/decoysnail.nix @@ -37,4 +37,6 @@ services.avahi.nssmdns = true; + nix.package = pkgs.nixUnstable; + } From 0c3d8008093fde6d20945335db70bf03174cc5da Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Thu, 9 Nov 2017 15:16:32 +0100 Subject: [PATCH 08/14] update stable checkout --- common-sw.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/common-sw.nix b/common-sw.nix index 875000c..00a9f61 100644 --- a/common-sw.nix +++ b/common-sw.nix @@ -75,7 +75,6 @@ cvc4 graphviz # toysolver - stable.haskellPackages.tip-lib emacsPackages.proofgeneral @@ -90,8 +89,8 @@ repo = "nixpkgs-channels"; }; stablePkgs = fetchNixPkgs { - rev = "5237768d62a40236d24fafbd9f4f97f3227399ce"; - sha256 = "1j707pwm6ll2cvmqvwfxxq21gd9q7l6s3vi3vc01jklplj2v20is"; + rev = "1a8a95e87962bc8ff8514b28e026fc987fbdb010"; + sha256 = "1rx14g8wlw6vdjalsv6rnznmfsazwf218rv75z9ac2vdgwihclxh"; }; in { # idea-community-eap = pkgs.idea.idea-community.overrideDerivation (oldAttrs: rec { From bc067ed6dcebe924833f05dfb0a18e1a662b0795 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 11 Nov 2017 08:48:27 +0100 Subject: [PATCH 09/14] lean --- large-sw.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/large-sw.nix b/large-sw.nix index 75e39dc..c499afd 100644 --- a/large-sw.nix +++ b/large-sw.nix @@ -20,6 +20,7 @@ stack + lean coq_8_6 # cargo rustc From 8a4401fb91b3fe9df4b3f0760eaf55708eba69fb Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 11 Nov 2017 08:48:35 +0100 Subject: [PATCH 10/14] archachatina: unstable nix, postgres --- archachatina.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/archachatina.nix b/archachatina.nix index f4b5461..09e6417 100644 --- a/archachatina.nix +++ b/archachatina.nix @@ -44,6 +44,8 @@ uvccapture ]; + # programs.ratbag.enable = true; + services.thermald.enable = true; virtualisation.docker.enable = true; @@ -92,4 +94,11 @@ services.transmission.enable = true; + nix.package = pkgs.nixUnstable; + + services.postgresql = { + enable = true; + extraPlugins = [ pkgs.postgis.v_2_4_0 ]; + }; + } From 6745772573b19102f265921f83170e8c07344d39 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Wed, 15 Nov 2017 00:44:21 +0900 Subject: [PATCH 11/14] petalius: tokyo!!! --- petalius.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/petalius.nix b/petalius.nix index da28b37..c6a8deb 100644 --- a/petalius.nix +++ b/petalius.nix @@ -46,10 +46,10 @@ networking.hostName = "petalius"; networking.hostId = "cf58caa9"; - systemd.services.ModemManager = { - enable = true; - wantedBy = [ "multi-user.target" ]; - }; + # systemd.services.ModemManager = { + # enable = true; + # wantedBy = [ "multi-user.target" ]; + # }; hardware.opengl.extraPackages = [ pkgs.vaapiIntel ]; @@ -66,7 +66,7 @@ }; users.extraUsers.gebner.extraGroups = [ "docker" ]; - #virtualisation.virtualbox.host.enable = true; + virtualisation.virtualbox.host.enable = true; # boot.kernelPackages = pkgs.lib.mkOverride 10 pkgs.linuxPackages; boot.kernelPatches = [ @@ -82,7 +82,7 @@ "psmouse" ]; - # time.timeZone = pkgs.lib.mkOverride 10 "Europe/London"; + time.timeZone = pkgs.lib.mkOverride 10 "Asia/Tokyo"; #services.avahi.nssmdns = true; From 5210f0eaad4cd2f92418deaf8cb6279170e4dc58 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Wed, 6 Dec 2017 10:30:48 +0100 Subject: [PATCH 12/14] petalius: (almost) back in vienna --- petalius.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/petalius.nix b/petalius.nix index c6a8deb..392a09c 100644 --- a/petalius.nix +++ b/petalius.nix @@ -82,7 +82,7 @@ "psmouse" ]; - time.timeZone = pkgs.lib.mkOverride 10 "Asia/Tokyo"; + # time.timeZone = pkgs.lib.mkOverride 10 "Asia/Tokyo"; #services.avahi.nssmdns = true; From 278f0b2e67a109142ff2ddc0aad97987e4986cb7 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 9 Dec 2017 19:08:20 +0100 Subject: [PATCH 13/14] vaccaria: fix fancontrol --- vaccaria.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/vaccaria.nix b/vaccaria.nix index 96faa85..21442f2 100644 --- a/vaccaria.nix +++ b/vaccaria.nix @@ -79,14 +79,14 @@ let fancontrolConfig = pkgs.writeText "fancontrol" '' # Configuration file generated by pwmconfig, changes will be lost INTERVAL=10 - DEVPATH=hwmon0=devices/pci0000:00/0000:00:18.3 hwmon2=devices/platform/it87.552 - DEVNAME=hwmon0=k10temp hwmon2=it8720 - FCTEMPS=hwmon2/pwm3=hwmon0/temp1_input hwmon2/pwm1=hwmon0/temp1_input - FCFANS=hwmon2/pwm3=hwmon2/fan1_input hwmon2/pwm1=hwmon2/fan1_input - MINTEMP=hwmon2/pwm3=40 hwmon2/pwm1=40 - MAXTEMP=hwmon2/pwm3=65 hwmon2/pwm1=65 - MINSTART=hwmon2/pwm3=150 hwmon2/pwm1=150 - MINSTOP=hwmon2/pwm3=0 hwmon2/pwm1=100 + DEVPATH=hwmon1=devices/pci0000:00/0000:00:18.3 hwmon0=devices/platform/it87.552 + DEVNAME=hwmon1=k10temp hwmon0=it8720 + FCTEMPS=hwmon0/pwm3=hwmon1/temp1_input hwmon0/pwm1=hwmon1/temp1_input + FCFANS=hwmon0/pwm3=hwmon0/fan1_input hwmon0/pwm1=hwmon0/fan1_input + MINTEMP=hwmon0/pwm3=40 hwmon0/pwm1=40 + MAXTEMP=hwmon0/pwm3=65 hwmon0/pwm1=65 + MINSTART=hwmon0/pwm3=150 hwmon0/pwm1=150 + MINSTOP=hwmon0/pwm3=0 hwmon0/pwm1=100 ''; in { description = "fancontrol from lm_sensors"; wantedBy = ["multi-user.target"]; @@ -95,7 +95,7 @@ # hdd spindown powerManagement.powerUpCommands = '' - ${pkgs.hdparm}/bin/hdparm -B127 -S100 /dev/sd{a,b,c,d,e,f} + ${pkgs.hdparm}/bin/hdparm -B128 -S0 /dev/sd{a,b,c,d,e,f} ''; } From b93b7f08e8004e2b04f2c383dc2e36674a1fd148 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 15 Dec 2017 09:48:17 +0100 Subject: [PATCH 14/14] i3: fix XDG_CURRENT_DESKTOP If XDG_CURRENT_DESKTOP=GNOME, then xdg-mime believes gio is on the PATH. --- i3.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/i3.nix b/i3.nix index c56b00d..ac6d689 100644 --- a/i3.nix +++ b/i3.nix @@ -86,7 +86,7 @@ start = '' export XDG_DATA_DIRS=/run/current-system/sw/share/''${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS export $(${pkgs.gnome3.gnome_keyring}/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh,gpg) - export XDG_CURRENT_DESKTOP=GNOME + export XDG_CURRENT_DESKTOP=X-Generic for m in xsettings; do ${pkgs.gnome3.gnome_settings_daemon}/libexec/gsd-$m & done