From e1bb0f2a741877390eeefc17a578b9de1b69d357 Mon Sep 17 00:00:00 2001 From: Jasper Ras Date: Thu, 14 Nov 2024 18:08:59 +0100 Subject: waybar: configure monitor via flake and add battery widget --- flake.nix | 4 ++-- home-manager/common.nix | 11 +++++++++++ home-manager/compositor/hyprland.nix | 7 +++---- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index 9c6b218..dac90a8 100644 --- a/flake.nix +++ b/flake.nix @@ -46,7 +46,7 @@ home-manager.useUserPackages = true; home-manager.users.jras = import ./home-manager/entrypoints/personal.nix; - home-manager.extraSpecialArgs = { inherit inputs; }; + home-manager.extraSpecialArgs = { inherit inputs; primary-monitor = "eDP-1"; }; } ./hosts/work.nix @@ -59,7 +59,7 @@ home-manager.useUserPackages = true; home-manager.users.jras = import ./home-manager/entrypoints/personal.nix; - home-manager.extraSpecialArgs = { inherit inputs; }; + home-manager.extraSpecialArgs = { inherit inputs; primary-monitor = "DP-2"; }; } ./hosts/tarrel.nix diff --git a/home-manager/common.nix b/home-manager/common.nix index ee7d8f2..42989ad 100644 --- a/home-manager/common.nix +++ b/home-manager/common.nix @@ -372,4 +372,15 @@ enable = true; package = "${pkgs.taskwarrior3}"; }; + + xdg.mimeApps = { + enable = true; + defaultApplications = { + "text/html" = "firefox.desktop"; + "x-scheme-handler/http" = "firefox.desktop"; + "x-scheme-handler/https" = "firefox.desktop"; + "x-scheme-handler/about" = "firefox.desktop"; + "x-scheme-handler/unknown" = "firefox.desktop"; + }; + }; } diff --git a/home-manager/compositor/hyprland.nix b/home-manager/compositor/hyprland.nix index 64957dd..bd6fdfd 100644 --- a/home-manager/compositor/hyprland.nix +++ b/home-manager/compositor/hyprland.nix @@ -1,4 +1,4 @@ -{ pkgs, config, ... }: +{ pkgs, config, primary-monitor, ... }: let pics = "${config.home.homeDirectory}/Pictures"; mac-color-4k = "${pics}/mac-color-4k.jpg"; @@ -95,14 +95,13 @@ in mainBar = { layer = "top"; position = "bottom"; - output = [ - "HDMI-A-1" - ]; + output = ["${primary-monitor}"]; modules-left = [ "hyprland/workspaces" ]; modules-right = [ "clock" + "battery" ]; "hyprland/workspaces" = { -- cgit v1.2.3