dev/nixfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Update inputs and disable kmscon

Browse Source
This commit is contained in:
Jack O'Sullivan 2022-02-20 16:10:57 +00:00
parent 26ab49d91c
commit 15b10f22cf
3 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
flake.lock generated
View File

@ -136,11 +136,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1644706973, "lastModified": 1645244400,
"narHash": "sha256-xOyxrhc5V79u0ZNmnPmJbY3ngtp43dNISEmrb8Ie6wQ=", "narHash": "sha256-o7KCd6ySFZ9/LbS62aTeuFmBWtP7Tt3Q3RcNjYgTgZU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "7c2ae0bdd20ddcaafe41ef669226a1df67f8aa06", "rev": "0232fe1b75e6d7864fd82b5c72f6646f87838fc3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -166,11 +166,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1644486793, "lastModified": 1645013224,
"narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=", "narHash": "sha256-b7OEC8vwzJv3rsz9pwnTX2LQDkeOWz2DbKypkVvNHXc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1882c6b7368fd284ad01b0a5b5601ef136321292", "rev": "b66b39216b1fef2d8c33cc7a5c72d8da80b79970",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -195,11 +195,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1644472683, "lastModified": 1645010845,
"narHash": "sha256-sP6iM4NksOYO6NFfTJ96cg+ClPnq6cdY30xKA1iYtyU=", "narHash": "sha256-hO9X4PvxkSLMQnGGB7tOrKPwufhLMiNQMNXNwzLqneo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7adc9c14ec74b27358a8df9b973087e351425a79", "rev": "2128d0aa28edef51fd8fef38b132ffc0155595df",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -210,11 +210,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1644525281, "lastModified": 1644613700,
"narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", "narHash": "sha256-wLRPJclMH8vsHuFtyI78aF09lw5mbi3lMB6uiK5S2wE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "48d63e924a2666baf37f4f14a18f19347fbd54a2", "rev": "23d785aa6f853e6cf3430119811c334025bbef55",
"type": "github" "type": "github"
}, },
"original": { "original": {

5
home-manager/modules/common.nix
View File

@ -170,10 +170,7 @@ in
(mkIf (config.my.isStandalone || !args.osConfig.home-manager.useGlobalPkgs) { (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 # Note: If globalPkgs mode is on, then these will be overridden by the NixOS equivalents of these options
nixpkgs = { nixpkgs = {
overlays = [ overlays = [ ];
# TODO: Wait for https://github.com/NixOS/nixpkgs/pull/159074 to arrive to nixos-unstable
(final: prev: { remarshal = pkgs'.master.remarshal; })
];
config = { config = {
allowUnfree = true; allowUnfree = true;
}; };

5
nixos/modules/common.nix
View File

@ -53,8 +53,6 @@ in
nixpkgs = { nixpkgs = {
overlays = [ overlays = [
inputs.deploy-rs.overlay 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 = { config = {
allowUnfree = true; allowUnfree = true;
@ -109,7 +107,8 @@ in
services = { services = {
kmscon = { 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; hwRender = mkDefault true;
extraOptions = "--verbose"; extraOptions = "--verbose";
extraConfig = extraConfig =