added nixos-hardware

This commit is contained in:
Rouven Seifert 2023-02-21 22:35:56 +01:00
parent e9e167d26d
commit 1b7ccea62c
Signed by: rouven.seifert
GPG key ID: B95E8FE6B11C4D09
3 changed files with 33 additions and 14 deletions

View file

@ -24,11 +24,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1676933022, "lastModified": 1677012759,
"narHash": "sha256-gLghsEHOy2W2ZmSwqNOyj2mSHe9SMpdcbqnoySlZnmY=", "narHash": "sha256-OtpMvJiChwpMc0rZ/WSKLgpBcx/1zuUcT9MhOPVoz34=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "5e889b385c43a8a72ada5ebc4888bbebb129b438", "rev": "c7c69ec40543d5c088abf0af816aff7b738ccaa2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -47,11 +47,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1676981621, "lastModified": 1677012422,
"narHash": "sha256-kRvteNQ8kkhtyJF4b+CHBDUkleZFxsIxtbCDn7gEK20=", "narHash": "sha256-8FiSyHE3lscZKts1W+U6DSyxdvxKzeql2RQ9qln7Ra4=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "a66ef50469c7a347d27a9afec83db1be70be1c84", "rev": "66e3679ba3dd1412f47e08c52872b7583deff291",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -120,13 +120,28 @@
"type": "github" "type": "github"
} }
}, },
"nixos-hardware": {
"locked": {
"lastModified": 1676924492,
"narHash": "sha256-78278eyP55JRFe7UCpmFwdkrTY6H2arzTpVeteWo8kM=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "d24ea777c57b69c6b143cf11d83184ef71b0dbbf",
"type": "github"
},
"original": {
"owner": "nixos",
"repo": "nixos-hardware",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1676885936, "lastModified": 1676973346,
"narHash": "sha256-ZRKb6zBfTvdCOXI7nGC1L9UWSU5ay2ltxg+f5UIzBOU=", "narHash": "sha256-rft8oGMocTAhUVqG3LW6I8K/Fo9ICGmNjRqaWTJwav0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b69883faca9542d135fa6bab7928ff1b233c167f", "rev": "d0d55259081f0b97c828f38559cad899d351cad1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -173,6 +188,7 @@
"hyprland": "hyprland", "hyprland": "hyprland",
"hyprpaper": "hyprpaper", "hyprpaper": "hyprpaper",
"nix-colors": "nix-colors", "nix-colors": "nix-colors",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"sops-nix": "sops-nix" "sops-nix": "sops-nix"
} }

View file

@ -7,6 +7,7 @@
sops-nix.url = github:Mic92/sops-nix; sops-nix.url = github:Mic92/sops-nix;
nix-colors.url = github:Misterio77/nix-colors; nix-colors.url = github:Misterio77/nix-colors;
hyprpaper.url = github:hyprwm/hyprpaper; hyprpaper.url = github:hyprwm/hyprpaper;
nixos-hardware.url = github:nixos/nixos-hardware;
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
hyprland.inputs.nixpkgs.follows = "nixpkgs"; hyprland.inputs.nixpkgs.follows = "nixpkgs";
@ -14,7 +15,7 @@
sops-nix.inputs.nixpkgs.follows = "nixpkgs"; sops-nix.inputs.nixpkgs.follows = "nixpkgs";
}; };
outputs = { self, nixpkgs, home-manager, hyprland, hyprpaper, sops-nix, nix-colors }@attrs: { outputs = { self, nixpkgs, home-manager, hyprland, hyprpaper, sops-nix, nix-colors, nixos-hardware }@attrs: {
formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixpkgs-fmt; formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixpkgs-fmt;
nixosConfigurations = { nixosConfigurations = {
thinkpad = nixpkgs.lib.nixosSystem { thinkpad = nixpkgs.lib.nixosSystem {
@ -23,6 +24,7 @@
modules = [ modules = [
./hosts/thinkpad ./hosts/thinkpad
./users/rouven ./users/rouven
nixos-hardware.nixosModules.lenovo-thinkpad-l14-intel
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
sops-nix.nixosModules.sops sops-nix.nixosModules.sops
{ {
@ -43,6 +45,7 @@
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs.inputs = attrs; specialArgs.inputs = attrs;
modules = [ modules = [
nixos-hardware.nixosModules.intel-nuc-8i7beh
./hosts/nuc ./hosts/nuc
sops-nix.nixosModules.sops sops-nix.nixosModules.sops
]; ];

View file

@ -37,10 +37,10 @@ map('n', '<leader>n :NERDTreeFocus<CR>', ':NERDTreeRefreshRoot<CR>')
autocmd('VimEnter', {command = 'NERDTree | wincmd p'}) autocmd('VimEnter', {command = 'NERDTree | wincmd p'})
--Close the tab if NERDTree is the only window remaining in it. --Close the tab if NERDTree is the only window remaining in it.
autocmd("BufEnter", { --autocmd("BufEnter", {
pattern = "*", --pattern = "*",
command = "if winnr('$') == 1 && exists('b:NERDTree') && b:NERDTree.isTabTree() | quit | endif" --command = "if winnr('$') == 1 && exists('b:NERDTree') && b:NERDTree.isTabTree() | quit | endif"
}) --})
-- remove ex-mode shortcut -- remove ex-mode shortcut
map('n', 'Q', '<Nop>') map('n', 'Q', '<Nop>')