From 342673154dc98816253452b0718dbe989d751ca3 Mon Sep 17 00:00:00 2001 From: Tao Tien <29749622+taotien@users.noreply.github.com> Date: Sat, 20 Apr 2024 18:47:52 -0700 Subject: [PATCH] bump --- extras/gaming.nix | 17 +++++++++++++---- flake.lock | 36 ++++++++++++++++++------------------ systems/NOlaptop.nix | 24 ++++++++++++------------ users/tao.nix | 2 +- users/tao/nushell/stuff.nu | 10 ++++++++-- 5 files changed, 52 insertions(+), 37 deletions(-) diff --git a/extras/gaming.nix b/extras/gaming.nix index 0b190bd..8bc5003 100644 --- a/extras/gaming.nix +++ b/extras/gaming.nix @@ -1,4 +1,13 @@ -{pkgs, ...}: { +{ + pkgs, + lib, + ... +}: let + if_desktop = + if lib.strings.hasPrefix "NOcomputer" (builtins.readFile /etc/hostname) + then true + else false; +in { # aagl.url = "github:ezKEa/aagl-gtk-on-nix"; # aagl.inputs.nixpkgs.follows = "nixpkgs"; @@ -43,9 +52,9 @@ ]; # THE FINALS audio borked - # services.pipewire.enable = false; - # hardware.pulseaudio.enable = true; - # hardware.pulseaudio.support32Bit = true; + services.pipewire.enable = !if_desktop; + hardware.pulseaudio.enable = if_desktop; + hardware.pulseaudio.support32Bit = if_desktop; services.pipewire.extraConfig = { pipewire."99-low-latency" = { context.properties = { diff --git a/flake.lock b/flake.lock index 2bdd496..0a05e42 100644 --- a/flake.lock +++ b/flake.lock @@ -145,11 +145,11 @@ ] }, "locked": { - "lastModified": 1713479476, - "narHash": "sha256-kTww3Hd+R95AB6J+Y1zvXrhUScgMzf0vV5hN6+wFPXE=", + "lastModified": 1713566308, + "narHash": "sha256-7Y91t8pheIzjJveUMAPyeh5NOq5F49Nq4Hl2532QpJs=", "owner": "nix-community", "repo": "home-manager", - "rev": "ffc3600f4009ca39b6cb63b24127ca4f93792854", + "rev": "057117a401a34259c9615ce62218aea7afdee4d3", "type": "github" }, "original": { @@ -189,11 +189,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1713499612, - "narHash": "sha256-IpvUlRDZkBXstPGwB1HDQWHwsUCUGybViAqD6G6siLc=", + "lastModified": 1713647546, + "narHash": "sha256-oiLxCGkICL2LXHZV6hhm3858JC/+6oANV5guVaRM6Wg=", "owner": "martinvonz", "repo": "jj", - "rev": "449fc423b864e5b83043b93f80114a793b05a9f2", + "rev": "77eaf67f96c6ea438e2dd1a5636f34b6a321e6be", "type": "github" }, "original": { @@ -210,11 +210,11 @@ ] }, "locked": { - "lastModified": 1713505400, - "narHash": "sha256-TsDy77lqN18hIWWeXbfHmdgyJS5U2Kx1t7iwVnLuJLc=", + "lastModified": 1713622239, + "narHash": "sha256-iDJSzi//RKkVwJ/VaQA04qkP0riC9WMdhfGBfL87H3E=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "19e47d2c132cd733f80fa6adc37011a01811447f", + "rev": "23289df6d107b9e7610980977eff5316dbad9ecb", "type": "github" }, "original": { @@ -225,11 +225,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1713441075, - "narHash": "sha256-3GGeFsEO8ivD+TcDEqe4s/d0VLvMYGNDGtx0ZnBxkUs=", + "lastModified": 1713521961, + "narHash": "sha256-EwR8wW9AqJhSIY+0oxWRybUZ32BVKuZ9bjlRh8SJvQ8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "6f976e53752e5b9ab08f9a3b1b0b9c67815c9754", + "rev": "5d48925b815fd202781bfae8fb6f45c07112fdb2", "type": "github" }, "original": { @@ -255,11 +255,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1713297878, - "narHash": "sha256-hOkzkhLT59wR8VaMbh1ESjtZLbGi+XNaBN6h49SPqEc=", + "lastModified": 1713537308, + "narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "66adc1e47f8784803f2deb6cacd5e07264ec2d5c", + "rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f", "type": "github" }, "original": { @@ -276,11 +276,11 @@ ] }, "locked": { - "lastModified": 1713460214, - "narHash": "sha256-WvX42uScdEN5yDJ13ZWQczYyUpPawgvt4JHvAaK5c44=", + "lastModified": 1713552700, + "narHash": "sha256-R2+GRjHFEapDa08FnuJjweAiE+5W7VKnBxNo3tC/Yzo=", "owner": "pjones", "repo": "plasma-manager", - "rev": "ef0c106a2104f841a54fe4b9ec60a79775e2fe1e", + "rev": "bd743369ef402d269885225af93064f22b640990", "type": "github" }, "original": { diff --git a/systems/NOlaptop.nix b/systems/NOlaptop.nix index ba35bd0..73c4a05 100644 --- a/systems/NOlaptop.nix +++ b/systems/NOlaptop.nix @@ -7,17 +7,17 @@ enable = true; algorithm = "zstd"; }; - nixpkgs.overlays = [ - (final: prev: { - libinput = prev.libinput.overrideAttrs (old: { - patches = - (old.patches or []) - ++ [ - ../extras/libinput-delay.patch - ]; - }); - }) - ]; + # nixpkgs.overlays = [ + # (final: prev: { + # libinput = prev.libinput.overrideAttrs (old: { + # patches = + # (old.patches or []) + # ++ [ + # ../extras/libinput-delay.patch + # ]; + # }); + # }) + # ]; environment.systemPackages = with pkgs; [ # fw-ectool @@ -28,7 +28,7 @@ nix.buildMachines = [ { hostName = "nocomputer"; - systems = ["x86_64-linux"]; + systems = ["x86_64-linux" "i686-linux"]; supportedFeatures = ["big-parallel"]; } ]; diff --git a/users/tao.nix b/users/tao.nix index ded14d6..9633215 100644 --- a/users/tao.nix +++ b/users/tao.nix @@ -21,7 +21,7 @@ aspellDicts.en bottles boxxy - calibre + # calibre darktable deluge discord diff --git a/users/tao/nushell/stuff.nu b/users/tao/nushell/stuff.nu index 54cb6d0..e3e57ea 100644 --- a/users/tao/nushell/stuff.nu +++ b/users/tao/nushell/stuff.nu @@ -1,12 +1,18 @@ source ~/.cache/starship/init.nu source ~/.zoxide.nu + def bump [] { cd /home/tao/projects/NOflake/; jj new -m "bump"; nix flake update; - rc2nix | save -f /home/tao/projects/NOflake/users/tao/plasma.nix; - sudo nixos-rebuild --flake /home/tao/projects/NOflake/ boot --impure --verbose; + # rc2nix | save -f /home/tao/projects/NOflake/users/tao/plasma.nix; + sudo nixos-rebuild boot --flake /home/tao/projects/NOflake/ --impure --verbose; }; + +def tse [exit_node] { + tailscale set --exit-node="$exit_node" +} + alias b = btm; alias cringe = sudo bootctl set-oneshot auto-windows alias fetch = neofetch