mirror of
https://codeberg.org/tmayoff/.dotfiles.git
synced 2025-12-06 08:48:34 -05:00
more updates to niri
This commit is contained in:
Tyler Mayoff
parent
7ccdf27209
commit
65f5a58e96
8 changed files with 317 additions and 222 deletions
119
dot_config/flake/flake.lock
generated
119
dot_config/flake/flake.lock
generated
|
|
@ -152,11 +152,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1756579987,
|
||||
"narHash": "sha256-duCce8zGsaMsrqqOmLOsuaV1PVIw/vXWnKuLKZClsGg=",
|
||||
"lastModified": 1756734952,
|
||||
"narHash": "sha256-H6jmduj4QIncLPAPODPSG/8ry9lpr1kRq6fYytU52qU=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "99a69bdf8a3c6bf038c4121e9c4b6e99706a187a",
|
||||
"rev": "29ab63bbb3d9eee4a491f7ce701b189becd34068",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -175,11 +175,11 @@
|
|||
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1756593635,
|
||||
"narHash": "sha256-tus6sIQr5EA9J1Vqpf5TN6MtLTpbIqqThUncgAMteRo=",
|
||||
"lastModified": 1756732319,
|
||||
"narHash": "sha256-w7pNSuw1hPRfFwKbV40/ZTK62FX4ZpqUQxCh9vIhD7Y=",
|
||||
"owner": "sodiboo",
|
||||
"repo": "niri-flake",
|
||||
"rev": "01285d6ffb9214e6e524cfb7a4752a3c20be6b2b",
|
||||
"rev": "2437b6b1f98cd3161ccc96750eed927ab38c1913",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -208,11 +208,11 @@
|
|||
"niri-unstable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1756556321,
|
||||
"narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=",
|
||||
"lastModified": 1756728273,
|
||||
"narHash": "sha256-7tYNlNO/qVRA6shdWxNuBMYOE+pGgxqE0f54S4Wr9PE=",
|
||||
"owner": "YaLTeR",
|
||||
"repo": "niri",
|
||||
"rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294",
|
||||
"rev": "77465e11fe36fdd9bc0a304b96bb2558116568af",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -290,11 +290,11 @@
|
|||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1756469547,
|
||||
"narHash": "sha256-YvtD2E7MYsQ3r7K9K2G7nCslCKMPShoSEAtbjHLtH0k=",
|
||||
"lastModified": 1756617294,
|
||||
"narHash": "sha256-aGnd4AHIYCWQKChAkHPpX+YYCt7pA6y2LFFA/s8q0wQ=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "41d292bfc37309790f70f4c120b79280ce40af16",
|
||||
"rev": "b4c2c57c31e68544982226d07e4719a2d86302a8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -352,11 +352,11 @@
|
|||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1756469547,
|
||||
"narHash": "sha256-YvtD2E7MYsQ3r7K9K2G7nCslCKMPShoSEAtbjHLtH0k=",
|
||||
"lastModified": 1756617294,
|
||||
"narHash": "sha256-aGnd4AHIYCWQKChAkHPpX+YYCt7pA6y2LFFA/s8q0wQ=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "41d292bfc37309790f70f4c120b79280ce40af16",
|
||||
"rev": "b4c2c57c31e68544982226d07e4719a2d86302a8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -366,6 +366,70 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"noctalia": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs-unstable"
|
||||
],
|
||||
"quickshell": "quickshell",
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1756700149,
|
||||
"narHash": "sha256-rOqprvpuA0dTNFSw6UwtAVWKcWXq99rRE4BqR06QXjs=",
|
||||
"owner": "noctalia-dev",
|
||||
"repo": "noctalia-shell",
|
||||
"rev": "e8c20422903434d065c6f2f891ffad5d59e71337",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "noctalia-dev",
|
||||
"ref": "v2.3.3",
|
||||
"repo": "noctalia-shell",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"quickshell": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"noctalia",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1753595452,
|
||||
"narHash": "sha256-vqkSDvh7hWhPvNjMjEDV4KbSCv2jyl2Arh73ZXe274k=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "a5431dd02dc23d9ef1680e67777fed00fe5f7cda",
|
||||
"revCount": 665,
|
||||
"type": "git",
|
||||
"url": "https://git.outfoxxed.me/outfoxxed/quickshell"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "https://git.outfoxxed.me/outfoxxed/quickshell"
|
||||
}
|
||||
},
|
||||
"quickshell_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs-unstable"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1756352679,
|
||||
"narHash": "sha256-UkKaPXTPzT7HAcBOV4NlWx2GAEJaTf0eb5OX6Q6jPqg=",
|
||||
"owner": "outfoxxed",
|
||||
"repo": "quickshell",
|
||||
"rev": "f7597cdae2d537c5b12843599955856090dc49d5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "outfoxxed",
|
||||
"repo": "quickshell",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"darwin": "darwin",
|
||||
|
|
@ -373,7 +437,24 @@
|
|||
"home-manager": "home-manager",
|
||||
"niri": "niri",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"nixpkgs-unstable": "nixpkgs-unstable"
|
||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||
"noctalia": "noctalia",
|
||||
"quickshell": "quickshell_2"
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"xwayland-satellite-stable": {
|
||||
|
|
@ -396,11 +477,11 @@
|
|||
"xwayland-satellite-unstable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1756570086,
|
||||
"narHash": "sha256-vnbIvAqSt+hSd6blDc9IMvZKxAcHpqLhy25tDvosrug=",
|
||||
"lastModified": 1756679414,
|
||||
"narHash": "sha256-yQGJ/n6mRwoIQnaL5oV2TGOHg4SEHpINTaoHrvkjr1Q=",
|
||||
"owner": "Supreeeme",
|
||||
"repo": "xwayland-satellite",
|
||||
"rev": "1d156aa8d30b124ff770488e5e34289a08ff4207",
|
||||
"rev": "c0497c990d46fcc012d9deff885bbe533e91e044",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
};
|
||||
|
||||
noctalia = {
|
||||
url = "github:noctalia-dev/noctalia-shell";
|
||||
url = "github:noctalia-dev/noctalia-shell/v2.3.4";
|
||||
inputs.nixpkgs.follows = "nixpkgs-unstable";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,4 @@
|
|||
{
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
{pkgs, ...}: let
|
||||
catppuccin = pkgs.fetchFromGitHub {
|
||||
owner = "catppuccin";
|
||||
repo = "ghostty";
|
||||
|
|
@ -30,6 +27,5 @@ in {
|
|||
};
|
||||
|
||||
xdg.configFile."ghostty/themes/catppuccin-latte.conf".source = "${catppuccin}/themes/catppuccin-latte.conf";
|
||||
|
||||
xdg.configFile."ghostty/themes/catppuccin-macchiato.conf".source = "${catppuccin}/themes/catppuccin-macchiato.conf";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
home.packages = with pkgs; [
|
||||
adw-gtk3
|
||||
|
||||
pkgs.mods.discord
|
||||
discord
|
||||
|
||||
# Office
|
||||
libreoffice
|
||||
|
|
|
|||
|
|
@ -8,11 +8,16 @@
|
|||
./darkman.nix
|
||||
];
|
||||
|
||||
programs.fuzzel.enable = true;
|
||||
|
||||
home.packages = with pkgs; [
|
||||
inputs.noctalia.packages.${system}.default
|
||||
inputs.quickshell.packages.${system}.default
|
||||
|
||||
xdg-desktop-portal-gtk
|
||||
xdg-desktop-portal-gnome
|
||||
gnome-keyring
|
||||
|
||||
xwayland-satellite
|
||||
wlsunset
|
||||
];
|
||||
|
||||
programs.niri.settings = {
|
||||
|
|
@ -122,12 +127,12 @@
|
|||
# position x=1280 y=0
|
||||
# }
|
||||
|
||||
# // Settings that influence how windows are positioned and sized.
|
||||
# // Find more information on the wiki:
|
||||
# // https://github.com/YaLTeR/niri/wiki/Configuration:-Layout
|
||||
# layout {
|
||||
# Settings that influence how windows are positioned and sized.
|
||||
# Find more information on the wiki:
|
||||
# https://github.com/YaLTeR/niri/wiki/Configuration:-Layout
|
||||
layout = {
|
||||
# // Set gaps around windows in logical pixels.
|
||||
# gaps 16
|
||||
gaps = 16;
|
||||
|
||||
# // When to center a column when changing focus, options are:
|
||||
# // - "never", default behavior, focusing an off-screen column will keep at the left
|
||||
|
|
@ -269,36 +274,36 @@
|
|||
# // top 64
|
||||
# // bottom 64
|
||||
# }
|
||||
# }
|
||||
};
|
||||
|
||||
# // Add lines like this to spawn processes at startup.
|
||||
# // Note that running niri as a session supports xdg-desktop-autostart,
|
||||
# // which may be more convenient to use.
|
||||
# // See the binds section below for more spawn examples.
|
||||
# Add lines like this to spawn processes at startup.
|
||||
# Note that running niri as a session supports xdg-desktop-autostart,
|
||||
# which may be more convenient to use.
|
||||
# See the binds section below for more spawn examples.
|
||||
|
||||
# // This line starts waybar, a commonly used bar for Wayland compositors.
|
||||
spawn-at-startup = [
|
||||
{argv = ["noctalia-shell"];}
|
||||
];
|
||||
|
||||
# // 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.
|
||||
# // Additionally, clients will be informed that they are tiled, removing some client-side rounded corners.
|
||||
# // This option will also fix border/focus ring drawing behind some semitransparent windows.
|
||||
# // After enabling or disabling this, you need to restart the apps for this to take effect.
|
||||
# // prefer-no-csd
|
||||
# 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.
|
||||
# Additionally, clients will be informed that they are tiled, removing some client-side rounded corners.
|
||||
# This option will also fix border/focus ring drawing behind some semitransparent windows.
|
||||
# After enabling or disabling this, you need to restart the apps for this to take effect.
|
||||
# prefer-no-csd
|
||||
|
||||
# // You can change the path where screenshots are saved.
|
||||
# // A ~ at the front will be expanded to the home directory.
|
||||
# // The path is formatted with strftime(3) to give you the screenshot date and time.
|
||||
# screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png"
|
||||
screenshot-path = "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png";
|
||||
|
||||
# // You can also set this to null to disable saving screenshots to disk.
|
||||
# // screenshot-path null
|
||||
|
||||
# // Animation settings.
|
||||
# // The wiki explains how to configure individual animations:
|
||||
# // https://github.com/YaLTeR/niri/wiki/Configuration:-Animations
|
||||
# Animation settings.
|
||||
# The wiki explains how to configure individual animations:
|
||||
# https://github.com/YaLTeR/niri/wiki/Configuration:-Animations
|
||||
# animations {
|
||||
# // Uncomment to turn off all animations.
|
||||
# // off
|
||||
|
|
@ -307,9 +312,44 @@
|
|||
# // slowdown 3.0
|
||||
# }
|
||||
|
||||
# // Window rules let you adjust behavior for individual windows.
|
||||
# // Find more information on the wiki:
|
||||
# // https://github.com/YaLTeR/niri/wiki/Configuration:-Window-Rules
|
||||
layer-rules = [
|
||||
{
|
||||
matches = [{namespace = "^quickshell-wallpaper$";}];
|
||||
}
|
||||
{
|
||||
matches = [{namespace = "^quickshell-overview$";}];
|
||||
place-within-backdrop = true;
|
||||
}
|
||||
];
|
||||
|
||||
# Window rules let you adjust behavior for individual windows.
|
||||
# Find more information on the wiki:
|
||||
# https://github.com/YaLTeR/niri/wiki/Configuration:-Window-Rules
|
||||
|
||||
window-rules = [
|
||||
{
|
||||
clip-to-geometry = true;
|
||||
geometry-corner-radius = let
|
||||
r = 20.0;
|
||||
in {
|
||||
bottom-left = r;
|
||||
bottom-right = r;
|
||||
top-left = r;
|
||||
top-right = r;
|
||||
};
|
||||
}
|
||||
|
||||
# Open the Firefox picture-in-picture player as floating by default.
|
||||
{
|
||||
matches = [
|
||||
{
|
||||
app-id = "firefox$";
|
||||
title = "^Picture-in-Picture$";
|
||||
}
|
||||
];
|
||||
open-floating = true;
|
||||
}
|
||||
];
|
||||
|
||||
# // Work around WezTerm's initial configure bug
|
||||
# // by setting an empty default-column-width.
|
||||
|
|
@ -321,15 +361,6 @@
|
|||
# default-column-width {}
|
||||
# }
|
||||
|
||||
# // Open the Firefox picture-in-picture player as floating by default.
|
||||
# window-rule {
|
||||
# // This app-id regular expression will work for both:
|
||||
# // - host Firefox (app-id is "firefox")
|
||||
# // - Flatpak Firefox (app-id is "org.mozilla.firefox")
|
||||
# match app-id=r#"firefox$"# title="^Picture-in-Picture$"
|
||||
# open-floating true
|
||||
# }
|
||||
|
||||
# // Example: block out two password managers from screen capture.
|
||||
# // (This example rule is commented out with a "/-" in front.)
|
||||
# /-window-rule {
|
||||
|
|
@ -352,15 +383,15 @@
|
|||
outputs."eDP-1".scale = 1.0;
|
||||
|
||||
binds = with config.lib.niri.actions; {
|
||||
# // Keys consist of modifiers separated by + signs, followed by an XKB key name
|
||||
# // in the end. To find an XKB name for a particular key, you may use a program
|
||||
# // like wev.
|
||||
# //
|
||||
# // "Mod" is a special modifier equal to Super when running on a TTY, and to Alt
|
||||
# // when running as a winit window.
|
||||
# //
|
||||
# // Most actions that you can bind here can also be invoked programmatically with
|
||||
# // `niri msg action do-something`.
|
||||
# Keys consist of modifiers separated by + signs, followed by an XKB key name
|
||||
# in the end. To find an XKB name for a particular key, you may use a program
|
||||
# like wev.
|
||||
#
|
||||
# "Mod" is a special modifier equal to Super when running on a TTY, and to Alt
|
||||
# when running as a winit window.
|
||||
#
|
||||
# Most actions that you can bind here can also be invoked programmatically with
|
||||
# `niri msg action do-something`.
|
||||
|
||||
# // Mod-Shift-/, which is usually the same as Mod-?,
|
||||
# // shows a list of important hotkeys.
|
||||
|
|
@ -371,9 +402,9 @@
|
|||
hotkey-overlay.title = "Open a Terminal: ghostty";
|
||||
action = spawn "ghostty";
|
||||
};
|
||||
"Mod+D" = {
|
||||
hotkey-overlay.title = "Run an Application: fuzzel";
|
||||
action = spawn "fuzzel";
|
||||
"Mod+Space" = {
|
||||
hotkey-overlay.title = "Application launcher";
|
||||
action = spawn ["noctalia-shell" "ipc" "call" "launcher" "toggle"];
|
||||
};
|
||||
# Super+Alt+L hotkey-overlay-title="Lock the Screen: swaylock" { spawn "swaylock"; }
|
||||
|
||||
|
|
@ -391,7 +422,10 @@
|
|||
# // Open/close the Overview: a zoomed-out view of workspaces and windows.
|
||||
# // You can also move the mouse into the top-left hot corner,
|
||||
# // or do a four-finger swipe up on a touchpad.
|
||||
# Mod+O repeat=false { toggle-overview; }
|
||||
"Mod+O" = {
|
||||
repeat = false;
|
||||
action = toggle-overview;
|
||||
};
|
||||
|
||||
"Mod+Q".action = close-window;
|
||||
|
||||
|
|
@ -420,19 +454,19 @@
|
|||
# // Mod+Ctrl+J { move-window-down-or-to-workspace-down; }
|
||||
# // Mod+Ctrl+K { move-window-up-or-to-workspace-up; }
|
||||
|
||||
# Mod+Home { focus-column-first; }
|
||||
# Mod+End { focus-column-last; }
|
||||
# Mod+Ctrl+Home { move-column-to-first; }
|
||||
# Mod+Ctrl+End { move-column-to-last; }
|
||||
"Mod+Home".action = focus-column-first;
|
||||
"Mod+End".action = focus-column-last;
|
||||
"Mod+Ctrl+Home".action = move-column-to-first;
|
||||
"Mod+Ctrl+End".action = move-column-to-last;
|
||||
|
||||
# Mod+Shift+Left { focus-monitor-left; }
|
||||
# Mod+Shift+Down { focus-monitor-down; }
|
||||
# Mod+Shift+Up { focus-monitor-up; }
|
||||
# Mod+Shift+Right { focus-monitor-right; }
|
||||
# Mod+Shift+H { focus-monitor-left; }
|
||||
# Mod+Shift+J { focus-monitor-down; }
|
||||
# Mod+Shift+K { focus-monitor-up; }
|
||||
# Mod+Shift+L { focus-monitor-right; }
|
||||
"Mod+Shift+Left".action = focus-monitor-left;
|
||||
"Mod+Shift+Down".action = focus-monitor-down;
|
||||
"Mod+Shift+Up".action = focus-monitor-up;
|
||||
"Mod+Shift+Right".action = focus-monitor-right;
|
||||
"Mod+Shift+H".action = focus-monitor-left;
|
||||
"Mod+Shift+J".action = focus-monitor-down;
|
||||
"Mod+Shift+K".action = focus-monitor-up;
|
||||
"Mod+Shift+L".action = focus-monitor-right;
|
||||
|
||||
"Mod+Shift+Ctrl+Left".action = move-column-to-monitor-left;
|
||||
"Mod+Shift+Ctrl+Down".action = move-column-to-monitor-down;
|
||||
|
|
|
|||
|
|
@ -17,5 +17,7 @@
|
|||
# chezmoi
|
||||
dot_apply = "chezmoi apply";
|
||||
dot_pull = "chezmoi update";
|
||||
|
||||
dot_update = "flake update --flake $CHEZMOI_SOURCE_DIR/dot_config/flake && dot_apply";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{pkgs, ...}: {
|
||||
{...}: {
|
||||
imports = [
|
||||
../../home/common.nix
|
||||
|
||||
|
|
@ -17,8 +17,7 @@
|
|||
username = "tyler";
|
||||
homeDirectory = "/home/tyler";
|
||||
|
||||
packages = with pkgs; [
|
||||
nom
|
||||
packages = [
|
||||
];
|
||||
|
||||
stateVersion = "23.11";
|
||||
|
|
|
|||
|
|
@ -3,23 +3,6 @@
|
|||
|
||||
modifications = final: prev: {
|
||||
mods = {
|
||||
discord = final.stdenv.mkDerivation {
|
||||
pname = "discord-wayland";
|
||||
version = prev.discord.version;
|
||||
|
||||
buildInputs = [final.makeWrapper];
|
||||
nativeBuildInputs = [final.makeWrapper];
|
||||
|
||||
unpackPhase = "true";
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
ln -s ${prev.discord}/bin/discord $out/bin/.discord-wrapped
|
||||
wrapProgram $out/bin/.discord-wrapped \
|
||||
--prefix PATH : ${final.lib.makeBinPath [final.xdg-utils final.coreutils]} \
|
||||
--add-flags "--enable-features=UseOzonePlatform --ozone-platform=wayland"
|
||||
ln -s $out/bin/.discord-wrapped $out/bin/discord
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue