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..c89c9a3 100644 --- a/flake.lock +++ b/flake.lock @@ -389,6 +389,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, @@ -495,6 +511,7 @@ "nixos-facter-modules": "nixos-facter-modules", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_5", + "nixpkgs-last-building": "nixpkgs-last-building", "nur": "nur", "zen-browser": "zen-browser" } diff --git a/flake.nix b/flake.nix index 4a7e4fd..674f1d5 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,7 @@ 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"; + nixpkgs-last-building.url = "github:NixOS/nixpkgs/59e69648d345d6e8fef86158c555730fa12af9de"; determinate.url = "https://flakehub.com/f/DeterminateSystems/determinate/0.1"; nur = { url = "github:nix-community/NUR"; @@ -45,7 +45,7 @@ nixos, self, nixpkgs, - # nixpkgs-last-building, + nixpkgs-last-building, nur, nixos-facter-modules, nixos-hardware, 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/users/tao.nix b/users/tao.nix index c61feff..a3cde88 100644 --- a/users/tao.nix +++ b/users/tao.nix @@ -5,24 +5,15 @@ 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; [ # keep-sorted start sticky_comments=no - # bitwarden-desktop # bottles # boxxy # carapace @@ -43,6 +34,7 @@ in { aspell aspellDicts.en bitwarden-cli + # bitwarden-desktop calibre darktable deluge @@ -96,7 +88,7 @@ in { zotero zoxide # keep-sorted end - ]; + ]); virtualisation.waydroid = { enable = true; package = pkgs.waydroid-nftables; 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/vy.nix b/users/vy.nix index 1b51781..ccdcf81 100644 --- a/users/vy.nix +++ b/users/vy.nix @@ -8,27 +8,24 @@ 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; services.flatpak.enable = true;