diff --git a/extras/dev.nix b/extras/dev.nix index 92b7971..2327ec6 100644 --- a/extras/dev.nix +++ b/extras/dev.nix @@ -68,6 +68,7 @@ #rust bacon + cargo-expand cargo-feature cargo-generate cargo-watch diff --git a/extras/gaming.nix b/extras/gaming.nix index 4445921..9198d01 100644 --- a/extras/gaming.nix +++ b/extras/gaming.nix @@ -56,48 +56,48 @@ in { ]; # THE FINALS audio borked - services.pipewire.enable = !if_desktop; - hardware.pulseaudio.enable = if_desktop; - hardware.pulseaudio.support32Bit = if_desktop; - services.pipewire.extraConfig = { - pipewire."99-low-latency" = { - context.properties = { - default.allowed-rates = [44100 48000 96000 192000]; - default.clock.rate = 192000; - default.clock.quantum = 32; - default.clock.min-quantum = 32; - default.clock.max-quantum = 32; - }; - context.modules = [ - { - name = "libpipewire-module-rt"; - args = { - nice.level = -12; - rt.prio = 89; - rt.time.soft = 200000; - rt.time.hard = 200000; - }; - flags = ["ifexists nofail"]; - } - ]; - }; - pipewire-pulse."99-low-latency" = { - context.modules = [ - { - name = "libpipewire-module-protocol-pulse"; - args = { - pulse.min.req = "32/192000"; - pulse.default.req = "32/192000"; - pulse.max.req = "32/192000"; - pulse.min.quantum = "32/192000"; - pulse.max.quantum = "32/192000"; - }; - } - ]; - stream.properties = { - node.latency = "32/192000"; - resample.quality = 1; - }; - }; - }; + # services.pipewire.enable = !if_desktop; + # hardware.pulseaudio.enable = if_desktop; + # hardware.pulseaudio.support32Bit = if_desktop; + # services.pipewire.extraConfig = { + # pipewire."99-low-latency" = { + # context.properties = { + # default.allowed-rates = [44100 48000 96000 192000]; + # default.clock.rate = 192000; + # default.clock.quantum = 32; + # default.clock.min-quantum = 32; + # default.clock.max-quantum = 32; + # }; + # context.modules = [ + # { + # name = "libpipewire-module-rt"; + # args = { + # nice.level = -12; + # rt.prio = 89; + # rt.time.soft = 200000; + # rt.time.hard = 200000; + # }; + # flags = ["ifexists nofail"]; + # } + # ]; + # }; + # pipewire-pulse."99-low-latency" = { + # context.modules = [ + # { + # name = "libpipewire-module-protocol-pulse"; + # args = { + # pulse.min.req = "32/192000"; + # pulse.default.req = "32/192000"; + # pulse.max.req = "32/192000"; + # pulse.min.quantum = "32/192000"; + # pulse.max.quantum = "32/192000"; + # }; + # } + # ]; + # stream.properties = { + # node.latency = "32/192000"; + # resample.quality = 1; + # }; + # }; + # }; } diff --git a/extras/uwuraid.nix b/extras/uwuraid.nix index 2f9885a..8eeab2b 100644 --- a/extras/uwuraid.nix +++ b/extras/uwuraid.nix @@ -1,95 +1,95 @@ {config, ...}: { age.secrets.uwuraid.file = ../secrets/uwuraid.age; - # systemd.mounts = let - # opts = { - # type = "cifs"; - # mountConfig = {Options = "x-systemd.automount,users,noauto,credentials=${config.age.secrets.uwuraid.path},noatime,uid=1000,gid=100";}; - # }; - # in [ - # (opts - # // { - # what = "//100.97.47.81/anime"; - # where = "/mnt/uwuraid/anime"; - # }) - # # (opts - # # // { - # # what = "//100.97.47.81/appdata"; - # # where = "/mnt/uwuraid/appdata"; - # # }) - # (opts - # // { - # what = "//100.97.47.81/backup"; - # where = "/mnt/uwuraid/backup"; - # }) - # (opts - # // { - # what = "//100.97.47.81/everything"; - # where = "/mnt/uwuraid/everything"; - # }) - # (opts - # // { - # what = "//100.97.47.81/games"; - # where = "/mnt/uwuraid/games"; - # }) - # # (opts - # # // { - # # what = "//100.97.47.81/isos"; - # # where = "/mnt/uwuraid/isos"; - # # }) - # # (opts - # # // { - # # what = "//100.97.47.81/jellyfin"; - # # where = "/mnt/uwuraid/jellyfin"; - # # }) - # (opts - # // { - # what = "//100.97.47.81/movies"; - # where = "/mnt/uwuraid/movies"; - # }) - # (opts - # // { - # what = "//100.97.47.81/music"; - # where = "/mnt/uwuraid/music"; - # }) - # (opts - # // { - # what = "//100.97.47.81/photos"; - # where = "/mnt/uwuraid/photos"; - # }) - # (opts - # // { - # what = "//100.97.47.81/syncthing"; - # where = "/mnt/uwuraid/syncthing"; - # }) - # # (opts - # # // { - # # what = "//100.97.47.81/television"; - # # where = "/mnt/uwuraid/television"; - # # }) - # (opts - # // { - # what = "//100.97.47.81/virginia"; - # where = "/mnt/uwuraid/virginia"; - # }) - # ]; - # systemd.automounts = let - # opts = { - # wantedBy = ["multi-user.target"]; - # automountConfig = {TimeoutIdleSec = "60";}; - # }; - # in [ - # (opts // {where = "/mnt/uwuraid/anime";}) - # # (opts // {where = "/mnt/uwuraid/appdata";}) - # (opts // {where = "/mnt/uwuraid/backup";}) - # (opts // {where = "/mnt/uwuraid/everything";}) - # (opts // {where = "/mnt/uwuraid/games";}) - # # (opts // {where = "/mnt/uwuraid/isos";}) - # # (opts // { where = "/mnt/uwuraid/jellyfin"; }) - # (opts // {where = "/mnt/uwuraid/movies";}) - # (opts // {where = "/mnt/uwuraid/music";}) - # (opts // {where = "/mnt/uwuraid/photos";}) - # (opts // {where = "/mnt/uwuraid/syncthing";}) - # (opts // {where = "/mnt/uwuraid/virginia";}) - # # (opts // {where = "/mnt/uwuraid/television";}) - # ]; + systemd.mounts = let + opts = { + type = "cifs"; + mountConfig = {Options = "x-systemd.automount,users,noauto,credentials=${config.age.secrets.uwuraid.path},noatime,uid=1000,gid=100";}; + }; + in [ + (opts + // { + what = "//100.97.47.81/anime"; + where = "/mnt/uwuraid/anime"; + }) + # (opts + # // { + # what = "//100.97.47.81/appdata"; + # where = "/mnt/uwuraid/appdata"; + # }) + (opts + // { + what = "//100.97.47.81/backup"; + where = "/mnt/uwuraid/backup"; + }) + (opts + // { + what = "//100.97.47.81/everything"; + where = "/mnt/uwuraid/everything"; + }) + (opts + // { + what = "//100.97.47.81/games"; + where = "/mnt/uwuraid/games"; + }) + # (opts + # // { + # what = "//100.97.47.81/isos"; + # where = "/mnt/uwuraid/isos"; + # }) + # (opts + # // { + # what = "//100.97.47.81/jellyfin"; + # where = "/mnt/uwuraid/jellyfin"; + # }) + (opts + // { + what = "//100.97.47.81/movies"; + where = "/mnt/uwuraid/movies"; + }) + (opts + // { + what = "//100.97.47.81/music"; + where = "/mnt/uwuraid/music"; + }) + (opts + // { + what = "//100.97.47.81/photos"; + where = "/mnt/uwuraid/photos"; + }) + (opts + // { + what = "//100.97.47.81/syncthing"; + where = "/mnt/uwuraid/syncthing"; + }) + # (opts + # // { + # what = "//100.97.47.81/television"; + # where = "/mnt/uwuraid/television"; + # }) + (opts + // { + what = "//100.97.47.81/virginia"; + where = "/mnt/uwuraid/virginia"; + }) + ]; + systemd.automounts = let + opts = { + wantedBy = ["multi-user.target"]; + automountConfig = {TimeoutIdleSec = "60";}; + }; + in [ + (opts // {where = "/mnt/uwuraid/anime";}) + # (opts // {where = "/mnt/uwuraid/appdata";}) + (opts // {where = "/mnt/uwuraid/backup";}) + (opts // {where = "/mnt/uwuraid/everything";}) + (opts // {where = "/mnt/uwuraid/games";}) + # (opts // {where = "/mnt/uwuraid/isos";}) + # (opts // { where = "/mnt/uwuraid/jellyfin"; }) + (opts // {where = "/mnt/uwuraid/movies";}) + (opts // {where = "/mnt/uwuraid/music";}) + (opts // {where = "/mnt/uwuraid/photos";}) + (opts // {where = "/mnt/uwuraid/syncthing";}) + (opts // {where = "/mnt/uwuraid/virginia";}) + # (opts // {where = "/mnt/uwuraid/television";}) + ]; } diff --git a/flake.lock b/flake.lock index 467a91f..e9830b2 100644 --- a/flake.lock +++ b/flake.lock @@ -89,11 +89,11 @@ ] }, "locked": { - "lastModified": 1728334376, - "narHash": "sha256-CTKEKPzD/j8FK6H4DO3EjyixZd3HHvgAgfnCwpGFP5c=", + "lastModified": 1728763831, + "narHash": "sha256-KOp33tls7jRAhcmu77aVxKpSMou8QgK0BC+Y3sYLuGo=", "owner": "nix-community", "repo": "disko", - "rev": "d39ee334984fcdae6244f5a8e6ab857479cbaefe", + "rev": "b6215392ec3bd05e9ebfbb2f7945c414096fce8f", "type": "github" }, "original": { @@ -224,11 +224,11 @@ ] }, "locked": { - "lastModified": 1728337164, - "narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=", + "lastModified": 1728791962, + "narHash": "sha256-nr5QiXwQcZmf6/auC1UpX8iAtINMtdi2mH+OkqJQVmU=", "owner": "nix-community", "repo": "home-manager", - "rev": "038630363e7de57c36c417fd2f5d7c14773403e4", + "rev": "64c6325b28ebd708653dd41d88f306023f296184", "type": "github" }, "original": { @@ -326,11 +326,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1728351368, - "narHash": "sha256-Ig/OSUMhCGFs/p0riUz8wqKMMg4dj9Rj756bGZWULDY=", + "lastModified": 1728783352, + "narHash": "sha256-9U5sXyy5i8N2iL6dROw8vAAhbbBAVWmKuNbEZj6CzSQ=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "b2c490e0fdd4ba63ea42bbd0f0fe928abb0af73a", + "rev": "f545d4fc6c01afb04b9108f59d16160dcfa0a971", "type": "github" }, "original": { @@ -341,11 +341,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1728269138, - "narHash": "sha256-oKxDImsOvgUZMY4NwXVyUc/c1HiU2qInX+b5BU0yXls=", + "lastModified": 1728729581, + "narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ecfcd787f373f43307d764762e139a7cdeb9c22b", + "rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806", "type": "github" }, "original": { @@ -404,11 +404,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1728193676, - "narHash": "sha256-PbDWAIjKJdlVg+qQRhzdSor04bAPApDqIv2DofTyynk=", + "lastModified": 1728627514, + "narHash": "sha256-r+SF9AnHrTg+bk6YszoKfV9lgyw+yaFUQe0dOjI0Z2o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ecbc1ca8ffd6aea8372ad16be9ebbb39889e55b6", + "rev": "c505ebf777526041d792a49d5f6dd4095ea391a7", "type": "github" }, "original": { @@ -464,11 +464,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1728241625, - "narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=", + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "type": "github" }, "original": { @@ -485,11 +485,11 @@ ] }, "locked": { - "lastModified": 1727917089, - "narHash": "sha256-XWNBGf8Z03sqA5/m99X6XTFbHGNuVx1gMaMQJbdDIrY=", + "lastModified": 1728750492, + "narHash": "sha256-9IHlIsH4gLqQjS2lFbEnsl/ItdqzBBLWLsyXS0k0jf8=", "owner": "pjones", "repo": "plasma-manager", - "rev": "bc14b17bff1557de8f103172508f896a87bb9cdb", + "rev": "c6d4b6f3e0138c08f37d66fcfbcbe37dab08f108", "type": "github" }, "original": { @@ -519,11 +519,11 @@ ] }, "locked": { - "lastModified": 1728268235, - "narHash": "sha256-lJMFnMO4maJuNO6PQ5fZesrTmglze3UFTTBuKGwR1Nw=", + "lastModified": 1728700003, + "narHash": "sha256-Ox1pvEHxLK6lAdaKQW21Zvk65SPDag+cD8YA444R/og=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "25685cc2c7054efc31351c172ae77b21814f2d42", + "rev": "fc1e58ebabe0cef4442eedea07556ff0c9eafcfe", "type": "github" }, "original": { diff --git a/users/tao/helix.nix b/users/tao/helix.nix index 7ce8790..407ecc0 100644 --- a/users/tao/helix.nix +++ b/users/tao/helix.nix @@ -72,6 +72,10 @@ name = "sql"; language-servers = ["sqls"]; } + { + name = "go"; + formatter.command = "goimports"; + } { name = "arduino"; grammar = "arduino"; @@ -187,6 +191,7 @@ }; }; language-server = { + rust-analyzer.config.check.command = "clippy"; # gas = { # command = "asm-lsp"; # }; @@ -198,6 +203,11 @@ command = "boxxy"; args = ["arduino-language-server" "-cli" "arduino-cli" "-cli-config" "~/.local/share/arduino/cli/arduino-cli.yaml" "-jobs" "0"]; }; + # gopls = { + # config = { + # unusedVariable = false; + # }; + # }; sqls = { command = "sqls"; }; diff --git a/users/tao/nushell/stuff.nu b/users/tao/nushell/stuff.nu index d3ed24a..44778e3 100644 --- a/users/tao/nushell/stuff.nu +++ b/users/tao/nushell/stuff.nu @@ -22,7 +22,8 @@ alias jd = jj diff alias jc = jj desc alias js = jj status alias jp = jj git push -alias jm = jj branch set main +alias jm = jj bookmark set main +alias jg = jj git clone --colocate def h [] { sk | complete |