diff --git a/flake.lock b/flake.lock index c028613..c4f16a3 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1676933022, - "narHash": "sha256-gLghsEHOy2W2ZmSwqNOyj2mSHe9SMpdcbqnoySlZnmY=", + "lastModified": 1677012759, + "narHash": "sha256-OtpMvJiChwpMc0rZ/WSKLgpBcx/1zuUcT9MhOPVoz34=", "owner": "nix-community", "repo": "home-manager", - "rev": "5e889b385c43a8a72ada5ebc4888bbebb129b438", + "rev": "c7c69ec40543d5c088abf0af816aff7b738ccaa2", "type": "github" }, "original": { @@ -47,11 +47,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1676981621, - "narHash": "sha256-kRvteNQ8kkhtyJF4b+CHBDUkleZFxsIxtbCDn7gEK20=", + "lastModified": 1677012422, + "narHash": "sha256-8FiSyHE3lscZKts1W+U6DSyxdvxKzeql2RQ9qln7Ra4=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "a66ef50469c7a347d27a9afec83db1be70be1c84", + "rev": "66e3679ba3dd1412f47e08c52872b7583deff291", "type": "github" }, "original": { @@ -120,13 +120,28 @@ "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": { "locked": { - "lastModified": 1676885936, - "narHash": "sha256-ZRKb6zBfTvdCOXI7nGC1L9UWSU5ay2ltxg+f5UIzBOU=", + "lastModified": 1676973346, + "narHash": "sha256-rft8oGMocTAhUVqG3LW6I8K/Fo9ICGmNjRqaWTJwav0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b69883faca9542d135fa6bab7928ff1b233c167f", + "rev": "d0d55259081f0b97c828f38559cad899d351cad1", "type": "github" }, "original": { @@ -173,6 +188,7 @@ "hyprland": "hyprland", "hyprpaper": "hyprpaper", "nix-colors": "nix-colors", + "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "sops-nix": "sops-nix" } diff --git a/flake.nix b/flake.nix index 980de3f..7c0cf96 100644 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,7 @@ sops-nix.url = github:Mic92/sops-nix; nix-colors.url = github:Misterio77/nix-colors; hyprpaper.url = github:hyprwm/hyprpaper; + nixos-hardware.url = github:nixos/nixos-hardware; home-manager.inputs.nixpkgs.follows = "nixpkgs"; hyprland.inputs.nixpkgs.follows = "nixpkgs"; @@ -14,7 +15,7 @@ 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; nixosConfigurations = { thinkpad = nixpkgs.lib.nixosSystem { @@ -23,6 +24,7 @@ modules = [ ./hosts/thinkpad ./users/rouven + nixos-hardware.nixosModules.lenovo-thinkpad-l14-intel home-manager.nixosModules.home-manager sops-nix.nixosModules.sops { @@ -43,6 +45,7 @@ system = "x86_64-linux"; specialArgs.inputs = attrs; modules = [ + nixos-hardware.nixosModules.intel-nuc-8i7beh ./hosts/nuc sops-nix.nixosModules.sops ]; diff --git a/users/rouven/modules/neovim/init.lua b/users/rouven/modules/neovim/init.lua index 9284d01..25392c4 100644 --- a/users/rouven/modules/neovim/init.lua +++ b/users/rouven/modules/neovim/init.lua @@ -37,10 +37,10 @@ map('n', 'n :NERDTreeFocus', ':NERDTreeRefreshRoot') autocmd('VimEnter', {command = 'NERDTree | wincmd p'}) --Close the tab if NERDTree is the only window remaining in it. -autocmd("BufEnter", { - pattern = "*", - command = "if winnr('$') == 1 && exists('b:NERDTree') && b:NERDTree.isTabTree() | quit | endif" -}) +--autocmd("BufEnter", { + --pattern = "*", + --command = "if winnr('$') == 1 && exists('b:NERDTree') && b:NERDTree.isTabTree() | quit | endif" +--}) -- remove ex-mode shortcut map('n', 'Q', '')