diff --git a/extras/dev.nix b/extras/dev.nix index 6c57d0e..a4b9db6 100644 --- a/extras/dev.nix +++ b/extras/dev.nix @@ -15,7 +15,6 @@ # }; programs.qgroundcontrol.enable = true; environment.systemPackages = with pkgs; [ - chromium claude-code # keep-sorted start sticky_comments=no # act diff --git a/extras/uwuraid.nix b/extras/uwuraid.nix index 4ab97d8..6c8ad5b 100644 --- a/extras/uwuraid.nix +++ b/extras/uwuraid.nix @@ -5,7 +5,7 @@ type = "cifs"; mountConfig = { # Options = "noauto,noatime,async,users,rw,x-systemd.automount,credentials=${config.age.secrets.uwuraid.path},file_mode=0777,dir_mode=0777"; - Options = "_netdev,noserverino,nounix,nobrl,noperm,noauto,noatime,async,users,rw,x-systemd.automount,x-systemd.requires=network-online.target,nofail,soft,credentials=${config.age.secrets.uwuraid.path},file_mode=0777,dir_mode=0777"; + Options = "_netdev,noserverino,noauto,noatime,async,users,rw,x-systemd.automount,x-systemd.requires=network-online.target,nofail,soft,credentials=${config.age.secrets.uwuraid.path},file_mode=0777,dir_mode=0777"; }; }; in [ diff --git a/flake.lock b/flake.lock index f2365e5..ec8a4a3 100644 --- a/flake.lock +++ b/flake.lock @@ -30,12 +30,12 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1776702255, - "narHash": "sha256-GileAqhqUkoUXJnpJitbIsYfvuWc230d4zeMBFh1KdU=", - "rev": "ef5209e37ee077f7c46a857a7f404bac1cb711ad", - "revCount": 412, + "lastModified": 1774669632, + "narHash": "sha256-OHRHymsM6sX0B7Xjpvf3m49vTgKzJGukJhw/O1O5bj4=", + "rev": "2edae0b5150c83c07cf7b7e86e937ad956d78197", + "revCount": 410, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/0.1.412%2Brev-ef5209e37ee077f7c46a857a7f404bac1cb711ad/019dabb8-c1b8-7a02-be7b-3fc4f5d5ef42/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/0.1.410%2Brev-2edae0b5150c83c07cf7b7e86e937ad956d78197/019d3291-0e4f-7484-aaae-6a10dd00f832/source.tar.gz" }, "original": { "type": "tarball", @@ -45,37 +45,37 @@ "determinate-nixd-aarch64-darwin": { "flake": false, "locked": { - "narHash": "sha256-wIHmKTzguRGRhNuYKqXl4NpghdeAYdXnBWKMMVWnlaA=", + "narHash": "sha256-T5PoERn2FTupvCwGmQhbYO/oQ0w+51nRn+0QRbnA9tg=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.18.0/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.17.2/macOS" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.18.0/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.17.2/macOS" } }, "determinate-nixd-aarch64-linux": { "flake": false, "locked": { - "narHash": "sha256-eIYwLso0rkCUtQNr49U6Lm6Cntx4AeEyEa3BCbhyL3s=", + "narHash": "sha256-T0iRt3f+2Q+KUU1VzdGiG6GluViuxuKr+bMG5eVtPO0=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.18.0/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.17.2/aarch64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.18.0/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.17.2/aarch64-linux" } }, "determinate-nixd-x86_64-linux": { "flake": false, "locked": { - "narHash": "sha256-oE/kvKBJkCIlFhkrEn7aLIf80HxK5E7fJGD2Acn4qbw=", + "narHash": "sha256-FDeJY4hugYM0+vB2rvKY8WpYgPNH7kNS0M082Rnk/CI=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.18.0/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.17.2/x86_64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.18.0/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.17.2/x86_64-linux" } }, "disko": { @@ -169,11 +169,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1776221232, - "narHash": "sha256-utPazkXA5Ef1KELKUDA+tMWkgeLlPhjmA6ma8NAWAe4=", + "lastModified": 1775012637, + "narHash": "sha256-Now9n+9BD37KilctvSOy3GzAdvQLZtPfCcGnxmxtaig=", "owner": "helix-editor", "repo": "helix", - "rev": "0805bc8534bafaa9109f1839f4e771afb32c3391", + "rev": "daac117bbb4348a496bdf851a9a5c1d9612a2938", "type": "github" }, "original": { @@ -210,11 +210,11 @@ ] }, "locked": { - "lastModified": 1776184304, - "narHash": "sha256-No6QGBmIv5ChiwKCcbkxjdEQ/RO2ZS1gD7SFy6EZ7rc=", + "lastModified": 1774991950, + "narHash": "sha256-kScKj3qJDIWuN9/6PMmgy5esrTUkYinrO5VvILik/zw=", "owner": "nix-community", "repo": "home-manager", - "rev": "3c7524c68348ef79ce48308e0978611a050089b2", + "rev": "f2d3e04e278422c7379e067e323734f3e8c585a7", "type": "github" }, "original": { @@ -274,12 +274,12 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1776699788, - "narHash": "sha256-VsZF/2XmjVd/pRHy+7gxLM6MNmzIKbSuR/b4s/adpVU=", - "rev": "7ab838d88023e6f71b3ef21bfcfc97e550f67aae", - "revCount": 24931, + "lastModified": 1774642787, + "narHash": "sha256-5pg3HyPEUj/AXXwOQAwyieyDx0c1/1rf7+EsOCa1rJM=", + "rev": "cb9989b5b2329842fd7a2586429351d1ede16d04", + "revCount": 24851, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.18.0/019dabb0-d850-7e52-bfec-e5abc21882af/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.17.2/019d3110-f384-7933-a525-8f854039828f/source.tar.gz" }, "original": { "type": "tarball", @@ -288,11 +288,11 @@ }, "nixos": { "locked": { - "lastModified": 1776067740, - "narHash": "sha256-B35lpsqnSZwn1Lmz06BpwF7atPgFmUgw1l8KAV3zpVQ=", + "lastModified": 1774799055, + "narHash": "sha256-Tsq9BCz0q47ej1uFF39m4tuhcwru/ls6vCCJzutEpaw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7e495b747b51f95ae15e74377c5ce1fe69c1765f", + "rev": "107cba9eb4a8d8c9f8e9e61266d78d340867913a", "type": "github" }, "original": { @@ -319,11 +319,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1775490113, - "narHash": "sha256-2ZBhDNZZwYkRmefK5XLOusCJHnoeKkoN95hoSGgMxWM=", + "lastModified": 1774933469, + "narHash": "sha256-OrnCQeUO2bqaWUl0lkDWyGWjKsOhtCyd7JSfTedQNUE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "c775c2772ba56e906cbeb4e0b2db19079ef11ff7", + "rev": "f4c4c2c0c923d7811ac2a63ccc154767e4195337", "type": "github" }, "original": { @@ -413,12 +413,12 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1775888245, - "narHash": "sha256-nwASzrRDD1JBEu/o8ekKYEXm/oJW6EMCzCRdrwcLe90=", - "rev": "13043924aaa7375ce482ebe2494338e058282925", - "revCount": 978638, + "lastModified": 1774273680, + "narHash": "sha256-a++tZ1RQsDb1I0NHrFwdGuRlR5TORvCEUksM459wKUA=", + "rev": "fdc7b8f7b30fdbedec91b71ed82f36e1637483ed", + "revCount": 968305, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.978638%2Brev-13043924aaa7375ce482ebe2494338e058282925/019d8a9c-62d4-7081-8145-107410bd19e6/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.968305%2Brev-fdc7b8f7b30fdbedec91b71ed82f36e1637483ed/019d1e65-315b-7c50-9232-ef9e46632115/source.tar.gz" }, "original": { "type": "tarball", @@ -427,11 +427,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1776169885, - "narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=", + "lastModified": 1774709303, + "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9", + "rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685", "type": "github" }, "original": { @@ -465,11 +465,11 @@ ] }, "locked": { - "lastModified": 1775358767, - "narHash": "sha256-f2eC+WIfhjevCPQILuV08i/kmKZzYZpUvkom/33VxCA=", + "lastModified": 1759631821, + "narHash": "sha256-V8A1L0FaU/aSXZ1QNJScxC12uP4hANeRBgI4YdhHeRM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "20fd44bc663daa53a2575e01293e24e681d62244", + "rev": "1d7cbdaad90f8a5255a89a6eddd8af24dc89cafe", "type": "github" }, "original": { @@ -501,11 +501,11 @@ ] }, "locked": { - "lastModified": 1776144279, - "narHash": "sha256-eX3u6wJ34+qu7ZR1qWOaToGWmudYQSOEStZZm6goP+8=", + "lastModified": 1775021133, + "narHash": "sha256-JB0u0evfSlmNg9HdGDxtXjaCcdKUpFPdSAMGxvJo5Pw=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "727de8a44c85e90f899c540cf3ffa0d5d3344f9c", + "rev": "4bf1a6837064486c4f573a9d500c4cf3c1c075c0", "type": "github" }, "original": { diff --git a/systems/NOmom.nix b/systems/NOmom.nix index 8e20673..6f14fc4 100644 --- a/systems/NOmom.nix +++ b/systems/NOmom.nix @@ -20,7 +20,7 @@ environment.plasma6.excludePackages = with pkgs; [ kdePackages.elisa kdePackages.konsole - # kdePackages.gwenview + kdePackages.gwenview kdePackages.kate # kdePackages.xwaylandvideobridge xterm diff --git a/systems/disk-config.nix b/systems/disk-config.nix index fef5d31..d543dca 100644 --- a/systems/disk-config.nix +++ b/systems/disk-config.nix @@ -32,7 +32,11 @@ format = "bcachefs"; mountOptions = [ "noatime" + "compression=zstd" + "background_compression=zstd" "discard" + # "fsck" + # "fix_errors" ]; mountpoint = "/"; }; diff --git a/users/tao.nix b/users/tao.nix index 85f681f..78f4fa2 100644 --- a/users/tao.nix +++ b/users/tao.nix @@ -9,11 +9,9 @@ in { users.users.tao.packages = (with pkgs-last-building; [ - # oculante # https://nixpk.gs/pr-tracker.html?pr=502921 + oculante # https://nixpk.gs/pr-tracker.html?pr=502921 ]) ++ (with pkgs; [ - sniffnet - oculante # keep-sorted start sticky_comments=no # android-tools # boxxy @@ -74,7 +72,6 @@ in { tinymist toastify typst - typstyle usbutils vial wezterm @@ -94,9 +91,6 @@ in { environment.shells = with pkgs; [nushell]; fonts.packages = with pkgs; [ - libertine - inconsolata - linux-libertine-g # keep-sorted start cooper-hewitt ibm-plex diff --git a/users/tao/HOME.nix b/users/tao/HOME.nix index 591346f..c5ef942 100644 --- a/users/tao/HOME.nix +++ b/users/tao/HOME.nix @@ -107,9 +107,6 @@ in { enable = true; settings = { remotes.origin.auto-track-bookmarks = "glob:*"; - aliases = { - "init" = ["git" "init"]; - }; user = { name = "Tao Tien"; email = "29749622+taotien@users.noreply.github.com"; @@ -169,7 +166,7 @@ in { # extraConfig = lib.concatStrings (map builtins.readFile (map (x: ./nushell/extras/. + x) (map (x: "/" + x) (builtins.attrNames (builtins.readDir ./nushell/extras))))); plugins = with pkgs.nushellPlugins; [ # skim - # desktop_notifications + desktop_notifications # highlight # units ]; diff --git a/users/tao/helix.nix b/users/tao/helix.nix index ba326a4..000c023 100644 --- a/users/tao/helix.nix +++ b/users/tao/helix.nix @@ -242,11 +242,10 @@ { name = "typst"; language-servers = ["tinymist"]; + } + { + name = "typst"; text-width = 100; - auto-format = true; - formatter = { - command = "typstyle"; - }; } # keep-sorted end ]; @@ -312,9 +311,6 @@ }; }; }; - # niv.config = { - # autoArchive = true; - # }; }; use-grammars.only = [ # keep-sorted start diff --git a/users/vy.nix b/users/vy.nix index 0658936..00543fe 100644 --- a/users/vy.nix +++ b/users/vy.nix @@ -29,18 +29,9 @@ in { programs.kdeconnect.enable = true; fonts.packages = with pkgs; [ - libertine - inconsolata - linux-libertine-g - adwaita-fonts - # keep-sorted start - cooper-hewitt - ibm-plex - nerd-fonts.fira-code noto-fonts-cjk-sans noto-fonts-cjk-serif noto-fonts-color-emoji - # keep-sorted end ]; services.flatpak.enable = true;