diff --git a/extras/gaming.nix b/extras/gaming.nix index 209156d..b27a99e 100644 --- a/extras/gaming.nix +++ b/extras/gaming.nix @@ -1,4 +1,10 @@ -{pkgs, ...}: { +{ + pkgs, + inputs, + ... +}: let + pkgs-last-building = inputs.nixpkgs-last-building.legacyPackages.${pkgs.system}; +in { # aagl.url = "github:ezKEa/aagl-gtk-on-nix"; # aagl.inputs.nixpkgs.follows = "nixpkgs"; @@ -9,24 +15,27 @@ ui.enable = true; }; - 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 - ]; + 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 + ]); networking.firewall.allowedTCPPorts = [25565]; diff --git a/flake.lock b/flake.lock index f2365e5..79427b4 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": 1778179392, + "narHash": "sha256-W6zorvjBYbzMNvqKIqCdpDF4rq3gj50Xximl56YM9/I=", + "rev": "efd54faa68be8cd777b5c28cab11e638998a0853", + "revCount": 416, "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.416%2Brev-efd54faa68be8cd777b5c28cab11e638998a0853/019e03c3-8bbc-7443-bd6d-c787773c6154/source.tar.gz?rev=efd54faa68be8cd777b5c28cab11e638998a0853&revCount=416" }, "original": { "type": "tarball", @@ -45,37 +45,37 @@ "determinate-nixd-aarch64-darwin": { "flake": false, "locked": { - "narHash": "sha256-wIHmKTzguRGRhNuYKqXl4NpghdeAYdXnBWKMMVWnlaA=", + "narHash": "sha256-z4mCqKI3Qd6weuHrlfzGccJG0giym/VJhKv20ijRSs0=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.18.0/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.20.0/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.20.0/macOS" } }, "determinate-nixd-aarch64-linux": { "flake": false, "locked": { - "narHash": "sha256-eIYwLso0rkCUtQNr49U6Lm6Cntx4AeEyEa3BCbhyL3s=", + "narHash": "sha256-yW+VNepSRytzfanSssPMJPvwioCcmlZYaBX8++UFkAk=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.18.0/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.20.0/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.20.0/aarch64-linux" } }, "determinate-nixd-x86_64-linux": { "flake": false, "locked": { - "narHash": "sha256-oE/kvKBJkCIlFhkrEn7aLIf80HxK5E7fJGD2Acn4qbw=", + "narHash": "sha256-+L102C3Hhkd1GlXmRm2eLTLsZKBxEvooiQZFqQRlBf0=", "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.20.0/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.20.0/x86_64-linux" } }, "disko": { @@ -85,11 +85,11 @@ ] }, "locked": { - "lastModified": 1773889306, - "narHash": "sha256-PAqwnsBSI9SVC2QugvQ3xeYCB0otOwCacB1ueQj2tgw=", + "lastModified": 1777713215, + "narHash": "sha256-8GzXDOXckDWwST8TY5DbwYFjdvQLlP7K9CLSVx6iTTo=", "owner": "nix-community", "repo": "disko", - "rev": "5ad85c82cc52264f4beddc934ba57f3789f28347", + "rev": "63b4e7e6cf75307c1d26ac3762b886b5b0247267", "type": "github" }, "original": { @@ -169,11 +169,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1776221232, - "narHash": "sha256-utPazkXA5Ef1KELKUDA+tMWkgeLlPhjmA6ma8NAWAe4=", + "lastModified": 1778169829, + "narHash": "sha256-p9CY3iCpTIzIDAnGv6cp+/ckRqs1G5wFSZcUtiEaM6Y=", "owner": "helix-editor", "repo": "helix", - "rev": "0805bc8534bafaa9109f1839f4e771afb32c3391", + "rev": "7d92fbdadf3cdadd5d0d1e27c234c10b74c6613c", "type": "github" }, "original": { @@ -210,11 +210,11 @@ ] }, "locked": { - "lastModified": 1776184304, - "narHash": "sha256-No6QGBmIv5ChiwKCcbkxjdEQ/RO2ZS1gD7SFy6EZ7rc=", + "lastModified": 1778144356, + "narHash": "sha256-dGM+QCstz/DyLB68+JK5GWyMx4QSqmOJEVgZmy63d/g=", "owner": "nix-community", "repo": "home-manager", - "rev": "3c7524c68348ef79ce48308e0978611a050089b2", + "rev": "e4419d3123b780d5f4c0bceeace450424387638c", "type": "github" }, "original": { @@ -231,11 +231,11 @@ ] }, "locked": { - "lastModified": 1774991950, - "narHash": "sha256-kScKj3qJDIWuN9/6PMmgy5esrTUkYinrO5VvILik/zw=", + "lastModified": 1777594677, + "narHash": "sha256-h90sHwoRJLRvaTpZroTvU2JRHDFj0czUafM8eqLe1RI=", "owner": "nix-community", "repo": "home-manager", - "rev": "f2d3e04e278422c7379e067e323734f3e8c585a7", + "rev": "899c08a15beae5da51a5cecd6b2b994777a948da", "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": 1778177425, + "narHash": "sha256-oyHvP5HDRe59opmjTrq2ED9lh+R9FrHyaCGPPNfBqWM=", + "rev": "f0ccb960d3ad5bff28acd9cabf8bdef885b5d52f", + "revCount": 25858, "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.20.0/019e03bc-3f83-7833-aba3-b691ef4956c7/source.tar.gz" }, "original": { "type": "tarball", @@ -288,11 +288,11 @@ }, "nixos": { "locked": { - "lastModified": 1776067740, - "narHash": "sha256-B35lpsqnSZwn1Lmz06BpwF7atPgFmUgw1l8KAV3zpVQ=", + "lastModified": 1778003029, + "narHash": "sha256-q/nkKLDtHIyLjZpKhWk3cSK5IYsFqtMd6UtXF3ddjgA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7e495b747b51f95ae15e74377c5ce1fe69c1765f", + "rev": "0c88e1f2bdb93d5999019e99cb0e61e1fe2af4c5", "type": "github" }, "original": { @@ -319,11 +319,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1775490113, - "narHash": "sha256-2ZBhDNZZwYkRmefK5XLOusCJHnoeKkoN95hoSGgMxWM=", + "lastModified": 1778143761, + "narHash": "sha256-lkesY6x2X2qxlqLM7CT2iM/0rP2JB7fruPN3h8POXmI=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "c775c2772ba56e906cbeb4e0b2db19079ef11ff7", + "rev": "3bcaa367d4c550d687a17ac792fd5cda214ee871", "type": "github" }, "original": { @@ -399,26 +399,26 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1761597516, - "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=", - "rev": "daf6dc47aa4b44791372d6139ab7b25269184d55", - "revCount": 811874, + "lastModified": 1773222311, + "narHash": "sha256-BHoB/XpbqoZkVYZCfXJXfkR+GXFqwb/4zbWnOr2cRcU=", + "rev": "0590cd39f728e129122770c029970378a79d076a", + "revCount": 909248, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2505.811874%2Brev-daf6dc47aa4b44791372d6139ab7b25269184d55/019a3494-3498-707e-9086-1fb81badc7fe/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2511.909248%2Brev-0590cd39f728e129122770c029970378a79d076a/019ce32b-8ace-7339-b129-cceaa8dd10c6/source.tar.gz" }, "original": { "type": "tarball", - "url": "https://flakehub.com/f/NixOS/nixpkgs/0.2505" + "url": "https://flakehub.com/f/NixOS/nixpkgs/0.2511" } }, "nixpkgs_3": { "locked": { - "lastModified": 1775888245, - "narHash": "sha256-nwASzrRDD1JBEu/o8ekKYEXm/oJW6EMCzCRdrwcLe90=", - "rev": "13043924aaa7375ce482ebe2494338e058282925", - "revCount": 978638, + "lastModified": 1777826146, + "narHash": "sha256-wQ/iN5Zp5VIa3ebBibijPnLyKhor+xEbDy4d0goa9Zs=", + "rev": "73c703c22422b8951895a960959dbbaca7296492", + "revCount": 991389, "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.991389%2Brev-73c703c22422b8951895a960959dbbaca7296492/019df6c8-934b-7d40-b402-027bb5def30f/source.tar.gz" }, "original": { "type": "tarball", @@ -427,11 +427,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1776169885, - "narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=", + "lastModified": 1777954456, + "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9", + "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1", "type": "github" }, "original": { @@ -501,11 +501,11 @@ ] }, "locked": { - "lastModified": 1776144279, - "narHash": "sha256-eX3u6wJ34+qu7ZR1qWOaToGWmudYQSOEStZZm6goP+8=", + "lastModified": 1778218381, + "narHash": "sha256-mhxT7KkmM0h/vgr84o2p6gkzm21b5/dCnIMVKaoXU+I=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "727de8a44c85e90f899c540cf3ffa0d5d3344f9c", + "rev": "ea79f20a194de74504821ab53e93c0cf92690f00", "type": "github" }, "original": { diff --git a/users/tao.nix b/users/tao.nix index 85f681f..23a3ff6 100644 --- a/users/tao.nix +++ b/users/tao.nix @@ -12,10 +12,12 @@ in { # 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 @@ -35,7 +37,6 @@ in { aspellDicts.en bitwarden-cli bitwarden-desktop - bottles calibre darktable deluge @@ -94,6 +95,7 @@ in { environment.shells = with pkgs; [nushell]; fonts.packages = with pkgs; [ + iosevka libertine inconsolata linux-libertine-g diff --git a/users/tao/nushell/config.nu b/users/tao/nushell/config.nu index a5660d9..0c08cc8 100644 --- a/users/tao/nushell/config.nu +++ b/users/tao/nushell/config.nu @@ -767,8 +767,12 @@ $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] { - zo ...$rest + __zoxide_z ...$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 b38d22c..d8f25b3 100644 --- a/users/tao/nushell/env.nu +++ b/users/tao/nushell/env.nu @@ -79,10 +79,14 @@ $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 2e22096..cca2d28 100644 --- a/users/tao/wezterm.lua +++ b/users/tao/wezterm.lua @@ -1,6 +1,5 @@ -local wezterm = require 'wezterm'; local config = { - font = wezterm.font 'IBM Plex Mono', + font = wezterm.font 'Iosevka', color_scheme = 'GruvboxDarkHard', window_decorations = "NONE",