From bb19cc1377e37c289df7dad3b2c6fdcfa943ab81 Mon Sep 17 00:00:00 2001 From: DerGrumpf Date: Mon, 7 Apr 2025 23:13:13 +0200 Subject: [PATCH] Changed: Stuff --- home/hyprland/hyprland.nix | 27 ++-- home/hyprland/hyprpaper.nix | 4 +- home/hyprland/waybar/double-monitor.nix | 163 +++++++++++++++++++++--- home/programs/misc/appimage.nix | 7 + home/xdg.nix | 15 ++- hosts/m920q/default.nix | 4 +- modules/system.nix | 2 +- users/phil/home.nix | 6 +- 8 files changed, 193 insertions(+), 35 deletions(-) create mode 100644 home/programs/misc/appimage.nix diff --git a/home/hyprland/hyprland.nix b/home/hyprland/hyprland.nix index 3a8ae41..b6ea4d6 100644 --- a/home/hyprland/hyprland.nix +++ b/home/hyprland/hyprland.nix @@ -93,14 +93,24 @@ in allow_tearing = false; }; - /*decoration = { + decoration = { rounding = 12; - drop_shadow = "yes"; - shadow_range = 16; - shadow_render_power = 4; - shadow_ignore_window = 1; - "col.shadow" = "0xFFF887FF"; - "col.shadow_inactive" = "0xFFDE004E"; + + shadow = { + enabled = true; + range = 16; + render_power = 4; + ignore_window = true; + color = "0xFFF887FF"; + color_inactive = "0xFFDE004E"; + #drop_shadow = "yes"; + #shadow_range = 16; + #shadow_render_power = 4; + #shadow_ignore_window = 1; + #"col.shadow" = "0xFFF887FF"; + #"col.shadow_inactive" = "0xFFDE004E"; + }; + blur = { enabled = true; size = 1; @@ -108,7 +118,7 @@ in new_optimizations = 1; noise = 0.04; }; - };*/ + }; animations = { enabled = "yes"; @@ -175,6 +185,7 @@ in "${super}, S, exec, ${power}" "${super}, P, pseudo, " # dwindle "${super}, J, togglesplit, "# dwindle + "${super}, O, exec, obsidian" # Move focus with mainMod + arrow keys "${super}, left, movefocus, l" diff --git a/home/hyprland/hyprpaper.nix b/home/hyprland/hyprpaper.nix index 749e724..8ab0654 100644 --- a/home/hyprland/hyprpaper.nix +++ b/home/hyprland/hyprpaper.nix @@ -15,8 +15,8 @@ # Hyprpaper configuration services.hyprpaper.enable = true; services.hyprpaper.settings = { - preload = "Pictures/Wallpapers/space_station.png"; - wallpaper = ", Pictures/Wallpapers/space_station.png"; + preload = "Pictures/Wallpapers/tokio.png"; + wallpaper = ", Pictures/Wallpapers/tokio.png"; }; } diff --git a/home/hyprland/waybar/double-monitor.nix b/home/hyprland/waybar/double-monitor.nix index 9c1ccb5..fb76e17 100644 --- a/home/hyprland/waybar/double-monitor.nix +++ b/home/hyprland/waybar/double-monitor.nix @@ -2,40 +2,167 @@ pkgs, config, ... -}: { +} : { programs.waybar = { enable = true; package = pkgs.waybar; - /*settings = { + settings = { mainBar = { layer = "top"; position = "top"; height = 30; - output = [ - "eDP-1" - "DP-1" - "HDMI-A-1" - "Virtual-1" + output = [ "DP-1" ]; + + modules-left = [ + "hyprland/workspaces" + "mpris" ]; - modules-left = [ "sway/workspaces" "sway/mode" "wlr/taskbar" ]; - modules-center = [ "sway/window" "custom/hello-from-waybar" ]; - modules-right = [ "mpd" "custom/mymodule#with-css-id" "temperature" ]; + modules-center = []; + + modules-right = [ + "network" + "memory" + "cpu" + "clock" + ]; + # Widgets "sway/workspaces" = { disable-scroll = true; all-outputs = true; }; - "custom/hello-from-waybar" = { - format = "hello {}"; - max-length = 40; - interval = "once"; - exec = pkgs.writeShellScript "hello-from-waybar" '' - echo "from within waybar $USER" - ''; + + mpris = { + format = "{player_icon} {dynamic}"; + format-paused = "{status_icon} {dynamic}"; + max-length = 100; + + player-icons = { + default = "⏸"; + mpv = "🎵"; + }; + + status-icons = { + paused = "▶"; + }; }; + + "hyprland/workspaces" = { + format = "{icon}"; + format-icons = { + default = ""; + active = ""; + }; + }; + + network = { + tooltip = true; + format-wifi = "{icon} "; + format-icons = ["󰤟" "󰤢" "󰤥"]; + rotate = 0; + format-ethernet = "󰈀 "; + tooltip-format = "Network: {essid}\nSignal strength: {signaldBm}dBm ({signalStrength}%)\nFrequency: {frequency}MHz\nInterface: {ifname}\nIP: {ipaddr}/{cidr}\nGateway: {gwaddr}\nNetmask: {netmask}"; + format-linked = "󰈀 {ifname} (No IP)"; + format-disconnected = " "; + tooltip-format-disconnected = "Disconnected"; + on-click = "/usr/local/bin/ags -t ControlPanel"; + interval = 2; + }; + + memory = { + interval = 1; + rotate = 270; + format = "{icon}"; + format-icons = ["󰝦" "󰪞" "󰪟" "󰪠" "󰪡" "󰪢" "󰪣" "󰪤" "󰪥"]; + max-length = 10; + }; + + cpu = { + interval = 1; + format = "{icon}"; + rotate = 270; + format-icons = ["󰝦" "󰪞" "󰪟" "󰪠" "󰪡" "󰪢" "󰪣" "󰪤" "󰪥"]; + }; + + clock = { + format = "{:%I:%M %p}"; + rotate = 0; + on-click = "/usr/local/bin/ags -t ActivityCenter"; + tooltip-format = "{calendar}"; + + calendar = { + mode = "month"; + mode-mon-col = 3; + on-scroll = 1; + on-click-right = "mode"; + format = { + months = "{}"; + weekdays = "{}"; + today = "{}"; + }; + }; + + actions = { + on-click-right = "mode"; + on-click-forward = "tz_up"; + on-click-backward = "tz_down"; + on-scroll-up = "shift_up"; + on-scroll-down = "shift_down"; + }; + }; + }; - };*/ + + secondBar = { + layer = "top"; + position = "top"; + height = 30; + output = [ + "HDMI-A-2" + ]; + + modules-left = [ + "hyprland/workspaces" + ]; + + modules-center = [ + "custom/weather" + ]; + + modules-right = [ + "network" + ]; + + "hyprland/workspaces" = { + format = "{icon}"; + format-icons = { + default = ""; + active = ""; + }; + }; + + "custom/weather" = { + exec = "python3 ~/.config/waybar/weather.py waybar"; + restart-interval = 900; + return-type = "json"; + }; + + network = { + tooltip = true; + format-wifi = "{icon} "; + format-icons = ["󰤟" "󰤢" "󰤥"]; + rotate = 0; + format-ethernet = "{bandwidthTotalBits} 󰈀 {bandwidthUpBits} 󰶣 {bandwidthDownBits} 󰶡 "; + tooltip-format = "Network: {essid}\nSignal strength: {signaldBm}dBm ({signalStrength}%)\nFrequency: {frequency}MHz\nInterface: {ifname}\nIP: {ipaddr}/{cidr}\nGateway: {gwaddr}\nNetmask: {netmask}"; + format-linked = "󰈀 {ifname} (No IP)"; + format-disconnected = " "; + tooltip-format-disconnected = "Disconnected"; + on-click = "/usr/local/bin/ags -t ControlPanel"; + interval = 2; + }; + }; + }; }; home.file.".config/waybar" = { diff --git a/home/programs/misc/appimage.nix b/home/programs/misc/appimage.nix new file mode 100644 index 0000000..a993c7b --- /dev/null +++ b/home/programs/misc/appimage.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: +{ + home.programs.appimage = { + enable = true; + binfmt = true; + }; +} diff --git a/home/xdg.nix b/home/xdg.nix index 1b22a8a..8c6a082 100644 --- a/home/xdg.nix +++ b/home/xdg.nix @@ -1,4 +1,4 @@ -{config, ...}: let +{pkgs, config, ...}: let browser = ["firefox.desktop"]; # XDG MIME types @@ -43,5 +43,18 @@ in { XDG_SCREENSHOTS_DIR = "${config.xdg.userDirs.pictures}/Screenshots"; }; }; + + portal = { + enable = true; + xdgOpenUsePortal = true; + config = { + common.default = [ "gtk" ]; + hyprland.default = [ "gtk" "hyprland" ]; + }; + extraPortals = [ + pkgs.xdg-desktop-portal-gtk + pkgs.xdg-desktop-portal-hyprland + ]; + }; }; } diff --git a/hosts/m920q/default.nix b/hosts/m920q/default.nix index 1be54cd..eb54f85 100644 --- a/hosts/m920q/default.nix +++ b/hosts/m920q/default.nix @@ -20,7 +20,7 @@ ../../modules/regreet/regreet.nix ../../modules/plymouth.nix ../../modules/file_managers/spacefm.nix - + ../../modules/python.nix # Include the results of the hardware scan. ./hardware-configuration.nix ]; @@ -55,7 +55,7 @@ # for Nvidia GPU #services.xserver.videoDrivers = ["nvidia"]; - hardware.opengl.enable = true; + hardware.graphics.enable = true; #hardware.nvidia = { # package = config.boot.kernelPackages.nvidiaPackages.stable; # modesetting.enable = true; diff --git a/modules/system.nix b/modules/system.nix index d46c262..dcba698 100644 --- a/modules/system.nix +++ b/modules/system.nix @@ -76,5 +76,5 @@ ]; security.polkit.enable = true; - + security.rtkit.enable = true; } diff --git a/users/phil/home.nix b/users/phil/home.nix index ee2a782..e57f6c2 100644 --- a/users/phil/home.nix +++ b/users/phil/home.nix @@ -11,7 +11,7 @@ ../../home/hyprland # Window Manager ../../home/themes/dark - ../../home/hyprland/waybar/single-monitor.nix + ../../home/hyprland/waybar/double-monitor.nix ../../home/programs/dev # Dev Tools @@ -23,13 +23,13 @@ ../../home/programs/productivity/blender.nix ../../home/programs/productivity/slicer.nix ../../home/programs/productivity/okular.nix - #../../home/programs/productivity/geary.nix + ../../home/programs/productivity/obsidian.nix ../../home/programs/social/element.nix ../../home/programs/social/webcord.nix ../../home/programs/web/firefox.nix - + ../../home/programs/misc/appimage.nix # Games # ../../home/programs/games/itch.nix # ../../home/programs/games/steam.nix