diff --git a/flake.lock b/flake.lock index 29d45df..95c0c5a 100644 --- a/flake.lock +++ b/flake.lock @@ -128,11 +128,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1757019746, - "narHash": "sha256-C1JdR4w+1FKaW1mKDfYzmV1xhGBklaRrHtLwWsCrAKo=", + "lastModified": 1757111114, + "narHash": "sha256-pf/XTuWIJWcEXb/hcZ30MV6Alpnz8iP9dF4v1YBFqMI=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "8a2ab8ff210ab2c7f8d281ddfbc7316f8dcb9145", + "rev": "e4c3a56242c3e70366bdd8013537a8fed8f7a147", "type": "github" }, "original": { @@ -231,11 +231,11 @@ ] }, "locked": { - "lastModified": 1756801442, - "narHash": "sha256-uNaSFIlyJRsvcMNoN7gxkhr7V6gORtQVUEfFQnwTdWQ=", + "lastModified": 1757153783, + "narHash": "sha256-HtnGRQX7BCze1eNlcc5ejAMExPk4DSqBPh6j2Byov7E=", "owner": "nix-community", "repo": "nh", - "rev": "f3095b9f00092717a694f39a2723fb04e3f575e0", + "rev": "036c141e2f14fb481f12c4d1498bc5d03d9e1865", "type": "github" }, "original": { @@ -279,15 +279,15 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 315532800, - "narHash": "sha256-1Ayx5AcA9t6riKWsuwLNI8x9SvLXKDOeBcfY4kZb0Zs=", - "rev": "aaff8c16d7fc04991cac6245bee1baa31f72b1e1", + "lastModified": 1756875158, + "narHash": "sha256-nDWEPoSmjN0P/NG9XntBijws0vwxnbeq+pKBLJGC0sA=", + "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1", "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre855444.aaff8c16d7fc/nixexprs.tar.xz?rev=aaff8c16d7fc04991cac6245bee1baa31f72b1e1" + "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre855242.d0fc30899600/nixexprs.tar.xz?rev=d0fc30899600b9b3466ddb260fd83deb486c32f1" }, "original": { "type": "tarball", - "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz" + "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" } }, "nixpkgs_3": { @@ -532,11 +532,11 @@ ] }, "locked": { - "lastModified": 1756999202, - "narHash": "sha256-AiJDRmIt2DuMk2IlBPnMG52ghUI9+D1nO7JRBF2vnZ0=", + "lastModified": 1757142986, + "narHash": "sha256-HB01usaR5wg5LK3lV6S7Za2x4AfKrNceOnun/mlpChk=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "369fbe5c53420b1a17295c5e85ea0dbe02fbcfbd", + "rev": "ed4bfefc49ef23e55b4f6e39d2e297a79f5ab2df", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 74a8e1b..3e9607f 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ inputs = { # Unstable nixpkgs, using the new Lockable HTTP Tarball protocol # https://github.com/NixOS/infra/pull/562. - nixpkgs.url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"; + nixpkgs.url = "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"; impermanence.url = "github:nix-community/impermanence"; diff --git a/hosts/hermit/programs.nix b/hosts/hermit/programs.nix index 268228f..d8c6d83 100644 --- a/hosts/hermit/programs.nix +++ b/hosts/hermit/programs.nix @@ -42,9 +42,6 @@ mprocs mpv networkmanagerapplet - nitch - obsidian - microfetch nmap pamixer pwvucontrol diff --git a/hosts/temperance/programs.nix b/hosts/temperance/programs.nix index 17e57ba..db4fe53 100644 --- a/hosts/temperance/programs.nix +++ b/hosts/temperance/programs.nix @@ -40,7 +40,6 @@ mpv nautilus nicotine-plus - obsidian oculante pandoc pavucontrol @@ -75,7 +74,6 @@ unzip zip util-linux - zed-editor ; }; } diff --git a/modules/packages/packages.mod.nix b/modules/packages/packages.mod.nix index 0754bcc..1c72936 100644 --- a/modules/packages/packages.mod.nix +++ b/modules/packages/packages.mod.nix @@ -16,25 +16,25 @@ in defaultPackages = [ ]; systemPackages = (with pkgs; [ + (lib.hiPrio pkgs.uutils-coreutils-noprefix) asciinema atuin bat bvi cachix calc + comma cpufetch curlie delta diff-so-fancy difftastic - difftastic dig direnv dust element entr eza - eza fd ffmpeg-full figlet @@ -49,23 +49,23 @@ in iamb imagemagick inetutils - inetutils jq just kondo lazygit linuxHeaders microfetch - microfetch - mprocs mprocs neofetch - nmap + nixfmt nmap ouch procs pv - ripgrep + python3 + radare2 + radicle-node + radicle-tui ripgrep rsync sd @@ -79,28 +79,18 @@ in timg tokei trash-cli + ty universal-android-debloater unzip util-linux + uv w3m watchman wget wireguard-tools yazi - zed-editor - zip zip zoxide - (lib.hiPrio pkgs.uutils-coreutils-noprefix) - zoxide - nixfmt - radare2 - uv - ty - python3 - comma - radicle-node - radicle-tui ]) ++ [ nil diff --git a/modules/programs/gui/zedless.mod.nix b/modules/programs/gui/zedless.mod.nix new file mode 100644 index 0000000..fe2c0b0 --- /dev/null +++ b/modules/programs/gui/zedless.mod.nix @@ -0,0 +1,19 @@ +{ + config, + inputs, + lib, + ... +}: +let + inherit (lib) getFlakePkg; + inherit (lib.lists) singleton; + inherit (lib.modules) mkIf; + + inherit (config.meta.system) isWorkstation; + zedless = (getFlakePkg inputs.zedless).overrideAttrs { + doCheck = false; + }; +in +{ + # environment.systemPackages = mkIf isWorkstation <| singleton zedless; +} diff --git a/modules/system/hardware/graphics.mod.nix b/modules/system/hardware/graphics.mod.nix index 797553a..0cd09c1 100644 --- a/modules/system/hardware/graphics.mod.nix +++ b/modules/system/hardware/graphics.mod.nix @@ -31,6 +31,7 @@ in nvidia = mkIf cfg.nvidia.enable { open = mkDefault true; + package = config.boot.kernelPackages.nvidiaPackages.beta; # Whether to enable kernel modesetting when using the NVIDIA proprietary driver. # Enabling this causes the proprietary NVIDIA driver to provide its own @@ -46,7 +47,12 @@ in enable = true; finegrained = false; }; - package = config.boot.kernelPackages.nvidiaPackages.beta; + + prime = { + offload.enable = true; + intelBusId = "PCI:0:2:0"; + nvidiaBusId = "PCI:1:0:0"; + }; }; }; services.xserver.videoDrivers = [