diff --git a/extras/dev.nix b/extras/dev.nix index 59169b6..c075f0c 100644 --- a/extras/dev.nix +++ b/extras/dev.nix @@ -3,17 +3,6 @@ pkgs, ... }: { - services.dockerRegistry = { - enable = true; - listenAddress = "0.0.0.0"; - port = 5000; - storagePath = "/var/lob/docker-registry"; - enableDelete = true; - enableGarbageCollect = true; - garbageCollectDates = "daily"; - openFirewall = false; - }; - boot.kernel.sysctl."vm.overcommit_memory" = "1"; # systemd.user.services.lspmux = { @@ -26,8 +15,7 @@ # }; programs.qgroundcontrol.enable = true; environment.systemPackages = with pkgs; [ - foxglove-studio - foxglove-cli + chromium claude-code # keep-sorted start sticky_comments=no # act @@ -79,11 +67,11 @@ wild # keep-sorted end - # # alloy - # bun - # docker-compose - # ngrok - # deno + # alloy + bun + docker-compose + ngrok + deno # # databases # sqlite diff --git a/extras/gaming.nix b/extras/gaming.nix index 86aea08..b27a99e 100644 --- a/extras/gaming.nix +++ b/extras/gaming.nix @@ -16,13 +16,10 @@ in { }; environment.systemPackages = - /* - (with pkgs-last-building; [ - # lutris - ]) - ++ - */ - with pkgs; [ + (with pkgs-last-building; [ + # lutris + ]) + ++ (with pkgs; [ # keep-sorted start # parsec-bin # yuzu # nintendo can suck the shit out of my asshole @@ -38,7 +35,7 @@ in { temurin-jre-bin-17 wine # keep-sorted end - ]; + ]); networking.firewall.allowedTCPPorts = [25565]; diff --git a/extras/uwuraid.nix b/extras/uwuraid.nix index a0b8072..4ab97d8 100644 --- a/extras/uwuraid.nix +++ b/extras/uwuraid.nix @@ -4,7 +4,8 @@ opts = { type = "cifs"; mountConfig = { - Options = "_netdev,noserverino,nounix,nobrl,noperm,noauto,noatime,async,rw,x-systemd.automount,x-systemd.requires=tailscaled.service,x-systemd.automount-idle-timeout=60,nofail,soft,softrw,credentials=${config.age.secrets.uwuraid.path},file_mode=0777,dir_mode=0777,echo_interval=30,echo_retries=2,closetimeo=0,vers=3.0,iocharset=utf8"; + # 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"; }; }; in [ diff --git a/flake.lock b/flake.lock index c250f2e..8324fde 100644 --- a/flake.lock +++ b/flake.lock @@ -30,12 +30,12 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1781815324, - "narHash": "sha256-5pDiPOe2tLKDOH59TkzP3MNiCCCbGxw3giDyRrSdP4E=", - "rev": "fdef7e382e042b1fe418f65770c3acda5933b155", - "revCount": 422, + "lastModified": 1778179392, + "narHash": "sha256-W6zorvjBYbzMNvqKIqCdpDF4rq3gj50Xximl56YM9/I=", + "rev": "efd54faa68be8cd777b5c28cab11e638998a0853", + "revCount": 416, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/0.1.422%2Brev-fdef7e382e042b1fe418f65770c3acda5933b155/019edc7b-7246-7e91-b54e-dcdac2728f77/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" }, "original": { "type": "tarball", @@ -45,37 +45,37 @@ "determinate-nixd-aarch64-darwin": { "flake": false, "locked": { - "narHash": "sha256-pQ7YeoB96bBl3iJGRdUWjdOFwahPUMwNN1yl9fwJufY=", + "narHash": "sha256-z4mCqKI3Qd6weuHrlfzGccJG0giym/VJhKv20ijRSs0=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.2/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.21.2/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.20.0/macOS" } }, "determinate-nixd-aarch64-linux": { "flake": false, "locked": { - "narHash": "sha256-t6Tc358tx16GFely1je18dmrfB8Wv1FkV6nRnU7ITYY=", + "narHash": "sha256-yW+VNepSRytzfanSssPMJPvwioCcmlZYaBX8++UFkAk=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.2/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.21.2/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-M5e/05UlhljIuqS2ZMozD3OJ2MTTYol9SxQwqrzJdkk=", + "narHash": "sha256-+L102C3Hhkd1GlXmRm2eLTLsZKBxEvooiQZFqQRlBf0=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.2/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.21.2/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.20.0/x86_64-linux" } }, "disko": { @@ -85,11 +85,11 @@ ] }, "locked": { - "lastModified": 1781152676, - "narHash": "sha256-RxWs5ND31KzTG7wvMM+PMfUjyNpmIEr999lqNARaM5o=", + "lastModified": 1777713215, + "narHash": "sha256-8GzXDOXckDWwST8TY5DbwYFjdvQLlP7K9CLSVx6iTTo=", "owner": "nix-community", "repo": "disko", - "rev": "ff8702b4de27f72b4c78573dfb89ec74e36abdf1", + "rev": "63b4e7e6cf75307c1d26ac3762b886b5b0247267", "type": "github" }, "original": { @@ -135,27 +135,6 @@ "url": "https://flakehub.com/f/hercules-ci/flake-parts/0.1" } }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "nur", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "git-hooks-nix": { "inputs": { "flake-compat": "flake-compat", @@ -190,11 +169,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1781971804, - "narHash": "sha256-sZ3m0vu/qNIip9S+fm/6LwvgwJNRNFzdozg95oFKfgg=", + "lastModified": 1778551011, + "narHash": "sha256-woJV7tJwwzjR0xWDNuGpwMENe/OEMAdSGg+nqWs9tUE=", "owner": "helix-editor", "repo": "helix", - "rev": "d2fdf3f3c788f8fb715caf6d2f94d71b984da6cd", + "rev": "8c41b11607924f7584b77c8a6e6b16439a2f559f", "type": "github" }, "original": { @@ -231,11 +210,11 @@ ] }, "locked": { - "lastModified": 1781980822, - "narHash": "sha256-UF4TqfMJCYOKVhLqgWnLZIdFm///wbUGlV0HyB2wHRg=", + "lastModified": 1778876681, + "narHash": "sha256-9XOIxYLBp+sJsPWNnNyk1aVfYXuuRJZ4Anpplm9Tn8g=", "owner": "nix-community", "repo": "home-manager", - "rev": "8695ecb389cb43449fba0494ffc21065c7cde39d", + "rev": "c7fad8197070948d8aa02cb8922240ee129cab2e", "type": "github" }, "original": { @@ -252,11 +231,11 @@ ] }, "locked": { - "lastModified": 1781497404, - "narHash": "sha256-9GAF8sSsnkyCVCWkomXR0T+zdSxyUlfPt6neQidimdg=", + "lastModified": 1778805320, + "narHash": "sha256-nGFJ01m2CTBKD4ABtcY4vLhHrRN91LKr/pn41PcU78A=", "owner": "nix-community", "repo": "home-manager", - "rev": "1285cd3d6882a9847f2d56ed5541b3350c8a6162", + "rev": "9846abe15e7d0d36b8acbd4d05f2b87461744c92", "type": "github" }, "original": { @@ -295,12 +274,12 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1780939209, - "narHash": "sha256-/JuW5C6sWuC836Y9b7hga3ZvhRiY4k4Zs73RRg5KVWM=", - "rev": "952beffe9c45ed245d30209d4f17cf1d26654a2a", - "revCount": 26044, + "lastModified": 1778177425, + "narHash": "sha256-oyHvP5HDRe59opmjTrq2ED9lh+R9FrHyaCGPPNfBqWM=", + "rev": "f0ccb960d3ad5bff28acd9cabf8bdef885b5d52f", + "revCount": 25858, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.21.1/019ea860-2acd-7680-ae61-10f9574b2694/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", @@ -309,16 +288,16 @@ }, "nixos": { "locked": { - "lastModified": 1781216227, - "narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=", + "lastModified": 1778737229, + "narHash": "sha256-6xWoytx8jFW4PF1GjRm/i/53trbpKGfz6zjzQGBr4cI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0", + "rev": "d7a713c0b7e47c908258e71cba7a2d77cc8d71d5", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-26.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } @@ -339,15 +318,12 @@ } }, "nixos-hardware": { - "inputs": { - "nixpkgs": "nixpkgs_4" - }, "locked": { - "lastModified": 1781622756, - "narHash": "sha256-JrPh4M6S7aPsEE9tOENuZrxC6o2szSLlK+t4+nLke9s=", + "lastModified": 1778593042, + "narHash": "sha256-xYGrSg6354UK2K4WSQd4+TfyvfqmvFbSY+ZtGQUXK0c=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "08018c72174a4df5657f8d94178ac69fb9c243e5", + "rev": "9bd7c80d43e258aaa607d83b43661df11444d808", "type": "github" }, "original": { @@ -389,6 +365,22 @@ "type": "github" } }, + "nixpkgs-last-building": { + "locked": { + "lastModified": 1754028485, + "narHash": "sha256-IiiXB3BDTi6UqzAZcf2S797hWEPCRZOwyNThJIYhUfk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "59e69648d345d6e8fef86158c555730fa12af9de", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "59e69648d345d6e8fef86158c555730fa12af9de", + "type": "github" + } + }, "nixpkgs-regression": { "locked": { "lastModified": 1643052045, @@ -421,12 +413,12 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1780930886, - "narHash": "sha256-rppURzHviaQN131F+nLiLdGfcb0uCd9gGP0E5+iw9MI=", - "rev": "8c3cede7ddc26bd659d2d383b5610efbd2c7a16e", - "revCount": 1012902, + "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.1012902%2Brev-8c3cede7ddc26bd659d2d383b5610efbd2c7a16e/019eab22-bd1e-7e40-b919-277db893c789/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", @@ -435,24 +427,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1767892417, - "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=", - "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba", - "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre924538.3497aa5c9457/nixexprs.tar.xz" - }, - "original": { - "type": "tarball", - "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1781577229, - "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", + "lastModified": 1778443072, + "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", + "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32", "type": "github" }, "original": { @@ -462,27 +441,6 @@ "type": "github" } }, - "nur": { - "inputs": { - "flake-parts": "flake-parts_2", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1781979923, - "narHash": "sha256-BQHJXHeKPYBQldv06grBZFnChKf3YdR4JLPFmqCB3sI=", - "owner": "nix-community", - "repo": "NUR", - "rev": "76b40a7a209c3fec96fb9d68f6a2f1f97760e3f2", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "NUR", - "type": "github" - } - }, "root": { "inputs": { "agenix": "agenix", @@ -494,8 +452,8 @@ "nixos": "nixos", "nixos-facter-modules": "nixos-facter-modules", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_5", - "nur": "nur", + "nixpkgs": "nixpkgs_4", + "nixpkgs-last-building": "nixpkgs-last-building", "zen-browser": "zen-browser" } }, @@ -543,11 +501,11 @@ ] }, "locked": { - "lastModified": 1781932488, - "narHash": "sha256-v7xGsRuuTPyKT1BzZYXfhciGKBRxQiBPn/wyvHDriqM=", + "lastModified": 1778846616, + "narHash": "sha256-cqNwCnEdzUlUgNk9c3bVkXnEfmhzHvHre2Nr2C0sIfo=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "bed09c284f289ad29cd7936e6297c7c16841903a", + "rev": "3e3671b5f0e7c60e8f10bdf8667598603203546a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4a7e4fd..0cc84f3 100644 --- a/flake.nix +++ b/flake.nix @@ -2,16 +2,12 @@ description = "we say NO to shitty OSes"; inputs = { - nixos.url = "github:NixOS/nixpkgs/nixos-26.05"; + nixos.url = "github:NixOS/nixpkgs/nixos-25.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs-last-building.url = "github:NixOS/nixpkgs/59e69648d345d6e8fef86158c555730fa12af9de"; nixos-facter-modules.url = "github:numtide/nixos-facter-modules"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - # nixpkgs-last-building.url = "github:NixOS/nixpkgs/64c08a7ca051951c8eae34e3e3cb1e202fe36786"; determinate.url = "https://flakehub.com/f/DeterminateSystems/determinate/0.1"; - nur = { - url = "github:nix-community/NUR"; - inputs.nixpkgs.follows = "nixpkgs"; - }; agenix = { url = "github:ryantm/agenix"; inputs.darwin.follows = ""; @@ -45,8 +41,7 @@ nixos, self, nixpkgs, - # nixpkgs-last-building, - nur, + nixpkgs-last-building, nixos-facter-modules, nixos-hardware, determinate, @@ -105,7 +100,6 @@ ./extras/dev.nix ./extras/gaming.nix lsfg-vk-flake.nixosModules.default - nur.modules.nixos.default ]; }; NOmom = nixpkgs.lib.nixosSystem { diff --git a/systems/BASED.nix b/systems/BASED.nix index 2c14d78..461cf80 100644 --- a/systems/BASED.nix +++ b/systems/BASED.nix @@ -6,8 +6,6 @@ modulesPath, ... }: { - services.fwupd.enable = true; - nixpkgs.overlays = [ (final: prev: { inherit @@ -22,11 +20,11 @@ nix.package = lib.mkIf (config.networking.hostName == "NOcomputer") pkgs.lixPackageSets.stable.lix; + programs.pmount.enable = true; environment.systemPackages = with pkgs; [ # keep-sorted start bat bottom - cachix cifs-utils dumbpipe dust @@ -57,62 +55,6 @@ # keep-sorted end ]; programs.partition-manager.enable = lib.mkDefault true; - programs.pmount.enable = lib.mkDefault true; - programs.mosh.enable = lib.mkDefault true; - - fonts.fontDir.enable = true; - fonts.packages = with pkgs; [ - # keep-sorted start - cooper-hewitt - ibm-plex - inconsolata - iosevka - libertine - linux-libertine-g - nerd-fonts.fira-code - nerd-fonts.iosevka-term - noto-fonts-cjk-sans - noto-fonts-cjk-serif - noto-fonts-color-emoji - # keep-sorted end - ]; - system.userActivationScripts.installFonts = '' - mkdir -p ~/.local/share/fonts - find ${pkgs.noto-fonts-cjk-sans}/share/fonts \ - -type f \( -name "*.otf" -o -name "*.ttf" -o -name "*.ttc" \) \ - -exec cp -f {} ~/.local/share/fonts/ \; - find ${pkgs.noto-fonts-cjk-serif}/share/fonts \ - -type f \( -name "*.otf" -o -name "*.ttf" -o -name "*.ttc" \) \ - -exec cp -f {} ~/.local/share/fonts/ \; - find ${pkgs.cooper-hewitt}/share/fonts \ - -type f \( -name "*.otf" -o -name "*.ttf" -o -name "*.ttc" \) \ - -exec cp -f {} ~/.local/share/fonts/ \; - find ${pkgs.ibm-plex}/share/fonts \ - -type f \( -name "*.otf" -o -name "*.ttf" -o -name "*.ttc" \) \ - -exec cp -f {} ~/.local/share/fonts/ \; - find ${pkgs.inconsolata}/share/fonts \ - -type f \( -name "*.otf" -o -name "*.ttf" -o -name "*.ttc" \) \ - -exec cp -f {} ~/.local/share/fonts/ \; - find ${pkgs.iosevka}/share/fonts \ - -type f \( -name "*.otf" -o -name "*.ttf" -o -name "*.ttc" \) \ - -exec cp -f {} ~/.local/share/fonts/ \; - find ${pkgs.libertine}/share/fonts \ - -type f \( -name "*.otf" -o -name "*.ttf" -o -name "*.ttc" \) \ - -exec cp -f {} ~/.local/share/fonts/ \; - find ${pkgs.linux-libertine-g}/share/fonts \ - -type f \( -name "*.otf" -o -name "*.ttf" -o -name "*.ttc" \) \ - -exec cp -f {} ~/.local/share/fonts/ \; - find ${pkgs.nerd-fonts.fira-code}/share/fonts \ - -type f \( -name "*.otf" -o -name "*.ttf" -o -name "*.ttc" \) \ - -exec cp -f {} ~/.local/share/fonts/ \; - find ${pkgs.nerd-fonts.iosevka-term}/share/fonts \ - -type f \( -name "*.otf" -o -name "*.ttf" -o -name "*.ttc" \) \ - -exec cp -f {} ~/.local/share/fonts/ \; - find ${pkgs.noto-fonts-color-emoji}/share/fonts \ - -type f \( -name "*.otf" -o -name "*.ttf" -o -name "*.ttc" \) \ - -exec cp -f {} ~/.local/share/fonts/ \; - fc-cache -fv - ''; hardware.graphics.enable = true; # hardware.opengl = { diff --git a/systems/NOcomputer.nix b/systems/NOcomputer.nix index 62de5c8..b4519d5 100644 --- a/systems/NOcomputer.nix +++ b/systems/NOcomputer.nix @@ -30,7 +30,7 @@ hardware.nvidia = { powerManagement.enable = true; open = true; - package = config.boot.kernelPackages.nvidiaPackages.latest; + package = config.boot.kernelPackages.nvidiaPackages.beta; }; services.tailscale.useRoutingFeatures = "both"; boot.kernel.sysctl."net.ipv4.ip_forward" = "1"; diff --git a/systems/NOlaptop.nix b/systems/NOlaptop.nix index 42cd8a7..702d002 100644 --- a/systems/NOlaptop.nix +++ b/systems/NOlaptop.nix @@ -17,16 +17,15 @@ # ]; environment.systemPackages = with pkgs; [ - # keep-sorted start - framework-tool fw-ectool - lact + framework-tool nvtopPackages.amd - # keep-sorted end + lact ]; services.lact.enable = true; + services.fwupd.enable = true; services.tailscale.useRoutingFeatures = "client"; systemd.services."backlight@backlight:amdgpu_bl2".enable = false; @@ -51,7 +50,8 @@ boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelParams = [ "amdgpu.abmlevel=1" - "amdgpu.dcdebugmask=0x400" + # amd doesn't have deep + # "mem_sleep_default=deep" ]; boot.kernelModules = ["amdgpu"]; powerManagement.cpuFreqGovernor = "powersave"; diff --git a/users/tao.nix b/users/tao.nix index c61feff..456a0c7 100644 --- a/users/tao.nix +++ b/users/tao.nix @@ -5,24 +5,18 @@ lib, ... }: let - # pkgs-last-building = inputs.nixpkgs-last-building.legacyPackages.${pkgs.system}; + pkgs-last-building = inputs.nixpkgs-last-building.legacyPackages.${pkgs.system}; in { - programs.gphoto2.enable = true; - nixpkgs.config.permittedInsecurePackages = [ - # "electron-39.8.10" - ]; - users.users.tao.packages = - /* - (with pkgs-last-building; [ - # oculante # https://nixpk.gs/pr-tracker.html?pr=502921 - # openscad + (with pkgs-last-building; [ + # oculante # https://nixpk.gs/pr-tracker.html?pr=502921 ]) - ++ ( - */ - with pkgs; [ + ++ (with pkgs; [ + feedr + sniffnet + oculante # keep-sorted start sticky_comments=no - # bitwarden-desktop + # android-tools # bottles # boxxy # carapace @@ -38,17 +32,16 @@ in { # texlab # thunderbird # wkhtmltopdf - android-tools appimage-run aspell aspellDicts.en bitwarden-cli + bitwarden-desktop calibre darktable deluge discord element-desktop - feedr forgejo-cli freecad-wayland gocryptfs @@ -63,7 +56,6 @@ in { nushell nvd obs-studio - oculante onlyoffice-desktopeditors openscad pandoc @@ -78,12 +70,10 @@ in { signal-desktop slack snapper - sniffnet starship syncplay tinymist toastify - transmission_4-gtk typst typstyle usbutils @@ -96,7 +86,7 @@ in { zotero zoxide # keep-sorted end - ]; + ]); virtualisation.waydroid = { enable = true; package = pkgs.waydroid-nftables; @@ -104,6 +94,22 @@ in { environment.shells = with pkgs; [nushell]; + fonts.packages = with pkgs; [ + nerd-fonts.iosevka-term + iosevka + libertine + inconsolata + linux-libertine-g + # 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 + ]; + documentation.enable = true; # virtualisation.libvirtd.enable = true; @@ -158,7 +164,7 @@ in { users.users.tao = { isNormalUser = true; # hashedPasswordFile = config.age.secrets.password-tao.path; - extraGroups = ["audio" "video" "wheel" "libvirtd" "dialout" "game" "camera"]; + extraGroups = ["audio" "video" "wheel" "libvirtd" "dialout" "game"]; shell = pkgs.nushell; }; age.secrets = { diff --git a/users/tao/cargo.toml b/users/tao/cargo.toml index 7db3b5f..7b70795 100644 --- a/users/tao/cargo.toml +++ b/users/tao/cargo.toml @@ -13,7 +13,7 @@ rustc-wrapper = "/path/to/sccache" [unstable] codegen-backend = true -[profile.dev] +[provile.dev] debug = 0 strip = "debuginfo" opt-level = 1 diff --git a/users/tao/helix.nix b/users/tao/helix.nix index ed84d2a..b7b4390 100644 --- a/users/tao/helix.nix +++ b/users/tao/helix.nix @@ -214,7 +214,7 @@ { name = "python"; auto-format = true; - language-servers = [/* "basedpyright" */ "ty" "ruff"]; + language-servers = ["basedpyright" "ty" "ruff"]; # formatter = { # command = "ruff"; # args = ["format"]; @@ -268,10 +268,10 @@ command = "microcad-lsp"; }; - # basedpyright = { - # command = "basedpyright-langserver"; - # args = ["--stdio"]; - # }; + basedpyright = { + command = "basedpyright-langserver"; + args = ["--stdio"]; + }; rust-analyzer.config.check.command = "clippy"; # gas = { # command = "asm-lsp"; diff --git a/users/tao/nushell/completions/completions-docker.nu b/users/tao/nushell/completions/completions-docker.nu index 42daeef..e8e02cc 100644 --- a/users/tao/nushell/completions/completions-docker.nu +++ b/users/tao/nushell/completions/completions-docker.nu @@ -1,27 +1,7 @@ -export def "nu-complete docker ps" [] { +export def "nu-complete docker start" [] { docker ps --all --format json | from json --objects | select Names Image | rename value description } export extern "docker start" [ - ...recipe: string@"nu-complete docker ps" + ...recipe: string@"nu-complete docker start" ] - -export extern "docker stop" [ - ...recipe: string@"nu-complete docker ps" -] - -export extern "docker restart" [ - ...recipe: string@"nu-complete docker ps" -] - -export extern "docker rm" [ - ...recipe: string@"nu-complete docker ps" -] - -export def --wrapped "docker bash" [ - name: string@"nu-complete docker ps" - ...rest -] { - docker exec -it -e DISPLAY $name bash ...$rest -} - diff --git a/users/tao/nushell/extras/nix.nu b/users/tao/nushell/extras/nix.nu index 8cd02bf..5a22b29 100644 --- a/users/tao/nushell/extras/nix.nu +++ b/users/tao/nushell/extras/nix.nu @@ -68,8 +68,8 @@ export def bump [...rest] { } let r = jj log -r @ --no-pager --no-graph --template 'change_id' sudo nix flake update - let build_success = rebuild boot - if $build_success { + let build_status = rebuild boot + if $build_status { jj desc -r $r -m $"bump (date now | format date "%Y-%m-%d")" jj bookmark set main -r $r jj git push --allow-empty-description diff --git a/users/vy.nix b/users/vy.nix index 1b51781..0658936 100644 --- a/users/vy.nix +++ b/users/vy.nix @@ -8,29 +8,41 @@ pkgs-last-building = inputs.nixpkgs-last-building.legacyPackages.${pkgs.system}; in { users.users.vy.packages = - /* - (with pkgs-last-building; [ - oculante # https://nixpk.gs/pr-tracker.html?pr=502921 - ]) - ++ ( - */ - with pkgs; [ - audacity - cosmic-store - google-chrome - jellyfin-media-player - onlyoffice-desktopeditors - rnote - signal-desktop - signal-desktop - snapper - syncthingtray - toastify - yt-dlp - zoom-us - ]; + (with pkgs-last-building; [ + oculante # https://nixpk.gs/pr-tracker.html?pr=502921 + ]) +++ (with pkgs; [ + audacity + cosmic-store + google-chrome + jellyfin-media-player + onlyoffice-desktopeditors + rnote + signal-desktop + signal-desktop + snapper + syncthingtray + toastify + yt-dlp + zoom-us + ]); 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; services.snapper.configs = {