From 89285ac29813792827cb8c3675b359cbda98e918 Mon Sep 17 00:00:00 2001 From: CDaut Date: Mon, 29 Apr 2024 00:02:36 +0200 Subject: [PATCH] screenshots --- flake.lock | 12 ++++++------ home.nix | 12 +++++++++--- programm_configs/sway.nix | 11 +++++++---- programm_configs/waybar.nix | 3 ++- 4 files changed, 24 insertions(+), 14 deletions(-) diff --git a/flake.lock b/flake.lock index ae299a5..09ed4ff 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1713818326, - "narHash": "sha256-aw3xbVPJauLk/bbrlakIYxKpeuMWzA2feGrkIpIuXd8=", + "lastModified": 1714203603, + "narHash": "sha256-eT7DENhYy7EPLOqHI9zkIMD9RvMCXcqh6gGqOK5BWYQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "67de98ae6eed5ad6f91b1142356d71a87ba97f21", + "rev": "c1609d584a6b5e9e6a02010f51bd368cb4782f8e", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1713714899, - "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=", + "lastModified": 1714076141, + "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6143fc5eeb9c4f00163267708e26191d1e918932", + "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856", "type": "github" }, "original": { diff --git a/home.nix b/home.nix index 944ef8e..6f7f406 100644 --- a/home.nix +++ b/home.nix @@ -49,6 +49,7 @@ let username = "clemens"; in firefox tex jetbrains.idea-ultimate + jetbrains.clion thunderbird signal-desktop nextcloud-client @@ -61,7 +62,6 @@ let username = "clemens"; in xournalpp pavucontrol keepassxc - flameshot gnome.simple-scan lxqt.lxqt-policykit cifs-utils @@ -69,8 +69,14 @@ let username = "clemens"; in unzip direnv font-awesome - networkmanagerapplet - ] ++ (if x11mode then [ arandr ] else [ wdisplays ]); + networkmanagerapplet + ] ++ (if x11mode then [ + arandr + flameshot + ] else [ + wdisplays + sway-contrib.grimshot + ]); fonts.fontconfig.enable = true; diff --git a/programm_configs/sway.nix b/programm_configs/sway.nix index 36f7b35..93df1df 100644 --- a/programm_configs/sway.nix +++ b/programm_configs/sway.nix @@ -94,6 +94,9 @@ "exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit'"; "${mod}+r" = "mode resize"; + + "${mod}+Print" = "exec ${pkgs.sway-contrib.grimshot}/bin/grimshot copy anything"; + "${mod}+Shift+Print" = "exec ${pkgs.sway-contrib.grimshot}/bin/grimshot save anything"; }; startup = [ { @@ -116,10 +119,10 @@ command = "blueman-applet"; always = true; } - { - command = "nm-applet"; - always = true; - } + { + command = "nm-applet"; + always = true; + } ]; }; }; diff --git a/programm_configs/waybar.nix b/programm_configs/waybar.nix index 5d5226b..5fa8cf7 100644 --- a/programm_configs/waybar.nix +++ b/programm_configs/waybar.nix @@ -48,7 +48,8 @@ critical-threshold = 70; format = "{temperatureC}°C"; interval = 2; - hwmon-path = "/sys/devices/platform/coretemp.0/hwmon/hwmon1/temp1_input"; + hwmon-path-abs = "/sys/devices/platform/coretemp.0/hwmon"; + input-filename = "temp1_input"; }; "network#eth" = {