overlays,gui: all pr's merged \o/

This commit is contained in:
Aaron Bieber 2023-06-04 07:03:38 -06:00
parent 2f4479fdc2
commit bd520aff6f
No known key found for this signature in database
2 changed files with 2 additions and 6 deletions

View File

@ -24,9 +24,6 @@ let
startAt = "*:0/5"; startAt = "*:0/5";
path = [ promnesia hpi ]; path = [ promnesia hpi ];
}]; }];
tailscale-systray = xinlib.prIsOpen.pkg 219502
(pkgs.callPackage ../pkgs/tailscale-systray.nix { })
pkgs."tailscale-systray";
in with lib; { in with lib; {
imports = [ ./gnome.nix ./kde.nix ./xfce.nix ./arcan.nix ]; imports = [ ./gnome.nix ./kde.nix ./xfce.nix ./arcan.nix ];
@ -81,7 +78,6 @@ in with lib; {
(callPackage ../pkgs/govulncheck.nix { }) (callPackage ../pkgs/govulncheck.nix { })
(callPackage ../configs/helix.nix { }) (callPackage ../configs/helix.nix { })
tailscale-systray
]); ]);
programs = { } // firefox.programs; programs = { } // firefox.programs;

View File

@ -2,13 +2,13 @@
let let
inherit (xinlib) prIsOpen; inherit (xinlib) prIsOpen;
#openssh = import ./openssh.nix; #openssh = import ./openssh.nix;
obsidian = prIsOpen.overlay 235408 (import ./obsidian.nix); #obsidian = prIsOpen.overlay 235408 (import ./obsidian.nix);
#tailscale = import ./tailscale.nix; #tailscale = import ./tailscale.nix;
#jetbrains = prIsOpen 232308 (import ./jetbrains.nix); #jetbrains = prIsOpen 232308 (import ./jetbrains.nix);
#tidal-hifi = prIsOpen 228552 (import ./tidal-hifi.nix { inherit lib; }); #tidal-hifi = prIsOpen 228552 (import ./tidal-hifi.nix { inherit lib; });
#matrix-synapse = prIsOpen 233652 (import ./matrix-synapse.nix); #matrix-synapse = prIsOpen 233652 (import ./matrix-synapse.nix);
in { in {
nixpkgs.overlays = if isUnstable then [ obsidian ] else [ ]; nixpkgs.overlays = if isUnstable then [ ] else [ ];
} }
# Example Python dep overlay # Example Python dep overlay