Compare commits

7 Commits

Author SHA1 Message Date
6e5c801507 laptop thinkpad config 2025-07-03 01:38:05 +09:30
86c7d6f997 Updated waybar for laptop 2025-07-03 01:37:22 +09:30
0f8709784a Finalised tweaks to waybar niri and wezterm 2025-06-26 16:27:25 +09:30
bafa00a6a1 Added waybar launch 2025-06-26 15:13:00 +09:30
5fbd147cc4 Updated waybar fuzzel and niri configs for the laptop 2025-06-26 15:11:00 +09:30
Dan MacLeod
56ae2cd201 updated niri config file 2025-06-26 15:02:38 +09:30
Dan MacLeod
0b238f52ef Moved power menu to a subfolder of waybar 2025-06-26 14:18:57 +09:30
4 changed files with 65 additions and 53 deletions

View File

@@ -3,6 +3,10 @@
// Check the wiki for a full description of the configuration:
// https://github.com/YaLTeR/niri/wiki/Configuration:-Introduction
hotkey-overlay {
skip-at-startup
}
// Input device configuration.
// Find the full list of options on the wiki:
// https://github.com/YaLTeR/niri/wiki/Configuration:-Input
@@ -117,35 +121,25 @@ input {
// automatically.
position x=1280 y=0
}
output "HDMI-A-1" {
// Uncomment this line to disable this output.
// off
// Resolution and, optionally, refresh rate of the output.
// The format is "<width>x<height>" or "<width>x<height>@<refresh rate>".
// If the refresh rate is omitted, niri will pick the highest refresh rate
// for the resolution.
// If the mode is omitted altogether or is invalid, niri will pick one automatically.
// Run `niri msg outputs` while inside a niri instance to list all outputs and their modes.
mode "2560x1440@74.924"
// You can use integer or fractional scale, for example use 1.5 for 150% scale.
output "Acer Technologies KG272U TP1SA002851C" {
mode "2560x1440"
scale 1
// Transform allows to rotate the output counter-clockwise, valid values are:
// normal, 90, 180, 270, flipped, flipped-90, flipped-180 and flipped-270.
transform "90"
position x=0 y=0
}
// Position of the output in the global coordinate space.
// This affects directional monitor actions like "focus-monitor-left", and cursor movement.
// The cursor can only move between directly adjacent outputs.
// Output scale and rotation has to be taken into account for positioning:
// outputs are sized in logical, or scaled, pixels.
// For example, a 3840×2160 output with scale 2.0 will have a logical size of 1920×1080,
// so to put another output directly adjacent to it on the right, set its x to 1920.
// If the position is unset or results in an overlap, the output is instead placed
// automatically.
position x=0 y=-730
output "ViewSonic Corporation VX2758-Series VVF190100000" {
mode "2560x1440"
scale 1
transform "normal"
position x=1440 y=755
focus-at-startup
}
output "AU Optronics 0x583D Unknown" {
mode "1920x1080"
scale 1.25
transform "normal"
}
// Settings that influence how windows are positioned and sized.
@@ -181,7 +175,7 @@ layout {
// preset-window-heights { }
// You can change the default width of the new windows.
default-column-width { proportion 0.5; }
default-column-width { proportion 0.66667; }
// If you leave the brackets empty, the windows themselves will decide their initial width.
// default-column-width {}
@@ -307,14 +301,11 @@ layout {
spawn-at-startup "waybar"
spawn-at-startup "/home/danmac/.config/niri/sway_startup" "/home/danmac/Pictures/Nextcloud/IMG_8826-Enhanced-NR.jpg"
spawn-at-startup "xwayland-satellite"
spawn-at-startup "xrdb" "/home/danmac/.Xresources"
spawn-at-startup "flatpak" "run" "com.nextcloud.desktopclient.nextcloud"
spawn-at-startup "cosmic-app-library"
environment {
DISPLAY ":0"
XCURSOR_THEME "Pop"
XCURSOR_SIZE "24"
}
// Uncomment this line to ask the clients to omit their client-side decorations if possible.
// If the client will specifically ask for CSD, the request will be honored.
@@ -348,13 +339,13 @@ animations {
// Work around WezTerm's initial configure bug
// by setting an empty default-column-width.
window-rule {
// window-rule {
// This regular expression is intentionally made as specific as possible,
// since this is the default config, and we want no false positives.
// You can get away with just app-id="wezterm" if you want.
match app-id=r#"^org\.wezfurlong\.wezterm$"#
default-column-width {}
}
// match app-id=r#"^org\.wezfurlong\.wezterm$"#
// default-column-width { }
// }
// Open the Firefox picture-in-picture player as floating by default.
window-rule {
@@ -370,6 +361,21 @@ window-rule {
open-floating true
}
window-rule {
// Zed and Zen should be 66% wide
match app-id="dev.zed.Zed"
match app-id="zen"
default-column-width { proportion 0.66667; }
}
window-rule {
// Nautilus open dialog should be floating
match app-id="org.gnome.Nautilus" title=r#"^Open"#
open-floating true
}
// Example: block out two password managers from screen capture.
// (This example rule is commented out with a "/-" in front.)
/-window-rule {
@@ -409,8 +415,11 @@ binds {
Mod+D hotkey-overlay-title="Open the COSMIC App Launcher" { spawn "cosmic-app-library"; }
Mod+Shift+D hotkey-overlay-title="Run an Application: fuzzel" { spawn "fuzzel"; }
Mod+B hotkey-overlay-title="Open the Default Browser" { spawn "xdg-open" "http://"; }
Super+Alt+L hotkey-overlay-title="Lock the Screen: swaylock" { spawn "swaylock"; }
Super+Alt+L hotkey-overlay-title="Lock the Screen: swaylock" { spawn "swaylock" "-f" "-i" "/usr/share/backgrounds/gnome/swoosh-l.jxl"; }
// toggle notification panel
Mod+Shift+N hotkey-overlay-title="Toggle notification window" { spawn "swaync-client" "-t"; }
XF86NotificationCenter hotkey-overlay-title="Toggle notification window" { spawn "swaync-client" "-t"; }
// You can also use a shell. Do this if you need pipes, multiple commands, etc.
// Note: the entire command goes as a single argument in the end.
// Mod+T { spawn "bash" "-c" "notify-send hello && exec alacritty"; }
@@ -422,6 +431,7 @@ binds {
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"; }
XF86AudioPlay allow-when-locked=true { spawn "playerctl" "play-pause"; }
XF86Favorites allow-when-locked=true { spawn "playerctl" "play-pause"; }
// Open/close the Overview: a zoomed-out view of workspaces and windows.
// You can also move the mouse into the top-left hot corner,
@@ -588,6 +598,7 @@ binds {
Mod+Shift+R { switch-preset-window-height; }
Mod+Ctrl+R { reset-window-height; }
Mod+F { maximize-column; }
Mod+G { reset-window-height; }
Mod+Shift+F { fullscreen-window; }
// Expand the focused column to space not taken up by other fully visible columns.

View File

@@ -1,8 +1,8 @@
{
"layer": "top", // Waybar at top layer
"output": ["eDP-1", "DP-1"], // Only display on on monitor
"output": ["DP-1", "eDP-1"], // Only display on on monitor
"position": "top", // Waybar position (top|bottom|left|right)
"height": 36, // Waybar height (to be removed for auto height)
"height": 28, // Waybar height (to be removed for auto height)
// Choose the order of the modules
"modules-left": [
"custom/logo",
@@ -42,7 +42,7 @@
},
"wlr/taskbar": {
"active-first": true,
"icon-size": 24,
"icon-size": 20,
"on-click": "activate",
"on-click-middle": "close",
"app_ids-mapping": {
@@ -59,7 +59,7 @@
}
},
"tray": {
// "icon-size": 21,
"icon-size": 20,
"spacing": 10
},
"clock": {
@@ -92,7 +92,7 @@
"on-click-right": "exec wezterm -e btm"
},
"memory": {
"format": "{percentage}% / {used:0.1f}GiB ",
"format": "{percentage}% ",
"on-click-right": "exec wezterm -e btm"
},
"temperature": {
@@ -117,7 +117,7 @@
"critical": 15
},
"format": "{capacity}% {icon}",
"format-charging": "󱐋",
"format-charging": "{capacity}% 󱐋",
"format-plugged": "",
"format-alt": "{capacity}% {time}",
"format-icons": ["", "", "", "", ""]

View File

@@ -12,6 +12,7 @@
#waybar {
background-color: alpha(@base, 0.7);
/* background: transparent; */
margin: 0px;
}
#custom-logo {
@@ -19,7 +20,7 @@
background-color: @base;
background-position: center;
background-repeat: no-repeat;
background-size: 24px;
background-size: 40%;
padding: 0px 8px 0px 24px;
}
@@ -34,7 +35,7 @@
#custom-pl-pulse,
#custom-pl-idle-before,
#custom-pl-tray {
font-size: 26px;
font-size: 24px;
}
#workspaces *,
@@ -43,8 +44,8 @@
#clock,
#idle_inhibitor,
#cpu,
#battery,
#memory,
#battery,
#temperature,
#pulseaudio,
#custom-power,

View File

@@ -1,16 +1,16 @@
local wezterm = require 'wezterm'
local wezterm = require("wezterm")
local c = {}
-- Display Configuration
c.font = wezterm.font 'NotoMono Nerd Font'
c.color_scheme = 'Catppuccin Macchiato'
c.font = wezterm.font("NotoMono Nerd Font")
c.color_scheme = "Catppuccin Macchiato"
c.window_background_opacity = 0.7
c.window_decorations = 'RESIZE'
c.window_decorations = "NONE"
c.visual_bell = {
fade_in_function = 'EaseIn',
fade_in_function = "EaseIn",
fade_in_duration_ms = 150,
fade_out_function = 'EaseOut',
fade_out_function = "EaseOut",
fade_out_duration_ms = 150,
}
@@ -23,6 +23,6 @@ c.switch_to_last_active_tab_when_closing_tab = true
-- Stop Confirming shit please
c.window_close_confirmation = 'NeverPrompt'
c.window_close_confirmation = "NeverPrompt"
return c