From 26fb5ba017ab213a57b33b37bdf36b7c64c6c819 Mon Sep 17 00:00:00 2001 From: Tao Tien <29749622+taotien@users.noreply.github.com> Date: Sat, 16 Aug 2025 14:56:51 -0700 Subject: [PATCH] bump --- extras/fprintclear.py | 0 flake.lock | 98 +++++------ systems/BASED.nix | 370 +++++++++++++++++++++--------------------- 3 files changed, 234 insertions(+), 234 deletions(-) mode change 100755 => 100644 extras/fprintclear.py diff --git a/extras/fprintclear.py b/extras/fprintclear.py old mode 100755 new mode 100644 diff --git a/flake.lock b/flake.lock index 513c5de..9b958cb 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1750173260, - "narHash": "sha256-9P1FziAwl5+3edkfFcr5HeGtQUtrSdk/MksX39GieoA=", + "lastModified": 1754433428, + "narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=", "owner": "ryantm", "repo": "agenix", - "rev": "531beac616433bac6f9e2a19feb8e99a22a66baf", + "rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d", "type": "github" }, "original": { @@ -34,12 +34,12 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1753068796, - "narHash": "sha256-jq04XAgT5Rci907wxd69trNwZixpnBLz5tH02h6JcoA=", - "rev": "9919bed0779086df2ce22a77f9406b7a347e340d", - "revCount": 261, + "lastModified": 1754407288, + "narHash": "sha256-tz/9ngXl8/CSddKo/ftNy753Rw3ul1iPLz0H9d9Fv2w=", + "rev": "60b33c388eb28ba3015d4fa55f5b87418ffdba84", + "revCount": 286, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/0.1.261%2Brev-9919bed0779086df2ce22a77f9406b7a347e340d/01982b0d-6363-7628-9942-f9772d6c2480/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/0.1.286%2Brev-60b33c388eb28ba3015d4fa55f5b87418ffdba84/01987ad5-9a3e-73b3-9414-b578cc792e0f/source.tar.gz" }, "original": { "type": "tarball", @@ -49,37 +49,37 @@ "determinate-nixd-aarch64-darwin": { "flake": false, "locked": { - "narHash": "sha256-tEhYb3OWFIPFvWa/orkyBMvS2joRRrqKHpK2cSd20hU=", + "narHash": "sha256-qZLIbSP6ic9/ozzFP0QqSk5CcQdbQ4iJHuCd03wV4i8=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.8.4/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.8.5/macOS" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.8.4/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.8.5/macOS" } }, "determinate-nixd-aarch64-linux": { "flake": false, "locked": { - "narHash": "sha256-BGDnwwbo30fdSAv26G2MFYKx2+qIQ8G40+muwKH9SPM=", + "narHash": "sha256-QK06CsX8jhocJlUmv+LGJL+67OqkaFutt4kyU9VYshE=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.8.4/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.8.5/aarch64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.8.4/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.8.5/aarch64-linux" } }, "determinate-nixd-x86_64-linux": { "flake": false, "locked": { - "narHash": "sha256-P4EJCgSsapE5tggKXiLUeS56PNciGLgonWAm7F1xf6E=", + "narHash": "sha256-WewOOmK0rZ7yDBaA1xie1wHYTMkB96scY4Fjt6MPxfQ=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.8.4/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.8.5/x86_64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.8.4/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.8.5/x86_64-linux" } }, "disko": { @@ -89,11 +89,11 @@ ] }, "locked": { - "lastModified": 1753140376, - "narHash": "sha256-7lrVrE0jSvZHrxEzvnfHFE/Wkk9DDqb+mYCodI5uuB8=", + "lastModified": 1754971456, + "narHash": "sha256-p04ZnIBGzerSyiY2dNGmookCldhldWAu03y0s3P8CB0=", "owner": "nix-community", "repo": "disko", - "rev": "545aba02960caa78a31bd9a8709a0ad4b6320a5c", + "rev": "8246829f2e675a46919718f9a64b71afe3bfb22d", "type": "github" }, "original": { @@ -193,11 +193,11 @@ ] }, "locked": { - "lastModified": 1753181343, - "narHash": "sha256-CLQfNtUqirNVSYoW/kYbvL4PeeNasmZonaPnjO3+1YQ=", + "lastModified": 1755313937, + "narHash": "sha256-pQb7bNcolxYGRiylUCrTddiF+qW2wsUiM9+eRIDUrVU=", "owner": "nix-community", "repo": "home-manager", - "rev": "0cdfcdbb525b77b951c889b6131047bc374f48fe", + "rev": "2a749f4790a14f7168be67cdf6e548ef1c944e10", "type": "github" }, "original": { @@ -236,12 +236,12 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1753066555, - "narHash": "sha256-/WmweOcc4DfQPfGkNxllsuEVgTwX3RVROOy3e/mAvr0=", - "rev": "47281531ec83e22a1bb0249db5a6e4d0d854f0a5", - "revCount": 21541, + "lastModified": 1754344628, + "narHash": "sha256-xVsqhMfsQzjf4XDO/GHVyk/D760uqlnOQ1NZ8Iyvpr0=", + "rev": "55219f9b36914a19b45a7989ad664f3fd8dfbc35", + "revCount": 21608, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.8.4/01982aff-6f3f-7bcc-85c8-b0d4e0cb35d8/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.8.5/0198772e-696e-72c6-9382-7ad2a9198f03/source.tar.gz" }, "original": { "type": "tarball", @@ -266,11 +266,11 @@ }, "nixos-facter-modules": { "locked": { - "lastModified": 1750412875, - "narHash": "sha256-uP9Xxw5XcFwjX9lNoYRpybOnIIe1BHfZu5vJnnPg3Jc=", + "lastModified": 1755092700, + "narHash": "sha256-knQiR+/3d9RQR6rIDUORO6ZBITleDKDqS4r/pl327WU=", "owner": "numtide", "repo": "nixos-facter-modules", - "rev": "14df13c84552a7d1f33c1cd18336128fbc43f920", + "rev": "7641b72e58c59ebb3c753fc36ff8ee3506ae8e05", "type": "github" }, "original": { @@ -281,11 +281,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1753122741, - "narHash": "sha256-nFxE8lk9JvGelxClCmwuJYftbHqwnc01dRN4DVLUroM=", + "lastModified": 1755330281, + "narHash": "sha256-aJHFJWP9AuI8jUGzI77LYcSlkA9wJnOIg4ZqftwNGXA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "cc66fddc6cb04ab479a1bb062f4d4da27c936a22", + "rev": "3dac8a872557e0ca8c083cdcfc2f218d18e113b0", "type": "github" }, "original": { @@ -297,16 +297,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1745391562, - "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=", + "lastModified": 1754028485, + "narHash": "sha256-IiiXB3BDTi6UqzAZcf2S797hWEPCRZOwyNThJIYhUfk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7", + "rev": "59e69648d345d6e8fef86158c555730fa12af9de", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } @@ -359,12 +359,12 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1752077645, - "narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=", - "rev": "be9e214982e20b8310878ac2baa063a961c1bdf6", - "revCount": 827262, + "lastModified": 1753722563, + "narHash": "sha256-FK8iq76wlacriq3u0kFCehsRYTAqjA9nfprpiSWRWIc=", + "rev": "648f70160c03151bc2121d179291337ad6bc564b", + "revCount": 836323, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.827262%2Brev-be9e214982e20b8310878ac2baa063a961c1bdf6/01980c9a-3044-72c0-b718-a99e9076d3d6/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.836323%2Brev-648f70160c03151bc2121d179291337ad6bc564b/019854b4-edf3-7ab3-ba79-b30d6017d043/source.tar.gz" }, "original": { "type": "tarball", @@ -373,11 +373,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1752950548, - "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", + "lastModified": 1755186698, + "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c87b95e25065c028d31a94f06a62927d18763fdf", + "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", "type": "github" }, "original": { @@ -423,11 +423,11 @@ ] }, "locked": { - "lastModified": 1753069499, - "narHash": "sha256-YtgY0ueqKNrBma4Euu8WH23BhUkBujirJDMDE1KujnU=", + "lastModified": 1755321573, + "narHash": "sha256-U2eUEfy7leG/UJiyHKcAMBSxWZEtY5lKj8hQ4wuB2Wo=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "c64b94235ae24e3b9e01a08f0331d8bb0e5b037a", + "rev": "0772a02b9b2ade8c4017a0213e60ce34381cef5a", "type": "github" }, "original": { diff --git a/systems/BASED.nix b/systems/BASED.nix index ddd732c..5a7744e 100644 --- a/systems/BASED.nix +++ b/systems/BASED.nix @@ -1,197 +1,197 @@ { - inputs, - lib, - pkgs, - modulesPath, - ... + inputs, + lib, + pkgs, + modulesPath, + ... }: { - environment.systemPackages = with pkgs; [ - # inputs.helix.packages.${pkgs.system}.default - # screen - bat - bottom - cifs-utils - du-dust - dumbpipe - exfatprogs - fastfetch - ffmpeg - firefox - git - helix - inputs.agenix.packages.${pkgs.system}.default - inputs.zen-browser.packages."${system}".default - jujutsu - mesa - mpv - ouch - pueue - ripgrep - # rustdesk - sendme - skim - tree - wezterm - wget - zstd + environment.systemPackages = with pkgs; [ + # inputs.helix.packages.${pkgs.system}.default + # screen + bat + bottom + cifs-utils + du-dust + dumbpipe + exfatprogs + fastfetch + ffmpeg + firefox + git + helix + inputs.agenix.packages.${pkgs.system}.default + inputs.zen-browser.packages."${system}".default + jujutsu + mesa + mpv + ouch + pueue + ripgrep + # rustdesk + sendme + skim + tree + wezterm + wget + zstd + ]; + programs.partition-manager.enable = lib.mkDefault true; + + # programs.nh = { + # enable = true; + # }; + + programs.firefox.enable = true; + programs.firefox.policies = { + DisablePocket = true; + PasswordManagerEnabled = false; + NoDefaultBookmarks = false; + }; + programs.firefox.preferences = { + "media.ffmpeg.vaapi.enabled" = true; + + "widget.use-xdg-desktop-portal.file-picker" = 1; + "widget.use-xdg-desktop-portal.location" = 1; + "widget.use-xdg-desktop-portal.mime-handler" = 1; + "widget.use-xdg-desktop-portal.open-uri" = 1; + "widget.use-xdg-desktop-portal.settings" = 1; + + "accessibility.browsewithcaret_shortcut.enabled" = false; + "browser.bookmarks.restore_default_bookmarks" = false; + }; + + services.flatpak.enable = true; + + hardware.graphics.enable = true; + # hardware.opengl = { + # enable = true; + # extraPackaged = with pkgs; [ + # libvdpau-va-gl + # ]; + # }; + services.xserver.enable = lib.mkDefault true; + services.xserver.excludePackages = [pkgs.xterm]; + services.xserver.xkb.layout = "us"; + systemd.services.display-manager.restartIfChanged = false; + services.displayManager.sddm.enable = lib.mkDefault true; + services.displayManager.sddm.wayland.enable = true; + services.desktopManager.plasma6.enable = lib.mkDefault true; + environment.plasma6.excludePackages = with pkgs; [ + kdePackages.elisa + kdePackages.konsole + kdePackages.gwenview + kdePackages.kate + kdePackages.xwaylandvideobridge + xterm + ]; + + services.openssh.enable = true; + users.users.root.openssh.authorizedKeys.keys = [ + ]; + programs.ssh.startAgent = true; + services.gnome.gcr-ssh-agent.enable = false; + + services.printing.enable = lib.mkDefault true; + services.printing.drivers = with pkgs; lib.mkDefault [gutenprint gutenprintBin]; + services.avahi = { + enable = true; + nssmdns4 = true; + openFirewall = true; + }; + + networking.networkmanager.enable = true; + networking.networkmanager.wifi.backend = "iwd"; + services.tailscale.enable = true; + services.resolved.enable = true; + networking.wireless.iwd = { + enable = true; + settings.IPv6.Enabled = true; + settings.Settings.AutoConnect = true; + }; + + services.smartd.enable = true; + # services.btrfs.autoScrub.enable = lib.mkDefault true; + + security.rtkit.enable = true; + services.pipewire = { + enable = lib.mkDefault true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + wireplumber.enable = lib.mkDefault true; + }; + + security.sudo-rs.enable = true; + security.sudo.enable = false; + + i18n.inputMethod = { + enable = lib.mkDefault true; + type = "fcitx5"; + fcitx5.addons = with pkgs; [ + fcitx5-gtk + fcitx5-mozc + fcitx5-rime ]; - programs.partition-manager.enable = lib.mkDefault true; + }; - # programs.nh = { - # enable = true; - # }; + environment.variables = { + EDITOR = "hx"; + VISUAL = "hx"; + PAGER = "bat"; + SKIM_DEFAULT_COMMAND = "rg --files"; + }; + environment.sessionVariables = { + EDITOR = "hx"; + VISUAL = "hx"; + PAGER = "bat"; + SKIM_DEFAULT_COMMAND = "rg --files"; + }; - programs.firefox.enable = true; - programs.firefox.policies = { - DisablePocket = true; - PasswordManagerEnabled = false; - NoDefaultBookmarks = false; - }; - programs.firefox.preferences = { - "media.ffmpeg.vaapi.enabled" = true; + time.timeZone = lib.mkDefault "US/Pacific"; + # services.automatic-timezoned.enable = lib.mkDefault true; + # i18n.defaultLocale = "en_US.UTF-8"; + # i18n.extraLocaleSettings = { + # LC_CTYPE = "en_US.UTF-8"; + # LC_MESSAGES = "en_US.UTF-8"; + # LC_ALL = "en_US.UTF-8"; + # }; - "widget.use-xdg-desktop-portal.file-picker" = 1; - "widget.use-xdg-desktop-portal.location" = 1; - "widget.use-xdg-desktop-portal.mime-handler" = 1; - "widget.use-xdg-desktop-portal.open-uri" = 1; - "widget.use-xdg-desktop-portal.settings" = 1; + # systemd.extraConfig = '' + # DefaultTimeoutStopSec=15s + # ''; - "accessibility.browsewithcaret_shortcut.enabled" = false; - "browser.bookmarks.restore_default_bookmarks" = false; - }; + zramSwap = { + enable = true; + algorithm = "zstd"; + }; - services.flatpak.enable = true; + boot.loader.systemd-boot.enable = lib.mkDefault true; + boot.loader.efi.canTouchEfiVariables = lib.mkDefault true; + boot.loader.timeout = lib.mkForce 1; + # boot.supportedFilesystems = ["ntfs" "btrfs"]; + hardware.enableAllFirmware = true; + hardware.bluetooth.enable = lib.mkDefault true; + # hardware.bluetooth.settings.General.Experimental = true; - hardware.graphics.enable = true; - # hardware.opengl = { - # enable = true; - # extraPackaged = with pkgs; [ - # libvdpau-va-gl - # ]; - # }; - services.xserver.enable = lib.mkDefault true; - services.xserver.excludePackages = [pkgs.xterm]; - services.xserver.xkb.layout = "us"; - systemd.services.display-manager.restartIfChanged = false; - services.displayManager.sddm.enable = lib.mkDefault true; - services.displayManager.sddm.wayland.enable = true; - services.desktopManager.plasma6.enable = lib.mkDefault true; - environment.plasma6.excludePackages = with pkgs; [ - kdePackages.elisa - kdePackages.konsole - kdePackages.gwenview - kdePackages.kate - kdePackages.xwaylandvideobridge - xterm + imports = [(modulesPath + "/installer/scan/not-detected.nix")]; + + nix.settings = { + experimental-features = "nix-command flakes"; + auto-optimise-store = true; + # adding logged in users allows for passwordless root + # trusted-users = ["root"]; + system-features = [ + "benchmark" + "big-parallel" + "gccarch-znver3" + "gccarch-znver4" + "kvm" + "nixos-test" ]; + }; + nixpkgs.config = {allowUnfree = true;}; + nix.nixPath = ["nixpkgs=${pkgs.path}"]; - services.openssh.enable = true; - users.users.root.openssh.authorizedKeys.keys = [ - ]; - programs.ssh.startAgent = true; - services.gnome.gcr-ssh-agent.enable = false; - - services.printing.enable = lib.mkDefault true; - services.printing.drivers = with pkgs; lib.mkDefault [gutenprint gutenprintBin]; - services.avahi = { - enable = true; - nssmdns4 = true; - openFirewall = true; - }; - - networking.networkmanager.enable = true; - networking.networkmanager.wifi.backend = "iwd"; - services.tailscale.enable = true; - services.resolved.enable = true; - networking.wireless.iwd = { - enable = true; - settings.IPv6.Enabled = true; - settings.Settings.AutoConnect = true; - }; - - services.smartd.enable = true; - # services.btrfs.autoScrub.enable = lib.mkDefault true; - - security.rtkit.enable = true; - services.pipewire = { - enable = lib.mkDefault true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - wireplumber.enable = lib.mkDefault true; - }; - - security.sudo-rs.enable = true; - security.sudo.enable = false; - - i18n.inputMethod = { - enable = lib.mkDefault true; - type = "fcitx5"; - fcitx5.addons = with pkgs; [ - fcitx5-gtk - fcitx5-mozc - fcitx5-rime - ]; - }; - - environment.variables = { - EDITOR = "hx"; - VISUAL = "hx"; - PAGER = "bat"; - SKIM_DEFAULT_COMMAND = "rg --files"; - }; - environment.sessionVariables = { - EDITOR = "hx"; - VISUAL = "hx"; - PAGER = "bat"; - SKIM_DEFAULT_COMMAND = "rg --files"; - }; - - time.timeZone = lib.mkDefault "US/Pacific"; - # services.automatic-timezoned.enable = lib.mkDefault true; - # i18n.defaultLocale = "en_US.UTF-8"; - # i18n.extraLocaleSettings = { - # LC_CTYPE = "en_US.UTF-8"; - # LC_MESSAGES = "en_US.UTF-8"; - # LC_ALL = "en_US.UTF-8"; - # }; - - systemd.extraConfig = '' - DefaultTimeoutStopSec=15s - ''; - - zramSwap = { - enable = true; - algorithm = "zstd"; - }; - - boot.loader.systemd-boot.enable = lib.mkDefault true; - boot.loader.efi.canTouchEfiVariables = lib.mkDefault true; - boot.loader.timeout = lib.mkForce 1; - # boot.supportedFilesystems = ["ntfs" "btrfs"]; - hardware.enableAllFirmware = true; - hardware.bluetooth.enable = lib.mkDefault true; - # hardware.bluetooth.settings.General.Experimental = true; - - imports = [(modulesPath + "/installer/scan/not-detected.nix")]; - - nix.settings = { - experimental-features = "nix-command flakes"; - auto-optimise-store = true; - # adding logged in users allows for passwordless root - # trusted-users = ["root"]; - system-features = [ - "benchmark" - "big-parallel" - "gccarch-znver3" - "gccarch-znver4" - "kvm" - "nixos-test" - ]; - }; - nixpkgs.config = {allowUnfree = true;}; - nix.nixPath = ["nixpkgs=${pkgs.path}"]; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - system.stateVersion = lib.mkDefault "23.05"; + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + system.stateVersion = lib.mkDefault "23.05"; }