From 15ff3538d9b291c9d496b5ed9eb529ef313da3fc Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 20 Aug 2017 10:22:57 +0200 Subject: [PATCH 01/28] fix build --- large-sw.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/large-sw.nix b/large-sw.nix index 1327ead..8fc9d9a 100644 --- a/large-sw.nix +++ b/large-sw.nix @@ -9,8 +9,8 @@ gimp inkscape jabref - libreoffice - calibre + libreoffice-fresh + #calibre vscode clang From 2fbe00610a3278fd7428fbe2fc044c5fd202f1d1 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 20 Aug 2017 19:30:11 +0200 Subject: [PATCH 02/28] openwbo --- large-sw.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/large-sw.nix b/large-sw.nix index 8fc9d9a..38d6775 100644 --- a/large-sw.nix +++ b/large-sw.nix @@ -12,6 +12,8 @@ libreoffice-fresh #calibre + open-wbo # only in 17.09+ + vscode clang From 651d7cb9e8b6d3ba86dcb43842522241d5b599b7 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Thu, 24 Aug 2017 14:18:58 +0200 Subject: [PATCH 03/28] decoysnail --- decoysnail.nix | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 decoysnail.nix diff --git a/decoysnail.nix b/decoysnail.nix new file mode 100644 index 0000000..0a0c58f --- /dev/null +++ b/decoysnail.nix @@ -0,0 +1,40 @@ +{ config, pkgs, ... }: + +{ + imports = + [ + ./common.nix + ./large-sw.nix + ./uefi.nix + ]; + + boot.initrd.luks.devices = [ + { + name = "sda2_crypt"; + device = "/dev/disk/by-uuid/6c687d35-1b43-4799-b71c-a5b5c21b3e2a"; + preLVM = true; + } + ]; + + networking = { + hostName = "decoysnail"; + hostId = "cf04f682"; + }; + + services.openssh.enable = true; + + hardware.cpu.intel.updateMicrocode = true; + + services.thermald.enable = true; + + virtualisation.docker = { + enable = true; + storageDriver = "overlay2"; + }; + users.extraUsers.gebner.extraGroups = [ "docker" ]; + + hardware.opengl.driSupport32Bit = true; + + services.avahi.nssmdns = true; + +} From 5ecee2ea8d9af7b62d295a8caf7876a029669fd9 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 26 Aug 2017 10:55:28 +0200 Subject: [PATCH 04/28] Readd perf. --- common-sw.nix | 4 +++- large-sw.nix | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/common-sw.nix b/common-sw.nix index 1b6b6bb..75d0e37 100644 --- a/common-sw.nix +++ b/common-sw.nix @@ -61,7 +61,7 @@ msmtp vdirsyncer khard khal - # linuxPackages.perf + linuxPackages.perf veriT minisat @@ -120,6 +120,8 @@ stablePkgs = stablePkgs; stable = import stablePkgs {}; + + qutebrowser = pkgs.qutebrowser.override { withWebEngineDefault = true; }; }; nixpkgs.config.allowTexliveBuilds = true; diff --git a/large-sw.nix b/large-sw.nix index 38d6775..1f0816d 100644 --- a/large-sw.nix +++ b/large-sw.nix @@ -12,6 +12,8 @@ libreoffice-fresh #calibre + # qutebrowser + open-wbo # only in 17.09+ vscode From ea0ea889527601b4a9fbc6e3aeb87b6f26b188dd Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Mon, 28 Aug 2017 19:19:07 +0200 Subject: [PATCH 05/28] petalius: initial config --- petalius.nix | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 petalius.nix diff --git a/petalius.nix b/petalius.nix new file mode 100644 index 0000000..23c0d92 --- /dev/null +++ b/petalius.nix @@ -0,0 +1,72 @@ +{ 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 = "nvme0n1p2"; + device = "/dev/disk/by-uuid/5ca3d7ec-3f9e-4a08-8bc2-b26bfc3459c5"; + 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 = "petalius"; + networking.hostId = "cf58caa9"; + + 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 3af97a345bc078cea979e2406cf1990ef6ef0ded Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Mon, 28 Aug 2017 23:31:53 +0200 Subject: [PATCH 06/28] petalius: fix touchpad --- len0073.patch | 25 +++++++++++++++++++++++++ petalius.nix | 12 ++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 len0073.patch diff --git a/len0073.patch b/len0073.patch new file mode 100644 index 0000000..d87594d --- /dev/null +++ b/len0073.patch @@ -0,0 +1,25 @@ +diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c +index 16c3046..ca912ce 100644 +--- a/drivers/input/mouse/synaptics.c ++++ b/drivers/input/mouse/synaptics.c +@@ -173,6 +173,7 @@ static const char * const smbus_pnp_ids[] = { + "LEN0046", /* X250 */ + "LEN004a", /* W541 */ + "LEN200f", /* T450s */ ++ "LEN0073", /* X1 Carbon 5 (Elantech) */ + NULL + }; + +diff --git a/drivers/input/rmi4/rmi_smbus.c b/drivers/input/rmi4/rmi_smbus.c +index 225025a..2939a2f 100644 +--- a/drivers/input/rmi4/rmi_smbus.c ++++ b/drivers/input/rmi4/rmi_smbus.c +@@ -322,7 +322,7 @@ static int rmi_smb_probe(struct i2c_client *client, + rmi_dbg(RMI_DEBUG_XPORT, &client->dev, "Smbus version is %d", + smbus_version); + +- if (smbus_version != 2) { ++ if (smbus_version != 2 && smbus_version != 3) { + dev_err(&client->dev, "Unrecognized SMB version %d\n", + smbus_version); + return -ENODEV; diff --git a/petalius.nix b/petalius.nix index 23c0d92..27e8fff 100644 --- a/petalius.nix +++ b/petalius.nix @@ -64,6 +64,18 @@ #virtualisation.virtualbox.host.enable = true; # boot.kernelPackages = pkgs.lib.mkOverride 10 pkgs.linuxPackages; + boot.kernelPatches = [ + { patch = ./len0073.patch; name = "len0073"; } + ]; + boot.kernelParams = [ + # "psmouse.synaptics_intertouch=1" + "psmouse.proto=imps" + ]; + boot.kernelModules = [ + "rmi_smbus" + "i2c_hid" + "psmouse" + ]; # time.timeZone = pkgs.lib.mkOverride 10 "Europe/London"; From 67e852c5372114b8fdeb58b65917f4424e15ef39 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Wed, 30 Aug 2017 20:24:00 +0200 Subject: [PATCH 07/28] theba: disable virtualbox --- theba.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/theba.nix b/theba.nix index 882097d..cad88ac 100644 --- a/theba.nix +++ b/theba.nix @@ -63,7 +63,7 @@ }; users.extraUsers.gebner.extraGroups = [ "docker" ]; - virtualisation.virtualbox.host.enable = true; + # virtualisation.virtualbox.host.enable = true; # boot.kernelPackages = pkgs.lib.mkOverride 10 pkgs.linuxPackages; From 3541ca141e5ce2f430e35fc6e3b22dd4533a6084 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Wed, 30 Aug 2017 20:24:16 +0200 Subject: [PATCH 08/28] add packages from theba --- pkgs/mutrace.nix | 21 +++++++++++++++++++++ pkgs/ubcsat.nix | 16 ++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/mutrace.nix create mode 100644 pkgs/ubcsat.nix diff --git a/pkgs/mutrace.nix b/pkgs/mutrace.nix new file mode 100644 index 0000000..9dfd726 --- /dev/null +++ b/pkgs/mutrace.nix @@ -0,0 +1,21 @@ +with import {}; +stdenv.mkDerivation rec { + name = "mutrace-${version}"; + version = "20150510"; + + src = fetchFromGitHub { + owner = "dbpercona"; + repo = "mutrace"; + rev = "3f71fc9752f6b5c673f9fd5d2dd30ac9af1b045d"; + sha256 = "0h1vsfbvm70mw4i7dyai9c8i5yfjyinqd18is7cmjn7l6my532qi"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ binutils libiberty ]; + + CFLAGS = [ "-DPACKAGE" "-I${libiberty}/include/libiberty" ]; + + postInstall = '' + sed -i "s,libm,$out/lib/\\0," $out/bin/* + ''; +} diff --git a/pkgs/ubcsat.nix b/pkgs/ubcsat.nix new file mode 100644 index 0000000..e5239d6 --- /dev/null +++ b/pkgs/ubcsat.nix @@ -0,0 +1,16 @@ +with import {}; +stdenv.mkDerivation rec { + name = "ubcsat-${version}"; + version = "1.2beta"; + + src = fetchFromGitHub { + owner = "gebner"; + repo = "ubcsat"; + rev = "4cb85e4ae9278746d6ee371dd676daafdc2efd59"; + sha256 = "0bnakj4w0p4q4dzppmw06vjq4ysd8d50wqfmwn8k6frypgsdnbw7"; + }; + + installPhase = '' + install -Dm0755 ubcsat $out/bin/ubcsat + ''; +} From 4b0cc1fe0d55669443b04c6eca99c8756f03c6ba Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Wed, 30 Aug 2017 22:37:28 +0200 Subject: [PATCH 09/28] i3: remove unifont --- i3.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/i3.nix b/i3.nix index 1dab198..90d89a4 100644 --- a/i3.nix +++ b/i3.nix @@ -37,22 +37,32 @@ ]; fonts = { + enableDefaultFonts = false; fonts = with pkgs; [ + xorg.fontbhlucidatypewriter100dpi + xorg.fontbhlucidatypewriter75dpi + dejavu_fonts + freefont_ttf + gyre-fonts # TrueType substitutes for standard PostScript fonts + liberation_ttf + xorg.fontbh100dpi + xorg.fontmiscmisc + xorg.fontcursormisc + # unifont + wqy_microhei inconsolata dejavu_fonts ipafont ipaexfont - unifont + # unifont ubuntu_font_family source-code-pro fira + noto-fonts-emoji cantarell_fonts # from gnome3 module ]; - fontconfig = { - allowBitmaps = false; - }; }; services.xserver = { From c16dece6353561dbdfd6b1656c0ac37515037c1c Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 2 Sep 2017 08:57:14 +0200 Subject: [PATCH 10/28] petalius: enable ModemManager --- petalius.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/petalius.nix b/petalius.nix index 27e8fff..392230f 100644 --- a/petalius.nix +++ b/petalius.nix @@ -44,7 +44,10 @@ networking.hostName = "petalius"; networking.hostId = "cf58caa9"; - systemd.services.ModemManager.enable = true; + systemd.services.ModemManager = { + enable = true; + wantedBy = [ "multi-user.target" ]; + }; hardware.opengl.extraPackages = [ pkgs.vaapiIntel ]; From 055b0ae03e3d61724fd026c010aaf8b9646c6ac0 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 2 Sep 2017 08:57:36 +0200 Subject: [PATCH 11/28] petalius: disable kernel patch, it doesn't work anyhow --- petalius.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/petalius.nix b/petalius.nix index 392230f..a358016 100644 --- a/petalius.nix +++ b/petalius.nix @@ -68,7 +68,7 @@ # boot.kernelPackages = pkgs.lib.mkOverride 10 pkgs.linuxPackages; boot.kernelPatches = [ - { patch = ./len0073.patch; name = "len0073"; } + # { patch = ./len0073.patch; name = "len0073"; } ]; boot.kernelParams = [ # "psmouse.synaptics_intertouch=1" From 589940971657244bac8ab621a03b991375f1736d Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 2 Sep 2017 09:10:46 +0200 Subject: [PATCH 12/28] Update common packages. --- common-sw.nix | 11 ++++------- i3.nix | 1 + large-sw.nix | 3 +-- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/common-sw.nix b/common-sw.nix index 75d0e37..6483cb6 100644 --- a/common-sw.nix +++ b/common-sw.nix @@ -2,16 +2,13 @@ { environment.systemPackages = with pkgs.haskellPackages; with pkgs; [ - # gitg + gitg gmpc m4 subversion openjdk8 sbt scala - # firefoxWrapper - # qutebrowser chromium - # thunderbird qalculate-gtk speedcrunch viewnior @@ -114,9 +111,9 @@ # }); clion-eap = pkgs.idea.clion; - neovim = pkgs.neovim.override { - extraPythonPackages = [ pkgs.pythonPackages.websocket_client ]; - }; + # neovim = pkgs.neovim.override { + # extraPythonPackages = [ pkgs.pythonPackages.websocket_client ]; + # }; stablePkgs = stablePkgs; stable = import stablePkgs {}; diff --git a/i3.nix b/i3.nix index 90d89a4..263d08c 100644 --- a/i3.nix +++ b/i3.nix @@ -26,6 +26,7 @@ xdotool scrot pavucontrol + dconf-editor # gnome3 core packages desktop_file_utils shared_mime_info diff --git a/large-sw.nix b/large-sw.nix index 1f0816d..c6c6a4c 100644 --- a/large-sw.nix +++ b/large-sw.nix @@ -5,12 +5,11 @@ idea-community-eap clion-eap texlive.combined.scheme-full biber - # androidsdk gimp inkscape jabref libreoffice-fresh - #calibre + calibre # qutebrowser From 8dd19846799b111ce9240df37db7b443b3073aa4 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 2 Sep 2017 09:41:48 +0200 Subject: [PATCH 13/28] i3: update to work with gnome 3.24 --- i3.nix | 12 +++++++++--- petalius.nix | 2 ++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/i3.nix b/i3.nix index 263d08c..4d48096 100644 --- a/i3.nix +++ b/i3.nix @@ -84,15 +84,20 @@ session = [ { name = "i3wm"; 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 - ${pkgs.gnome3.gnome_settings_daemon}/libexec/gnome-settings-daemon-localeexec & + for m in xsettings; do + ${pkgs.gnome3.gnome_settings_daemon}/libexec/gsd-$m & + done i3 & waitPID=$! ''; } ]; }; + updateDbusEnvironment = true; + windowManager = { default = "i3"; i3.enable = true; @@ -104,6 +109,7 @@ }; services.dbus.packages = with pkgs; [ dunst gnome3.gcr ]; + services.udev.packages = [ pkgs.gnome3.gnome_settings_daemon ]; # copied from gnome3 module security.polkit.enable = true; @@ -128,8 +134,8 @@ # Needed for themes and backgrounds environment.pathsToLink = [ "/share" ]; environment.variables.GIO_EXTRA_MODULES = with pkgs.gnome3; [ - "${dconf}/lib/gio/modules" - "${glib_networking}/lib/gio/modules" + "${pkgs.lib.getLib dconf}/lib/gio/modules" + "${glib_networking.out}/lib/gio/modules" "${gvfs}/lib/gio/modules" ]; } diff --git a/petalius.nix b/petalius.nix index a358016..11cbbe5 100644 --- a/petalius.nix +++ b/petalius.nix @@ -24,6 +24,8 @@ ]; services.xserver = { + dpi = 120; + libinput.enable = true; config = '' Section "InputClass" From 5fdea9d8814000dbfa0902cb419f566226cf000f Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 22 Sep 2017 20:24:13 +0200 Subject: [PATCH 14/28] add stack --- large-sw.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/large-sw.nix b/large-sw.nix index c6c6a4c..75e39dc 100644 --- a/large-sw.nix +++ b/large-sw.nix @@ -18,6 +18,8 @@ vscode clang + stack + coq_8_6 # cargo rustc From aee6a3d0aec0994dcda36feb71bb9b3d2d1964f7 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 22 Sep 2017 20:26:19 +0200 Subject: [PATCH 15/28] enable pulseaudio discovery --- i3.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/i3.nix b/i3.nix index 4d48096..c56b00d 100644 --- a/i3.nix +++ b/i3.nix @@ -126,7 +126,6 @@ services.gnome3.seahorse.enable = true; services.gnome3.sushi.enable = true; # services.gnome3.tracker.enable = true; - hardware.pulseaudio.enable = true; services.telepathy.enable = true; networking.networkmanager.enable = true; services.upower.enable = config.powerManagement.enable; @@ -138,4 +137,9 @@ "${glib_networking.out}/lib/gio/modules" "${gvfs}/lib/gio/modules" ]; + hardware.pulseaudio = { + enable = true; + zeroconf.discovery.enable = true; + }; + } From 78360f34f2565ea68be3a25159f7bf23291332a8 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 23 Sep 2017 14:34:29 +0200 Subject: [PATCH 16/28] euhadra: publish pulseaudio server --- euhadra.nix | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/euhadra.nix b/euhadra.nix index cccde7e..bbafe20 100644 --- a/euhadra.nix +++ b/euhadra.nix @@ -40,12 +40,27 @@ restore_paused "yes" ''; }; - networking.firewall.allowedTCPPorts = [ config.services.mpd.network.port ]; + + networking.firewall.allowedTCPPorts = [ + config.services.mpd.network.port + 4713 # pulseaudio + ]; environment.systemPackages = with pkgs; [ mpc_cli ]; - services.xserver.vaapiDrivers = [ pkgs.vaapiIntel ]; + hardware.opengl.extraPackages = [ pkgs.vaapiIntel ]; nixpkgs.config.mpv.vaapiSupport = true; + hardware.pulseaudio = { + zeroconf.publish.enable = true; + tcp = { + enable = true; + anonymousClients.allowedIpRanges = [ + "127.0.0.1" + "10.57.0.0/16" + ]; + }; + }; + } From 776f46612ba839b23fcb4a0133ed1cc7ece30779 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Wed, 27 Sep 2017 17:37:11 +0200 Subject: [PATCH 17/28] 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 18/28] 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 19/28] 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 20/28] 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 21/28] 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 22/28] 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 23/28] 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 24/28] 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 25/28] 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 26/28] 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 27/28] 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 28/28] 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;