From 24c8bf45874f1788067c6edf2f88a78095065b6a Mon Sep 17 00:00:00 2001 From: Paul-Henri Froidmont Date: Tue, 28 Mar 2023 18:35:58 +0200 Subject: [PATCH] Add flameshot --- hosts/froidmpa-laptop/default.nix | 1 + hosts/nixos-desktop/default.nix | 1 + modules/desktop/flameshot.nix | 26 ++++++++++++++++++++ modules/desktop/picom.nix | 1 + modules/desktop/xmonad/scripts/screenshot.sh | 3 --- modules/desktop/xmonad/xmonad.hs | 2 +- modules/desktop/xmonad/xmonad.nix | 7 ------ 7 files changed, 30 insertions(+), 11 deletions(-) create mode 100644 modules/desktop/flameshot.nix delete mode 100755 modules/desktop/xmonad/scripts/screenshot.sh diff --git a/hosts/froidmpa-laptop/default.nix b/hosts/froidmpa-laptop/default.nix index a3645bb..7c20623 100644 --- a/hosts/froidmpa-laptop/default.nix +++ b/hosts/froidmpa-laptop/default.nix @@ -10,6 +10,7 @@ vscode.enable = true; dunst.enable = true; htop.enable = true; + flameshot.enable = true; }; editor = { vim.enable = true; diff --git a/hosts/nixos-desktop/default.nix b/hosts/nixos-desktop/default.nix index 7bcee70..d09b9c9 100644 --- a/hosts/nixos-desktop/default.nix +++ b/hosts/nixos-desktop/default.nix @@ -10,6 +10,7 @@ vscode.enable = true; dunst.enable = true; htop.enable = true; + flameshot.enable = true; }; editor = { vim.enable = true; diff --git a/modules/desktop/flameshot.nix b/modules/desktop/flameshot.nix new file mode 100644 index 0000000..611a602 --- /dev/null +++ b/modules/desktop/flameshot.nix @@ -0,0 +1,26 @@ +{ config, lib, pkgs, ... }: + +with lib; +with lib.my; +let cfg = config.modules.desktop.flameshot; +in { + options.modules.desktop.flameshot = { enable = mkBoolOpt false; }; + config = mkIf cfg.enable { + home-manager.users.${config.user.name} = { config, ... }: { + services.flameshot = { + enable = true; + settings = { + General = { + showStartupLaunchMessage = false; + showHelp = false; + showDesktopNotification = false; + filenamePattern = "%F_%T"; + savePath = "${config.home.homeDirectory}/Pictures/Screenshots"; + saveAfterCopy = true; + uiColor = "#83A598"; + }; + }; + }; + }; + }; +} diff --git a/modules/desktop/picom.nix b/modules/desktop/picom.nix index 68d594d..c254e7b 100644 --- a/modules/desktop/picom.nix +++ b/modules/desktop/picom.nix @@ -9,6 +9,7 @@ in { config = mkIf cfg.enable { home-manager.users.${config.user.name} = { services.picom = { + enable = true; backend = "glx"; vSync = true; opacityRules = [ diff --git a/modules/desktop/xmonad/scripts/screenshot.sh b/modules/desktop/xmonad/scripts/screenshot.sh deleted file mode 100755 index 04e44de..0000000 --- a/modules/desktop/xmonad/scripts/screenshot.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -sleep 0.2; scrot -s -e 'mv $f ~/Pictures/Screenshots' diff --git a/modules/desktop/xmonad/xmonad.hs b/modules/desktop/xmonad/xmonad.hs index 88b9c05..41c3054 100644 --- a/modules/desktop/xmonad/xmonad.hs +++ b/modules/desktop/xmonad/xmonad.hs @@ -93,7 +93,7 @@ myAdditionalKeys = [ ("M-n", spawn $ myTerminal ++ " -e newsboat"), ("M-c", spawn "rofi -show calc -modi calc -no-show-match -no-sort"), ("", spawn "scrot -e 'mv $f ~/Pictures/Screenshots'"), - ("S-", spawn "~/.xmonad/scripts/screenshot.sh"), + ("S-", spawn "flameshot gui"), ("M-S-a", spawn $ myTerminal ++ " -e pulsemixer"), ("M-S-p", spawn "rofi -show p -modi p:rofi-power-menu"), ("M-", spawn myTerminal), diff --git a/modules/desktop/xmonad/xmonad.nix b/modules/desktop/xmonad/xmonad.nix index 4f07145..be092af 100644 --- a/modules/desktop/xmonad/xmonad.nix +++ b/modules/desktop/xmonad/xmonad.nix @@ -53,14 +53,7 @@ in { }; }; - services.picom.enable = true; - home = { - file.".xmonad/scripts" = { - source = ./scripts; - recursive = true; - }; - packages = with pkgs.unstable; [ i3lock