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/gaming.nix b/extras/gaming.nix index b27a99e..209156d 100644 --- a/extras/gaming.nix +++ b/extras/gaming.nix @@ -1,10 +1,4 @@ -{ - pkgs, - inputs, - ... -}: let - pkgs-last-building = inputs.nixpkgs-last-building.legacyPackages.${pkgs.system}; -in { +{pkgs, ...}: { # aagl.url = "github:ezKEa/aagl-gtk-on-nix"; # aagl.inputs.nixpkgs.follows = "nixpkgs"; @@ -15,27 +9,24 @@ in { ui.enable = true; }; - environment.systemPackages = - (with pkgs-last-building; [ - # lutris - ]) - ++ (with pkgs; [ - # keep-sorted start - # parsec-bin - # yuzu # nintendo can suck the shit out of my asshole - easyeffects - gamemode - graalvmPackages.graalvm-ce - heroic - mangohud - osu-lazer-bin - prismlauncher - protonup-qt - r2modman - temurin-jre-bin-17 - wine - # keep-sorted end - ]); + environment.systemPackages = with pkgs; [ + # keep-sorted start + # parsec-bin + # yuzu # nintendo can suck the shit out of my asshole + easyeffects + gamemode + graalvmPackages.graalvm-ce + heroic + lutris + mangohud + osu-lazer-bin + prismlauncher + protonup-qt + r2modman + temurin-jre-bin-17 + wine + # keep-sorted end + ]; networking.firewall.allowedTCPPorts = [25565]; 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 79427b4..ec8a4a3 100644 --- a/flake.lock +++ b/flake.lock @@ -30,12 +30,12 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1778179392, - "narHash": "sha256-W6zorvjBYbzMNvqKIqCdpDF4rq3gj50Xximl56YM9/I=", - "rev": "efd54faa68be8cd777b5c28cab11e638998a0853", - "revCount": 416, + "lastModified": 1774669632, + "narHash": "sha256-OHRHymsM6sX0B7Xjpvf3m49vTgKzJGukJhw/O1O5bj4=", + "rev": "2edae0b5150c83c07cf7b7e86e937ad956d78197", + "revCount": 410, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/0.1.416%2Brev-efd54faa68be8cd777b5c28cab11e638998a0853/019e03c3-8bbc-7443-bd6d-c787773c6154/source.tar.gz?rev=efd54faa68be8cd777b5c28cab11e638998a0853&revCount=416" + "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-z4mCqKI3Qd6weuHrlfzGccJG0giym/VJhKv20ijRSs0=", + "narHash": "sha256-T5PoERn2FTupvCwGmQhbYO/oQ0w+51nRn+0QRbnA9tg=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.20.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.20.0/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.17.2/macOS" } }, "determinate-nixd-aarch64-linux": { "flake": false, "locked": { - "narHash": "sha256-yW+VNepSRytzfanSssPMJPvwioCcmlZYaBX8++UFkAk=", + "narHash": "sha256-T0iRt3f+2Q+KUU1VzdGiG6GluViuxuKr+bMG5eVtPO0=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.20.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.20.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-+L102C3Hhkd1GlXmRm2eLTLsZKBxEvooiQZFqQRlBf0=", + "narHash": "sha256-FDeJY4hugYM0+vB2rvKY8WpYgPNH7kNS0M082Rnk/CI=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.20.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.20.0/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.17.2/x86_64-linux" } }, "disko": { @@ -85,11 +85,11 @@ ] }, "locked": { - "lastModified": 1777713215, - "narHash": "sha256-8GzXDOXckDWwST8TY5DbwYFjdvQLlP7K9CLSVx6iTTo=", + "lastModified": 1773889306, + "narHash": "sha256-PAqwnsBSI9SVC2QugvQ3xeYCB0otOwCacB1ueQj2tgw=", "owner": "nix-community", "repo": "disko", - "rev": "63b4e7e6cf75307c1d26ac3762b886b5b0247267", + "rev": "5ad85c82cc52264f4beddc934ba57f3789f28347", "type": "github" }, "original": { @@ -169,11 +169,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1778169829, - "narHash": "sha256-p9CY3iCpTIzIDAnGv6cp+/ckRqs1G5wFSZcUtiEaM6Y=", + "lastModified": 1775012637, + "narHash": "sha256-Now9n+9BD37KilctvSOy3GzAdvQLZtPfCcGnxmxtaig=", "owner": "helix-editor", "repo": "helix", - "rev": "7d92fbdadf3cdadd5d0d1e27c234c10b74c6613c", + "rev": "daac117bbb4348a496bdf851a9a5c1d9612a2938", "type": "github" }, "original": { @@ -210,11 +210,11 @@ ] }, "locked": { - "lastModified": 1778144356, - "narHash": "sha256-dGM+QCstz/DyLB68+JK5GWyMx4QSqmOJEVgZmy63d/g=", + "lastModified": 1774991950, + "narHash": "sha256-kScKj3qJDIWuN9/6PMmgy5esrTUkYinrO5VvILik/zw=", "owner": "nix-community", "repo": "home-manager", - "rev": "e4419d3123b780d5f4c0bceeace450424387638c", + "rev": "f2d3e04e278422c7379e067e323734f3e8c585a7", "type": "github" }, "original": { @@ -231,11 +231,11 @@ ] }, "locked": { - "lastModified": 1777594677, - "narHash": "sha256-h90sHwoRJLRvaTpZroTvU2JRHDFj0czUafM8eqLe1RI=", + "lastModified": 1774991950, + "narHash": "sha256-kScKj3qJDIWuN9/6PMmgy5esrTUkYinrO5VvILik/zw=", "owner": "nix-community", "repo": "home-manager", - "rev": "899c08a15beae5da51a5cecd6b2b994777a948da", + "rev": "f2d3e04e278422c7379e067e323734f3e8c585a7", "type": "github" }, "original": { @@ -274,12 +274,12 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1778177425, - "narHash": "sha256-oyHvP5HDRe59opmjTrq2ED9lh+R9FrHyaCGPPNfBqWM=", - "rev": "f0ccb960d3ad5bff28acd9cabf8bdef885b5d52f", - "revCount": 25858, + "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.20.0/019e03bc-3f83-7833-aba3-b691ef4956c7/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": 1778003029, - "narHash": "sha256-q/nkKLDtHIyLjZpKhWk3cSK5IYsFqtMd6UtXF3ddjgA=", + "lastModified": 1774799055, + "narHash": "sha256-Tsq9BCz0q47ej1uFF39m4tuhcwru/ls6vCCJzutEpaw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0c88e1f2bdb93d5999019e99cb0e61e1fe2af4c5", + "rev": "107cba9eb4a8d8c9f8e9e61266d78d340867913a", "type": "github" }, "original": { @@ -319,11 +319,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1778143761, - "narHash": "sha256-lkesY6x2X2qxlqLM7CT2iM/0rP2JB7fruPN3h8POXmI=", + "lastModified": 1774933469, + "narHash": "sha256-OrnCQeUO2bqaWUl0lkDWyGWjKsOhtCyd7JSfTedQNUE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3bcaa367d4c550d687a17ac792fd5cda214ee871", + "rev": "f4c4c2c0c923d7811ac2a63ccc154767e4195337", "type": "github" }, "original": { @@ -399,26 +399,26 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1773222311, - "narHash": "sha256-BHoB/XpbqoZkVYZCfXJXfkR+GXFqwb/4zbWnOr2cRcU=", - "rev": "0590cd39f728e129122770c029970378a79d076a", - "revCount": 909248, + "lastModified": 1761597516, + "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=", + "rev": "daf6dc47aa4b44791372d6139ab7b25269184d55", + "revCount": 811874, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2511.909248%2Brev-0590cd39f728e129122770c029970378a79d076a/019ce32b-8ace-7339-b129-cceaa8dd10c6/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2505.811874%2Brev-daf6dc47aa4b44791372d6139ab7b25269184d55/019a3494-3498-707e-9086-1fb81badc7fe/source.tar.gz" }, "original": { "type": "tarball", - "url": "https://flakehub.com/f/NixOS/nixpkgs/0.2511" + "url": "https://flakehub.com/f/NixOS/nixpkgs/0.2505" } }, "nixpkgs_3": { "locked": { - "lastModified": 1777826146, - "narHash": "sha256-wQ/iN5Zp5VIa3ebBibijPnLyKhor+xEbDy4d0goa9Zs=", - "rev": "73c703c22422b8951895a960959dbbaca7296492", - "revCount": 991389, + "lastModified": 1774273680, + "narHash": "sha256-a++tZ1RQsDb1I0NHrFwdGuRlR5TORvCEUksM459wKUA=", + "rev": "fdc7b8f7b30fdbedec91b71ed82f36e1637483ed", + "revCount": 968305, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.991389%2Brev-73c703c22422b8951895a960959dbbaca7296492/019df6c8-934b-7d40-b402-027bb5def30f/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": 1777954456, - "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=", + "lastModified": 1774709303, + "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1", + "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": 1778218381, - "narHash": "sha256-mhxT7KkmM0h/vgr84o2p6gkzm21b5/dCnIMVKaoXU+I=", + "lastModified": 1775021133, + "narHash": "sha256-JB0u0evfSlmNg9HdGDxtXjaCcdKUpFPdSAMGxvJo5Pw=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "ea79f20a194de74504821ab53e93c0cf92690f00", + "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 23a3ff6..78f4fa2 100644 --- a/users/tao.nix +++ b/users/tao.nix @@ -9,15 +9,11 @@ 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; [ - feedr - sniffnet - oculante # keep-sorted start sticky_comments=no # android-tools - # bottles # boxxy # carapace # davinci-resolve @@ -37,6 +33,7 @@ in { aspellDicts.en bitwarden-cli bitwarden-desktop + bottles calibre darktable deluge @@ -75,7 +72,6 @@ in { tinymist toastify typst - typstyle usbutils vial wezterm @@ -95,10 +91,6 @@ in { environment.shells = with pkgs; [nushell]; fonts.packages = with pkgs; [ - iosevka - 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/tao/nushell/config.nu b/users/tao/nushell/config.nu index 0c08cc8..a5660d9 100644 --- a/users/tao/nushell/config.nu +++ b/users/tao/nushell/config.nu @@ -767,12 +767,8 @@ $env.config = { mkdir ($nu.data-dir | path join "vendor/autoload") starship init nu | save -f ($nu.data-dir | path join "vendor/autoload/starship.nu") -zoxide init nushell --no-cmd | save --force ~/.zoxide.nu source ~/.zoxide.nu export def --wrapped --env z [...rest] { - __zoxide_z ...$rest + zo ...$rest l } - -devenv hook nu | save --force ~/.cache/devenv/hook.nu -source ~/.cache/devenv/hook.nu diff --git a/users/tao/nushell/env.nu b/users/tao/nushell/env.nu index d8f25b3..b38d22c 100644 --- a/users/tao/nushell/env.nu +++ b/users/tao/nushell/env.nu @@ -79,14 +79,10 @@ $env.NU_PLUGIN_DIRS = [ ] # To add entries to PATH (on Windows you might use Path), you can use the following pattern: -# $env.PATH = ($env.PATH | split row (char esep)) +$env.PATH = ($env.PATH | split row (char esep)) # $env.GOPATH = '/home/tao/.go' # $env.CARAPACE_BRIDGES mkdir ~/.cache/carapace # carapace _carapace nushell | save -f ~/.cache/carapace/init.nu - -use std/util "path add" -path add ~/.cargo/bin/ -path add ~/.local/bin/ diff --git a/users/tao/wezterm.lua b/users/tao/wezterm.lua index cca2d28..2e22096 100644 --- a/users/tao/wezterm.lua +++ b/users/tao/wezterm.lua @@ -1,5 +1,6 @@ +local wezterm = require 'wezterm'; local config = { - font = wezterm.font 'Iosevka', + font = wezterm.font 'IBM Plex Mono', color_scheme = 'GruvboxDarkHard', window_decorations = "NONE", 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;