ant/nix-system
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update

Browse source
This commit is contained in:
ant 2024-03-31 07:54:18 +02:00
parent 7b9199c542
commit 0aac48f782
6 changed files with 101 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

74
dotfiles/waybar.css
View file

@ -1,22 +1,20 @@
* { * {
border: none; border: none;
border-radius: 0;
background: rgba(0, 0, 0, 0); background: rgba(0, 0, 0, 0);
/* font-family: "CartographCF italic"; */ /* font-family: "CartographCF italic"; */
font-family: "Material Design Icons", Roboto; font-family: "Material Design Icons", Monospace;
/* font-family: "Roboto"; */ /* font-family: "Roboto"; */
font-weight: bold; font-weight: bold;
font-size: 14px; font-size: 14px;
min-height: 0; min-height: 0;
} }
tooltip { /* tooltip { */
background: #000000; /* background: #000000; */
/* border-radius: 10px; */ /* border-width: 2px; */
border-width: 2px; /* border-style: solid; */
border-style: solid; /* border-color: #222222; */
border-color: #222222; /* } */
}
#custom-language, #custom-language,
#idle_inhibitor, #idle_inhibitor,
@ -49,65 +47,57 @@ tooltip {
/* margin-right: 3px; */ /* margin-right: 3px; */
/* margin-left: 3px; */ /* margin-left: 3px; */
/* border: 1px solid #000000; */ /* border: 1px solid #000000; */
border-radius: 14px;
margin: 0px 4px 0px 4px; margin: 0px 4px 0px 4px;
} }
#workspaces { #workspaces {
padding: 0; padding: 0;
margin-left: 0; /* margin-left: 0; */
margin-right: 0; /* margin-right: 0; */
border-radius: 0;
} }
#workspaces button { #workspaces button {
padding: 4px; padding: 4px;
color: #aaaaaa; color: #aaaaaa;
border-radius: 16px
} }
#workspaces button.active { #workspaces button.active {
color: #ffffff; color: #ffffff;
border-radius: 20px;
background: #0f0f0f; background: #0f0f0f;
} }
#workspaces button.focused { #workspaces button.focused {
/* color: #a6adc8; */ /* color: #a6adc8; */
border-radius: 0px;
background: #eba0ac; background: #eba0ac;
/* border-radius: 10px; */
} }
#workspaces button.urgent { #workspaces button.urgent {
/* color: #11111b; */ /* color: #11111b; */
background: #a6e3a1; background: #a6e3a1;
/* border-radius: 10px; */
} }
#workspaces button:hover { #workspaces button:hover {
background: #11111b; background: #11111b;
border-radius: 0px;
/* color: #cdd6f4; */ /* color: #cdd6f4; */
/* border-radius: 10px; */
} }
#pulseaudio.speaker { #pulseaudio.speaker {
/* color: #89b4fa; */ /* color: #89b4fa; */
/* border-radius: 10px 0 0 10px; */
margin-left: 0; margin-left: 0;
margin-right: 0; margin-right: 0;
border-radius: 0;
} }
#pulseaudio.microphone { #pulseaudio.microphone {
/* color: #cba6f7; */ /* color: #cba6f7; */
margin-left: 0; margin-left: 0;
margin-right: 0; margin-right: 0;
border-radius: 0;
} }
#idle_inhibitor { #idle_inhibitor {
margin-left: 0; margin-left: 0;
margin-right: 0; margin-right: 0;
border-radius: 0;
} }
#backlight { #backlight {
border-radius: 0 14px 14px 0;
margin-left: 0; margin-left: 0;
} }
@ -119,46 +109,32 @@ tooltip {
/* #mpris { */ /* #mpris { */
/* border-radius: 10px; */
/* font-family: "CartographCF italic"; */ /* font-family: "CartographCF italic"; */
/* } */ /* } */
#tray {
border-radius: 0;
margin-left: 0;
margin-right: 0;
}
#network { #network {
border-radius: 10px; /* margin-right: 0; */
border-radius: 14px 0 0 14px;
margin-right: 0;
} }
#disk { #disk {
border-radius: 0;
margin-right: 0; margin-right: 0;
margin-left: 0; margin-left: 0;
} }
#cpu { #cpu {
border-radius: 0; /* margin-left: 0; */
margin-left: 0;
margin-right: 0; margin-right: 0;
} }
#temperature { #temperature {
/* color: #f9afdb; */ /* color: #f9afdb; */
border-radius: 0;
margin-right: 0; margin-right: 0;
margin-left: 0; margin-left: 0;
} }
#memory { #memory {
/* border-radius: 0 10px 10px 0; */
margin-left: 0; margin-left: 0;
margin-right: 0; margin-right: 0;
border-radius: 0;
} }
#memory.low { #memory.low {
@ -166,20 +142,30 @@ tooltip {
} }
#battery { #battery {
border-radius: 0;
margin-left: 0; margin-left: 0;
margin-right: 0; margin-right: 0;
} }
#clock { #tray {
margin-left: 0; /* margin-left: 0; */
margin-right: 0; margin-right: 0;
}
tooltip,
window#waybar #tray menu {
color: #aaaaaa;
background: #000000;
border: 1px solid #888888;
border-radius: 0; border-radius: 0;
} }
#clock {
/* margin-left: 0; */
margin-right: 0;
}
/* #custom-gpu { */ /* #custom-gpu { */
/* color: #f5c2e7; */ /* color: #f5c2e7; */
/* border-radius: 10px; */
/* } */ /* } */
#window { #window {
@ -192,24 +178,20 @@ tooltip {
#bluetooth { #bluetooth {
border-radius: 0;
margin-left: 0; margin-left: 0;
margin-right: 0; margin-right: 0;
} }
#custom-weather { #custom-weather {
/* border-radius: 10px 0px 0px 10px; */
margin-right: 0; margin-right: 0;
} }
#custom-nvidia-load { #custom-nvidia-load {
/* border-radius: 10px 0 0 10px; */
margin-right: 0; margin-right: 0;
/* color: #afb8f9; */ /* color: #afb8f9; */
} }
#custom-nvidia-mem { #custom-nvidia-mem {
/* border-radius: 0 10px 10px 0; */
margin-left: 0; margin-left: 0;
/* color: #aff9b2; */ /* color: #aff9b2; */
} }

16
dotfiles/waybar.jsonc
View file

@ -76,7 +76,7 @@
}, },
"disk": { "disk": {
"interval": 30, "interval": 1,
"format": "󰋊 {free}", "format": "󰋊 {free}",
"path": "/", "path": "/",
"on-click": "alacritty --class floating -e ncdu -x /" "on-click": "alacritty --class floating -e ncdu -x /"
@ -91,7 +91,7 @@
"memory": { "memory": {
"interval": 1, "interval": 1,
"format": "󰧑 {percentage}%", "format": "󰧑 {percentage:2}%",
"tooltip-format": "{used:0.1f}G/{total:0.1f}G", "tooltip-format": "{used:0.1f}G/{total:0.1f}G",
"states": { "low": 70 }, "states": { "low": 70 },
"on-click": "notify-send \"$(printf \"%-20s %10s\\n\" \"COMMAND\" \"MEMORY USAGE\"; ps axo comm,rss | awk '{mem[$1]+=$2} END {for (cmd in mem) printf \"%-20s %5.2f MiB\\n\", cmd, mem[cmd]/1024}' | sort -k2nr | head -n10)\"" "on-click": "notify-send \"$(printf \"%-20s %10s\\n\" \"COMMAND\" \"MEMORY USAGE\"; ps axo comm,rss | awk '{mem[$1]+=$2} END {for (cmd in mem) printf \"%-20s %5.2f MiB\\n\", cmd, mem[cmd]/1024}' | sort -k2nr | head -n10)\""
@ -102,8 +102,8 @@
"format": "󰌙", "format": "󰌙",
"format-disconnected": "󰌙", "format-disconnected": "󰌙",
"format-linked": "󰛵", "format-linked": "󰛵",
"format-ethernet": "󰓢 {bandwidthDownBytes} {bandwidthUpBytes}", "format-ethernet": "󰓢 {bandwidthDownBytes:>} {bandwidthUpBytes:>}",
"format-wifi": "󰖩 {bandwidthDownBytes} {bandwidthUpBytes}", "format-wifi": "󰖩 {bandwidthDownBytes:>} {bandwidthUpBytes:>}",
"on-click": "wifi-toggle", "on-click": "wifi-toggle",
"on-right-click": "$TERMINAL --class floating -e nmtui", "on-right-click": "$TERMINAL --class floating -e nmtui",
"tooltip-format-ethernet": "{ipaddr}", "tooltip-format-ethernet": "{ipaddr}",
@ -139,7 +139,7 @@
}, },
"cpu": { "cpu": {
"interval": 1, "interval": 1,
"format": "󰘚 {usage}%", "format": "󰘚 {usage:2}%",
"max-length": 10, "max-length": 10,
"on-click": "alacritty --class floating -e htop" "on-click": "alacritty --class floating -e htop"
}, },
@ -154,8 +154,8 @@
"warning": 30, "warning": 30,
"critical": 15 "critical": 15
}, },
"format-charging": "󰂅 {capacity}%", "format-charging": "󰂅 {capacity:2}%",
"format": "{icon} {capacity}%", "format": "{icon} {capacity:2}%",
"format-icons": ["󰂎", "󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"], "format-icons": ["󰂎", "󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"],
"tooltip": true "tooltip": true
}, },
@ -175,7 +175,7 @@
"min-length": 10, "min-length": 10,
"interval": 1, "interval": 1,
"format": "{:%d/%m %H:%M:%S}", "format": "{:%d/%m %H:%M:%S}",
"timezones": ["Asia/Ho_Chi_Minh", "Europe/Paris"], "timezones": ["Europe/Paris"],
"tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>", "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
"actions": { "actions": {
"on-scroll-up": "tz_up", "on-scroll-up": "tz_up",

3
fish.nix
View file

@ -10,6 +10,7 @@
interactiveShellInit = '' interactiveShellInit = ''
# bind ctrl+s to fg # bind ctrl+s to fg
set -gx fish_greeting
bind \cz 'fg 2>/dev/null; commandline -f repaint' bind \cz 'fg 2>/dev/null; commandline -f repaint'
set -x DIRENV_LOG_FORMAT "" set -x DIRENV_LOG_FORMAT ""
''; '';
@ -92,6 +93,8 @@
nsp = "nix shell nixpkgs#"; nsp = "nix shell nixpkgs#";
f = "lfcd"; f = "lfcd";
sxiv = "nsxiv"; sxiv = "nsxiv";
del = "trash -rf";
rsyncp = "rsync --info=progress2 --no-inc-recursive";
}; };
plugins = [ plugins = [

32
home.nix
View file

@ -20,6 +20,7 @@ let user = import ./name.nix; in
home.packages = with pkgs; [ home.packages = with pkgs; [
betterbird betterbird
python3 python3
python3Packages.virtualenv
dunst dunst
ncdu ncdu
nsxiv nsxiv
@ -46,7 +47,7 @@ let user = import ./name.nix; in
xdg-utils xdg-utils
entr entr
# xdg-desktop-portal-wlr # xdg-desktop-portal-wlr
# xdg-desktop-portal-hyprland xdg-desktop-portal-hyprland
(catppuccin-gtk.override { (catppuccin-gtk.override {
accents = [ "pink" ]; accents = [ "pink" ];
size = "compact"; size = "compact";
@ -54,6 +55,12 @@ let user = import ./name.nix; in
variant = "mocha"; variant = "mocha";
}) })
davfs2 davfs2
htop
yt-dlp
ffmpeg
wget
lua-language-server
]; ];
# Home Manager is pretty good at managing dotfiles. The primary way to manage # Home Manager is pretty good at managing dotfiles. The primary way to manage
@ -165,6 +172,16 @@ let user = import ./name.nix; in
NNN_TRASH = 1; NNN_TRASH = 1;
GOPATH = "${config.home.homeDirectory}/.local/share/go"; GOPATH = "${config.home.homeDirectory}/.local/share/go";
GOMODCACHE = "${config.home.homeDirectory}/.cache/go/pkg/mod"; GOMODCACHE = "${config.home.homeDirectory}/.cache/go/pkg/mod";
GDK_BACKEND = "wayland,x11";
QT_QPA_PLATFORM = "wayland;xcb";
CLUTTER_BACKEND = "wayland";
XDG_CURRENT_DESKTOP = "Hyprland";
XDG_SESSION_TYPE = "wayland";
XDG_SESSION_DESKTOP = "Hyprland";
QT_AUTO_SCREEN_SCALE_FACTOR = "1";
WLR_NO_HARDWARE_CURSORS = "1";
XCURSOR_SIZE = "24";
}; };
home.keyboard.options = [ home.keyboard.options = [
@ -182,6 +199,11 @@ let user = import ./name.nix; in
xdg = { xdg = {
enable = true; enable = true;
systemDirs.data = [ "${config.home.homeDirectory}/.local/share" ]; systemDirs.data = [ "${config.home.homeDirectory}/.local/share" ];
# portal = {
# enable = true;
# configPackage = pkgs.xdg-desktop-portal-hyprland;
# xdgOpenUsePortal = true;
# };
userDirs = { userDirs = {
enable = true; enable = true;
createDirectories = false; createDirectories = false;
@ -227,7 +249,7 @@ let user = import ./name.nix; in
}; };
Install = { Install = {
# enable the service # enable the service
WantedBy = [ "default.target" ]; # WantedBy = [ "default.target" ];
}; };
Timer = { Timer = {
Unit = "battery-notify.service"; Unit = "battery-notify.service";
@ -295,7 +317,7 @@ let user = import ./name.nix; in
qt = { qt = {
enable = true; enable = true;
platformTheme = "gtk"; platformTheme = "kde";
}; };
programs.direnv = { programs.direnv = {
@ -391,7 +413,7 @@ let user = import ./name.nix; in
}]; }];
timeouts = [{ timeouts = [{
timeout = 300; timeout = 900;
command = "${config.programs.swaylock.package}/bin/swaylock -defF"; command = "${config.programs.swaylock.package}/bin/swaylock -defF";
} }
{ {
@ -452,7 +474,7 @@ let user = import ./name.nix; in
gcc gcc
ocamlPackages.lsp ocamlPackages.lsp
ocamlPackages.ocamlformat ocamlPackages.ocamlformat
rnix-lsp # rnix-lsp
cargo cargo
]; ];
}; };

45
hyprland.nix
View file

@ -4,9 +4,8 @@
xwayland.enable = true; xwayland.enable = true;
# plugins = [ # plugins = [
# flakes-pkgs.hyprfocus # "${flakes-pkgs.hyprfocus}/lib/libhyprfocus.so"
# ]; # ];
systemd.enable = true; systemd.enable = true;
systemd.variables = [ systemd.variables = [
"GDK_BACKEND=wayland,x11" "GDK_BACKEND=wayland,x11"
@ -27,7 +26,7 @@
kb_layout = "fr"; kb_layout = "fr";
kb_variant = ""; kb_variant = "";
kb_model = "pc105"; kb_model = "pc105";
kb_options = ""; kb_options = "caps:super";
kb_rules = ""; kb_rules = "";
touchpad = { touchpad = {
@ -73,7 +72,7 @@
pseudotile = true; pseudotile = true;
preserve_split = true; preserve_split = true;
force_split = 2; force_split = 2;
no_gaps_when_only = true; # no_gaps_when_only = true;
}; };
master = { master = {
@ -115,6 +114,7 @@
"$mod SHIFT, Return, exec, kitty --working-directory \"$(window_dir)\"" "$mod SHIFT, Return, exec, kitty --working-directory \"$(window_dir)\""
"$mod, w, exec, firefox" "$mod, w, exec, firefox"
"$mod SHIFT, w, exec, firefox --private-window" "$mod SHIFT, w, exec, firefox --private-window"
"$mod SHIFT, s, exec, firefox \"https://search.nixos.org/packages?channel=unstable&query=$(rofi -dmenu -p \"nix search\")\""
"$mod, m, exec, kitty --class floating -e pulsemixer" "$mod, m, exec, kitty --class floating -e pulsemixer"
"$mod, d, exec, ~/.bin/runmenu" "$mod, d, exec, ~/.bin/runmenu"
"$mod, x, exec, keepmenu" "$mod, x, exec, keepmenu"
@ -209,7 +209,7 @@
]; ];
# plugin:hyprfocus { # plugin:hyprfocus {
# enabled = yes # enabled = no;
# #
# keyboard_focus_animation = shrink # keyboard_focus_animation = shrink
# mouse_focus_animation = flash # mouse_focus_animation = flash
@ -238,20 +238,35 @@
# } # }
# } # }
"plugin:hyprfocus" = { # "plugin:hyprfocus" = {
enabled = true; # enabled = true;
keyboard_focus_animation = "flash"; # keyboard_focus_animation = "flash";
mouse_focus_animation = "nothing"; # mouse_focus_animation = "nothing";
# bezier = "bezIn, 0.5,0.0,1.0,0.5"; # bezier = "bezIn, 0.5,0.0,1.0,0.5";
# bezier = "bezOut, 0.0,0.5,0.5,1.0"; # # bezier = "bezOut, 0.0,0.5,0.5,1.0";
flash = { # flash = {
flash_opacity = 0.6; # shrink_percentage = 0.8;
in_speed = 0.3;
}; # in_bezier = "bezIn";
}; # in_speed = 0.5;
# out_bezier = "bezIn";
# out_speed = 3;
# };
# shrink = {
# shrink_percentage = 0.8;
# in_bezier = "bezIn";
# in_speed = 0.5;
# out_bezier = "bezIn";
# out_speed = 3;
# };
# };
}; };

4
lf.nix
View file

@ -66,7 +66,7 @@
shift shift
case "$mode" in case "$mode" in
copy) copy)
rsync -a --ignore-existing --info=progress2 -- "$@" . | rsync -a --ignore-existing --info=progress2 --no-inc-recursive -- "$@" . |
stdbuf -i0 -o0 -e0 tr '\r' '\n' | stdbuf -i0 -o0 -e0 tr '\r' '\n' |
while IFS= read -r line; do while IFS= read -r line; do
lf -remote "send $id echo $line" lf -remote "send $id echo $line"
@ -149,12 +149,12 @@
ai = "open_folder_in_sxiv"; ai = "open_folder_in_sxiv";
aw = "send-warpinator"; aw = "send-warpinator";
E = "$nvim"; E = "$nvim";
zp = "toggle_preview";
p = "alt-paste copy"; p = "alt-paste copy";
P = "alt-paste cut"; P = "alt-paste cut";
"<space>" = ":toggle; down; save-select"; "<space>" = ":toggle; down; save-select";
u = ":unselect; save-select"; u = ":unselect; save-select";
v = ":invert; save-select"; v = ":invert; save-select";
"<tab>" = "toggle_preview";
}; };
# previewer.source = "${pkgs.pistol}/bin/pistol"; # previewer.source = "${pkgs.pistol}/bin/pistol";