add ardour to laptop2

This reverts commit ffac8ef90a.

TODO

@@ -1,3 +1,4 @@
 convert hyprland config to nix
 simplify the config
 remove useless modules
+move things from groups to configs

dotfiles/hypr-desk/hyprland.lua

@@ -0,0 +1,18 @@
+---------------
+--- SOURCES ---
+---------------
+
+-- MONITORS
+require("source/monitors")
+-- BINDS
+require("source/binds")
+-- AUTOSTART
+require("source/autostart")
+-- ENVIRONMENT VARIABLES
+require("source/ev")
+-- LOOK AND FEEL
+require("source/look")
+-- INPUT
+require("source/input")
+-- WINDOWS AND WORKSPACES
+require("source/winandwork")

dotfiles/hypr-desk/source/autostart.lua

@@ -0,0 +1,18 @@
+-- Autostarts here
+
+-- exec_once
+hl.on("hyprland.start", function ()
+  hl.exec_cmd("waybar")
+  hl.exec_cmd("hyprpaper")
+  hl.exec_cmd("wl-paste --type text --watch cliphist store")
+  hl.exec_cmd("wl-paste --type image --watch cliphist store")
+  hl.exec_cmd("systemctl --user start hyprpolkitagent")
+  hl.exec_cmd("mako")
+  hl.exec_cmd("thunderbird", {workspace = "10 silent"})
+end)
+
+-- exec at each reload
+hl.on("config.reloaded", function ()
+  hl.exec_cmd("killall waybar && waybar")
+  hl.exec_cmd("killall hyprpaper && hyprpaper")
+end)

dotfiles/hypr-desk/source/binds.conf

@@ -20,7 +20,7 @@ bind = $mainMod, comma, exit,
 bind = $mainMod, E, exec, $fileManager
 bind = $mainMod, R, exec, $menu
 bind = $mainMod, W, exec, wlogout
-bind = $mainMod, A, exec, qutebrowser
+bind = $mainMod, A, exec, alacritty
 bind = $mainMod, F, fullscreen
 bind = $mainMod, T, togglefloating
 

dotfiles/hypr-desk/source/binds.lua

@@ -0,0 +1,103 @@
+------------------------------------
+--- USE WEV TO GET THE KEYS CODE ---
+------------------------------------
+
+--------------------
+--- KEYBINDINGSS ---
+--------------------
+
+-- MainMod
+mainMod = "SUPER"
+
+-- exec
+hl.bind(mainMod .. " + comma", hl.dsp.exit())
+hl.bind(mainMod .. " + F", hl.dsp.window.fullscreen())
+hl.bind(mainMod .. " + T", hl.dsp.window.float())
+hl.bind(mainMod .. " + C", hl.dsp.window.close())
+hl.bind(mainMod .. " + Q", hl.dsp.exec_cmd("kitty"))
+hl.bind(mainMod .. " + A", hl.dsp.exec_cmd("alacritty"))
+hl.bind(mainMod .. " + E", hl.dsp.exec_cmd("dolphin"))
+hl.bind(mainMod .. " + R", hl.dsp.exec_cmd("wofi --show drun"))
+hl.bind(mainMod .. " + W", hl.dsp.exec_cmd("wlogout"))
+
+-- Quick
+hl.bind("XF86AudioMute", hl.dsp.exec_cmd("obsidian"))
+hl.bind("XF86AudioRaiseVolume", hl.dsp.exec_cmd("virt-manager"))
+hl.bind("XF86AudioLowerVolume", hl.dsp.exec_cmd("virt-manager"))
+
+-- Reload waybar
+hl.bind(mainMod .. " + SHIFT + B", hl.dsp.exec_cmd("pkill waybar && waybar"))
+
+-- Hide waybar
+hl.bind(mainMod .. " + X", hl.dsp.exec_cmd("pkill waybar || waybar"))
+
+-- Clipboard history
+hl.bind(mainMod .. " + V", hl.dsp.exec_cmd("cliphist list | wofi -dmenu | cliphist decode | wl-copy"))
+
+-- Screenshot to clipboard
+hl.bind(mainMod .. " + SHIFT + S", hl.dsp.exec_cmd("grim -g \"$(slurp -d)\" - | wl-copy"))
+
+-- Move focus with mainMod + arrow keys
+hl.bind(mainMod .. " + h", hl.dsp.focus({direction = "left"}))
+hl.bind(mainMod .. " + l", hl.dsp.focus({direction = "right"}))
+hl.bind(mainMod .. " + k", hl.dsp.focus({direction = "up"}))
+hl.bind(mainMod .. " + j", hl.dsp.focus({direction = "down"}))
+
+-- Move/resize windows with mainMod + LMB/RMB and dragging
+hl.bind(mainMod .. " + mouse:272", hl.dsp.window.drag(),   { mouse = true })
+hl.bind(mainMod .. " + mouse:273", hl.dsp.window.resize(), { mouse = true })
+
+-- Resize Windows
+hl.bind(mainMod .. " + CTRL + h", hl.dsp.window.resize({ x = -20 , y = 0   , relative = true }))
+hl.bind(mainMod .. " + CTRL + l", hl.dsp.window.resize({ x = 20  , y = 0   , relative = true }))
+hl.bind(mainMod .. " + CTRL + k", hl.dsp.window.resize({ x = 0   , y = -20 , relative = true }))
+hl.bind(mainMod .. " + CTRL + j", hl.dsp.window.resize({ x = 0   , y = 20  , relative = true }))
+
+-- Set default workspace
+hl.workspace_rule({workspace = "1", monitor = "DP-1", default = true})
+hl.workspace_rule({workspace = "2", monitor = "DP-1"})
+hl.workspace_rule({workspace = "3", monitor = "DP-1"})
+hl.workspace_rule({workspace = "4", monitor = "DP-1"})
+hl.workspace_rule({workspace = "5", monitor = "DP-1"})
+hl.workspace_rule({workspace = "6", monitor = "DP-1"})
+hl.workspace_rule({workspace = "7", monitor = "DP-1"})
+hl.workspace_rule({workspace = "8", monitor = "DP-1"})
+hl.workspace_rule({workspace = "9", monitor = "DP-1"})
+hl.workspace_rule({workspace = "10", monitor = "DP-1"})
+
+hl.workspace_rule({workspace = "11", monitor = "DP-2", default = true})
+hl.workspace_rule({workspace = "12", monitor = "DP-2"})
+hl.workspace_rule({workspace = "13", monitor = "DP-2"})
+hl.workspace_rule({workspace = "14", monitor = "DP-2"})
+
+-- Switch workspaces
+hl.bind(mainMod .. " + ampersand",       hl.dsp.focus({ workspace = "1"}))
+hl.bind(mainMod .. " + eacute",          hl.dsp.focus({ workspace = "2"}))
+hl.bind(mainMod .. " + quotedbl",        hl.dsp.focus({ workspace = "3"}))
+hl.bind(mainMod .. " + apostrophe",      hl.dsp.focus({ workspace = "4"}))
+hl.bind(mainMod .. " + parenleft",       hl.dsp.focus({ workspace = "5"}))
+hl.bind(mainMod .. " + minus",           hl.dsp.focus({ workspace = "6"}))
+hl.bind(mainMod .. " + egrave",          hl.dsp.focus({ workspace = "7"}))
+hl.bind(mainMod .. " + underscore",      hl.dsp.focus({ workspace = "8"}))
+hl.bind(mainMod .. " + ccedilla",        hl.dsp.focus({ workspace = "9"}))
+hl.bind(mainMod .. " + agrave",          hl.dsp.focus({ workspace = "10"}))
+hl.bind(mainMod .. " + dead_circumflex", hl.dsp.focus({ workspace = "11"}))
+hl.bind(mainMod .. " + dollar",          hl.dsp.focus({ workspace = "12"}))
+hl.bind(mainMod .. " + ugrave",          hl.dsp.focus({ workspace = "13"}))
+hl.bind(mainMod .. " + asterisk",        hl.dsp.focus({ workspace = "14"}))
+
+-- Move active window to a workspace
+hl.bind(mainMod .. " + SHIFT + ampersand",       hl.dsp.window.move({ workspace = "1"}))
+hl.bind(mainMod .. " + SHIFT + eacute",          hl.dsp.window.move({ workspace = "2"}))
+hl.bind(mainMod .. " + SHIFT + quotedbl",        hl.dsp.window.move({ workspace = "3"}))
+hl.bind(mainMod .. " + SHIFT + apostrophe",      hl.dsp.window.move({ workspace = "4"}))
+hl.bind(mainMod .. " + SHIFT + parenleft",       hl.dsp.window.move({ workspace = "5"}))
+hl.bind(mainMod .. " + SHIFT + minus",           hl.dsp.window.move({ workspace = "6"}))
+hl.bind(mainMod .. " + SHIFT + egrave",          hl.dsp.window.move({ workspace = "7"}))
+hl.bind(mainMod .. " + SHIFT + underscore",      hl.dsp.window.move({ workspace = "8"}))
+hl.bind(mainMod .. " + SHIFT + ccedilla",        hl.dsp.window.move({ workspace = "9"}))
+hl.bind(mainMod .. " + SHIFT + agrave",          hl.dsp.window.move({ workspace = "10"}))
+hl.bind(mainMod .. " + SHIFT + dead_circumflex", hl.dsp.window.move({ workspace = "11"}))
+hl.bind(mainMod .. " + SHIFT + dollar",          hl.dsp.window.move({ workspace = "12"}))
+hl.bind(mainMod .. " + SHIFT + ugrave",          hl.dsp.window.move({ workspace = "13"}))
+hl.bind(mainMod .. " + SHIFT + asterisk",        hl.dsp.window.move({ workspace = "14"}))

dotfiles/hypr-desk/source/ev.conf

@@ -5,8 +5,6 @@ env = LIBVA_DRIVER_NAME,nvidia
 env = XDG_SESSION_TYPE,wayland
 env = GBM_BACKEND,nvidia-drm
 env = __GLX_VENDOR_LIBRARY_NAME,nvidia
-env = GTK_THEME, Adwaita-dark
-
 
 cursor {
     no_hardware_cursors = true

dotfiles/hypr-desk/source/ev.lua

@@ -0,0 +1,9 @@
+-- Set env here
+hl.env("XCURSOR_SIZE", "24")
+hl.env("HYPRCURSOR_SIZE", "24")
+hl.env("LIBVA_DRIVER_NAME", "nvidia")
+hl.env("XDG_SESSION_TYPE", "wayland")
+hl.env("GBM_BACKEND", "nvidia-drm")
+hl.env("__GLX_VENDOR_LIBRARY_NAME", "nvidia")
+hl.env("HYPRLAND_NO_SD_VARS", "1")
+hl.env("LD_LIBRARY_PATH", "/nix/store/p5c2hfgw9pipp2vd0xvxjmly99nbsdki-pipewire-1.6.8-jack/lib/")

dotfiles/hypr-desk/source/input.lua

@@ -0,0 +1,23 @@
+--Set inputs here
+
+hl.config({
+    input = {
+        kb_layout = "fr",
+        kb_variant = "",
+        kb_model   = "",
+        kb_options = "",
+        kb_rules   = "",
+
+        follow_mouse = 1,
+
+        sensitivity = 0,
+
+        touchpad = {
+            natural_scroll = false,
+        },
+    },
+    cursor = {
+        no_hardware_cursors = 0,
+        min_refresh_rate = 165
+    }
+})

dotfiles/hypr-desk/source/look.conf

@@ -59,7 +59,6 @@ animations {
 
 # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
 dwindle {
-    pseudotile = true # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
     preserve_split = true # You probably want this
 }
 
@@ -71,3 +70,8 @@ misc {
     force_default_wallpaper = 0 # Set to 0 or 1 to disable the anime mascot wallpapers
     disable_hyprland_logo = true # If true disables the random hyprland logo / anime girl background. :(
 }
+
+ecosystem {
+    no_update_news = true
+    no_donation_nag = true
+}

dotfiles/hypr-desk/source/look.lua

@@ -0,0 +1,61 @@
+--Set look and feel here
+
+hl.config({
+    general = {
+        layout = "dwindle",
+        gaps_in  = 3,
+        gaps_out = 5,
+        border_size = 1,
+        col = {
+            active_border   = { colors = {"rgba(33ccffee)", "rgba(00ff99ee)"}, angle = 45 },
+            inactive_border = "rgba(595959aa)",
+        },
+    },
+
+    decoration = {
+        rounding       = 6,
+        rounding_power = 2,
+
+        active_opacity   = 1.0,
+        inactive_opacity = 1.0,
+
+        shadow = {
+            enabled      = false
+        },
+
+        blur = {
+            enabled   = false,
+        },
+    },
+
+    animations = {
+        enabled = true,
+    },
+
+    dwindle = {
+        preserve_split = true,
+    },
+
+    master = {
+        new_status = "master",
+    },
+
+    misc = {
+        force_default_wallpaper = 0,
+        disable_hyprland_logo   = true,
+    },
+
+    ecosystem = {
+        no_update_news = true,
+        no_donation_nag = true,
+    }
+})
+
+hl.curve( "mybezier", { type = "bezier", points = { {0.05, 0.9}, {0.1, 1.05} } })
+
+hl.animation({ leaf = "windows", enabled = true, speed = 7, bezier = "mybezier" })
+hl.animation({ leaf = "windowsOut", enabled = true, speed = 7, bezier = "mybezier" })
+hl.animation({ leaf = "border", enabled = true, speed = 7, bezier = "mybezier" })
+hl.animation({ leaf = "borderangle", enabled = true, speed = 7, bezier = "mybezier" })
+hl.animation({ leaf = "fade", enabled = true, speed = 7, bezier = "mybezier" })
+hl.animation({ leaf = "workspaces", enabled = true, speed = 7, bezier = "mybezier" })

dotfiles/hypr-desk/source/monitors.lua

@@ -0,0 +1,15 @@
+-- Set monitors here
+hl.monitor({
+    output = "DP-1",
+    mode = "1920x1080@165",
+    position = "0x0",
+    scale = 1
+})
+
+hl.monitor({
+    output = "DP-2",
+    mode = "1920x1080@165",
+    position = "-1080x-520",
+    transform = 1,
+    scale = 1
+})

dotfiles/hypr-desk/source/winandwork.conf

@@ -1,6 +1,16 @@
-#Set windows ans workspaces rules here
+windowrule {
-# Ignore maximize requests from apps. You'll probably like this.
+  name = windowrule-1
-windowrulev2 = suppressevent maximize, class:.*
+  suppress_event = maximize
+  match:class = .*
+}
 
-# Fix some dragging issues with XWayland
+windowrule {
-windowrulev2 = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0
+  name = windowrule-2
+  no_focus = on
+  match:class = ^$
+  match:title = ^$
+  match:xwayland = 1
+  match:float = 1
+  match:fullscreen = 0
+  match:pin = 0
+}

dotfiles/hypr-desk/source/winandwork.lua

@@ -0,0 +1,19 @@
+hl.window_rule({
+    name = "suppress-maximize-events",
+    match = {class = ".*"},
+    suppress_event = "maximize"
+})
+
+hl.window_rule({
+    name  = "fix-xwayland-drags",
+    match = {
+        class      = "^$",
+        title      = "^$",
+        xwayland   = true,
+        float      = true,
+        fullscreen = false,
+        pin        = false,
+    },
+
+    no_focus = true,
+})

dotfiles/hypr-lap/binds.conf

@@ -6,7 +6,7 @@
 ### KEYBINDINGSS ###
 ####################
 
-$terminal = alacritty
+$terminal = kitty
 $fileManager = dolphin
 $menu = wofi --show drun
 $calc = qalculate-gtk
@@ -21,11 +21,14 @@ bind = $mainMod, comma, exit,
 bind = $mainMod, E, exec, $fileManager
 bind = $mainMod, R, exec, $menu
 bind = $mainMod, W, exec, wlogout
-bind = $mainMod, A, exec, qutebrowser
+bind = $mainMod, A, exec, alacritty
 bind = $mainMod, F, fullscreen
 bind = $mainMod, T, togglefloating
 bind = , XF86Calculator, exec, $calc
 
+# Clipboard history
+bind = $mainMod, V, exec, cliphist list | wofi -dmenu | cliphist decode | wl-copy
+
 # Change Wallpaper
 bind = $mainMod SHIFT, W, exec, echo trigger > /tmp/wallpaper-trigger
 

dotfiles/hypr-lap/hyprland.conf

@@ -33,6 +33,8 @@ exec = killall waybar && waybar
 exec-once = mako
 exec-once = systemctl --user start hyprpolkitagent
 exec-once = [workspace 10 silent] thunderbird
+exec-once = wl-paste --type text --watch cliphist store
+exec-once = wl-paste --type image --watch cliphist store
 
 
 #############################
@@ -107,7 +109,6 @@ animations {
 
 # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
 dwindle {
-    pseudotile = true # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
     preserve_split = true # You probably want this
 }
 
@@ -165,5 +166,19 @@ device {
 # Example windowrule v2
 # windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
 
-windowrulev2 = suppressevent maximize, class:.* # You'll probably like this.
+windowrule {
-windowrulev2 = opacity 0.70 0.70,class:^(Alacritty)$
+  name = windowrule-1
+  suppress_event = maximize
+  match:class = .*
+}
+
+windowrule {
+  name = windowrule-2
+  opacity = 0.70 0.70
+  match:class = ^(Alacritty)$
+}
+
+ecosystem {
+    no_update_news = true
+    no_donation_nag = true
+}

dotfiles/hypr-lap/hyprland.lua

@@ -0,0 +1,18 @@
+---------------
+--- SOURCES ---
+---------------
+
+-- MONITORS
+require("source/monitors")
+-- BINDS
+require("source/binds")
+-- AUTOSTART
+require("source/autostart")
+-- ENVIRONMENT VARIABLES
+require("source/ev")
+-- LOOK AND FEEL
+require("source/look")
+-- INPUT
+require("source/input")
+-- WINDOWS AND WORKSPACES
+require("source/winandwork")

dotfiles/hypr-lap/source/autostart.lua

@@ -0,0 +1,16 @@
+-- exec_once
+hl.on("hyprland.start", function ()
+  hl.exec_cmd("waybar")
+  hl.exec_cmd("/home/smayzy/.config/hypr/battery.sh")
+  hl.exec_cmd("systemctl --user start hypr-wallpaper.service")
+  hl.exec_cmd("wl-paste --type text --watch cliphist store")
+  hl.exec_cmd("wl-paste --type image --watch cliphist store")
+  hl.exec_cmd("systemctl --user start hyprpolkitagent")
+  hl.exec_cmd("mako")
+  hl.exec_cmd("thunderbird", {workspace = "10 silent"})
+end)
+
+-- exec at each reload
+hl.on("config.reloaded", function ()
+  hl.exec_cmd("killall waybar && waybar")
+end)

dotfiles/hypr-lap/source/binds.lua

@@ -0,0 +1,94 @@
+------------------------------------
+--- USE WEV TO GET THE KEYS CODE ---
+------------------------------------
+
+--------------------
+--- KEYBINDINGSS ---
+--------------------
+
+-- MainMod
+mainMod = "SUPER"
+
+-- exec
+hl.bind(mainMod .. " + comma", hl.dsp.exit())
+hl.bind(mainMod .. " + F", hl.dsp.window.fullscreen())
+hl.bind(mainMod .. " + T", hl.dsp.window.float())
+hl.bind(mainMod .. " + C", hl.dsp.window.close())
+hl.bind(mainMod .. " + Q", hl.dsp.exec_cmd("kitty"))
+hl.bind(mainMod .. " + A", hl.dsp.exec_cmd("alacritty"))
+hl.bind(mainMod .. " + E", hl.dsp.exec_cmd("dolphin"))
+hl.bind(mainMod .. " + R", hl.dsp.exec_cmd("wofi --show drun"))
+hl.bind(mainMod .. " + W", hl.dsp.exec_cmd("wlogout"))
+hl.bind("XF86Calculator",  hl.dsp.exec_cmd("qalculate-gtk"))
+
+-- Volume
+hl.bind("XF86AudioMute"       , hl.dsp.exec_cmd("pactl set-sink-volume @DEFAULT_SINK@ 0%"))
+hl.bind("XF86AudioRaiseVolume", hl.dsp.exec_cmd("pactl set-sink-volume @DEFAULT_SINK@ +5%"))
+hl.bind("XF86AudioLowerVolume", hl.dsp.exec_cmd("pactl set-sink-volume @DEFAULT_SINK@ -5%"))
+
+-- Brightness
+hl.bind("XF86MonBrightnessDown", hl.dsp.exec_cmd("brightnessctl set 5%-"))
+hl.bind("XF86MonBrightnessUp",   hl.dsp.exec_cmd("brightnessctl set 5%+"))
+
+-- Change wallpaper
+hl.bind(mainMod .. " + SHIFT + W", hl.dsp.exec_cmd("echo trigger > /tmp/wallpaper-trigger"))
+
+-- Reload waybar
+hl.bind(mainMod .. " + SHIFT + B", hl.dsp.exec_cmd("pkill waybar && waybar"))
+
+-- Hide waybar
+hl.bind(mainMod .. " + X", hl.dsp.exec_cmd("pkill waybar || waybar"))
+
+-- Clipboard history
+hl.bind(mainMod .. " + V", hl.dsp.exec_cmd("cliphist list | wofi -dmenu | cliphist decode | wl-copy"))
+
+-- Screenshot to clipboard
+hl.bind(mainMod .. " + SHIFT + S", hl.dsp.exec_cmd("grim -g \"$(slurp -d)\" - | wl-copy"))
+
+-- Move focus with mainMod + arrow keys
+hl.bind(mainMod .. " + h", hl.dsp.focus({direction = "left"}))
+hl.bind(mainMod .. " + l", hl.dsp.focus({direction = "right"}))
+hl.bind(mainMod .. " + k", hl.dsp.focus({direction = "up"}))
+hl.bind(mainMod .. " + j", hl.dsp.focus({direction = "down"}))
+
+-- Move/resize windows with mainMod + LMB/RMB and dragging
+hl.bind(mainMod .. " + mouse:272", hl.dsp.window.drag(),   { mouse = true })
+hl.bind(mainMod .. " + mouse:273", hl.dsp.window.resize(), { mouse = true })
+
+-- Resize Windows
+hl.bind(mainMod .. " + CTRL + h", hl.dsp.window.resize({ x = -20 , y = 0   , relative = true }))
+hl.bind(mainMod .. " + CTRL + l", hl.dsp.window.resize({ x = 20  , y = 0   , relative = true }))
+hl.bind(mainMod .. " + CTRL + k", hl.dsp.window.resize({ x = 0   , y = -20 , relative = true }))
+hl.bind(mainMod .. " + CTRL + j", hl.dsp.window.resize({ x = 0   , y = 20  , relative = true }))
+
+-- Switch workspaces
+hl.bind(mainMod .. " + ampersand",       hl.dsp.focus({ workspace = "1"}))
+hl.bind(mainMod .. " + eacute",          hl.dsp.focus({ workspace = "2"}))
+hl.bind(mainMod .. " + quotedbl",        hl.dsp.focus({ workspace = "3"}))
+hl.bind(mainMod .. " + apostrophe",      hl.dsp.focus({ workspace = "4"}))
+hl.bind(mainMod .. " + parenleft",       hl.dsp.focus({ workspace = "5"}))
+hl.bind(mainMod .. " + minus",           hl.dsp.focus({ workspace = "6"}))
+hl.bind(mainMod .. " + egrave",          hl.dsp.focus({ workspace = "7"}))
+hl.bind(mainMod .. " + underscore",      hl.dsp.focus({ workspace = "8"}))
+hl.bind(mainMod .. " + ccedilla",        hl.dsp.focus({ workspace = "9"}))
+hl.bind(mainMod .. " + agrave",          hl.dsp.focus({ workspace = "10"}))
+hl.bind(mainMod .. " + dead_circumflex", hl.dsp.focus({ workspace = "11"}))
+hl.bind(mainMod .. " + dollar",          hl.dsp.focus({ workspace = "12"}))
+hl.bind(mainMod .. " + ugrave",          hl.dsp.focus({ workspace = "13"}))
+hl.bind(mainMod .. " + asterisk",        hl.dsp.focus({ workspace = "14"}))
+
+-- Move active window to a workspace
+hl.bind(mainMod .. " + SHIFT + ampersand",       hl.dsp.window.move({ workspace = "1"}))
+hl.bind(mainMod .. " + SHIFT + eacute",          hl.dsp.window.move({ workspace = "2"}))
+hl.bind(mainMod .. " + SHIFT + quotedbl",        hl.dsp.window.move({ workspace = "3"}))
+hl.bind(mainMod .. " + SHIFT + apostrophe",      hl.dsp.window.move({ workspace = "4"}))
+hl.bind(mainMod .. " + SHIFT + parenleft",       hl.dsp.window.move({ workspace = "5"}))
+hl.bind(mainMod .. " + SHIFT + minus",           hl.dsp.window.move({ workspace = "6"}))
+hl.bind(mainMod .. " + SHIFT + egrave",          hl.dsp.window.move({ workspace = "7"}))
+hl.bind(mainMod .. " + SHIFT + underscore",      hl.dsp.window.move({ workspace = "8"}))
+hl.bind(mainMod .. " + SHIFT + ccedilla",        hl.dsp.window.move({ workspace = "9"}))
+hl.bind(mainMod .. " + SHIFT + agrave",          hl.dsp.window.move({ workspace = "10"}))
+hl.bind(mainMod .. " + SHIFT + dead_circumflex", hl.dsp.window.move({ workspace = "11"}))
+hl.bind(mainMod .. " + SHIFT + dollar",          hl.dsp.window.move({ workspace = "12"}))
+hl.bind(mainMod .. " + SHIFT + ugrave",          hl.dsp.window.move({ workspace = "13"}))
+hl.bind(mainMod .. " + SHIFT + asterisk",        hl.dsp.window.move({ workspace = "14"}))

dotfiles/hypr-lap/source/ev.lua

@@ -0,0 +1,6 @@
+-- Set env here
+hl.env("XCURSOR_SIZE", "24")
+hl.env("HYPRCURSOR_SIZE", "24")
+hl.env("XDG_SESSION_TYPE", "wayland")
+hl.env("HYPRLAND_NO_SD_VARS", "1")
+hl.env("LD_LIBRARY_PATH", "/nix/store/p5c2hfgw9pipp2vd0xvxjmly99nbsdki-pipewire-1.6.8-jack/lib/")

dotfiles/hypr-lap/source/input.lua

@@ -0,0 +1,22 @@
+--Set inputs here
+
+hl.config({
+    input = {
+        kb_layout = "fr",
+        kb_variant = "",
+        kb_model   = "pc105",
+        kb_options = "terminate:ctrl_alt_bksp",
+        kb_rules   = "",
+
+        follow_mouse = 1,
+
+        sensitivity = 0,
+
+        touchpad = {
+            natural_scroll = false,
+        },
+    },
+    cursor = {
+        no_hardware_cursors = 0,
+    }
+})

dotfiles/hypr-lap/source/look.lua

@@ -0,0 +1,61 @@
+--Set look and feel here
+
+hl.config({
+    general = {
+        layout = "dwindle",
+        gaps_in  = 3,
+        gaps_out = 5,
+        border_size = 1,
+        col = {
+            active_border   = { colors = {"rgba(33ccffee)", "rgba(00ff99ee)"}, angle = 45 },
+            inactive_border = "rgba(595959aa)",
+        },
+    },
+
+    decoration = {
+        rounding       = 6,
+        rounding_power = 2,
+
+        active_opacity   = 1.0,
+        inactive_opacity = 1.0,
+
+        shadow = {
+            enabled      = false
+        },
+
+        blur = {
+            enabled   = false,
+        },
+    },
+
+    animations = {
+        enabled = true,
+    },
+
+    dwindle = {
+        preserve_split = true,
+    },
+
+    master = {
+        new_status = "master",
+    },
+
+    misc = {
+        force_default_wallpaper = 0,
+        disable_hyprland_logo   = true,
+    },
+
+    ecosystem = {
+        no_update_news = true,
+        no_donation_nag = true,
+    }
+})
+
+hl.curve( "mybezier", { type = "bezier", points = { {0.05, 0.9}, {0.1, 1.05} } })
+
+hl.animation({ leaf = "windows", enabled = true, speed = 7, bezier = "mybezier" })
+hl.animation({ leaf = "windowsOut", enabled = true, speed = 7, bezier = "mybezier" })
+hl.animation({ leaf = "border", enabled = true, speed = 7, bezier = "mybezier" })
+hl.animation({ leaf = "borderangle", enabled = true, speed = 7, bezier = "mybezier" })
+hl.animation({ leaf = "fade", enabled = true, speed = 7, bezier = "mybezier" })
+hl.animation({ leaf = "workspaces", enabled = true, speed = 7, bezier = "mybezier" })

dotfiles/hypr-lap/source/monitors.lua

@@ -0,0 +1,6 @@
+hl.monitor({
+    output = "",
+    mode = "preferred",
+    position = "auto",
+    scale = 1
+})

dotfiles/hypr-lap/source/winandwork.lua

@@ -0,0 +1,19 @@
+hl.window_rule({
+    name = "suppress-maximize-events",
+    match = {class = ".*"},
+    suppress_event = "maximize"
+})
+
+hl.window_rule({
+    name  = "fix-xwayland-drags",
+    match = {
+        class      = "^$",
+        title      = "^$",
+        xwayland   = true,
+        float      = true,
+        fullscreen = false,
+        pin        = false,
+    },
+
+    no_focus = true,
+})

dotfiles/isyncrc

@@ -0,0 +1,38 @@
+IMAPStore smayzy-remote
+Host mail.smayzy.ovh
+User smayzy@smayzy.ovh
+PassCmd "pass mail/smayzy"
+TLSType IMAPS
+
+MaildirStore smayzy-local
+Path ~/Mail/smayzy/
+Inbox ~/Mail/smayzy/INBOX
+SubFolders Verbatim
+
+Channel smayzy
+Far :smayzy-remote:
+Near :smayzy-local:
+Create Both
+Expunge Both
+Patterns *
+SyncState *
+
+
+IMAPStore baptiste.maylin-remote
+Host mail.smayzy.ovh
+User baptiste.maylin@smayzy.ovh
+PassCmd "pass mail/baptiste.maylin"
+TLSType IMAPS
+
+MaildirStore baptiste.maylin-local
+Path ~/Mail/baptiste.maylin/
+Inbox ~/Mail/baptiste.maylin/INBOX
+SubFolders Verbatim
+
+Channel baptiste.maylin
+Far :baptiste.maylin-remote:
+Near :baptiste.maylin-local:
+Create Both
+Expunge Both
+Patterns *
+SyncState *

dotfiles/msmtp/config

@@ -0,0 +1,25 @@
+defaults
+tls on
+tls_starttls off
+auth on
+logfile ~/.msmtp.log
+timeout 60
+
+account smayzy
+host mail.smayzy.ovh
+port 465
+domain smayzy.ovh
+from smayzy@smayzy.ovh
+user smayzy@smayzy.ovh
+passwordeval pass mail/smayzy
+
+account baptiste.maylin
+host mail.smayzy.ovh
+port 465
+domain smayzy.ovh
+from baptiste.maylin@smayzy.ovh
+user baptiste.maylin@smayzy.ovh
+passwordeval pass mail/baptiste.maylin
+
+
+account default : smayzy

dotfiles/neomutt/bind.muttrc

@@ -0,0 +1,15 @@
+# vim: syntax=neomuttrc
+bind index,pager \Ck sidebar-prev
+bind index,pager \Cj sidebar-next
+bind index,pager \Ce sidebar-open
+bind index,pager V sidebar-toggle-visible
+
+
+bind index,pager j next-entry
+bind index,pager k previous-entry
+bind index,pager J next-page
+bind index,pager K previous-page
+
+bind editor \C_ bol
+bind editor \Cd kill-line
+bind editor \Cr history-search

dotfiles/neomutt/color.muttrc

@@ -0,0 +1,68 @@
+# vim: filetype=neomuttrc
+# Default index colors:
+color index yellow default '.*'
+color index_author red default '.*'
+color index_number blue default
+color index_subject cyan default '.*'
+
+# For new mail:
+color index brightyellow black "~N"
+color index_author brightred black "~N"
+color index_subject brightcyan black "~N"
+
+# Header colors:
+color header blue default ".*"
+color header brightmagenta default "^(From)"
+color header brightcyan default "^(Subject)"
+color header brightwhite default "^(CC|BCC)"
+
+mono bold bold
+mono underline underline
+mono indicator reverse
+mono error bold
+color normal default default
+color indicator brightblack white
+color sidebar_highlight red default
+color sidebar_divider brightblack black
+color sidebar_flagged red black
+color sidebar_new green black
+color normal brightyellow default
+color error red default
+color tilde black default
+color message cyan default
+color markers red white
+color attachment white default
+color search brightmagenta default
+color status brightyellow black
+color hdrdefault brightgreen default
+color quoted green default
+color quoted1 blue default
+color quoted2 cyan default
+color quoted3 yellow default
+color quoted4 red default
+color quoted5 brightred default
+color signature brightgreen default
+color bold black default
+color underline black default
+color normal default default
+
+color body brightred default "[\-\.+_a-zA-Z0-9]+@[\-\.a-zA-Z0-9]+" # Email addresses
+color body brightblue default "(https?|ftp)://[\-\.,/%~_:?&=\#a-zA-Z0-9]+" # URL
+color body green default "\`[^\`]*\`" # Green text between ` and `
+color body brightblue default "^# \.*" # Headings as bold blue
+color body brightcyan default "^## \.*" # Subheadings as bold cyan
+color body brightgreen default "^### \.*" # Subsubheadings as bold green
+color body yellow default "^(\t| )*(-|\\*) \.*" # List items as yellow
+color body brightcyan default "[;:][-o][)/(|]" # emoticons
+color body brightcyan default "[;:][)(|]" # emoticons
+color body brightcyan default "[ ][*][^*]*[*][ ]?" # more emoticon?
+color body brightcyan default "[ ]?[*][^*]*[*][ ]" # more emoticon?
+color body red default "(BAD signature)"
+color body cyan default "(Good signature)"
+color body brightblack default "^gpg: Good signature .*"
+color body brightyellow default "^gpg: "
+color body brightyellow red "^gpg: BAD signature from.*"
+mono body bold "^gpg: Good signature"
+mono body bold "^gpg: BAD signature from.*"
+color body red default "([a-z][a-z0-9+-]*://(((([a-z0-9_.!~*'();:&=+$,-]|%[0-9a-f][0-9a-f])*@)?((([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?|[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+)(:[0-9]+)?)|([a-z0-9_.!~*'()$,;:@&=+-]|%[0-9a-f][0-9a-f])+)(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?(#([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?|(www|ftp)\\.(([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?(:[0-9]+)?(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?(#([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?)[^].,:;!)? \t\r\n<>\"]"
+

dotfiles/neomutt/muttrc

@@ -0,0 +1,40 @@
+# vim: syntax=neomuttrc
+set editor = "vim"
+
+source color.muttrc
+source bind.muttrc
+
+set ssl_force_tls = yes
+set mail_check_stats
+
+set sidebar_visible = yes
+set sidebar_width = 40
+set sidebar_short_path = yes
+set sidebar_delim_chars = '/'
+set sidebar_on_right = yes
+set sidebar_format = '%B%<F? [%F]>%* %<N?%N/>%S'
+
+set spoolfile = "~/Mail/smayzy/INBOX"
+set folder = "~/Mail/smayzy"
+
+mailboxes `for u in smayzy baptiste.maylin; do echo "$HOME/Mail/placeholder/------$u------"; find ~/Mail/$u -type d -name cur | xargs dirname; done | xargs`
+
+folder-hook ~/Mail/smayzy/.* "\
+    set from='smayzy@smayzy.ovh';\
+    set realname='Smayzy';\
+    set folder='~/Mail/smayzy';\
+    set spoolfile='+INBOX';\
+    set record='+Sent';\
+    set postponed='+Drafts';\
+    set trash='+Trash';\
+    set sendmail='msmtp -a smayzy'"
+
+folder-hook ~/Mail/baptiste.maylin/.* "\
+    set from='baptiste.maylin@smayzy.ovh';\
+    set realname='Baptiste Maylin';\
+    set folder='~/Mail/baptiste.maylin';\
+    set spoolfile='+INBOX';\
+    set record='+Sent';\
+    set postponed='+Drafts';\
+    set trash='+Trash';\
+    set sendmail='msmtp -a baptiste.maylin'"

flake.lock

@@ -8,11 +8,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1762618334,
+        "lastModified": 1770165109,
-        "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=",
+        "narHash": "sha256-9VnK6Oqai65puVJ4WYtCTvlJeXxMzAp/69HhQuTdl/I=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "fcdea223397448d35d9b31f798479227e80183f6",
+        "rev": "b027ee29d959fda4b60b57566d64c98a202e0feb",
         "type": "github"
       },
       "original": {
@@ -46,11 +46,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1751685974,
+        "lastModified": 1777699697,
-        "narHash": "sha256-NKw96t+BgHIYzHUjkTK95FqYRVKB8DHpVhefWSz/kTw=",
+        "narHash": "sha256-Eg9b/rq/ECYwNwEXs5i9wHyhxNI0JrYx2srdI2uZMaQ=",
         "ref": "refs/heads/main",
-        "rev": "549f2762aebeff29a2e5ece7a7dc0f955281a1d1",
+        "rev": "382052b74656a369c5408822af3f2501e9b1af81",
-        "revCount": 92,
+        "revCount": 94,
         "type": "git",
         "url": "https://git.lix.systems/lix-project/flake-compat.git"
       },
@@ -59,27 +59,6 @@
         "url": "https://git.lix.systems/lix-project/flake-compat.git"
       }
     },
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "nvf",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1768135262,
-        "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -108,11 +87,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768530555,
+        "lastModified": 1785531816,
-        "narHash": "sha256-EBXKDho4t1YSgodAL6C8M3UTm8MGMZNQ9rQnceR5+6c=",
+        "narHash": "sha256-vkMnV0JIyw+g/NmcfoajlGaAO+9a0ezia+FZohQJrik=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d21bee5abf9fb4a42b2fa7728bf671f8bb246ba6",
+        "rev": "bf9ce9fec78f95f374e8dd3b503863a3ec128ebe",
         "type": "github"
       },
       "original": {
@@ -123,11 +102,11 @@
     },
     "mnw": {
       "locked": {
-        "lastModified": 1767030222,
+        "lastModified": 1780772958,
-        "narHash": "sha256-kSvWF3Xt2HW9hmV5V7i8PqeWJIBUKmuKoHhOgj3Znzs=",
+        "narHash": "sha256-VKKe8r4pwCGWZ3Yr9CPN129R4S3CKLSrlYqdYz3vKpM=",
         "owner": "Gerg-L",
         "repo": "mnw",
-        "rev": "75bb637454b0fbbb5ed652375a4bf7ffd28bcf6f",
+        "rev": "0871dbf63a53610c95db04439ed8ea4d6ec9c160",
         "type": "github"
       },
       "original": {
@@ -136,28 +115,6 @@
         "type": "github"
       }
     },
-    "ndg": {
-      "inputs": {
-        "nixpkgs": [
-          "nvf",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1768214250,
-        "narHash": "sha256-hnBZDQWUxJV3KbtvyGW5BKLO/fAwydrxm5WHCWMQTbw=",
-        "owner": "feel-co",
-        "repo": "ndg",
-        "rev": "a6bd3c1ce2668d096e4fdaaa03ad7f03ba1fbca8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "feel-co",
-        "ref": "refs/tags/v2.6.0",
-        "repo": "ndg",
-        "type": "github"
-      }
-    },
     "nix-flatpak": {
       "locked": {
         "lastModified": 1767983141,
@@ -174,6 +131,26 @@
         "type": "github"
       }
     },
+    "nix-index-database": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1785650611,
+        "narHash": "sha256-q4kR7g+pCcz6NASvoVPYu+CWWUurX03wogtBqGmR4h0=",
+        "owner": "nix-community",
+        "repo": "nix-index-database",
+        "rev": "dbc756c9d7287de19b3e0e38c928c47510d42c3e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix-index-database",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1754028485,
@@ -192,11 +169,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1768305791,
+        "lastModified": 1785571196,
-        "narHash": "sha256-AIdl6WAn9aymeaH/NvBj0H9qM+XuAuYbGMZaP0zcXAQ=",
+        "narHash": "sha256-KoTsyMQqnXQZq8deCEnu4QkyldkwH/bpMMhUcfMdGIw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "1412caf7bf9e660f2f962917c14b1ea1c3bc695e",
+        "rev": "148bab9c1c3c53136ecb44a6ea356a0ed5b39b06",
         "type": "github"
       },
       "original": {
@@ -208,35 +185,29 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1768395095,
+        "lastModified": 1784796856,
-        "narHash": "sha256-ZhuYJbwbZT32QA95tSkXd9zXHcdZj90EzHpEXBMabaw=",
+        "narHash": "sha256-vwxWgF+Gj276WznzGb1LxGsK/39HaQwgQXiU3EkC844=",
-        "owner": "nixos",
+        "rev": "e2587caef70cea85dd97d7daab492899902dbf5d",
-        "repo": "nixpkgs",
+        "type": "tarball",
-        "rev": "13868c071cc73a5e9f610c47d7bb08e5da64fdd5",
+        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1040357.e2587caef70c/nixexprs.tar.xz"
-        "type": "github"
       },
       "original": {
-        "owner": "nixos",
+        "type": "tarball",
-        "ref": "nixpkgs-unstable",
+        "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
-        "repo": "nixpkgs",
-        "type": "github"
       }
     },
     "nvf": {
       "inputs": {
         "flake-compat": "flake-compat",
-        "flake-parts": "flake-parts",
         "mnw": "mnw",
-        "ndg": "ndg",
+        "nixpkgs": "nixpkgs_3"
-        "nixpkgs": "nixpkgs_3",
-        "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1768464392,
+        "lastModified": 1785632973,
-        "narHash": "sha256-H3DRARqclUFdUaWgu1xQEb86/wrh41ZG0fIQJVjcZdE=",
+        "narHash": "sha256-j4NzdhN4dgpvORbKdteIcw8M2WJyKrIgalBxT/CNk+c=",
         "owner": "notashelf",
         "repo": "nvf",
-        "rev": "007f14a2c8d67568f4655654b401871920d73011",
+        "rev": "c82d4e47cc1baab21d4954760db49941aaa39b49",
         "type": "github"
       },
       "original": {
@@ -250,6 +221,7 @@
         "agenix": "agenix",
         "home-manager": "home-manager_2",
         "nix-flatpak": "nix-flatpak",
+        "nix-index-database": "nix-index-database",
         "nixpkgs": "nixpkgs_2",
         "nvf": "nvf"
       }
@@ -268,21 +240,6 @@
         "repo": "default",
         "type": "github"
       }
-    },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
     }
   },
   "root": "root",

flake.nix

@@ -10,6 +10,11 @@
 
     agenix.url = "github:ryantm/agenix";
 
+    nix-index-database = {
+      url = "github:nix-community/nix-index-database";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest";
 
     nvf.url = "github:notashelf/nvf";
@@ -30,6 +35,7 @@
         inputs.nix-flatpak.nixosModules.nix-flatpak
         inputs.nvf.nixosModules.default
         inputs.agenix.nixosModules.default
+        inputs.nix-index-database.nixosModules.default
       ];
 
       mkHost =
@@ -52,7 +58,7 @@
         desktop1 = mkHost ./hosts/desktop1/configuration.nix;
         server1 = mkHost ./hosts/server1/configuration.nix;
         laptop1 = mkHost ./hosts/laptop1/configuration.nix;
-
+        laptop2 = mkHost ./hosts/laptop2/configuration.nix;
       };
     };
 

hosts/common/common.nix

@@ -24,6 +24,7 @@
       "wheel"
       "wireshark"
       "dialout"
+      "audio"
     ];
   };
 

hosts/desktop1/configuration.nix

@@ -31,8 +31,11 @@
     fsType = "nfs";
     options = [
       "x-systemd.automount"
+      "nofail"
       "noauto"
       "nfsvers=4"
+      "soft"
+      "timeo=50"
     ];
     depends = [ "/home" ];
   };
@@ -41,8 +44,11 @@
     fsType = "nfs";
     options = [
       "x-systemd.automount"
+      "nofail"
       "noauto"
       "nfsvers=4"
+      "soft"
+      "timeo=50"
     ];
     depends = [ "/home" ];
   };
@@ -51,12 +57,24 @@
     fsType = "nfs";
     options = [
       "x-systemd.automount"
+      "nofail"
       "noauto"
       "nfsvers=4"
+      "soft"
+      "timeo=50"
     ];
     depends = [ "/home" ];
   };
 
+  security.pam.loginLimits = [
+    {
+      domain = "@audio";
+      type = "-";
+      item = "memlock";
+      value = "unlimited";
+    }
+  ];
+
   smayzy = {
     desktop.enable = true;
     nvidia.enable = true;
@@ -64,6 +82,19 @@
     hyprland.enable = true;
     kde.enable = true;
     docker.enable = true;
+    steam.enable = true;
+    office.enable = true;
+    mullvad.enable = true;
+    alacritty.enable = true;
+    ardour.enable = true;
+    mail.enable = true;
+    supertuxkart.enable = true;
+    flatpak = {
+      enable = true;
+      media.enable = true;
+      dev.enable = true;
+      gaming.enable = true;
+    };
     containers = {
       nixos = {
       };
@@ -75,7 +106,6 @@
         gateway = "192.168.1.254";
       };
     };
-    qbittorrent.enable = true;
   };
 
   home-manager = {
@@ -106,12 +136,6 @@
       linux /boot/vmlinuz-6.12.47-gentoo-dist root=UUID=ad8fa502-d3dc-4999-abce-17a09a9cb779
       initrd /boot/initramfs-6.12.47-gentoo-dist.img
     }
-    menuentry "LFS" {
-      insmod part_gpt
-      insmod ext2
-      search --no-floppy --fs-uuid --set=root 73925a5c-739f-4092-b3ca-c6be7d0971e5
-      linux /boot/vmlinuz-6.16.1-lfs-12.4 root=/dev/sda1
-    }
   '';
 
 }

hosts/laptop1/configuration.nix

@@ -10,6 +10,7 @@
     laptop.enable = true;
     hyprland.enable = true;
     kde.enable = true;
+    grub-on-lap.enable = true;
   };
 
   home-manager = {
@@ -26,5 +27,4 @@
   system.stateVersion = "24.11";
 
   networking.hostName = "laptop1";
-
 }

hosts/laptop2/configuration.nix

@@ -0,0 +1,30 @@
+{ inputs, config, ... }:
+
+{
+  imports = [
+    ../common/common.nix
+    ./hardware-configuration.nix
+  ];
+
+  smayzy = {
+    laptop.enable = true;
+    hyprland.enable = true;
+    kde.enable = true;
+    ardour.enable = true;
+  };
+
+  home-manager = {
+    extraSpecialArgs = {
+      inherit inputs;
+      smayzy = config.smayzy;
+    };
+    users = {
+      smayzy = import ./home.nix;
+    };
+    backupFileExtension = "backup";
+  };
+
+  system.stateVersion = "24.11";
+
+  networking.hostName = "laptop2";
+}

hosts/laptop2/hardware-configuration.nix

@@ -0,0 +1,47 @@
+# 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,
+  pkgs,
+  modulesPath,
+  ...
+}:
+
+{
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
+
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "nvme"
+    "usb_storage"
+    "sd_mod"
+  ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/ceed0ac4-72b3-4050-b8a3-0b91aa845da0";
+    fsType = "ext4";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/65F0-BF7E";
+    fsType = "vfat";
+    options = [
+      "fmask=0077"
+      "dmask=0077"
+    ];
+  };
+
+  swapDevices = [
+    { device = "/dev/disk/by-uuid/3567a75d-12cc-4c3e-a37d-9b99708cbfea"; }
+  ];
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

hosts/laptop2/home.nix

@@ -1,6 +1,7 @@
 { ... }:
+
 {
   imports = [
-    ./firejail.nix
+    ../common/home.nix
   ];
 }

modules/home-manager/cli/default.nix

@@ -2,5 +2,6 @@
 {
   imports = [
     ./fastfetch.nix
+    ./mail.nix
   ];
 }

modules/home-manager/cli/mail.nix

@@ -0,0 +1,29 @@
+{
+  lib,
+  smayzy,
+  ...
+}:
+let
+  mkIf = lib.mkIf;
+in
+{
+  config = mkIf smayzy.mail.enable {
+    home.file = {
+      ".config/neomutt" = {
+        source = builtins.toPath ../../../dotfiles/neomutt;
+        recursive = true;
+        force = true;
+      };
+      ".config/isyncrc" = {
+        source = builtins.toPath ../../../dotfiles/isyncrc;
+        recursive = true;
+        force = true;
+      };
+      ".config/msmtp" = {
+        source = builtins.toPath ../../../dotfiles/msmtp;
+        recursive = true;
+        force = true;
+      };
+    };
+  };
+}

modules/home-manager/lf/lf.nix

@@ -15,7 +15,7 @@ in
       enable = true;
       commands = {
         dragon-out = ''%${pkgs.dragon-drop}/bin/xdragon -a -x "$fx"'';
-        editor-open = ''$$EDITOR $f'';
+        editor-open = "$$EDITOR $f";
         mkdir = ''
           ''${{
             printf "Directory Name: "

modules/home-manager/terminal/kitty.nix

@@ -8,6 +8,7 @@ in
       enable = true;
       settings = {
         cursor = "#c7c7c7";
+        cursor_trail = 3;
         cursor_text_color = "#feffff";
         selection_foreground = "#3e3e3e";
         selection_background = "#c1ddff";

modules/nix/audio/ardour.nix

@@ -0,0 +1,30 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+let
+  inherit (lib) mkIf mkOption types;
+in
+{
+  options.smayzy.ardour.enable = mkOption {
+    type = types.bool;
+    default = false;
+    description = "ardour suite";
+  };
+
+  config = mkIf config.smayzy.ardour.enable {
+    environment.systemPackages = with pkgs; [
+      ardour
+      guitarix
+      tuxguitar
+      caps
+      lsp-plugins
+      calf
+      dragonfly-reverb
+      tap-plugins
+      hydrogen
+    ];
+  };
+}

modules/nix/audio/default.nix

@@ -2,5 +2,6 @@
 {
   imports = [
     ./pipewire.nix
+    ./ardour.nix
   ];
 }

modules/nix/audio/pipewire.nix

@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
 let
   inherit (lib) mkIf mkOption types;
 in
@@ -17,6 +17,16 @@ in
       alsa.enable = true;
       alsa.support32Bit = true;
       pulse.enable = true;
+      jack.enable = true;
+      extraConfig.pipewire."92-low-latency" = {
+        "context.properties" = {
+          "default.clock.rate" = 48000;
+          "default.clock.quantum" = 128;
+          "default.clock.min-quantum" = 128;
+          "default.clock.max-quantum" = 128;
         };
       };
+    };
+    environment.systemPackages = with pkgs; [ pulseaudioFull ];
+  };
 }

modules/nix/base-cli/nvf.nix

@@ -32,6 +32,9 @@ in
             nix.enable = true;
             clang.enable = true;
             rust.enable = true;
+            arduino.enable = true;
+            bash.enable = true;
+            lua.enable = true;
           };
           theme = {
             enable = true;

modules/nix/base-cli/pkgs.nix

@@ -24,6 +24,8 @@ in
       btop
       file
       vim
+      man-pages
+      man-pages-posix
       fastfetch
       lf
       tshark
@@ -36,6 +38,8 @@ in
       nfs-utils
       nmap
       agenix.packages.${stdenv.hostPlatform.system}.default
+      nixpkgs-review
     ];
+    programs.nix-index-database.comma.enable = true;
   };
 }

modules/nix/browser/chromium.nix

@@ -1,23 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-let
-  inherit (lib) mkIf mkOption types;
-in
-{
-  options.smayzy.chromium.enable = mkOption {
-    type = types.bool;
-    default = false;
-    description = "chromium";
-  };
-
-  config = mkIf config.smayzy.chromium.enable {
-    programs.chromium.enable = true;
-    environment.systemPackages = with pkgs; [
-      chromium
-    ];
-  };
-}

modules/nix/browser/default.nix

@@ -1,8 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./firefox.nix
-    ./librewolf.nix
-    ./chromium.nix
-  ];
-}

modules/nix/browser/firefox.nix

@@ -1,15 +0,0 @@
-{ lib, config, ... }:
-let
-  inherit (lib) mkIf mkOption types;
-in
-{
-  options.smayzy.firefox.enable = mkOption {
-    type = types.bool;
-    default = false;
-    description = "firefox";
-  };
-
-  config = mkIf config.smayzy.firefox.enable {
-    programs.firefox.enable = true;
-  };
-}

modules/nix/browser/librewolf.nix

@@ -1,20 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-let
-  inherit (lib) mkIf mkOption types;
-in
-{
-  options.smayzy.librewolf.enable = mkOption {
-    type = types.bool;
-    default = false;
-    description = "librewolf";
-  };
-
-  config = mkIf config.smayzy.librewolf.enable {
-    environment.systemPackages = with pkgs; [ librewolf ];
-  };
-}

modules/nix/cad/default.nix

@@ -1,7 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./freecad.nix
-    ./fritzing.nix
-  ];
-}

modules/nix/cad/freecad.nix

@@ -1,20 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-let
-  inherit (lib) mkIf mkOption types;
-in
-{
-  options.smayzy.freecad.enable = mkOption {
-    type = types.bool;
-    default = false;
-    description = "enable freecad";
-  };
-
-  config = mkIf config.smayzy.freecad.enable {
-    environment.systemPackages = with pkgs; [ freecad-wayland ];
-  };
-}

modules/nix/cad/fritzing.nix

@@ -1,20 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-let
-  inherit (lib) mkIf mkOption types;
-in
-{
-  options.smayzy.fritzing.enable = mkOption {
-    type = types.bool;
-    default = false;
-    description = "enable fritzing";
-  };
-
-  config = mkIf config.smayzy.fritzing.enable {
-    environment.systemPackages = with pkgs; [ fritzing ];
-  };
-}

modules/nix/comm/default.nix

@@ -1,7 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./element.nix
-    ./thunderbird.nix
-  ];
-}

modules/nix/comm/element.nix

@@ -1,22 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-let
-  inherit (lib) mkIf mkOption types;
-in
-{
-  options.smayzy.element.enable = mkOption {
-    type = types.bool;
-    default = false;
-    description = "element";
-  };
-
-  config = mkIf config.smayzy.element.enable {
-    environment.systemPackages = with pkgs; [
-      element-desktop
-    ];
-  };
-}

modules/nix/comm/thunderbird.nix

@@ -1,22 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-let
-  inherit (lib) mkIf mkOption types;
-in
-{
-  options.smayzy.thunderbird.enable = mkOption {
-    type = types.bool;
-    default = false;
-    description = "thunderbird";
-  };
-
-  config = mkIf config.smayzy.thunderbird.enable {
-    environment.systemPackages = with pkgs; [
-      thunderbird
-    ];
-  };
-}

modules/nix/containers/nixos/unbound.nix

@@ -58,7 +58,8 @@ in
                   ''"sonarr.internal.smayzy.ovh.       A 192.168.1.203"''
                   ''"srv1-proxmox.internal.smayzy.ovh. A 192.168.1.203"''
                   ''"srv2-proxmox.internal.smayzy.ovh. A 192.168.1.203"''
-                  ''"srv1-pbs.internal.smayzy.ovh.     A 192.168.1.203"''
+                  ''"srv1-pbs.internal.smayzy.ovh.     A 192.168.1.79"''
+                  ''"srv2-pbs.internal.smayzy.ovh.     A 192.168.1.80"''
                 ];
               };
             };

modules/nix/ctf/default.nix

@@ -1,6 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./ghidra.nix
-  ];
-}

modules/nix/ctf/ghidra.nix

@@ -1,20 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-let
-  inherit (lib) mkIf mkOption types;
-in
-{
-  options.smayzy.ghidra.enable = mkOption {
-    type = types.bool;
-    default = false;
-    description = "enable ghidra";
-  };
-
-  config = mkIf config.smayzy.ghidra.enable {
-    environment.systemPackages = with pkgs; [ ghidra ];
-  };
-}

modules/nix/default.nix

@@ -3,20 +3,13 @@
   imports = [
     ./audio
     ./base-cli
-    ./browser
-    ./cad
-    ./comm
     ./containers
-    ./ctf
     ./de
     ./displaymanager
-    ./ebook
     ./flatpak
     ./games
     ./groups
     ./hardware
-    ./ide
-    ./isolation
     ./networking
     ./office
     ./shell

modules/nix/ebook/calibre.nix

@@ -1,20 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-let
-  inherit (lib) mkIf mkOption types;
-in
-{
-  options.smayzy.calibre.enable = mkOption {
-    type = types.bool;
-    default = false;
-    description = "enable calibre";
-  };
-
-  config = mkIf config.smayzy.calibre.enable {
-    environment.systemPackages = with pkgs; [ calibre ];
-  };
-}

modules/nix/ebook/default.nix

@@ -1,6 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./calibre.nix
-  ];
-}

modules/nix/games/default.nix

@@ -1,7 +1,7 @@
 { ... }:
 {
   imports = [
-    ./prism.nix
     ./steam.nix
+    ./supertuxkart.nix
   ];
 }

modules/nix/games/prism.nix

@@ -1,22 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-let
-  inherit (lib) mkIf mkOption types;
-in
-{
-  options.smayzy.prism.enable = mkOption {
-    type = types.bool;
-    default = false;
-    description = "prismlauncher";
-  };
-
-  config = mkIf config.smayzy.prism.enable {
-    environment.systemPackages = with pkgs; [
-      prismlauncher
-    ];
-  };
-}

modules/nix/games/steam.nix

@@ -16,6 +16,6 @@ in
 
   config = mkIf config.smayzy.steam.enable {
     programs.steam.enable = true;
-    environment.systemPackages = with pkgs; [ depotdownloader];
+    environment.systemPackages = with pkgs; [ depotdownloader gamescope ];
   };
 }

modules/nix/games/supertuxkart.nix

@@ -0,0 +1,20 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+let
+  inherit (lib) mkIf mkOption types;
+in
+{
+  options.smayzy.supertuxkart.enable = mkOption {
+    type = types.bool;
+    default = false;
+    description = "supertuxkart";
+  };
+
+  config = mkIf config.smayzy.supertuxkart.enable {
+    environment.systemPackages = with pkgs; [ supertuxkart ];
+  };
+}

modules/nix/groups/base.nix

@@ -17,5 +17,6 @@ in
       nvf.enable = true;
       zsh.enable = true;
     };
+    documentation.dev.enable = true;
   };
 }

modules/nix/groups/desktop.nix

@@ -1,4 +1,9 @@
-{ lib, config, ... }:
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
 let
   inherit (lib) mkIf mkOption types;
 in
@@ -13,42 +18,40 @@ in
     smayzy = {
       base = true;
       power = "desktop";
-      steam.enable = true;
-      prism.enable = true;
-      firefox.enable = true;
-      librewolf.enable = true;
       audio.enable = true;
-      office.enable = true;
-      element.enable = true;
       sddm.enable = true;
-      mullvad.enable = true;
       wireguard.enable = true;
       gui-utilities.enable = true;
       mouse.enable = true;
-      obsidian.enable = true;
-      kdenlive.enable = true;
-      thunderbird.enable = true;
-      blender.enable = true;
-      inkscape.enable = true;
-      komikku.enable = true;
-      flatpak = {
-        enable = true;
-        media.enable = true;
-        dev.enable = true;
-        gaming.enable = true;
-      };
-      arduino.enable = true;
-      calibre.enable = true;
-      freecad.enable = true;
-      fritzing.enable = true;
-      aegisub.enable = true;
       tor.enable = true;
-      chromium.enable = true;
-      ghidra.enable = true;
-      firejail.enable = true;
-      wireshark.enable = true;
-      bitwarden.enable = true;
-      alacritty.enable = true;
     };
+    programs.firefox.enable = true;
+    programs.wireshark.enable = true;
+    environment.systemPackages = with pkgs; [
+      wireshark
+      librewolf
+      prismlauncher
+      obsidian
+      komikku
+      inkscape
+      blender
+      aegisub
+      kdePackages.kdenlive
+      freecad-wayland
+      fritzing
+      element-desktop
+      thunderbird
+      kicad
+      ghidra
+      calibre
+      arduino-ide
+      arduino-cli
+      firejail
+      qbittorrent
+      android-tools
+      gdb
+      chromium
+      rpi-imager
+    ];
   };
 }

modules/nix/groups/laptop.nix

@@ -18,42 +18,53 @@ in
     smayzy = {
       base = true;
       power = "laptop";
-      grub-on-lap.enable = true;
-      prism.enable = true;
-      firefox.enable = true;
-      librewolf.enable = true;
       audio.enable = true;
       office.enable = true;
-      element.enable = true;
       sddm.enable = true;
       mullvad.enable = true;
       wireguard.enable = true;
       gui-utilities.enable = true;
       mouse.enable = true;
-      obsidian.enable = true;
-      kdenlive.enable = true;
-      thunderbird.enable = true;
-      inkscape.enable = true;
-      komikku.enable = true;
       flatpak = {
         enable = true;
         dev.enable = true;
         media.enable = true;
       };
-      arduino.enable = true;
-      calibre.enable = true;
-      freecad.enable = true;
       tor.enable = true;
-      fritzing.enable = true;
-      aegisub.enable = true;
       alacritty.enable = true;
-      chromium.enable = true;
-      firejail.enable = true;
-      wireshark.enable = true;
-      bitwarden.enable = true;
       steam.enable = true;
+      mail.enable = true;
     };
+    hardware.bluetooth = {
+      enable = true;
+      powerOnBoot = false;
+    };
+    services.blueman.enable = true;
+    programs.firefox.enable = true;
+    programs.wireshark.enable = true;
     networking.networkmanager.enable = true;
-    environment.systemPackages = with pkgs; [ networkmanagerapplet ];
+    environment.systemPackages = with pkgs; [
+      wireshark
+      networkmanagerapplet
+      librewolf
+      obsidian
+      komikku
+      inkscape
+      aegisub
+      kdePackages.kdenlive
+      freecad-wayland
+      fritzing
+      element-desktop
+      thunderbird
+      prismlauncher
+      kicad
+      calibre
+      arduino-ide
+      arduino-cli
+      firejail
+      gdb
+      chromium
+      rpi-imager
+    ];
   };
 }

modules/nix/ide/arduino.nix

@@ -1,20 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-let
-  inherit (lib) mkIf mkOption types;
-in
-{
-  options.smayzy.arduino.enable = mkOption {
-    type = types.bool;
-    default = false;
-    description = "arduino ide";
-  };
-
-  config = mkIf config.smayzy.arduino.enable {
-    environment.systemPackages = with pkgs; [ arduino-ide ];
-  };
-}

modules/nix/ide/default.nix

@@ -1,6 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./arduino.nix
-  ];
-}

modules/nix/isolation/firejail.nix

@@ -1,20 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}:
-let
-  inherit (lib) mkIf mkOption types;
-in
-{
-  options.smayzy.firejail.enable = mkOption {
-    type = types.bool;
-    default = false;
-    description = "firejail";
-  };
-
-  config = mkIf config.smayzy.firejail.enable {
-    environment.systemPackages = with pkgs; [ firejail ];
-  };
-}

modules/nix/networking/default.nix

@@ -2,7 +2,6 @@
 {
   imports = [
     ./openssh.nix
-    ./wireshark.nix
+    ./mail.nix
-    ./qbittorrent.nix
   ];
 }

modules/nix/networking/mail.nix

@@ -0,0 +1,26 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+let
+  inherit (lib) mkIf mkOption types;
+in
+{
+  options.smayzy.mail.enable = mkOption {
+    type = types.bool;
+    default = false;
+    description = "enables neomut isync and msmtp";
+  };
+
+  config = mkIf config.smayzy.mail.enable {
+    environment.systemPackages = with pkgs; [
+      neomutt
+      isync
+      msmtp
+      pass
+    ];
+    programs.gnupg.agent.enable = true;
+  };
+}

modules/nix/networking/qbittorrent.nix

@@ -1,20 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-let
-  inherit (lib) mkIf mkOption types;
-in
-{
-  options.smayzy.qbittorrent.enable = mkOption {
-    type = types.bool;
-    default = false;
-    description = "qbittorrent";
-  };
-
-  config = mkIf config.smayzy.qbittorrent.enable {
-    environment.systemPackages = with pkgs; [ qbittorrent ];
-  };
-}

modules/nix/networking/wireshark.nix

@@ -1,21 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-let
-  inherit (lib) mkIf mkOption types;
-in
-{
-  options.smayzy.wireshark.enable = mkOption {
-    type = types.bool;
-    default = false;
-    description = "wireshark";
-  };
-
-  config = mkIf config.smayzy.wireshark.enable {
-    programs.wireshark.enable = true;
-    environment.systemPackages = with pkgs; [ wireshark ];
-  };
-}

modules/nix/office/aegisub.nix

@@ -1,22 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-let
-  inherit (lib) mkIf mkOption types;
-in
-{
-  options.smayzy.aegisub.enable = mkOption {
-    type = types.bool;
-    default = false;
-    description = "aegisub";
-  };
-
-  config = mkIf config.smayzy.aegisub.enable {
-    environment.systemPackages = with pkgs; [
-      aegisub
-    ];
-  };
-}

modules/nix/office/bitwarden.nix

@@ -1,22 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-let
-  inherit (lib) mkIf mkOption types;
-in
-{
-  options.smayzy.bitwarden.enable = mkOption {
-    type = types.bool;
-    default = false;
-    description = "bitwarden";
-  };
-
-  config = mkIf config.smayzy.bitwarden.enable {
-    environment.systemPackages = with pkgs; [
-      bitwarden-desktop
-    ];
-  };
-}

modules/nix/office/blender.nix

@@ -1,22 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-let
-  inherit (lib) mkIf mkOption types;
-in
-{
-  options.smayzy.blender.enable = mkOption {
-    type = types.bool;
-    default = false;
-    description = "blender";
-  };
-
-  config = mkIf config.smayzy.blender.enable {
-    environment.systemPackages = with pkgs; [
-      blender
-    ];
-  };
-}

modules/nix/office/default.nix

@@ -1,13 +1,6 @@
 { ... }:
 {
   imports = [
-    ./aegisub.nix
-    ./bitwarden.nix
-    ./blender.nix
-    ./inkscape.nix
-    ./kdenlive.nix
-    ./komikku.nix
-    ./obsidian.nix
     ./office.nix
   ];
 }

modules/nix/office/inkscape.nix

@@ -1,22 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-let
-  inherit (lib) mkIf mkOption types;
-in
-{
-  options.smayzy.inkscape.enable = mkOption {
-    type = types.bool;
-    default = false;
-    description = "inkscape";
-  };
-
-  config = mkIf config.smayzy.inkscape.enable {
-    environment.systemPackages = with pkgs; [
-      inkscape
-    ];
-  };
-}

modules/nix/office/kdenlive.nix

@@ -1,22 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-let
-  inherit (lib) mkIf mkOption types;
-in
-{
-  options.smayzy.kdenlive.enable = mkOption {
-    type = types.bool;
-    default = false;
-    description = "kdenlive";
-  };
-
-  config = mkIf config.smayzy.kdenlive.enable {
-    environment.systemPackages = with pkgs; [
-      kdePackages.kdenlive
-    ];
-  };
-}

modules/nix/office/komikku.nix

@@ -1,22 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-let
-  inherit (lib) mkIf mkOption types;
-in
-{
-  options.smayzy.komikku.enable = mkOption {
-    type = types.bool;
-    default = false;
-    description = "komikku";
-  };
-
-  config = mkIf config.smayzy.komikku.enable {
-    environment.systemPackages = with pkgs; [
-      komikku
-    ];
-  };
-}

modules/nix/office/obsidian.nix

@@ -1,22 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-let
-  inherit (lib) mkIf mkOption types;
-in
-{
-  options.smayzy.obsidian.enable = mkOption {
-    type = types.bool;
-    default = false;
-    description = "obsidian";
-  };
-
-  config = mkIf config.smayzy.obsidian.enable {
-    environment.systemPackages = with pkgs; [
-      obsidian
-    ];
-  };
-}

modules/nix/wm/hyprland.nix

@@ -21,7 +21,7 @@ in
     };
 
     xdg.portal.enable = true;
-    xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
+    xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-hyprland ];
 
     fonts.packages = with pkgs; [ nerd-fonts.jetbrains-mono ];
 
@@ -41,6 +41,8 @@ in
       grim
       slurp
       mako
+      kdePackages.dolphin
+      brightnessctl
     ];
   };
 }

overlays/default.nix

@@ -1,3 +1,4 @@
 {
   fix-jdk8 = import ./fix-jdk8.nix;
+  freecad = import ./freecad.nix;
 }

overlays/freecad.nix

@@ -0,0 +1,12 @@
+final: prev: {
+  smayzy-freecad-x11-fix = prev.stdenv.mkDerivation {
+    name = "smayzy-freecad-x11-fix";
+    buildInputs = [ prev.makeWrapper ];
+    installPhase = ''
+      mkdir -p $out/bin
+      wrapProgram ${prev.freecad}/bin/FreeCAD \
+        --set QT_QPA_PLATFORM xcb \
+        --prefix PATH : ${prev.stdenv.cc.cc}/bin
+    '';
+  };
+}