dot
vizie's NixOS desktop: Hyprland, CachyOS kernel and gaming tweaks
b7c0f64
4 files changed +35 −5
modifiedflake.lock
@@ -147,6 +147,22 @@ | ||
| 147 | 147 | "type": "github" |
| 148 | 148 | } |
| 149 | 149 | }, |
| 150 | + "nixpkgs-signal": | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | +, | |
| 150 | 166 | "nixpkgs_2": |
| 151 | 167 | |
| 152 | 168 | |
@@ -191,6 +207,7 @@ | ||
| 191 | 207 | "imsh-clients": "imsh-clients", |
| 192 | 208 | "nix-cachyos-kernel": "nix-cachyos-kernel", |
| 193 | 209 | "nixpkgs": "nixpkgs_2", |
| 210 | + "nixpkgs-signal": "nixpkgs-signal", | |
| 194 | 211 | "philly": "philly" |
| 195 | 212 | } |
| 196 | 213 | } |
modifiedflake.nix
@@ -4,6 +4,11 @@ | ||
| 4 | 4 | inputs = { |
| 5 | 5 | nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; |
| 6 | 6 | |
| 7 | + # Signal 8.31.0, from a master commit (already in cache.nixos.org). CachyOS | |
| 8 | + # ran 8.31.0, and Signal won't open a database a newer version has written. | |
| 9 | + # Only used while nixos-unstable's Signal is older (pkgs/default.nix). | |
| 10 | + nixpkgs-signal.url = "github:NixOS/nixpkgs/70ae5c224b56eaeadf74327811fd59b1470defbe"; | |
| 11 | + | |
| 7 | 12 | home-manager = { |
| 8 | 13 | url = "github:nix-community/home-manager"; |
| 9 | 14 | inputs.nixpkgs.follows = "nixpkgs"; |
@@ -43,7 +48,7 @@ | ||
| 43 | 48 | }; |
| 44 | 49 | in |
| 45 | 50 | { |
| 46 | - overlays.default = import ./pkgs; | |
| 51 | + overlays.default = import ./pkgs inputs; | |
| 47 | 52 | |
| 48 | 53 | # The packages this repo adds or patches, so each can be built on its own: |
| 49 | 54 | # nix build .#waybar |
modifiedmodules/nixos/base.nix
@@ -7,7 +7,7 @@ | ||
| 7 | 7 | { |
| 8 | 8 | nixpkgs = { |
| 9 | 9 | config.allowUnfree = true; |
| 10 | - overlays = [ (import ../../pkgs) ]; | |
| 10 | + overlays = [ (import ../../pkgs inputs) ]; | |
| 11 | 11 | }; |
| 12 | 12 | |
| 13 | 13 | nix = { |
modifiedpkgs/default.nix
@@ -1,6 +1,6 @@ | ||
| 1 | 1 | # Packages this config adds to nixpkgs or patches. Used as an overlay, so the |
| 2 | -# patched waybar replaces the stock one everywhere. | |
| 3 | -final: prev: { | |
| 2 | +# patched waybar replaces the stock one everywhere. Takes the flake's inputs first. | |
| 3 | +inputs: final: prev: { | |
| 4 | 4 | # Same three patches as the Arch PKGBUILD in the old dotfiles repo; see the |
| 5 | 5 | # comments at the top of each patch. |
| 6 | 6 | waybar = prev.waybar.overrideAttrs (old: { |
@@ -12,7 +12,15 @@ | ||
| 12 | 12 | }); |
| 13 | 13 | |
| 14 | 14 | xembedsniproxy = final.callPackage ./xembedsniproxy { }; |
| 15 | - signal-desktop-themed = final.callPackage ./signal-desktop-themed { }; | |
| 15 | + # Signal from the nixpkgs-signal input until nixos-unstable has 8.31.0 too; | |
| 16 | + # then the input and this choice can go. | |
| 17 | + signal-desktop-themed = final.callPackage ./signal-desktop-themed { | |
| 18 | + signal-desktop = | |
| 19 | + if final.lib.versionAtLeast prev.signal-desktop.version "8.31.0" then | |
| 20 | + prev.signal-desktop | |
| 21 | + else | |
| 22 | + inputs.nixpkgs-signal.legacyPackages..signal-desktop; | |
| 23 | + }; | |
| 16 | 24 | claude-desktop = final.callPackage ./claude-desktop { }; |
| 17 | 25 | opendeck = final.callPackage ./opendeck { }; |
| 18 | 26 | breezex-cursor = final.callPackage ./breezex-cursor { }; |