From c3a2bf746e3ddad1c059239aac75f9ec3fdde876 Mon Sep 17 00:00:00 2001 From: macronova Date: Tue, 16 Jan 2024 18:48:06 -0800 Subject: [PATCH] Update flake --- flake.lock | 60 ++++++++++++++++----------------- linux/blitzar/audio.nix | 7 ++-- linux/blitzar/configuration.nix | 45 +++++++++---------------- linux/blitzar/default.nix | 4 ++- linux/blitzar/device.nix | 4 +-- linux/blitzar/disko.nix | 5 +-- linux/blitzar/gui.nix | 1 + linux/blitzar/locale.nix | 4 ++- linux/blitzar/network.nix | 5 ++- linux/blitzar/tailscale.nix | 4 ++- linux/blitzar/zfs.nix | 4 +-- 11 files changed, 69 insertions(+), 74 deletions(-) diff --git a/flake.lock b/flake.lock index fbd5b9d..b5d61eb 100644 --- a/flake.lock +++ b/flake.lock @@ -21,11 +21,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1704277720, - "narHash": "sha256-meAKNgmh3goankLGWqqpw73pm9IvXjEENJloF0coskE=", + "lastModified": 1705356404, + "narHash": "sha256-0/WnHU5S9GXOJD2HGe/mFNmGGE+8UGnhwofsyJQVoDA=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "0dd382b70c351f528561f71a0a7df82c9d2be9a4", + "rev": "44a6ec1faeff61a6404c25ef1a263fc2d98d081b", "type": "github" }, "original": { @@ -39,11 +39,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1705017253, - "narHash": "sha256-/ysUOnF/dYJXDTxi/fi4MNN7uYKRji5CKp3EIamXB+0=", + "lastModified": 1705348229, + "narHash": "sha256-CssPema1sBxZkrT95KFuKCNNiqxNe1lnf2QNeXk88Xk=", "owner": "nix-community", "repo": "disko", - "rev": "fa5db12d76f9e8ee11e572cdbe021230e48b6afa", + "rev": "d0b4408eaf782a1ada0a9133bb1cecefdd59c696", "type": "github" }, "original": { @@ -88,11 +88,11 @@ }, "hardware": { "locked": { - "lastModified": 1704786394, - "narHash": "sha256-aJM0ln9fMGWw1+tjyl5JZWZ3ahxAA2gw2ZpZY/hkEMs=", + "lastModified": 1705312285, + "narHash": "sha256-rd+dY+v61Y8w3u9bukO/hB55Xl4wXv4/yC8rCGVnK5U=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "b34a6075e9e298c4124e35c3ccaf2210c1f3a43b", + "rev": "bee2202bec57e521e3bd8acd526884b9767d7fa0", "type": "github" }, "original": { @@ -106,11 +106,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1704980804, - "narHash": "sha256-lPNNKdPqIYcjhhYIVwlajNt/HqVWbMOoSdNnwCvOP04=", + "lastModified": 1705347059, + "narHash": "sha256-MSdJZDeyBIjf1SAZ7OvA44b00zUGTrDxkAm9vVR+XRk=", "owner": "nix-community", "repo": "home-manager", - "rev": "93e804e7f8a1eb88bde6117cd5046501e66aa4bd", + "rev": "8c3b2a0cab64a464de9e41a470eecf1318ccff57", "type": "github" }, "original": { @@ -147,11 +147,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1704917398, - "narHash": "sha256-q13oPB1fl45E+7cbV1P1VQt1GtGBaSbrHPtC0Y7q83c=", + "lastModified": 1705251288, + "narHash": "sha256-TwCR7tZvrjsvz6SmgjWYOne7Qz7J2jn4Cr4Er0Yj+LA=", "owner": "viperML", "repo": "nh", - "rev": "dcaf5bb7cdf7a1a4efb95ab94303c46b39eb193f", + "rev": "36eba281576afe0f67e5aafb4e7a414f256dba31", "type": "github" }, "original": { @@ -227,11 +227,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1704290814, - "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", + "lastModified": 1705033721, + "narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", + "rev": "a1982c92d8980a0114372973cbdfe0a307f1bdea", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1704842529, - "narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=", + "lastModified": 1705242415, + "narHash": "sha256-a8DRYrNrzTudvO7XHUPNJD89Wbf1ZZT0VbwCsPnHWaE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eabe8d3eface69f5bb16c18f8662a702f50c20d5", + "rev": "ea780f3de2d169f982564128804841500e85e373", "type": "github" }, "original": { @@ -322,11 +322,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1704722960, - "narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=", + "lastModified": 1705133751, + "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d", + "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", "type": "github" }, "original": { @@ -338,11 +338,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1704161960, - "narHash": "sha256-QGua89Pmq+FBAro8NriTuoO/wNaUtugt29/qqA8zeeM=", + "lastModified": 1704842529, + "narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "63143ac2c9186be6d9da6035fa22620018c85932", + "rev": "eabe8d3eface69f5bb16c18f8662a702f50c20d5", "type": "github" }, "original": { @@ -371,11 +371,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1704908274, - "narHash": "sha256-74W9Yyomv3COGRmKi8zvyA5tL2KLiVkBeaYmYLjXyOw=", + "lastModified": 1705356877, + "narHash": "sha256-274jL1cH64DcXUXebVMZBRUsTs3FvFlPIPkCN/yhSnI=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c0b3a5af90fae3ba95645bbf85d2b64880addd76", + "rev": "87755331580fdf23df7e39b46d63ac88236bf42c", "type": "github" }, "original": { diff --git a/linux/blitzar/audio.nix b/linux/blitzar/audio.nix index 0dc2630..166c572 100644 --- a/linux/blitzar/audio.nix +++ b/linux/blitzar/audio.nix @@ -1,7 +1,8 @@ -{ ... }: { +{ ... }: + +{ security.rtkit.enable = true; - # Enable pipewire services.pipewire = { enable = true; alsa = { @@ -11,7 +12,5 @@ pulse.enable = true; }; - # Enable noisetorch programs.noisetorch.enable = true; - } diff --git a/linux/blitzar/configuration.nix b/linux/blitzar/configuration.nix index a029c8e..f4301ad 100644 --- a/linux/blitzar/configuration.nix +++ b/linux/blitzar/configuration.nix @@ -5,7 +5,6 @@ { pkgs, ... }: { - # Configure boot boot = { initrd.systemd.enable = true; @@ -28,31 +27,28 @@ }; }; - # Set your time zone. - time.timeZone = "Asia/Shanghai"; - - # Enable bluetooth - hardware.bluetooth.enable = true; - - # Enable hardware accelerated video decoding - hardware.opengl = { - enable = true; - extraPackages = with pkgs; [ - vaapiVdpau - libvdpau-va-gl - ]; + # Configure hardware + hardware = { + bluetooth.enable = true; + opengl = { + enable = true; + extraPackages = with pkgs; [ + vaapiVdpau + libvdpau-va-gl + ]; + }; }; - # Enable firmware update - services.fwupd.enable = true; + # 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"; - # Enable CUPS to print documents. - # services.printing.enable = true; - # Some programs need SUID wrappers, can be configured further or are # started in user sessions. # programs.mtr.enable = true; @@ -61,16 +57,6 @@ # enableSSHSupport = true; # }; - # List services that you want to enable: - - # Enable the OpenSSH daemon. - # services.openssh.enable = true; - - # Copy the NixOS configuration file and link it from the resulting system - # (/run/current-system/configuration.nix). This is useful in case you - # accidentally delete configuration.nix. - # system.copySystemConfiguration = true; - # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It‘s perfectly fine and recommended to leave @@ -78,6 +64,5 @@ # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). system.stateVersion = "23.11"; # Did you read the comment? - } diff --git a/linux/blitzar/default.nix b/linux/blitzar/default.nix index fc4a423..c3afd46 100644 --- a/linux/blitzar/default.nix +++ b/linux/blitzar/default.nix @@ -1,4 +1,6 @@ -{ inputs, ... }: { +{ inputs, ... }: + +{ imports = with inputs; [ disko.nixosModules.disko hardware.nixosModules.asus-zephyrus-ga402 diff --git a/linux/blitzar/device.nix b/linux/blitzar/device.nix index 4a23098..2208b7f 100644 --- a/linux/blitzar/device.nix +++ b/linux/blitzar/device.nix @@ -1,5 +1,6 @@ -{ config, ... }: { +{ config, ... }: +{ programs = { adb.enable = true; kdeconnect.enable = true; @@ -15,5 +16,4 @@ }; users.users.${config.constants.userName}.extraGroups = [ "adbusers" ]; - } diff --git a/linux/blitzar/disko.nix b/linux/blitzar/disko.nix index f1d73f3..c80d22c 100644 --- a/linux/blitzar/disko.nix +++ b/linux/blitzar/disko.nix @@ -1,4 +1,6 @@ -{ ... }: { +{ ... }: + +{ disko.devices = { # Partition the physical disk disk.storage = { @@ -76,5 +78,4 @@ }; }; }; - } diff --git a/linux/blitzar/gui.nix b/linux/blitzar/gui.nix index 0b9dd9e..7b45e3c 100644 --- a/linux/blitzar/gui.nix +++ b/linux/blitzar/gui.nix @@ -1,4 +1,5 @@ { config, pkgs, ... }: + let usr = config.constants.userName; in { home-manager.users.${usr} = { home.packages = with pkgs; [ diff --git a/linux/blitzar/locale.nix b/linux/blitzar/locale.nix index 639102f..44bd2c1 100644 --- a/linux/blitzar/locale.nix +++ b/linux/blitzar/locale.nix @@ -1,4 +1,6 @@ -{ pkgs, ... }: { +{ pkgs, ... }: + +{ # Configure default fonts fonts = { packages = with pkgs; [ diff --git a/linux/blitzar/network.nix b/linux/blitzar/network.nix index 793136a..9e6efcc 100644 --- a/linux/blitzar/network.nix +++ b/linux/blitzar/network.nix @@ -1,4 +1,6 @@ -{ config, ... }: { +{ config, ... }: + +{ networking = let const = config.constants; in { domain = const.domain; hostId = "30f8f777"; @@ -9,5 +11,6 @@ nftables.enable = true; wireless.iwd.enable = true; }; + services.resolved.enable = true; } diff --git a/linux/blitzar/tailscale.nix b/linux/blitzar/tailscale.nix index 58797c6..dc0f3dc 100644 --- a/linux/blitzar/tailscale.nix +++ b/linux/blitzar/tailscale.nix @@ -1,4 +1,6 @@ -{ ... }: { +{ ... }: + +{ services.tailscale = { enable = true; port = 22276; diff --git a/linux/blitzar/zfs.nix b/linux/blitzar/zfs.nix index e00bff8..430a055 100644 --- a/linux/blitzar/zfs.nix +++ b/linux/blitzar/zfs.nix @@ -1,5 +1,6 @@ -{ config, lib, ... }: { +{ config, lib, ... }: +{ boot = { kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages; loader.grub.zfsSupport = true; @@ -78,6 +79,5 @@ ]; }; }; - }