Add chrysalis, extend nm
This commit is contained in:
parent
4ce3193f0f
commit
076e08ff25
17
flake.lock
17
flake.lock
|
@ -363,6 +363,22 @@
|
||||||
"type": "indirect"
|
"type": "indirect"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixpkgs-21.05": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1637316267,
|
||||||
|
"narHash": "sha256-hfAA/0W3tycKKOSwP7Xt6FXLG9h/FgCu45wdGubHtV0=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "24528474d2b3370f2f23879a557ae2cc92a5d50b",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "nixos-21.05",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nixpkgs-master": {
|
"nixpkgs-master": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1636627443,
|
"lastModified": 1636627443,
|
||||||
|
@ -583,6 +599,7 @@
|
||||||
"mosh": "mosh",
|
"mosh": "mosh",
|
||||||
"nixos-hardware": "nixos-hardware",
|
"nixos-hardware": "nixos-hardware",
|
||||||
"nixpkgs": "nixpkgs_9",
|
"nixpkgs": "nixpkgs_9",
|
||||||
|
"nixpkgs-21.05": "nixpkgs-21.05",
|
||||||
"nixpkgs-master": "nixpkgs-master",
|
"nixpkgs-master": "nixpkgs-master",
|
||||||
"nixpkgs-wayland": "nixpkgs-wayland",
|
"nixpkgs-wayland": "nixpkgs-wayland",
|
||||||
"rip": "rip",
|
"rip": "rip",
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "nixpkgs/nixos-unstable";
|
nixpkgs.url = "nixpkgs/nixos-unstable";
|
||||||
nixpkgs-master.url = "github:NixOS/nixpkgs/master";
|
nixpkgs-master.url = "github:NixOS/nixpkgs/master";
|
||||||
|
"nixpkgs-21.05".url = "github:NixOS/nixpkgs/nixos-21.05";
|
||||||
nixos-hardware.url = "github:NixOS/nixos-hardware";
|
nixos-hardware.url = "github:NixOS/nixos-hardware";
|
||||||
nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland";
|
nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland";
|
||||||
home-manager.url = "github:nix-community/home-manager";
|
home-manager.url = "github:nix-community/home-manager";
|
||||||
|
@ -119,6 +120,7 @@
|
||||||
(self: super: {
|
(self: super: {
|
||||||
# Add a meta package containing packages from master
|
# Add a meta package containing packages from master
|
||||||
bleeding = inputs.nixpkgs-master.legacyPackages.x86_64-linux;
|
bleeding = inputs.nixpkgs-master.legacyPackages.x86_64-linux;
|
||||||
|
"nixpkgs-21.05" = inputs."nixpkgs-21.05".legacyPackages.x86_64-linux;
|
||||||
# Add FiraCode as a package, but use NerdFonts
|
# Add FiraCode as a package, but use NerdFonts
|
||||||
firaCodeNerd = super.nerdfonts.override { fonts = [ "FiraCode" ]; };
|
firaCodeNerd = super.nerdfonts.override { fonts = [ "FiraCode" ]; };
|
||||||
# TODO: Remove once khal is fixed
|
# TODO: Remove once khal is fixed
|
||||||
|
|
|
@ -31,7 +31,10 @@ in {
|
||||||
networking = {
|
networking = {
|
||||||
hostName = "helix-texta";
|
hostName = "helix-texta";
|
||||||
# nm ftw
|
# nm ftw
|
||||||
networkmanager.enable = true;
|
networkmanager = {
|
||||||
|
enable = true;
|
||||||
|
packages = with pkgs; [ networkmanager-vpnc ];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
system.fsPackages = [ pkgs.sshfs ];
|
system.fsPackages = [ pkgs.sshfs ];
|
||||||
|
@ -176,7 +179,7 @@ in {
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
thunderbolt
|
thunderbolt
|
||||||
qt5.qtwayland
|
qt5.qtwayland
|
||||||
chrysalis
|
pkgs."nixpkgs-21.05".chrysalis
|
||||||
];
|
];
|
||||||
|
|
||||||
services.printing.enable = true;
|
services.printing.enable = true;
|
||||||
|
|
Loading…
Reference in a new issue