chris/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

the core of niri is done

Browse source
This commit is contained in:
Chris Cochrun 2025-09-02 06:33:13 -05:00
parent d0c8e279ca
commit d6d16bfe7f
3 changed files with 40 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
home/home.nix
View file

@ -669,9 +669,9 @@ in {
output = [ "DP-1" "eDP-1" ]; output = [ "DP-1" "eDP-1" ];
position = if laptop then "bottom" else "top"; position = if laptop then "bottom" else "top";
height = 15; height = 15;
width = if laptop then 1400 else 2200; width = if laptop then 1450 else 2200;
# Choose the order of the modules "custom/wintitle", # Choose the order of the modules "custom/wintitle",
modules-left = [ "hyprland/workspaces" "hyprland/window" ]; modules-left = [ "niri/workspaces" "niri/window" ];
modules-center = [ "clock" ]; modules-center = [ "clock" ];
modules-right = modules-right =
[ "cpu" "memory" "pulseaudio" "backlight" "battery" "tray" ]; [ "cpu" "memory" "pulseaudio" "backlight" "battery" "tray" ];
@ -679,12 +679,12 @@ in {
margin-bottom = if laptop then 4 else 0; margin-bottom = if laptop then 4 else 0;
margin-left = 6; margin-left = 6;
margin-right = 6; margin-right = 6;
"hyprland/window" = { format = "<span style='italic'>{title}</span>"; icon = true; }; "niri/window" = { format = "<span style='italic'>{title}</span>"; icon = true; };
workspaces = { format = " {name} "; }; workspaces = { format = " {name} "; };
"hyprland/workspaces" = { "niri/workspaces" = {
format = "{icon}"; format = "{icon}";
format-icons = { format-icons = {
"1" = ""; "main" = "";
"2" = ""; "2" = "";
"3" = "󰈙"; "3" = "󰈙";
"4" = "󰭹"; "4" = "󰭹";
@ -825,7 +825,7 @@ in {
padding-bottom: 2px; padding-bottom: 2px;
padding-left: 5px; padding-left: 5px;
padding-right: 5px; padding-right: 5px;
margin-right: 50px; margin-right: 0px;
background: @backtransparent; background: @backtransparent;
box-shadow: 5px 5px 4px 4px #202020; box-shadow: 5px 5px 4px 4px #202020;
border-radius: 20px; border-radius: 20px;

40
home/modules/niri.nix
View file

@ -62,18 +62,23 @@ in
# enable = true; # enable = true;
settings = { settings = {
prefer-no-csd = true; prefer-no-csd = true;
binds = with config.lib.niri.actions; { binds = with config.lib.niri.actions; let
"XF86AudioRaiseVolume".action.spawn = ["volup"]; in {
"XF86AudioLowerVolume".action.spawn = ["voldown"]; "XF86AudioRaiseVolume".action.spawn = ["pamixer" "--allow-boost" "-i" "5"];
"Super+E".action.spawn = "nu nirilof emacs 'emacslient -c'"; "XF86AudioLowerVolume".action.spawn = ["pamixer" "--allow-boost" "-d" "5"];
"Super+E".action.spawn = ["${pkgs.nushell}/bin/nu" "/home/chris/nirilof emacs 'emacslient -c'"];
"Super+Return".action.spawn = "alacritty"; "Super+Return".action.spawn = "alacritty";
"Super+B".action.spawn = "nu nirilof org.qutebrowser.qutebrowser qutebrowser"; "Super+B".action = spawn ["${pkgs.nushell}/bin/nu" "/home/chris/nirilof org.qutebrowser.qutebrowser qutebrowser"];
"Super+Space".action.spawn = "cosmic-launcher"; "Super+Space".action.spawn = "cosmic-launcher";
"Super+V".action= spawn ["${pkgs.fish}/bin/fish" "-c" "${pkgs.cliphist}/bin/cliphist list | ${pkgs.rofi-wayland}/bin/rofi -p '󱃔 ' -dmenu | ${pkgs.cliphist}/bin/cliphist decode | ${pkgs.wl-clipboard}/bin/wl-copy"];
"Super+I".action.spawn = ["alacritty" "--class" "btm" "-e" "btm"];
"Super+A".action.spawn = ["alacritty" "--class" "pulsemixer" "-e" "pulsemixer"];
"Super+Shift+Q".action = quit; "Super+Shift+Q".action = quit;
"Super+O".action = toggle-overview; "Super+O".action = toggle-overview;
"Super+F".action = fullscreen-window; "Super+F".action = fullscreen-window;
"Super+Shift+F".action = toggle-windowed-fullscreen; "Super+Shift+F".action = toggle-windowed-fullscreen;
"Super+C".action = close-window; "Super+C".action = close-window;
"Super+Shift+C".action = center-window;
"Super+P".action.spawn = "/home/chris/bin/rbw.sh"; "Super+P".action.spawn = "/home/chris/bin/rbw.sh";
"Super+Left".action = focus-column-left; "Super+Left".action = focus-column-left;
"Super+H".action = focus-column-left; "Super+H".action = focus-column-left;
@ -83,10 +88,15 @@ in
"Super+Shift+L".action = move-column-right; "Super+Shift+L".action = move-column-right;
"Super+Ctrl+L".action = set-column-width "+10%"; "Super+Ctrl+L".action = set-column-width "+10%";
"Super+Ctrl+H".action = set-column-width "-10%"; "Super+Ctrl+H".action = set-column-width "-10%";
"Super+M".action = set-column-width "95%"; "Super+M".action = maximize-column;
"Super+W".action = switch-preset-column-width;
"Super+Comma".action = consume-or-expel-window-left;
"Super+Period".action = consume-or-expel-window-right;
}; };
spawn-at-startup = [ spawn-at-startup = [
{ argv = ["${pkgs.xwayland-satellite}/bin/xwayland-satellite"]; }
{ argv = ["waybar"]; } { argv = ["waybar"]; }
{ argv = ["cosmic-osd"]; }
{ argv = ["kwalled6"]; } { argv = ["kwalled6"]; }
{ argv = ["swww-daemon"]; } { argv = ["swww-daemon"]; }
{ argv = ["rbw-agent"]; } { argv = ["rbw-agent"]; }
@ -122,11 +132,27 @@ in
} }
{ {
matches = [{app-id = "com.system76.CosmicFiles";}]; matches = [{app-id = "com.system76.CosmicFiles";}];
open-on-workspace = "main"; open-floating = true;
}
{
matches = [{app-id = "btm";}];
open-floating = true;
default-column-width.proportion = 0.7;
default-window-height.proportion = 0.7;
}
{
matches = [{app-id = "pulsemixer";}];
open-floating = true; open-floating = true;
} }
]; ];
layout = { layout = {
center-focused-column = "never";
preset-column-widths = [
{ proportion = 1. / 3.; }
{ proportion = 1. / 2.; }
{ proportion = 2. / 3.; }
{ proportion = 1. / 1.; }
];
gaps = 15; gaps = 15;
struts = { struts = {
bottom = 5; bottom = 5;

1
pkgs/desktop-packages.nix
View file

@ -174,6 +174,7 @@
wireguard-tools wireguard-tools
# cosmic-ext-examine # cosmic-ext-examine
cosmic-settings cosmic-settings
xwayland-satellite
aider-chat aider-chat
wgsl-analyzer wgsl-analyzer
]; ];