flameshot fix and remove vivaldi overlay

This commit is contained in:
Joseph Hanson 2024-09-15 20:05:52 -05:00
parent bfb6a8aef6
commit ff63e8b393
Signed by: jahanson
SSH key fingerprint: SHA256:vy6dKBECV522aPAwklFM3ReKAVB086rT3oWwiuiFG7o
6 changed files with 32 additions and 4 deletions

View file

@ -40,7 +40,6 @@ with config;
packages = with pkgs; packages = with pkgs;
[ [
#apps #apps
(unstable.flameshot.override { enableWlrSupport = true; })
obsidian obsidian
parsec-bin parsec-bin
solaar # open source manager for logitech unifying receivers solaar # open source manager for logitech unifying receivers

View file

@ -13,7 +13,7 @@
networking.hostName = "telchar"; networking.hostName = "telchar";
boot = { boot = {
initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usbhid" "usb_storage" "sd_mod" ]; initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usbhid" "usb_storage" "sd_mod" ];
initrd.kernelModules = [ ]; initrd.kernelModules = [ "amdgpu" ];
kernelModules = [ "kvm-amd" ]; kernelModules = [ "kvm-amd" ];
extraModulePackages = [ ]; extraModulePackages = [ ];
}; };
@ -62,7 +62,8 @@
}; };
}; };
security._1password.enable = true;
framework_wifi_swap.enable = true; framework_wifi_swap.enable = true;
programs.flameshot.enable = true;
security._1password.enable = true;
}; };
} }

View file

@ -1,5 +1,6 @@
{ {
imports = [ imports = [
./flameshot
./shell ./shell
]; ];
} }

View file

@ -0,0 +1,5 @@
{
imports = [
./flameshot.nix
];
}

View file

@ -0,0 +1,22 @@
{ config, lib, pkgs, ... }:
let
cfg = config.mySystem.programs.flameshot;
in
{
options.mySystem.programs.flameshot = {
enable = lib.mkEnableOption "flameshot";
};
config = lib.mkIf cfg.enable {
environment.sessionVariables = {
XDG_SESSION_TYPE = "wayland";
QT_QPA_PLATFORM = "wayland";
};
environment.systemPackages = with pkgs; [
(unstable.flameshot.override { enableWlrSupport = true; })
xdg-desktop-portal
xdg-desktop-portal-gnome
];
};
}

View file

@ -27,7 +27,7 @@ in
nur = inputs.nur.overlay; nur = inputs.nur.overlay;
smartmontools = smartmontoolsOverlay; smartmontools = smartmontoolsOverlay;
termius = termiusOverlay; termius = termiusOverlay;
vivaldi = vivaldiOverlay; # vivaldi = vivaldiOverlay;
# The unstable nixpkgs set (declared in the flake inputs) will # The unstable nixpkgs set (declared in the flake inputs) will
# be accessible through 'pkgs.unstable' # be accessible through 'pkgs.unstable'