Compare commits

..

2 commits

9 changed files with 220 additions and 9 deletions

View file

@ -20,4 +20,13 @@
"897c1a470da759236cc11798f4e0a5f7d4d59fbc" "897c1a470da759236cc11798f4e0a5f7d4d59fbc"
(openpgp-fingerprint (openpgp-fingerprint
"2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5")))) "2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5"))))
(channel
(name 'rosenthal)
(url "https://github.com/rakino/rosenthal")
(branch "trunk")
(introduction
(make-channel-introduction
"7677db76330121a901604dfbad19077893865f35"
(openpgp-fingerprint
"13E7 6CD6 E649 C28C 3385 4DF5 5E5A A665 6149 17F7"))))
) )

View file

@ -94,6 +94,7 @@
`(("nvim/init.vim" ,(local-file "nvim/config/init.vim")) `(("nvim/init.vim" ,(local-file "nvim/config/init.vim"))
("nvim/after/ftplugin/markdown/custom.vim" ,(local-file "nvim/config/after/ftplugin/markdown/custom.vim")) ("nvim/after/ftplugin/markdown/custom.vim" ,(local-file "nvim/config/after/ftplugin/markdown/custom.vim"))
("sway" ,(local-file "sway" #:recursive? #t)) ("sway" ,(local-file "sway" #:recursive? #t))
("hypr" ,(local-file "hypr" #:recursive? #t))
("waybar" ,(local-file "waybar" #:recursive? #t)) ("waybar" ,(local-file "waybar" #:recursive? #t))
("alacritty" ,(local-file "alacritty" #:recursive? #t)) ("alacritty" ,(local-file "alacritty" #:recursive? #t))
("home-manager" ,(local-file "nix-home-manager" #:recursive? #t)) )) ("home-manager" ,(local-file "nix-home-manager" #:recursive? #t)) ))

Binary file not shown.

After

Width:  |  Height:  |  Size: 1 MiB

9
home-config/hypr/autostart.sh Executable file
View file

@ -0,0 +1,9 @@
#!/usr/bin/env bash
waybar &
mako &
swaybg -i ~/.config/hypr/Wallpapers/mountains.jpg &
swayidle -w timeout 300 'swaylock --screenshots --clock --indicator --grace 3 --fade-in 1 --effect-blur 7x5 --effect-greyscale' timeout 600 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on' before-sleep 'swaylock -f -c 000000' &

View file

@ -0,0 +1,181 @@
exec-once = dbus-update-activation-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP=Hyprland
#
# Please note not all available settings / options are set here.
# For a full list, see the wiki
#
# See https://wiki.hyprland.org/Configuring/Monitors/
monitor=,preferred,auto,1
# See https://wiki.hyprland.org/Configuring/Keywords/ for more
# Execute your favorite apps at launch
# exec-once = waybar & hyprpaper & firefox
# Source a file (multi-file configs)
# source = ~/.config/hypr/myColors.conf
# Some default env vars.
env = XCURSOR_SIZE,24
# For all categories, see https://wiki.hyprland.org/Configuring/Variables/
input {
kb_layout = us
kb_variant =
kb_model =
kb_options =
kb_rules =
follow_mouse = 1
touchpad {
natural_scroll = no
}
sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
}
general {
# See https://wiki.hyprland.org/Configuring/Variables/ for more
gaps_in = 5
gaps_out = 10
border_size = 2
col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
col.inactive_border = rgba(595959aa)
layout = dwindle
}
decoration {
# See https://wiki.hyprland.org/Configuring/Variables/ for more
rounding = 5
blur = yes
blur_size = 3
blur_passes = 1
blur_new_optimizations = on
drop_shadow = yes
shadow_range = 4
shadow_render_power = 3
col.shadow = rgba(1a1a1aee)
}
animations {
enabled = yes
# Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more
bezier = myBezier, 0.05, 0.9, 0.1, 1.05
animation = windows, 1, 7, myBezier
animation = windowsOut, 1, 7, default, popin 80%
animation = border, 1, 10, default
animation = borderangle, 1, 8, default
animation = fade, 1, 7, default
animation = workspaces, 1, 6, default
}
dwindle {
# See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
preserve_split = yes # you probably want this
}
master {
# See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
new_is_master = true
}
gestures {
# See https://wiki.hyprland.org/Configuring/Variables/ for more
workspace_swipe = off
}
# Example per-device config
# See https://wiki.hyprland.org/Configuring/Keywords/#executing for more
device:epic-mouse-v1 {
sensitivity = -0.5
}
# Example windowrule v1
# windowrule = float, ^(kitty)$
# Example windowrule v2
# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
# See https://wiki.hyprland.org/Configuring/Keywords/ for more
$mainMod = SUPER
# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
bind = $mainMod, Return, exec, alacritty
bind = $mainMod SHIFT, Q, killactive
bind = $mainMod SHIFT, E, exit
bind = $mainMod SHIFT, Space, togglefloating
bind = $mainMod, D, exec, fuzzel --width=35 --font='Hack:weight=bold:size=12' --background-color='282a36fa' --selection-color='3d4460fa' --line-height=20 --border-radius=20
bind = $mainMod, P, pseudo, # dwindle
bind = $mainMod, J, togglesplit, # dwindle
bind = $mainMod, F, fullscreen
bind = ,XF86MonBrightnessUp, exec, light -A 10
bind = ,XF86MonBrightnessDown, exec, light -U 10
# Move focus with mainMod + arrow keys
bind = $mainMod, left, movefocus, l
bind = $mainMod, right, movefocus, r
bind = $mainMod, up, movefocus, u
bind = $mainMod, down, movefocus, d
# Move window with mainMod + SHIFT + arrow keys
bind = $mainMod SHIFT, left, movewindow, l
bind = $mainMod SHIFT, right, movewindow, r
bind = $mainMod SHIFT, up, movewindow, u
bind = $mainMod SHIFT, down, movewindow, d
# Switch workspaces with mainMod + [0-9]
bind = $mainMod, 1, workspace, 1
bind = $mainMod, 2, workspace, 2
bind = $mainMod, 3, workspace, 3
bind = $mainMod, 4, workspace, 4
bind = $mainMod, 5, workspace, 5
bind = $mainMod, 6, workspace, 6
bind = $mainMod, 7, workspace, 7
bind = $mainMod, 8, workspace, 8
bind = $mainMod, 9, workspace, 9
bind = $mainMod, 0, workspace, 10
# Move active window to a workspace with mainMod + SHIFT + [0-9]
bind = $mainMod SHIFT, 1, movetoworkspace, 1
bind = $mainMod SHIFT, 2, movetoworkspace, 2
bind = $mainMod SHIFT, 3, movetoworkspace, 3
bind = $mainMod SHIFT, 4, movetoworkspace, 4
bind = $mainMod SHIFT, 5, movetoworkspace, 5
bind = $mainMod SHIFT, 6, movetoworkspace, 6
bind = $mainMod SHIFT, 7, movetoworkspace, 7
bind = $mainMod SHIFT, 8, movetoworkspace, 8
bind = $mainMod SHIFT, 9, movetoworkspace, 9
bind = $mainMod SHIFT, 0, movetoworkspace, 10
# Scroll through existing workspaces with mainMod + scroll
bind = $mainMod, mouse_down, workspace, e+1
bind = $mainMod, mouse_up, workspace, e-1
# Move/resize windows with mainMod + LMB/RMB and dragging
bindm = $mainMod, mouse:272, movewindow
bindm = $mainMod, mouse:273, resizewindow
# Bind mainMod + L to screenlocker
bind = $mainMod, L, exec, swaylock --screenshots --clock --indicator --fade-in 1 --effect-blur 7x5 --effect-greyscale
# Keybind for screenshot
bind = $mainMod SHIFT, S, exec, grimblast copy area
bind = $mainMod SHIFT, Print, exec, grimblast edit area
# Notifications keybinds
bind = $mainMod, N, exec, makoctl dismiss
bind = $mainMod SHIFT, N, exec, makoctl dismiss -a
exec-once = ~/.config/hypr/autostart.sh

View file

@ -3,17 +3,17 @@
"position": "top", "position": "top",
"height": 30, "height": 30,
"modules-left": ["sway/workspaces", "sway/mode"], "modules-left": ["wlr/workspaces", "hyprland/submap"],
"modules-center": ["sway/window"], "modules-center": ["hyprland/window"],
"modules-right": ["tray", "custom/spotify", "custom/weather", "custom/mail", "custom/storage", "backlight", "pulseaudio", "network", "idle_inhibitor", "battery", "clock"], "modules-right": ["tray", "custom/spotify", "custom/weather", "custom/mail", "custom/storage", "backlight", "pulseaudio", "network", "idle_inhibitor", "battery", "clock"],
"sway/mode": { "hyprland/submap": {
"format": " {}" "format": " {}"
}, },
"sway/workspaces": { "wlr/workspaces": {
"format": "{name}", "format": "{name}",
"disable-scroll": true "disable-scroll": true
}, },
"sway/window": { "hyprland/window": {
"max-length": 80, "max-length": 80,
"tooltip": false "tooltip": false
}, },
@ -43,7 +43,7 @@
"ethernet": [""], "ethernet": [""],
"disconnected": ["睊"] "disconnected": ["睊"]
}, },
"on-click": "alacritty -e iwctl", "on-click": "alacritty -e doas nmtui",
"tooltip": false "tooltip": false
}, },
"pulseaudio": { "pulseaudio": {

View file

@ -37,7 +37,7 @@ window#waybar.solo {
color: rgba(217, 216, 216, 1); color: rgba(217, 216, 216, 1);
} }
#workspaces button.focused { #workspaces button.active {
border-top: 3px solid rgba(217, 216, 216, 1); border-top: 3px solid rgba(217, 216, 216, 1);
border-bottom: 3px solid rgba(217, 216, 216, 0); border-bottom: 3px solid rgba(217, 216, 216, 0);
} }

View file

@ -11,6 +11,7 @@
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (ryan-packages freedesktop) #:use-module (ryan-packages freedesktop)
#:use-module (ryan-packages wm) #:use-module (ryan-packages wm)
#:use-module (rosenthal packages wm)
#:use-module (gnu packages security-token) #:use-module (gnu packages security-token)
#:use-module (gnu services security-token) #:use-module (gnu services security-token)
#:use-module (gnu services cups) #:use-module (gnu services cups)
@ -104,6 +105,7 @@
;; under their own account: use 'guix search KEYWORD' to search ;; under their own account: use 'guix search KEYWORD' to search
;; for packages and 'guix install PACKAGE' to install a package. ;; for packages and 'guix install PACKAGE' to install a package.
(packages (append (map specification->package (list "sway" (packages (append (map specification->package (list "sway"
"hyprland"
"swaybg" "swaybg"
"swayidle" "swayidle"
;"swaylock-effects" ;"swaylock-effects"
@ -114,11 +116,12 @@
"hicolor-icon-theme" "hicolor-icon-theme"
"git" "git"
"nss-certs" "nss-certs"
"waybar" ;"waybar"
"gnupg" "gnupg"
"light" "light"
"mako" "mako"
"grim" "grim"
"grimblast"
"slurp" "slurp"
"wl-clipboard" "wl-clipboard"
"bluez" "bluez"
@ -138,7 +141,7 @@
"wireplumber" "wireplumber"
"wireshark" "wireshark"
"zsh")) "zsh"))
(list my-ca-certs xdg-desktop-portal-wlr-new swaylock-effects-new) (list my-ca-certs xdg-desktop-portal-wlr-new swaylock-effects-new waybar-new)
%my-base-packages )) %my-base-packages ))
;; Below is the list of system services. To search for available ;; Below is the list of system services. To search for available

View file

@ -1,6 +1,7 @@
(define-module (ryan-packages wm) (define-module (ryan-packages wm)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix gexp)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix utils) #:use-module (guix utils)
@ -19,3 +20,10 @@
(base32 (base32
"0j7dxn66xqlf6iv2arqzz7mxlh7nf85anvpyf30d2frcidarda9h")))) "0j7dxn66xqlf6iv2arqzz7mxlh7nf85anvpyf30d2frcidarda9h"))))
(inputs (modify-inputs (package-inputs swaylock-effects) (delete "linux-pam"))))) (inputs (modify-inputs (package-inputs swaylock-effects) (delete "linux-pam")))))
(define-public waybar-new
(package
(inherit waybar)
(arguments (list #:configure-flags #~(list "-Dexperimental=true")))))
waybar-new