From ccfcd6db3a4dcc33952c37a2867ec58eafe6cd2f Mon Sep 17 00:00:00 2001 From: Rouven Seifert Date: Sat, 25 Nov 2023 23:20:52 +0100 Subject: [PATCH] package cleanup --- users/rouven/default.nix | 1 - users/rouven/modules/foot/default.nix | 27 ++++++++++++++++++++++-- users/rouven/modules/packages.nix | 13 ++---------- users/rouven/modules/ssh/default.nix | 1 - users/rouven/modules/wayland/default.nix | 2 ++ 5 files changed, 29 insertions(+), 15 deletions(-) diff --git a/users/rouven/default.nix b/users/rouven/default.nix index 9a54b15..25d47a6 100644 --- a/users/rouven/default.nix +++ b/users/rouven/default.nix @@ -18,7 +18,6 @@ home.username = "rouven"; home.homeDirectory = "/home/rouven"; home.stateVersion = config.system.stateVersion; - home.enableNixpkgsReleaseCheck = false; }; }; } diff --git a/users/rouven/modules/foot/default.nix b/users/rouven/modules/foot/default.nix index 766766b..36b2c1a 100644 --- a/users/rouven/modules/foot/default.nix +++ b/users/rouven/modules/foot/default.nix @@ -3,14 +3,37 @@ home.packages = with pkgs; [ libsixel ]; + + # enable socket activation + systemd.user = { + services.foot = { + Unit = { + Requires = "foot.socket"; + }; + }; + sockets.foot = { + Socket = { + ListenStream = "%t/foot.sock"; + }; + Unit = { + PartOf = [ "graphical-session.target" ]; + After = [ "graphical-session.target" ]; + ConditionEnvironment = "WAYLAND_DISPLAY"; + }; + Install = { + WantedBy = [ "graphical-session.target" ]; + }; + }; + }; + programs.foot = { enable = true; server.enable = true; settings = rec { main = { shell = "${pkgs.zsh}/bin/zsh"; - dpi-aware = "yes"; - font = "monospace:family=Iosevka Nerd Font, size=8"; + # dpi-aware = "yes"; + font = "monospace:family=Iosevka Nerd Font:size=12"; notify = "${lib.getExe pkgs.libnotify} -a \${app-id} -i \${app-id} \${title} \${body}"; }; cursor.color = "${colors.background} ${colors.foreground}"; diff --git a/users/rouven/modules/packages.nix b/users/rouven/modules/packages.nix index f2f97b6..0292bee 100644 --- a/users/rouven/modules/packages.nix +++ b/users/rouven/modules/packages.nix @@ -25,14 +25,12 @@ in cups # graphics - evince # pdf viewer + zathura gimp krita ffmpeg drawio leafpad - gamescope - gnome.simple-scan imv # sound @@ -52,12 +50,10 @@ in discord tdesktop element-desktop - gomuks # alternative matrix client mattermost-desktop gajim # games - # dwarf-fortress-packages.dwarf-fortress-full prismlauncher # minecraft, but it actually works # not anymore lol superTuxKart @@ -66,18 +62,13 @@ in yubikey-manager-qt yubioath-flutter bitwarden - pass # misc - btop neofetch # obligatory virt-manager jetbrains.idea-ultimate #😎 powerline-fonts croc # send files anywhere - bacula - hcloud - jq xournalpp libreoffice mosh @@ -116,7 +107,7 @@ in browsers = [ "google-chrome.desktop" "firefox.desktop" "org.qutebrowser.qutebrowser.desktop" ]; in { - "application/pdf" = [ "org.gnome.Evince.desktop" ]; + "application/pdf" = [ "org.pwmt.zathura.desktop" ]; "image/png" = image-viewers; "image/jpg" = image-viewers; "image/jpeg" = image-viewers; diff --git a/users/rouven/modules/ssh/default.nix b/users/rouven/modules/ssh/default.nix index 761ed0f..ae67792 100644 --- a/users/rouven/modules/ssh/default.nix +++ b/users/rouven/modules/ssh/default.nix @@ -24,7 +24,6 @@ in "rfive.de" = { hostname = "falkenstein.vpn.rfive.de"; user = "root"; - port = 2222; extraOptions = { VerifyHostKeyDNS = "ask"; }; diff --git a/users/rouven/modules/wayland/default.nix b/users/rouven/modules/wayland/default.nix index 41f422b..6a0654f 100644 --- a/users/rouven/modules/wayland/default.nix +++ b/users/rouven/modules/wayland/default.nix @@ -14,6 +14,8 @@ swaynotificationcenter playerctl wdisplays + wl-mirror + jq (libinput.override { eventGUISupport = true; }) ];