Compare commits

..

No commits in common. "02c356ec5170d96c533baa5553a5f4b7f6ce3c68" and "929c98faf5d5067155c9fc443ed5e956f9aecf38" have entirely different histories.

4 changed files with 16 additions and 30 deletions

18
flake.lock generated
View file

@ -266,11 +266,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737221749, "lastModified": 1737120639,
"narHash": "sha256-igllW0yG+UbetvhT11jnt9RppSHXYgMykYhZJeqfHs0=", "narHash": "sha256-p5e/45V41YD3tMELuiNIoVCa25/w4nhOTm0B9MtdHFI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "97d7946b5e107dd03cc82f21165251d4e0159655", "rev": "a0046af169ce7b1da503974e1b22c48ef4d71887",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -436,11 +436,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1737241062, "lastModified": 1737083351,
"narHash": "sha256-GM4ZnlsuJWjk+tbespU/DWQsZ2V0u0CS3Hqg0JGMt5M=", "narHash": "sha256-hCddtSuk6m6XROmdOC0te0j2sLeUr28QIzNRk0qF1as=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b681ff2c9c9163f24ca705d948bb0cee1b3e09f9", "rev": "0993fc268872148cebcd1fac8660a8b8ced49542",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -525,11 +525,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1737200978, "lastModified": 1737143193,
"narHash": "sha256-QTUx/F8HVjrRIHQxHKrr72aPMj+cDk18WTbvBCCBBdI=", "narHash": "sha256-+/BdPFrdJpgmzrMEUZMxsLeND8IvFtjyZbxHX2XrNv4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "cbf960e5659054b2ccf27b67218782e69016bef5", "rev": "aa839cf994f6b9a6b38e755597452087beac0567",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -38,12 +38,10 @@
extra-substituters = [ extra-substituters = [
"https://cache.cything.io/central" "https://cache.cything.io/central"
"https://niri.cachix.org" "https://niri.cachix.org"
"https://nix-community.cachix.org"
]; ];
extra-trusted-public-keys = [ extra-trusted-public-keys = [
"central:uWhjva6m6dhC2hqNisjn2hXGvdGBs19vPkA1dPEuwFg=" "central:uWhjva6m6dhC2hqNisjn2hXGvdGBs19vPkA1dPEuwFg="
"niri.cachix.org-1:Wv0OmO7PsuocRKzfDoJ3mulSl7Z6oezYhGhR+3W2964=" "niri.cachix.org-1:Wv0OmO7PsuocRKzfDoJ3mulSl7Z6oezYhGhR+3W2964="
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
]; ];
builders-use-substitutes = true; builders-use-substitutes = true;
}; };

View file

@ -49,10 +49,6 @@ in
matches = [{ app-id = "anki"; title = "Add"; }]; matches = [{ app-id = "anki"; title = "Add"; }];
open-floating = true; open-floating = true;
} }
{
matches = [{ app-id = "anki"; }];
default-column-width.proportion = .25;
}
{ {
matches = [{ app-id = "foot"; }]; matches = [{ app-id = "foot"; }];
default-column-width.proportion = .5; default-column-width.proportion = .5;
@ -107,20 +103,12 @@ in
"Mod+Shift+R".action = switch-preset-window-height; "Mod+Shift+R".action = switch-preset-window-height;
"Mod+Ctrl+R".action = reset-window-height; "Mod+Ctrl+R".action = reset-window-height;
"Mod+F".action = fullscreen-window; "Mod+F".action = fullscreen-window;
"Mod+WheelScrollDown" = {
cooldown-ms = 150;
action = focus-column-right;
};
"Mod+WheelScrollUp" = {
cooldown-ms = 150;
action = focus-column-left;
};
"XF86AudioRaiseVolume".action = sh "wpctl set-volume @DEFAULT_AUDIO_SINK@ 1%+"; "XF86AudioRaiseVolume".action = sh "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.1+";
"XF86AudioLowerVolume".action = sh "wpctl set-volume @DEFAULT_AUDIO_SINK@ 1%-"; "XF86AudioLowerVolume".action = sh "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.1-";
"XF86AudioMute".action = sh "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"; "XF86AudioMute".action = sh "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
"XF86MonBrightnessUp".action = sh "brightnessctl set 1%+"; "XF86MonBrightnessUp".action = sh "brightnessctl set 10%+";
"XF86MonBrightnessDown".action = sh "brightnessctl set 1%-"; "XF86MonBrightnessDown".action = sh "brightnessctl set 10%-";
"Mod+1".action = focus-workspace 1; "Mod+1".action = focus-workspace 1;
"Mod+2".action = focus-workspace 2; "Mod+2".action = focus-workspace 2;

View file

@ -6,8 +6,8 @@
"margin-left": 0, "margin-left": 0,
"margin-right": 0, "margin-right": 0,
"margin-top": 0, "margin-top": 0,
"modules-left": ["niri/workspaces", "clock#time", "clock#date", "battery"], // Sets modules for the left of the bar "modules-left": ["sway/workspaces", "clock#time", "clock#date", "battery"], // Sets modules for the left of the bar
"modules-center": ["niri/window"], // Set modules for the center of the bar "modules-center": ["sway/window"], // Set modules for the center of the bar
"modules-right": ["tray", "temperature", "cpu", "memory", "wireplumber"], // Set modules for the right of the bar "modules-right": ["tray", "temperature", "cpu", "memory", "wireplumber"], // Set modules for the right of the bar
"clock#time": { "clock#time": {
"format": "<span color=\"#7aa2f7\"> </span>{:%H:%M:%S}", "format": "<span color=\"#7aa2f7\"> </span>{:%H:%M:%S}",
@ -71,7 +71,7 @@
"on-click": "pavucontrol", "on-click": "pavucontrol",
"interval": 4, "interval": 4,
}, },
"niri/window": { "sway/window": {
"max-length": 64, "max-length": 64,
}, },
"tray": { "tray": {