This commit is contained in:
Daylin Morgan 2022-11-21 15:12:09 -06:00
parent 8dfbafaed2
commit 67a1317e13
4 changed files with 79 additions and 14 deletions

View file

@ -18,7 +18,6 @@
time.timeZone = "America/Chicago"; time.timeZone = "America/Chicago";
programs.zsh.enable = true; programs.zsh.enable = true;
programs.dconf.enable = true;
# overwrite demo as default login # overwrite demo as default login
services.xserver = { services.xserver = {
enable = true; enable = true;
@ -93,7 +92,7 @@ gnome.adwaita-icon-theme
# firefox # firefox
wavebox wavebox
pciutils
(vivaldi.override { (vivaldi.override {
proprietaryCodecs = true; proprietaryCodecs = true;
enableWidevine = false; enableWidevine = false;
@ -105,7 +104,6 @@ vscode.fhs
go go
rustup rustup
]; ];
@ -119,7 +117,6 @@ vscode.fhs
openssl openssl
zlib # for delta zlib # for delta
fuse # for libfuse/Neovim Appimage
]; ];
NIX_LD = lib.fileContents "${pkgs.stdenv.cc}/nix-support/dynamic-linker"; NIX_LD = lib.fileContents "${pkgs.stdenv.cc}/nix-support/dynamic-linker";
}; };

21
environment.nix Normal file
View file

@ -0,0 +1,21 @@
{ lib, config, pkgs, ... }:
{
# for compatibility add zsh to list of /etc/shells
environment.shells = with pkgs; [ zsh ];
environment.etc = {
issue.source = ./etc/issue;
};
environment.variables = {
NIX_LD_LIBRARY_PATH = with pkgs; lib.makeLibraryPath [
stdenv.cc.cc
openssl
zlib # for delta
];
NIX_LD = lib.fileContents "${pkgs.stdenv.cc}/nix-support/dynamic-linker";
};
}

View file

@ -1,5 +1,26 @@
{ {
"nodes": { "nodes": {
"hyprland": {
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"wlroots": "wlroots"
},
"locked": {
"lastModified": 1669054465,
"narHash": "sha256-4xBCexof83T4eFR2EP6HGfpHGLPJf3x6hsWt8LlhIHU=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "d504c1e5ab84bcbf7648350e867ccdda9b38b9c4",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "Hyprland",
"type": "github"
}
},
"nix-ld": { "nix-ld": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -39,6 +60,7 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"hyprland": "hyprland",
"nix-ld": "nix-ld", "nix-ld": "nix-ld",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
} }
@ -57,6 +79,24 @@
"repo": "flake-utils", "repo": "flake-utils",
"type": "github" "type": "github"
} }
},
"wlroots": {
"flake": false,
"locked": {
"host": "gitlab.freedesktop.org",
"lastModified": 1668785720,
"narHash": "sha256-CX+PYJP2PxZWL380WzyMNsrfRgIb/78brdwvDg/zj28=",
"owner": "wlroots",
"repo": "wlroots",
"rev": "4ff46e6cf9463e594605928feeb7c55cf323b5e7",
"type": "gitlab"
},
"original": {
"host": "gitlab.freedesktop.org",
"owner": "wlroots",
"repo": "wlroots",
"type": "gitlab"
}
} }
}, },
"root": "root", "root": "root",

View file

@ -7,11 +7,15 @@
url = "github:Mic92/nix-ld"; url = "github:Mic92/nix-ld";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
hyprland = {
url = "github:hyprwm/Hyprland";
# build with your own instance of nixpkgs
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = inputs: outputs = inputs:
/* ignore:: */
{ {
nixosConfigurations = { nixosConfigurations = {
@ -19,8 +23,11 @@
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
./configuration.nix ./configuration.nix
inputs.nix-ld.nixosModules.nix-ld
./overlays.nix ./overlays.nix
./environment.nix
inputs.hyprland.nixosModules.default
{ programs.hyprland.enable = true; }
inputs.nix-ld.nixosModules.nix-ld
]; ];
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
}; };