From 5112403a32ecba28cf399306026dbb6eb8266fa6 Mon Sep 17 00:00:00 2001 From: serenity-F Date: Wed, 11 Dec 2024 20:29:27 +1000 Subject: [PATCH] expanded on sway.nix --- home/desktop/default.nix | 15 +++++---------- home/desktop/sway/sway.nix | 19 ++++++++++++++++--- home/desktop/waybar.nix | 6 ++++++ 3 files changed, 27 insertions(+), 13 deletions(-) diff --git a/home/desktop/default.nix b/home/desktop/default.nix index 6d376b8..e10755c 100755 --- a/home/desktop/default.nix +++ b/home/desktop/default.nix @@ -28,8 +28,8 @@ xdg = { mimeApps = { enable = true; - associations.added = associations; - defaultApplications = associations; + #associations.added = associations; + #defaultApplications = associations; }; portal = { enable = false; @@ -42,14 +42,14 @@ }; configPackages = with pkgs; [ #xdg-desktop-portal - #xdg-desktop-portal-wlr + xdg-desktop-portal-wlr xdg-desktop-portal-gtk xdg-desktop-portal-gnome xdg-desktop-portal-hyprland ]; extraPortals = with pkgs; [ #xdg-desktop-portal - #xdg-desktop-portal-wlr + xdg-desktop-portal-wlr xdg-desktop-portal-gtk xdg-desktop-portal-gnome xdg-desktop-portal-hyprland @@ -63,11 +63,7 @@ #}; }; - fonts = { - fontconfig = { - enable = true; - }; - }; + fonts = { fontconfig = { enable = true; }; }; qt = { enable = true; @@ -134,7 +130,6 @@ ## desktop swww # Wallpaper daemon dconf # GTK settings tweaker - waybar # Desktop status bar blueman # GTK bluetooth manager ydotool # Click/Keypress emulator wlsunset # Blue light filter diff --git a/home/desktop/sway/sway.nix b/home/desktop/sway/sway.nix index 8d44f7b..5385479 100755 --- a/home/desktop/sway/sway.nix +++ b/home/desktop/sway/sway.nix @@ -82,14 +82,27 @@ in { }; config = rec { + + output = { + eDP-1 = { + ## Set HIDP scale (pixel integer scaling) + scale = "1"; + }; + }; + ## Use Wofi as menu - menu = "wofi"; + menu = "wofi --show run"; ## Use kitty as default terminal terminal = "kitty"; - ## Startup applications and scripts + ## Startup scripts and programs startup = [ { command = "startup"; } { command = "kitty"; } ]; - bars = [{ "command" = "${waybar}/bin/waybar"; }]; + ## Use waybar as desktop statusbar + bars = [{ + command = "${waybar}/bin/waybar"; + position = "top"; + fonts = { size = 15.0; }; + }]; focus = { followMouse = true; diff --git a/home/desktop/waybar.nix b/home/desktop/waybar.nix index 27d29b2..e99015d 100755 --- a/home/desktop/waybar.nix +++ b/home/desktop/waybar.nix @@ -1,4 +1,10 @@ { pkgs, config, lib, waybar, ... }: { + + home = { + + packages = with pkgs; [ waybar ]; + }; + services = { blueman-applet.enable = false; network-manager-applet.enable = true;