From 1918c984d546a63e3d4bdfc749adfa271313ba38 Mon Sep 17 00:00:00 2001 From: Joseph Hanson Date: Sun, 15 Sep 2024 20:27:54 -0500 Subject: [PATCH] removing flameshot -- can't get it to work on wayland --- nixos/hosts/telchar/default.nix | 1 - nixos/modules/nixos/programs/default.nix | 1 - .../nixos/programs/flameshot/default.nix | 5 ----- .../nixos/programs/flameshot/flameshot.nix | 22 ------------------- 4 files changed, 29 deletions(-) delete mode 100644 nixos/modules/nixos/programs/flameshot/default.nix delete mode 100644 nixos/modules/nixos/programs/flameshot/flameshot.nix diff --git a/nixos/hosts/telchar/default.nix b/nixos/hosts/telchar/default.nix index db040dd..f42afd3 100644 --- a/nixos/hosts/telchar/default.nix +++ b/nixos/hosts/telchar/default.nix @@ -63,7 +63,6 @@ }; framework_wifi_swap.enable = true; - programs.flameshot.enable = true; security._1password.enable = true; }; } diff --git a/nixos/modules/nixos/programs/default.nix b/nixos/modules/nixos/programs/default.nix index 22f6dcc..5cf8372 100644 --- a/nixos/modules/nixos/programs/default.nix +++ b/nixos/modules/nixos/programs/default.nix @@ -1,6 +1,5 @@ { imports = [ - ./flameshot ./shell ]; } diff --git a/nixos/modules/nixos/programs/flameshot/default.nix b/nixos/modules/nixos/programs/flameshot/default.nix deleted file mode 100644 index f445470..0000000 --- a/nixos/modules/nixos/programs/flameshot/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - imports = [ - ./flameshot.nix - ]; -} diff --git a/nixos/modules/nixos/programs/flameshot/flameshot.nix b/nixos/modules/nixos/programs/flameshot/flameshot.nix deleted file mode 100644 index 3a40820..0000000 --- a/nixos/modules/nixos/programs/flameshot/flameshot.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ 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 - ]; - }; -}