diff --git a/dotfiles/dot_config/niri/config.kdl b/dotfiles/dot_config/niri/config.kdl new file mode 100644 index 0000000..dffa374 --- /dev/null +++ b/dotfiles/dot_config/niri/config.kdl @@ -0,0 +1,509 @@ +// This config is in the KDL format: https://kdl.dev +// "/-" comments out the following node. +// Check the wiki for a full description of the configuration: +// https://github.com/YaLTeR/niri/wiki/Configuration:-Overview + +// Input device configuration. +// Find the full list of options on the wiki: +// https://github.com/YaLTeR/niri/wiki/Configuration:-Input +input { + keyboard { + xkb { + // You can set rules, model, layout, variant and options. + // For more information, see xkeyboard-config(7). + + // For example: + // layout "us,ru" + // options "grp:win_space_toggle,compose:ralt,ctrl:nocaps" + } + } + + // Next sections include libinput settings. + // Omitting settings disables them, or leaves them at their default values. + touchpad { + // off + tap + // dwt + // dwtp + natural-scroll + // accel-speed 0.2 + // accel-profile "flat" + // scroll-method "two-finger" + // disabled-on-external-mouse + } + + mouse { + // off + // natural-scroll + // accel-speed 0.2 + // accel-profile "flat" + // scroll-method "no-scroll" + } + + trackpoint { + // off + // natural-scroll + // accel-speed 0.2 + // accel-profile "flat" + // scroll-method "on-button-down" + // scroll-button 273 + // middle-emulation + } + + // Uncomment this to make the mouse warp to the center of newly focused windows. + // warp-mouse-to-focus + + // Focus windows and outputs automatically when moving the mouse into them. + // Setting max-scroll-amount="0%" makes it work only on windows already fully on screen. + // focus-follows-mouse max-scroll-amount="0%" +} + +// You can configure outputs by their name, which you can find +// by running `niri msg outputs` while inside a niri instance. +// The built-in laptop monitor is usually called "eDP-1". +// Find more information on the wiki: +// https://github.com/YaLTeR/niri/wiki/Configuration:-Outputs +// Remember to uncomment the node by removing "/-"! +output "eDP-1" { + // Uncomment this line to disable this output. + // off + + // Resolution and, optionally, refresh rate of the output. + // The format is "x" or "x@". + // 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 "2560x1600@240.00" + + // You can use integer or fractional scale, for example use 1.5 for 150% scale. + scale 1.5 + + // Transform allows to rotate the output counter-clockwise, valid values are: + // normal, 90, 180, 270, flipped, flipped-90, flipped-180 and flipped-270. + transform "normal" + + // 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=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 { + // Set gaps around windows in logical pixels. + 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 + // or right edge of the screen. + // - "always", the focused column will always be centered. + // - "on-overflow", focusing a column will center it if it doesn't fit + // together with the previously focused column. + center-focused-column "never" + + // You can customize the widths that "switch-preset-column-width" (Mod+R) toggles between. + preset-column-widths { + // Proportion sets the width as a fraction of the output width, taking gaps into account. + // For example, you can perfectly fit four windows sized "proportion 0.25" on an output. + // The default preset widths are 1/3, 1/2 and 2/3 of the output. + proportion 0.33333 + proportion 0.5 + proportion 0.66667 + + // Fixed sets the width in logical pixels exactly. + // fixed 1920 + } + + // You can also customize the heights that "switch-preset-window-height" (Mod+Shift+R) toggles between. + // preset-window-heights { } + + // You can change the default width of the new windows. + default-column-width { proportion 0.5; } + // If you leave the brackets empty, the windows themselves will decide their initial width. + // default-column-width {} + + // By default focus ring and border are rendered as a solid background rectangle + // behind windows. That is, they will show up through semitransparent windows. + // This is because windows using client-side decorations can have an arbitrary shape. + // + // If you don't like that, you should uncomment `prefer-no-csd` below. + // Niri will draw focus ring and border *around* windows that agree to omit their + // client-side decorations. + // + // Alternatively, you can override it with a window rule called + // `draw-border-with-background`. + + // You can change how the focus ring looks. + focus-ring { + // Uncomment this line to disable the focus ring. + // off + + // How many logical pixels the ring extends out from the windows. + width 2 + + // Colors can be set in a variety of ways: + // - CSS named colors: "red" + // - RGB hex: "#rgb", "#rgba", "#rrggbb", "#rrggbbaa" + // - CSS-like notation: "rgb(255, 127, 0)", rgba(), hsl() and a few others. + + // Color of the ring on the active monitor. + active-color "#7fc8ff" + + // Color of the ring on inactive monitors. + inactive-color "#505050" + + // You can also use gradients. They take precedence over solid colors. + // Gradients are rendered the same as CSS linear-gradient(angle, from, to). + // The angle is the same as in linear-gradient, and is optional, + // defaulting to 180 (top-to-bottom gradient). + // You can use any CSS linear-gradient tool on the web to set these up. + // Changing the color space is also supported, check the wiki for more info. + // + // active-gradient from="#80c8ff" to="#bbddff" angle=45 + + // You can also color the gradient relative to the entire view + // of the workspace, rather than relative to just the window itself. + // To do that, set relative-to="workspace-view". + // + // inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view" + } + + // You can also add a border. It's similar to the focus ring, but always visible. + border { + // The settings are the same as for the focus ring. + // If you enable the border, you probably want to disable the focus ring. + off + + width 4 + active-color "#ffc87f" + inactive-color "#505050" + + // active-gradient from="#ffbb66" to="#ffc880" angle=45 relative-to="workspace-view" + // inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view" + } + + // Struts shrink the area occupied by windows, similarly to layer-shell panels. + // You can think of them as a kind of outer gaps. They are set in logical pixels. + // Left and right struts will cause the next window to the side to always be visible. + // Top and bottom struts will simply add outer gaps in addition to the area occupied by + // layer-shell panels and regular gaps. + struts { + // left 64 + // right 64 + // 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. +// spawn-at-startup "alacritty" "-e" "fish" + +// 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" + +// 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 +animations { + // Uncomment to turn off all animations. + // off + + // Slow down all animations by this factor. Values below 1 speed them up instead. + // 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 + +// Work around WezTerm's initial configure bug +// by setting an empty default-column-width. +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 {} +} + +// 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 { + match app-id=r#"^org\.keepassxc\.KeePassXC$"# + match app-id=r#"^org\.gnome\.World\.Secrets$"# + + block-out-from "screen-capture" + + // Use this instead if you want them visible on third-party screenshot tools. + // block-out-from "screencast" +} + +// Example: enable rounded corners for all windows. +// (This example rule is commented out with a "/-" in front.) +/-window-rule { + geometry-corner-radius 12 + clip-to-geometry true +} + +binds { + // 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. + Mod+Shift+Slash { show-hotkey-overlay; } + + // Suggested binds for running programs: terminal, app launcher, screen locker. + Mod+T { spawn "wezterm"; } + Mod+D { spawn "fuzzel"; } + Super+Alt+L { spawn "swaylock"; } + + // 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"; } + + // Example volume keys mappings for PipeWire & WirePlumber. + // The allow-when-locked=true property makes them work even when the session is locked. + XF86AudioRaiseVolume allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1+"; } + XF86AudioLowerVolume allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1-"; } + 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"; } + + Mod+Q { close-window; } + + Mod+Left { focus-column-left; } + Mod+Down { focus-window-down; } + Mod+Up { focus-window-up; } + Mod+Right { focus-column-right; } + Mod+H { focus-column-left; } + Mod+J { focus-window-down; } + Mod+K { focus-window-up; } + Mod+L { focus-column-right; } + + Mod+Ctrl+Left { move-column-left; } + Mod+Ctrl+Down { move-window-down; } + Mod+Ctrl+Up { move-window-up; } + Mod+Ctrl+Right { move-column-right; } + Mod+Ctrl+H { move-column-left; } + Mod+Ctrl+J { move-window-down; } + Mod+Ctrl+K { move-window-up; } + Mod+Ctrl+L { move-column-right; } + + // Alternative commands that move across workspaces when reaching + // the first or last window in a column. + // Mod+J { focus-window-or-workspace-down; } + // Mod+K { focus-window-or-workspace-up; } + // 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+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+Ctrl+Left { move-column-to-monitor-left; } + Mod+Shift+Ctrl+Down { move-column-to-monitor-down; } + Mod+Shift+Ctrl+Up { move-column-to-monitor-up; } + Mod+Shift+Ctrl+Right { move-column-to-monitor-right; } + Mod+Shift+Ctrl+H { move-column-to-monitor-left; } + Mod+Shift+Ctrl+J { move-column-to-monitor-down; } + Mod+Shift+Ctrl+K { move-column-to-monitor-up; } + Mod+Shift+Ctrl+L { move-column-to-monitor-right; } + + // Alternatively, there are commands to move just a single window: + // Mod+Shift+Ctrl+Left { move-window-to-monitor-left; } + // ... + + // And you can also move a whole workspace to another monitor: + // Mod+Shift+Ctrl+Left { move-workspace-to-monitor-left; } + // ... + + Mod+Page_Down { focus-workspace-down; } + Mod+Page_Up { focus-workspace-up; } + Mod+U { focus-workspace-down; } + Mod+I { focus-workspace-up; } + Mod+Ctrl+Page_Down { move-column-to-workspace-down; } + Mod+Ctrl+Page_Up { move-column-to-workspace-up; } + Mod+Ctrl+U { move-column-to-workspace-down; } + Mod+Ctrl+I { move-column-to-workspace-up; } + + // Alternatively, there are commands to move just a single window: + // Mod+Ctrl+Page_Down { move-window-to-workspace-down; } + // ... + + Mod+Shift+Page_Down { move-workspace-down; } + Mod+Shift+Page_Up { move-workspace-up; } + Mod+Shift+U { move-workspace-down; } + Mod+Shift+I { move-workspace-up; } + + // You can bind mouse wheel scroll ticks using the following syntax. + // These binds will change direction based on the natural-scroll setting. + // + // To avoid scrolling through workspaces really fast, you can use + // the cooldown-ms property. The bind will be rate-limited to this value. + // You can set a cooldown on any bind, but it's most useful for the wheel. + Mod+WheelScrollDown cooldown-ms=150 { focus-workspace-down; } + Mod+WheelScrollUp cooldown-ms=150 { focus-workspace-up; } + Mod+Ctrl+WheelScrollDown cooldown-ms=150 { move-column-to-workspace-down; } + Mod+Ctrl+WheelScrollUp cooldown-ms=150 { move-column-to-workspace-up; } + + Mod+WheelScrollRight { focus-column-right; } + Mod+WheelScrollLeft { focus-column-left; } + Mod+Ctrl+WheelScrollRight { move-column-right; } + Mod+Ctrl+WheelScrollLeft { move-column-left; } + + // Usually scrolling up and down with Shift in applications results in + // horizontal scrolling; these binds replicate that. + Mod+Shift+WheelScrollDown { focus-column-right; } + Mod+Shift+WheelScrollUp { focus-column-left; } + Mod+Ctrl+Shift+WheelScrollDown { move-column-right; } + Mod+Ctrl+Shift+WheelScrollUp { move-column-left; } + + // Similarly, you can bind touchpad scroll "ticks". + // Touchpad scrolling is continuous, so for these binds it is split into + // discrete intervals. + // These binds are also affected by touchpad's natural-scroll, so these + // example binds are "inverted", since we have natural-scroll enabled for + // touchpads by default. + // Mod+TouchpadScrollDown { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.02+"; } + // Mod+TouchpadScrollUp { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.02-"; } + + // You can refer to workspaces by index. However, keep in mind that + // niri is a dynamic workspace system, so these commands are kind of + // "best effort". Trying to refer to a workspace index bigger than + // the current workspace count will instead refer to the bottommost + // (empty) workspace. + // + // For example, with 2 workspaces + 1 empty, indices 3, 4, 5 and so on + // will all refer to the 3rd workspace. + Mod+1 { focus-workspace 1; } + Mod+2 { focus-workspace 2; } + Mod+3 { focus-workspace 3; } + Mod+4 { focus-workspace 4; } + Mod+5 { focus-workspace 5; } + Mod+6 { focus-workspace 6; } + Mod+7 { focus-workspace 7; } + Mod+8 { focus-workspace 8; } + Mod+9 { focus-workspace 9; } + Mod+Ctrl+1 { move-column-to-workspace 1; } + Mod+Ctrl+2 { move-column-to-workspace 2; } + Mod+Ctrl+3 { move-column-to-workspace 3; } + Mod+Ctrl+4 { move-column-to-workspace 4; } + Mod+Ctrl+5 { move-column-to-workspace 5; } + Mod+Ctrl+6 { move-column-to-workspace 6; } + Mod+Ctrl+7 { move-column-to-workspace 7; } + Mod+Ctrl+8 { move-column-to-workspace 8; } + Mod+Ctrl+9 { move-column-to-workspace 9; } + + // Alternatively, there are commands to move just a single window: + // Mod+Ctrl+1 { move-window-to-workspace 1; } + + // Switches focus between the current and the previous workspace. + // Mod+Tab { focus-workspace-previous; } + + // The following binds move the focused window in and out of a column. + // If the window is alone, they will consume it into the nearby column to the side. + // If the window is already in a column, they will expel it out. + Mod+BracketLeft { consume-or-expel-window-left; } + Mod+BracketRight { consume-or-expel-window-right; } + + // Consume one window from the right to the bottom of the focused column. + Mod+Comma { consume-window-into-column; } + // Expel the bottom window from the focused column to the right. + Mod+Period { expel-window-from-column; } + + Mod+R { switch-preset-column-width; } + Mod+Shift+R { switch-preset-window-height; } + Mod+Ctrl+R { reset-window-height; } + Mod+F { maximize-column; } + Mod+Shift+F { fullscreen-window; } + Mod+C { center-column; } + + // Finer width adjustments. + // This command can also: + // * set width in pixels: "1000" + // * adjust width in pixels: "-5" or "+5" + // * set width as a percentage of screen width: "25%" + // * adjust width as a percentage of screen width: "-10%" or "+10%" + // Pixel sizes use logical, or scaled, pixels. I.e. on an output with scale 2.0, + // set-column-width "100" will make the column occupy 200 physical screen pixels. + Mod+Minus { set-column-width "-10%"; } + Mod+Equal { set-column-width "+10%"; } + + // Finer height adjustments when in column with other windows. + Mod+Shift+Minus { set-window-height "-10%"; } + Mod+Shift+Equal { set-window-height "+10%"; } + + // Move the focused window between the floating and the tiling layout. + Mod+V { toggle-window-floating; } + Mod+Shift+V { switch-focus-between-floating-and-tiling; } + + // Actions to switch layouts. + // Note: if you uncomment these, make sure you do NOT have + // a matching layout switch hotkey configured in xkb options above. + // Having both at once on the same hotkey will break the switching, + // since it will switch twice upon pressing the hotkey (once by xkb, once by niri). + // Mod+Space { switch-layout "next"; } + // Mod+Shift+Space { switch-layout "prev"; } + + Print { screenshot; } + Ctrl+Print { screenshot-screen; } + Alt+Print { screenshot-window; } + + // The quit action will show a confirmation dialog to avoid accidental exits. + Mod+Shift+E { quit; } + Ctrl+Alt+Delete { quit; } + + // Powers off the monitors. To turn them back on, do any input like + // moving the mouse or pressing any other key. + Mod+Shift+P { power-off-monitors; } +} diff --git a/dotfiles/dot_config/wezterm/wezterm.lua b/dotfiles/dot_config/wezterm/wezterm.lua index 32bd2dd..3cbc72e 100644 --- a/dotfiles/dot_config/wezterm/wezterm.lua +++ b/dotfiles/dot_config/wezterm/wezterm.lua @@ -74,7 +74,7 @@ config.background = { } } -config.window_decorations = "TITLE|RESIZE" +-- config.window_decorations = "TITLE|RESIZE" config.window_padding = { left = 12, diff --git a/flake.lock b/flake.lock index 759c945..65cbbde 100644 --- a/flake.lock +++ b/flake.lock @@ -185,11 +185,11 @@ "zig": "zig" }, "locked": { - "lastModified": 1737517085, - "narHash": "sha256-A5w6+0Zc7b93nbCF6ayHbXIEO0+h+8BR4byYGgTy+tY=", + "lastModified": 1737779447, + "narHash": "sha256-+iVqQXAUJshUYgxOHfke54Ux4f/aggl1yub86KNx2tE=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "ddf7173ae92b4992c4506b6df4681c0687cc29c3", + "rev": "71e62f96fa4d286eda835048428d5be96e9f87c1", "type": "github" }, "original": { @@ -263,11 +263,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1737575492, - "narHash": "sha256-qa/D3NC1JoApnUuLrq1gseBmIxeg6icm/ojPgggMDVQ=", + "lastModified": 1737762889, + "narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=", "owner": "nix-community", "repo": "home-manager", - "rev": "cefb1889b96ddd1dac3dd4734e894f4cadab7802", + "rev": "daf04c5950b676f47a794300657f1d3d14c1a120", "type": "github" }, "original": { @@ -290,11 +290,11 @@ "uv2nix": "uv2nix" }, "locked": { - "lastModified": 1737544722, - "narHash": "sha256-XAWQdmd21BGeIkt3ngevgwJW2UJDF/tEu23jVIOTG9U=", + "lastModified": 1737828490, + "narHash": "sha256-V2uXWc2L25P4Dtfrlb0GMR3vqKclFaPieSz3lA6Z4G8=", "owner": "isd-project", "repo": "isd", - "rev": "3bd515e5ccce312d5ff7273afb93e7a775212925", + "rev": "591eb04e8d50576ae6dc7ea435664ccb52e82726", "type": "github" }, "original": { @@ -311,11 +311,11 @@ }, "locked": { "dir": "nix", - "lastModified": 1736192527, - "narHash": "sha256-s0nfy/exouiq6JdBiOhEvcfK1Nh8d/cVzYB67b36WPI=", + "lastModified": 1737820827, + "narHash": "sha256-PJ+X/Os2MDmaIjaplrmi5poTAiFpsq9TaXCvdUnSc/4=", "ref": "refs/heads/master", - "rev": "25de8837fdd89b5c70bb313188f7430fe29e0c42", - "revCount": 900, + "rev": "6bbd9181fc6d6f7e4b502988e7ad09a26d89f2a6", + "revCount": 906, "submodules": true, "type": "git", "url": "https://github.com/kmonad/kmonad?dir=nix" @@ -401,11 +401,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1736952876, - "narHash": "sha256-dJXuLP2CBkIG333L+Rb3e1D0oXHYbl0MgmKPGuvFuAI=", + "lastModified": 1737806078, + "narHash": "sha256-FjgNPBLMCpmwtJT5LiQYkM2lDY+yAmW1ZN1Idx7QeDg=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "b6966d5fa96b0fae99a4da0b5bdfbb0a75f5c058", + "rev": "83cc6a28afc4155fd3fe28274f6b5287f51ed2b6", "type": "github" }, "original": { @@ -416,11 +416,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1737590910, - "narHash": "sha256-qM/y6Dtpu9Wmf5HqeZajQdn+cS0aljdYQQQnrvx+LJE=", + "lastModified": 1737751639, + "narHash": "sha256-ZEbOJ9iT72iwqXsiEMbEa8wWjyFvRA9Ugx8utmYbpz4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9368027715d8dde4b84c79c374948b5306fdd2db", + "rev": "dfad538f751a5aa5d4436d9781ab27a6128ec9d4", "type": "github" }, "original": { @@ -479,11 +479,11 @@ }, "nixpkgs-unstable_2": { "locked": { - "lastModified": 1737469691, - "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=", + "lastModified": 1737746512, + "narHash": "sha256-nU6AezEX4EuahTO1YopzueAXfjFfmCHylYEFCagduHU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab", + "rev": "825479c345a7f806485b7f00dbe3abb50641b083", "type": "github" }, "original": { @@ -495,11 +495,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1736012469, - "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", + "lastModified": 1737469691, + "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", + "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab", "type": "github" }, "original": { @@ -527,11 +527,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1737404927, - "narHash": "sha256-e1WgPJpIYbOuokjgylcsuoEUCB4Jl2rQXa2LUD6XAG8=", + "lastModified": 1737672001, + "narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ae584d90cbd0396a422289ee3efb1f1c9d141dc3", + "rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8", "type": "github" }, "original": { @@ -826,11 +826,11 @@ }, "locked": { "dir": "nix", - "lastModified": 1737065773, - "narHash": "sha256-YPP/92ViF7zd3TAnQL65pIaYiNeyqjPA4JnO6l/Hn0s=", + "lastModified": 1737758457, + "narHash": "sha256-Z50/JcMQI2R9ttEd20gXEhuAXvAI0yp3bM7j6/Xoi+A=", "owner": "wez", "repo": "wezterm", - "rev": "6c443bee9a21b6d37e06227085ddcd9633529a69", + "rev": "4bf0007cefff7f1ad139d89b54f074d5ad7d2184", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c28cab0..b535044 100644 --- a/flake.nix +++ b/flake.nix @@ -39,7 +39,6 @@ ghostty = { url = "github:ghostty-org/ghostty"; - # inputs.nixpkgs.follows = "nixpkgs"; }; affinity-nix = { diff --git a/home/home.nix b/home/home.nix index a862301..0b8784c 100644 --- a/home/home.nix +++ b/home/home.nix @@ -2,17 +2,13 @@ { nixpkgs = { - # You can add overlays here overlays = [ - # Add overlays your own flake exports (from overlays and pkgs dir): outputs.overlays.additions outputs.overlays.modifications outputs.overlays.unstable-packages ]; - # Configure your nixpkgs instance config = { - # Disable if you don't want unfree packages allowUnfree = true; }; }; @@ -24,9 +20,9 @@ inputs.affinity-nix.packages.x86_64-linux.designer guix - uv + # uv - thonny + unstable.thonny inputs.isd.packages.x86_64-linux.default @@ -125,6 +121,9 @@ serapeum ])) + fuzzel + + kdlfmt ccl racket gdu @@ -281,13 +280,16 @@ discord slack signal-desktop + eyedropper calcurse onlyoffice-desktopeditors libreoffice hyphenDicts.en_US plexamp - amberol + rmpc + resources carla + switcheroo # audacity tenacity supercollider-with-plugins @@ -296,6 +298,7 @@ blender davinci-resolve-studio steam + unstable.processing zotero jre tesseract @@ -426,6 +429,9 @@ programs = { home-manager.enable = true; + yambar = { + enable = true; + }; direnv = { enable = true; nix-direnv.enable = true; @@ -499,11 +505,11 @@ thefuck = { enable = true; }; - # ghostty = { - # enable = true; - # package = inputs.ghostty.packages.x86_64-linux.ghostty; - # enableFishIntegration = true; - # }; + ghostty = { + enable = true; + package = inputs.ghostty.packages.x86_64-linux.ghostty; + enableFishIntegration = true; + }; wezterm = { enable = true; package = inputs.wezterm.packages.${pkgs.system}.default; @@ -621,6 +627,13 @@ }; services = { + # mpd = { + # enable = true; + # # musicDirectory = ; + # }; + mako = { + enable = true; + }; flatpak.enable = true; syncthing = { enable = true; @@ -691,10 +704,11 @@ # moving files! xdg.configFile."just/justfile".source = ../dotfiles/dot_config/just/justfile; xdg.configFile."starship.toml".source = ../dotfiles/dot_config/starship.toml; - # xdg.configFile."ghostty".source = ../dotfiles/dot_config/ghostty; + xdg.configFile."ghostty".source = ../dotfiles/dot_config/ghostty; xdg.configFile."wezterm".source = ../dotfiles/dot_config/wezterm; xdg.configFile."git".source = ../dotfiles/dot_config/git; xdg.configFile."rbw".source = ../dotfiles/dot_config/rbw; + xdg.configFile."niri/config.kdl".source = ../dotfiles/dot_config/niri/config.kdl; home.file.".ssh/config".source = ../dotfiles/dot_ssh/config; home.file.".npmrc".source = ../dotfiles/dot_npmrc; home.file.".vst3/yabridge/yabridge.toml".source = ../dotfiles/dot_vst3/yabridge.toml; diff --git a/overlays/default.nix b/overlays/default.nix index 3f5233c..984d91f 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -3,10 +3,8 @@ # This one brings our custom packages from the 'pkgs' directory additions = final: _prev: import ../packages final.pkgs; - # This one contains whatever you want to overlay - # You can change versions, add patches, set compilation flags, anything really. - # https://nixos.wiki/wiki/Overlays modifications = final: prev: { + ulauncher = prev.ulauncher.overrideAttrs (old: { propagatedBuildInputs = with prev.python3Packages; old.propagatedBuildInputs @@ -35,41 +33,55 @@ patches = [""]; }); - # openrazer-daemon = prev.openrazer-daemon.overrideDerivation (previous: { - # # name = "openrazer-daemon"; - # src = prev.fetchFromGitHub { - # owner = "openrazer"; - # repo = "openrazer"; - # hash = "sha256-GqmFpVNuPRNM95pJsihsk/d3s61t4Lw+qaukKip9BAM="; - # rev = "5e677b178be7da08fb72d7cd0791bf68a129fcc5"; - # }; - # }); + openrazer-daemon = prev.openrazer-daemon.overrideDerivation (previous: { + # name = "openrazer-daemon"; + src = prev.fetchFromGitHub { + owner = "openrazer"; + version = "latest"; + repo = "openrazer"; + hash = "sha256-GqmFpVNuPRNM95pJsihsk/d3s61t4Lw+qaukKip9BAM="; + rev = "5e677b178be7da08fb72d7cd0791bf68a129fcc5"; + }; + }); - # python312 = prev.python312.override { - # packageOverrides = pyself: pysuper: { - # openrazer = pysuper.openrazer.overrideAttrs (_: { - # src = prev.fetchFromGitHub { - # owner = "openrazer"; - # repo = "openrazer"; - # hash = "sha256-GqmFpVNuPRNM95pJsihsk/d3s61t4Lw+qaukKip9BAM="; - # rev = "5e677b178be7da08fb72d7cd0791bf68a129fcc5"; - # }; - # }); - # }; - # }; + python312 = prev.python312.override { + packageOverrides = pyself: pysuper: { + openrazer = pysuper.openrazer.overrideAttrs (_: { + src = prev.fetchFromGitHub { + owner = "openrazer"; + repo = "openrazer"; + hash = "sha256-GqmFpVNuPRNM95pJsihsk/d3s61t4Lw+qaukKip9BAM="; + rev = "5e677b178be7da08fb72d7cd0791bf68a129fcc5"; + }; + }); + }; + }; - # python311 = prev.python311.override { - # packageOverrides = pyself: pysuper: { - # openrazer = pysuper.openrazer.overrideAttrs (_: { - # src = prev.fetchFromGitHub { - # owner = "openrazer"; - # repo = "openrazer"; - # hash = "sha256-GqmFpVNuPRNM95pJsihsk/d3s61t4Lw+qaukKip9BAM="; - # rev = "5e677b178be7da08fb72d7cd0791bf68a129fcc5"; - # }; - # }); - # }; - # }; + python311 = prev.python311.override { + packageOverrides = pyself: pysuper: { + openrazer = pysuper.openrazer.overrideAttrs (_: { + src = prev.fetchFromGitHub { + version = "latest"; + owner = "openrazer"; + repo = "openrazer"; + hash = "sha256-GqmFpVNuPRNM95pJsihsk/d3s61t4Lw+qaukKip9BAM="; + rev = "5e677b178be7da08fb72d7cd0791bf68a129fcc5"; + }; + }); + }; + }; + + linuxPackages_6_12 = prev.linuxPackages_6_12.extend (lpf: lpp: { + openrazer = lpp.openrazer.overrideAttrs (_: { + src = prev.fetchFromGitHub { + owner = "openrazer"; + repo = "openrazer"; + version = "latest"; + hash = "sha256-GqmFpVNuPRNM95pJsihsk/d3s61t4Lw+qaukKip9BAM="; + rev = "5e677b178be7da08fb72d7cd0791bf68a129fcc5"; + }; + }); + }); }; # When applied, the unstable nixpkgs set (declared in the flake inputs) will diff --git a/packages/bitwig-beta/bitwig-studio-beta.nix b/packages/bitwig-beta/bitwig-studio-beta.nix index 08d964e..cfd53c2 100644 --- a/packages/bitwig-beta/bitwig-studio-beta.nix +++ b/packages/bitwig-beta/bitwig-studio-beta.nix @@ -32,12 +32,12 @@ stdenv.mkDerivation rec { pname = "bitwig-studio-unwrapped"; - version = "5.3-beta-3"; + version = "5.3-beta-6"; src = fetchurl { name = "bitwig-studio-${version}.deb"; - url = "https://downloads-secure.bitwig.com/5.3%20Beta%203/bitwig-studio-5.3-beta-3.deb?__token__=st=1734721071.0~exp=1734721671.0~hmac=b69ea20705e6b169a0dbc6a7944dcbc428f58d83dedb93b2cc81f5c0d173862a&source_url=/dl/Bitwig%20Studio/5.3%20Beta%203/installer_linux/"; - sha256 = "sha256-3T1Jg+WgETi8nbmiqYNw/FylvF8LkIbAw+iEOjpbKqU="; + url = "https://downloads-secure.bitwig.com/5.3%20Beta%206/bitwig-studio-5.3-beta-6.deb?__token__=st=1737819113.0~exp=1737819713.0~hmac=4f89ac2fb395e08a914fe57eb46d2313b2d5288f981d0f7e2da9089325c4c099&source_url=/dl/Bitwig%20Studio/5.3%20Beta%206/installer_linux/"; + sha256 = "sha256-DE5qWSAcOJHThAXdQouOVRkFNhuzZD9j8gphByaQEis="; }; diff --git a/system/eddie/configuration.nix b/system/eddie/configuration.nix index f3cff5a..c36d8a5 100644 --- a/system/eddie/configuration.nix +++ b/system/eddie/configuration.nix @@ -60,7 +60,6 @@ tailscale rsync gnupg - # openrazer-daemon clinfo alsa-utils psutils @@ -72,12 +71,8 @@ freetype egl-wayland glfw-wayland - # libGL.dev openssl - adi1090x-plymouth-themes - # solaar - # logitech-udev-rules - linuxKernel.packages.linux_6_13.openrazer + xwayland-satellite ]; # Bootloader. @@ -87,13 +82,7 @@ systemd-boot.configurationLimit = 8; efi.canTouchEfiVariables = true; }; - # plymouth = { - # enable = true; - # font = "${pkgs.jetbrains-mono}/share/fonts/truetype/JetBrainsMono-Medium.ttf"; - # themePackages = [ pkgs.adi1090x-plymouth-themes ]; - # theme = "deus_ex"; - # }; - kernelPackages = pkgs.linuxPackages_latest; + kernelPackages = pkgs.unstable.linuxPackages_6_12; initrd.kernelModules = [ "nvidia" "nvidia_modeset" "nvidia_uvm" "nvidia_drm" "snd-virmidi" ]; kernelParams = [ "nvidia_drm.fbdev=1" "nvidia_drm.modeset=1" ]; }; @@ -223,6 +212,9 @@ vSync = true; }; + programs.niri.enable = true; + # programs.waybar.enable = true; + programs.nh = { enable = true; clean = { @@ -255,11 +247,14 @@ services.gnome.sushi.enable = true; - xdg.portal.extraPortals = [ - pkgs.xdg-desktop-portal-gnome - pkgs.xdg-desktop-portal-gtk - pkgs.xdg-desktop-portal - ]; + xdg.portal = { + enable = true; + extraPortals = [ + pkgs.xdg-desktop-portal-gnome + pkgs.xdg-desktop-portal-gtk + pkgs.xdg-desktop-portal + ]; + }; # Enable sound with pipewire. hardware.pulseaudio.enable = false;