mirror of
https://codeberg.org/muon/home.git
synced 2025-12-06 08:07:45 +00:00
Add flameshot auth
This commit is contained in:
parent
162061ddd3
commit
6ed9e76165
7 changed files with 82 additions and 10 deletions
|
|
@ -10,3 +10,10 @@ creation_rules:
|
||||||
- *muon
|
- *muon
|
||||||
- *muho
|
- *muho
|
||||||
- *mups
|
- *mups
|
||||||
|
|
||||||
|
- path_regex: modules/home/sops/secrets.ya?ml$
|
||||||
|
key_groups:
|
||||||
|
- age:
|
||||||
|
- *muon
|
||||||
|
- *muho
|
||||||
|
- *mups
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@ in {
|
||||||
imports = [
|
imports = [
|
||||||
./terminal
|
./terminal
|
||||||
./desktop
|
./desktop
|
||||||
|
./sops
|
||||||
|
|
||||||
./xdg.nix
|
./xdg.nix
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,21 @@
|
||||||
{ pkgs, lib, config, osConfig, ... }: {
|
{ pkgs, lib, config, osConfig, ... }:
|
||||||
options.mods.i3.enable = lib.mkEnableOption "enables i3";
|
let
|
||||||
|
fsss = with pkgs;
|
||||||
|
writeShellApplication {
|
||||||
|
name = "fsss";
|
||||||
|
runtimeInputs = [ flameshot curl xsel ];
|
||||||
|
text = ''
|
||||||
|
flameshot gui -r -s > /tmp/ss.png;if [ ! -s /tmp/ss.png ]; then
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
AUTH=$(cat ${config.sops.secrets.zipline-auth.path})
|
||||||
|
curl -H "authorization: $AUTH" https://share.muon.host/api/upload -F file=@/tmp/ss.png -H "Content-Type: multipart/form-data" -H "Format: date" -H "Image-Compression-Percent: 90" -H "No-JSON: true" | tr -d '\n' | xsel -ib;
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
in with lib; {
|
||||||
|
options.mods.i3.enable = mkEnableOption "enables i3";
|
||||||
|
|
||||||
config = lib.mkIf config.mods.i3.enable {
|
config = mkIf config.mods.i3.enable {
|
||||||
services.unclutter.enable = true;
|
services.unclutter.enable = true;
|
||||||
programs.rofi.enable = true;
|
programs.rofi.enable = true;
|
||||||
|
|
||||||
|
|
@ -68,7 +82,7 @@
|
||||||
# -> keys: [string] -> values: [string]
|
# -> keys: [string] -> values: [string]
|
||||||
# -> keybindings: attrSet { string -> string }
|
# -> keybindings: attrSet { string -> string }
|
||||||
zipBinds = comb: action: keys: values:
|
zipBinds = comb: action: keys: values:
|
||||||
(builtins.listToAttrs (lib.zipListsWith (k: v: {
|
(builtins.listToAttrs (zipListsWith (k: v: {
|
||||||
name = "${modifier}${comb}${k}";
|
name = "${modifier}${comb}${k}";
|
||||||
value = "${action} ${v}";
|
value = "${action} ${v}";
|
||||||
}) keys values));
|
}) keys values));
|
||||||
|
|
@ -76,9 +90,9 @@
|
||||||
moveKeys = [ "h" "j" "k" "l" ];
|
moveKeys = [ "h" "j" "k" "l" ];
|
||||||
moveDirs = [ "left" "down" "up" "right" ];
|
moveDirs = [ "left" "down" "up" "right" ];
|
||||||
|
|
||||||
workspKeys = genSpaces (x: lib.mod (x + 1) wsAmount);
|
workspKeys = genSpaces (x: mod (x + 1) wsAmount);
|
||||||
|
|
||||||
in lib.mkOptionDefault ((zipBinds "+" "focus" moveKeys moveDirs)
|
in mkOptionDefault ((zipBinds "+" "focus" moveKeys moveDirs)
|
||||||
// (zipBinds "+Shift+" "move" moveKeys moveDirs)
|
// (zipBinds "+Shift+" "move" moveKeys moveDirs)
|
||||||
// (zipBinds "+" "workspace number" workspKeys workspaces)
|
// (zipBinds "+" "workspace number" workspKeys workspaces)
|
||||||
// (zipBinds "+Shift+" "move container to workspace number" workspKeys
|
// (zipBinds "+Shift+" "move container to workspace number" workspKeys
|
||||||
|
|
@ -87,6 +101,7 @@
|
||||||
"exec --no-startup-id pactl set-sink-volume 0 +2%";
|
"exec --no-startup-id pactl set-sink-volume 0 +2%";
|
||||||
"XF86AudioLowerVolume" =
|
"XF86AudioLowerVolume" =
|
||||||
"exec --no-startup-id pactl set-sink-volume 0 -2%";
|
"exec --no-startup-id pactl set-sink-volume 0 -2%";
|
||||||
|
"Print" = "exec ${getExe fsss}";
|
||||||
});
|
});
|
||||||
|
|
||||||
bars = let
|
bars = let
|
||||||
|
|
@ -96,7 +111,7 @@
|
||||||
mode = "dock";
|
mode = "dock";
|
||||||
hiddenState = "hide";
|
hiddenState = "hide";
|
||||||
position = "bottom";
|
position = "bottom";
|
||||||
statusCommand = "${lib.getExe pkgs.i3status-rust} ${status_conf}";
|
statusCommand = "${getExe pkgs.i3status-rust} ${status_conf}";
|
||||||
command = "${pkgs.i3}/bin/i3bar";
|
command = "${pkgs.i3}/bin/i3bar";
|
||||||
workspaceButtons = true;
|
workspaceButtons = true;
|
||||||
workspaceNumbers = true;
|
workspaceNumbers = true;
|
||||||
|
|
|
||||||
|
|
@ -38,7 +38,7 @@ in with lib; {
|
||||||
programs.zsh.sessionVariables.BROWSER = "librewolf";
|
programs.zsh.sessionVariables.BROWSER = "librewolf";
|
||||||
|
|
||||||
services.flameshot = {
|
services.flameshot = {
|
||||||
enable = true;
|
enable = false;
|
||||||
settings = {
|
settings = {
|
||||||
General = {
|
General = {
|
||||||
disabledTrayIcon = true;
|
disabledTrayIcon = true;
|
||||||
|
|
|
||||||
10
modules/home/sops/default.nix
Normal file
10
modules/home/sops/default.nix
Normal file
|
|
@ -0,0 +1,10 @@
|
||||||
|
{ pkgs, lib, config, inputs, system, ... }:
|
||||||
|
let cfg = config.mods;
|
||||||
|
in with lib; {
|
||||||
|
imports = [ inputs.sops-nix.homeManagerModules.sops ];
|
||||||
|
sops = {
|
||||||
|
age.keyFile = "/home/muon/.config/sops/age/keys.txt";
|
||||||
|
defaultSopsFile = ./secrets.yaml;
|
||||||
|
secrets.zipline-auth = { };
|
||||||
|
};
|
||||||
|
}
|
||||||
39
modules/home/sops/secrets.yaml
Normal file
39
modules/home/sops/secrets.yaml
Normal file
|
|
@ -0,0 +1,39 @@
|
||||||
|
zipline-auth: ENC[AES256_GCM,data:RkJI6GuH7RzdcSlKn32gMGojjB6rkdDcnNUvsi/BTfJk2slzoktAaJPzQA==,iv:LIiB3tyqXf/D64aIDSo0AyG3imvI6ZE893KBPlYFr28=,tag:wl8spMBwzfvuKA+Y6JnVyQ==,type:str]
|
||||||
|
sops:
|
||||||
|
kms: []
|
||||||
|
gcp_kms: []
|
||||||
|
azure_kv: []
|
||||||
|
hc_vault: []
|
||||||
|
age:
|
||||||
|
- recipient: age1m97a3eptxwpdd7h5kkqe9gkmhg6rquc64qjmlsfqfhfqv8q72crqrylhgc
|
||||||
|
enc: |
|
||||||
|
-----BEGIN AGE ENCRYPTED FILE-----
|
||||||
|
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZdno1QTVQci94M083c01O
|
||||||
|
MzlHZnhOb3BxNFBtSE9YWUcySmNNL0ovbHdvCmF3K1dVMFN2REs0Wm5JODgyVSt1
|
||||||
|
aGJGODRZWllaeHd3Y2tHcXNxN01WelUKLS0tIElqaENucWgzcytSRlE3YThjRTda
|
||||||
|
bC9hQXVTSU9yYU0xTlE1QVYyclp4L28KlAWVfsSmIHxbjsgRggmEzBk79aFem93d
|
||||||
|
dwCuAzM95eRDPB0pnhgROa0f9uiAUDdrtfWRrGVvIVzCKL0DPCPA5w==
|
||||||
|
-----END AGE ENCRYPTED FILE-----
|
||||||
|
- recipient: age1v4s4hg7u3vjjkarvrk7v6ev7w3wja2r5xm7f4t06culw3fuq7qns8sfju7
|
||||||
|
enc: |
|
||||||
|
-----BEGIN AGE ENCRYPTED FILE-----
|
||||||
|
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpcFJ6ejRkQnQwSUtLY2d4
|
||||||
|
Sm1QL3RDQmtieDZ3T1Z2Z2RFR25HTmxPNERVCmM3TW1wSW05bkxJenUxQjF2S3Br
|
||||||
|
bDNpK3V4RnFnYVFaRXM3NEhFTmZiZVkKLS0tIGJxVnpEZ2FUK0JDUmp3UjRBUGhV
|
||||||
|
MEVmRjM2elE3MHRXQ0FURW1PSlRKL3cKcPYPd6fLVZpxMK/A9dR144irkkmQW/hN
|
||||||
|
FdXlOWIV9f/I5qi1Lay6WQM67Z13kiNFOC/GSv/0Amu+Y1RmvedRgA==
|
||||||
|
-----END AGE ENCRYPTED FILE-----
|
||||||
|
- recipient: age1n7qz2w3hkf7fcdv92kxw9k6uef487na2tlc87486rcjwj8lyfuws5q46gn
|
||||||
|
enc: |
|
||||||
|
-----BEGIN AGE ENCRYPTED FILE-----
|
||||||
|
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBwYTRqV0E1MGNpMm45c1d5
|
||||||
|
UU5Eem5QRC82NmFmTytHakljMFJXYWE1eVZZCmVtWGxVeVVFUWlzSWZyZXd0V1Q4
|
||||||
|
eEVQY2hndTI0aEo4bW9tMlk3M2k5cW8KLS0tIDV2RU9vdkgrdDhTMkpYZkV6aXd4
|
||||||
|
cThxTVpmcEMrcG9Lczd3dkdyQ0paSHMKUfkx9jh7zIqBkUjxaH3dVKvNJG3Mipts
|
||||||
|
OjmJ5aVVIR5U8MhgSgECb22mGlOgW8SU/x4gxcWgafZwbv2vbON6OA==
|
||||||
|
-----END AGE ENCRYPTED FILE-----
|
||||||
|
lastmodified: "2025-01-19T20:01:35Z"
|
||||||
|
mac: ENC[AES256_GCM,data:jG/1PmWEk8EMvor/QCEhxDzkRufVWCLdDnsfomVy9hbiOl9ndzCFjvMR2OXkxGsTHl8bGaYJ+DqAjtLvgZZW5l+F6HQmQcene1vNFH3DsrtiQ7TC3Lmov6PBND1XCkj3urwaT3zKoydHIuIdIWyo2/RSxyz8G8mQrn8QrKv5SJw=,iv:PIle2A4sd2hVarMIgYu9/obShMe8NnDbfe9FUL/p8HI=,tag:I/2Bt2L+a8ybJUc6Pv3yZw==,type:str]
|
||||||
|
pgp: []
|
||||||
|
unencrypted_suffix: _unencrypted
|
||||||
|
version: 3.9.2
|
||||||
|
|
@ -33,8 +33,8 @@ sops:
|
||||||
cThxTVpmcEMrcG9Lczd3dkdyQ0paSHMKUfkx9jh7zIqBkUjxaH3dVKvNJG3Mipts
|
cThxTVpmcEMrcG9Lczd3dkdyQ0paSHMKUfkx9jh7zIqBkUjxaH3dVKvNJG3Mipts
|
||||||
OjmJ5aVVIR5U8MhgSgECb22mGlOgW8SU/x4gxcWgafZwbv2vbON6OA==
|
OjmJ5aVVIR5U8MhgSgECb22mGlOgW8SU/x4gxcWgafZwbv2vbON6OA==
|
||||||
-----END AGE ENCRYPTED FILE-----
|
-----END AGE ENCRYPTED FILE-----
|
||||||
lastmodified: "2025-01-17T21:33:05Z"
|
lastmodified: "2025-01-19T19:59:53Z"
|
||||||
mac: ENC[AES256_GCM,data:1rWVznPbKkLUES4PlHPsfrjGr6/q/RFm3+GUnn2hyixsfYRdTStoRjPglop/ma+6h9Yzwb0kkVYOFQDrGXmPFqtjbTjATqzRMo75bGNy+Ncs6f6zyEcZAnVk/MnPc7U0+PFRwkX6F4VnGQucZBDtE5/wpUYlhl2QB8x1Q3taCBk=,iv:2pRm+LGw+i5PR2I5xBqcmRctZUprWFCRZryuIyIH5rc=,tag:e9lnLyzp4wDHlbMsRNOAmw==,type:str]
|
mac: ENC[AES256_GCM,data:6bOKL2CLWkezZKFQ/xvOwDDjf4uCd8vCdaahB9Mk9rPu9rLQSUbUrkI8dH1cOwHrVGAOHiIs3wA5jiZ15LUMLu2Hb/sL1WXKRbGAPpe1OiHEojzqof1DhcVbKp325eDOuzFwymAAI+UUrIyjpiXz/2TP0S8DlE2GrijKEiwrarc=,iv:86TLsmeJwRWBxbaA24wyrqSBBLRzTf7OFhKLnn6wOGc=,tag:gO75zauaNt0C4yu6v1iMWw==,type:str]
|
||||||
pgp: []
|
pgp: []
|
||||||
unencrypted_suffix: _unencrypted
|
unencrypted_suffix: _unencrypted
|
||||||
version: 3.9.2
|
version: 3.9.2
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue