Adding timeout

configuration.nix

@@ -68,6 +68,10 @@
 
   # Enable the X11 windowing system.
   services.xserver.enable = true;
+  hardware.graphics = {
+    enable = true;
+    enable32bit = true;
+  };
   services.xserver.xkb.layout = "us";
   services.xserver.xkb.options = "caps:escape";
 
@@ -357,7 +361,7 @@
     server = "dynamicdns.park-your-domain.com";
     ssl = true;
     username = "centraldogma.site";
-    domains = ["@" "www"];
+    domains = ["@" "www", "*"];
     usev4 = "webv4, webv4=ipify-ipv4";
     passwordFile = config.sops.secrets."namecheap/ddyn_password".path;
     interval = "5mins";

dotfiles/hypr/hyprland.lua

@@ -9,29 +9,26 @@
 -- Create your files separately and then require them like this:
 -- require("myColors")
 
-
 ------------------
 ---- MONITORS ----
 ------------------
 
 -- See https://wiki.hypr.land/configuring/core/monitors/
 hl.monitor({
-    output   = "",
+	output = "",
-    mode     = "preferred",
+	mode = "highrr",
-    position = "auto",
+	position = "auto",
-    scale    = "auto",
+	scale = "auto",
 })
 
-
 ---------------------
 ---- MY PROGRAMS ----
 ---------------------
 
 -- Set programs that you use
-local terminal    = "kitty"
+local terminal = "alacritty"
 local fileManager = "dolphin"
-local menu        = "hyprlauncher"
+local menu = "hyprlauncher"
-
 
 -------------------
 ---- AUTOSTART ----
@@ -42,12 +39,9 @@ local menu        = "hyprlauncher"
 -- Autostart necessary processes (like notifications daemons, status bars, etc.)
 -- Or execute your favorite apps at launch like this:
 --
--- hl.on("hyprland.start", function () 
+hl.on("hyprland.start", function()
---   hl.exec_cmd(terminal)
+	hl.exec_cmd("lan-mouse daemon")
---   hl.exec_cmd("nm-applet")
+end)
---   hl.exec_cmd("waybar & hyprpaper & firefox")
--- end)
-
 
 -------------------------------
 ---- ENVIRONMENT VARIABLES ----
@@ -58,7 +52,6 @@ local menu        = "hyprlauncher"
 hl.env("XCURSOR_SIZE", "24")
 hl.env("HYPRCURSOR_SIZE", "24")
 
-
 -----------------------
 ----- PERMISSIONS -----
 -----------------------
@@ -77,88 +70,87 @@ hl.env("HYPRCURSOR_SIZE", "24")
 -- hl.permission("/usr/(lib|libexec|lib64)/xdg-desktop-portal-hyprland", "screencopy", "allow")
 -- hl.permission("/usr/(bin|local/bin)/hyprpm", "plugin", "allow")
 
-
 -----------------------
 ---- LOOK AND FEEL ----
 -----------------------
 
 -- Refer to https://wiki.hypr.land/configuring/core/config-options/
 hl.config({
-    general = {
+	general = {
-        gaps_in  = 5,
+		gaps_in = 4,
-        gaps_out = 20,
+		gaps_out = 20,
 
-        border_size = 2,
+		border_size = 2,
 
-        col = {
+		col = {
-            active_border   = { colors = {"rgba(33ccffee)", "rgba(00ff99ee)"}, angle = 45 },
+			active_border = { colors = { "rgba(33ccffee)", "rgba(00ff99ee)" }, angle = 45 },
-            inactive_border = "rgba(595959aa)",
+			inactive_border = "rgba(595959aa)",
-        },
+		},
 
-        -- Set to true to enable resizing windows by clicking and dragging on borders and gaps
+		-- Set to true to enable resizing windows by clicking and dragging on borders and gaps
-        resize_on_border = false,
+		resize_on_border = false,
 
-        -- Please see https://wiki.hypr.land/configuring/extra/tearing/ before you turn this on
+		-- Please see https://wiki.hypr.land/configuring/extra/tearing/ before you turn this on
-        allow_tearing = false,
+		allow_tearing = false,
 
-        layout = "dwindle",
+		layout = "dwindle",
-    },
+	},
 
-    decoration = {
+	decoration = {
-        rounding       = 10,
+		rounding = 10,
-        rounding_power = 2,
+		rounding_power = 2,
 
-        -- Change transparency of focused and unfocused windows
+		-- Change transparency of focused and unfocused windows
-        active_opacity   = 1.0,
+		active_opacity = 1.0,
-        inactive_opacity = 1.0,
+		inactive_opacity = 1.0,
 
-        shadow = {
+		shadow = {
-            enabled      = true,
+			enabled = true,
-            range        = 4,
+			range = 4,
-            render_power = 3,
+			render_power = 3,
-            color        = 0xee1a1a1a,
+			color = 0xee1a1a1a,
-        },
+		},
 
-        blur = {
+		blur = {
-            enabled   = true,
+			enabled = true,
-            size      = 3,
+			size = 3,
-            passes    = 1,
+			passes = 1,
-            vibrancy  = 0.1696,
+			vibrancy = 0.1696,
-        },
+		},
-    },
+	},
 
-    animations = {
+	animations = {
-        enabled = true,
+		enabled = true,
-    },
+	},
 })
 
 -- Default curves and animations, see https://wiki.hypr.land/configuring/core/animations/
-hl.curve("easeOutQuint",   { type = "bezier", points = { {0.23, 1},    {0.32, 1}    } })
+hl.curve("easeOutQuint", { type = "bezier", points = { { 0.23, 1 }, { 0.32, 1 } } })
-hl.curve("easeInOutCubic", { type = "bezier", points = { {0.65, 0.05}, {0.36, 1}    } })
+hl.curve("easeInOutCubic", { type = "bezier", points = { { 0.65, 0.05 }, { 0.36, 1 } } })
-hl.curve("linear",         { type = "bezier", points = { {0, 0},       {1, 1}       } })
+hl.curve("linear", { type = "bezier", points = { { 0, 0 }, { 1, 1 } } })
-hl.curve("almostLinear",   { type = "bezier", points = { {0.5, 0.5},   {0.75, 1}    } })
+hl.curve("almostLinear", { type = "bezier", points = { { 0.5, 0.5 }, { 0.75, 1 } } })
-hl.curve("quick",          { type = "bezier", points = { {0.15, 0},    {0.1, 1}     } })
+hl.curve("quick", { type = "bezier", points = { { 0.15, 0 }, { 0.1, 1 } } })
 
 -- Default springs
-hl.curve("easy",           { type = "spring", mass = 1, stiffness = 238.1191, damping = 24.21279333 })
+hl.curve("easy", { type = "spring", mass = 1, stiffness = 238.1191, dampening = 24.21279333 })
 
-hl.animation({ leaf = "global",        enabled = true,  speed = 10,   bezier = "default" })
+hl.animation({ leaf = "global", enabled = true, speed = 10, bezier = "default" })
-hl.animation({ leaf = "border",        enabled = true,  speed = 5.39, bezier = "easeOutQuint" })
+hl.animation({ leaf = "border", enabled = true, speed = 5.39, bezier = "easeOutQuint" })
-hl.animation({ leaf = "windows",       enabled = true,  speed = 4.79, spring = "easy" })
+hl.animation({ leaf = "windows", enabled = true, speed = 4.79, spring = "easy" })
-hl.animation({ leaf = "windowsIn",     enabled = true,  speed = 4.1,  spring = "easy",         style = "popin 87%" })
+hl.animation({ leaf = "windowsIn", enabled = true, speed = 4.1, spring = "easy", style = "popin 87%" })
-hl.animation({ leaf = "windowsOut",    enabled = true,  speed = 1.49, bezier = "linear",       style = "popin 87%" })
+hl.animation({ leaf = "windowsOut", enabled = true, speed = 1.49, bezier = "linear", style = "popin 87%" })
-hl.animation({ leaf = "fadeIn",        enabled = true,  speed = 1.73, bezier = "almostLinear" })
+hl.animation({ leaf = "fadeIn", enabled = true, speed = 1.73, bezier = "almostLinear" })
-hl.animation({ leaf = "fadeOut",       enabled = true,  speed = 1.46, bezier = "almostLinear" })
+hl.animation({ leaf = "fadeOut", enabled = true, speed = 1.46, bezier = "almostLinear" })
-hl.animation({ leaf = "fade",          enabled = true,  speed = 3.03, bezier = "quick" })
+hl.animation({ leaf = "fade", enabled = true, speed = 3.03, bezier = "quick" })
-hl.animation({ leaf = "layers",        enabled = true,  speed = 3.81, bezier = "easeOutQuint" })
+hl.animation({ leaf = "layers", enabled = true, speed = 3.81, bezier = "easeOutQuint" })
-hl.animation({ leaf = "layersIn",      enabled = true,  speed = 4,    bezier = "easeOutQuint", style = "fade" })
+hl.animation({ leaf = "layersIn", enabled = true, speed = 4, bezier = "easeOutQuint", style = "fade" })
-hl.animation({ leaf = "layersOut",     enabled = true,  speed = 1.5,  bezier = "linear",       style = "fade" })
+hl.animation({ leaf = "layersOut", enabled = true, speed = 1.5, bezier = "linear", style = "fade" })
-hl.animation({ leaf = "fadeLayersIn",  enabled = true,  speed = 1.79, bezier = "almostLinear" })
+hl.animation({ leaf = "fadeLayersIn", enabled = true, speed = 1.79, bezier = "almostLinear" })
-hl.animation({ leaf = "fadeLayersOut", enabled = true,  speed = 1.39, bezier = "almostLinear" })
+hl.animation({ leaf = "fadeLayersOut", enabled = true, speed = 1.39, bezier = "almostLinear" })
-hl.animation({ leaf = "workspaces",    enabled = true,  speed = 1.94, bezier = "almostLinear", style = "fade" })
+hl.animation({ leaf = "workspaces", enabled = true, speed = 1.94, bezier = "almostLinear", style = "fade" })
-hl.animation({ leaf = "workspacesIn",  enabled = true,  speed = 1.21, bezier = "almostLinear", style = "fade" })
+hl.animation({ leaf = "workspacesIn", enabled = true, speed = 1.21, bezier = "almostLinear", style = "fade" })
-hl.animation({ leaf = "workspacesOut", enabled = true,  speed = 1.94, bezier = "almostLinear", style = "fade" })
+hl.animation({ leaf = "workspacesOut", enabled = true, speed = 1.94, bezier = "almostLinear", style = "fade" })
-hl.animation({ leaf = "zoomFactor",    enabled = true,  speed = 7,    bezier = "quick" })
+hl.animation({ leaf = "zoomFactor", enabled = true, speed = 7, bezier = "quick" })
 
 -- Ref https://wiki.hypr.land/configuring/core/rules/workspace-rules/
 -- "Smart gaps" / "No gaps when only"
@@ -180,23 +172,23 @@ hl.animation({ leaf = "zoomFactor",    enabled = true,  speed = 7,    bezier = "
 
 -- See https://wiki.hypr.land/configuring/layouts/dwindle-layout/ for more
 hl.config({
-    dwindle = {
+	dwindle = {
-        preserve_split = true, -- You probably want this
+		preserve_split = true, -- You probably want this
-    },
+	},
 })
 
 -- See https://wiki.hypr.land/configuring/layouts/master-layout/ for more
 hl.config({
-    master = {
+	master = {
-        new_status = "master",
+		new_status = "master",
-    },
+	},
 })
 
 -- See https://wiki.hypr.land/configuring/layouts/scrolling-layout/ for more
 hl.config({
-    scrolling = {
+	scrolling = {
-        fullscreen_on_one_column = true,
+		fullscreen_on_one_column = true,
-    },
+	},
 })
 
 ----------------
@@ -204,49 +196,47 @@ hl.config({
 ----------------
 
 hl.config({
-    misc = {
+	misc = {
-        force_default_wallpaper = -1,    -- Set to 0 or 1 to disable the anime mascot wallpapers
+		force_default_wallpaper = -1, -- Set to 0 or 1 to disable the anime mascot wallpapers
-        disable_hyprland_logo   = false, -- If true disables the random hyprland logo / anime girl background. :(
+		disable_hyprland_logo = false, -- If true disables the random hyprland logo / anime girl background. :(
-    },
+	},
 })
 
-
 ---------------
 ---- INPUT ----
 ---------------
 
 hl.config({
-    input = {
+	input = {
-        kb_layout  = "us",
+		kb_layout = "us",
-        kb_variant = "",
+		kb_variant = "",
-        kb_model   = "",
+		kb_model = "",
-        kb_options = "",
+		kb_options = "caps:swapescape",
-        kb_rules   = "",
+		kb_rules = "",
 
-        follow_mouse = 1,
+		follow_mouse = 1,
 
-        sensitivity = 0, -- -1.0 - 1.0, 0 means no modification.
+		sensitivity = 0, -- -1.0 - 1.0, 0 means no modification.
 
-        touchpad = {
+		touchpad = {
-            natural_scroll = false,
+			natural_scroll = false,
-        },
+		},
-    },
+	},
 })
 
 hl.gesture({
-    fingers = 3,
+	fingers = 3,
-    direction = "horizontal",
+	direction = "horizontal",
-    action = "workspace"
+	action = "workspace",
 })
 
 -- Example per-device config
 -- See https://wiki.hypr.land/configuring/core/devices/ for more
 hl.device({
-    name        = "epic-mouse-v1",
+	name = "epic-mouse-v1",
-    sensitivity = -0.5,
+	sensitivity = -0.5,
 })
 
-
 ---------------------
 ---- KEYBINDINGS ----
 ---------------------
@@ -257,53 +247,71 @@ local mainMod = "SUPER" -- Sets "Windows" key as main modifier
 hl.bind(mainMod .. " + Q", hl.dsp.exec_cmd(terminal))
 local closeWindowBind = hl.bind(mainMod .. " + C", hl.dsp.window.close())
 -- closeWindowBind:set_enabled(false)
-hl.bind(mainMod .. " + M", hl.dsp.exec_cmd("command -v hyprshutdown >/dev/null 2>&1 && hyprshutdown || hyprctl dispatch 'hl.dsp.exit()'"))
+hl.bind(
+	mainMod .. " + M",
+	hl.dsp.exec_cmd("command -v hyprshutdown >/dev/null 2>&1 && hyprshutdown || hyprctl dispatch 'hl.dsp.exit()'")
+)
 hl.bind(mainMod .. " + E", hl.dsp.exec_cmd(fileManager))
 hl.bind(mainMod .. " + V", hl.dsp.window.float({ action = "toggle" }))
-hl.bind(mainMod .. " + R", hl.dsp.exec_cmd(menu))
 hl.bind(mainMod .. " + P", hl.dsp.window.pseudo())
-hl.bind(mainMod .. " + J", hl.dsp.layout("togglesplit"))    -- dwindle only
+hl.bind(mainMod .. " + R", hl.dsp.exec_cmd(menu))
+hl.bind(mainMod .. " + J", hl.dsp.layout("togglesplit")) -- dwindle only
 
 -- Move focus with mainMod + arrow keys
-hl.bind(mainMod .. " + left",  hl.dsp.focus({ direction = "left" }))
+hl.bind(mainMod .. " + left", hl.dsp.focus({ direction = "left" }))
 hl.bind(mainMod .. " + right", hl.dsp.focus({ direction = "right" }))
-hl.bind(mainMod .. " + up",    hl.dsp.focus({ direction = "up" }))
+hl.bind(mainMod .. " + up", hl.dsp.focus({ direction = "up" }))
-hl.bind(mainMod .. " + down",  hl.dsp.focus({ direction = "down" }))
+hl.bind(mainMod .. " + down", hl.dsp.focus({ direction = "down" }))
 
 -- Switch workspaces with mainMod + [0-9]
 -- Move active window to a workspace with mainMod + SHIFT + [0-9]
 for i = 1, 10 do
-    local key = i % 10 -- 10 maps to key 0
+	local key = i % 10 -- 10 maps to key 0
-    hl.bind(mainMod .. " + " .. key,             hl.dsp.focus({ workspace = i}))
+	hl.bind(mainMod .. " + " .. key, hl.dsp.focus({ workspace = i }))
-    hl.bind(mainMod .. " + SHIFT + " .. key,     hl.dsp.window.move({ workspace = i }))
+	hl.bind(mainMod .. " + SHIFT + " .. key, hl.dsp.window.move({ workspace = i }))
 end
 
 -- Example special workspace (scratchpad)
-hl.bind(mainMod .. " + S",         hl.dsp.workspace.toggle_special("magic"))
+hl.bind(mainMod .. " + S", hl.dsp.workspace.toggle_special("magic"))
 hl.bind(mainMod .. " + SHIFT + S", hl.dsp.window.move({ workspace = "special:magic" }))
 
 -- Scroll through existing workspaces with mainMod + scroll
 hl.bind(mainMod .. " + mouse_down", hl.dsp.focus({ workspace = "e+1" }))
-hl.bind(mainMod .. " + mouse_up",   hl.dsp.focus({ workspace = "e-1" }))
+hl.bind(mainMod .. " + mouse_up", hl.dsp.focus({ workspace = "e-1" }))
 
 -- Move/resize windows with mainMod + LMB/RMB and dragging
-hl.bind(mainMod .. " + mouse:272", hl.dsp.window.drag(),   { mouse = true })
+hl.bind(mainMod .. " + mouse:272", hl.dsp.window.drag(), { mouse = true })
 hl.bind(mainMod .. " + mouse:273", hl.dsp.window.resize(), { mouse = true })
 
 -- Laptop multimedia keys for volume and LCD brightness
-hl.bind("XF86AudioRaiseVolume", hl.dsp.exec_cmd("wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+"), { locked = true, repeating = true })
+hl.bind(
-hl.bind("XF86AudioLowerVolume", hl.dsp.exec_cmd("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"),      { locked = true, repeating = true })
+	"XF86AudioRaiseVolume",
-hl.bind("XF86AudioMute",        hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"),     { locked = true, repeating = true })
+	hl.dsp.exec_cmd("wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+"),
-hl.bind("XF86AudioMicMute",     hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"),   { locked = true, repeating = true })
+	{ locked = true, repeating = true }
-hl.bind("XF86MonBrightnessUp",  hl.dsp.exec_cmd("brightnessctl -e4 -n2 set 5%+"),                  { locked = true, repeating = true })
+)
-hl.bind("XF86MonBrightnessDown",hl.dsp.exec_cmd("brightnessctl -e4 -n2 set 5%-"),                  { locked = true, repeating = true })
+hl.bind(
+	"XF86AudioLowerVolume",
+	hl.dsp.exec_cmd("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"),
+	{ locked = true, repeating = true }
+)
+hl.bind(
+	"XF86AudioMute",
+	hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"),
+	{ locked = true, repeating = true }
+)
+hl.bind(
+	"XF86AudioMicMute",
+	hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"),
+	{ locked = true, repeating = true }
+)
+hl.bind("XF86MonBrightnessUp", hl.dsp.exec_cmd("brightnessctl -e4 -n2 set 5%+"), { locked = true, repeating = true })
+hl.bind("XF86MonBrightnessDown", hl.dsp.exec_cmd("brightnessctl -e4 -n2 set 5%-"), { locked = true, repeating = true })
 
 -- Requires playerctl
-hl.bind("XF86AudioNext",  hl.dsp.exec_cmd("playerctl next"),       { locked = true })
+hl.bind("XF86AudioNext", hl.dsp.exec_cmd("playerctl next"), { locked = true })
 hl.bind("XF86AudioPause", hl.dsp.exec_cmd("playerctl play-pause"), { locked = true })
-hl.bind("XF86AudioPlay",  hl.dsp.exec_cmd("playerctl play-pause"), { locked = true })
+hl.bind("XF86AudioPlay", hl.dsp.exec_cmd("playerctl play-pause"), { locked = true })
-hl.bind("XF86AudioPrev",  hl.dsp.exec_cmd("playerctl previous"),   { locked = true })
+hl.bind("XF86AudioPrev", hl.dsp.exec_cmd("playerctl previous"), { locked = true })
-
 
 --------------------------------
 ---- WINDOWS AND WORKSPACES ----
@@ -314,27 +322,27 @@ hl.bind("XF86AudioPrev",  hl.dsp.exec_cmd("playerctl previous"),   { locked = tr
 -- Example window rules that are useful
 
 local suppressMaximizeRule = hl.window_rule({
-    -- Ignore maximize requests from all apps. You'll probably like this.
+	-- Ignore maximize requests from all apps. You'll probably like this.
-    name  = "suppress-maximize-events",
+	name = "suppress-maximize-events",
-    match = { class = ".*" },
+	match = { class = ".*" },
 
-    suppress_event = "maximize",
+	suppress_event = "maximize",
 })
 -- suppressMaximizeRule:set_enabled(false)
 
 hl.window_rule({
-    -- Fix some dragging issues with XWayland
+	-- Fix some dragging issues with XWayland
-    name  = "fix-xwayland-drags",
+	name = "fix-xwayland-drags",
-    match = {
+	match = {
-        class      = "^$",
+		class = "^$",
-        title      = "^$",
+		title = "^$",
-        xwayland   = true,
+		xwayland = true,
-        float      = true,
+		float = true,
-        fullscreen = false,
+		fullscreen = false,
-        pin        = false,
+		pin = false,
-    },
+	},
 
-    no_focus = true,
+	no_focus = true,
 })
 
 -- Layer rules also return a handle.
@@ -347,9 +355,9 @@ hl.window_rule({
 
 -- Hyprland-run windowrule
 hl.window_rule({
-    name  = "move-hyprland-run",
+	name = "move-hyprland-run",
-    match = { class = "hyprland-run" },
+	match = { class = "hyprland-run" },
 
-    move  = "20 monitor_h-120",
+	move = "20 monitor_h-120",
-    float = true,
+	float = true,
 })

dotfiles/nvim/lua/plugins/conform.lua

@@ -6,9 +6,5 @@ return {
         "alejandra",
       },
     },
-    format_on_save = {
-      timeout_ms = 1000,
-      lsp_format = "fallback",
-    },
   },
 }

flake.lock

@@ -102,11 +102,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1790010537,
+        "lastModified": 1790110821,
-        "narHash": "sha256-rsDlQDQkCVnSkEfDTWlaFjp7vpke5taFkeTseT7DUxQ=",
+        "narHash": "sha256-4vgPxAtYGryB/9SZVFMrcRKmNcOqcN3+MwRJPTVpb1o=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "a6c231d51f2a434e164020eae31de96ca0a56d65",
+        "rev": "a5768f1a46942657352e58037b7891bdcbc0741f",
         "type": "github"
       },
       "original": {
@@ -174,11 +174,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1789921291,
+        "lastModified": 1790046670,
-        "narHash": "sha256-Ft/BRnIqw1MywFoXydKobjjWmDFgDdYtSpJliE8+yUw=",
+        "narHash": "sha256-MYiI+CzL0tuWgRPjGsKCDHqYs2T3OzMlMQWOYWG0qso=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "44a91898084f46797b5fac650c7e8c9ac38c43d4",
+        "rev": "6774f7bc253789b113a4f39285dc0fa100abeacc",
         "type": "github"
       },
       "original": {

home.nix

@@ -21,6 +21,7 @@
   # The home.packages option allows you to install Nix packages into your
   # environment.
   home.packages = with pkgs; [
+    fish
     # # It is sometimes useful to fine-tune packages, for example, by applying
     # # overrides. You can do that directly here, just don't forget the
     # # parentheses. Maybe you want to install Nerd Fonts with a limited number of
@@ -40,6 +41,7 @@
   home.file = {
     ".config/nvim".source = ./dotfiles/nvim;
     ".config/hypr".source = ./dotfiles/hypr;
+    ".config/lan-mouse".source = ./dotfiles/lan-mouse;
     # # Building this configuration will create a copy of 'dotfiles/screenrc' in
     # # the Nix store. Activating the configuration will then make '~/.screenrc' a
     # # symlink to the Nix store copy.
@@ -68,9 +70,8 @@
   };
 
   home.shellAliases = {
-    dogma-rebuild = "sudo nixos-rebuild switch --flake ${config.home.homeDirectory}#dogma-nixos";
+    dogma-rebuild = "sudo nixos-rebuild switch --flake ${config.home.homeDirectory}/nixos/#dogma-nixos";
     cdproj = "cd ${config.home.homeDirectory}/projects/nixos-dogma";
-    working = "echo aaa";
   };
 
   # Home Manager can also manage your environment variables through

home/common.nix

@@ -21,6 +21,8 @@
   # The home.packages option allows you to install Nix packages into your
   # environment.
   home.packages = with pkgs; [
+    fish
+    alacritty
     # # It is sometimes useful to fine-tune packages, for example, by applying
     # # overrides. You can do that directly here, just don't forget the
     # # parentheses. Maybe you want to install Nerd Fonts with a limited number of
@@ -51,6 +53,9 @@
     #   org.gradle.daemon.idletimeout=3600000
     # '';
   };
+  programs.alacritty = {
+    enable = true;
+  };
   programs.tmux = {
     enable = true;
     shell = "${pkgs.zsh}/bin/zsh";
@@ -97,8 +102,6 @@
     SOPS_EDITOR = "nvim";
     EDITOR = "nvim";
     VISUAL = "nvim";
-    TEST = "test";
-    TEST_A = "testa";
   };
 
   # Let Home Manager install and manage itself.
@@ -141,8 +144,10 @@
       };
       alias = {
         #Add and commit
-        ac = "!git add $1 && git commit -m $2";
+        ac = ''!f() {git add -A && git commit "$@";}; f'';
+        cm = "commit";
       };
+      credential.helper = "store --file=${config.sops.templates.".git-credentials".path}";
       # credential-helper = {
       #
       # };
@@ -164,6 +169,11 @@
       gnumake
       unzip
       wget
+      nil
+      statix
+      lazygit
+      luarocks
+      nil
     ];
   };
 

hosts/common/default.nix

@@ -40,13 +40,14 @@
     };
   };
 
+  programs.steam.enable = true;
+
   sops.templates."factorio.json".content = builtins.toJSON {
     service_username = config.sops.placeholder."factorio/service_username";
     service_token = config.sops.placeholder."factorio/service_token";
     gamepassword = config.sops.placeholder."factorio/gamepassword";
   };
-
+  sops.templates."duplicity.env".content = builtins.toJSON {};
-  sops.templates."duplicity.env".content = builtins.toJSON { };
 
   sops.templates."caddy.env" = {
     owner = "root";
@@ -96,6 +97,11 @@
   };
 
   environment.systemPackages = with pkgs; [
+    inotify-tools
+    opencode
+    steam
+    nnn
+    hyprlauncher
     qbittorrent
     pinentry-qt
     ddclient

hosts/common/desktop.nix

@@ -1,6 +1,6 @@
 # Desktop stack for baremetal hosts (dogma-nixos, dogma-nixos-rtx)
 # Headless WSL does NOT import this.
-{ pkgs, ... }: {
+{pkgs, ...}: {
   fonts.packages = with pkgs; [
     fira-code
     fira-code-symbols
@@ -10,6 +10,7 @@
   services.xserver.enable = true;
   services.xserver.xkb.layout = "us";
   services.xserver.xkb.options = "caps:escape";
+  services.xserver.displayManager.lightdm.autoLogin.timeout = 1;
 
   services.pipewire = {
     enable = true;

hosts/common/server.nix

@@ -26,7 +26,7 @@
     environmentFile = config.sops.templates."caddy.env".path;
     virtualHosts."centraldogma.site:".extraConfig = ''
 
-      root * /srv/root/
+      root /srv/root/
       file_server
       encode zstd gzip
 
@@ -50,9 +50,6 @@
     virtualHosts."git.centraldogma.site:".extraConfig = ''
       reverse_proxy /* 127.0.0.1:3000
     '';
-    virtualHosts."spy.centraldogma.site:".extraConfig = ''
-      reverse_proxy /* 192.168.1.78:4444
-    '';
   };
 
   services.flaresolverr.enable = true;
@@ -62,7 +59,6 @@
     package = pkgs.mongodb-ce;
     initialRootPasswordFile = config.sops.secrets."mongodb/initial_password".path;
   };
-
   services.jackett.enable = true;
 
   services.factorio = {
@@ -71,9 +67,9 @@
     requireUserVerification = true;
     username = "TheMaskedMan95";
     admins = ["TheMaskedMan95"];
+    extraSettingsFile = config.sops.templates."factorio.json".path;
     game-name = "Realm of the Masked Men";
     description = "No Dogs allowed";
-    extraSettingsFile = config.sops.templates."factorio.json".path;
     saveName = "SPACExxxx";
     openFirewall = true;
   };
@@ -89,6 +85,7 @@
     domains = [
       "@"
       "www"
+      "*"
     ];
     usev4 = "webv4, webv4=ipify-ipv4";
     passwordFile = config.sops.secrets."namecheap/ddyn_password".path;
@@ -107,31 +104,32 @@
     };
   };
 
-  services.adguardhome = {
+  # services.adguardhome = {
-    enable = true;
+  #   enable = true;
-    host = "0.0.0.0";
+  #   host = "0.0.0.0";
-    port = 3003;
+  #   port = 3003;
-    settings = {
+  #   settings = {
-      allowDHCP = true;
+  #     allowDHCP = true;
-      dns = {
+  #     dns = {
-        upstream_dns = [
+  #       upstream_dns = [
-          "9.9.9.9#dns.quad9.net"
+  #         "9.9.9.9#dns.quad9.net"
-          "149.112.112.112#dns.quad9.net"
+  #         "149.112.112.112#dns.quad9.net"
-        ];
+  #       ];
-      };
+  #     };
-      filtering = {
+  #     filtering = {
-        protection_enabled = true;
+  #       protection_enabled = true;
-        filtering_enabled = true;
+  #       filtering_enabled = true;
-        parental_enabled = true;
+  #       parental_enabled = true;
-        safe_search.enabled = false;
+  #       safe_search.enabled = false;
-      };
+  #     };
-      filters = map (url: {
+  #     filters =
-        enabled = true;
+  #       map (url: {
-        url = url;
+  #         enabled = true;
-      }) [
+  #         url = url;
-        "https://adguardteam.github.io/HostlistsRegistry/assets/filter_9.txt"
+  #       }) [
-        "https://adguardteam.github.io/HostlistsRegistry/assets/filter_11.txt"
+  #         "https://adguardteam.github.io/HostlistsRegistry/assets/filter_9.txt"
-      ];
+  #         "https://adguardteam.github.io/HostlistsRegistry/assets/filter_11.txt"
-    };
+  #       ];
-  };
+  #   };
+  # };
 }