Update to unstable and latest kernel
This commit is contained in:
parent
ec900eb30a
commit
1e01b76061
32
flake.lock
32
flake.lock
|
@ -7,16 +7,15 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1617824794,
|
||||
"narHash": "sha256-UGkvzx0nIXHhNq/KwJLjXvKAQRE2V33MuX+UirvqrkQ=",
|
||||
"lastModified": 1621649712,
|
||||
"narHash": "sha256-SGOWonfYzV/Cdjfv3dlEgbMlg5yRZohTG/Cm0xcuiEA=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "2aa20ae969f2597c4df10a094440a66e9d7f8c86",
|
||||
"rev": "4f70f49cec34cb22b9be9f42cd0dd68ef816a797",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "release-20.09",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
|
@ -38,27 +37,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1621231671,
|
||||
"narHash": "sha256-JibKd8VVGRCS0fpjkQcMxkCsCJz0qbrDMkf5++OMkyE=",
|
||||
"lastModified": 1621717585,
|
||||
"narHash": "sha256-ppKKDZzZCCKcaTgTo+FmTd/sJsjLqRgxPyyMFBnCC6w=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "52090c613ad854abb824dcbba20e19bfa3890e91",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-20.09",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1621618687,
|
||||
"narHash": "sha256-eftI5DUnosDRWhAdlc1WevEWI0/W70v6FPeFtFshpi4=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "fba98bad71596ffc963fb14140760d2e4abb0a4d",
|
||||
"rev": "ef997835052856ff8003c24187e5a75e622d41fa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -72,8 +55,7 @@
|
|||
"inputs": {
|
||||
"home-manager": "home-manager",
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixpkgs-unstable": "nixpkgs-unstable"
|
||||
"nixpkgs": "nixpkgs"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
12
flake.nix
12
flake.nix
|
@ -2,9 +2,6 @@
|
|||
description = "Malte Tammena's system configuration";
|
||||
|
||||
inputs.nixpkgs = {
|
||||
url = "github:NixOS/nixpkgs/nixos-20.09";
|
||||
};
|
||||
inputs.nixpkgs-unstable = {
|
||||
url = "github:NixOS/nixpkgs/master";
|
||||
};
|
||||
inputs.nixos-hardware = {
|
||||
|
@ -12,19 +9,15 @@
|
|||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
inputs.home-manager = {
|
||||
url = "github:nix-community/home-manager/release-20.09";
|
||||
url = "github:nix-community/home-manager/";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
outputs = { self, nixpkgs, nixpkgs-unstable, nixos-hardware, home-manager }:
|
||||
outputs = { self, nixpkgs, nixos-hardware, home-manager }:
|
||||
let
|
||||
system = "x86_64-linux";
|
||||
username = "malte";
|
||||
|
||||
overlay-unstable = final: prev: {
|
||||
unstable = nixpkgs-unstable.legacyPackages.${system};
|
||||
};
|
||||
|
||||
in rec {
|
||||
|
||||
nixosModules.lenovo-thinkpad-p1 = { pkgs, config, lib, ... }: {
|
||||
|
@ -82,7 +75,6 @@
|
|||
({ pkgs, ... }: {
|
||||
system.configurationRevision = nixpkgs.lib.mkIf (self ? rev) self.rev;
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
nixpkgs.overlays = [ overlay-unstable ];
|
||||
|
||||
services.dbus.packages = [ pkgs.gnome3.dconf ];
|
||||
|
||||
|
|
|
@ -1,14 +1,17 @@
|
|||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
home.packages = with pkgs; [
|
||||
numix-cursor-theme
|
||||
];
|
||||
gtk = {
|
||||
enable = true;
|
||||
theme = {
|
||||
package = pkgs.unstable.arc-theme;
|
||||
package = pkgs.arc-theme;
|
||||
name = "Arc";
|
||||
};
|
||||
iconTheme = {
|
||||
package = pkgs.unstable.papirus-icon-theme;
|
||||
package = pkgs.papirus-icon-theme;
|
||||
name = "Papirus";
|
||||
};
|
||||
|
||||
|
@ -16,6 +19,9 @@
|
|||
bookmarks = [
|
||||
|
||||
];
|
||||
extraConfig = {
|
||||
gtk-cursor-theme-name = "Numix-Cursor";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -15,14 +15,14 @@
|
|||
config = {
|
||||
home = {
|
||||
packages = with pkgs; [
|
||||
unstable.tdesktop
|
||||
tdesktop
|
||||
hledger
|
||||
firefox
|
||||
steam
|
||||
ponymix
|
||||
gnome3.nautilus
|
||||
gnome3.sushi
|
||||
unstable.hicolor-icon-theme
|
||||
hicolor-icon-theme
|
||||
];
|
||||
|
||||
keyboard = {
|
||||
|
|
|
@ -23,7 +23,10 @@ in
|
|||
extraOptions = [ "--my-next-gpu-wont-be-nvidia" ];
|
||||
enable = true;
|
||||
systemdIntegration = true;
|
||||
wrapperFeatures.gtk = true;
|
||||
wrapperFeatures = {
|
||||
base = true;
|
||||
gtk = true;
|
||||
};
|
||||
|
||||
config = {
|
||||
modifier = "Mod4";
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
#services.xserver.displayManager.gdm.enable = true;
|
||||
#services.xserver.desktopManager.gnome3.enable = true;
|
||||
|
||||
|
||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
boot.supportedFilesystems = [ "btrfs" ];
|
||||
boot.loader.timeout = 1;
|
||||
# Use the systemd-boot EFI boot loader.
|
||||
|
|
Loading…
Reference in a new issue