From 3f1f16ad1342befa65e8c3a1ffa7a7c32fcbc8ad Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Fri, 8 Jul 2016 15:01:42 -0700 Subject: [PATCH 1/7] sj laptop: add BFQ patches to kernel --- configuration/steveej-laptop/hw.nix | 2 ++ configuration/steveej-laptop/pkg.nix | 31 ++++++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/configuration/steveej-laptop/hw.nix b/configuration/steveej-laptop/hw.nix index 9b4c429..4a99e58 100644 --- a/configuration/steveej-laptop/hw.nix +++ b/configuration/steveej-laptop/hw.nix @@ -10,6 +10,8 @@ hardware.enableAllFirmware = true; hardware.trackpoint.emulateWheel = true; + boot.kernelPackages = pkgs.myLinuxPackages; + boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "sd_mod" ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; diff --git a/configuration/steveej-laptop/pkg.nix b/configuration/steveej-laptop/pkg.nix index e2d912d..676de8c 100644 --- a/configuration/steveej-laptop/pkg.nix +++ b/configuration/steveej-laptop/pkg.nix @@ -12,9 +12,36 @@ in packageOverrides = pkgs: rec { go = gitpkgs.go1_6; bluez = pkgs.bluez5; - linuxPackages = pkgs.linuxPackages_latest; #pythonPackages.sqlalchemy7 = pkgs.pythonPackages.sqlalchemy7.override { doCheck = false; }; - }; + + myLinuxPackages = pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor + (pkgs.linux_latest.override { + kernelPatches = pkgs.linux_latest.kernelPatches ++ [ + { patch = pkgs.fetchurl { + url = "ftp://teambelgium.net/bfq/patches/4.5.0-v7r11/0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.5.0.patch"; + sha256 = "1j6h831kj32c9slzm4vhjvd8m17gbwh713kcpc54z9i02fwyq6ax"; + }; + name = "bfq1"; } + { patch = pkgs.fetchurl { + url = "ftp://teambelgium.net/bfq/patches/4.5.0-v7r11/0002-block-introduce-the-BFQ-v7r11-I-O-sched-for-4.5.0.patch"; + sha256 = "1q8nf7fcp72s2xz2pfl22sv4w5fm4hzgciljrkd3g7gj5xvi27lw"; + }; + name = "bfq2"; } + { patch = pkgs.fetchurl { + url = "ftp://teambelgium.net/bfq/patches/4.5.0-v7r11/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-for.patch"; + sha256 = "1q2j7g3cfwi52psxgwa06hadl6c2fh87ckm07pyaj35n6524gjg0"; + }; + name = "bfq3"; } + ]; + extraConfig = '' + BFQ_GROUP_IOSCHED y + IOSCHED_BFQ y + DEFAULT_BFQ y + ''; + }) + pkgs.linuxPackages_latest + ); + }; allowUnfree = true; From b4f3c7cea9107bc25fcb1b53b4d1483c796cb905 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Fri, 8 Jul 2016 15:03:42 -0700 Subject: [PATCH 2/7] neovim: tweak vim-go options --- configuration/common/pkg/neovim.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/configuration/common/pkg/neovim.nix b/configuration/common/pkg/neovim.nix index 2dd5693..b29314e 100644 --- a/configuration/common/pkg/neovim.nix +++ b/configuration/common/pkg/neovim.nix @@ -177,7 +177,10 @@ in { let g:go_highlight_interfaces = 1 let g:go_highlight_operators = 1 let g:go_highlight_build_constraints = 1 -" let g:go_fmt_command = "goimports" + let g:go_fmt_command = 'gofmt' + let g:go_fmt_options= '-s' + let g:go_def_mode = 'godef' + let g:go_def_reuse_buffer = 0 au FileType go nmap gds (go-def-split) au FileType go nmap gdv (go-def-vertical) From fd5b963bfb8130da7a46840bcbd85018c117fb7d Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Fri, 8 Jul 2016 15:05:02 -0700 Subject: [PATCH 3/7] *: syntax correction --- configuration/steveej-laptop/pkg.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/configuration/steveej-laptop/pkg.nix b/configuration/steveej-laptop/pkg.nix index 676de8c..50f1908 100644 --- a/configuration/steveej-laptop/pkg.nix +++ b/configuration/steveej-laptop/pkg.nix @@ -12,7 +12,6 @@ in packageOverrides = pkgs: rec { go = gitpkgs.go1_6; bluez = pkgs.bluez5; - #pythonPackages.sqlalchemy7 = pkgs.pythonPackages.sqlalchemy7.override { doCheck = false; }; myLinuxPackages = pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor (pkgs.linux_latest.override { @@ -81,7 +80,7 @@ in androidsdk_4_4 nixops - ansible + ansible gnupg picocom @@ -111,7 +110,7 @@ in audacity pavucontrol spotify - + gimp inkscape pdftk From a390b5e62f15d3fc71689a2ac466dd2f274cd0c8 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Fri, 8 Jul 2016 15:07:42 -0700 Subject: [PATCH 4/7] sj laptop: add nox to pkg --- configuration/steveej-laptop/pkg.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/configuration/steveej-laptop/pkg.nix b/configuration/steveej-laptop/pkg.nix index 50f1908..9a47272 100644 --- a/configuration/steveej-laptop/pkg.nix +++ b/configuration/steveej-laptop/pkg.nix @@ -80,6 +80,7 @@ in androidsdk_4_4 nixops + nox ansible gnupg From 8342c2166af8d97796c35c46112d6e33b99dc401 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Fri, 8 Jul 2016 15:07:42 -0700 Subject: [PATCH 5/7] sj laptop/pkg: use spotify from gitpkgs --- configuration/steveej-laptop/pkg.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration/steveej-laptop/pkg.nix b/configuration/steveej-laptop/pkg.nix index 9a47272..673590b 100644 --- a/configuration/steveej-laptop/pkg.nix +++ b/configuration/steveej-laptop/pkg.nix @@ -110,7 +110,6 @@ in vlc audacity pavucontrol - spotify gimp inkscape @@ -127,5 +126,6 @@ in gitpkgs.rkt gitpkgs.flannel gitpkgs.remmina + gitpkgs.spotify ]; } From af9e582616065be63441645b1e3b446dfeea1cca Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Fri, 8 Jul 2016 15:11:11 -0700 Subject: [PATCH 6/7] sj laptop/system: enable synaptics --- configuration/steveej-laptop/system.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configuration/steveej-laptop/system.nix b/configuration/steveej-laptop/system.nix index dfa77a9..68a283b 100644 --- a/configuration/steveej-laptop/system.nix +++ b/configuration/steveej-laptop/system.nix @@ -108,12 +108,12 @@ services.etcd.enable = true; services.xserver = { - synaptics.enable = false; -# synaptics.palmDetect = true; -# synaptics.horizEdgeScroll = true; -# synaptics.horizontalScroll = true; -# synaptics.twoFingerScroll = true; -# synaptics.vertEdgeScroll = true; + synaptics.enable = true; + synaptics.palmDetect = true; + synaptics.horizEdgeScroll = true; + synaptics.horizontalScroll = true; + synaptics.twoFingerScroll = true; + synaptics.vertEdgeScroll = true; videoDrivers = [ "qxl" "intel" ]; enable = true; From 1dfcfbc59203866f76921a9f37552b3670f8268a Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Fri, 8 Jul 2016 15:11:44 -0700 Subject: [PATCH 7/7] neovim: prepare deoplete --- configuration/common/pkg/neovim.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/configuration/common/pkg/neovim.nix b/configuration/common/pkg/neovim.nix index b29314e..05509f1 100644 --- a/configuration/common/pkg/neovim.nix +++ b/configuration/common/pkg/neovim.nix @@ -187,10 +187,17 @@ in { au FileType go nmap gdt (go-def-tab) " } + " deoplete { +" let g:deoplete#enable_at_startup = 1 +" let g:deoplete#enable_smart_case = 1 + " } ''; vam.knownPlugins = gitpkgs.vimPlugins; # optional vam.pluginDictionaries = [ # full ducomentation at github.com/MarcWeber/vim-addon-manager +# "deoplete-nvim" +# "deoplete-jedi" +# "deoplete-go" "vim-addon-vim2nix" "youcompleteme" "vim-airline" @@ -216,7 +223,7 @@ in { html5lib dbus ] ++ pythonPkgs; - withPython3 = false; + withPython3 = true; }) ]; }