diff --git a/modules/home/default.nix b/modules/home/default.nix index f0c6b1e..8e47e1e 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -3,7 +3,6 @@ imports = [ (import ./git.nix) ] ++ [ (import ./swaync/default.nix) ] - ++ [ (import ./sway/default.nix) ] ++ [ (import ./fonts.nix) ] ++ [ (import ./hyprland) ] ++ [ (import ./hyprlock) ] diff --git a/modules/home/hyprland/config.nix b/modules/home/hyprland/config.nix index 3f6a141..2f5690a 100644 --- a/modules/home/hyprland/config.nix +++ b/modules/home/hyprland/config.nix @@ -85,8 +85,7 @@ "wl-paste --watch cliphist store &" "yubikey-touch-detector --libnotify &" "mpDris2 &" - "foot --server &" - "hyprfloat &" + "foot --server" ]; input = { @@ -186,7 +185,7 @@ }; animations = { - enabled = true; + enabled = false; bezier = [ "fluent_decel, 0, 0.2, 0.4, 1" @@ -213,15 +212,10 @@ ]; }; - gesture = [ - "3, horizontal, workspace" - # "4, horizontal, move" - ]; - bind = [ # keybindings "$mainMod, Return, exec, footclient" - "$mainMod SHIFT, Return, exec, [float; center; size 950 650] footclient --title 'float_foot'" + "$mainMod SHIFT, Return, exec, [float; center; size 950 650] footclient" "$mainMod, Q, killactive," "$mainMod, F, fullscreen, 0" # set 1 to 0 to set full screen without waybar "$mainMod, Space, togglefloating," @@ -237,9 +231,6 @@ "$mainMod, Tab, changegroupactive, f" "$mainMod SHIFT, Tab, changegroupactive, b" - # password manager - "$mainMod SHIFT, X, exec, footclient --title 'float_foot' zsh -c 'bash ~/.local/src/bw-fzf/bw-fzf.sh" - # clipboard manager "$mainMod SHIFT, V, exec, cliphist list | bemenu -l 5 --ignorecase | cliphist decode | wl-copy" @@ -249,9 +240,10 @@ "$mainMod SHIFT, W, exec, wdisplays" "$mainMod SHIFT, T, exec, thunderbird" "$mainMod SHIFT, E, exec, element-desktop" + "$mainMod SHIFT, X, exec, gajim" "$mainMod SHIFT, P, exec, pavucontrol-qt" - "$mainMod SHIFT, N, exec, notes" - "$mainMod , N, exec, swaync-client -t" + "$mainMod SHIFT, N ,exec, notes" + "$mainMod, N,exec, swaync-client -t" # screenshot "SUPER SHIFT, S, exec, grimblast save area ~/Pictures/$(date +'%Y-%m-%d-At-%Ih%Mm%Ss').png" @@ -346,7 +338,6 @@ "size 950 600,title:^(float_foot)$" "float,title:^(Volume Control)$" "float,title:^(Librewolf — Sharing Indicator)$" - "float,title:^(Export Image as PNG)$" "move 0 0,title:^(Librewolf — Sharing Indicator)$" "size 700 450,title:^(Volume Control)$" "move 40 55%,title:^(Volume Control)$" @@ -381,7 +372,6 @@ "float,title:^(branchdialog)$" "float,title:^(Confirm to replace files)$" "float,title:^(File Operation Progress)$" - "float,title:^(float_foot)$" "nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0" ]; diff --git a/modules/home/packages.nix b/modules/home/packages.nix index 1320e1f..b9e2bcc 100644 --- a/modules/home/packages.nix +++ b/modules/home/packages.nix @@ -7,7 +7,6 @@ }: { home.packages = with pkgs; [ - swayfx # Environment shit tesseract yubikey-touch-detector @@ -32,7 +31,7 @@ python3 # CLI shit - bitwarden-cli + fff imagemagick foot termpdfpy diff --git a/modules/home/sway/default.nix b/modules/home/sway/default.nix index a72c246..5446f5b 100644 --- a/modules/home/sway/default.nix +++ b/modules/home/sway/default.nix @@ -1,10 +1,9 @@ -{ pkgs, username, ... }: -{ +{ pkgs, username, ... }: { home.packages = with pkgs; [ swayfx autotiling - libinput-gestures - wmctrl + # libinput-gestures + # wmctrl ]; #home.file = { # "/home/${username}/.config/libinput-gestures/sway.conf" = { diff --git a/modules/services/uptime-kuma.nix b/modules/services/uptime-kuma.nix deleted file mode 100644 index a7d1eb8..0000000 --- a/modules/services/uptime-kuma.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ config, ... }: -{ - services = { - uptime-kuma = { - enable = true; - settings.PORT = 4800; - }; - anubis.instances.uptime-kuma = { - settings = { - TARGET = "http://localhost:4800"; - BIND = ":4801"; - BIND_NETWORK = "tcp"; - }; - }; - nginx.virtualHosts."uptime.liv.town" = { - forceSSL = true; - sslCertificate = "/var/lib/acme/liv.town/cert.pem"; - sslCertificateKey = "/var/lib/acme/liv.town/key.pem"; - locations."/" = { - proxyPass = "http://localhost${toString config.services.anubis.instances.uptime-kuma.settings.BIND}"; - proxyWebsockets = true; - }; - }; - }; -}