diff --git a/.envrc b/.envrc index e3fecb3..4baea90 100644 --- a/.envrc +++ b/.envrc @@ -1,2 +1,6 @@ -use flake +if ! has nix_direnv_version || ! nix_direnv_version 3.1.0; then + source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.1.0/direnvrc" "sha256-yMJ2OVMzrFaDPn7q8nCBZFRYpL/f0RcHzhmw/i6btJM=" +fi +nix_direnv_manual_reload +use flake diff --git a/configs/niri-config.kdl b/configs/niri-config.kdl index db8949d..55348fb 100644 --- a/configs/niri-config.kdl +++ b/configs/niri-config.kdl @@ -8,7 +8,9 @@ input { spawn-at-startup "xwayland-satellite" spawn-at-startup "ghostty" spawn-at-startup "mako" -//spawn-at-startup "sfwbar" +spawn-at-startup "nm-applet --indicator" +spawn-at-startup "waybar" +spawn-at-startup "waybar -c /home/ari/.config/waybar/bottom-config.jsonc" environment { QT_QPA_PLATFORM "wayland" @@ -55,6 +57,7 @@ output "Samsung Electric Company S22R35x H4TR503886" { layout { gaps 8 center-focused-column "never" + tab-indicator preset-column-widths { proportion 0.33333 proportion 0.5 @@ -79,7 +82,14 @@ screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png" // Open the Firefox picture-in-picture player as floating by default. window-rule { match app-id=r#"firefox$"# title="^Picture-in-Picture$" + match app-id="org.pulseaudio.pavucontrol" + match app-id="Rofi" + match app-id="nm-connection-editor" + match app-id=".blueman-manager-wrapped" open-floating true + default-floating-position x=0 y=25 relative-to="top" + default-window-height { proportion 0.5; } + default-column-width { proportion 0.25; } } window-rule { match is-active=false @@ -89,14 +99,9 @@ window-rule { match app-id=r#"^Slack$"# match app-id=r#"^code$"# exclude app-id=r#"^code$"# title=r#"^Visual Studio Code$"# - open-maximized true open-fullscreen true open-floating false } -//window-rule { -// match app-id=r#"^code$"# title=r#"^Visual Studio Code$"# -// open-floating true -//} // ========================= // General Stuff // ========================= @@ -121,8 +126,9 @@ binds { XF86AudioLowerVolume allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1-"; } XF86AudioMute allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle"; } XF86AudioMicMute allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle"; } - XF86MonBrightnessUp { spawn "brightnessctl set 10%+"; } - XF86MonBrightnessDown { spawn "brightnessctl set 10%-"; } + XF86MonBrightnessUp { spawn "brightnessctl" "set" "10%+"; } + XF86MonBrightnessDown { spawn "brightnessctl" "set" "10%-"; } + Mod+Alt+L { spawn "/run/current-system/sw/bin/makoctl" "dismiss" "-a"; } Mod+Left { focus-column-left; } Mod+Down { focus-workspace-down; } @@ -156,4 +162,31 @@ binds { Ctrl+Alt+Delete { quit; } Mod+Q { close-window; } + + Mod+Ctrl+W { spawn "waybar"; } + Mod+Ctrl+B { spawn "waybar" "-c" "/home/ari/.config/waybar/bottom-config.jsonc"; } +} + + +/// Com Apps +workspace "chat" { + open-on-output "eDP-1" +} +spawn-at-startup "slack" +spawn-at-startup "signal-desktop" +spawn-at-startup "gnome-calendar" +window-rule { + match app-id=r#"^Slack$"# + match app-id=r#"^signal$"# + match app-id=r#"^org.gnome.Calendar$"# + open-on-workspace "chat" + open-fullscreen true +} + +/// Coding +workspace "code" +window-rule { + match app-id=r#"^code$"# + match app-id=r#"^DBeaver$"# + open-on-workspace "code" } diff --git a/configs/nwg-bar/bar.json b/configs/nwg-bar/bar.json deleted file mode 100644 index a874e8e..0000000 --- a/configs/nwg-bar/bar.json +++ /dev/null @@ -1,27 +0,0 @@ -[ - { - "label": "Sleep", - "exec": "systemctl suspend", - "icon": "/nix/store/rwc6cn4dcv2simn3c4kmy2wgi0s9x3df-nwg-bar-0.1.6/share/nwg-bar/images/system-suspend.svg" - }, - { - "label": "Hibernate", - "exec": "systemctl hibernate", - "icon": "/nix/store/rwc6cn4dcv2simn3c4kmy2wgi0s9x3df-nwg-bar-0.1.6/share/nwg-bar/images/system-hibernate.svg" - }, - { - "label": "Logout", - "exec": "hyprctl dispatch exit", - "icon": "/nix/store/rwc6cn4dcv2simn3c4kmy2wgi0s9x3df-nwg-bar-0.1.6/share/nwg-bar/images/system-log-out.svg" - }, - { - "label": "Reboot", - "exec": "systemctl reboot", - "icon": "/nix/store/rwc6cn4dcv2simn3c4kmy2wgi0s9x3df-nwg-bar-0.1.6/share/nwg-bar/images/system-reboot.svg" - }, - { - "label": "Shutdown", - "exec": "systemctl -i poweroff", - "icon": "/nix/store/rwc6cn4dcv2simn3c4kmy2wgi0s9x3df-nwg-bar-0.1.6/share/nwg-bar/images/system-shutdown.svg" - } -] \ No newline at end of file diff --git a/configs/nwg-bar/style.css b/configs/nwg-bar/style.css deleted file mode 100644 index 50e547d..0000000 --- a/configs/nwg-bar/style.css +++ /dev/null @@ -1,35 +0,0 @@ -window { - background-color: rgba (0, 0, 0, 1.0) -} - -/* Outer bar container, takes all the window width/height */ -#outer-box { - margin: 0px -} - -/* Inner bar container, surrounds buttons */ -#inner-box { - background-color: rgba (0, 0, 0, 0.85); - border-radius: 10px; - border-style: none; - border-width: 1px; - border-color: rgba (156, 142, 122, 0.7); - padding: 5px; - margin: 5px -} - -button, image { - background: none; - border: none; - box-shadow: none -} - -button { - padding-left: 10px; - padding-right: 10px; - margin: 5px -} - -button:hover { - background-color: rgba (255, 255, 255, 0.1) -} diff --git a/configs/waybar/bottom-config.jsonc b/configs/waybar/bottom-config.jsonc new file mode 100644 index 0000000..9fe7b19 --- /dev/null +++ b/configs/waybar/bottom-config.jsonc @@ -0,0 +1,23 @@ +{ + "layer": "top", + "position": "bottom", // Waybar at bottom layer + "height": 32, + "margin-top": 4, + "margin-left": 4, + "margin-right": 4, + "spacing": 0, + "modules-left": [ + "niri/workspaces", + ], + "modules-center": [ + "wlr/taskbar" + ], + "modules-right": [], + "niri/workspaces": { + "format": "{icon}", + "format-icons": { + "code": "💻", + "chat": "💬" + } + } +} diff --git a/configs/waybar/config b/configs/waybar/config deleted file mode 100644 index bc45b55..0000000 --- a/configs/waybar/config +++ /dev/null @@ -1,129 +0,0 @@ -{ - "layer": "bottom", - "position": "bottom", - "mod": "dock", - "exclusive": true, - "gtk-layer-shell": true, - "margin-bottom": -1, - "passthrough": false, - "height": 41, - "modules-left": [ - "custom/os_button", - "hyprland/workspaces" - // "wlr/taskbar" - ], - "modules-center": [], - "modules-right": [ - "cpu", - // "temperature", - "memory", - // "disk", - // "tray", - "pulseaudio", - "network", - "battery", - "clock" - ], - "hyprland/workspaces": { - "icon-size": 32, - "spacing": 16, - "on-scroll-up": "hyprctl dispatch workspace r+1", - "on-scroll-down": "hyprctl dispatch workspace r-1" - }, - "custom/os_button": { - "format": "☕", - "on-click": "nwg-bar", - "tooltip": false - }, - "cpu": { - "interval": 5, - "format": "💻 {usage}%", - "max-length": 10 - }, - "temperature": { - "hwmon-path-abs": "/sys/devices/platform/coretemp.0/hwmon", - "input-filename": "temp2_input", - "critical-threshold": 75, - "tooltip": false, - "format-critical": "({temperatureC}°C)", - "format": "({temperatureC}°C)" - }, - "disk": { - "interval": 30, - "format": "💾 {percentage_used}%", - "path": "/", - "tooltip": true, - "unit": "GB", - "tooltip-format": "Available {free} of {total}" - }, - "memory": { - "interval": 10, - "format": "🐏 {percentage}%", - "max-length": 10, - "tooltip": true, - "tooltip-format": "RAM - {used:0.1f}GiB used" - }, - "wlr/taskbar": { - "format": "{icon} {title:.17}", - "icon-size": 28, - "spacing": 3, - "on-click-middle": "close", - "tooltip-format": "{title}", - "ignore-list": [], - "on-click": "activate" - }, - "tray": { - "icon-size": 18, - "spacing": 3 - }, - "clock": { - "format": " {:%R\n %d.%m.%Y}", - "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" - } - }, - "network": { - "format-wifi": " {icon}", - "format-ethernet": " 🔌 ", - "format-disconnected": " 🟥" - }, - "battery": { - "states": { - "good": 95, - "warning": 30, - "critical": 20 - }, - "format": "{icon} {capacity}%", - "format-charging": "🔋 {capacity}%", - "format-plugged": "🔌 {capacity}%", - "format-alt": "{time} {icon}", - "format-icons": [ - "🔋" - ] - }, - "pulseaudio": { - "format": "{volume}% {icon}", - "format-bluetooth": "{volume}% {icon}", - "format-icons": { - "alsa_output.pci-0000_00_1f.3.analog-stereo": "", - "alsa_output.pci-0000_00_1f.3.analog-stereo-muted": "", - "headphones": "", - "handsfree": "", - "headset": "", - "phone": "", - "phone-muted": "", - "portable": "", - "car": "", - "default": [ - "", - "" - ] - }, - "scroll-step": 1, - "on-click": "pavucontrol" - } -} \ No newline at end of file diff --git a/configs/waybar/config.jsonc b/configs/waybar/config.jsonc new file mode 100644 index 0000000..5735946 --- /dev/null +++ b/configs/waybar/config.jsonc @@ -0,0 +1,189 @@ +{ + "layer": "top", // Waybar at top layer + "height": 32, // Waybar height (to be removed for auto height) + "margin-top": 4, + "margin-left": 4, + "margin-right": 4, + "spacing": 0, // Gaps between modules (4px) + "modules-left": [ + "niri/window" + ], + "modules-center": [ + "clock" + ], + "modules-right": [ + "cpu", + "memory", + "temperature", + "network", + "keyboard-state", + "battery", + "group/sound", + "group/backlight", + "tray", + "custom/logout" + ], + // Modules configuration + "group/sound": { + "click-to-reveal": true, + "orientation": "horizontal", + "drawer": { + "transition-duration": 500, + "transition-left-to-right": true + }, + "modules": [ + "pulseaudio", + "pulseaudio/slider" + ] + }, + "group/backlight": { + "click-to-reveal": true, + "orientation": "horizontal", + "drawer": { + "transition-duration": 500, + "transition-left-to-right": true + }, + "modules": [ + "backlight", + "backlight/slider" + ] + }, + "pulseaudio/slider": { + "min": 0, + "max": 100, + "orientation": "horizontal" + }, + "custom/logout": { + "format": "⏻", + "tooltip": true, + "on-click": "niri msg action quit" + }, + "keyboard-state": { + "numlock": true, + "capslock": true, + "format": "{name} {icon}", + "format-icons": { + "locked": "", + "unlocked": "" + } + }, + "niri/window": { + "icon": true, + "format": "{app_id}/{title}" + }, + "idle_inhibitor": { + "format": "{icon}", + "format-icons": { + "activated": "", + "deactivated": "" + } + }, + "tray": { + // "icon-size": 21, + "spacing": 10 + }, + "clock": { + "tooltip-format": "{:%Y %B}\n{calendar}", + "format": "{:%e %B %H:%M}" + }, + "cpu": { + "format": "{usage}% ", + "tooltip": false + }, + "memory": { + "format": "{}% " + }, + "temperature": { + // "thermal-zone": 2, + // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input", + "critical-threshold": 80, + // "format-critical": "{temperatureC}°C {icon}", + "format": "{temperatureC}°C {icon}", + "format-icons": [ + "", + "", + "" + ] + }, + "backlight": { + // "device": "acpi_video1", + "format": "{percent}% {icon}", + "format-icons": [ + "", + "", + "", + "", + "", + "", + "", + "", + "" + ] + }, + "battery": { + "states": { + "good": 95, + "warning": 30, + "critical": 15 + }, + "format": "{capacity}% {icon}", + "format-charging": "{capacity}% ", + "format-plugged": "{capacity}% ", + "format-alt": "{time} {icon}", + "format-icons": [ + "", + "", + "", + "", + "" + ] + }, + "battery#bat2": { + "bat": "BAT2" + }, + "network": { + "format": "{ifname} {essid}", + "tooltip-format": "{ifname} {ipaddr}/{cidr} {essid} {icon} {frequency} {signaldBm}", + // "format-wifi": "", + // "format-ethernet": "", + // "tooltip-format": "{ifname} via {gwaddr} ", + // "format-linked": "", + // "format-disconnected": "⚠", + // "format-alt": "{ifname}: {ipaddr}/{cidr}", + "on-click": "nmcli device wifi rescan && ghostty -e nmtui" + }, + "pulseaudio": { + "format": "{volume}% {icon}", + "format-bluetooth": "{volume}% {icon}", + "format-bluetooth-muted": " {icon}", + "format-muted": "", + "format-source": "{volume}% ", + "format-source-muted": "", + "format-icons": { + "headphone": "", + "hands-free": "", + "headset": "", + "phone": "", + "portable": "", + "car": "", + "default": [ + "", + "", + "" + ] + }, + "on-click": "pavucontrol" + }, + "custom/media": { + "format": "{icon} {}", + "return-type": "json", + "max-length": 40, + "format-icons": { + "spotify": "", + "default": "🎜" + }, + "escape": true, + "exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder + // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name + } +} \ No newline at end of file diff --git a/configs/waybar/style.css b/configs/waybar/style.css index f038def..d4b5c2c 100644 --- a/configs/waybar/style.css +++ b/configs/waybar/style.css @@ -1,181 +1,316 @@ - -/*base background color*/ -@define-color bg_main rgba(25, 25, 25, 0.65); -@define-color bg_main_tooltip rgba(0, 0, 0, 0.7); - - -/*base background color of selections */ -@define-color bg_hover rgba(200, 200, 200, 0.3); -/*base background color of active elements */ -@define-color bg_active rgba(100, 100, 100, 0.5); - -/*base border color*/ -@define-color border_main rgba(255, 255, 255, 0.2); - -/*text color for entries, views and content in general */ -@define-color content_main white; -/*text color for entries that are unselected */ -@define-color content_inactive rgba(255, 255, 255, 0.25); - * { - text-shadow: none; - box-shadow: none; - border: none; - border-radius: 0; - font-family: "Fira Code", "Ubuntu"; - font-weight: 600; - font-size: 12.7px; + font-family: "Fira Code"; + font-size: 14px; + /* font-feature-settings: "tnum";*/ } window#waybar { - background: @bg_main; - border-top: 1px solid @border_main; - color: @content_main; + /*background: transparent;*/ + background-color: rgba(30, 30, 46, 0.5); + /* border-bottom: 2px solid rgba(147, 153, 178, 0.5); */ + /* border: 1px solid rgba(166, 173, 200, 1.0); */ + color: #ffffff; + /* transition-property: background-color; */ + /* transition-duration: .5s; */ } -tooltip { - background: @bg_main_tooltip; - border-radius: 5px; - border-width: 1px; - border-style: solid; - border-color: @border_main; -} -tooltip label{ - color: @content_main; +window#waybar.hidden { + opacity: 0.2; } -#custom-os_button { - font-family: "JetBrainsMono Nerd Font"; - font-size: 24px; - padding-left: 12px; - padding-right: 20px; - transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); +/* +window#waybar.empty { + background-color: transparent; } -#custom-os_button:hover { - background: @bg_hover; - color: @content_main; +window#waybar.solo { + background-color: #FFFFFF; +} +*/ + +window#waybar.termite { + background-color: #3F3F3F; } -#workspaces { - color: transparent; - margin-right: 1.5px; - margin-left: 1.5px; +window#waybar.chromium { + background-color: #000000; + border: none; } + +button { + /* Use box-shadow instead of border so the text isn't offset */ + box-shadow: none; + /* Avoid rounded borders under each button name */ + border: none; + border-radius: 0; + transition-property: none; +} + +/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */ +button:hover { + background: none; + box-shadow: none; + text-shadow: none; + border: none; + -gtk-icon-effect: none; + -gtk-icon-shadow: none; +} + #workspaces button { - padding: 3px; - color: @content_inactive; - transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); -} -#workspaces button.active { - color: @content_main; - border-bottom: 3px solid white; -} -#workspaces button.focused { - color: @bg_active; -} -#workspaces button.urgent { - background: rgba(255, 200, 0, 0.35); - border-bottom: 3px dashed @warning_color; - color: @warning_color; + background-color: transparent; + color: #ffffff; } + #workspaces button:hover { - background: @bg_hover; - color: @content_main; + background: rgba(0, 0, 0, 0.2); } -#taskbar { +#workspaces button.focused { + background-color: #64727D; + box-shadow: inset 0 -3px #ffffff; } -#taskbar button { - min-width: 130px; - border-bottom: 3px solid rgba(255, 255, 255, 0.3); - margin-left: 2px; - margin-right: 2px; - padding-left: 8px; - padding-right: 8px; - color: white; - transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); +#workspaces button.urgent { + background-color: #eb4d4b; } -#taskbar button.active { - border-bottom: 3px solid white; - background: @bg_active; +#mode { + background-color: #64727D; + border-bottom: 3px solid #ffffff; } -#taskbar button:hover { - border-bottom: 3px solid white; - background: @bg_hover; - color: @content_main; +#clock, +#battery, +#cpu, +#memory, +#disk, +#temperature, +#backlight, +#network, +#pulseaudio, +#wireplumber, +#custom-media, +#tray, +#mode, +#idle_inhibitor, +#keyboard-state, +#scratchpad, +#custom-logout, +#mpd { + padding: 0px 10px; + margin-right: 1px; + color: #f0f0ff; + background-color: rgba(30, 30, 46, 0.6); + border-radius: 5px; } -#cpu, #disk, #memory { - padding:3px; +#window, +#workspaces { + margin: 0 4px; } -#temperature { - color: transparent; - font-size: 0px; - transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); -} -#temperature.critical { - padding-right: 3px; - color: @warning_color; - font-size: initial; - border-bottom: 3px dashed @warning_color; - transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); +/* If workspaces is the leftmost module, omit left margin */ +.modules-left>widget:first-child>#workspaces { + margin-left: 0; } -#window { - border-radius: 10px; - margin-left: 20px; - margin-right: 20px; -} - -#tray{ - margin-left: 5px; - margin-right: 5px; -} -#tray > .passive { - border-bottom: none; -} -#tray > .active { - border-bottom: 3px solid white; -} -#tray > .needs-attention { - border-bottom: 3px solid @warning_color; -} -#tray > widget { - transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); -} -#tray > widget:hover { - background: @bg_hover; -} - -#pulseaudio { - font-family: "JetBrainsMono Nerd Font"; - padding-left: 3px; - padding-right: 3px; - transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); -} -#pulseaudio:hover { - background: @bg_hover; -} - -#network { - padding-left: 3px; - padding-right: 3px; -} - -#language { - padding-left: 5px; - padding-right: 5px; +/* If workspaces is the rightmost module, omit right margin */ +.modules-right>widget:last-child>#workspaces { + margin-right: 0; } #clock { - padding-right: 5px; - padding-left: 5px; - transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); + /* background-color: #64727D; */ + font-weight: bold; + /* background-color: rgba(0, 0, 0, 0.3); */ + /* border-radius: 99px; */ } -#clock:hover { - background: @bg_hover; + +#battery { + /* background-color: #f9e2af; */ + /* color: #000000; */ + margin-left: 4px; } + +#battery.charging, +#battery.plugged { + color: #ffffff; + background-color: #26A65B; +} + +@keyframes blink { + to { + background-color: #ffffff; + color: #000000; + } +} + +#battery.critical:not(.charging) { + background-color: #f53c3c; + color: #ffffff; + animation-name: blink; + animation-duration: 0.5s; + animation-timing-function: linear; + animation-iteration-count: infinite; + animation-direction: alternate; +} + +label:focus { + background-color: #000000; +} + +#backlight { + background-color: #90b1b1; +} + +#network.disconnected { + background-color: #f53c3c; +} + + +#taskbar { + margin-left: 4px; +} + +#taskbar button { + color: #f0f0ff; + background-color: rgba(30, 30, 46, 0.6); +} + +#taskbar button:first-child { + border-radius: 99px 0 0 99px; +} + +#taskbar button:last-child { + border-radius: 0 99px 99px 0; +} + +#taskbar button:first-child:last-child { + border-radius: 99px; +} + +#taskbar button:hover { + background-color: rgba(49, 50, 68, 0.6); +} + +#taskbar button.active { + background-color: rgba(88, 91, 112, 0.6); +} + +#taskbar button.active:hover { + background-color: rgba(108, 112, 134, 0.6); +} + +#pulseaudio { + background-color: #f1c40f; + color: #000000; +} + +#pulseaudio.muted { + background-color: #90b1b1; + color: #2a5c45; +} + +slider { + min-height: 0px; + min-width: 0px; + opacity: 0; + background-image: none; + border: none; + box-shadow: none; +} + +trough { + min-height: 10px; + min-width: 80px; + border-radius: 5px; + background-color: black; +} + +highlight { + min-width: 10px; + border-radius: 5px; + background-color: green; +} + +#wireplumber { + background-color: #fff0f5; + color: #000000; +} + +#wireplumber.muted { + background-color: #f53c3c; +} + +#custom-media { + background-color: #66cc99; + color: #2a5c45; + min-width: 100px; +} + +#custom-media.custom-spotify { + background-color: #66cc99; +} + +#custom-media.custom-vlc { + background-color: #ffa000; +} + +#temperature { + background-color: #f0932b; +} + +#temperature.critical { + background-color: #eb4d4b; +} + +#tray { + background-color: #2980b9; +} + +#tray>.passive { + -gtk-icon-effect: dim; +} + +#tray>.needs-attention { + -gtk-icon-effect: highlight; + background-color: #eb4d4b; +} + +#idle_inhibitor { + background-color: #2d3436; +} + +#idle_inhibitor.activated { + background-color: #ecf0f1; + color: #2d3436; +} + +#language { + background: #00b093; + color: #740864; + margin: 0 5px; + min-width: 16px; +} + +#keyboard-state { + background: #97e1ad; + color: #000000; +} + +#keyboard-state>label { + margin-left: 2.5px; + margin-right: 2.5px; + padding: 0 5px; +} + +#keyboard-state>label.locked { + background: rgba(0, 0, 0, 0.2); +} + +#scratchpad { + background: rgba(0, 0, 0, 0.2); +} + +#scratchpad.empty { + background-color: transparent; +} \ No newline at end of file diff --git a/flake.lock b/flake.lock index a65ed06..e16d311 100644 --- a/flake.lock +++ b/flake.lock @@ -1,61 +1,5 @@ { "nodes": { - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "ghostty": { - "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs", - "zig": "zig", - "zon2nix": "zon2nix" - }, - "locked": { - "lastModified": 1751413371, - "narHash": "sha256-yY7K58oczWzTfKlP6K2cICioAzG4WCkppO9pZuXQWoM=", - "owner": "ghostty-org", - "repo": "ghostty", - "rev": "776d25b0652068e5eeb802670a7adfbbcadf8e8b", - "type": "github" - }, - "original": { - "owner": "ghostty-org", - "repo": "ghostty", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -130,19 +74,6 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 1748189127, - "narHash": "sha256-zRDR+EbbeObu4V2X5QCd2Bk5eltfDlCr5yvhBwUT6pY=", - "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334", - "type": "tarball", - "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.802491.7c43f080a7f2/nixexprs.tar.xz" - }, - "original": { - "type": "tarball", - "url": "https://channels.nixos.org/nixos-25.05/nixexprs.tar.xz" - } - }, - "nixpkgs_2": { "locked": { "lastModified": 1751211869, "narHash": "sha256-1Cu92i1KSPbhPCKxoiVG5qnoRiKTgR5CcGSRyLpOd7Y=", @@ -160,13 +91,12 @@ }, "root": { "inputs": { - "ghostty": "ghostty", "home-manager": "home-manager", "nix-darwin": "nix-darwin", "nix-flatpak": "nix-flatpak", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", - "systems": "systems_2" + "nixpkgs": "nixpkgs", + "systems": "systems" } }, "systems": { @@ -183,75 +113,6 @@ "repo": "default", "type": "github" } - }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "zig": { - "inputs": { - "flake-compat": [ - "ghostty" - ], - "flake-utils": [ - "ghostty", - "flake-utils" - ], - "nixpkgs": [ - "ghostty", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1748261582, - "narHash": "sha256-3i0IL3s18hdDlbsf0/E+5kyPRkZwGPbSFngq5eToiAA=", - "owner": "mitchellh", - "repo": "zig-overlay", - "rev": "aafb1b093fb838f7a02613b719e85ec912914221", - "type": "github" - }, - "original": { - "owner": "mitchellh", - "repo": "zig-overlay", - "type": "github" - } - }, - "zon2nix": { - "inputs": { - "flake-utils": [ - "ghostty", - "flake-utils" - ], - "nixpkgs": [ - "ghostty", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1742104771, - "narHash": "sha256-LhidlyEA9MP8jGe1rEnyjGFCzLLgCdDpYeWggibayr0=", - "owner": "jcollie", - "repo": "zon2nix", - "rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613", - "type": "github" - }, - "original": { - "owner": "jcollie", - "ref": "56c159be489cc6c0e73c3930bd908ddc6fe89613", - "repo": "zon2nix", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 4e32f9a..7f755bc 100644 --- a/flake.nix +++ b/flake.nix @@ -6,10 +6,6 @@ # Nixpkgs nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; # Terminal - ghostty = { - url = "github:ghostty-org/ghostty"; - inputs.nixpkgs-stable.follows = "nixpkgs"; - }; # Flatpak nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=main"; # Home manager @@ -32,7 +28,6 @@ , home-manager , nix-darwin , nix-flatpak - , ghostty , }: let @@ -78,10 +73,7 @@ nix-flatpak ; specialArgs = { - inputs = { - inherit - ghostty; - }; + inputs = { }; }; }; # Libs diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index c99680a..9ee5895 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -139,7 +139,7 @@ in # Work gdk slack - google-chrome + google-chrome # IPhone Tethering libimobiledevice diff --git a/modules/home/default.nix b/modules/home/default.nix index 4ddd4b3..2eb70b1 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -21,6 +21,7 @@ in kubectl kubectx htop + btop duf ]; }; @@ -59,6 +60,7 @@ in ipfetch nixd htop + btop fastfetch kubectl kubectx diff --git a/modules/nixos/common/fonts.nix b/modules/nixos/common/fonts.nix index f0c036e..0c25cd2 100644 --- a/modules/nixos/common/fonts.nix +++ b/modules/nixos/common/fonts.nix @@ -1,17 +1,25 @@ { pkgs, ... }: +let + fontPackages = with pkgs; [ + nerd-fonts.fira-code + nerd-fonts.droid-sans-mono + nerd-fonts.fira-mono + fira-code + fira-code-symbols + font-awesome + mplus-outline-fonts.githubRelease + jetbrains-mono + ubuntu_font_family + noto-fonts + noto-fonts-cjk-sans + noto-fonts-emoji + noto-fonts-color-emoji + ]; +in { + environment.systemPackages = fontPackages; fonts = { - packages = with pkgs; [ - fira-code - fira-code-symbols - font-awesome - mplus-outline-fonts.githubRelease - jetbrains-mono - ubuntu_font_family - noto-fonts - noto-fonts-cjk-sans - noto-fonts-emoji - ]; + packages = fontPackages; enableDefaultPackages = true; fontDir.enable = true; fontconfig = { @@ -24,3 +32,4 @@ }; }; } + diff --git a/modules/nixos/desktop/gnome.nix b/modules/nixos/desktop/gnome.nix index 68e0a9f..f6cef24 100644 --- a/modules/nixos/desktop/gnome.nix +++ b/modules/nixos/desktop/gnome.nix @@ -1,6 +1,11 @@ { config, lib, pkgs, ... }: let cfg = config.skyg.nixos.desktop.gnome; + gnomeExtensions = with pkgs.gnomeExtensions; [ + pop-shell + docker + krypto + ]; in { options = { @@ -17,7 +22,7 @@ in gnome-console ]; environment.sessionVariables.GSK_RENDERER = "gl"; # fix blackbars around wayland windows - environment.systemPackages = with pkgs; [ gnomeExtensions.pop-shell ]; + environment.systemPackages = gnomeExtensions; programs.dconf.enable = true; home-manager.users.${config.skyg.user.name}.dconf.settings = { "org/gnome/desktop/wm/keybindings" = { @@ -34,12 +39,7 @@ in }; "org/gnome/shell" = { disable-user-extensions = false; - enabled-extensions = with pkgs.gnomeExtensions; [ - gsconnect.extensionUuid - pop-shell.extensionUuid - docker.extensionUuid - krypto.extensionUuid - ]; + enabled-extensions = lib.forEach gnomeExtensions (ext: ext.extensionUuid); }; }; }; diff --git a/modules/nixos/desktop/packages.nix b/modules/nixos/desktop/packages.nix index 8b51e92..07f06a4 100644 --- a/modules/nixos/desktop/packages.nix +++ b/modules/nixos/desktop/packages.nix @@ -1,13 +1,12 @@ -{ config, lib, pkgs, inputs, ... }: +{ config, lib, pkgs, ... }: let cfg = config.skyg.nixos.desktop; - ghostty = inputs.ghostty.packages.${pkgs.stdenv.hostPlatform.system}.default; in { config = lib.mkIf cfg.enable { # Flatpak services.flatpak.enable = true; - environment.systemPackages = [ ghostty ] ++ (with pkgs; [ + environment.systemPackages = (with pkgs; [ # General utils busybox gcc @@ -19,6 +18,9 @@ in # video vlc + + # terminal + ghostty ]); }; } diff --git a/modules/nixos/desktop/tiler.nix b/modules/nixos/desktop/tiler.nix index e5624fc..98ed351 100644 --- a/modules/nixos/desktop/tiler.nix +++ b/modules/nixos/desktop/tiler.nix @@ -10,15 +10,26 @@ in }; }; config = lib.mkIf cfg.enable { + users.users.${config.skyg.user.name} = { + extraGroups = [ + "input" + ]; + }; + # services.blueman.enable = true; + # programs.nm-applet.enable = true; environment.systemPackages = with pkgs; [ mako brightnessctl - libnotify + libnotify fuzzel waybar pavucontrol - sfwbar xwayland-satellite + wofi + rofi + rofi-wayland + networkmanagerapplet + blueman ]; }; } diff --git a/tmp.log b/tmp.log new file mode 100644 index 0000000..b8aa081 Binary files /dev/null and b/tmp.log differ