From 845887c737f501ec0af7bc092ce2cff1835229ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Krop=C3=A1=C4=8Dek?= Date: Fri, 18 Oct 2024 15:46:07 +0200 Subject: [PATCH] added moonlight and nixos-hardware --- flake.lock | 29 +++++++++++++++++++++++------ flake.nix | 2 ++ hosts/lenar/default.nix | 1 + hosts/lenar/disko.nix | 2 +- users/krop/default.nix | 1 + 5 files changed, 28 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 9ab9200..dc3e76e 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1729070567, - "narHash": "sha256-r3KMTeBLioUtRPRFjdWbpZqfMmQHr6Dj9vjGaj4OhP8=", + "lastModified": 1729099656, + "narHash": "sha256-VftVIg7UXTy1bq+tzi1aVYOWl7PQ35IpjW88yMYjjpc=", "owner": "nix-community", "repo": "disko", - "rev": "c8760cee70cf166ad6bcee0bd9f0bba934a3a651", + "rev": "d7d57edb72e54891fa67a6f058a46b2bb405663b", "type": "github" }, "original": { @@ -53,6 +53,22 @@ "type": "github" } }, + "nixos-hardware": { + "locked": { + "lastModified": 1728729581, + "narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=", + "owner": "NixOS", + "repo": "nixos-hardware", + "rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "master", + "repo": "nixos-hardware", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1725194671, @@ -71,11 +87,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1728538411, - "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=", + "lastModified": 1728863046, + "narHash": "sha256-DZBO2465PL5V89e8hFSJewyH4QbCPpW3ssws7ckT/0A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221", + "rev": "d4f247e89f6e10120f911e2e2d2254a050d0f732", "type": "github" }, "original": { @@ -90,6 +106,7 @@ "disko": "disko", "home-manager": "home-manager", "nix-flatpak": "nix-flatpak", + "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2" } } diff --git a/flake.nix b/flake.nix index ae45725..e6222b5 100644 --- a/flake.nix +++ b/flake.nix @@ -12,6 +12,8 @@ }; disko.url = "github:nix-community/disko"; + + nixos-hardware.url = "github:NixOS/nixos-hardware/master"; }; outputs = diff --git a/hosts/lenar/default.nix b/hosts/lenar/default.nix index eb44ab1..78612b5 100644 --- a/hosts/lenar/default.nix +++ b/hosts/lenar/default.nix @@ -9,6 +9,7 @@ # Include the results of the hardware scan. ./hardware-configuration.nix inputs.disko.nixosModules.disko + inputs.nixos-hardware.nixosModules.common-cpu-intel ./disko.nix ]; diff --git a/hosts/lenar/disko.nix b/hosts/lenar/disko.nix index 8f4d521..df53a71 100644 --- a/hosts/lenar/disko.nix +++ b/hosts/lenar/disko.nix @@ -11,7 +11,7 @@ priority = 1; name = "ESP"; start = "1M"; - end = "128M"; + end = "1G"; type = "EF00"; content = { type = "filesystem"; diff --git a/users/krop/default.nix b/users/krop/default.nix index 02825ef..d3b2466 100644 --- a/users/krop/default.nix +++ b/users/krop/default.nix @@ -19,6 +19,7 @@ gnomeExtensions.grand-theft-focus gnomeExtensions.vitals spotify + moonlight-qt # # Adds the 'hello' command to your environment. It prints a friendly # # "Hello, world!" when run. # hello