Update flake

This commit is contained in:
Invariantspace 2024-01-16 18:48:06 -08:00
parent 8e4f10a696
commit c3a2bf746e
11 changed files with 69 additions and 74 deletions

60
flake.lock generated
View file

@ -21,11 +21,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1704277720, "lastModified": 1705356404,
"narHash": "sha256-meAKNgmh3goankLGWqqpw73pm9IvXjEENJloF0coskE=", "narHash": "sha256-0/WnHU5S9GXOJD2HGe/mFNmGGE+8UGnhwofsyJQVoDA=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "0dd382b70c351f528561f71a0a7df82c9d2be9a4", "rev": "44a6ec1faeff61a6404c25ef1a263fc2d98d081b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -39,11 +39,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1705017253, "lastModified": 1705348229,
"narHash": "sha256-/ysUOnF/dYJXDTxi/fi4MNN7uYKRji5CKp3EIamXB+0=", "narHash": "sha256-CssPema1sBxZkrT95KFuKCNNiqxNe1lnf2QNeXk88Xk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "fa5db12d76f9e8ee11e572cdbe021230e48b6afa", "rev": "d0b4408eaf782a1ada0a9133bb1cecefdd59c696",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -88,11 +88,11 @@
}, },
"hardware": { "hardware": {
"locked": { "locked": {
"lastModified": 1704786394, "lastModified": 1705312285,
"narHash": "sha256-aJM0ln9fMGWw1+tjyl5JZWZ3ahxAA2gw2ZpZY/hkEMs=", "narHash": "sha256-rd+dY+v61Y8w3u9bukO/hB55Xl4wXv4/yC8rCGVnK5U=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "b34a6075e9e298c4124e35c3ccaf2210c1f3a43b", "rev": "bee2202bec57e521e3bd8acd526884b9767d7fa0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -106,11 +106,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1704980804, "lastModified": 1705347059,
"narHash": "sha256-lPNNKdPqIYcjhhYIVwlajNt/HqVWbMOoSdNnwCvOP04=", "narHash": "sha256-MSdJZDeyBIjf1SAZ7OvA44b00zUGTrDxkAm9vVR+XRk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "93e804e7f8a1eb88bde6117cd5046501e66aa4bd", "rev": "8c3b2a0cab64a464de9e41a470eecf1318ccff57",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -147,11 +147,11 @@
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1704917398, "lastModified": 1705251288,
"narHash": "sha256-q13oPB1fl45E+7cbV1P1VQt1GtGBaSbrHPtC0Y7q83c=", "narHash": "sha256-TwCR7tZvrjsvz6SmgjWYOne7Qz7J2jn4Cr4Er0Yj+LA=",
"owner": "viperML", "owner": "viperML",
"repo": "nh", "repo": "nh",
"rev": "dcaf5bb7cdf7a1a4efb95ab94303c46b39eb193f", "rev": "36eba281576afe0f67e5aafb4e7a414f256dba31",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -227,11 +227,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1704290814, "lastModified": 1705033721,
"narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", "narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", "rev": "a1982c92d8980a0114372973cbdfe0a307f1bdea",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -243,11 +243,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1704842529, "lastModified": 1705242415,
"narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=", "narHash": "sha256-a8DRYrNrzTudvO7XHUPNJD89Wbf1ZZT0VbwCsPnHWaE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "eabe8d3eface69f5bb16c18f8662a702f50c20d5", "rev": "ea780f3de2d169f982564128804841500e85e373",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -322,11 +322,11 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1704722960, "lastModified": 1705133751,
"narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=", "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d", "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -338,11 +338,11 @@
}, },
"nixpkgs_8": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1704161960, "lastModified": 1704842529,
"narHash": "sha256-QGua89Pmq+FBAro8NriTuoO/wNaUtugt29/qqA8zeeM=", "narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "63143ac2c9186be6d9da6035fa22620018c85932", "rev": "eabe8d3eface69f5bb16c18f8662a702f50c20d5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -371,11 +371,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1704908274, "lastModified": 1705356877,
"narHash": "sha256-74W9Yyomv3COGRmKi8zvyA5tL2KLiVkBeaYmYLjXyOw=", "narHash": "sha256-274jL1cH64DcXUXebVMZBRUsTs3FvFlPIPkCN/yhSnI=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "c0b3a5af90fae3ba95645bbf85d2b64880addd76", "rev": "87755331580fdf23df7e39b46d63ac88236bf42c",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -1,7 +1,8 @@
{ ... }: { { ... }:
{
security.rtkit.enable = true; security.rtkit.enable = true;
# Enable pipewire
services.pipewire = { services.pipewire = {
enable = true; enable = true;
alsa = { alsa = {
@ -11,7 +12,5 @@
pulse.enable = true; pulse.enable = true;
}; };
# Enable noisetorch
programs.noisetorch.enable = true; programs.noisetorch.enable = true;
} }

View file

@ -5,7 +5,6 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
# Configure boot # Configure boot
boot = { boot = {
initrd.systemd.enable = true; initrd.systemd.enable = true;
@ -28,31 +27,28 @@
}; };
}; };
# Set your time zone. # Configure hardware
time.timeZone = "Asia/Shanghai"; hardware = {
bluetooth.enable = true;
# Enable bluetooth opengl = {
hardware.bluetooth.enable = true; enable = true;
extraPackages = with pkgs; [
# Enable hardware accelerated video decoding vaapiVdpau
hardware.opengl = { libvdpau-va-gl
enable = true; ];
extraPackages = with pkgs; [ };
vaapiVdpau
libvdpau-va-gl
];
}; };
# Enable firmware update # Configure system services
services.fwupd.enable = true; services = {
automatic-timezoned.enable = true;
fwupd.enable = true;
};
# Configure network proxy if necessary # Configure network proxy if necessary
# networking.proxy.default = "http://user:password@proxy:port/"; # networking.proxy.default = "http://user:password@proxy:port/";
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; # 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 # Some programs need SUID wrappers, can be configured further or are
# started in user sessions. # started in user sessions.
# programs.mtr.enable = true; # programs.mtr.enable = true;
@ -61,16 +57,6 @@
# enableSSHSupport = true; # 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 # This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions # settings for stateful data, like file locations and database versions
# on your system were taken. Its perfectly fine and recommended to leave # on your system were taken. Its perfectly fine and recommended to leave
@ -78,6 +64,5 @@
# Before changing this value read the documentation for this option # Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "23.11"; # Did you read the comment? system.stateVersion = "23.11"; # Did you read the comment?
} }

View file

@ -1,4 +1,6 @@
{ inputs, ... }: { { inputs, ... }:
{
imports = with inputs; [ imports = with inputs; [
disko.nixosModules.disko disko.nixosModules.disko
hardware.nixosModules.asus-zephyrus-ga402 hardware.nixosModules.asus-zephyrus-ga402

View file

@ -1,5 +1,6 @@
{ config, ... }: { { config, ... }:
{
programs = { programs = {
adb.enable = true; adb.enable = true;
kdeconnect.enable = true; kdeconnect.enable = true;
@ -15,5 +16,4 @@
}; };
users.users.${config.constants.userName}.extraGroups = [ "adbusers" ]; users.users.${config.constants.userName}.extraGroups = [ "adbusers" ];
} }

View file

@ -1,4 +1,6 @@
{ ... }: { { ... }:
{
disko.devices = { disko.devices = {
# Partition the physical disk # Partition the physical disk
disk.storage = { disk.storage = {
@ -76,5 +78,4 @@
}; };
}; };
}; };
} }

View file

@ -1,4 +1,5 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
let usr = config.constants.userName; in { let usr = config.constants.userName; in {
home-manager.users.${usr} = { home-manager.users.${usr} = {
home.packages = with pkgs; [ home.packages = with pkgs; [

View file

@ -1,4 +1,6 @@
{ pkgs, ... }: { { pkgs, ... }:
{
# Configure default fonts # Configure default fonts
fonts = { fonts = {
packages = with pkgs; [ packages = with pkgs; [

View file

@ -1,4 +1,6 @@
{ config, ... }: { { config, ... }:
{
networking = let const = config.constants; in { networking = let const = config.constants; in {
domain = const.domain; domain = const.domain;
hostId = "30f8f777"; hostId = "30f8f777";
@ -9,5 +11,6 @@
nftables.enable = true; nftables.enable = true;
wireless.iwd.enable = true; wireless.iwd.enable = true;
}; };
services.resolved.enable = true; services.resolved.enable = true;
} }

View file

@ -1,4 +1,6 @@
{ ... }: { { ... }:
{
services.tailscale = { services.tailscale = {
enable = true; enable = true;
port = 22276; port = 22276;

View file

@ -1,5 +1,6 @@
{ config, lib, ... }: { { config, lib, ... }:
{
boot = { boot = {
kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages; kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
loader.grub.zfsSupport = true; loader.grub.zfsSupport = true;
@ -78,6 +79,5 @@
]; ];
}; };
}; };
} }