diff --git a/nixos/home/jahanson/workstation.nix b/nixos/home/jahanson/workstation.nix
index f459950..223d976 100644
--- a/nixos/home/jahanson/workstation.nix
+++ b/nixos/home/jahanson/workstation.nix
@@ -40,7 +40,6 @@ with config;
     packages = with pkgs;
       [
         #apps
-        (unstable.flameshot.override { enableWlrSupport = true; })
         obsidian
         parsec-bin
         solaar # open source manager for logitech unifying receivers
diff --git a/nixos/hosts/telchar/default.nix b/nixos/hosts/telchar/default.nix
index 665e8f2..db040dd 100644
--- a/nixos/hosts/telchar/default.nix
+++ b/nixos/hosts/telchar/default.nix
@@ -13,7 +13,7 @@
   networking.hostName = "telchar";
   boot = {
     initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usbhid" "usb_storage" "sd_mod" ];
-    initrd.kernelModules = [ ];
+    initrd.kernelModules = [ "amdgpu" ];
     kernelModules = [ "kvm-amd" ];
     extraModulePackages = [ ];
   };
@@ -62,7 +62,8 @@
       };
     };
 
-    security._1password.enable = true;
     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 5cf8372..22f6dcc 100644
--- a/nixos/modules/nixos/programs/default.nix
+++ b/nixos/modules/nixos/programs/default.nix
@@ -1,5 +1,6 @@
 {
   imports = [
+    ./flameshot
     ./shell
   ];
 }
diff --git a/nixos/modules/nixos/programs/flameshot/default.nix b/nixos/modules/nixos/programs/flameshot/default.nix
new file mode 100644
index 0000000..f445470
--- /dev/null
+++ b/nixos/modules/nixos/programs/flameshot/default.nix
@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./flameshot.nix
+  ];
+}
diff --git a/nixos/modules/nixos/programs/flameshot/flameshot.nix b/nixos/modules/nixos/programs/flameshot/flameshot.nix
new file mode 100644
index 0000000..3a40820
--- /dev/null
+++ b/nixos/modules/nixos/programs/flameshot/flameshot.nix
@@ -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
+    ];
+  };
+}
diff --git a/nixos/overlays/default.nix b/nixos/overlays/default.nix
index d663757..bdc8552 100644
--- a/nixos/overlays/default.nix
+++ b/nixos/overlays/default.nix
@@ -27,7 +27,7 @@ in
   nur = inputs.nur.overlay;
   smartmontools = smartmontoolsOverlay;
   termius = termiusOverlay;
-  vivaldi = vivaldiOverlay;
+  # vivaldi = vivaldiOverlay;
 
   # The unstable nixpkgs set (declared in the flake inputs) will
   # be accessible through 'pkgs.unstable'