From c4fd1a37c1936df2f77994345d944dadd54a4531 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Mon, 2 Dec 2024 23:41:00 +0100 Subject: [PATCH 01/23] chore: remove a lot of bloat :) --- modules/home/packages.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/modules/home/packages.nix b/modules/home/packages.nix index ba5e29e..b9c4459 100644 --- a/modules/home/packages.nix +++ b/modules/home/packages.nix @@ -14,27 +14,18 @@ lm_sensors # Show sensor outputs, i.e. temperatures yubikey-touch-detector # Display notification when YubiKey requires a headpat bitwarden-cli # Use Bitwarden as a CLI secrets manager - gajim # XMPP client - nheko # Matrix client - linuxKernel.packages.linux_hardened.v4l2loopback # Use A7ii as webcam # wikit # Wikipedia summaries from the terminal, not added to Nix yet # reader # Firefox reader mode but in the terminal, not added to Nix yet vimv # edit filenames in batch with $EDITOR pastel # generate, analyze, convert and manipulate colors glow # Render Markdown from the terminal htmlq # jq but for HTML - lemmeknow # Identify anything android-tools # ADB/Fastboot eva # Calculator - tofi # drun type launcher - # termpdfpy # Read PDFs from the terminal, errors out for now - anki-bin # Learn languages + anki-bin # Flashcards vimv # Bulk rename - audacity # Record audio stuff obs-studio # Record video stuff exiftool # Read exif data from CLI - pinta # "Paint.NET-like editor" - kdenlive # Video editor translate-shell # Google Translate but in the CLI wireguard-tools # VPN connections openresolv # required for wireguard-tools @@ -60,12 +51,10 @@ gitleaks # TODO: adds pre-commit hook libreoffice xfce.thunar - prismlauncher lunar-client - jdk ripgrep yt-dlp - wineWowPackages.wayland + # wineWowPackages.wayland # element-desktop # wayland version is very laggy for me spotify thunderbird From b0ba1ebcffa00fdab363b724c0cc80d727e8e6c2 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Thu, 5 Dec 2024 11:33:35 +0100 Subject: [PATCH 02/23] feat: adds spotify_player --- modules/home/packages.nix | 1 + modules/home/zsh.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/modules/home/packages.nix b/modules/home/packages.nix index b9c4459..9db97e6 100644 --- a/modules/home/packages.nix +++ b/modules/home/packages.nix @@ -57,6 +57,7 @@ # wineWowPackages.wayland # element-desktop # wayland version is very laggy for me spotify + spotify_player thunderbird neofetch nodejs_22 diff --git a/modules/home/zsh.nix b/modules/home/zsh.nix index c5c3108..d63ffa0 100644 --- a/modules/home/zsh.nix +++ b/modules/home/zsh.nix @@ -152,6 +152,7 @@ # ]; shellAliases = { + spt = "spotify_player"; convert = "magick"; ls = "eza -lh --git"; la = "eza -A --git"; From 8af26da6c247437de45dad261af6587863f22cfc Mon Sep 17 00:00:00 2001 From: Ahwx Date: Thu, 5 Dec 2024 12:58:32 +0100 Subject: [PATCH 03/23] fix: nginx for radicale --- modules/services/radicale.nix | 41 ++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/modules/services/radicale.nix b/modules/services/radicale.nix index a652fa1..bb5aa29 100644 --- a/modules/services/radicale.nix +++ b/modules/services/radicale.nix @@ -12,24 +12,25 @@ }; }; - # services.nginx = { - # enable = true; - # recommendedProxySettings = true; - # recommendedTlsSettings = true; - # virtualHosts = { - # "calendar.liv.town" = { - # forceSSL = true; - # enableACME = true; - # # locations."/radicale/" = { - # locations."/" = { - # proxyPass = "http://127.0.0.1:5232/"; - # extraConfig = '' - # # proxy_set_header X-Script-Name /radicale; - # proxy_set_header X-Script-Name /; - # proxy_pass_header Authorization; - # ''; - # }; - # }; - # }; - # }; + services.nginx = { + enable = true; + recommendedProxySettings = true; + recommendedTlsSettings = true; + virtualHosts = { + "calendar.liv.town" = { + forceSSL = true; + sslCertificate = "/var/lib/acme/liv.town/cert.pem"; + sslCertificateKey = "/var/lib/acme/liv.town/key.pem"; + # locations."/radicale/" = { + locations."/" = { + proxyPass = "http://127.0.0.1:5232/"; + # extraConfig = '' + # # proxy_set_header X-Script-Name /radicale; + # # proxy_set_header X-Script-Name /; + # proxy_pass_header Authorization; + # ''; + }; + }; + }; + }; } From 61b32a87f432c2c0a2deb33298a3b24ed9ef34ef Mon Sep 17 00:00:00 2001 From: Ahwx Date: Thu, 5 Dec 2024 12:58:58 +0100 Subject: [PATCH 04/23] feat: enable radicale for violet --- modules/services/violet.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/services/violet.nix b/modules/services/violet.nix index f7f1d7f..16806a5 100644 --- a/modules/services/violet.nix +++ b/modules/services/violet.nix @@ -10,6 +10,8 @@ ++ [(import ./nginx.nix)] ++ [(import ./komga.nix)] ++ [(import ./frp.nix)] + ++ [(import ./radicale.nix)] + # ++ [(import ./jitsi-meet.nix)] # ++ [(import ./nextcloud.nix)] ++ [(import ./matrix/default.nix)]; # ++ [(import ./tmux.nix)]; From 5784692619cbcae27b02b570d9ee5273f9afb919 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Thu, 5 Dec 2024 12:59:06 +0100 Subject: [PATCH 05/23] flake: update --- flake.lock | 118 +++++++++++++++++++++++++++++++++-------------------- 1 file changed, 74 insertions(+), 44 deletions(-) diff --git a/flake.lock b/flake.lock index bc6e6e7..364bd15 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1732650593, - "narHash": "sha256-/fDdm6O0ljOqmN+xlZMxy9NjhFfYxOPCLhCRw11diEA=", + "lastModified": 1733193102, + "narHash": "sha256-pTgxoor8N8K2DvvCkR5XbUsruvAhyrDMirhvx3SvpJs=", "owner": "KZDKM", "repo": "Hyprspace", - "rev": "55da6e2363d8298b54f3aba2d8cac8057163e2b7", + "rev": "13af97dc5cf68a552bff72e3a9960a24df9c248d", "type": "github" }, "original": { @@ -104,11 +104,11 @@ ] }, "locked": { - "lastModified": 1731774881, - "narHash": "sha256-1Dxryiw8u2ejntxrrv3sMtIE8WHKxmlN4KeH+uMGbmc=", + "lastModified": 1731959031, + "narHash": "sha256-TGcvIjftziC1CjuiHCzrYDwmOoSFYIhdiKmLetzB5L0=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "b31a6a4da8199ae3489057db7d36069a70749a56", + "rev": "4468981c1c50999f315baa1508f0e53c4ee70c52", "type": "github" }, "original": { @@ -119,11 +119,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1732947104, - "narHash": "sha256-AMVSa4H73IAp12Zwpa+2/mE9sFirxxg8gv6gDvADzQI=", + "lastModified": 1733001911, + "narHash": "sha256-uX/9m0TbdhEzuWA0muM5mI/AaWcLiDLjCCyu5Qr9MRk=", "owner": "catppuccin", "repo": "nix", - "rev": "7a6e695bbf6220af2b1a6941613d9df1160a32cd", + "rev": "a817009ebfd2cca7f70a77884e5098d0a8c83f8e", "type": "github" }, "original": { @@ -426,11 +426,11 @@ ] }, "locked": { - "lastModified": 1732884235, - "narHash": "sha256-r8j6R3nrvwbT1aUp4EPQ1KC7gm0pu9VcV1aNaB+XG6Q=", + "lastModified": 1733175814, + "narHash": "sha256-zFOtOaqjzZfPMsm1mwu98syv3y+jziAq5DfWygaMtLg=", "owner": "nix-community", "repo": "home-manager", - "rev": "819f682269f4e002884702b87e445c82840c68f2", + "rev": "bf23fe41082aa0289c209169302afd3397092f22", "type": "github" }, "original": { @@ -466,11 +466,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1730743354, - "narHash": "sha256-gU4NySYyXeAzVaF5bI6BKmj2CdgiwGFnuPjXUId3Dx0=", + "lastModified": 1733056338, + "narHash": "sha256-sp14z0mrqrtmouz1+bU4Jh8/0xi+xwQHF2l7mhGSSVU=", "owner": "hyprwm", "repo": "contrib", - "rev": "792f6b83dc719214e0e2a0b380c34f147b28ece2", + "rev": "d7c55140f1785b8d9fef351f1cd2a4c9e1eaa466", "type": "github" }, "original": { @@ -508,10 +508,40 @@ "type": "github" } }, + "hyprgraphics": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1733248371, + "narHash": "sha256-FFLJzFTyNhS7tBEEECx0B8Ye/bpmxhFVEKlECgMLc6c=", + "owner": "hyprwm", + "repo": "hyprgraphics", + "rev": "cc95e5babc6065bc3ab4cd195429a9900836ef13", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprgraphics", + "type": "github" + } + }, "hyprland": { "inputs": { "aquamarine": "aquamarine", "hyprcursor": "hyprcursor", + "hyprgraphics": "hyprgraphics", "hyprland-protocols": "hyprland-protocols", "hyprlang": "hyprlang", "hyprutils": "hyprutils", @@ -524,11 +554,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1732837919, - "narHash": "sha256-yoKm2+SDxjy783zTGwSWn3LGOO3SOmW5e7CObqFTz+E=", + "lastModified": 1733252304, + "narHash": "sha256-9AHjiMYZZ3b9GpNNA5QCfS1kS1f3Lq45bN9LbLBtVb8=", "ref": "refs/heads/main", - "rev": "8f83d29f00bfa89d1e8fe94b4dda98fe898b6b0e", - "revCount": 5504, + "rev": "320144ae7288fe23686935ebb235d9fe0c900862", + "revCount": 5510, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -626,11 +656,11 @@ ] }, "locked": { - "lastModified": 1731702627, - "narHash": "sha256-+JeO9gevnXannQxMfR5xzZtF4sYmSlWkX/BPmPx0mWk=", + "lastModified": 1732288281, + "narHash": "sha256-XTU9B53IjGeJiJ7LstOhuxcRjCOFkQFl01H78sT9Lg4=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "e911361a687753bbbdfe3b6a9eab755ecaf1d9e1", + "rev": "b26f33cc1c8a7fd5076e19e2cce3f062dca6351c", "type": "github" }, "original": { @@ -743,11 +773,11 @@ "umu": "umu" }, "locked": { - "lastModified": 1732758553, - "narHash": "sha256-divlhUduT0/t8D9k11Yd3Ah3xpr302vV1KXxIMb8I3M=", + "lastModified": 1733101372, + "narHash": "sha256-mkyyBVPj8SIc01zEBX3gZ2ATJj8Fb06nxDME7pDxYQo=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "effe1d54e23f430d3e803f63e9e47aba33acfb63", + "rev": "094b2c4ee459dd5d3d1611c919d59f26110053b0", "type": "github" }, "original": { @@ -758,11 +788,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1732483221, - "narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=", + "lastModified": 1733217105, + "narHash": "sha256-fc6jTzIwCIVWTX50FtW6AZpuukuQWSEbPiyg6ZRGWFY=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405", + "rev": "cceee0a31d2f01bcc98b2fbd591327c06a4ea4f9", "type": "github" }, "original": { @@ -877,11 +907,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1731890469, - "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=", + "lastModified": 1732997066, + "narHash": "sha256-9Vvu3a1ep1LB6F/kVE2hHH2HQzhSFtUyJYiJRkUkC4Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5083ec887760adfe12af64830a66807423a859a7", + "rev": "33b9d57c656e65a9c88c5f34e4eb00b83e2b0ca9", "type": "github" }, "original": { @@ -893,11 +923,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1732758367, - "narHash": "sha256-RzaI1RO0UXqLjydtz3GAXSTzHkpb/lLD1JD8a0W4Wpo=", + "lastModified": 1733212471, + "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fa42b5a5f401aab8a32bd33c9a4de0738180dc59", + "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", "type": "github" }, "original": { @@ -987,11 +1017,11 @@ }, "nur": { "locked": { - "lastModified": 1732961569, - "narHash": "sha256-d/yl5ewjzl7Ur98LJFmEky9pbyN6Zx42X5haBJ2V0Pw=", + "lastModified": 1733245290, + "narHash": "sha256-q0vf2tINCUKk7XPDSKMdzp96c+x3pWUxwl0Y10c+UxQ=", "owner": "nix-community", "repo": "NUR", - "rev": "6fac7ca63269695e7928ff742c9b752c183e21ca", + "rev": "1a776f27abb96c4563f290bc7cffdc8cd7755fdd", "type": "github" }, "original": { @@ -1034,11 +1064,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1731363552, - "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", + "lastModified": 1732021966, + "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", + "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", "type": "github" }, "original": { @@ -1203,11 +1233,11 @@ }, "locked": { "dir": "packaging/nix", - "lastModified": 1732337089, - "narHash": "sha256-dwFza03ETqrcmVGSCdgDDKTWKRgckpQ3vXkZRCYtM9g=", + "lastModified": 1733037609, + "narHash": "sha256-HkS24indfMaQbVZ+9GY5BHc+rqPvh8htF0rWYhvgPKI=", "ref": "refs/heads/main", - "rev": "f6a6af3191f5497d95d8f8aaa08826a45da199c4", - "revCount": 842, + "rev": "e559e2e50999093c3e837d33886f9e14e34ead0a", + "revCount": 863, "submodules": true, "type": "git", "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" From 4d55ad66c5d086ba7abfeb8e1c0f346618852304 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Sat, 7 Dec 2024 12:21:49 +0100 Subject: [PATCH 06/23] feat: remove cursor as it was offset --- modules/home/hyprland/config.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/home/hyprland/config.nix b/modules/home/hyprland/config.nix index eddf93e..1a074ab 100644 --- a/modules/home/hyprland/config.nix +++ b/modules/home/hyprland/config.nix @@ -28,18 +28,18 @@ color = "black"; }; }; - cursorTheme = { - name = "Bibata-Modern-Ice"; - package = pkgs.bibata-cursors; - size = 24; - }; + # cursorTheme = { + # name = "Bibata-Modern-Ice"; + # package = pkgs.bibata-cursors; + # size = 24; + # }; }; - home.pointerCursor = { - name = "Bibata-Modern-Ice"; - package = pkgs.bibata-cursors; - size = 24; - }; + # home.pointerCursor = { + # name = "Bibata-Modern-Ice"; + # package = pkgs.bibata-cursors; + # size = 24; + # }; # gtk = { # enable = true; From 826334c561d347b896f290b3c47f8884e916ce5d Mon Sep 17 00:00:00 2001 From: Ahwx Date: Sat, 7 Dec 2024 22:16:37 +0100 Subject: [PATCH 07/23] flake: update --- flake.lock | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/flake.lock b/flake.lock index 364bd15..5122f6c 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1733193102, - "narHash": "sha256-pTgxoor8N8K2DvvCkR5XbUsruvAhyrDMirhvx3SvpJs=", + "lastModified": 1733366913, + "narHash": "sha256-OL4XyCfmAH4KMobiKZI6pDaaZjaTMUfVpGLlNmt3+kI=", "owner": "KZDKM", "repo": "Hyprspace", - "rev": "13af97dc5cf68a552bff72e3a9960a24df9c248d", + "rev": "3107652c5390bfe5efa685722152c3f30e2cb153", "type": "github" }, "original": { @@ -29,11 +29,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1728796306, - "narHash": "sha256-X2pD05332WGbP7Ckx2Iw6HVW/Qewhno2WJwuiHIbBCk=", + "lastModified": 1733340944, + "narHash": "sha256-/4cZrvnK1m2seORcYP+pAKoziaCgFCIAOpdkYSLUcaQ=", "owner": "KZDKM", "repo": "Hyswipe", - "rev": "c26676af73d699077039e6d47593bd82d2ecbc07", + "rev": "001b5983ea372bc525c246c8280fd57176a2e0b7", "type": "github" }, "original": { @@ -426,11 +426,11 @@ ] }, "locked": { - "lastModified": 1733175814, - "narHash": "sha256-zFOtOaqjzZfPMsm1mwu98syv3y+jziAq5DfWygaMtLg=", + "lastModified": 1733389730, + "narHash": "sha256-KZMu4ddMll5khS0rYkJsVD0hVqjMNHlhTM3PCQar0Ag=", "owner": "nix-community", "repo": "home-manager", - "rev": "bf23fe41082aa0289c209169302afd3397092f22", + "rev": "65912bc6841cf420eb8c0a20e03df7cbbff5963f", "type": "github" }, "original": { @@ -554,11 +554,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1733252304, - "narHash": "sha256-9AHjiMYZZ3b9GpNNA5QCfS1kS1f3Lq45bN9LbLBtVb8=", + "lastModified": 1733472978, + "narHash": "sha256-hxjaXMbyhhiBm7wHcaA6q+UY2oH8EyrfGo/MT9gRyhI=", "ref": "refs/heads/main", - "rev": "320144ae7288fe23686935ebb235d9fe0c900862", - "revCount": 5510, + "rev": "10a4365f7d2674d0e9180a3bddf535acb95eae70", + "revCount": 5518, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -923,11 +923,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1733212471, - "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", + "lastModified": 1733392399, + "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", + "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", "type": "github" }, "original": { @@ -1017,11 +1017,11 @@ }, "nur": { "locked": { - "lastModified": 1733245290, - "narHash": "sha256-q0vf2tINCUKk7XPDSKMdzp96c+x3pWUxwl0Y10c+UxQ=", + "lastModified": 1733474920, + "narHash": "sha256-B0cimRAnptz2iasZiBGTHlquuv8TiC+srJEjWmQMV0o=", "owner": "nix-community", "repo": "NUR", - "rev": "1a776f27abb96c4563f290bc7cffdc8cd7755fdd", + "rev": "bc6792eb0cece391ac965b0d8f97ce197edafdc6", "type": "github" }, "original": { @@ -1233,11 +1233,11 @@ }, "locked": { "dir": "packaging/nix", - "lastModified": 1733037609, - "narHash": "sha256-HkS24indfMaQbVZ+9GY5BHc+rqPvh8htF0rWYhvgPKI=", + "lastModified": 1733450594, + "narHash": "sha256-UlWmVUocOgkT/OpqXwcfFFRQSH28jncpWRqFNGVuh6I=", "ref": "refs/heads/main", - "rev": "e559e2e50999093c3e837d33886f9e14e34ead0a", - "revCount": 863, + "rev": "1c3dd941402a782dc9d3582ba6aaac00f5e498e0", + "revCount": 864, "submodules": true, "type": "git", "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" From 894aa39d84f23aa8f138db82a07d974c0020023a Mon Sep 17 00:00:00 2001 From: Ahwx Date: Fri, 13 Dec 2024 16:32:07 +0100 Subject: [PATCH 08/23] fix: open element/swaync-client panel with keybinds --- modules/home/hyprland/config.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/home/hyprland/config.nix b/modules/home/hyprland/config.nix index 1a074ab..0f4a72c 100644 --- a/modules/home/hyprland/config.nix +++ b/modules/home/hyprland/config.nix @@ -228,8 +228,10 @@ "$mainMod SHIFT, F, exec, firefox" "$mainMod SHIFT, W, exec, wdisplays" "$mainMod SHIFT, T, exec, thunderbird" + "$mainMod SHIFT, E, exec, element-desktop" "$mainMod SHIFT, P, exec, pavucontrol-qt" "$mainMod SHIFT, N ,exec, notes" # should be added by scripts/custom packages + "$mainMod, N,exec, swaync-client -t" # screenshot "SUPER SHIFT, S, exec, grimblast --notify --cursor save area ~/Pictures/$(date +'%Y-%m-%d-At-%Ih%Mm%Ss').png" From 0f207dab5b6c6da8198555704532dbbea60644a8 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Fri, 13 Dec 2024 16:32:18 +0100 Subject: [PATCH 09/23] feat: adds hyprsunset and hyprspace --- modules/home/hyprland/hyprland.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/home/hyprland/hyprland.nix b/modules/home/hyprland/hyprland.nix index e4ea538..5cbe8bf 100644 --- a/modules/home/hyprland/hyprland.nix +++ b/modules/home/hyprland/hyprland.nix @@ -11,6 +11,7 @@ glib wayland direnv + inputs.hyprsunset.packages.${pkgs.system}.hyprsunset ]; # systemd.user.targets.hyprland-session.Unit.Wants = [ "xdg-desktop-autostart.target" ]; wayland.windowManager.hyprland = { @@ -22,7 +23,7 @@ # enableNvidiaPatches = false; systemd.enable = true; plugins = [ - # inputs.Hyprspace.packages.${pkgs.system}.Hyprspace + inputs.Hyprspace.packages.${pkgs.system}.Hyprspace inputs.Hyswipe.packages.${pkgs.system}.Hyswipe ]; }; From 241f53891d3de3462a75ee507160680edcd4afea Mon Sep 17 00:00:00 2001 From: Ahwx Date: Fri, 13 Dec 2024 16:32:27 +0100 Subject: [PATCH 10/23] chore: add/remove packages --- modules/home/packages.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/modules/home/packages.nix b/modules/home/packages.nix index 9db97e6..2d14049 100644 --- a/modules/home/packages.nix +++ b/modules/home/packages.nix @@ -5,10 +5,8 @@ bandwhich # Terminal bandwidth utilization tool powertop element-desktop # Nheko is kinda shit so sadly this has to happen - yewtube # Play YouTube videos via the terminal iamb # In-terminal-Matrix-messaging signal-desktop # Since the bridge is broken :( - socat # Required for `hyprland-smart-borders` tesseract # Screen grabbing text from images/PDFs/etc pixcat # Display images in the terminal lm_sensors # Show sensor outputs, i.e. temperatures @@ -17,22 +15,18 @@ # wikit # Wikipedia summaries from the terminal, not added to Nix yet # reader # Firefox reader mode but in the terminal, not added to Nix yet vimv # edit filenames in batch with $EDITOR - pastel # generate, analyze, convert and manipulate colors + # pastel # generate, analyze, convert and manipulate colors glow # Render Markdown from the terminal - htmlq # jq but for HTML + # htmlq # jq but for HTML android-tools # ADB/Fastboot eva # Calculator anki-bin # Flashcards - vimv # Bulk rename obs-studio # Record video stuff exiftool # Read exif data from CLI translate-shell # Google Translate but in the CLI wireguard-tools # VPN connections openresolv # required for wireguard-tools - prusa-slicer - blender progress - epy zip ripdrag pwgen @@ -57,7 +51,7 @@ # wineWowPackages.wayland # element-desktop # wayland version is very laggy for me spotify - spotify_player + spotify-player thunderbird neofetch nodejs_22 @@ -73,7 +67,6 @@ ffmpeg killall libnotify - man-pages # extra man pages mpv # video player openssl pamixer # pulseaudio command line mixer From 298a1027f78f5a17416d317a5cf0bd4c64f8f444 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Fri, 13 Dec 2024 16:32:51 +0100 Subject: [PATCH 11/23] feat: adds hyprsunset --- flake.lock | 145 ++++++++++++++++++++++++++++++++++++++++++++++++++--- flake.nix | 1 + 2 files changed, 138 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index bc6e6e7..2007db9 100644 --- a/flake.lock +++ b/flake.lock @@ -288,7 +288,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_6" + "systems": "systems_7" }, "locked": { "lastModified": 1726560853, @@ -564,6 +564,31 @@ "type": "github" } }, + "hyprland-protocols_2": { + "inputs": { + "nixpkgs": [ + "hyprsunset", + "nixpkgs" + ], + "systems": [ + "hyprsunset", + "systems" + ] + }, + "locked": { + "lastModified": 1728345020, + "narHash": "sha256-xGbkc7U/Roe0/Cv3iKlzijIaFBNguasI31ynL2IlEoM=", + "owner": "hyprwm", + "repo": "hyprland-protocols", + "rev": "a7c183800e74f337753de186522b9017a07a8cee", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-protocols", + "type": "github" + } + }, "hyprlang": { "inputs": { "hyprutils": [ @@ -614,6 +639,28 @@ "type": "github" } }, + "hyprsunset": { + "inputs": { + "hyprland-protocols": "hyprland-protocols_2", + "hyprutils": "hyprutils_3", + "hyprwayland-scanner": "hyprwayland-scanner_3", + "nixpkgs": "nixpkgs_5", + "systems": "systems_6" + }, + "locked": { + "lastModified": 1731163989, + "narHash": "sha256-+M6/ZLT2g6l2JCBBQSNMp8oqXPMMUckWTNhHSXzvlXE=", + "owner": "hyprwm", + "repo": "hyprsunset", + "rev": "adaae9d2adac611151224b054f59db8cb0976779", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprsunset", + "type": "github" + } + }, "hyprutils": { "inputs": { "nixpkgs": [ @@ -664,6 +711,31 @@ "type": "github" } }, + "hyprutils_3": { + "inputs": { + "nixpkgs": [ + "hyprsunset", + "nixpkgs" + ], + "systems": [ + "hyprsunset", + "systems" + ] + }, + "locked": { + "lastModified": 1727300645, + "narHash": "sha256-OvAtVLaSRPnbXzOwlR1fVqCXR7i+ICRX3aPMCdIiv+c=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "3f5293432b6dc6a99f26aca2eba3876d2660665c", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, "hyprwayland-scanner": { "inputs": { "nixpkgs": [ @@ -714,6 +786,31 @@ "type": "github" } }, + "hyprwayland-scanner_3": { + "inputs": { + "nixpkgs": [ + "hyprsunset", + "nixpkgs" + ], + "systems": [ + "hyprsunset", + "systems" + ] + }, + "locked": { + "lastModified": 1726874836, + "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -739,7 +836,7 @@ "nix-gaming": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "umu": "umu" }, "locked": { @@ -876,6 +973,22 @@ } }, "nixpkgs_5": { + "locked": { + "lastModified": 1728241625, + "narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { "locked": { "lastModified": 1731890469, "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=", @@ -891,7 +1004,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1732758367, "narHash": "sha256-RzaI1RO0UXqLjydtz3GAXSTzHkpb/lLD1JD8a0W4Wpo=", @@ -907,7 +1020,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1728492678, "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", @@ -923,7 +1036,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1728492678, "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", @@ -942,7 +1055,7 @@ "nixvim": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "nixvim": "nixvim_2" }, "locked": { @@ -967,7 +1080,7 @@ "git-hooks": "git-hooks", "home-manager": "home-manager_3", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_9", "nuschtosSearch": "nuschtosSearch", "treefmt-nix": "treefmt-nix" }, @@ -1058,9 +1171,10 @@ "hypr-contrib": "hypr-contrib", "hyprland": "hyprland", "hyprpicker": "hyprpicker", + "hyprsunset": "hyprsunset", "nix-gaming": "nix-gaming", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "nixvim": "nixvim", "nur": "nur" } @@ -1158,6 +1272,21 @@ } }, "systems_6": { + "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" + } + }, + "systems_7": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", diff --git a/flake.nix b/flake.nix index 10d08da..0aff0fb 100644 --- a/flake.nix +++ b/flake.nix @@ -16,6 +16,7 @@ }; hypr-contrib.url = "github:hyprwm/contrib"; hyprpicker.url = "github:hyprwm/hyprpicker"; + hyprsunset.url = "github:hyprwm/hyprsunset"; Hyprspace = { url = "github:KZDKM/Hyprspace"; inputs.hyprland.follows = "hyprland"; # Hyprspace uses latest Hyprland. We declare this to keep them in sync. From c802f8a41024ca57a34fee0babb76e104cda2d20 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Thu, 19 Dec 2024 01:32:23 +0100 Subject: [PATCH 12/23] feat: add `ichiyo` (x230) --- flake.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/flake.nix b/flake.nix index 0aff0fb..f6a4b21 100644 --- a/flake.nix +++ b/flake.nix @@ -60,6 +60,14 @@ ]; specialArgs = { host="sakura"; inherit self inputs username ; }; }; + ichiyo = nixpkgs.lib.nixosSystem { + inherit system; + modules = [ + (import ./hosts/ichiyo) + agenix.nixosModules.default + ]; + specialArgs = { host="sakura"; inherit self inputs username ; }; + }; violet = nixpkgs.lib.nixosSystem { inherit system; modules = [ From 7da48159dc95e4991d1af5c4c5ddbdf7ff55632e Mon Sep 17 00:00:00 2001 From: Ahwx Date: Thu, 19 Dec 2024 15:39:23 +0100 Subject: [PATCH 13/23] feat: adds configuration for ichiyo --- hosts/ichiyo/default.nix | 36 +++++++++++++++++++++++++ hosts/ichiyo/hardware-configuration.nix | 36 +++++++++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 hosts/ichiyo/default.nix create mode 100644 hosts/ichiyo/hardware-configuration.nix diff --git a/hosts/ichiyo/default.nix b/hosts/ichiyo/default.nix new file mode 100644 index 0000000..c38c5e8 --- /dev/null +++ b/hosts/ichiyo/default.nix @@ -0,0 +1,36 @@ +{ lib, inputs, pkgs, config, ... }: +{ + imports = [ + ./hardware-configuration.nix + ./../../modules/core + ]; + + powerManagement = { + enable = true; + # powertop.enable = true; + cpuFreqGovernor = lib.mkDefault "ondemand"; + }; + + liv.laptop.enable = true; + + # Bootloader stuff + boot.loader.grub.enable = lib.mkForce true; + boot.loader.grub.device = lib.mkForce "/dev/sda"; + boot.loader.grub.useOSProber = lib.mkForce true; + boot.initrd.secrets = { + "/crypto_keyfile.bin" = null; + }; + boot.loader.grub.enableCryptodisk = lib.mkForce true; + boot.initrd.luks.devices."luks-729500c5-557b-45c8-ab3f-5c365db28284".keyFile = lib.mkForce "/crypto_keyfile.bin"; + + networking.hostName = "ichiyo"; + + boot = { + extraModulePackages = with config.boot.kernelPackages; + [ + acpi_call + cpupower + ] + ++ [pkgs.cpupower-gui]; + }; +} diff --git a/hosts/ichiyo/hardware-configuration.nix b/hosts/ichiyo/hardware-configuration.nix new file mode 100644 index 0000000..96cba70 --- /dev/null +++ b/hosts/ichiyo/hardware-configuration.nix @@ -0,0 +1,36 @@ +# 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" "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/348a526e-113e-4b62-b54e-b0bf9ad101a2"; + fsType = "ext4"; + }; + + boot.initrd.luks.devices."luks-729500c5-557b-45c8-ab3f-5c365db28284".device = "/dev/disk/by-uuid/729500c5-557b-45c8-ab3f-5c365db28284"; + + swapDevices = [ ]; + + # 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 + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp0s25.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wwp0s20u4i6.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} From 1f65af50d65b53d146fc6ff4f4836e5ec746734f Mon Sep 17 00:00:00 2001 From: Ahwx Date: Thu, 19 Dec 2024 18:18:14 +0100 Subject: [PATCH 14/23] fix: make radicale work woah --- modules/services/radicale.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/modules/services/radicale.nix b/modules/services/radicale.nix index bb5aa29..d601bca 100644 --- a/modules/services/radicale.nix +++ b/modules/services/radicale.nix @@ -6,7 +6,7 @@ server.hosts = [ "0.0.0.0:5232" ]; auth = { type = "htpasswd"; - htpasswd_filename = "/home/liv/radicaleusers"; + htpasswd_filename = "/etc/radicale/htpasswd"; htpasswd_encryption = "bcrypt"; }; }; @@ -17,18 +17,20 @@ recommendedProxySettings = true; recommendedTlsSettings = true; virtualHosts = { - "calendar.liv.town" = { + "plan.liv.town" = { forceSSL = true; sslCertificate = "/var/lib/acme/liv.town/cert.pem"; sslCertificateKey = "/var/lib/acme/liv.town/key.pem"; # locations."/radicale/" = { locations."/" = { proxyPass = "http://127.0.0.1:5232/"; - # extraConfig = '' - # # proxy_set_header X-Script-Name /radicale; - # # proxy_set_header X-Script-Name /; - # proxy_pass_header Authorization; - # ''; + proxyWebsockets = true; + extraConfig = '' + proxy_connect_timeout 300; + proxy_send_timeout 300; + proxy_read_timeout 300; + send_timeout 300; + ''; }; }; }; From 244d2f8ec65b3943f54cb519a64a7a37c0a7021e Mon Sep 17 00:00:00 2001 From: Ahwx Date: Thu, 19 Dec 2024 18:18:50 +0100 Subject: [PATCH 15/23] chore: remove unused code --- modules/services/sharkey-proxy.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/sharkey-proxy.nix b/modules/services/sharkey-proxy.nix index 4eddaf2..b06dcc4 100644 --- a/modules/services/sharkey-proxy.nix +++ b/modules/services/sharkey-proxy.nix @@ -1,4 +1,4 @@ -{ lib, config, pkgs, ... }: +{ ... }: { services = { nginx.virtualHosts."quack.social" = { From 4aaf317614dc400b62e0bfb802492dd41910013d Mon Sep 17 00:00:00 2001 From: Ahwx Date: Thu, 19 Dec 2024 18:19:06 +0100 Subject: [PATCH 16/23] feat: add a bunch of proxies for binternet/librey --- modules/services/binternet-proxy.nix | 14 ++++++++++++++ modules/services/librey-proxy.nix | 14 ++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 modules/services/binternet-proxy.nix create mode 100644 modules/services/librey-proxy.nix diff --git a/modules/services/binternet-proxy.nix b/modules/services/binternet-proxy.nix new file mode 100644 index 0000000..e1ffe1f --- /dev/null +++ b/modules/services/binternet-proxy.nix @@ -0,0 +1,14 @@ +{ ... }: +{ + services = { + nginx.virtualHosts."curate.liv.town" = { + forceSSL = true; + sslCertificate = "/var/lib/acme/liv.town/cert.pem"; + sslCertificateKey = "/var/lib/acme/liv.town/key.pem"; + locations."/" = { + proxyPass = "http://localhost:8081"; + proxyWebsockets = true; + }; + }; + }; +} diff --git a/modules/services/librey-proxy.nix b/modules/services/librey-proxy.nix new file mode 100644 index 0000000..92da713 --- /dev/null +++ b/modules/services/librey-proxy.nix @@ -0,0 +1,14 @@ +{ ... }: +{ + services = { + nginx.virtualHosts."search.liv.town" = { + forceSSL = true; + sslCertificate = "/var/lib/acme/liv.town/cert.pem"; + sslCertificateKey = "/var/lib/acme/liv.town/key.pem"; + locations."/" = { + proxyPass = "http://localhost:8080"; + proxyWebsockets = true; + }; + }; + }; +} From 73d198015fda37f812fce77546409347583266c8 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Thu, 19 Dec 2024 18:22:06 +0100 Subject: [PATCH 17/23] fix: oops ntfy requires websockets --- modules/services/ntfy.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/services/ntfy.nix b/modules/services/ntfy.nix index 71a28f5..66d7a2b 100644 --- a/modules/services/ntfy.nix +++ b/modules/services/ntfy.nix @@ -15,7 +15,10 @@ in { nginx.virtualHosts.${hostname} = { useACMEHost = "liv.town"; forceSSL = true; - locations."/" = { proxyPass = "http://127.0.0.1:${toString port}"; }; + locations."/" = { + proxyPass = "http://127.0.0.1:${toString port}"; + proxyWebsockets = true; + }; }; frp.settings.proxies = [ { From 23f0b78c6c7f2eecee2cde245f254079428acafb Mon Sep 17 00:00:00 2001 From: Ahwx Date: Thu, 19 Dec 2024 18:22:22 +0100 Subject: [PATCH 18/23] chore: add/remove services --- modules/services/violet.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/services/violet.nix b/modules/services/violet.nix index 16806a5..fd9621b 100644 --- a/modules/services/violet.nix +++ b/modules/services/violet.nix @@ -4,13 +4,19 @@ ++ [(import ./mumble.nix)] ++ [(import ./ntfy.nix)] ++ [(import ./sharkey-proxy.nix)] + ++ [(import ./librey-proxy.nix)] + ++ [(import ./binternet-proxy.nix)] ++ [(import ./monitoring.nix)] ++ [(import ./docker.nix)] ++ [(import ./gokapi.nix)] ++ [(import ./nginx.nix)] - ++ [(import ./komga.nix)] + # ++ [(import ./komga.nix)] ++ [(import ./frp.nix)] ++ [(import ./radicale.nix)] + ++ [(import ./jellyfin.nix)] + ++ [(import ./readarr.nix)] + ++ [(import ./lidarr.nix)] + # ++ [(import ./scrutiny.nix)] # ++ [(import ./jitsi-meet.nix)] # ++ [(import ./nextcloud.nix)] ++ [(import ./matrix/default.nix)]; From 0d82e2f2aa432fdb934644d840c660d49c486e1f Mon Sep 17 00:00:00 2001 From: Ahwx Date: Thu, 19 Dec 2024 18:22:41 +0100 Subject: [PATCH 19/23] feat: add lidarr/readarr --- modules/services/lidarr.nix | 21 +++++++++++++++++++++ modules/services/readarr.nix | 20 ++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 modules/services/lidarr.nix create mode 100644 modules/services/readarr.nix diff --git a/modules/services/lidarr.nix b/modules/services/lidarr.nix new file mode 100644 index 0000000..a8c41a0 --- /dev/null +++ b/modules/services/lidarr.nix @@ -0,0 +1,21 @@ +{ ... }: + +{ + services = { + lidarr = { + enable = true; + }; + + nginx.virtualHosts = { + "listen.liv.town" = { + forceSSL = true; + sslCertificate = "/var/lib/acme/liv.town/cert.pem"; + sslCertificateKey = "/var/lib/acme/liv.town/key.pem"; + locations."/" = { + proxyPass = "http://127.0.0.1:8686/"; + proxyWebsockets = true; + }; + }; + }; + }; +} diff --git a/modules/services/readarr.nix b/modules/services/readarr.nix new file mode 100644 index 0000000..8fdf88f --- /dev/null +++ b/modules/services/readarr.nix @@ -0,0 +1,20 @@ +{ ... }: +{ + services = { + readarr = { + enable = true; + }; + + nginx.virtualHosts = { + "read.liv.town" = { + forceSSL = true; + sslCertificate = "/var/lib/acme/liv.town/cert.pem"; + sslCertificateKey = "/var/lib/acme/liv.town/key.pem"; + locations."/" = { + proxyPass = "http://127.0.0.1:8787/"; + proxyWebsockets = true; + }; + }; + }; + }; +} From b17234ffe186c197a28fc0e77a2ab5bf20dbc074 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Thu, 19 Dec 2024 18:22:52 +0100 Subject: [PATCH 20/23] feat: add jellyfin --- modules/services/jellyfin.nix | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 modules/services/jellyfin.nix diff --git a/modules/services/jellyfin.nix b/modules/services/jellyfin.nix new file mode 100644 index 0000000..fd4fa6b --- /dev/null +++ b/modules/services/jellyfin.nix @@ -0,0 +1,26 @@ +{ pkgs, ... }: + +{ + environment.systemPackages = [ + pkgs.jellyfin + pkgs.jellyfin-web + pkgs.jellyfin-ffmpeg + ]; + + services = { + jellyfin = { + enable = true; + }; + nginx.virtualHosts = { + "stream.liv.town" = { + forceSSL = true; + sslCertificate = "/var/lib/acme/liv.town/cert.pem"; + sslCertificateKey = "/var/lib/acme/liv.town/key.pem"; + locations."/" = { + proxyPass = "http://localhost:8096"; + proxyWebsockets = true; + }; + }; + }; + }; +} From bfceb118ca32a682d27430d4f7523816ff41bec1 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Thu, 19 Dec 2024 18:23:31 +0100 Subject: [PATCH 21/23] chore: remove unused non-working service --- modules/services/komga.nix | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 modules/services/komga.nix diff --git a/modules/services/komga.nix b/modules/services/komga.nix deleted file mode 100644 index f5f18a5..0000000 --- a/modules/services/komga.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, config, pkgs, ... }: { - services.komga = { - enable = true; - port = 2872; - stateDir = "/var/lib/komga"; - openFirewall = true; - user = "liv"; - }; - - services = { - nginx.virtualHosts."read.liv.town" = { - useACMEHost = "liv.town"; - forceSSL = true; - locations."/" = { - proxyPass = "http://localhost:2872"; - }; - }; - }; - -} From 8fc79e3c102bd8d4ae89ffc73e1ee2db79334611 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Thu, 19 Dec 2024 18:23:38 +0100 Subject: [PATCH 22/23] feat: add scrutiny --- modules/services/scrutiny.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 modules/services/scrutiny.nix diff --git a/modules/services/scrutiny.nix b/modules/services/scrutiny.nix new file mode 100644 index 0000000..ebe64d8 --- /dev/null +++ b/modules/services/scrutiny.nix @@ -0,0 +1,18 @@ +{ ... }: + +{ + services.scrutiny = { + enable = true; + collector.enable = true; + settings.web.listen.port = 8181; + settings.notify.urls = [ + "ntfy://notify.liv.town/violet" + ]; + }; + + services.nginx.virtualHosts."scrutiny.liv.town" = { + locations."/" = { + proxyPass = "http://localhost:8181/"; + }; + }; +} From 26531f68de4f150437e62b9fadbeb297ee7b135f Mon Sep 17 00:00:00 2001 From: Ahwx Date: Thu, 19 Dec 2024 19:10:38 +0100 Subject: [PATCH 23/23] flake: update --- flake.lock | 1518 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1518 insertions(+) create mode 100644 flake.lock diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..88a037f --- /dev/null +++ b/flake.lock @@ -0,0 +1,1518 @@ +{ + "nodes": { + "Hyprspace": { + "inputs": { + "hyprland": [ + "hyprland" + ], + "systems": "systems" + }, + "locked": { + "lastModified": 1733625860, + "narHash": "sha256-YiLUDw14NaavML8y9rxXxO7q+j3b/ghQhBmIy0+/Zmk=", + "owner": "KZDKM", + "repo": "Hyprspace", + "rev": "e2d561c933cd085d68bf0b39c4f78870ad0abbc2", + "type": "github" + }, + "original": { + "owner": "KZDKM", + "repo": "Hyprspace", + "type": "github" + } + }, + "Hyswipe": { + "inputs": { + "hyprland": [ + "hyprland" + ], + "systems": "systems_2" + }, + "locked": { + "lastModified": 1733340944, + "narHash": "sha256-/4cZrvnK1m2seORcYP+pAKoziaCgFCIAOpdkYSLUcaQ=", + "owner": "KZDKM", + "repo": "Hyswipe", + "rev": "001b5983ea372bc525c246c8280fd57176a2e0b7", + "type": "github" + }, + "original": { + "owner": "KZDKM", + "repo": "Hyswipe", + "type": "github" + } + }, + "agenix": { + "inputs": { + "darwin": "darwin", + "home-manager": "home-manager", + "nixpkgs": "nixpkgs", + "systems": "systems_3" + }, + "locked": { + "lastModified": 1723293904, + "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=", + "owner": "ryantm", + "repo": "agenix", + "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41", + "type": "github" + }, + "original": { + "owner": "ryantm", + "repo": "agenix", + "type": "github" + } + }, + "alejandra": { + "inputs": { + "fenix": "fenix", + "flakeCompat": "flakeCompat", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1660592437, + "narHash": "sha256-xFumnivtVwu5fFBOrTxrv6fv3geHKF04RGP23EsDVaI=", + "owner": "kamadorueda", + "repo": "alejandra", + "rev": "e7eac49074b70814b542fee987af2987dd0520b5", + "type": "github" + }, + "original": { + "owner": "kamadorueda", + "ref": "3.0.0", + "repo": "alejandra", + "type": "github" + } + }, + "aquamarine": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1734400729, + "narHash": "sha256-Bf+oya0BuleVXYGIWsb0eWnrK6s0aiesOsI7Mpj1pMU=", + "owner": "hyprwm", + "repo": "aquamarine", + "rev": "a132fa41be7ebe797ad758e84d9df068151a723b", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "aquamarine", + "type": "github" + } + }, + "catppuccin": { + "locked": { + "lastModified": 1734624488, + "narHash": "sha256-swNM0LxzIcyQcyK5SE0Q13qs3MOcJR4KL2+bSv2HHpg=", + "owner": "catppuccin", + "repo": "nix", + "rev": "562a0ace199ab59413d5093e31d6745704bd0d11", + "type": "github" + }, + "original": { + "owner": "catppuccin", + "repo": "nix", + "type": "github" + } + }, + "darwin": { + "inputs": { + "nixpkgs": [ + "agenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1700795494, + "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", + "type": "github" + }, + "original": { + "owner": "lnl7", + "ref": "master", + "repo": "nix-darwin", + "type": "github" + } + }, + "devshell": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1728330715, + "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", + "owner": "numtide", + "repo": "devshell", + "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, + "fenix": { + "inputs": { + "nixpkgs": [ + "alejandra", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1657607339, + "narHash": "sha256-HaqoAwlbVVZH2n4P3jN2FFPMpVuhxDy1poNOR7kzODc=", + "owner": "nix-community", + "repo": "fenix", + "rev": "b814c83d9e6aa5a28d0cf356ecfdafb2505ad37d", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "revCount": 57, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" + } + }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_2" + }, + "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" + } + }, + "flake-parts_3": { + "inputs": { + "nixpkgs-lib": [ + "nixvim", + "nixvim", + "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" + } + }, + "flake-parts_4": { + "inputs": { + "nixpkgs-lib": [ + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-utils": { + "inputs": { + "systems": "systems_7" + }, + "locked": { + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flakeCompat": { + "flake": false, + "locked": { + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "git-hooks": { + "inputs": { + "flake-compat": [ + "nixvim", + "nixvim", + "flake-compat" + ], + "gitignore": "gitignore_2", + "nixpkgs": [ + "nixvim", + "nixvim", + "nixpkgs" + ], + "nixpkgs-stable": [ + "nixvim", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1728727368, + "narHash": "sha256-7FMyNISP7K6XDSIt1NJxkXZnEdV3HZUXvFoBaJ/qdOg=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "eb74e0be24a11a1531b5b8659535580554d30b28", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "hyprland", + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gitignore_2": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixvim", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "agenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1703113217, + "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1734622215, + "narHash": "sha256-OOfI0XhSJGHblfdNDhfnn8QnZxng63rWk9eeJ2tCbiI=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "1395379a7a36e40f2a76e7b9936cc52950baa1be", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_3": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1728726232, + "narHash": "sha256-8ZWr1HpciQsrFjvPMvZl0W+b0dilZOqXPoKa2Ux36bc=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "d57112db877f07387ce7104b5ac346ede556d2d7", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "hypr-contrib": { + "inputs": { + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1733056338, + "narHash": "sha256-sp14z0mrqrtmouz1+bU4Jh8/0xi+xwQHF2l7mhGSSVU=", + "owner": "hyprwm", + "repo": "contrib", + "rev": "d7c55140f1785b8d9fef351f1cd2a4c9e1eaa466", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "contrib", + "type": "github" + } + }, + "hyprcursor": { + "inputs": { + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1734364709, + "narHash": "sha256-+2bZJL2u5hva7rSp65OfKJBK+k03T6GB/NCvpoS1OOo=", + "owner": "hyprwm", + "repo": "hyprcursor", + "rev": "f388aacd22be4a6e4d634fbaf6f75eb0713d239a", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprcursor", + "type": "github" + } + }, + "hyprgraphics": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1733684019, + "narHash": "sha256-2kYREgmSmbLsmDpLEq96hxVAU3qz8aCvVhF65yCFZHY=", + "owner": "hyprwm", + "repo": "hyprgraphics", + "rev": "fb2c0268645a77403af3b8a4ce8fa7ba5917f15d", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprgraphics", + "type": "github" + } + }, + "hyprland": { + "inputs": { + "aquamarine": "aquamarine", + "hyprcursor": "hyprcursor", + "hyprgraphics": "hyprgraphics", + "hyprland-protocols": "hyprland-protocols", + "hyprland-qtutils": "hyprland-qtutils", + "hyprlang": "hyprlang", + "hyprutils": "hyprutils", + "hyprwayland-scanner": "hyprwayland-scanner", + "nixpkgs": [ + "nixpkgs" + ], + "pre-commit-hooks": "pre-commit-hooks", + "systems": "systems_4", + "xdph": "xdph" + }, + "locked": { + "lastModified": 1734573361, + "narHash": "sha256-rlHkYVDjKXABfAxdcsHnbdZa/0EWE3g/XnR/Ln96rPA=", + "ref": "refs/heads/main", + "rev": "5b714f05f87831e3e930af04649f853d5efb9902", + "revCount": 5570, + "submodules": true, + "type": "git", + "url": "https://github.com/hyprwm/Hyprland" + }, + "original": { + "submodules": true, + "type": "git", + "url": "https://github.com/hyprwm/Hyprland" + } + }, + "hyprland-protocols": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1728345020, + "narHash": "sha256-xGbkc7U/Roe0/Cv3iKlzijIaFBNguasI31ynL2IlEoM=", + "owner": "hyprwm", + "repo": "hyprland-protocols", + "rev": "a7c183800e74f337753de186522b9017a07a8cee", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-protocols", + "type": "github" + } + }, + "hyprland-protocols_2": { + "inputs": { + "nixpkgs": [ + "hyprsunset", + "nixpkgs" + ], + "systems": [ + "hyprsunset", + "systems" + ] + }, + "locked": { + "lastModified": 1728345020, + "narHash": "sha256-xGbkc7U/Roe0/Cv3iKlzijIaFBNguasI31ynL2IlEoM=", + "owner": "hyprwm", + "repo": "hyprland-protocols", + "rev": "a7c183800e74f337753de186522b9017a07a8cee", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-protocols", + "type": "github" + } + }, + "hyprland-qtutils": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1733940128, + "narHash": "sha256-hmfXWj2GA9cj1QUkPFYtAAeohhs615zL4E3APy3FnvQ=", + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "rev": "3833097e50473a152dd614d4b468886840b4ea78", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "type": "github" + } + }, + "hyprlang": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1734364628, + "narHash": "sha256-ii8fzJfI953n/EmIxVvq64ZAwhvwuuPHWfGd61/mJG8=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "16e59c1eb13d9fb6de066f54e7555eb5e8a4aba5", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprpicker": { + "inputs": { + "hyprutils": "hyprutils_2", + "hyprwayland-scanner": "hyprwayland-scanner_2", + "nixpkgs": "nixpkgs_4", + "systems": "systems_5" + }, + "locked": { + "lastModified": 1734384415, + "narHash": "sha256-As7Z39Pqoy/dUiaaT8UIPUVGViWiKmRsBUHTGkT2430=", + "owner": "hyprwm", + "repo": "hyprpicker", + "rev": "46d2f5a817a89405cef941d8beb4551425acf3da", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprpicker", + "type": "github" + } + }, + "hyprsunset": { + "inputs": { + "hyprland-protocols": "hyprland-protocols_2", + "hyprutils": "hyprutils_3", + "hyprwayland-scanner": "hyprwayland-scanner_3", + "nixpkgs": "nixpkgs_5", + "systems": "systems_6" + }, + "locked": { + "lastModified": 1731163989, + "narHash": "sha256-+M6/ZLT2g6l2JCBBQSNMp8oqXPMMUckWTNhHSXzvlXE=", + "owner": "hyprwm", + "repo": "hyprsunset", + "rev": "adaae9d2adac611151224b054f59db8cb0976779", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprsunset", + "type": "github" + } + }, + "hyprutils": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1734384247, + "narHash": "sha256-bl3YyJb2CgaeVKYq/l8j27vKdbkTpDNFDsnCl0dnNlY=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "e6cf45cd1845368702e03b8912f4cc44ebba3322", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, + "hyprutils_2": { + "inputs": { + "nixpkgs": [ + "hyprpicker", + "nixpkgs" + ], + "systems": [ + "hyprpicker", + "systems" + ] + }, + "locked": { + "lastModified": 1733502241, + "narHash": "sha256-KAUNC4Dgq8WQjYov5auBw/usaHixhacvb7cRDd0AG/k=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "104117aed6dd68561be38b50f218190aa47f2cd8", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, + "hyprutils_3": { + "inputs": { + "nixpkgs": [ + "hyprsunset", + "nixpkgs" + ], + "systems": [ + "hyprsunset", + "systems" + ] + }, + "locked": { + "lastModified": 1727300645, + "narHash": "sha256-OvAtVLaSRPnbXzOwlR1fVqCXR7i+ICRX3aPMCdIiv+c=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "3f5293432b6dc6a99f26aca2eba3876d2660665c", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, + "hyprwayland-scanner": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1734384417, + "narHash": "sha256-noYeXcNQ15g1/gIJIYT2zdO66wzY5Z06PYz6BfKUZA8=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "90e87f7fcfcce4862826d60332cbc5e2f87e1f88", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, + "hyprwayland-scanner_2": { + "inputs": { + "nixpkgs": [ + "hyprpicker", + "nixpkgs" + ], + "systems": [ + "hyprpicker", + "systems" + ] + }, + "locked": { + "lastModified": 1726874836, + "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, + "hyprwayland-scanner_3": { + "inputs": { + "nixpkgs": [ + "hyprsunset", + "nixpkgs" + ], + "systems": [ + "hyprsunset", + "systems" + ] + }, + "locked": { + "lastModified": 1726874836, + "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, + "nix-darwin": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1728385805, + "narHash": "sha256-mUd38b0vhB7yzgAjNOaFz7VY9xIVzlbn3P2wjGBcVV0=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "48b50b3b137be5cfb9f4d006835ce7c3fe558ccc", + "type": "github" + }, + "original": { + "owner": "lnl7", + "repo": "nix-darwin", + "type": "github" + } + }, + "nix-gaming": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs_6", + "umu": "umu" + }, + "locked": { + "lastModified": 1734486355, + "narHash": "sha256-e9ui1RA/Bf57fiABB0ddXy4m/FoqM9yiEv6XtaoTyag=", + "owner": "fufexan", + "repo": "nix-gaming", + "rev": "3a37d41cbe8cda558c5d1a83e73fd452207cd914", + "type": "github" + }, + "original": { + "owner": "fufexan", + "repo": "nix-gaming", + "type": "github" + } + }, + "nixos-hardware": { + "locked": { + "lastModified": 1734352517, + "narHash": "sha256-mfv+J/vO4nqmIOlq8Y1rRW8hVsGH3M+I2ESMjhuebDs=", + "owner": "nixos", + "repo": "nixos-hardware", + "rev": "b12e314726a4226298fe82776b4baeaa7bcf3dcd", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixos-hardware", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1703013332, + "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1733096140, + "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" + } + }, + "nixpkgs-lib_2": { + "locked": { + "lastModified": 1727825735, + "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1730741070, + "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_10": { + "locked": { + "lastModified": 1734424634, + "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1657425264, + "narHash": "sha256-3aHvoI2e8vJKw3hvnHECaBpSsL5mxVsVtaLCnTdNcH8=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "de5b3dd17034e6106e75746e81618e5bd408de8a", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1712163089, + "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1734119587, + "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1728241625, + "narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1733935885, + "narHash": "sha256-xyiHLs6KJ1fxeGmcCxKjJE4yJknVJxbC8Y/ZRYyC8WE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5a48e3c2e435e95103d56590188cfed7b70e108c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { + "locked": { + "lastModified": 1734424634, + "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { + "locked": { + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_9": { + "locked": { + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixvim": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_8", + "nixvim": "nixvim_2" + }, + "locked": { + "lastModified": 1732699651, + "narHash": "sha256-pqMKyU+LfZ7nyLWtzy26+mfd6yslR6F+bgRgCeL+ZPg=", + "owner": "ahwxorg", + "repo": "nixvim-config", + "rev": "f295de4b6f9f808e3074e53d058b309dc69c55d2", + "type": "github" + }, + "original": { + "owner": "ahwxorg", + "repo": "nixvim-config", + "type": "github" + } + }, + "nixvim_2": { + "inputs": { + "devshell": "devshell", + "flake-compat": "flake-compat_2", + "flake-parts": "flake-parts_3", + "git-hooks": "git-hooks", + "home-manager": "home-manager_3", + "nix-darwin": "nix-darwin", + "nixpkgs": "nixpkgs_9", + "nuschtosSearch": "nuschtosSearch", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1728829992, + "narHash": "sha256-722PdOQ4uTTAOyS3Ze4H7LXDNVi9FecKbLEvj3Qu0hM=", + "owner": "nix-community", + "repo": "nixvim", + "rev": "619e24366e8ad34230d65a323d26ca981bfa6927", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixvim", + "type": "github" + } + }, + "nur": { + "inputs": { + "flake-parts": "flake-parts_4", + "nixpkgs": "nixpkgs_10", + "treefmt-nix": "treefmt-nix_2" + }, + "locked": { + "lastModified": 1734626672, + "narHash": "sha256-L/FC33I5l9GwaZ55zVDiKROyhAit6yl6yWqxssMl2sk=", + "owner": "nix-community", + "repo": "NUR", + "rev": "7bdb9e6abd154dde4004c499aa1c7707a6dbcb16", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NUR", + "type": "github" + } + }, + "nuschtosSearch": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixvim", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1728701796, + "narHash": "sha256-FTDCOUnq+gdnHC3p5eisv1X1mMtKJDNMegwpZjRzQKY=", + "owner": "NuschtOS", + "repo": "search", + "rev": "9578d865b081c29ae98131caf7d2f69a42f0ca6e", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "repo": "search", + "type": "github" + } + }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": "flake-compat", + "gitignore": "gitignore", + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1734379367, + "narHash": "sha256-Keu8z5VgT5gnCF4pmB+g7XZFftHpfl4qOn7nqBcywdE=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "0bb4be58f21ff38fc3cdbd6c778eb67db97f0b99", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "root": { + "inputs": { + "Hyprspace": "Hyprspace", + "Hyswipe": "Hyswipe", + "agenix": "agenix", + "alejandra": "alejandra", + "catppuccin": "catppuccin", + "home-manager": "home-manager_2", + "hypr-contrib": "hypr-contrib", + "hyprland": "hyprland", + "hyprpicker": "hyprpicker", + "hyprsunset": "hyprsunset", + "nix-gaming": "nix-gaming", + "nixos-hardware": "nixos-hardware", + "nixpkgs": "nixpkgs_7", + "nixvim": "nixvim", + "nur": "nur" + } + }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1657557289, + "narHash": "sha256-PRW+nUwuqNTRAEa83SfX+7g+g8nQ+2MMbasQ9nt6+UM=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "caf23f29144b371035b864a1017dbc32573ad56d", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, + "systems": { + "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" + } + }, + "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" + } + }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_4": { + "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" + } + }, + "systems_5": { + "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" + } + }, + "systems_6": { + "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" + } + }, + "systems_7": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1727984844, + "narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_2": { + "inputs": { + "nixpkgs": [ + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "umu": { + "inputs": { + "nixpkgs": [ + "nix-gaming", + "nixpkgs" + ] + }, + "locked": { + "dir": "packaging/nix", + "lastModified": 1734207213, + "narHash": "sha256-5CZPAeKm24Y1BKnN8Md3HUViCMCs7AVghRC+05Bdlkk=", + "ref": "refs/heads/main", + "rev": "6189d0d9fd062e89a375db20aeae1d1c009e9833", + "revCount": 869, + "submodules": true, + "type": "git", + "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" + }, + "original": { + "dir": "packaging/nix", + "submodules": true, + "type": "git", + "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" + } + }, + "xdph": { + "inputs": { + "hyprland-protocols": [ + "hyprland", + "hyprland-protocols" + ], + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1734422917, + "narHash": "sha256-0y7DRaXslhfqVKV8a/talYTYAe2NHOQhMZG7KMNRCtc=", + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "rev": "3e884d941ca819c1f2e50df8bdae0debded1ed87", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +}