diff --git a/configs/hypr/hyprland.conf b/configs/hypr/hyprland.conf index 42e7211..a84ced2 100644 --- a/configs/hypr/hyprland.conf +++ b/configs/hypr/hyprland.conf @@ -4,7 +4,15 @@ monitor=,preferred,auto,auto # See https://wiki.hyprland.org/Configuring/Keywords/ for more # Execute your favorite apps at launch # exec-once = waybar & hyprpaper & firefox -exec-once = waybar & dunst & firefox & kitty +exec-once = waybar & dunst +exec-once = lxqt-policykit-agent + +# Window rules +windowrulev2 = float,class:(lxqt-policykit-agent) +windowrulev2 = fullscreen,class:(Code) +windowrulev2 = fullscreen,class:(firefox) +windowrulev2 = fakefullscreen, class:^(code-url-handler)$ + # Some default env vars. env = XCURSOR_SIZE,24 # For all categories, see https://wiki.hyprland.org/Configuring/Variables/ @@ -13,6 +21,7 @@ input { follow_mouse = 1 touchpad { natural_scroll = yes + clickfinger_behavior = yes } sensitivity = 0 # -1.0 - 1.0, 0 means no modification. } @@ -143,5 +152,3 @@ bind = $mainMod, mouse_up, workspace, e-1 bindm = $mainMod, mouse:272, movewindow bindm = $mainMod, mouse:273, resizewindow -# Window Rules -windowrulev2=fakefullscreen, class:^(code-url-handler)$ diff --git a/configs/waybar/config.jsonc b/configs/waybar/config.jsonc index 17e1e7b..cd84837 100644 --- a/configs/waybar/config.jsonc +++ b/configs/waybar/config.jsonc @@ -2,9 +2,9 @@ { "layer": "top", "position": "top", - "spacing": 4, // Gaps between modules (4px) + "spacing": 8, // Gaps between modules (4px) + "reload_style_on_change": true, "modules-left": [ - "keyboard-state", "hyprland/workspaces" // "hyprland/submap" ], @@ -13,17 +13,28 @@ // "power-profiles-daemon" ], "modules-right": [ + "group/indicators" // "mpd", // "idle_inhibitor", - // "pulseaudio", - "network", - "cpu", - "memory", - "temperature", // "backlight", - "battery" // "tray" ], + "group/indicators": { + "orientation": "orthogonal", + "drawer": { + "transition-duration": 500, + "transition-left-to-right": true + }, + "modules": [ + "battery", + "network", + "cpu", + "memory", + "temperature", + "keyboard-state", + "pulseaudio" + ] + }, "keyboard-state": { "numlock": true, "capslock": true, @@ -125,7 +136,6 @@ } }, "network": { - // "interface": "wlp2*", // (Optional) To force the use of this interface "format-wifi": "{essid} ({signalStrength}%) ", "format-ethernet": "{ipaddr}/{cidr} ", "tooltip-format": "{ifname} via {gwaddr} ", diff --git a/configs/waybar/style.css b/configs/waybar/style.css index 4d7b85e..92df1f4 100644 --- a/configs/waybar/style.css +++ b/configs/waybar/style.css @@ -1,17 +1,16 @@ -/* @import "macchiato.css";*/ - -/** { - color: @text; -}*/ - -/*window#waybar { - background-color: shade(@base, 0.9); - border: 2px solid alpha(@crust, 0.3); - padding-left: 1em; - padding-right: 1em; -} -*/ +@import "mocha.css"; * { - font-family: "Arimo Nerd Font", "Font Awesome 6 Free"; -} \ No newline at end of file + color: @text; + font-family: "Arimo Nerd Font", "Font Awesome 6 Free"; + border: none; + border-radius: 0; + font-size: 13px; + min-height: 0; +} + +window#waybar { + background-color: shade(@base, 0.9); + border: 2px solid alpha(@crust, 0.3); +} + diff --git a/framework13.configuration.nix b/framework13.configuration.nix new file mode 100644 index 0000000..76fea23 --- /dev/null +++ b/framework13.configuration.nix @@ -0,0 +1,35 @@ +{ pkgs, config, ... }: +let + user = { + name = "ari"; + fullName = "Ari Sosnovsky"; + email = "ariel@sosnovsky.ca"; + }; +in +{ + imports = + [ + /etc/nixos/cachix.nix + + (import /home/ari/nixos-setup/main.nix { + enableFingerPrint = true; + hostName = "fwbook"; + user = user; + }) + /home/ari/nixos-setup/modules/optional/amd-packages.nix + /home/ari/nixos-setup/modules/optional/gnome.nix + (import /home/ari/nixos-setup/modules/optional/hyprland.nix { + user = user; + }) + ]; + hardware.framework.amd-7040.preventWakeOnAC = true; + services.fwupd.enable = true; + fileSystems."/mnt/Data" = { + device = "/dev/sda1"; + fsType = "ext4"; + options = [ + "users" + "nofail" + ]; + }; +} diff --git a/modules/optional/hyprland.nix b/modules/optional/hyprland.nix index 4c3d002..9afda20 100644 --- a/modules/optional/hyprland.nix +++ b/modules/optional/hyprland.nix @@ -8,27 +8,28 @@ xdg-desktop-portal-hyprland dunst pavucontrol + lxqt.lxqt-policykit ]; services.mpd.enable = true; services.pipewire.enable = true; services.pipewire.wireplumber.enable = true; - security.polkit.enable = true; + # security.polkit.enable = true; users.users.${user.name}.extraGroups = [ "input" ]; - systemd = { - user.services.polkit-gnome-authentication-agent-1 = { - description = "polkit-gnome-authentication-agent-1"; - wantedBy = [ "graphical-session.target" ]; - wants = [ "graphical-session.target" ]; - after = [ "graphical-session.target" ]; - serviceConfig = { - Type = "simple"; - ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"; - Restart = "on-failure"; - RestartSec = 1; - TimeoutStopSec = 10; - }; - }; - }; + # systemd = { + # user.services.polkit-gnome-authentication-agent-1 = { + # description = "polkit-gnome-authentication-agent-1"; + # wantedBy = [ "graphical-session.target" ]; + # wants = [ "graphical-session.target" ]; + # after = [ "graphical-session.target" ]; + # serviceConfig = { + # Type = "simple"; + # ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"; + # Restart = "on-failure"; + # RestartSec = 1; + # TimeoutStopSec = 10; + # }; + # }; + # }; }