From 1910cf83fb4aa82c25916aa82f9d89119f2f71e9 Mon Sep 17 00:00:00 2001 From: Tao Tien <29749622+taotien@users.noreply.github.com> Date: Tue, 22 Jul 2025 22:21:02 -0700 Subject: [PATCH] bump --- flake.lock | 84 +++++++------- users/tao.nix | 316 +++++++++++++++++++++++++------------------------- 2 files changed, 200 insertions(+), 200 deletions(-) diff --git a/flake.lock b/flake.lock index a41a909..513c5de 100644 --- a/flake.lock +++ b/flake.lock @@ -34,12 +34,12 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1752331782, - "narHash": "sha256-eRDO93C2dXNVoLbnNECWwGcMErDKVAXNWWy6hFMPoE8=", - "rev": "33ffc091037908049e9897dc8258efae81709cfd", - "revCount": 259, + "lastModified": 1753068796, + "narHash": "sha256-jq04XAgT5Rci907wxd69trNwZixpnBLz5tH02h6JcoA=", + "rev": "9919bed0779086df2ce22a77f9406b7a347e340d", + "revCount": 261, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/0.1.259%2Brev-33ffc091037908049e9897dc8258efae81709cfd/0197ff1f-8815-7cd1-855b-1ff5b818e6e5/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/0.1.261%2Brev-9919bed0779086df2ce22a77f9406b7a347e340d/01982b0d-6363-7628-9942-f9772d6c2480/source.tar.gz" }, "original": { "type": "tarball", @@ -49,37 +49,37 @@ "determinate-nixd-aarch64-darwin": { "flake": false, "locked": { - "narHash": "sha256-T/kTCi8rrh1r5XMGQBymB4Hnk/KNNGkgtgma6bXXKy0=", + "narHash": "sha256-tEhYb3OWFIPFvWa/orkyBMvS2joRRrqKHpK2cSd20hU=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.8.2/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.8.4/macOS" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.8.2/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.8.4/macOS" } }, "determinate-nixd-aarch64-linux": { "flake": false, "locked": { - "narHash": "sha256-C+KvOykOIoXCWSsPBM2Hzy1skk2lgiKXQyb9fJdwSdQ=", + "narHash": "sha256-BGDnwwbo30fdSAv26G2MFYKx2+qIQ8G40+muwKH9SPM=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.8.2/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.8.4/aarch64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.8.2/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.8.4/aarch64-linux" } }, "determinate-nixd-x86_64-linux": { "flake": false, "locked": { - "narHash": "sha256-cENobOVn0+FtON9bmr/QoUEpNGEyxW4YpFXkLyBTYDs=", + "narHash": "sha256-P4EJCgSsapE5tggKXiLUeS56PNciGLgonWAm7F1xf6E=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.8.2/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.8.4/x86_64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.8.2/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.8.4/x86_64-linux" } }, "disko": { @@ -89,11 +89,11 @@ ] }, "locked": { - "lastModified": 1752541678, - "narHash": "sha256-dyhGzkld6jPqnT/UfGV2oqe7tYn7hppAqFvF3GZTyXY=", + "lastModified": 1753140376, + "narHash": "sha256-7lrVrE0jSvZHrxEzvnfHFE/Wkk9DDqb+mYCodI5uuB8=", "owner": "nix-community", "repo": "disko", - "rev": "2bf3421f7fed5c84d9392b62dcb9d76ef09796a7", + "rev": "545aba02960caa78a31bd9a8709a0ad4b6320a5c", "type": "github" }, "original": { @@ -193,11 +193,11 @@ ] }, "locked": { - "lastModified": 1752603129, - "narHash": "sha256-S+wmHhwNQ5Ru689L2Gu8n1OD6s9eU9n9mD827JNR+kw=", + "lastModified": 1753181343, + "narHash": "sha256-CLQfNtUqirNVSYoW/kYbvL4PeeNasmZonaPnjO3+1YQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "e8c19a3cec2814c754f031ab3ae7316b64da085b", + "rev": "0cdfcdbb525b77b951c889b6131047bc374f48fe", "type": "github" }, "original": { @@ -214,11 +214,11 @@ ] }, "locked": { - "lastModified": 1743604125, - "narHash": "sha256-ZD61DNbsBt1mQbinAaaEqKaJk2RFo9R/j+eYWeGMx7A=", + "lastModified": 1752603129, + "narHash": "sha256-S+wmHhwNQ5Ru689L2Gu8n1OD6s9eU9n9mD827JNR+kw=", "owner": "nix-community", "repo": "home-manager", - "rev": "180fd43eea296e62ae68e079fcf56aba268b9a1a", + "rev": "e8c19a3cec2814c754f031ab3ae7316b64da085b", "type": "github" }, "original": { @@ -236,12 +236,12 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1752329813, - "narHash": "sha256-+PLMYzOLXmYtGUcUxIbJZpadAV/gO73EAhISc1kgvJM=", - "rev": "04045d5add7915ea9209a09833fae1aa3a3a9be1", - "revCount": 21488, + "lastModified": 1753066555, + "narHash": "sha256-/WmweOcc4DfQPfGkNxllsuEVgTwX3RVROOy3e/mAvr0=", + "rev": "47281531ec83e22a1bb0249db5a6e4d0d854f0a5", + "revCount": 21541, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.8.2/0197ff19-42da-7beb-b8cf-902b39687ccf/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.8.4/01982aff-6f3f-7bcc-85c8-b0d4e0cb35d8/source.tar.gz" }, "original": { "type": "tarball", @@ -281,11 +281,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1752666637, - "narHash": "sha256-P8J72psdc/rWliIvp8jUpoQ6qRDlVzgSDDlgkaXQ0Fw=", + "lastModified": 1753122741, + "narHash": "sha256-nFxE8lk9JvGelxClCmwuJYftbHqwnc01dRN4DVLUroM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d1bfa8f6ccfb5c383e1eba609c1eb67ca24ed153", + "rev": "cc66fddc6cb04ab479a1bb062f4d4da27c936a22", "type": "github" }, "original": { @@ -359,12 +359,12 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1751852175, - "narHash": "sha256-+MLlfTCCOvz4K6AcSPbaPiFM9MYi7fA2Wr1ibmRwIlM=", - "rev": "2defa37146df235ef62f566cde69930a86f14df1", - "revCount": 826355, + "lastModified": 1752077645, + "narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=", + "rev": "be9e214982e20b8310878ac2baa063a961c1bdf6", + "revCount": 827262, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.826355%2Brev-2defa37146df235ef62f566cde69930a86f14df1/0197e88b-d442-748b-8d6d-36a43b63b168/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.827262%2Brev-be9e214982e20b8310878ac2baa063a961c1bdf6/01980c9a-3044-72c0-b718-a99e9076d3d6/source.tar.gz" }, "original": { "type": "tarball", @@ -373,11 +373,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1752480373, - "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", + "lastModified": 1752950548, + "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", + "rev": "c87b95e25065c028d31a94f06a62927d18763fdf", "type": "github" }, "original": { @@ -423,11 +423,11 @@ ] }, "locked": { - "lastModified": 1752693471, - "narHash": "sha256-Sov1NiQROlhMca+JFJcqfjo60l3LHORBwvDTo4QQcJ8=", + "lastModified": 1753069499, + "narHash": "sha256-YtgY0ueqKNrBma4Euu8WH23BhUkBujirJDMDE1KujnU=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "e7e3cdf01acd0cbcb65e870c27d4dfae25bc6f22", + "rev": "c64b94235ae24e3b9e01a08f0331d8bb0e5b037a", "type": "github" }, "original": { diff --git a/users/tao.nix b/users/tao.nix index ee06cb7..01439f6 100644 --- a/users/tao.nix +++ b/users/tao.nix @@ -1,168 +1,168 @@ { - inputs, - config, - pkgs, - lib, - ... + inputs, + config, + pkgs, + lib, + ... }: { - services.syncplay = { - enable = true; - motd = "we only watch kino here"; + services.syncplay = { + enable = true; + motd = "we only watch kino here"; + }; + + users.users.tao.packages = with pkgs; [ + syncplay + # boxxy + calibre + # carapace + # cloud-hypervisor + # davinci-resolve + # fractal + # freerdp + # inputs.plasma-manager.packages.${pkgs.system}.default + # jellyfin-mpv-shim + # libsForQt5.kcharselect + # mendeley + # piper + # slack + # tectonic + # texlab + # thunderbird + # wkhtmltopdf + appimage-run + aspell + aspellDicts.en + bottles + # darktable + deluge + discord + freecad-wayland + gocryptfs + gurk-rs + jellyfin-media-player + # kdePackages.plasma-vault + keepassxc + # leetcode-cli + man-pages + man-pages-posix + miniserve + mousai + nix-output-monitor + nixos-anywhere + nufmt + nushell + nvd + obs-studio + oculante + onlyoffice-bin + pandoc + pipe-rename + prusa-slicer + qmk + qmk-udev-rules + qmk_hid + ripgrep-all + signal-desktop + slack + snapper + starship + syncthingtray + taskwarrior3 + tinymist + toastify + typst + usbutils + vial + wezterm + wl-clipboard-rs + yt-dlp + zathura + zellij + zoom-us + zoxide + ]; + programs.adb.enable = true; + programs.kdeconnect.enable = true; + environment.shells = with pkgs; [nushell]; + + # virtualisation.libvirtd.enable = true; + # virtualisation.libvirtd.qemu.swtpm.enable = true; + # virtualisation.spiceUSBRedirection.enable = true; + # programs.virt-manager.enable = true; + + # virtualisation.virtualbox.host = { + # enable = true; + # enableExtensionPack = true; + # }; + + # nixpkgs.overlays = [ + # (final: prev: { + # options.services.snapper.configs = prev.options.services.snapper.configs.overrideAttrs (old: { + # configOptions.FSTYPE = lib.mkOption { + # type = lib.types.enum ["btrfs" "bcachefs"]; + # }; + # }); + # }) + # ]; + + disabledModules = ["services/misc/snapper.nix"]; + imports = [../extras/snapper.nix]; + services.snapper.configs = { + home = { + SUBVOLUME = "/home"; + # FSTYPE = "bcachefs"; + FSTYPE = + if lib.strings.hasPrefix "NOlaptop" (builtins.readFile /etc/hostname) + then "bcachefs" + else "btrfs"; + ALLOW_USERS = ["tao"]; + TIMELINE_CREATE = true; + TIMELINE_CLEANUP = true; + TIMELINE_LIMIT_HOURLY = 5; + TIMELINE_LIMIT_DAILY = 7; }; + }; + services.snapper.snapshotInterval = "*:0/5"; - users.users.tao.packages = with pkgs; [ - syncplay - # boxxy - calibre - # carapace - # cloud-hypervisor - # davinci-resolve - # fractal - # freerdp - # inputs.plasma-manager.packages.${pkgs.system}.default - # jellyfin-mpv-shim - # libsForQt5.kcharselect - # mendeley - # piper - # slack - # tectonic - # texlab - # thunderbird - # wkhtmltopdf - appimage-run - aspell - aspellDicts.en - bottles - darktable - deluge - discord - freecad-wayland - gocryptfs - gurk-rs - jellyfin-media-player - # kdePackages.plasma-vault - keepassxc - # leetcode-cli - man-pages - man-pages-posix - miniserve - mousai - nix-output-monitor - nixos-anywhere - nufmt - nushell - nvd - obs-studio - oculante - onlyoffice-bin - pandoc - pipe-rename - prusa-slicer - qmk - qmk-udev-rules - qmk_hid - ripgrep-all - signal-desktop - slack - snapper - starship - syncthingtray - taskwarrior3 - tinymist - toastify - typst - usbutils - vial - wezterm - wl-clipboard-rs - yt-dlp - zathura - zellij - zoom-us - zoxide - ]; - programs.adb.enable = true; - programs.kdeconnect.enable = true; - environment.shells = with pkgs; [nushell]; + hardware.keyboard.qmk.enable = true; + services.udev.extraRules = '' + KERNEL=="hidraw*", SUBSYSTEM=="hidraw", MODE="0660", GROUP="users", TAG+="uaccess", TAG+="udev-acl" + ''; + # services.ratbagd.enable = true; - # virtualisation.libvirtd.enable = true; - # virtualisation.libvirtd.qemu.swtpm.enable = true; - # virtualisation.spiceUSBRedirection.enable = true; - # programs.virt-manager.enable = true; + boot.extraModulePackages = with config.boot.kernelPackages; [ + v4l2loopback + ]; + boot.extraModprobeConfig = '' + options v4l2loopback devices=1 video_nr=1 card_label="OBS Cam" exclusive_caps=1 + ''; - # virtualisation.virtualbox.host = { - # enable = true; - # enableExtensionPack = true; - # }; + fonts.packages = with pkgs; [ + # (nerdfonts.override {fonts = ["FiraCode"];}) + nerd-fonts.fira-code + noto-fonts-cjk-sans + noto-fonts-cjk-serif + noto-fonts-color-emoji + ibm-plex + cooper-hewitt + ]; - # nixpkgs.overlays = [ - # (final: prev: { - # options.services.snapper.configs = prev.options.services.snapper.configs.overrideAttrs (old: { - # configOptions.FSTYPE = lib.mkOption { - # type = lib.types.enum ["btrfs" "bcachefs"]; - # }; - # }); - # }) - # ]; + documentation.enable = true; - disabledModules = ["services/misc/snapper.nix"]; - imports = [../extras/snapper.nix]; - services.snapper.configs = { - home = { - SUBVOLUME = "/home"; - # FSTYPE = "bcachefs"; - FSTYPE = - if lib.strings.hasPrefix "NOlaptop" (builtins.readFile /etc/hostname) - then "bcachefs" - else "btrfs"; - ALLOW_USERS = ["tao"]; - TIMELINE_CREATE = true; - TIMELINE_CLEANUP = true; - TIMELINE_LIMIT_HOURLY = 5; - TIMELINE_LIMIT_DAILY = 7; - }; - }; - services.snapper.snapshotInterval = "*:0/5"; + # age.secrets.password-tao.file = ../secrets/syncthing-uwuraid.age; + users.users.tao = { + isNormalUser = true; + # hashedPasswordFile = config.age.secrets.password-tao.path; + extraGroups = ["audio" "video" "wheel" "libvirtd" "dialout" "game"]; + shell = pkgs.nushell; + }; - hardware.keyboard.qmk.enable = true; - services.udev.extraRules = '' - KERNEL=="hidraw*", SUBSYSTEM=="hidraw", MODE="0660", GROUP="users", TAG+="uaccess", TAG+="udev-acl" - ''; - # services.ratbagd.enable = true; - - boot.extraModulePackages = with config.boot.kernelPackages; [ - v4l2loopback - ]; - boot.extraModprobeConfig = '' - options v4l2loopback devices=1 video_nr=1 card_label="OBS Cam" exclusive_caps=1 - ''; - - fonts.packages = with pkgs; [ - # (nerdfonts.override {fonts = ["FiraCode"];}) - nerd-fonts.fira-code - noto-fonts-cjk-sans - noto-fonts-cjk-serif - noto-fonts-color-emoji - ibm-plex - cooper-hewitt - ]; - - documentation.enable = true; - - # age.secrets.password-tao.file = ../secrets/syncthing-uwuraid.age; - users.users.tao = { - isNormalUser = true; - # hashedPasswordFile = config.age.secrets.password-tao.path; - extraGroups = ["audio" "video" "wheel" "libvirtd" "dialout" "game"]; - shell = pkgs.nushell; - }; - - age.secrets.syncthing-NOcomputer.file = ../secrets/syncthing-NOcomputer.age; - age.secrets.syncthing-NOlaptop.file = ../secrets/syncthing-NOlaptop.age; - age.secrets.syncthing-uwuraid.file = ../secrets/syncthing-uwuraid.age; - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.verbose = true; - home-manager.backupFileExtension = ".hm-bak"; - home-manager.users.tao = import ./tao/HOME.nix {inherit inputs pkgs lib config;}; + age.secrets.syncthing-NOcomputer.file = ../secrets/syncthing-NOcomputer.age; + age.secrets.syncthing-NOlaptop.file = ../secrets/syncthing-NOlaptop.age; + age.secrets.syncthing-uwuraid.file = ../secrets/syncthing-uwuraid.age; + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.verbose = true; + home-manager.backupFileExtension = ".hm-bak"; + home-manager.users.tao = import ./tao/HOME.nix {inherit inputs pkgs lib config;}; }