From b237a2135952e4f97177a59e197a7c10233b84e2 Mon Sep 17 00:00:00 2001 From: Patrick Date: Wed, 27 Sep 2023 20:49:09 +0200 Subject: [PATCH] feat: added images --- flake.lock | 12 ++--- img/mic.png.age | Bin 0 -> 7881 bytes img/qr.png.age | Bin 0 -> 5245 bytes modules/graphical/default.nix | 1 + modules/graphical/images.nix | 65 +++++++++++++++++++++++++++ modules/optional/secureboot.nix | 7 +-- users/common/graphical/Xorg/i3.nix | 13 ++++-- users/common/programs/streamdeck.nix | 13 ++---- users/patrick/default.nix | 7 ++- users/patrick/patrick.nix | 1 + 10 files changed, 95 insertions(+), 24 deletions(-) create mode 100644 img/mic.png.age create mode 100644 img/qr.png.age create mode 100644 modules/graphical/images.nix diff --git a/flake.lock b/flake.lock index b27b635..7e47b55 100644 --- a/flake.lock +++ b/flake.lock @@ -36,12 +36,12 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1695588239, - "narHash": "sha256-FMeJBXADlrWqJlBCEkfsOz4b2yzjMUwAD0zYGkLhAXQ=", - "owner": "oddlama", - "repo": "agenix-rekey", - "rev": "e33d9479671a9e253790c8b2b09bbe3072ecf289", - "type": "github" + "dirtyRev": "da8fc11d2e83a7cdba24cfd43ca39bf866d0e56a-dirty", + "dirtyShortRev": "da8fc11-dirty", + "lastModified": 1695737316, + "narHash": "sha256-WAZMw/HqNqaCRCx/DDPWzITDIV8ui9c3PaiTzxYPoTE=", + "type": "git", + "url": "file:///home/patrick/repos/nix/agenix-rekey" }, "original": { "owner": "oddlama", diff --git a/img/mic.png.age b/img/mic.png.age new file mode 100644 index 0000000000000000000000000000000000000000..10756729c84ae654880862e09c7818d496aec27c GIT binary patch literal 7881 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 Dq>tLv literal 0 HcmV?d00001 diff --git a/modules/graphical/default.nix b/modules/graphical/default.nix index 05fd1ee..713b2d1 100644 --- a/modules/graphical/default.nix +++ b/modules/graphical/default.nix @@ -7,6 +7,7 @@ imports = [ inputs.stylix.nixosModules.stylix ./fonts.nix + ./images.nix ]; stylix = { diff --git a/modules/graphical/images.nix b/modules/graphical/images.nix new file mode 100644 index 0000000..d530246 --- /dev/null +++ b/modules/graphical/images.nix @@ -0,0 +1,65 @@ +{ + lib, + config, + ... +}: let + inherit + (lib) + mkEnableOption + mkMerge + attrNames + flip + filterAttrs + mkIf + mkOption + types + removeSuffix + hasPrefix + mapAttrs' + listToAttrs + ; +in { + home-manager.sharedModules = [ + { + options.images = { + enable = mkEnableOption "Enable images"; + images = mkOption { + type = types.attrsOf types.path; + readOnly = true; + default = flip mapAttrs' (filterAttrs (n: _: hasPrefix "images-" n) config.age.secrets) ( + name: value: { + inherit (value) name; + value = value.path; + } + ); + }; + }; + } + ]; + + imports = [ + { + age.secrets = mkMerge ( + flip map + (attrNames config.home-manager.users) + ( + user: + mkIf config.home-manager.users.${user}.images.enable ( + listToAttrs (flip map (attrNames (filterAttrs (_: type: type == "regular") (builtins.readDir ../../img))) + ( + file: { + name = "images-${user}-${file}"; + value = { + name = removeSuffix ".age" file; + rekeyFile = ../../img/${file}; + owner = user; + group = user; + }; + } + )) + ) + ) + ); + } + ]; +} diff --git a/modules/optional/secureboot.nix b/modules/optional/secureboot.nix index ce3e4a6..088eb1a 100644 --- a/modules/optional/secureboot.nix +++ b/modules/optional/secureboot.nix @@ -16,9 +16,10 @@ lib.optionalAttrs (!minimal) { age.secrets.secureboot.rekeyFile = ../../hosts/${config.node.name}/secrets/secureboot.tar.age; system.activationScripts.securebootuntar = { text = '' - rm -r /run/secureboot || true - mkdir -p /run/secureboot - ${pkgs.gnutar}/bin/tar xf ${config.age.secrets.secureboot.path} -C /run/secureboot || true + rm -r /run/secureboot || true + mkdir -p /run/secureboot + chmod 700 /run/secureboot + ${pkgs.gnutar}/bin/tar xf ${config.age.secrets.secureboot.path} -C /run/secureboot || true ''; deps = ["agenix"]; }; diff --git a/users/common/graphical/Xorg/i3.nix b/users/common/graphical/Xorg/i3.nix index a6579cb..270b00d 100644 --- a/users/common/graphical/Xorg/i3.nix +++ b/users/common/graphical/Xorg/i3.nix @@ -31,7 +31,12 @@ ${maim} | ${pkgs.xclip}/bin/xclip -selection clipboard -t image/png '' ); - "${cfg.modifier}+F10" = + "${cfg.modifier}+F10" = let + nsend = '' ${pkgs.libnotify}/bin/notify-send \ + -h string:category:Screenshot\ + -h string:image-path:"${config.images.images."qr.png"}" \ + ''; + in "exec " + toString ( pkgs.writeShellScript "clipboard-qr-screenshot" '' @@ -43,15 +48,15 @@ fi case "$return" in "0") - ${pkgs.libnotify}/bin/notify-send -h string:category:"Screenshot" "Copied qr to clipboard" + ${nsend} "Copied qr to clipboard" ${pkgs.xclip}/bin/xclip -selection clipboard -f <<< ''${qr%"''${qr##*[![:space:]]}"} exit 0 ;; "4") - ${pkgs.libnotify}/bin/notify-send -h string:category:"Screenshot" "No qr found" + ${nsend} "No qr found" ;; *) - ${pkgs.libnotify}/bin/notify-send -h string:category:"Screenshot" "Failure scanning qr" + ${nsend} "Failure scanning qr" ;; esac '' diff --git a/users/common/programs/streamdeck.nix b/users/common/programs/streamdeck.nix index 10a8c00..89d7993 100644 --- a/users/common/programs/streamdeck.nix +++ b/users/common/programs/streamdeck.nix @@ -1,4 +1,4 @@ -{ +{config, ...}: { programs.streamdeck-ui = { enable = true; settings = { @@ -12,7 +12,8 @@ # keyInput to press keys = "F7"; # Text shown on button - text = "mute"; + #text = "mute"; + icon = config.images.images."mic.png"; # Text position text_vertical_align = "middle-bottom"; }; @@ -21,14 +22,6 @@ text = "deafen"; text_vertical_align = "middle-bottom"; }; - "7" = { - # background picture - icon = "/home/patrick/ms.jpg"; - # command to execute on press - command = "echo lol"; - # background fill colour - background_color = "#000000"; - }; }; }; brightness = 99; # brighness value between 0 and 99 diff --git a/users/patrick/default.nix b/users/patrick/default.nix index f805f37..7ba8e73 100644 --- a/users/patrick/default.nix +++ b/users/patrick/default.nix @@ -33,7 +33,12 @@ lib.optionalAttrs (!minimal) { # xournalpp needs this or else it will crash gnome3.adwaita-icon-theme ]; - age.secrets.smb-creds.rekeyFile = ../../secrets/smb.cred.age; + age.secrets = { + smb-creds = { + owner = "patrick"; + rekeyFile = ../../secrets/smb.cred.age; + }; + }; programs.dconf.enable = true; home-manager.users.patrick = { diff --git a/users/patrick/patrick.nix b/users/patrick/patrick.nix index 6b13d7a..ea82067 100644 --- a/users/patrick/patrick.nix +++ b/users/patrick/patrick.nix @@ -1,4 +1,5 @@ {pkgs, ...}: { + images.enable = true; home = { packages = with pkgs; [ nextcloud-client