From 15b10f22cfd612cdae459337c434a293b3a59f38 Mon Sep 17 00:00:00 2001 From: Jack O'Sullivan Date: Sun, 20 Feb 2022 16:10:57 +0000 Subject: [PATCH] Update inputs and disable kmscon --- flake.lock | 24 ++++++++++++------------ home-manager/modules/common.nix | 5 +---- nixos/modules/common.nix | 5 ++--- 3 files changed, 15 insertions(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index d05c308..2470002 100644 --- a/flake.lock +++ b/flake.lock @@ -136,11 +136,11 @@ ] }, "locked": { - "lastModified": 1644706973, - "narHash": "sha256-xOyxrhc5V79u0ZNmnPmJbY3ngtp43dNISEmrb8Ie6wQ=", + "lastModified": 1645244400, + "narHash": "sha256-o7KCd6ySFZ9/LbS62aTeuFmBWtP7Tt3Q3RcNjYgTgZU=", "owner": "nix-community", "repo": "home-manager", - "rev": "7c2ae0bdd20ddcaafe41ef669226a1df67f8aa06", + "rev": "0232fe1b75e6d7864fd82b5c72f6646f87838fc3", "type": "github" }, "original": { @@ -166,11 +166,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1644486793, - "narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=", + "lastModified": 1645013224, + "narHash": "sha256-b7OEC8vwzJv3rsz9pwnTX2LQDkeOWz2DbKypkVvNHXc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1882c6b7368fd284ad01b0a5b5601ef136321292", + "rev": "b66b39216b1fef2d8c33cc7a5c72d8da80b79970", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1644472683, - "narHash": "sha256-sP6iM4NksOYO6NFfTJ96cg+ClPnq6cdY30xKA1iYtyU=", + "lastModified": 1645010845, + "narHash": "sha256-hO9X4PvxkSLMQnGGB7tOrKPwufhLMiNQMNXNwzLqneo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7adc9c14ec74b27358a8df9b973087e351425a79", + "rev": "2128d0aa28edef51fd8fef38b132ffc0155595df", "type": "github" }, "original": { @@ -210,11 +210,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1644525281, - "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", + "lastModified": 1644613700, + "narHash": "sha256-wLRPJclMH8vsHuFtyI78aF09lw5mbi3lMB6uiK5S2wE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "48d63e924a2666baf37f4f14a18f19347fbd54a2", + "rev": "23d785aa6f853e6cf3430119811c334025bbef55", "type": "github" }, "original": { diff --git a/home-manager/modules/common.nix b/home-manager/modules/common.nix index 9dd81b2..b266084 100644 --- a/home-manager/modules/common.nix +++ b/home-manager/modules/common.nix @@ -170,10 +170,7 @@ in (mkIf (config.my.isStandalone || !args.osConfig.home-manager.useGlobalPkgs) { # Note: If globalPkgs mode is on, then these will be overridden by the NixOS equivalents of these options nixpkgs = { - overlays = [ - # TODO: Wait for https://github.com/NixOS/nixpkgs/pull/159074 to arrive to nixos-unstable - (final: prev: { remarshal = pkgs'.master.remarshal; }) - ]; + overlays = [ ]; config = { allowUnfree = true; }; diff --git a/nixos/modules/common.nix b/nixos/modules/common.nix index 2c7f89c..0575c36 100644 --- a/nixos/modules/common.nix +++ b/nixos/modules/common.nix @@ -53,8 +53,6 @@ in nixpkgs = { overlays = [ inputs.deploy-rs.overlay - # TODO: Wait for https://github.com/NixOS/nixpkgs/pull/159074 to arrive to nixos-unstable - (final: prev: { remarshal = pkgs'.master.remarshal; }) ]; config = { allowUnfree = true; @@ -109,7 +107,8 @@ in services = { kmscon = { - enable = mkDefault true; + # As it turns out, kmscon hasn't been updated in years and has some bugs... + enable = mkDefault false; hwRender = mkDefault true; extraOptions = "--verbose"; extraConfig =