fix poly bar, use minified nvim to test out
This commit is contained in:
RingOfStorms (Joshua Bell)
parent
647423692c
commit
b2f0476412
6 changed files with 389 additions and 136 deletions
|
|
@ -1,4 +1,4 @@
|
|||
{ ... }:
|
||||
{
|
||||
imports = [ ./i3.nix ];
|
||||
imports = [ ./i3.nix ./polybar.nix ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -81,13 +81,7 @@
|
|||
"Print" = "exec sh -c 'maim -s | xclip -selection clipboard -t image/png'";
|
||||
};
|
||||
|
||||
bars = [
|
||||
# {
|
||||
# position = "top";
|
||||
# statusCommand = "${pkgs.i3status}/bin/i3status";
|
||||
# }
|
||||
];
|
||||
|
||||
bars = [ ];
|
||||
startup = [ ];
|
||||
};
|
||||
};
|
||||
|
|
|
|||
306
flakes/common/hm_modules/de_i3/polybar.nix
Normal file
306
flakes/common/hm_modules/de_i3/polybar.nix
Normal file
|
|
@ -0,0 +1,306 @@
|
|||
{ lib, pkgs, ... }:
|
||||
let
|
||||
mf = "#3b3b3bcc";
|
||||
bg = "#00000000";
|
||||
fg = "#FFFFFF";
|
||||
|
||||
polybarRun = pkgs.writeShellScriptBin "pbr" ''
|
||||
polybar -m | while IFS=: read -r mon rest; do
|
||||
if echo "$rest" | ${pkgs.gnugrep}/bin/grep -q "(primary)"; then
|
||||
MONITOR="$mon" polybar -r primary &
|
||||
else
|
||||
MONITOR="$mon" polybar -r others &
|
||||
fi
|
||||
done
|
||||
wait
|
||||
'';
|
||||
in
|
||||
{
|
||||
services.polybar = {
|
||||
enable = true;
|
||||
package = pkgs.polybar.override {
|
||||
i3Support = true;
|
||||
iwSupport = true;
|
||||
pulseSupport = true;
|
||||
};
|
||||
script = "${polybarRun}/bin/pbr";
|
||||
settings = {
|
||||
"global/wm" = {
|
||||
margin-bottom = 0;
|
||||
margin-top = 5;
|
||||
};
|
||||
|
||||
"bar/main" = {
|
||||
monitor = "\${env:MONITOR}";
|
||||
width = "100%";
|
||||
height = 20;
|
||||
radius = 0;
|
||||
background = bg;
|
||||
foreground = fg;
|
||||
font-0 = "JetBrainsMono Nerd Font:size=11;2";
|
||||
font-1 = "Noto Sans CJK JP:size=11;2";
|
||||
|
||||
cursor-click = "pointer";
|
||||
enable-ipc = true;
|
||||
};
|
||||
|
||||
"bar/primary" = {
|
||||
"inherit" = "bar/main";
|
||||
modules-left = "i3";
|
||||
modules-center = "clock temperature cpu memory filesystem";
|
||||
modules-right = "volume tray powermenu";
|
||||
# modules-right = "volume network bluetooth backlight tray powermenu";
|
||||
};
|
||||
|
||||
"bar/others" = {
|
||||
"inherit" = "bar/main";
|
||||
modules-left = "i3";
|
||||
modules-center = "clock temperature cpu memory filesystem";
|
||||
modules-right = "";
|
||||
};
|
||||
|
||||
"settings" = {
|
||||
screenchange-reload = true;
|
||||
|
||||
compositing-background = "source";
|
||||
compositing-foreground = "over";
|
||||
compositing-overline = "over";
|
||||
comppositing-underline = "over";
|
||||
compositing-border = "over";
|
||||
|
||||
pseudo-transparency = true;
|
||||
};
|
||||
|
||||
"module/i3" = {
|
||||
type = "internal/i3";
|
||||
index-sort = true;
|
||||
pin-workspaces = true;
|
||||
strip-wsnumbers = true;
|
||||
wrapping-scroll = false;
|
||||
format = "<label-state>";
|
||||
|
||||
ws-icon-0 = "1;一";
|
||||
ws-icon-1 = "2;二";
|
||||
ws-icon-2 = "3;三";
|
||||
ws-icon-3 = "4;四";
|
||||
ws-icon-4 = "5;五";
|
||||
ws-icon-5 = "6;六";
|
||||
ws-icon-6 = "7;七";
|
||||
ws-icon-7 = "8;八";
|
||||
ws-icon-8 = "9;九";
|
||||
ws-icon-9 = "10;十";
|
||||
|
||||
label-unfocused = "%icon%";
|
||||
label-focused = "%icon%";
|
||||
label-focused-background = mf;
|
||||
label-visible = "%icon%";
|
||||
label-urgent = "%icon%";
|
||||
label-occupied = "%icon%";
|
||||
|
||||
label-unfocused-padding = 1;
|
||||
label-focused-padding = 1;
|
||||
label-visible-padding = 1;
|
||||
label-urgent-padding = 1;
|
||||
label-occupied-padding = 1;
|
||||
};
|
||||
|
||||
"module/clock" = {
|
||||
type = "internal/date";
|
||||
interval = 10;
|
||||
date = "%b %d, %H:%M";
|
||||
format = "<label>";
|
||||
label = "%date%";
|
||||
};
|
||||
|
||||
"module/temperature" = {
|
||||
type = "internal/temperature";
|
||||
interval = 5;
|
||||
thermal-zone = 2;
|
||||
hwmon-path = "/sys/class/hwmon/hwmon2/temp1_input";
|
||||
warn-temperature = 80;
|
||||
format = "<label>";
|
||||
format-prefix = " ";
|
||||
label = " %temperature-c%";
|
||||
};
|
||||
|
||||
"module/cpu" = {
|
||||
type = "internal/cpu";
|
||||
interval = 2;
|
||||
format = "<label>";
|
||||
format-prefix = " ";
|
||||
label = " %percentage%%";
|
||||
};
|
||||
|
||||
"module/memory" = {
|
||||
type = "internal/memory";
|
||||
interval = 5;
|
||||
format = "<label>";
|
||||
format-prefix = " ";
|
||||
label = " %percentage_used%%";
|
||||
};
|
||||
|
||||
"module/filesystem" = {
|
||||
type = "internal/fs";
|
||||
interval = 30;
|
||||
mount-0 = "/";
|
||||
format-mounted = "<label-mounted>";
|
||||
label-mounted = " %percentage_used%%";
|
||||
format-mounted-prefix = " ";
|
||||
};
|
||||
|
||||
# "module/battery" = {
|
||||
# type = "internal/battery";
|
||||
# battery = "BAT0";
|
||||
# adapter = "AC";
|
||||
# full-at = 98;
|
||||
# format-charging = "%percentage%% ";
|
||||
# format-discharging = "%percentage%% %icon%";
|
||||
# format-full = "%percentage%% ";
|
||||
# ramp-capacity-0 = "";
|
||||
# ramp-capacity-1 = "";
|
||||
# ramp-capacity-2 = "";
|
||||
# ramp-capacity-3 = "";
|
||||
# ramp-capacity-4 = "";
|
||||
# };
|
||||
#
|
||||
# "module/battery2" = {
|
||||
# type = "internal/battery";
|
||||
# battery = "BAT2";
|
||||
# adapter = "AC";
|
||||
# full-at = 98;
|
||||
# format-charging = "%percentage%% ";
|
||||
# format-discharging = "%percentage%% %icon%";
|
||||
# format-full = "%percentage%% ";
|
||||
# ramp-capacity-0 = "";
|
||||
# ramp-capacity-1 = "";
|
||||
# ramp-capacity-2 = "";
|
||||
# ramp-capacity-3 = "";
|
||||
# ramp-capacity-4 = "";
|
||||
# };
|
||||
|
||||
# "module/volumea" = {
|
||||
# type = "custom/script";
|
||||
# format = "<label>";
|
||||
# exec = "/bin/sh";
|
||||
# exec-args = [
|
||||
# "-c"
|
||||
# "${pkgs.wireplumber}/bin/wpctl get-volume @DEFAULT_AUDIO_SINK@ 2>/dev/null | awk '{printf \" %d%%\", $2*100}'"
|
||||
# ];
|
||||
# interval = 2;
|
||||
# click-left = "${pkgs.pavucontrol}/bin/pavucontrol";
|
||||
# click-right = "${pkgs.wireplumber}/bin/wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
|
||||
# scroll-up = "${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.05+";
|
||||
# scroll-down = "${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.05-";
|
||||
# };
|
||||
|
||||
"module/volume" = {
|
||||
type = "internal/alsa";
|
||||
};
|
||||
|
||||
# "module/wifi" = {
|
||||
# type = "internal/network";
|
||||
# interface = "wlp11s0";
|
||||
# unknown-as-up = true;
|
||||
# accumulate-stats = true;
|
||||
# interval = 3;
|
||||
# format-connected = " %essid% (%signal%%)";
|
||||
# format-wired = " %local_ip%";
|
||||
# format-disconnected = " Disconnected";
|
||||
# };
|
||||
|
||||
# "module/network" = {
|
||||
# type = "internal/network";
|
||||
# interface = "eno1";
|
||||
#
|
||||
# interval = "1.0";
|
||||
#
|
||||
# accumulate-stats = true;
|
||||
# unknown-as-up = true;
|
||||
#
|
||||
# format-connected = "<label-connected>";
|
||||
# format-connected-background = mf;
|
||||
# format-connected-underline = bg;
|
||||
# format-connected-overline = bg;
|
||||
# format-connected-padding = 2;
|
||||
# format-connected-margin = 0;
|
||||
#
|
||||
# format-disconnected = "<label-disconnected>";
|
||||
# format-disconnected-background = mf;
|
||||
# format-disconnected-underline = bg;
|
||||
# format-disconnected-overline = bg;
|
||||
# format-disconnected-padding = 2;
|
||||
# format-disconnected-margin = 0;
|
||||
#
|
||||
# label-connected = "D %downspeed:2% | U %upspeed:2%";
|
||||
# label-disconnected = "DISCONNECTED";
|
||||
# };
|
||||
|
||||
# "module/bluetooth" = {
|
||||
# type = "custom/script";
|
||||
# format = "<label>";
|
||||
# format-prefix = " ";
|
||||
# exec = "/bin/sh";
|
||||
# exec-args = [
|
||||
# "-c"
|
||||
# "${pkgs.bluez}/bin/bluetoothctl info | grep -q 'Connected: yes' && echo '' || echo ' off'"
|
||||
# ];
|
||||
# interval = 5;
|
||||
# click-left = "blueman-manager";
|
||||
# };
|
||||
|
||||
# "module/backlight" = {
|
||||
# type = "custom/script";
|
||||
# format = "<label>";
|
||||
# format-prefix = " ";
|
||||
# exec = "/bin/sh";
|
||||
# exec-args = [
|
||||
# "-c"
|
||||
# "${pkgs.brightnessctl}/bin/brightnessctl -m | cut -d, -f4"
|
||||
# ];
|
||||
#
|
||||
# interval = 2;
|
||||
# label = "%output%% ";
|
||||
# scroll-up = "${pkgs.brightnessctl}/bin/brightnessctl set +5%";
|
||||
# scroll-down = "${pkgs.brightnessctl}/bin/brightnessctl set 5%-";
|
||||
# };
|
||||
|
||||
"module/powermenu" = {
|
||||
type = "custom/menu";
|
||||
expand-right = "false";
|
||||
|
||||
format = "<label-toggle> <menu>";
|
||||
format-background = mf;
|
||||
format-padding = 1;
|
||||
|
||||
label-open = " ";
|
||||
label-close = " ";
|
||||
label-separator = "|";
|
||||
|
||||
menu-0-0 = " Logout";
|
||||
menu-0-0-exec = "i3-msg exit";
|
||||
menu-0-1 = " Reboot";
|
||||
menu-0-1-exec = "systemctl reboot";
|
||||
menu-0-2 = " Shutdown";
|
||||
menu-0-2-exec = "systemctl poweroff";
|
||||
};
|
||||
|
||||
"module/tray" = {
|
||||
type = "internal/tray";
|
||||
tray-foreground = fg;
|
||||
tray-spacing = 4;
|
||||
tray-size = "90%";
|
||||
tray-position = "right";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
home.packages = [
|
||||
polybarRun
|
||||
|
||||
pkgs.playerctl
|
||||
pkgs.brightnessctl
|
||||
pkgs.blueman
|
||||
pkgs.bluez
|
||||
pkgs.noto-fonts-cjk-sans
|
||||
];
|
||||
}
|
||||
|
|
@ -1,6 +1,4 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
|
@ -20,51 +18,25 @@
|
|||
|
||||
services.xserver = {
|
||||
enable = true;
|
||||
# displayManager.startx.enable = true;
|
||||
windowManager.i3 = {
|
||||
enable = true;
|
||||
# package = pkgs.i3;
|
||||
extraPackages = with pkgs; [
|
||||
dmenu
|
||||
i3status
|
||||
i3lock
|
||||
maim
|
||||
xclip
|
||||
];
|
||||
};
|
||||
desktopManager = {
|
||||
# xterm.enable = false;
|
||||
# xfce = {
|
||||
# enable = true;
|
||||
# noDesktop = true;
|
||||
# enableXfwm = false;
|
||||
# };
|
||||
};
|
||||
displayManager = {
|
||||
lightdm.enable = true;
|
||||
defaultSession = "none+i3";
|
||||
# defaultSession = "xfce+i3";
|
||||
};
|
||||
};
|
||||
services.displayManager.defaultSession = "none+i3";
|
||||
|
||||
hardware.graphics.enable = true;
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
# xfce.xfce4-panel
|
||||
# xfce.xfce4-session
|
||||
# xfce.xfce4-settings
|
||||
# xfce.xfce4-power-manager
|
||||
# xfce.xfce4-pulseaudio-plugin
|
||||
# xfce.xfce4-screenshooter
|
||||
# xfce.xfce4-clipman-plugin
|
||||
# xfce.xfce4-sensors-plugin
|
||||
# xfce.xfce4-notifyd
|
||||
pavucontrol
|
||||
];
|
||||
security.rtkit.enable = true;
|
||||
|
||||
# Applets/services for tray widgets
|
||||
programs.nm-applet.enable = true;
|
||||
services.blueman.enable = true;
|
||||
services.upower.enable = true;
|
||||
# xfce4-notifyd is provided as a package; XFCE runs it automatically
|
||||
}
|
||||
|
|
|
|||
167
hosts/lio/flake.lock
generated
167
hosts/lio/flake.lock
generated
|
|
@ -221,11 +221,11 @@
|
|||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1759772810,
|
||||
"narHash": "sha256-8/sO67+Q6yNfFD39W5SXQHDbf/tQUHWFhCdxgRRGVCQ=",
|
||||
"lastModified": 1761619080,
|
||||
"narHash": "sha256-PsLFmU/CORWeCjJi9ALsegwr/SMjf2gHsooTR09az4c=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "2b78ecc45e163d655c08c9a4cffb4a91c66d0493",
|
||||
"rev": "fd644bba1d3a83169e4b312ce20928ba1b0abb02",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -269,11 +269,11 @@
|
|||
"nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1759715887,
|
||||
"narHash": "sha256-9wXyswKnUenlZyO/aIy0gr1hF0IhuEJ0UOwvqjDSGjA=",
|
||||
"lastModified": 1761323006,
|
||||
"narHash": "sha256-6BjkqZCo2DLVxW6BHyElt2cZdG6Dhzao8hPfWYm0sIQ=",
|
||||
"owner": "CopilotC-Nvim",
|
||||
"repo": "CopilotChat.nvim",
|
||||
"rev": "92f269971c33a6e2f405da8b14f01cd109b9a3a3",
|
||||
"rev": "a7138a0ee04d8af42c262554eccee168bbf1454f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -301,11 +301,11 @@
|
|||
"nvim_plugin-L3MON4D3/LuaSnip": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1759157591,
|
||||
"narHash": "sha256-sicE0/Vgc03X+Qxqlu5CM7NGd+6FE9RGx6OjZUa6Umw=",
|
||||
"lastModified": 1761039842,
|
||||
"narHash": "sha256-ovvtTZgqL6MFvuI3byx+boWm6ErZX06+v6a3VoctREc=",
|
||||
"owner": "L3MON4D3",
|
||||
"repo": "LuaSnip",
|
||||
"rev": "73813308abc2eaeff2bc0d3f2f79270c491be9d7",
|
||||
"rev": "ccf25a5452b8697a823de3e5ecda63ed3d723b79",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -317,11 +317,11 @@
|
|||
"nvim_plugin-MeanderingProgrammer/render-markdown.nvim": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1759424904,
|
||||
"narHash": "sha256-Smt9v6/XyHUdUiIPyCPQSRvWCeMMhYITSZWd9M7Jlvs=",
|
||||
"lastModified": 1761343950,
|
||||
"narHash": "sha256-HycEAgAsU8IxFiYfyp5ZGN+z6wYyCarIESxA9TDuJ3s=",
|
||||
"owner": "MeanderingProgrammer",
|
||||
"repo": "render-markdown.nvim",
|
||||
"rev": "7e6af36c846017122e07e68803bbf95f3c729ca3",
|
||||
"rev": "bfd67f1402b97ac619cb538f4bbaed12a7fa89aa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -397,11 +397,11 @@
|
|||
"nvim_plugin-b0o/schemastore.nvim": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1759454886,
|
||||
"narHash": "sha256-T6mWvScsU0IsB3wFre5+TrNIbpQCA0flf7BNrGQIb+M=",
|
||||
"lastModified": 1761343239,
|
||||
"narHash": "sha256-obGnux+K0blHROEOAy7Ct18vxiO4Qez8XJB5l23KgMs=",
|
||||
"owner": "b0o",
|
||||
"repo": "schemastore.nvim",
|
||||
"rev": "8e17e50b519ba360bcfd5dfb5843ccac9be500ba",
|
||||
"rev": "4341619da06779ae310ee9c3d6d70edfefed7152",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -413,11 +413,11 @@
|
|||
"nvim_plugin-catppuccin/nvim": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1759668198,
|
||||
"narHash": "sha256-WmWGygttH78KajAaIvlwRW47G7UGJuPV0YIfEZkse6I=",
|
||||
"lastModified": 1761396780,
|
||||
"narHash": "sha256-Nz/XbItShbrnKtj0+gcEDBFO5y00g0EG5CHqdJGK2j0=",
|
||||
"owner": "catppuccin",
|
||||
"repo": "nvim",
|
||||
"rev": "e79d09fa347b367e0e7f693bfe87dba932a8cbd1",
|
||||
"rev": "8c4125e3c746976ba025dc5d908fa22c6aa09486",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -429,11 +429,11 @@
|
|||
"nvim_plugin-chrisgrieser/nvim-early-retirement": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1757363000,
|
||||
"narHash": "sha256-hfoJDD4ZKIx1IZjmZba117wRe3ELyGqG8ZqxDnRVmIk=",
|
||||
"lastModified": 1760385962,
|
||||
"narHash": "sha256-PtpD6Uc4GK4dSJynWH5d6c7XOWXfYODXJ3FyOY1eZNo=",
|
||||
"owner": "chrisgrieser",
|
||||
"repo": "nvim-early-retirement",
|
||||
"rev": "14aba23ce4168e6d6acbf78ab1d33739c3894f68",
|
||||
"rev": "9109589b542773c9ad2a34067a085874f255577b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -461,11 +461,11 @@
|
|||
"nvim_plugin-folke/lazy.nvim": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1759439283,
|
||||
"narHash": "sha256-FjQ2rj3BvC8fh60IT0ExrBOmdDLdXFexffef6iKcPFQ=",
|
||||
"lastModified": 1761488113,
|
||||
"narHash": "sha256-jBmtFzzdGYe3N3kvWHvR7FGXtA+/t36efxsAqhLmaxU=",
|
||||
"owner": "folke",
|
||||
"repo": "lazy.nvim",
|
||||
"rev": "59334064f8604ca073791c25dcc5c9698865406e",
|
||||
"rev": "ed4dc336a73c18da6fea6e1cf7ad6e1b76d281eb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -493,11 +493,11 @@
|
|||
"nvim_plugin-folke/which-key.nvim": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1758639622,
|
||||
"narHash": "sha256-JNkjlv6QpnuaYCAFcBPjV7IavVLzj8QEX/Zi3sbdyrU=",
|
||||
"lastModified": 1759952076,
|
||||
"narHash": "sha256-N31+V5L0gd+TUo9nVtNGRmMVmM9fMxOwldCfuLYT4hU=",
|
||||
"owner": "folke",
|
||||
"repo": "which-key.nvim",
|
||||
"rev": "904308e6885bbb7b60714c80ab3daf0c071c1492",
|
||||
"rev": "b4177e3eaf15fe5eb8357ebac2286d488be1ed00",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -557,11 +557,11 @@
|
|||
"nvim_plugin-hrsh7th/nvim-cmp": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1744514599,
|
||||
"narHash": "sha256-l5z+PT4S9b09d2M+J/tHVd9W9Ss3eQQk5Ykpz2Qjxxw=",
|
||||
"lastModified": 1760792454,
|
||||
"narHash": "sha256-wkESSNUViVI5DE+3t4AVTaSLQ/hTB43vrm+PH6uA8H4=",
|
||||
"owner": "hrsh7th",
|
||||
"repo": "nvim-cmp",
|
||||
"rev": "b5311ab3ed9c846b585c0c15b7559be131ec4be9",
|
||||
"rev": "a7bcf1d88069fc67c9ace8a62ba480b8fe879025",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -573,11 +573,11 @@
|
|||
"nvim_plugin-j-hui/fidget.nvim": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1758578970,
|
||||
"narHash": "sha256-ieY3zaQAydzadpPiW1/IYakVHhp+wyEOpCQntgDOObs=",
|
||||
"lastModified": 1761243883,
|
||||
"narHash": "sha256-XXTeJweQRIsC/WFhFxFbepOETV8e5Wfmh513su2Wve0=",
|
||||
"owner": "j-hui",
|
||||
"repo": "fidget.nvim",
|
||||
"rev": "3f5475949679953af6d78654db29b944fa826e6a",
|
||||
"rev": "e32b672d8fd343f9d6a76944fedb8c61d7d8111a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -605,11 +605,11 @@
|
|||
"nvim_plugin-lewis6991/gitsigns.nvim": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1759324477,
|
||||
"narHash": "sha256-GDK9I3SNRyZe59+GsnDC0L2KjGr150dWo4S3DUwhT7U=",
|
||||
"lastModified": 1760888451,
|
||||
"narHash": "sha256-eGpB7YYWbyCCGYXEYAM432srSp/lUo5C1b0J3OYjwnY=",
|
||||
"owner": "lewis6991",
|
||||
"repo": "gitsigns.nvim",
|
||||
"rev": "1ee5c1fd068c81f9dd06483e639c2aa4587dc197",
|
||||
"rev": "20ad4419564d6e22b189f6738116b38871082332",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -685,11 +685,11 @@
|
|||
"nvim_plugin-mfussenegger/nvim-lint": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1758714671,
|
||||
"narHash": "sha256-POnQfsZAv93+0uCbKFcNgyQxn3u8nNqgnx0uTqCkCq8=",
|
||||
"lastModified": 1759852544,
|
||||
"narHash": "sha256-wVEX0lCxeipvwCfdd2JbQwnhgg6UrTXixC8E1OiEblI=",
|
||||
"owner": "mfussenegger",
|
||||
"repo": "nvim-lint",
|
||||
"rev": "335a6044be16d7701001059cba9baa36fbeef422",
|
||||
"rev": "9da1fb942dd0668d5182f9c8dee801b9c190e2bb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -701,11 +701,11 @@
|
|||
"nvim_plugin-mrcjkb/rustaceanvim": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1759623626,
|
||||
"narHash": "sha256-Cz4LDzz7v3kBS1mbxZjprogqHFghYr5xMfSN3us2Ltk=",
|
||||
"lastModified": 1761585884,
|
||||
"narHash": "sha256-m/gd+cb7X2a7R6JSbHes0QjGs+zuj4698Qyi/OW0R1g=",
|
||||
"owner": "mrcjkb",
|
||||
"repo": "rustaceanvim",
|
||||
"rev": "96a4f5efc7705f613ddd47fb5d1445c172acb213",
|
||||
"rev": "be0d1d14b8504c1c0965b608dc7ed39f2d588c91",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -717,11 +717,11 @@
|
|||
"nvim_plugin-neovim/nvim-lspconfig": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1759548517,
|
||||
"narHash": "sha256-K56vjTUkQ/NdA6vq5942zUknPiCUbMByiEW540dR8R0=",
|
||||
"lastModified": 1761605346,
|
||||
"narHash": "sha256-3Aulaw6KMmrcoQQxhRhQhjZ2fg6MSU4Q7qAWtrVsOcA=",
|
||||
"owner": "neovim",
|
||||
"repo": "nvim-lspconfig",
|
||||
"rev": "e688b486fe9291f151eae7e5c0b5a5c4ef980847",
|
||||
"rev": "2b52bc2190c8efde2e4de02d829a138666774c7c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -730,22 +730,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nvim_plugin-nosduco/remote-sshfs.nvim": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1759193354,
|
||||
"narHash": "sha256-FfUxpRfqrf0r56/gi76N2ZooWnXWO0aRtaQBS7m+SvY=",
|
||||
"owner": "nosduco",
|
||||
"repo": "remote-sshfs.nvim",
|
||||
"rev": "45502b3892774811153aeab5f7f9b0033c82005c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nosduco",
|
||||
"repo": "remote-sshfs.nvim",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nvim_plugin-numToStr/Comment.nvim": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
@ -781,11 +765,11 @@
|
|||
"nvim_plugin-nvim-lualine/lualine.nvim": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1754970649,
|
||||
"narHash": "sha256-lWt2kpW+hsTMWt8tar/+AISTDrIt4Jn27NmI9j+Xt4s=",
|
||||
"lastModified": 1760596863,
|
||||
"narHash": "sha256-hdrAdG3hC2sAevQ6a9xizqPgEgnNKxuc5rBYn0pKM1c=",
|
||||
"owner": "nvim-lualine",
|
||||
"repo": "lualine.nvim",
|
||||
"rev": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955",
|
||||
"rev": "3946f0122255bc377d14a59b27b609fb3ab25768",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -861,11 +845,11 @@
|
|||
"nvim_plugin-nvim-tree/nvim-tree.lua": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1759222332,
|
||||
"narHash": "sha256-TmQd8Xx9xw3G9PfPH+DZeSECfiUoO7XKCUSyQ4O0hMk=",
|
||||
"lastModified": 1760921408,
|
||||
"narHash": "sha256-QCUp/6qX/FS8LrZ6K+pvC/mHkYW8xfzQZEB2y0VOStQ=",
|
||||
"owner": "nvim-tree",
|
||||
"repo": "nvim-tree.lua",
|
||||
"rev": "87d096a39cb2d5d43e6771563575ff042a79f48b",
|
||||
"rev": "64e2192f5250796aa4a7f33c6ad888515af50640",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -877,11 +861,11 @@
|
|||
"nvim_plugin-nvim-tree/nvim-web-devicons": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1759188261,
|
||||
"narHash": "sha256-lVrakFrpIP9lp7sMfMb33KeMPIkcn1qBFVytJzKCfuE=",
|
||||
"lastModified": 1761440007,
|
||||
"narHash": "sha256-klBjUtj0AvarN5a6O8Hh2t5BuOTe/m3ps2cHnlxVJvE=",
|
||||
"owner": "nvim-tree",
|
||||
"repo": "nvim-web-devicons",
|
||||
"rev": "b8221e42cf7287c4dcde81f232f58d7b947c210d",
|
||||
"rev": "8dcb311b0c92d460fac00eac706abd43d94d68af",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -893,11 +877,11 @@
|
|||
"nvim_plugin-nvim-treesitter/nvim-treesitter-context": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1757521884,
|
||||
"narHash": "sha256-+yj8bstmffVByX3Z/1vkUYdXvpmWGbPt+RDfkBnV11w=",
|
||||
"lastModified": 1761077440,
|
||||
"narHash": "sha256-QdZstxKsEILwe7eUZCmMdyLPyvNKc/e7cfdYQowHWPQ=",
|
||||
"owner": "nvim-treesitter",
|
||||
"repo": "nvim-treesitter-context",
|
||||
"rev": "41847d3dafb5004464708a3db06b14f12bde548a",
|
||||
"rev": "ec308c7827b5f8cb2dd0ad303a059c945dd21969",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -941,11 +925,11 @@
|
|||
"nvim_plugin-rmagatti/auto-session": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1759618137,
|
||||
"narHash": "sha256-+RYQi685tyV73WNXpgr/Q5p3o21dSUkQmSoif+EPBVM=",
|
||||
"lastModified": 1761491368,
|
||||
"narHash": "sha256-F2MtkBCVAObRwniSvFjv5MmYnCaj1YSUf0Nk5MF1F4Y=",
|
||||
"owner": "rmagatti",
|
||||
"repo": "auto-session",
|
||||
"rev": "0385a9ad378d70608c2e6e4c14b3b126ce30fc51",
|
||||
"rev": "f0eb3d69848389869572b82b336d7a6887e88e43",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -954,7 +938,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nvim_plugin-ron/ron.vim": {
|
||||
"nvim_plugin-ron-rs/ron.vim": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1660904719,
|
||||
|
|
@ -1005,11 +989,11 @@
|
|||
"nvim_plugin-stevearc/conform.nvim": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1759554032,
|
||||
"narHash": "sha256-JX+vFs+8n4PS7Xwq68MW2mjlDaLlUx6CxMqhf9ArfXQ=",
|
||||
"lastModified": 1761160784,
|
||||
"narHash": "sha256-yUUDxYuIjbFHUscEKpFV6IaraDNOA4hdcGljPHG/+sU=",
|
||||
"owner": "stevearc",
|
||||
"repo": "conform.nvim",
|
||||
"rev": "9d859cbfbde7a1bd1770e7c97aef30ec5a237a71",
|
||||
"rev": "9fd3d5e0b689ec1bf400c53cbbec72c6fdf24081",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1117,11 +1101,11 @@
|
|||
"nvim_plugin-zbirenbaum/copilot.lua": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1759697885,
|
||||
"narHash": "sha256-PwqJ7/FCfK4AqFgguZ2Tac5RWhehSEfI1N6ySSuTbZc=",
|
||||
"lastModified": 1761595323,
|
||||
"narHash": "sha256-KkiU2xmpfIbpuijvcXDw+LWKWuBgxjwY7jEQIasN5Kw=",
|
||||
"owner": "zbirenbaum",
|
||||
"repo": "copilot.lua",
|
||||
"rev": "30b98a4c25d6152c14084020f703b6d56e1f1122",
|
||||
"rev": "93adf9844dcbe09a37e7a72eaa286d33d38bf628",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1196,7 +1180,6 @@
|
|||
"nvim_plugin-mfussenegger/nvim-lint": "nvim_plugin-mfussenegger/nvim-lint",
|
||||
"nvim_plugin-mrcjkb/rustaceanvim": "nvim_plugin-mrcjkb/rustaceanvim",
|
||||
"nvim_plugin-neovim/nvim-lspconfig": "nvim_plugin-neovim/nvim-lspconfig",
|
||||
"nvim_plugin-nosduco/remote-sshfs.nvim": "nvim_plugin-nosduco/remote-sshfs.nvim",
|
||||
"nvim_plugin-numToStr/Comment.nvim": "nvim_plugin-numToStr/Comment.nvim",
|
||||
"nvim_plugin-nvim-lua/plenary.nvim": "nvim_plugin-nvim-lua/plenary.nvim",
|
||||
"nvim_plugin-nvim-lualine/lualine.nvim": "nvim_plugin-nvim-lualine/lualine.nvim",
|
||||
|
|
@ -1210,7 +1193,7 @@
|
|||
"nvim_plugin-rafamadriz/friendly-snippets": "nvim_plugin-rafamadriz/friendly-snippets",
|
||||
"nvim_plugin-rcarriga/nvim-notify": "nvim_plugin-rcarriga/nvim-notify",
|
||||
"nvim_plugin-rmagatti/auto-session": "nvim_plugin-rmagatti/auto-session",
|
||||
"nvim_plugin-ron/ron.vim": "nvim_plugin-ron/ron.vim",
|
||||
"nvim_plugin-ron-rs/ron.vim": "nvim_plugin-ron-rs/ron.vim",
|
||||
"nvim_plugin-saadparwaiz1/cmp_luasnip": "nvim_plugin-saadparwaiz1/cmp_luasnip",
|
||||
"nvim_plugin-sindrets/diffview.nvim": "nvim_plugin-sindrets/diffview.nvim",
|
||||
"nvim_plugin-stevearc/conform.nvim": "nvim_plugin-stevearc/conform.nvim",
|
||||
|
|
@ -1224,11 +1207,11 @@
|
|||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1760630879,
|
||||
"narHash": "sha256-H1ZHzlSpu2dxnM69OYCB6qJVZfVIbR3hBu3LcVW2eKw=",
|
||||
"lastModified": 1761621645,
|
||||
"narHash": "sha256-pbwLPnz2WEAJ4K6d/iBy0u/Rko9NLaN8gn8NqsBzUNo=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "d1172c40fd221200a1c7f924d0e43b395f3338ad",
|
||||
"revCount": 310,
|
||||
"rev": "26dd42aebb0b2bc218acf2e36113997133f4dbbd",
|
||||
"revCount": 319,
|
||||
"type": "git",
|
||||
"url": "https://git.joshuabell.xyz/ringofstorms/nvim"
|
||||
},
|
||||
|
|
@ -1245,11 +1228,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1759718104,
|
||||
"narHash": "sha256-TbkLsgdnXHUXR4gOQBmhxkEE9ne+eHmX1chZHWRogy0=",
|
||||
"lastModified": 1761619008,
|
||||
"narHash": "sha256-vp97eNmi5GG/+jlvnBpmG6EVO2F1+nqMQFF9GT2TIQg=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "edea9f33f9a03f615ad3609a40fbcefe0ec835ca",
|
||||
"rev": "7bc7d2f706ebe5479d230d2c6806b5dc757ae4cd",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@ let
|
|||
'';
|
||||
bg1 = ../_shared_assets/wallpapers/pixel_neon.png;
|
||||
bg2 = ../_shared_assets/wallpapers/pixel_neon_v.png;
|
||||
xrSetup = "xrandr --output DP-1 --mode 3840x2160 --rate 97.983 --pos 0x0 --primary; xrandr --output DP-2 --mode 3440x1440 --rate 99.982 --rotate left --left-of DP-1";
|
||||
xrSetup = "xrandr --output DP-1 --mode 3840x2160 --rate 97.98 --pos 0x0 --primary; sleep 0.2; xrandr --output DP-2 --mode 3440x1440 --rate 99.98 --rotate left --left-of DP-1";
|
||||
xwallpaperCmd = "xwallpaper --output DP-1 --zoom ${bg1} --output DP-2 --zoom ${bg2}";
|
||||
startupCmd = "sh -c 'sleep 0.2; i3-msg workspace number 7; sleep 0.2; i3-msg workspace number 1'";
|
||||
i3ExtraOptions = {
|
||||
startup = [
|
||||
{ command = "${xrSetup}"; }
|
||||
{ command = "sh -c 'sleep 0.5; ${xwallpaperCmd}'"; }
|
||||
{ command = "sh -c 'sleep 1; ${xwallpaperCmd}'"; }
|
||||
{ command = "${startupCmd}"; }
|
||||
];
|
||||
};
|
||||
|
|
@ -35,16 +35,14 @@ in
|
|||
inherit (lib) mkAfter;
|
||||
in
|
||||
{
|
||||
xsession.windowManager.i3.config.bars = lib.mkForce [];
|
||||
xsession.windowManager.i3.config.startup = mkAfter (i3ExtraOptions.startup ++ [
|
||||
{ command = "nm-applet"; }
|
||||
{ command = "blueman-applet"; }
|
||||
{ command = "xfce4-power-manager"; }
|
||||
{ command = "sh -c 'pgrep -x xfsettingsd >/dev/null || xfsettingsd'"; }
|
||||
{ command = "sh -c 'pgrep -x xfce4-panel >/dev/null || (sleep 0.5; xfce4-panel --disable-wm-check)'"; }
|
||||
{ command = "sh -c 'xset s off -dpms; xset s noblank'"; }
|
||||
]);
|
||||
xsession.windowManager.i3.extraConfig = mkAfter assignLines;
|
||||
home.packages = [ pkgs.xwallpaper pkgs.xorg.xrandr ];
|
||||
home.packages = [ pkgs.xwallpaper pkgs.xorg.xrandr pkgs.xorg.xset ];
|
||||
}
|
||||
)
|
||||
];
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue