From b2038c9105ca23ddeefc5771be62e2f484d81b73 Mon Sep 17 00:00:00 2001 From: Amaury JOLY Date: Wed, 25 Mar 2026 19:01:19 +0100 Subject: [PATCH] update --- configuration.nix | 1 + dotconfig/.gitkeep | 0 dotconfig/alacritty/alacritty.toml | 2 + dotconfig/i3/autostart.sh | 7 + dotconfig/i3/config | 234 +++++++++++++++++++ dotconfig/picom/picom.conf | 40 ++++ dotconfig/polybar/config.ini.model | 257 +++++++++++++++++++++ dotconfig/polybar/get_spotify_status.sh | 51 ++++ dotconfig/polybar/scroll_spotify_status.sh | 12 + dotconfig/polybar/start.sh | 40 ++++ flake.lock | 57 +++-- flake.nix | 6 +- modules/laptop/home-manager.nix | 30 +++ modules/nixos/base.nix | 7 +- modules/nixos/desktop-i3.nix | 72 +++++- secrets/wifi-networks.yaml | 6 +- 16 files changed, 795 insertions(+), 27 deletions(-) create mode 100644 dotconfig/.gitkeep create mode 100644 dotconfig/alacritty/alacritty.toml create mode 100755 dotconfig/i3/autostart.sh create mode 100644 dotconfig/i3/config create mode 100644 dotconfig/picom/picom.conf create mode 100644 dotconfig/polybar/config.ini.model create mode 100755 dotconfig/polybar/get_spotify_status.sh create mode 100755 dotconfig/polybar/scroll_spotify_status.sh create mode 100755 dotconfig/polybar/start.sh create mode 100644 modules/laptop/home-manager.nix diff --git a/configuration.nix b/configuration.nix index 697bce5..c04b863 100644 --- a/configuration.nix +++ b/configuration.nix @@ -17,6 +17,7 @@ ./modules/laptop/default.nix ./modules/laptop/fingerprint.nix ./modules/laptop/users.nix + ./modules/laptop/home-manager.nix ./modules/laptop/bluetooth.nix ./modules/laptop/zwift.nix diff --git a/dotconfig/.gitkeep b/dotconfig/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/dotconfig/alacritty/alacritty.toml b/dotconfig/alacritty/alacritty.toml new file mode 100644 index 0000000..fc8b264 --- /dev/null +++ b/dotconfig/alacritty/alacritty.toml @@ -0,0 +1,2 @@ +[font] +normal = { family = "DejaVuSansM Nerd Font Mono", style = "Regular"} \ No newline at end of file diff --git a/dotconfig/i3/autostart.sh b/dotconfig/i3/autostart.sh new file mode 100755 index 0000000..2e5dd3c --- /dev/null +++ b/dotconfig/i3/autostart.sh @@ -0,0 +1,7 @@ +#!/bin/bash +sleep 1 + +i3 gaps inner current set 10 +i3 gaps outer current set 0 + +sleep 1 \ No newline at end of file diff --git a/dotconfig/i3/config b/dotconfig/i3/config new file mode 100644 index 0000000..f480589 --- /dev/null +++ b/dotconfig/i3/config @@ -0,0 +1,234 @@ +# This file has been auto-generated by i3-config-wizard(1). +# It will not be overwritten, so edit it as you like. +# +# Should you change your keyboard layout some time, delete +# this file and re-run i3-config-wizard(1). +# + +# i3 config file (v4) +# +# Please see https://i3wm.org/docs/userguide.html for a complete reference! + +gaps inner 10 +gaps outer 12 +default_border pixel 0 +default_floating_border pixel 0 + +set $mod Mod4 + +# Font for window titles. Will also be used by the bar unless a different font +# is used in the bar {} block below. +font pango:monospace 8 + +# https://thomashunter.name/i3-configurator/ +# class border bground text indicator child_border +client.focused #2F4A36 #2F4A36 #FFFFFF #2F4A36 #2F4A36 +client.focused_inactive #52805E #52805E #FFFFFF #484E50 #5F676A +client.unfocused #0A100B #0A100B #888888 #292D2E #222222 +client.urgent #2F343A #900000 #FFFFFF #900000 #900000 +client.placeholder #000000 #0C0C0C #FFFFFF #000000 #0C0C0C + +client.background #FFFFFF + +# This font is widely installed, provides lots of unicode glyphs, right-to-left +# text rendering and scalability on retina/hidpi displays (thanks to pango). +#font pango:DejaVu Sans Mono 8 + +# Start XDG autostart .desktop files using dex. See also +# https://wiki.archlinux.org/index.php/XDG_Autostart +exec --no-startup-id dex --autostart --environment i3 + +# The combination of xss-lock, nm-applet and pactl is a popular choice, so +# they are included here as an example. Modify as you see fit. + +# xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the +# screen before suspend. Use loginctl lock-session to lock your screen. +exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork + +# NetworkManager is the most popular way to manage wireless networks on Linux, +# and nm-applet is a desktop environment-independent system tray GUI for it. +# exec --no-startup-id nm-applet + +# Use pactl to adjust volume in PulseAudio. +set $refresh_i3status killall -SIGUSR1 i3status +bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status +bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10% && $refresh_i3status +bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status +bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status + +# Use Mouse+$mod to drag floating windows to their wanted position +floating_modifier $mod + +# start a terminal +# bindsym $mod+Return exec i3-sensible-terminal + +# kill focused window +bindsym $mod+Shift+Q kill + +# start dmenu (a program launcher) +bindsym $mod+d exec --no-startup-id rofi -show drun -show-icons +# A more modern dmenu replacement is rofi: +# bindcode $mod+40 exec "rofi -modi drun,run -show drun" +# There also is i3-dmenu-desktop which only displays applications shipping a +# .desktop file. It is a wrapper around dmenu, so you need that installed. +# bindcode $mod+40 exec --no-startup-id i3-dmenu-desktop + +# change focus +# bindsym $mod+j focus left +# bindsym $mod+k focus down +# bindsym $mod+l focus up +# bindsym $mod+m focus right + +# alternatively, you can use the cursor keys: +bindsym $mod+Left focus left +bindsym $mod+Down focus down +bindsym $mod+Up focus up +bindsym $mod+Right focus right + +# move focused window +# bindsym $mod+Shift+j move left +# bindsym $mod+Shift+k move down +# bindsym $mod+Shift+l move up +# bindsym $mod+Shift+M move right + +# alternatively, you can use the cursor keys: +bindsym $mod+Shift+Left move left +bindsym $mod+Shift+Down move down +bindsym $mod+Shift+Up move up +bindsym $mod+Shift+Right move right + +# split in horizontal orientation +bindsym $mod+h split h + +# split in vertical orientation +bindsym $mod+v split v + +# enter fullscreen mode for the focused container +bindsym $mod+f fullscreen toggle + +# change container layout (stacked, tabbed, toggle split) +bindsym $mod+s layout stacking +bindsym $mod+z layout tabbed +bindsym $mod+e layout toggle split + +# toggle tiling / floating +bindsym $mod+Shift+space floating toggle + +# change focus between tiling / floating windows +bindsym $mod+space focus mode_toggle + +# focus the parent container +bindsym $mod+q focus parent + +# focus the child container +#bindsym $mod+d focus child + +# Define names for default workspaces for which we configure key bindings later on. +# We use variables to avoid repeating the names in multiple places. +set $ws1 "1" +set $ws2 "2" +set $ws3 "3" +set $ws4 "4" +set $ws5 "5" +set $ws6 "6" +set $ws7 "7" +set $ws8 "8" +set $ws9 "9" +set $ws10 "10" + +# switch to workspace +bindsym $mod+ampersand workspace number $ws1 +bindsym $mod+eacute workspace number $ws2 +bindsym $mod+quotedbl workspace number $ws3 +bindsym $mod+apostrophe workspace number $ws4 +bindsym $mod+parenleft workspace number $ws5 +bindsym $mod+minus workspace number $ws6 +bindsym $mod+egrave workspace number $ws7 +bindsym $mod+underscore workspace number $ws8 +bindsym $mod+ccedilla workspace number $ws9 +bindsym $mod+agrave workspace number $ws10 + +# move focused container to workspace +bindsym $mod+Shift+1 move container to workspace number $ws1 +bindsym $mod+Shift+eacute move container to workspace number $ws2 +bindsym $mod+Shift+3 move container to workspace number $ws3 +bindsym $mod+Shift+4 move container to workspace number $ws4 +bindsym $mod+Shift+5 move container to workspace number $ws5 +bindsym $mod+Shift+6 move container to workspace number $ws6 +bindsym $mod+Shift+egrave move container to workspace number $ws7 +bindsym $mod+Shift+8 move container to workspace number $ws8 +bindsym $mod+Shift+ccedilla move container to workspace number $ws9 +bindsym $mod+Shift+agrave move container to workspace number $ws10 + +# reload the configuration file +bindsym $mod+Shift+c reload +# restart i3 inplace (preserves your layout/session, can be used to upgrade i3) +bindsym $mod+Shift+r restart +# exit i3 (logs you out of your X session) +bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'" + +# resize window (you can also use the mouse for that) +mode "resize" { + # These bindings trigger as soon as you enter the resize mode + + # Pressing left will shrink the window’s width. + # Pressing right will grow the window’s width. + # Pressing up will shrink the window’s height. + # Pressing down will grow the window’s height. + # bindsym j resize shrink width 10 px or 10 ppt + # bindsym k resize grow height 10 px or 10 ppt + # bindsym l resize shrink height 10 px or 10 ppt + # bindsym m resize grow width 10 px or 10 ppt + + # same bindings, but for the arrow keys + bindsym Left resize shrink width 10 px or 10 ppt + bindsym Down resize grow height 10 px or 10 ppt + bindsym Up resize shrink height 10 px or 10 ppt + bindsym Right resize grow width 10 px or 10 ppt + + # back to normal: Enter or Escape or $mod+r + bindsym Return mode "default" + bindsym Escape mode "default" + bindsym $mod+r mode "default" +} + +bindsym $mod+r mode "resize" + +# Start i3bar to display a workspace bar (plus the system information i3status +# finds out, if available) +# bar { +# status_command /home/alice/.config/polybar/start.sh +# } +# exec --no-startup-id tint2 + +# custom +exec_always --no-startup-id /home/alice/.config/i3/autostart.sh +exec_always --no-startup-id /home/alice/.config/polybar/start.sh +exec_always --no-startup-id picom +# exec_always --no-startup-id eww open frame +# exec_alwaysé --no-startup-id betterlockscreen -u /home/alice/.config/betterlockscreen -u /home/alice/wallpaper/ -l dimb + +bindsym $mod+Shift+l exec --no-startup-id i3lock -c 000000 + +bindsym $mod+Return exec alacritty + +bindsym $mod+Tab exec rofi -show combi -show-icons + +bindsym $mod+p move workspace to output left + +# bindsym $mod+m exec autorandr right_h +# bindsym $mod+Shift+m exec autorandr right_v +# bindsym $mod+k exec autorandr left_h +# bindsym $mod+Shift+k exec autorandr left_v +# bindsym $mod+l exec autorandr laptop +# bindsym $mod+o exec autorandr duplicate + +## Screenshots +# bindsym Print exec --no-startup-id maim "/home/$USER/Pictures/$(date)" +# bindsym $mod+Print exec --no-startup-id maim --window $(xdotool getactivewindow) "/home/$USER/Pictures/$(date)" +# bindsym Shift+Print exec --no-startup-id maim --select "/home/$USER/Pictures/$(date)" + +## Clipboard Screenshots +# bindsym Ctrl+Print exec --no-startup-id maim | xclip -selection clipboard -t image/png +# bindsym Ctrl+$mod+Print exec --no-startup-id maim --window $(xdotool getactivewindow) | xclip -selection clipboard -t image/png +bindsym $mod+Shift+Print exec --no-startup-id maim --select | xclip -selection clipboard -t image/png \ No newline at end of file diff --git a/dotconfig/picom/picom.conf b/dotconfig/picom/picom.conf new file mode 100644 index 0000000..5d107e6 --- /dev/null +++ b/dotconfig/picom/picom.conf @@ -0,0 +1,40 @@ +# Picom configuration file + +# Backend +backend = "glx"; +vsync = true; +use-damage = true; + +# Shadows +shadow = true; +shadow-radius = 10; +shadow-offset-x = -5; +shadow-offset-y = -5; +shadow-opacity = 0.8; + +# Opacity +frame-opacity = 1.0; + +# Fading +fading = true; +fade-in-step = 0.03; +fade-out-step = 0.03; +fade-delta = 10; + +corner-radius = 20; + +# regles par application +rules: ({ + match = "class_g = 'Alacritty'"; + opacity = 0.8; +}, { + match = "class_g = 'i3-frame'"; + corner-radius = 0; +} , { + match = "class_g = 'Polybar'"; + corner-radius = 0; +} , { + match = "class_g = 'Eww'"; + corner-radius = 0; +} +); \ No newline at end of file diff --git a/dotconfig/polybar/config.ini.model b/dotconfig/polybar/config.ini.model new file mode 100644 index 0000000..a6747aa --- /dev/null +++ b/dotconfig/polybar/config.ini.model @@ -0,0 +1,257 @@ +[color] +background = #2f4a36 +background-alt = #375740 +foreground = #e8e8e8 +foreground-dim = #b8c0b8 +accent = #a3be8c +alert = #ff6b6b + +; ========================= +; BASES +; ========================= + +[bar/base] +monitor = ${env:MONITOR:} +width = 100% +height = 20 +offset-x = 0 +foreground = ${color.foreground} +border-size = 0 +line-size = 0 +padding-left = 1 +padding-right = 1 +module-margin = 1 +separator = " · " +separator-foreground = ${color.foreground-dim} +font-0 = "DejaVuSansM Nerd Font Mono:size=10;2" +font-1 = "Noto Sans CJK JP:size=10;2" +font-2 = "Noto Color Emoji:size=10;2" +radius = 10 +enable-ipc = true + +[module/temp-base] +type = internal/temperature +warn-temperature = 80 +format =