5 Commits

Author SHA1 Message Date
Dan MacLeod
4def2c96e7 add intune to niri floating rule 2025-07-03 11:45:59 +09:30
Dan MacLeod
bfe91a5a67 added some window rules and changed waybar powerline separators 2025-07-02 21:32:41 +09:30
Dan MacLeod
b4235351fa Updated primary niri config 2025-06-27 11:19:06 +09:30
danmac
aeeb00aaa9 fixed to minimise the waybar height 2025-06-26 23:03:38 +09:30
danmac
46c48602f6 updated danmac@rnet-beelink bg image 2025-06-26 22:00:07 +09:30
7 changed files with 63 additions and 69 deletions

View File

@@ -24,7 +24,7 @@ font=NotoSans Nerd Font
# x-margin=0 # x-margin=0
# y-margin=0 # y-margin=0
# lines=15 # lines=15
width=40 width=80
# tabs=8 # tabs=8
# horizontal-pad=40 # horizontal-pad=40
# vertical-pad=8 # vertical-pad=8

View File

@@ -28,18 +28,17 @@ input {
// Next sections include libinput settings. // Next sections include libinput settings.
// Omitting settings disables them, or leaves them at their default values. // Omitting settings disables them, or leaves them at their default values.
touchpad { touchpad {
// off off
// tap // tap
// dwt // dwt
// dwtp // dwtp
// drag false // drag false
// drag-lock // drag-lock
natural-scroll // natural-scroll
// accel-speed 0.2 // accel-speed 0.2
// accel-profile "flat" // accel-profile "flat"
scroll-method "two-finger" // scroll-method "two-finger"
disabled-on-external-mouse // disabled-on-external-mouse
click-method "clickfinger"
} }
mouse { mouse {
@@ -61,18 +60,6 @@ input {
// middle-emulation // middle-emulation
} }
touch {
// off
map-to-output "eDP-1"
}
tablet {
// off
map-to-output "eDP-1"
// left-handed
// calibration-matrix 1.0 0.0 0.0 0.0 1.0 0.0
}
// Uncomment this to make the mouse warp to the center of newly focused windows. // Uncomment this to make the mouse warp to the center of newly focused windows.
warp-mouse-to-focus warp-mouse-to-focus
@@ -82,7 +69,6 @@ input {
// Change the Mod key to Alt // Change the Mod key to Alt
mod-key "Alt" mod-key "Alt"
mod-key-nested "Super"
} }
// You can configure outputs by their name, which you can find // You can configure outputs by their name, which you can find
@@ -136,12 +122,6 @@ output "ViewSonic Corporation VX2758-Series VVF190100000" {
focus-at-startup focus-at-startup
} }
output "AU Optronics 0x583D Unknown" {
mode "1920x1080"
scale 1.25
transform "normal"
}
// Settings that influence how windows are positioned and sized. // Settings that influence how windows are positioned and sized.
// Find more information on the wiki: // Find more information on the wiki:
// https://github.com/YaLTeR/niri/wiki/Configuration:-Layout // https://github.com/YaLTeR/niri/wiki/Configuration:-Layout
@@ -175,7 +155,7 @@ layout {
// preset-window-heights { } // preset-window-heights { }
// You can change the default width of the new windows. // You can change the default width of the new windows.
default-column-width { proportion 0.66667; } default-column-width { proportion 0.5; }
// If you leave the brackets empty, the windows themselves will decide their initial width. // If you leave the brackets empty, the windows themselves will decide their initial width.
// default-column-width {} // default-column-width {}
@@ -254,13 +234,13 @@ layout {
// radius. It has to assume that windows have square corners, leading to // radius. It has to assume that windows have square corners, leading to
// shadow artifacts inside the CSD rounded corners. This setting fixes // shadow artifacts inside the CSD rounded corners. This setting fixes
// those artifacts. // those artifacts.
// //
// However, instead you may want to set prefer-no-csd and/or // However, instead you may want to set prefer-no-csd and/or
// geometry-corner-radius. Then, niri will know the corner radius and // geometry-corner-radius. Then, niri will know the corner radius and
// draw the shadow correctly, without having to draw it behind the // draw the shadow correctly, without having to draw it behind the
// window. These will also remove client-side shadows if the window // window. These will also remove client-side shadows if the window
// draws any. // draws any.
// //
// draw-behind-window true // draw-behind-window true
// You can change how shadows look. The values below are in logical // You can change how shadows look. The values below are in logical
@@ -298,10 +278,9 @@ layout {
// See the binds section below for more spawn examples. // See the binds section below for more spawn examples.
// This line starts waybar, a commonly used bar for Wayland compositors. // This line starts waybar, a commonly used bar for Wayland compositors.
spawn-at-startup "waybar" // 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 "/home/reivernet/.config/niri/sway_startup" "/home/reivernet/Pictures/Nextcloud/IMG_8618-Enhanced-NR.jpg"
spawn-at-startup "xwayland-satellite" spawn-at-startup "xwayland-satellite"
spawn-at-startup "flatpak" "run" "com.nextcloud.desktopclient.nextcloud"
spawn-at-startup "cosmic-app-library" spawn-at-startup "cosmic-app-library"
environment { environment {
@@ -344,7 +323,7 @@ animations {
// since this is the default config, and we want no false positives. // since this is the default config, and we want no false positives.
// You can get away with just app-id="wezterm" if you want. // You can get away with just app-id="wezterm" if you want.
// match app-id=r#"^org\.wezfurlong\.wezterm$"# // match app-id=r#"^org\.wezfurlong\.wezterm$"#
// default-column-width { } // default-column-width {}
// } // }
// Open the Firefox picture-in-picture player as floating by default. // Open the Firefox picture-in-picture player as floating by default.
@@ -357,6 +336,8 @@ window-rule {
match app-id=r#"zen$"# title="^Extension:" match app-id=r#"zen$"# title="^Extension:"
match app-id=r#"com.nextcloud.desktopclient.nextcloud$"# match app-id=r#"com.nextcloud.desktopclient.nextcloud$"#
match app-id=r#"mako"# match app-id=r#"mako"#
match app-id="org.gnome.Nautilus" title="Open Folder"
match app-id="Intune-portal"
open-floating true open-floating true
} }
@@ -369,6 +350,21 @@ window-rule {
default-column-width { proportion 0.66667; } default-column-width { proportion 0.66667; }
} }
window-rule {
// Solve space property manager
match app-id="solvespace"
default-column-width { proportion 0.75; }
}
window-rule {
// Solve space property manager
match title="Property Browser — SolveSpace"
default-column-width { proportion 0.25; }
}
// Example: block out two password managers from screen capture. // Example: block out two password managers from screen capture.
// (This example rule is commented out with a "/-" in front.) // (This example rule is commented out with a "/-" in front.)
/-window-rule { /-window-rule {
@@ -405,8 +401,7 @@ binds {
// Suggested binds for running programs: terminal, app launcher, screen locker. // Suggested binds for running programs: terminal, app launcher, screen locker.
Mod+T hotkey-overlay-title="Open a Terminal: wezterm" { spawn "wezterm"; } Mod+T hotkey-overlay-title="Open a Terminal: wezterm" { spawn "wezterm"; }
Mod+D hotkey-overlay-title="Open the COSMIC App Launcher" { spawn "cosmic-app-library"; } Mod+D hotkey-overlay-title="Run an Application: cosmic-apps" { 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://"; } 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" "-f" "-i" "/usr/share/backgrounds/gnome/swoosh-l.jxl"; } Super+Alt+L hotkey-overlay-title="Lock the Screen: swaylock" { spawn "swaylock" "-f" "-i" "/usr/share/backgrounds/gnome/swoosh-l.jxl"; }
@@ -423,6 +418,8 @@ binds {
XF86AudioMute allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle"; } 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"; } XF86AudioMicMute allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle"; }
XF86AudioPlay allow-when-locked=true { spawn "playerctl" "play-pause"; } XF86AudioPlay allow-when-locked=true { spawn "playerctl" "play-pause"; }
XF86AudioPrev allow-when-locked=true { spawn "playerctl" "previous"; }
XF86AudioNext allow-when-locked=true { spawn "playerctl" "next"; }
// Open/close the Overview: a zoomed-out view of workspaces and windows. // Open/close the Overview: a zoomed-out view of workspaces and windows.
// You can also move the mouse into the top-left hot corner, // You can also move the mouse into the top-left hot corner,

View File

@@ -1,8 +1,8 @@
{ {
"layer": "top", // Waybar at top layer "layer": "top", // Waybar at top layer
"output": ["eDP-1", "DP-1"], // Only display on on monitor "output": "DP-1", // Only display on on monitor
"position": "top", // Waybar position (top|bottom|left|right) "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 // Choose the order of the modules
"modules-left": [ "modules-left": [
"custom/logo", "custom/logo",
@@ -27,7 +27,6 @@
"cpu", "cpu",
"memory", "memory",
"temperature", "temperature",
"battery",
"custom/pl-stats", "custom/pl-stats",
"pulseaudio", "pulseaudio",
"custom/pl-pulse", "custom/pl-pulse",
@@ -42,7 +41,7 @@
}, },
"wlr/taskbar": { "wlr/taskbar": {
"active-first": true, "active-first": true,
"icon-size": 24, "icon-size": 20,
"on-click": "activate", "on-click": "activate",
"on-click-middle": "close", "on-click-middle": "close",
"app_ids-mapping": { "app_ids-mapping": {
@@ -59,7 +58,7 @@
} }
}, },
"tray": { "tray": {
// "icon-size": 21, "icon-size": 20,
"spacing": 10 "spacing": 10
}, },
"clock": { "clock": {
@@ -92,7 +91,7 @@
"on-click-right": "exec wezterm -e btm" "on-click-right": "exec wezterm -e btm"
}, },
"memory": { "memory": {
"format": "{percentage}% / {used:0.1f}GiB ", "format": "{percentage}% / {used:0.1f}GiB / {avail:0.1f}GiB ",
"on-click-right": "exec wezterm -e btm" "on-click-right": "exec wezterm -e btm"
}, },
"temperature": { "temperature": {
@@ -116,9 +115,9 @@
"warning": 30, "warning": 30,
"critical": 15 "critical": 15
}, },
"format": "{capacity}% {icon}", "format": "{icon}",
"format-charging": "{capacity}% 󱐋", "format-charging": "󱐋",
"format-plugged": "{capacity}% ", "format-plugged": "",
"format-alt": "{capacity}% {time}", "format-alt": "{capacity}% {time}",
"format-icons": ["", "", "", "", ""] "format-icons": ["", "", "", "", ""]
}, },
@@ -202,36 +201,36 @@
"escape": true, "escape": true,
}, },
"custom/pl-taskbar": { "custom/pl-taskbar": {
"format": "" "format": ""
}, },
"custom/pl-workspaces": { "custom/pl-workspaces": {
"format": "" "format": ""
}, },
"custom/pl-window": { "custom/pl-window": {
"format": "" "format": ""
}, },
"custom/pl-swaync": { "custom/pl-swaync": {
"format": "" "format": ""
}, },
"custom/pl-clock": { "custom/pl-clock": {
"format": "" "format": ""
}, },
"custom/pl-idle": { "custom/pl-idle": {
"format": "" "format": ""
}, },
"custom/pl-stats": { "custom/pl-stats": {
"format": "" "format": ""
}, },
"custom/pl-pulse": { "custom/pl-pulse": {
"format": "" "format": ""
}, },
"custom/pl-tray": { "custom/pl-tray": {
"format": "" "format": ""
}, },
"custom/pl-swaync-before": { "custom/pl-swaync-before": {
"format": "" "format": ""
}, },
"custom/pl-idle-before": { "custom/pl-idle-before": {
"format": "" "format": ""
}, },
} }

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 6.1 KiB

View File

@@ -1 +1 @@
cachy-logo.svg pika-logo.svg

View File

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

View File

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