chore(flake): Restore end-rs input to newly updated repo

When SSIDs contain spaces

.envrc

@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-use flake

.gitignore

@@ -1,2 +1,3 @@
 venv/
 .direnv
+.envrc

bar/eww/bar/widget.yuck

@@ -53,7 +53,6 @@
 
 (defwidget connectivity []
   (eventbox
-    :onclick "bash -c 'iwgtk &> /dev/null &'"
     (label
       :class "connectivity"
       :text "${

bar/eww/default.nix

@@ -11,11 +11,11 @@
   home.packages = [
     pkgs.eww
     # Script dependencies
-    pkgs.iw
     pkgs.jq
     pkgs.dash
     pkgs.socat
     pkgs.pamixer
+    pkgs.playerctl
     pkgs.pavucontrol
   ];
 }

bar/eww/scripts/get-connectivity-info

@@ -3,10 +3,10 @@
 
 print_network_state() {
   case "$1" in
-    eth*)
+    eth*|enp*)
       echo ethernet
       ;;
-    wlan*)
+    wlan*|wlp*)
       echo wireless
       ;;
     usb*)
@@ -19,27 +19,30 @@ print_network_state() {
 }
 
 wifi_strength() {
-    if [ "$1" -le -80 ]; then echo terrible
-  elif [ "$1" -le -70 ]; then echo bad
-  elif [ "$1" -le -60 ]; then echo mediocre
-  elif [ "$1" -le -40 ]; then echo good
+    if [ "$1" -le 20 ]; then echo terrible
+  elif [ "$1" -le 40 ]; then echo bad
+  elif [ "$1" -le 60 ]; then echo mediocre
+  elif [ "$1" -le 80 ]; then echo good
   else                       echo excellent
   fi
 }
 
 print_network_infos() {
   if [ -n "$1" ]; then
-    route_line=$(ip route show dev "$1" | awk '($1 == "default") { print }')
+    device="$1"
+    route_line=$(ip route show dev "$device" | awk '($1 == "default") { print }')
 
     printf ',"ip":{"local":"%s","gateway":"%s"}' \
       "$(echo "$route_line" | awk '{ print $7 }')" \
       "$(echo "$route_line" | awk '{ print $3 }')"
 
     if [ "$state" = wireless ]; then
-      signal=$(iw dev "$1" link | awk '($1 == "signal:") { print $2}')
+      wireless_info=$(nmcli --get-values active,ssid,signal dev wifi list --rescan no | grep "^yes")
+      ssid=$(echo "$wireless_info" | cut -d : -f2)
+      signal=$(echo "$wireless_info" | cut -d : -f3)
       printf ',"wifi":{"signal":"%s","ssid":"%s"}' \
         "$(wifi_strength "$signal")" \
-        "$(iw dev wlan0 info | grep '^\s*ssid ' | xargs | cut -d \  -f 2-)"
+        "$ssid"
     fi
   fi
 }

bar/eww/scripts/timer

@@ -0,0 +1,78 @@
+#!/usr/bin/env dash
+
+WORK_TIME=1200
+PAUSE_TIME=300
+
+timer_state_pid=0
+timer_state_state="inactive"
+timer_state_time="00:00"
+timer_state_progress=100000
+
+sub_timer_pid=0
+
+start_timer() {
+    timer_type=$1
+    duration=0
+
+    timer_state_state="$timer_type" # Update done later
+
+    if [ "$timer_type" = "work" ]; then
+        duration=$WORK_TIME
+        timer_type="pause"
+    elif [ "$timer_type" = "pause" ]; then
+        duration=$PAUSE_TIME
+        timer_type="work"
+    else
+        echo "Invalid argument"
+        exit 1
+    fi
+
+    i=$duration
+    while [ "$i" -ge 0 ] ; do
+        timer_state_progress=$((i * 100000 / duration))
+        timer_state_time="$(date -u -d @$i +'%M:%S')"
+        update_timer_state
+        sleep 1
+        i=$(( i - 1 ))
+    done
+
+    # Notify user
+    if [ "$timer_type" = "pause" ]; then
+        notify-send -c grind-timer -i ~/Images/Icons/moai.jpg "Work period over" "You can take a little nap now."
+    elif [ "$timer_type" = "work" ]; then
+        notify-send -c grind-timer -i ~/Images/Icons/moai.jpg "Pause period over" "Back to grinding we go."
+    fi
+
+    start_timer "$timer_type"
+}
+
+update_timer_state() {
+    echo "{\"pid\": $timer_state_pid, \"state\": \"$timer_state_state\", \"time\": \"$timer_state_time\", \"progress\": $timer_state_progress}"
+}
+
+handle_signal() {
+    # If a timer is running, kill it
+    if [ $sub_timer_pid -ne 0 ]; then
+        kill -9 $sub_timer_pid
+        sub_timer_pid=0
+        timer_state_state="inactive"
+        timer_state_progress=100000
+        update_timer_state
+    else
+        start_timer "work" &
+        sub_timer_pid=$!
+        # Will wait forever
+        wait $sub_timer_pid
+    fi
+}
+
+# Set up the SIGUSR1 signal handler
+trap handle_signal 10
+
+timer_state_pid=$$; update_timer_state
+
+while true; do
+    sleep infinity &
+    wait
+done
+

bar/eww/timer/widget.yuck

@@ -1,57 +1,18 @@
-(defvar WORK_TIME_SEC 1200)
-(defvar PAUSE_TIME_SEC 300)
-
-(defvar timer-state "inactive")
-(defvar timer-start-time 0)
-
-(defpoll timer-time 
-  :interval "900ms"
-  :run-while {timer-state != "inactive"}
-  `date +%s`)
-  
-(defpoll timer-work-period
-  :interval "20m"
-  :initial "first"
-  :run-while {timer-state == "work"}
-  `if [ "$(eww get timer-work-period)" == "first" ]; then 
-    eww update timer-start-time=$(date +%s)
-    echo next
-  else 
-    notify-send -c grind-timer -i ~/Images/Icons/moai.jpg "Work period over" "You can take a little nap now."
-    eww update timer-state=pause timer-pause-period=first
-    echo final
-  fi`) ; TODO: Put in a separate script
-
-(defpoll timer-pause-period
-  :interval "5m"
-  :initial "first"
-  :run-while {timer-state == "pause"}
-  `if [ "$(eww get timer-pause-period)" == "first" ]; then 
-    eww update timer-start-time=$(date +%s)
-    echo next
-  else 
-    notify-send -c grind-timer -i ~/Images/Icons/moai.jpg "Pause period over" "Back to grinding we go."
-    eww update timer-state=work timer-work-period=first
-    echo final
-  fi`) ; TODO: Put in a separate script
+(deflisten timer_state :initial '{"pid": 0, "state": "inactive", "time": "00:00", "progress": 100000}' "~/.config/eww/scripts/timer")
 
 (defwidget start-button []
   (button
     :class "start-button"
     :vexpand true
-    :onclick "eww update timer-state=${timer-state == "inactive" ? "work" : "inactive"} timer-work-period=first timer-pause-period=first"
+    :onclick "kill -10 ${timer_state.pid}"
     (overlay
       (circular-progress
         :class "circle-progress"
-        :value "${
-          timer-state == "inactive" ? 100 :
-            100 * (timer-start-time + (timer-state == "work" ? WORK_TIME_SEC : PAUSE_TIME_SEC) - timer-time)
-            / (timer-state == "work" ? WORK_TIME_SEC : PAUSE_TIME_SEC)
-        }"
+        :value "${timer_state.progress / 1000}"
         :thickness 6
         :start-at 75
         :clockwise true)
-      (label :class "start-icon" :text "${timer-state == "inactive" ? 'Start' : (timer-state == "work" ? "Working" : "Pause")}")
+      (label :class "start-icon" :text "${timer_state.state == "inactive" ? 'Start' : (timer_state.state == "work" ? "Working" : "Pause")}")
     )
   )
 )
@@ -60,13 +21,13 @@
   (box
     :orientation "v"
     :space-evenly false
-    :class "timer ${timer-state}"
+    :class "timer ${timer_state.state}"
     (label :class "timer-title" :text "Grind timer")
     (start-button :valign "center" :vexpand true)
     (revealer
       :transition "slideup"
-      :reveal {timer-state != "inactive"}
-      (label :class "timer-text" :text "${timer-state != "inactive" ? formattime(timer-start-time - (3600 - (timer-state == "work" ? WORK_TIME_SEC : PAUSE_TIME_SEC)) - timer-time, "%H:%M:%S") : "00:20:00"}")
+      :reveal {timer_state.state != "inactive"}
+      (label :class "timer-text" :text "${timer_state.time}")
     )
   )
 )

bin/Hyprland-wrapper

@@ -9,6 +9,6 @@ export XDG_CONFIG_HOME="${HOME}/.config"
 # Execution
 exec ssh-agent \
     dbus-launch --exit-with-session \
-    hyprland \
+    Hyprland \
     "$@"
 

bin/swaylock-hyprland

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Run swaylock
-exec /usr/bin/swaylock \
+exec swaylock \
     "$@" \
     --indicator \
     --daemonize \

de/hypr/default.nix

@@ -11,8 +11,8 @@
       executable = true;
     };
     # Hyprland launch wrapper
-    ".local/bin/Hyprland" = {
-      source = ../../bin/Hyprland;
+    ".local/bin/Hyprland-wrapper" = {
+      source = ../../bin/Hyprland-wrapper;
       executable = true;
     };
     # UWU launcher script
@@ -30,28 +30,47 @@
       source = ../../bin/wallpaperctl;
       executable = true;
     };
+    # Lock script
+    ".local/bin/swaylock-hyprland" = {
+      source = ../../bin/swaylock-hyprland;
+      executable = true;
+    };
   };
 
-  home.packages = [
-    pkgs.egl-wayland # For NVIDIA compatibility
-    pkgs.xdg-desktop-portal-hyprland
+  home.packages = with pkgs; [
+    egl-wayland # For NVIDIA compatibility
+    xdg-desktop-portal-hyprland
     # Common DE packages required in config
-    pkgs.wl-clipboard
-    pkgs.grim
-    pkgs.slurp
-    pkgs.hyprpicker
-    pkgs.udiskie
-    pkgs.swww
+    wl-clipboard
+    grim
+    slurp
+    hyprpicker
+    udiskie
+    swww
+    swaylock-effects
+    brightnessctl
+    networkmanagerapplet
     # Apps launchable from bindings
-    pkgs.firefox
-    pkgs.kitty
-    pkgs.yazi
-    # Theme
-    pkgs.bibata-cursors
+    firefox
+    kitty
+    yazi
+    # Yazi requirements
+    ffmpegthumbnailer
+    poppler
+    imagemagick
   ];
 
+  home.pointerCursor = {
+    gtk.enable = true;
+    # x11.enable = true;
+    package = pkgs.bibata-cursors;
+    name = "Bibata-Modern-Classic";
+    size = 24;
+  };
+
   wayland.windowManager.hyprland = {
     enable = true;
+    package = inputs.hyprland.packages.${pkgs.system}.hyprland;
     extraConfig = builtins.readFile ./hyprland.conf;
     plugins = [inputs.hy3.packages.${pkgs.system}.hy3];
   };

de/hypr/hyprland.conf.d/environment.conf

@@ -1,13 +1,6 @@
 # Hyprland GPU backend
 # env = WLR_DRM_DEVICES,/dev/dri/card1
 
-# Hyprcursor
-env = HYPRCURSOR_THEME,Bibata-Modern
-env = HYPRCURSOR_SIZE,24
-# X cursor
-env = XCURSOR_THEME,Bibata-Modern
-env = XCURSOR_SIZE,24
-
 # Backend
 env = GDK_BACKEND, wayland,x11
 env = SDL_VIDEODRIVER, wayland

de/hypr/hyprland.conf.d/startup.conf

@@ -1,10 +1,10 @@
 # Startup
 
 exec-once = artix-pipewire-launcher restart
-exec-once = end-rs daemon
 exec-once = wallpaperctl daemon
 exec-once = swayosd-server
+exec-once = nm-applet
 exec-once = udiskie
 exec-once = eww-bard
-exec-once = hyprctl setcursor Bibata-Modern-Classic 24
+exec-once = end-rs daemon
 exec-once = dbus-update-activation-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP

de/hypr/hyprland.conf.d/windowrules.conf

@@ -13,6 +13,8 @@ windowrulev2 = workspace 8 silent, class:(Deezer)
 windowrule = float, ^(connman-gtk)$
 
 windowrulev2 = float, class:(iwgtk)
+windowrulev2 = float, class:(nm-connection-editor)
+windowrulev2 = float, class:(.blueman-manager-wrapped)
 
 windowrulev2 = float, class:(localsend_app)
 

editor/helix/config.toml

@@ -24,6 +24,6 @@ normal = "block"
 select = "underline"
 
 [keys.normal]
-backspace = {r = ":sh cargo run", p = ":sh python src/main.py"}
+backspace = {r = ":sh cargo run", b = ":sh cargo build", p = ":sh python src/main.py"}
 a = ["ensure_selections_forward", "collapse_selection", "move_char_right", "insert_mode"]
 A-R = [":clipboard-paste-replace"]

flake.lock

@@ -1,5 +1,47 @@
 {
   "nodes": {
+    "anixrun": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1727281125,
+        "narHash": "sha256-/d65UInO08BTrE1JrXwc0/+tLdkRQuM4H2eSirbuLcI=",
+        "owner": "GaspardCulis",
+        "repo": "anixrun",
+        "rev": "95931fe5365120cafe46cbc8e3e0df5667b50db6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "GaspardCulis",
+        "repo": "anixrun",
+        "type": "github"
+      }
+    },
+    "anyrun": {
+      "inputs": {
+        "flake-parts": "flake-parts",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1728852607,
+        "narHash": "sha256-PhJdr8b4nZVHts5KMEsf7vCDXVpFIFCa7VlCt+oYpL4=",
+        "owner": "anyrun-org",
+        "repo": "anyrun",
+        "rev": "6e0385f6945d701545edc5bccfc5f544e1e12663",
+        "type": "github"
+      },
+      "original": {
+        "owner": "anyrun-org",
+        "repo": "anyrun",
+        "type": "github"
+      }
+    },
     "aquamarine": {
       "inputs": {
         "hyprutils": [
@@ -24,11 +66,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1725199881,
-        "narHash": "sha256-jsmipf/u1GFZE5tBUkr56CHMN6VpUWCAjfLIhvQijU0=",
+        "lastModified": 1727261104,
+        "narHash": "sha256-rxDI7WrxIRV9it9mDCHcLa7xQykf1JloXnoXr5xQ8zI=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "f8a687dd29ff019657498f1bd14da2fbbf0e604b",
+        "rev": "b82fdaff917582a9d568969e15e61b398c71e990",
         "type": "github"
       },
       "original": {
@@ -44,11 +86,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1726838624,
-        "narHash": "sha256-SU40aZ/UyK4bhuanaWvqlhIw2/kiDrGYcKxCkTn5FP8=",
+        "lastModified": 1729010169,
+        "narHash": "sha256-AjgIlXcreagCs6ltT8mzI1UYEiYgfhlwe4Tl3taxQSU=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "0fe779905ffe730eace0bf7ecf56938c625012a5",
+        "rev": "9ab6ae4e632016caac1c7e82e15b12b8c672ed76",
         "type": "github"
       },
       "original": {
@@ -64,11 +106,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1726943802,
-        "narHash": "sha256-Ooj+Io2qBvA1IOZ0Ueks4OYHN6ylhHTxSvkmwG1Wt4E=",
+        "lastModified": 1729221539,
+        "narHash": "sha256-REh7hzFcVv6LngqX5xcjJC5KM41k1oJ6accEJjrEihA=",
         "owner": "Dr-42",
         "repo": "end-rs",
-        "rev": "aced942e36ecd6d3ce4ab45cf1c79ca4e98f6267",
+        "rev": "6f75f9fc569ef842c687fc908f573be5a414ce19",
         "type": "github"
       },
       "original": {
@@ -77,6 +119,27 @@
         "type": "github"
       }
     },
+    "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "anyrun",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1727826117,
+        "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -84,11 +147,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1726440980,
-        "narHash": "sha256-ChhIrjtdu5d83W+YDRH+Ec5g1MmM0xk6hJnkz15Ot7M=",
+        "lastModified": 1728903686,
+        "narHash": "sha256-ZHFrGNWDDriZ4m8CA/5kDa250SG1LiiLPApv1p/JF0o=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "a9c9cc6e50f7cbd2d58ccb1cd46a1e06e9e445ff",
+        "rev": "e1aec543f5caf643ca0d94b6a633101942fd065f",
         "type": "github"
       },
       "original": {
@@ -102,11 +165,11 @@
         "hyprland": "hyprland"
       },
       "locked": {
-        "lastModified": 1725825817,
-        "narHash": "sha256-hBvwaMlgBuR2cB1Kx6cA1z7x38HXUujNcHtBsKhaEZs=",
+        "lastModified": 1728520267,
+        "narHash": "sha256-6TVaB+nWVanqZWqievg+m7tVNrSpQ9CQcwXJQeyU/Q0=",
         "owner": "outfoxxed",
         "repo": "hy3",
-        "rev": "4b194eb5486b89102726ad5f4492bb3440c46031",
+        "rev": "4e92705d7a0ff23296aa1a62c05734ccc6de7bec",
         "type": "github"
       },
       "original": {
@@ -134,11 +197,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1722623071,
-        "narHash": "sha256-sLADpVgebpCBFXkA1FlCXtvEPu1tdEsTfqK1hfeHySE=",
+        "lastModified": 1727532803,
+        "narHash": "sha256-ZaZ7h7PY8mQc4vtGmVqWLAq9CAO02gHMyNR5yY8zDmM=",
         "owner": "hyprwm",
         "repo": "hyprcursor",
-        "rev": "912d56025f03d41b1ad29510c423757b4379eb1c",
+        "rev": "b98726e431d4d3ed58bd58bee1047cdb81cec69f",
         "type": "github"
       },
       "original": {
@@ -151,31 +214,57 @@
       "inputs": {
         "aquamarine": "aquamarine",
         "hyprcursor": "hyprcursor",
+        "hyprland-protocols": "hyprland-protocols",
         "hyprlang": "hyprlang",
         "hyprutils": "hyprutils",
         "hyprwayland-scanner": "hyprwayland-scanner",
         "nixpkgs": "nixpkgs",
-        "systems": "systems",
+        "systems": "systems_2",
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1725814101,
-        "narHash": "sha256-+wE97utoDfhQP6AMdZHUmBeL8grbce/Jv2i5M+6AbaE=",
+        "lastModified": 1728142617,
+        "narHash": "sha256-ramJ6G9bKYuZshtYRc0olhtN89bP9i4BDhhTU0E0cLc=",
         "ref": "refs/heads/main",
-        "rev": "0f594732b063a90d44df8c5d402d658f27471dfe",
-        "revCount": 5196,
-        "submodules": true,
+        "rev": "0ec6072a290051a03ab66cfb9bc616b2f5540e64",
+        "revCount": 5298,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland"
       },
       "original": {
-        "rev": "0f594732b063a90d44df8c5d402d658f27471dfe",
-        "submodules": true,
+        "rev": "0ec6072a290051a03ab66cfb9bc616b2f5540e64",
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland"
       }
     },
     "hyprland-protocols": {
+      "inputs": {
+        "nixpkgs": [
+          "hy3",
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hy3",
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1727451107,
+        "narHash": "sha256-qV9savtHwmZUa0eJE294WYJjKPGB2+bJhwByFShsVyo=",
+        "owner": "hyprwm",
+        "repo": "hyprland-protocols",
+        "rev": "6b3261ee13a6d2b99de79a31d352f6996e35bde3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-protocols",
+        "type": "github"
+      }
+    },
+    "hyprland-protocols_2": {
       "inputs": {
         "nixpkgs": [
           "hy3",
@@ -223,11 +312,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1725188252,
-        "narHash": "sha256-yBH8c4GDaEAtBrh+BqIlrx5vp6gG/Gu8fQQK63KAQgs=",
+        "lastModified": 1725997860,
+        "narHash": "sha256-d/rZ/fHR5l1n7PeyLw0StWMNLXVU9c4HFyfskw568so=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "c12ab785ce1982f82594aff03b3104c598186ddd",
+        "rev": "dfeb5811dd6485490cce18d6cc1e38a055eea876",
         "type": "github"
       },
       "original": {
@@ -250,11 +339,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1724966483,
-        "narHash": "sha256-WXDgKIbzjYKczxSZOsJplCS1i1yrTUpsDPuJV/xpYLo=",
+        "lastModified": 1727300645,
+        "narHash": "sha256-OvAtVLaSRPnbXzOwlR1fVqCXR7i+ICRX3aPMCdIiv+c=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "8976e3f6a5357da953a09511d0c7f6a890fb6ec2",
+        "rev": "3f5293432b6dc6a99f26aca2eba3876d2660665c",
         "type": "github"
       },
       "original": {
@@ -277,11 +366,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1721324119,
-        "narHash": "sha256-SOOqIT27/X792+vsLSeFdrNTF+OSRp5qXv6Te+fb2Qg=",
+        "lastModified": 1726874836,
+        "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=",
         "owner": "hyprwm",
         "repo": "hyprwayland-scanner",
-        "rev": "a048a6cb015340bd82f97c1f40a4b595ca85cc30",
+        "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e",
         "type": "github"
       },
       "original": {
@@ -292,11 +381,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1725103162,
-        "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
+        "lastModified": 1727348695,
+        "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b",
+        "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
         "type": "github"
       },
       "original": {
@@ -308,11 +397,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1726243404,
-        "narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=",
+        "lastModified": 1728888510,
+        "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059",
+        "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c",
         "type": "github"
       },
       "original": {
@@ -324,6 +413,8 @@
     },
     "root": {
       "inputs": {
+        "anixrun": "anixrun",
+        "anyrun": "anyrun",
         "disko": "disko",
         "end-rs": "end-rs",
         "home-manager": "home-manager",
@@ -350,14 +441,39 @@
         "type": "github"
       }
     },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1689347949,
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "type": "github"
+      }
+    },
     "xdph": {
       "inputs": {
-        "hyprland-protocols": "hyprland-protocols",
+        "hyprland-protocols": "hyprland-protocols_2",
         "hyprlang": [
           "hy3",
           "hyprland",
           "hyprlang"
         ],
+        "hyprutils": [
+          "hy3",
+          "hyprland",
+          "hyprutils"
+        ],
+        "hyprwayland-scanner": [
+          "hy3",
+          "hyprland",
+          "hyprwayland-scanner"
+        ],
         "nixpkgs": [
           "hy3",
           "hyprland",
@@ -370,11 +486,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1725203932,
-        "narHash": "sha256-VLULC/OnI+6R9KEP2OIGk+uLJJsfRlaLouZ5gyFd2+Y=",
+        "lastModified": 1727524473,
+        "narHash": "sha256-1DGktDtSWIJpnDbVoj/qpvJSH5zg6JbOfuh6xqZMap0=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "2425e8f541525fa7409d9f26a8ffaf92a3767251",
+        "rev": "7e500e679ede40e79cf2d89b5f5fa3e34923bd26",
         "type": "github"
       },
       "original": {

flake.nix

@@ -26,6 +26,15 @@
       url = "github:Dr-42/end-rs";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    anyrun = {
+      url = "github:anyrun-org/anyrun";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    anixrun = {
+      url = "github:GaspardCulis/anixrun";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = {

hosts/Zephyrus/default.nix

@@ -1,8 +1,6 @@
 {
   inputs,
   pkgs,
-  lib,
-  config,
   ...
 }: {
   imports = [
@@ -17,54 +15,33 @@
 
   console.keyMap = "fr";
 
-  # Network & Bluetooth
-  networking.wireless.iwd.enable = true;
-
-  hardware.bluetooth.enable = true;
-  hardware.bluetooth.powerOnBoot = true;
-
-  # Audio
-  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;
-  };
+  security.pam.services.swaylock = {};
 
   # Services
   services.seatd.enable = true;
   services.blueman.enable = true;
+  services.udisks2.enable = true;
   services.power-profiles-daemon.enable = true;
 
   # Programs
-  environment.systemPackages = [
-    pkgs.git
-    pkgs.wget
-    pkgs.ncdu
-    pkgs.neofetch
-    pkgs.bottom
-    pkgs.htop
-    pkgs.iwgtk
+  environment.systemPackages = with pkgs; [
+    git
+    wget
+    ncdu
+    neofetch
+    bottom
+    htop
+    wg-netmanager
+    podman-compose
   ];
 
-  # NVIDIA
-  nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) ["nvidia-x11" "nvidia-settings"];
-
-  hardware.graphics.enable = true;
-
-  services.xserver.videoDrivers = ["nvidia"];
-
-  hardware.nvidia = {
-    modesetting.enable = true;
-
-    open = false; # Bruuh
-
-    prime = {
-      amdgpuBusId = "PCI:7:0:0";
-      nvidiaBusId = "PCI:1:0:0";
+  #Podman
+  virtualisation.containers.enable = true;
+  virtualisation = {
+    podman = {
+      enable = true;
+      # Required for containers under podman-compose to be able to talk to each other.
+      defaultNetwork.settings.dns_enabled = true;
     };
   };
 
@@ -79,6 +56,7 @@
       "video"
       "seat"
       "audio"
+      "networkmanager"
     ];
     group = "gaspard";
   };

hosts/Zephyrus/hardware-configuration.nix

@@ -16,6 +16,7 @@
   boot = {
     kernelPackages = lib.mkDefault pkgs.linuxPackages_zen;
     kernelModules = ["kvm-amd"];
+    kernelParams = ["mem_sleep_default=deep"]; # Should fix/change suspend method
     extraModulePackages = [];
     initrd = {
       availableKernelModules = ["nvme" "xhci_pci" "usbhid" "sdhci_pci"];
@@ -29,8 +30,58 @@
         efiSupport = true;
       };
     };
+    tmp.useTmpfs = true;
   };
 
+  # Network & Bluetooth
+  networking.networkmanager.enable = true;
+
+  hardware.bluetooth.enable = true;
+  hardware.bluetooth.powerOnBoot = true;
+
+  # Audio
+  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;
+  };
+
+  #NVIDIA
+  nixpkgs.config.allowUnfreePredicate = pkg:
+    builtins.elem (lib.getName pkg) [
+      "nvidia-x11"
+      "nvidia-settings"
+    ];
+
+  hardware.graphics = {
+    enable = true;
+    extraPackages = with pkgs; [
+      vaapiVdpau
+      libvdpau-va-gl
+      mesa
+    ];
+  };
+  hardware.nvidia = {
+    modesetting.enable = true;
+
+    open = false; # Bruuh
+
+    prime = {
+      offload = {
+        enable = true;
+        enableOffloadCmd = true;
+      };
+
+      amdgpuBusId = "PCI:7:0:0";
+      nvidiaBusId = "PCI:1:0:0";
+    };
+  };
+  services.xserver.videoDrivers = ["nvidia"];
+
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
   # still possible to use this option, but it's recommended to use it in conjunction

misc/anyrun/default.nix

@@ -1,9 +1,38 @@
-{pkgs, ...}: {
-  home.file = {
-    ".config/anyrun".source = ../anyrun;
-  };
-
-  home.packages = [
-    pkgs.anyrun
+{
+  pkgs,
+  inputs,
+  ...
+}: {
+  imports = [
+    inputs.anyrun.homeManagerModules.anyrun # Import the anyrun home-manager module
   ];
+
+  programs.anyrun = {
+    enable = true;
+    config = {
+      plugins = [
+        inputs.anyrun.packages.${pkgs.system}.applications
+        inputs.anyrun.packages.${pkgs.system}.symbols
+        inputs.anyrun.packages.${pkgs.system}.websearch
+        inputs.anyrun.packages.${pkgs.system}.rink
+        inputs.anyrun.packages.${pkgs.system}.shell
+        inputs.anixrun.packages.${pkgs.system}.default
+      ];
+      x = {fraction = 0.5;};
+      y = {fraction = 0.3;};
+      width = {fraction = 0.3;};
+      hideIcons = false;
+      ignoreExclusiveZones = false;
+      layer = "top";
+      hidePluginInfo = true;
+      closeOnClick = true;
+      showResultsImmediately = false;
+      maxEntries = null;
+    };
+    extraCss = builtins.readFile ./style.css;
+
+    extraConfigFiles."applications.ron".text = builtins.readFile ./applications.ron;
+    extraConfigFiles."symbols.ron".text = builtins.readFile ./symbols.ron;
+    extraConfigFiles."websearch.ron".text = builtins.readFile ./websearch.ron;
+  };
 }

shell/bash/.bash_exec

@@ -2,7 +2,7 @@
 
 # Start DE if on tty1
 if [ "$(tty)" = /dev/tty1 ]; then
-	exec Hyprland
+	exec Hyprland-wrapper
 fi
 
 # Start DE if on tty1

shell/bash/default.nix

@@ -12,5 +12,6 @@
   home.packages = [
     pkgs.starship
     pkgs.zoxide
+    pkgs.lsd
   ];
 }

term/alacritty/default.nix

@@ -1,18 +1,13 @@
-{
-  config,
-  pkgs,
-  ...
-} : {
+{pkgs, ...}: {
   home.file = {
     ".config/alacritty/alacritty.toml".source = ./alacritty.toml;
   };
 
-  home.packages = [
-    pkgs.alacritty
-    pkgs.fira-code-nerdfont
+  home.packages = with pkgs; [
+    alacritty
+    fira-code-nerdfont
+    fira-code-symbols
   ];
 
   fonts.fontconfig.enable = true;
 }
-
-

themes/pomme.nix

@@ -0,0 +1,20 @@
+{pkgs, ...}: {
+  home.packages = [pkgs.dconf];
+  dconf.settings = {
+    "org/gnome/desktop/interface" = {
+      color-scheme = "prefer-light";
+    };
+  };
+
+  gtk = {
+    enable = true;
+    theme = {
+      package = pkgs.whitesur-gtk-theme;
+      name = "WhiteSur-Dark-solid-nord";
+    };
+    iconTheme = {
+      package = pkgs.whitesur-icon-theme;
+      name = "WhiteSur";
+    };
+  };
+}

users/gaspard.nix

@@ -11,5 +11,6 @@
     ../term
     ../editor
     ../de
+    ../themes/pomme.nix
   ];
 }