aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gui/conf/xmonad.hs8
-rw-r--r--gui/touchegg.nix38
-rw-r--r--gui/twmn.nix9
-rw-r--r--host/athena.nix3
4 files changed, 8 insertions, 50 deletions
diff --git a/gui/conf/xmonad.hs b/gui/conf/xmonad.hs
index e85b121..c676882 100644
--- a/gui/conf/xmonad.hs
+++ b/gui/conf/xmonad.hs
@@ -368,25 +368,25 @@ screenWidthOn host = case host of
"majestix" -> 1920
"obelix" -> 1280
"asterix" -> 1366
- "athena" -> 2560
+ "athena" -> 1920
screenHeightOn host = case host of
"hephaestus" -> 1200
"majestix" -> 1080
"obelix" -> 1024
"asterix" -> 768
- "athena" -> 1440
+ "athena" -> 1080
borderWidthOn host = case host of
"hephaestus" -> 3
"majestix" -> 3
"obelix" -> 3
"asterix" -> 3
- "athena" -> 6
+ "athena" -> 3
decoHeightOn host = case host of
"hephaestus" -> 20
"majestix" -> 20
"obelix" -> 20
"asterix" -> 20
- "athena" -> 30
+ "athena" -> 20
-------------------------------------------------------------------------------
-- helper for layout name dependent actions
diff --git a/gui/touchegg.nix b/gui/touchegg.nix
deleted file mode 100644
index 8e5cb6b..0000000
--- a/gui/touchegg.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ pkgs, ... }:
-
-{
- home.file.".config/touchegg/touchegg.conf".text = let
- uictrl = pkgs.lib.callPackageWith pkgs ./pkgs/uictrl.nix { };
- in ''
- <touchégg>
- <application name="All">
- <gesture type="DRAG" fingers="3" direction="LEFT">
- <action type="RUN_COMMAND">${uictrl}/bin/uictrl next</action>
- </gesture>
- <gesture type="DRAG" fingers="3" direction="RIGHT">
- <action type="RUN_COMMAND">${uictrl}/bin/uictrl prev</action>
- </gesture>
- <gesture type="TAP" fingers="2">
- <action type="MOUSE_CLICK">BUTTON=3</action>
- </gesture>
- </application>
- </touchégg>
- '';
-
- systemd.user.services.touchegg = {
- Unit = {
- Description = "Touchégg multitouch gestures";
- After = [ "graphical-session-pre.target" ];
- PartOf = [ "graphical-session.target" ];
- };
-
- Install = {
- WantedBy = [ "graphical-session.target" ];
- };
-
- Service = {
- ExecStart = "${pkgs.touchegg}/bin/touchegg";
- Restart = "on-failure";
- };
- };
-}
diff --git a/gui/twmn.nix b/gui/twmn.nix
index 1420457..c3c35cb 100644
--- a/gui/twmn.nix
+++ b/gui/twmn.nix
@@ -1,9 +1,6 @@
{ config, pkgs, ... }:
-let
- hidpi = config.custom.hidpi;
-
-in {
+{
home.packages = with pkgs; [
twmn
libnotify
@@ -31,8 +28,8 @@ in {
[gui]
background_color=#909737
font=Iosevka
- font_size=${if hidpi then "24" else "14"}
- height=${if hidpi then "32" else "20"}
+ font_size=14
+ height=20
foreground_color=#111111
always_on_top=true
position=bottom_right
diff --git a/host/athena.nix b/host/athena.nix
index 17e264d..8fc7357 100644
--- a/host/athena.nix
+++ b/host/athena.nix
@@ -6,7 +6,6 @@
../gui/networkmanager.nix
../gui/stalonetray.nix
../gui/redshift.nix
- ../gui/touchegg.nix
];
home.packages = with pkgs; [
@@ -16,5 +15,5 @@
blueman
];
- custom.hidpi = true;
+ custom.hidpi = false;
}