From f9eaf92be4e3d9377675d9be2488d5e02b738681 Mon Sep 17 00:00:00 2001 From: macronova Date: Fri, 16 Feb 2024 14:59:52 -0800 Subject: [PATCH] Update flake --- flake.lock | 30 +++++++++++++++--------------- linux/blitzar/configuration.nix | 18 ------------------ linux/blitzar/device.nix | 15 ++++++++++++++- 3 files changed, 29 insertions(+), 34 deletions(-) diff --git a/flake.lock b/flake.lock index bb835dd..9b8a84b 100644 --- a/flake.lock +++ b/flake.lock @@ -21,11 +21,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1707524024, - "narHash": "sha256-HmumZ8FuWAAYZrWUKm3N4G4h8nmZ5VUVX+vXLmCJNKM=", + "lastModified": 1708029101, + "narHash": "sha256-FPlAle/nl4sJRfd8eILe5M20aRJh/z2KY8ji2yBBwaI=", "owner": "nix-community", "repo": "disko", - "rev": "d07de570ba05cec2807d058daaa044f6955720c7", + "rev": "810eccbad22cc50323b27161033399eb87658932", "type": "github" }, "original": { @@ -70,11 +70,11 @@ }, "hardware": { "locked": { - "lastModified": 1707211557, - "narHash": "sha256-LTKTzZ6fM5j8XWXf51IMBzDaOaJg9kYWLUZxoIhzRN8=", + "lastModified": 1708091350, + "narHash": "sha256-o28BJYi68qqvHipT7V2jkWxDiMS1LF9nxUsou+eFUPQ=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "6e5cc385fc8cf5ca6495d70243074ccdea9f64c7", + "rev": "106d3fec43bcea19cb2e061ca02531d54b542ce3", "type": "github" }, "original": { @@ -88,11 +88,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1707683400, - "narHash": "sha256-Zc+J3UO1Xpx+NL8UB6woPHyttEy9cXXtm+0uWwzuYDc=", + "lastModified": 1708031129, + "narHash": "sha256-EH20hJfNnc1/ODdDVat9B7aKm0B95L3YtkIRwKLvQG8=", "owner": "nix-community", "repo": "home-manager", - "rev": "21b078306a2ab68748abf72650db313d646cf2ca", + "rev": "3d6791b3897b526c82920a2ab5f61d71985b3cf8", "type": "github" }, "original": { @@ -291,11 +291,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1707546158, - "narHash": "sha256-nYYJTpzfPMDxI8mzhQsYjIUX+grorqjKEU9Np6Xwy/0=", + "lastModified": 1707956935, + "narHash": "sha256-ZL2TrjVsiFNKOYwYQozpbvQSwvtV/3Me7Zwhmdsfyu4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d934204a0f8d9198e1e4515dd6fec76a139c87f0", + "rev": "a4d4fe8c5002202493e87ec8dbc91335ff55552c", "type": "github" }, "original": { @@ -339,11 +339,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1707620614, - "narHash": "sha256-gfAoB9dGzBu62NoAoM945aok7+6M+LFu+nvnGwAsTp4=", + "lastModified": 1707842202, + "narHash": "sha256-3dTBbCzHJBinwhsisGJHW1HLBsLbj91+a5ZDXt7ttW0=", "owner": "Mic92", "repo": "sops-nix", - "rev": "2eb7c4ba3aa75e2660fd217eb1ab64d5b793608e", + "rev": "48afd3264ec52bee85231a7122612e2c5202fa74", "type": "github" }, "original": { diff --git a/linux/blitzar/configuration.nix b/linux/blitzar/configuration.nix index f4301ad..763c9ae 100644 --- a/linux/blitzar/configuration.nix +++ b/linux/blitzar/configuration.nix @@ -27,24 +27,6 @@ }; }; - # Configure hardware - hardware = { - bluetooth.enable = true; - opengl = { - enable = true; - extraPackages = with pkgs; [ - vaapiVdpau - libvdpau-va-gl - ]; - }; - }; - - # Configure system services - services = { - automatic-timezoned.enable = true; - fwupd.enable = true; - }; - # Configure network proxy if necessary # networking.proxy.default = "http://user:password@proxy:port/"; # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; diff --git a/linux/blitzar/device.nix b/linux/blitzar/device.nix index 2208b7f..d729724 100644 --- a/linux/blitzar/device.nix +++ b/linux/blitzar/device.nix @@ -1,17 +1,30 @@ -{ config, ... }: +{ config, pkgs, ... }: { + hardware = { + bluetooth.enable = true; + opengl = { + enable = true; + extraPackages = with pkgs; [ + vaapiVdpau + libvdpau-va-gl + ]; + }; + }; + programs = { adb.enable = true; kdeconnect.enable = true; }; services = { + automatic-timezoned.enable = true; avahi = { enable = true; nssmdns4 = true; openFirewall = true; }; + fwupd.enable = true; printing.enable = true; };