From 328ecdffc3c077639e548fff930eb0f1b45f4268 Mon Sep 17 00:00:00 2001 From: Florian Schmitt Date: Mon, 13 Jan 2025 00:32:27 +0300 Subject: [PATCH] feat: niri, waybar ricing --- dotfiles/kitty/kitty.conf | 4 +- dotfiles/niri/config.kdl | 501 +++++++++++++++++++++ dotfiles/nvim/lua/plugins/init.lua | 1 + dotfiles/waybar/config.jsonc | 92 ++++ dotfiles/waybar/style.css | 94 ++++ machines/dragon/configuration.nix | 74 +-- machines/dragon/hardware-configuration.nix | 10 +- modules/console.nix | 14 +- modules/desktop.nix | 18 +- modules/home-config.nix | 30 +- scripts/swww.sh | 34 ++ 11 files changed, 780 insertions(+), 92 deletions(-) create mode 100644 dotfiles/niri/config.kdl create mode 100644 dotfiles/waybar/config.jsonc create mode 100644 dotfiles/waybar/style.css create mode 100755 scripts/swww.sh diff --git a/dotfiles/kitty/kitty.conf b/dotfiles/kitty/kitty.conf index bb497d8..10648ea 100644 --- a/dotfiles/kitty/kitty.conf +++ b/dotfiles/kitty/kitty.conf @@ -83,11 +83,11 @@ map ctrl+shift+0 resize_window reset confirm_os_window_close 0 enable_audio_bell no -window_padding_width 2 +window_padding_width 8 font_size 14.0 background_opacity 1 paste_actions filter -#hide_window_decorations yes +hide_window_decorations yes #background_opacity 0.98 #background_image ~/Nextcloud/Images/Wallpapers/kitty-bg.png #background_image_layout cscaled diff --git a/dotfiles/niri/config.kdl b/dotfiles/niri/config.kdl new file mode 100644 index 0000000..66185fb --- /dev/null +++ b/dotfiles/niri/config.kdl @@ -0,0 +1,501 @@ +// https://github.com/YaLTeR/niri/wiki/Configuration:-Overview + +input { + keyboard { + xkb { + layout "us,ru" + options "grp:win_space_toggle,compose:ralt,ctrl:nocaps" + } + } + + touchpad { + 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%" +} + +environment { + QT_QPA_PLATFORM "wayland" + DISPLAY ":0" + EDITOR "nvim" + LC_TIME "fr_FR.UTF-8" +} + +// 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 "1920x1080@120.030" + + // You can use integer or fractional scale, for example use 1.5 for 150% scale. + scale 2 + + // 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 "on-overflow" + + // 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.25 + 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.33333; } + // 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 3 + + // 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 "#ea9d34" + + // 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="#ea9d34" to="#f6c177" 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 "xwayland-satellite" +spawn-at-startup "xrandr --output eDP-1 --primary" +spawn-at-startup "waybar" +spawn-at-startup "swww-daemon" +spawn-at-startup "~/Code/nixos-config/scripts/swww.sh ~/Nextcloud/Images/Wallpapers" +spawn-at-startup "firefox" +spawn-at-startup "kitty" + +hotkey-overlay { + skip-at-startup +} + +// 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 0.3 +} + +// 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 {} +} + +// 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 5 + clip-to-geometry true + opacity 0.95 +} + +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 "kitty"; } + Mod+D { spawn "fuzzel"; } + Mod+E { spawn "pcmanfm"; } + 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; } + + // Consume one window from the right into the focused column. + Mod+Comma { consume-window-into-column; } + // Expel one window from the focused column to the right. + Mod+Period { expel-window-from-column; } + + // There are also commands that consume or expel a single window to the side. + Mod+BracketLeft { consume-or-expel-window-left; } + Mod+BracketRight { consume-or-expel-window-right; } + + 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%"; } + + // 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/nvim/lua/plugins/init.lua b/dotfiles/nvim/lua/plugins/init.lua index 0a58b26..4f79237 100644 --- a/dotfiles/nvim/lua/plugins/init.lua +++ b/dotfiles/nvim/lua/plugins/init.lua @@ -96,6 +96,7 @@ return { "javascript", "json", "lua", + "kdl", "make", "markdown", "nix", diff --git a/dotfiles/waybar/config.jsonc b/dotfiles/waybar/config.jsonc new file mode 100644 index 0000000..be23f1b --- /dev/null +++ b/dotfiles/waybar/config.jsonc @@ -0,0 +1,92 @@ +{ + "layer": "top", + "spacing": 0, + "height": 20, + "margin-top": 0, + "margin-right": 3, + "margin-bottom": 0, + "margin-left": 3, + "position": "top", + "modules-left": [ + "niri/workspaces" + ], + "modules-center": [ + "niri/window" + ], + "modules-right": [ + "network", + "cpu", + "memory", + "battery", + "pulseaudio", + "tray", + "clock" + ], + "disable-scroll": true, + "tray": { + "icon-size": 16, + "spacing": 8, + "tooltip": false + }, + "clock": { + "format": "{:%a %d %b %H:%M}", + "tooltip": false + }, + "cpu": { + "format": " {usage}%", + "interval": 2, + "states": { + "critical": 90 + }, + "on-click": "kitty btop" + }, + "memory": { + "format": " {percentage}%", + "interval": 2, + "states": { + "critical": 80 + }, + "on-click": "kitty btop" + }, + "battery": { + "format": "{icon} {capacity}%", + "format-icons": [ + "", + "", + "", + "", + "" + ], + "interval": 6, + "states": { + "warning": 30, + "critical": 10 + }, + "tooltip": false + }, + "network": { + "format-wifi": "󰀂 {bandwidthDownBits}", + "format-ethernet": " {bandwidthDownBits}", + "format-disconnected": "󰲜", + "interval": 5, + "tooltip": false + }, + "pulseaudio": { + "scroll-step": 1, + "max-volume": 100, + "format": "󰕾 {volume}%", + "format-bluetooth": "󱄠 {volume}%", + "nospacing": 1, + "on-click": "pavucontrol", + "tooltip": false + }, + "niri/window": { + "format": "{}", + "icon": true, + "icon-size": 16, + "rewrite": { + //"(.*) Mozilla Firefox": "🌎 $1", + //"(.*) - zsh": "> [$1]" + } + } +} diff --git a/dotfiles/waybar/style.css b/dotfiles/waybar/style.css new file mode 100644 index 0000000..4f5aa22 --- /dev/null +++ b/dotfiles/waybar/style.css @@ -0,0 +1,94 @@ +@define-color base #191724; +@define-color surface #1f1d2e; +@define-color overlay #26233a; + +@define-color muted #6e6a86; +@define-color subtle #908caa; +@define-color text #e0def4; + +@define-color love #eb6f92; +@define-color gold #f6c177; +@define-color rose #ebbcba; +@define-color pine #31748f; +@define-color foam #9ccfd8; +@define-color iris #c4a7e7; + +@define-color highlightLow #21202e; +@define-color highlightMed #403d52; +@define-color highlightHigh #524f67; + +* { + font-size: 13px; + min-height: 0; + font-family: "Iosevka Nerd Font Mono"; +} +window#waybar { + all: unset; +} +.modules-left, +.modules-center, +.modules-right { + background: transparent; + margin: 0; + padding: 0; +} +tooltip { + background: @base; + color: @text; +} +#clock, +#bluetooth, +#network, +#battery, +#cpu, +#memory, +#temperature, +#tray, +#pulseaudio, +#window, +#workspaces { + border-radius: 8px; + background: alpha(@base, 0.75); + box-shadow: 0px 0px 1px rgba(0, 0, 0, 0.75); + color: @text; + padding: 2px 8px; + margin: 3px; +} +#clock:hover, +#bluetooth:hover, +#network:hover, +#battery:hover, +#cpu:hover, +#memory:hover, +#temperature:hover, +#pulseaudio:hover, +#tray:hover, +#window:hover, +#workspaces:hover { + transition: all 0.3s ease; + background: @base; +} + +#network { + min-width: 100px; +} + +#cpu, +#memory { + min-width: 40px; +} + +#workspaces button { + padding: 1px; + margin: 1px; + color: @text; + border-radius: 50%; +} +#workspaces button:hover { + background: @text; + color: @base; +} +#workspaces button.focused { + background: @gold; + color: @base; +} diff --git a/machines/dragon/configuration.nix b/machines/dragon/configuration.nix index b82a0ac..cb55a52 100644 --- a/machines/dragon/configuration.nix +++ b/machines/dragon/configuration.nix @@ -1,34 +1,18 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). - -{ config, pkgs, ... }: +{ config, ... }: { - - # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - networking.hostName = "dragon"; # Define your hostname. - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + networking.hostName = "dragon"; networking.extraHosts = '' 163.172.173.184 aleks-test-install-bookworm.test ''; - - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - - # Enable networking networking.networkmanager.enable = true; - # Set your time zone. time.timeZone = "Europe/Moscow"; - # Select internationalisation properties. i18n.defaultLocale = "fr_FR.UTF-8"; - i18n.extraLocaleSettings = { LC_ADDRESS = "fr_FR.UTF-8"; LC_IDENTIFICATION = "fr_FR.UTF-8"; @@ -41,6 +25,7 @@ LC_TIME = "fr_FR.UTF-8"; }; + hardware.pulseaudio.enable = false; hardware.graphics = { enable = true; }; @@ -48,36 +33,14 @@ nixpkgs.config.allowUnfree = true; nixpkgs.config.nvidia.acceptLicense = true; hardware.nvidia = { - - # Modesetting is required. modesetting.enable = true; - - # Nvidia power management. Experimental, and can cause sleep/suspend to fail. - # Enable this if you have graphical corruption issues or application crashes after waking - # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead - # of just the bare essentials. powerManagement.enable = true; - - # Fine-grained power management. Turns off GPU when not in use. - # Experimental and only works on modern Nvidia GPUs (Turing or newer). powerManagement.finegrained = false; - - # Use the NVidia open source kernel module (not to be confused with the - # independent third-party "nouveau" open source driver). - # Support is limited to the Turing and later architectures. Full list of - # supported GPUs is at: - # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus - # Only available from driver 515.43.04+ - # Currently alpha-quality/buggy, so false is currently the recommended setting. open = false; - - # Enable the Nvidia settings menu, - # accessible via `nvidia-settings`. nvidiaSettings = true; - - # Optionally, you may need to select the appropriate driver version for your specific GPU. package = config.boot.kernelPackages.nvidiaPackages.latest; }; + services.xserver = { enable = true; videoDrivers = [ @@ -124,28 +87,16 @@ } ]; - # Enable CUPS to print documents. services.printing.enable = true; - # Enable sound with pipewire. - hardware.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = { enable = true; alsa.enable = true; alsa.support32Bit = true; pulse.enable = true; - # If you want to use JACK applications, uncomment this - #jack.enable = true; - - # use the example session manager (no others are packaged yet so this is enabled by default, - # no need to redefine it in your config for now) - #media-session.enable = true; }; - # Enable touchpad support (enabled default in most desktopManager). - # services.xserver.libinput.enable = true; - imports = [ ../../modules/console.nix ../../modules/desktop.nix @@ -156,12 +107,17 @@ ../../modules/systemd-unfreeze.nix ]; - # This value determines the NixOS release from which the default - # settings for stateful data, like file locations and database versions - # on your system were taken. It‘s perfectly fine and recommended to leave - # this value at the release version of the first install of this system. - # Before changing this value read the documentation for this option - # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). + #programs.proxychains.enable = true; + #programs.proxychains.proxies.prx1.enable = true; + #programs.proxychains.proxies.prx1.type = "socks5"; + #programs.proxychains.proxies.prx1.host = "127.0.0.1"; + #programs.proxychains.proxies.prx1.port = 9090; + + #services.ollama = { + # enable = true; + # acceleration = "cuda"; + #}; + system.stateVersion = "23.11"; # Did you read the comment? } diff --git a/machines/dragon/hardware-configuration.nix b/machines/dragon/hardware-configuration.nix index dcac166..7a01b46 100644 --- a/machines/dragon/hardware-configuration.nix +++ b/machines/dragon/hardware-configuration.nix @@ -1,8 +1,4 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. { - config, lib, modulesPath, ... @@ -59,11 +55,9 @@ peers = [ { publicKey = "cUmp55I20JEhxr+RMmOsX+6U9kcDiAq3grnvzjQ642w="; - #allowedIPs = [ - # "0.0.0.0/0" - # "::/0" - #]; allowedIPs = [ + #"0.0.0.0/0" + #"::/0" "192.168.12.0/24" "2a01:4f9:1a:9a05::/64" ]; diff --git a/modules/console.nix b/modules/console.nix index e10575d..484c745 100644 --- a/modules/console.nix +++ b/modules/console.nix @@ -1,5 +1,5 @@ # cli programs should be available on servers and desktop -{ config, pkgs, ... }: +{ pkgs, ... }: { programs.zsh.enable = true; programs.fzf = { @@ -7,16 +7,6 @@ keybindings = true; }; - # programs.neovim = { - # enable = true; - # defaultEditor = true; - # package = pkgs.neovim; - # viAlias = true; - # vimAlias = true; - #}; - - # List packages installed in system profile. To search, run: - # $ nix search wget environment.systemPackages = with pkgs; [ ansible atuin @@ -50,7 +40,9 @@ mpc-cli mpd mpv + mtr neofetch + netcat-gnu nixd neovim ollama diff --git a/modules/desktop.nix b/modules/desktop.nix index f0097b4..b9b58e3 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -57,11 +57,12 @@ }; }; droidcam.enable = true; + dconf.enable = true; firefox.enable = true; firefox.languagePacks = [ "fr" ]; firefox.nativeMessagingHosts.packages = [ pkgs.passff-host ]; hyprland.enable = true; - + niri.enable = true; ssh.askPassword = pkgs.lib.mkForce "${pkgs.ksshaskpass.out}/bin/ksshaskpass"; # conflict between kde and gnome cf. https://github.com/NixOS/nixpkgs/issues/75867 ssh.startAgent = true; @@ -78,6 +79,12 @@ # Allow unfree packages nixpkgs.config.allowUnfree = true; + xdg.portal = { + enable = true; + extraPortals = [ pkgs.xdg-desktop-portal-kde ]; + xdgOpenUsePortal = true; + }; + # no kde bloat environment.plasma6.excludePackages = with pkgs.kdePackages; [ baloo @@ -125,6 +132,7 @@ digikam eaglemode filezilla + ghostty gimp-with-plugins hunspell hunspellDicts.fr-moderne @@ -136,6 +144,7 @@ mumble nextcloud-client obsidian + pcmanfm signal-desktop thunderbird tigervnc @@ -147,9 +156,12 @@ niri waybar fuzzel - alacritty + gnome-tweaks networkmanagerapplet - + rose-pine-gtk-theme + themechanger + pavucontrol + xwayland-satellite ]; # Do not restart the display manager automatically diff --git a/modules/home-config.nix b/modules/home-config.nix index 907eebb..d541930 100644 --- a/modules/home-config.nix +++ b/modules/home-config.nix @@ -20,12 +20,8 @@ let ''; in { - # TODO can we automate the installation of home-manager ? - # sudo nix-channel --add https://github.com/nix-community/home-manager/archive/release-24.05.tar.gz home-manager imports = [ ]; - # Let Home Manager install and manage itself. - #programs.home-manager.enable = true; home-manager.useGlobalPkgs = true; users.users.mrflos = { isNormalUser = true; @@ -71,24 +67,40 @@ in # ]; home.file = { "./.config/kitty/" = { + force = true; source = ../dotfiles/kitty; recursive = true; }; - "./.config/nvim/" = { - source = ../dotfiles/nvim; - recursive = true; - }; - "./.config/lazygit/" = { + force = true; source = ../dotfiles/lazygit; recursive = true; }; + "./.config/niri/" = { + force = true; + source = ../dotfiles/niri; + recursive = true; + }; + + "./.config/nvim/" = { + force = true; + source = ../dotfiles/nvim; + recursive = true; + }; + "./.config/tmux/" = { + force = true; source = ../dotfiles/tmux; recursive = true; }; + + "./.config/waybar/" = { + force = true; + source = ../dotfiles/waybar; + recursive = true; + }; }; home.sessionVariables = { EDITOR = "nvim"; diff --git a/scripts/swww.sh b/scripts/swww.sh new file mode 100755 index 0000000..b728bee --- /dev/null +++ b/scripts/swww.sh @@ -0,0 +1,34 @@ +#!/usr/bin/env bash + +# This script will randomly go through the files of a directory, setting it +# up as the wallpaper at regular intervals +# +# NOTE: this script is in bash (not posix shell), because the RANDOM variable +# we use is not defined in posix + +if [[ $# -lt 1 ]] || [[ ! -d $1 ]]; then + echo "Usage: + $0 " + exit 1 +fi + +# Edit below to control the images transition +export SWWW_TRANSITION_FPS=120 +export SWWW_TRANSITION_DURATION=1 +export SWWW_TRANSITION_STEP=2 + +# This controls (in seconds) when to switch to the next image +INTERVAL=300 + +while true; do + find "$1" -type f \ + | while read -r img; do + echo "$((RANDOM % 1000)):$img" + done \ + | sort -n | cut -d':' -f2- \ + | while read -r img; do + swww img "$img" + sleep $INTERVAL + done +done +one