From 6faa93b81ced2f29a232b1cd7b3437f3424b808b Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Sun, 6 Jun 2021 15:14:27 +0200 Subject: [PATCH] update blackadder kernel, rm libinput-gestures --- home-manager/desktop.nix | 1 - home-manager/home.nix | 2 +- home-manager/libinput-gestures.nix | 39 ------------------------------ nixos/physical/3950x.nix | 2 +- pkgs/default.nix | 3 --- 5 files changed, 2 insertions(+), 45 deletions(-) delete mode 100644 home-manager/libinput-gestures.nix diff --git a/home-manager/desktop.nix b/home-manager/desktop.nix index 83bde23..5bf7c03 100644 --- a/home-manager/desktop.nix +++ b/home-manager/desktop.nix @@ -16,7 +16,6 @@ in }; programs.mako.enable = true; services = { - libinput-gestures.enable = true; gpg-agent.extraConfig = '' pinentry-program ${pkgs.pinentry_gnome}/bin/pinentry-gnome3 ''; diff --git a/home-manager/home.nix b/home-manager/home.nix index 422e76b..2a03afc 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -8,7 +8,7 @@ let TF_SHELL = shell; } "${pkgs.thefuck}/bin/thefuck -a > $out"; in { - imports = [ ./arbtt.nix ./libinput-gestures.nix ./desktop.nix ]; + imports = [ ./arbtt.nix ./desktop.nix ]; nixpkgs = { config.allowUnfree = true; inherit (import /home/yorick/dotfiles/config.nix) overlays; diff --git a/home-manager/libinput-gestures.nix b/home-manager/libinput-gestures.nix deleted file mode 100644 index 20333d4..0000000 --- a/home-manager/libinput-gestures.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg = config.services.libinput-gestures; - -in { - - options.services.libinput-gestures = { - enable = mkEnableOption "libinput-gestures"; - - package = mkOption { type = types.package; default = pkgs.libinput-gestures; }; - - }; - - config = mkIf cfg.enable { - systemd.user.services.libinput-gestures = { - Unit = { - Description = "libinput-gestures"; - After = [ "graphical-session-pre.target" ]; - PartOf = [ "graphical-session.target" ]; - }; - - Install = { - WantedBy = [ "graphical-session.target" ]; - }; - - Service = { - ExecStart = '' - ${pkgs.libinput-gestures}/bin/libinput-gestures - ''; - }; - }; - - }; - -} diff --git a/nixos/physical/3950x.nix b/nixos/physical/3950x.nix index e6316a3..d001e7e 100644 --- a/nixos/physical/3950x.nix +++ b/nixos/physical/3950x.nix @@ -11,7 +11,7 @@ in { boot.loader.efi.canTouchEfiVariables = true; boot.supportedFilesystems = [ "zfs" ]; boot.kernelModules = [ "nct6775" ]; - boot.kernelPackages = pkgs.linuxPackages_5_10; + boot.kernelPackages = pkgs.linuxPackages_5_11; # zfs networking.hostId = "c7736638"; services.zfs.autoScrub.enable = true; services.zfs.trim.enable = true; diff --git a/pkgs/default.nix b/pkgs/default.nix index f47894d..367070a 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -5,9 +5,6 @@ ftb = super.callPackage ./ftb.nix {}; pyroscope = super.callPackage ./pyroscope {}; #lejos = super.callPackage ../pkgs/lejos.nix {}; - libinput-gestures = super.libinput-gestures.override { extraUtilsPath = [ - self.xdotool self.python3 - ];}; weiightminder = super.callPackage (builtins.fetchGit { url = https://gist.github.com/yorickvP/229d21a7da13c9c514dbd26147822641;