diff --git a/config/default.nix b/config/default.nix index 6986997..817ae89 100755 --- a/config/default.nix +++ b/config/default.nix @@ -56,7 +56,6 @@ let subdomain = stringType; label = stringType; name = stringType; - hostname = stringType; domains = genOptions stringType "url"; dns = genOptions stringType "provider"; localhost = genOptions stringType "address"; diff --git a/config/instances/config/hledger.nix b/config/instances/config/hledger.nix new file mode 100755 index 0000000..50a82e1 --- /dev/null +++ b/config/instances/config/hledger.nix @@ -0,0 +1,18 @@ +{ instancesFunctions }: +let + inherit (instancesFunctions) + dummy + ; + hledgerLabel = "Hledger"; + hledgerName = "hledger"; +in +{ + label = hledgerLabel; + name = hledgerName; + paths = { + path0 = "/mnt/media/storage/${hledgerLabel}"; + }; + ports = { + port0 = 5000; + }; +} diff --git a/config/instances/config/nginx.nix b/config/instances/config/nginx.nix new file mode 100755 index 0000000..9db3c77 --- /dev/null +++ b/config/instances/config/nginx.nix @@ -0,0 +1,17 @@ +{instancesFunctions}: let + inherit + (instancesFunctions) + dummy + ; + + nginxLabel = "Ngnix"; + nginxName = "nginx"; +in { + name = nginxName; + label = nginxLabel; + email = dummy; + ports = { + port0 = 8080; # HTTP + port1 = 8443; # HTTPS + }; +} diff --git a/config/instances/config/postfix.nix b/config/instances/config/postfix.nix deleted file mode 100755 index 399b7f4..0000000 --- a/config/instances/config/postfix.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ instancesFunctions }: -let - inherit (instancesFunctions) - domain3 - servicePath - sslPath - sopsPath - ; - - postfixLabel = "Postfix"; - postfixName = "postfix"; -in -{ - label = postfixLabel; - name = postfixName; - sops = { - path0 = "${sopsPath}/${postfixName}"; - }; - subdomain = postfixName; - paths = { - path0 = "${servicePath}/${postfixLabel}"; - }; - ssl = { - cert = "${sslPath}/${domain3}/fullchain.pem"; - key = "${sslPath}/${domain3}/key.pem"; - }; -} diff --git a/config/instances/config/smtp.nix b/config/instances/config/smtp.nix deleted file mode 100755 index 863b785..0000000 --- a/config/instances/config/smtp.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ instancesFunctions }: -let - inherit (instancesFunctions) - dummy - ; -in -{ - hostname = "mail.smtp2go.com"; - name = dummy; - ports = { - port0 = 2525; - }; -} diff --git a/config/instances/default.nix b/config/instances/default.nix index aca3e82..499cd30 100755 --- a/config/instances/default.nix +++ b/config/instances/default.nix @@ -12,26 +12,20 @@ let sopsPath = "/var/lib/secrets"; sslPath = "/var/lib/acme"; varLib = "/var/lib"; - dummy = ""; + dummy = []; }; - instances = builtins.listToAttrs ( - map - (name: { - name = builtins.substring 0 (builtins.stringLength name - 4) name; - value = import (configPath + "/${name}") { - inherit - instancesFunctions - ; - }; - }) - ( - builtins.filter (name: builtins.match ".*\\.nix$" name != null) ( - builtins.attrNames (builtins.readDir configPath) - ) - ) - ); -in -{ + instances = builtins.listToAttrs (map (name: { + name = builtins.substring 0 (builtins.stringLength name - 4) name; + value = import (configPath + "/${name}") { + inherit + instancesFunctions + ; + }; + }) + (builtins.filter (name: + builtins.match ".*\\.nix$" name != null) (builtins.attrNames + (builtins.readDir configPath)))); +in { instances = instances; } diff --git a/flake.lock b/flake.lock index 3b0c482..e39a681 100755 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,38 @@ { "nodes": { + "aquamarine": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1738183445, + "narHash": "sha256-C1He3N1SA8D2u+TSlldbA9wiYwDvXI4GxX3zKaeD7qU=", + "owner": "hyprwm", + "repo": "aquamarine", + "rev": "48a000cf35dd10bfeb231152735aebbe875f4b74", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "aquamarine", + "type": "github" + } + }, "buildbot-nix": { "inputs": { "flake-parts": "flake-parts_2", @@ -11,11 +44,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1738462159, - "narHash": "sha256-ZBK7MABYnd9fjjOYRA8plXRMdVoir6EuUImcM8LxSBQ=", + "lastModified": 1737857314, + "narHash": "sha256-T9THCbnlj4CkKbTP+lisA5PUMoTXE7uh4FyDQzui+dc=", "owner": "nix-community", "repo": "buildbot-nix", - "rev": "13b7bb36c12e42797218ce04d6767e83c70497d3", + "rev": "c077f430f3717d41bb303d031398058665315166", "type": "github" }, "original": { @@ -39,6 +72,28 @@ "type": "github" } }, + "direnv": { + "inputs": { + "gomod2nix": "gomod2nix", + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems_2" + }, + "locked": { + "lastModified": 1737963187, + "narHash": "sha256-k/RLIf4WrW8ZM8kzN9MCQ+28fohHfWKhYEqAdsgvJUQ=", + "owner": "direnv", + "repo": "direnv", + "rev": "b76e297d5cbf0ec11e5d2320b2c89a981fb2b628", + "type": "github" + }, + "original": { + "owner": "direnv", + "repo": "direnv", + "type": "github" + } + }, "dream2nix": { "inputs": { "nixpkgs": [ @@ -126,6 +181,38 @@ "type": "github" } }, + "flake-compat_5": { + "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_6": { + "flake": false, + "locked": { + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -155,11 +242,11 @@ ] }, "locked": { - "lastModified": 1738453229, - "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", + "lastModified": 1736143030, + "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", + "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", "type": "github" }, "original": { @@ -193,6 +280,24 @@ "inputs": { "systems": "systems" }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_3" + }, "locked": { "lastModified": 1705309234, "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", @@ -207,27 +312,9 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "flake-utils_3": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1731533236, @@ -244,6 +331,24 @@ } }, "flake-utils_4": { + "inputs": { + "systems": "systems_8" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_5": { "inputs": { "systems": [ "ngipkgs", @@ -264,9 +369,9 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_6": { "inputs": { - "systems": "systems_6" + "systems": "systems_12" }, "locked": { "lastModified": 1731533236, @@ -321,7 +426,7 @@ "gitignore": { "inputs": { "nixpkgs": [ - "ngipkgs", + "hyprland", "pre-commit-hooks", "nixpkgs" ] @@ -341,6 +446,28 @@ } }, "gitignore_2": { + "inputs": { + "nixpkgs": [ + "ngipkgs", + "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_3": { "inputs": { "nixpkgs": [ "pre-commit-hooks-nix", @@ -361,21 +488,43 @@ "type": "github" } }, + "gomod2nix": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "direnv", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1694616124, + "narHash": "sha256-c49BVhQKw3XDRgt+y+uPAbArtgUlMXCET6VxEBmzHXE=", + "owner": "nix-community", + "repo": "gomod2nix", + "rev": "f95720e89af6165c8c0aa77f180461fe786f3c21", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "gomod2nix", + "type": "github" + } + }, "helix": { "inputs": { "crane": "crane", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" ], "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1738547365, - "narHash": "sha256-4GrVwyIZKx14eVG8TZMKmgyw8v3TuETPrLvYkFNqlyc=", + "lastModified": 1738455488, + "narHash": "sha256-tiMwjSEMyIQ9UnQ7/UmxvTnigdgBW2DC/17dxbsih+w=", "owner": "helix-editor", "repo": "helix", - "rev": "066e938ba083c0259ff411b681eca7bad30980df", + "rev": "e70f8833e2ba4903324449da7f2116b75de67537", "type": "github" }, "original": { @@ -398,11 +547,11 @@ ] }, "locked": { - "lastModified": 1738237977, - "narHash": "sha256-oJN/yvRL7G0WlR/hTkQIjFbPkzCV+sFnNB/38Tb9RL4=", + "lastModified": 1736917206, + "narHash": "sha256-JTBWmyGf8K1Rwb+gviHIUzRJk/sITtT+72HXFkTZUjo=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "6d1b6d5d59758b4f5f05745f774fc13cdc59da43", + "rev": "afd0a42e8c61ebb56899315ee4084a8b2e4ff425", "type": "github" }, "original": { @@ -431,6 +580,525 @@ "type": "github" } }, + "hyprcursor": { + "inputs": { + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1738178255, + "narHash": "sha256-+D6Nu2ewXbMTFzx/Q4jDOo+LAOUPr0cxQJg5k33daIE=", + "owner": "hyprwm", + "repo": "hyprcursor", + "rev": "dcadd3398abe146d60c67e0d9ee6e27b301cae82", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprcursor", + "type": "github" + } + }, + "hyprgraphics": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1738018829, + "narHash": "sha256-5Ol5iahMlELx3lWuChyZsqqLk6sP6aqaJCJFw92OZGo=", + "owner": "hyprwm", + "repo": "hyprgraphics", + "rev": "12cd7034e441a5ebfdef1a090c0788413b4a635b", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprgraphics", + "type": "github" + } + }, + "hypridle": { + "inputs": { + "hyprland-protocols": "hyprland-protocols", + "hyprlang": "hyprlang", + "hyprutils": "hyprutils", + "hyprwayland-scanner": "hyprwayland-scanner", + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems_5" + }, + "locked": { + "lastModified": 1737984253, + "narHash": "sha256-h4KWLijrHK7rugD2oV8JfVgloD+xPW1jCVT2B7K+bjQ=", + "owner": "hyprwm", + "repo": "hypridle", + "rev": "15ca902b2cb845a8a5378ec022c11a4a77155b83", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hypridle", + "type": "github" + } + }, + "hyprland": { + "inputs": { + "aquamarine": "aquamarine", + "hyprcursor": "hyprcursor", + "hyprgraphics": "hyprgraphics", + "hyprland-protocols": "hyprland-protocols_2", + "hyprland-qtutils": "hyprland-qtutils", + "hyprlang": "hyprlang_2", + "hyprutils": "hyprutils_2", + "hyprwayland-scanner": "hyprwayland-scanner_2", + "nixpkgs": [ + "nixpkgs" + ], + "pre-commit-hooks": "pre-commit-hooks", + "systems": "systems_6", + "xdph": "xdph" + }, + "locked": { + "lastModified": 1738437019, + "narHash": "sha256-XPl2sQ6x5Dtw4XrrLMp1ERQSG1/heV6JJ9Gthm2SCMw=", + "owner": "hyprwm", + "repo": "Hyprland", + "rev": "64fefa3749868e6170b6275963c6528456a7d9f2", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "Hyprland", + "type": "github" + } + }, + "hyprland-portal": { + "inputs": { + "hyprland-protocols": "hyprland-protocols_3", + "hyprlang": "hyprlang_3", + "hyprutils": "hyprutils_3", + "hyprwayland-scanner": "hyprwayland-scanner_3", + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems_7" + }, + "locked": { + "lastModified": 1737634991, + "narHash": "sha256-dBAnb7Kbnier30cA7AgxVSxxARmxKZ1vHZT33THSIr8=", + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "rev": "e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "type": "github" + } + }, + "hyprland-protocols": { + "inputs": { + "nixpkgs": [ + "hypridle", + "nixpkgs" + ], + "systems": [ + "hypridle", + "systems" + ] + }, + "locked": { + "lastModified": 1737556638, + "narHash": "sha256-laKgI3mr2qz6tas/q3tuGPxMdsGhBi/w+HO+hO2f1AY=", + "owner": "hyprwm", + "repo": "hyprland-protocols", + "rev": "4c75dd5c015c8a0e5a34c6d02a018a650f57feb5", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-protocols", + "type": "github" + } + }, + "hyprland-protocols_2": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1737556638, + "narHash": "sha256-laKgI3mr2qz6tas/q3tuGPxMdsGhBi/w+HO+hO2f1AY=", + "owner": "hyprwm", + "repo": "hyprland-protocols", + "rev": "4c75dd5c015c8a0e5a34c6d02a018a650f57feb5", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-protocols", + "type": "github" + } + }, + "hyprland-protocols_3": { + "inputs": { + "nixpkgs": [ + "hyprland-portal", + "nixpkgs" + ], + "systems": [ + "hyprland-portal", + "systems" + ] + }, + "locked": { + "lastModified": 1737556638, + "narHash": "sha256-laKgI3mr2qz6tas/q3tuGPxMdsGhBi/w+HO+hO2f1AY=", + "owner": "hyprwm", + "repo": "hyprland-protocols", + "rev": "4c75dd5c015c8a0e5a34c6d02a018a650f57feb5", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-protocols", + "type": "github" + } + }, + "hyprland-qt-support": { + "inputs": { + "hyprlang": [ + "hyprland", + "hyprland-qtutils", + "hyprlang" + ], + "nixpkgs": [ + "hyprland", + "hyprland-qtutils", + "nixpkgs" + ], + "systems": [ + "hyprland", + "hyprland-qtutils", + "systems" + ] + }, + "locked": { + "lastModified": 1737634706, + "narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=", + "owner": "hyprwm", + "repo": "hyprland-qt-support", + "rev": "8810df502cdee755993cb803eba7b23f189db795", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-qt-support", + "type": "github" + } + }, + "hyprland-qtutils": { + "inputs": { + "hyprland-qt-support": "hyprland-qt-support", + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "hyprutils": [ + "hyprland", + "hyprland-qtutils", + "hyprlang", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1737981711, + "narHash": "sha256-lh6cL5D8nPplB3WovCQjLUZ7k7MViiBrMlpkfm4R7/c=", + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "rev": "96bf0677fa9cd13508294e3d4559dfbbc8beff73", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "type": "github" + } + }, + "hyprlang": { + "inputs": { + "hyprutils": [ + "hypridle", + "hyprutils" + ], + "nixpkgs": [ + "hypridle", + "nixpkgs" + ], + "systems": [ + "hypridle", + "systems" + ] + }, + "locked": { + "lastModified": 1737634606, + "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "f41271d35cc0f370d300413d756c2677f386af9d", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprlang_2": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1737634606, + "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "f41271d35cc0f370d300413d756c2677f386af9d", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprlang_3": { + "inputs": { + "hyprutils": [ + "hyprland-portal", + "hyprutils" + ], + "nixpkgs": [ + "hyprland-portal", + "nixpkgs" + ], + "systems": [ + "hyprland-portal", + "systems" + ] + }, + "locked": { + "lastModified": 1737634606, + "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "f41271d35cc0f370d300413d756c2677f386af9d", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprutils": { + "inputs": { + "nixpkgs": [ + "hypridle", + "nixpkgs" + ], + "systems": [ + "hypridle", + "systems" + ] + }, + "locked": { + "lastModified": 1737632363, + "narHash": "sha256-X9I8POSlHxBVjD0fiX1O2j7U9Zi1+4rIkrsyHP0uHXY=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "006620eb29d54ea9086538891404c78563d1bae1", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, + "hyprutils_2": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1737978343, + "narHash": "sha256-TfFS0HCEJh63Kahrkp1h9hVDMdLU8a37Zz+IFucxyfA=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "6a8bc9d2a4451df12f5179dc0b1d2d46518a90ab", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, + "hyprutils_3": { + "inputs": { + "nixpkgs": [ + "hyprland-portal", + "nixpkgs" + ], + "systems": [ + "hyprland-portal", + "systems" + ] + }, + "locked": { + "lastModified": 1737632363, + "narHash": "sha256-X9I8POSlHxBVjD0fiX1O2j7U9Zi1+4rIkrsyHP0uHXY=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "006620eb29d54ea9086538891404c78563d1bae1", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, + "hyprwayland-scanner": { + "inputs": { + "nixpkgs": [ + "hypridle", + "nixpkgs" + ], + "systems": [ + "hypridle", + "systems" + ] + }, + "locked": { + "lastModified": 1735493474, + "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, + "hyprwayland-scanner_2": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1735493474, + "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, + "hyprwayland-scanner_3": { + "inputs": { + "nixpkgs": [ + "hyprland-portal", + "nixpkgs" + ], + "systems": [ + "hyprland-portal", + "systems" + ] + }, + "locked": { + "lastModified": 1735493474, + "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, "lix": { "flake": false, "locked": { @@ -447,7 +1115,7 @@ }, "lix-module": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "flakey-profile": "flakey-profile", "lix": "lix", "nixpkgs": [ @@ -470,19 +1138,19 @@ "inputs": { "buildbot-nix": "buildbot-nix", "dream2nix": "dream2nix", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable_2", - "pre-commit-hooks": "pre-commit-hooks", + "pre-commit-hooks": "pre-commit-hooks_2", "sops-nix": "sops-nix", - "systems": "systems_4" + "systems": "systems_9" }, "locked": { - "lastModified": 1738530522, - "narHash": "sha256-6PdmWHiMmUEtDP324tKbHmgwYmeTvJju17DIN49ylqM=", + "lastModified": 1738417913, + "narHash": "sha256-kDvtRkmeXtFo6UrxFCLRWxyPbNhwyIzb5vRXmPZ3D/k=", "owner": "ngi-nix", "repo": "ngipkgs", - "rev": "f3fb5a5b58f69fd79f432b7927fad41af5f71f59", + "rev": "22541f0b0b4375ac55590981b0c529620cea8a4f", "type": "github" }, "original": { @@ -493,11 +1161,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1738422722, - "narHash": "sha256-Q4vhtbLYWBUnjWD4iQb003Lt+N5PuURDad1BngGKdUs=", + "lastModified": 1737879851, + "narHash": "sha256-H+FXIKj//kmFHTTW4DFeOjR7F1z2/3eb2iwN6Me4YZk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "102a39bfee444533e6b4e8611d7e92aa39b7bec1", + "rev": "5d3221fd57cc442a1a522a15eb5f58230f45a304", "type": "github" }, "original": { @@ -525,11 +1193,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1738435198, - "narHash": "sha256-5+Hmo4nbqw8FrW85FlNm4IIrRnZ7bn0cmXlScNsNRLo=", + "lastModified": 1737672001, + "narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f6687779bf4c396250831aa5a32cbfeb85bb07a3", + "rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8", "type": "github" }, "original": { @@ -611,8 +1279,53 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "gitignore": "gitignore", + "nixpkgs": [ + "hyprland", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1737465171, + "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "pre-commit-hooks-nix": { + "inputs": { + "flake-compat": "flake-compat_5", + "gitignore": "gitignore_3", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1737465171, + "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, + "pre-commit-hooks_2": { + "inputs": { + "flake-compat": "flake-compat_4", + "gitignore": "gitignore_2", "nixpkgs": [ "ngipkgs", "nixpkgs" @@ -632,31 +1345,9 @@ "type": "github" } }, - "pre-commit-hooks-nix": { - "inputs": { - "flake-compat": "flake-compat_4", - "gitignore": "gitignore_2", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1737465171, - "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "purescript-overlay": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "nixpkgs": [ "ngipkgs", "dream2nix", @@ -697,17 +1388,23 @@ }, "root": { "inputs": { + "direnv": "direnv", "flake-parts": "flake-parts", "ghostty": "ghostty", "helix": "helix", "home-manager": "home-manager", + "hypridle": "hypridle", + "hyprland": "hyprland", + "hyprland-portal": "hyprland-portal", "lix-module": "lix-module", "ngipkgs": "ngipkgs", "nixpkgs": "nixpkgs_2", "nur": "nur", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "sops-nix": "sops-nix_2", - "systems": "systems_5", + "systems": "systems_10", + "waybar": "waybar", + "wpaperd": "wpaperd", "yazi": "yazi" } }, @@ -733,6 +1430,27 @@ } }, "rust-overlay_2": { + "inputs": { + "nixpkgs": [ + "wpaperd", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729391507, + "narHash": "sha256-as0I9xieJUHf7kiK2a9znDsVZQTFWhM1pLivII43Gi0=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "784981a9feeba406de38c1c9a3decf966d853cca", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_3": { "inputs": { "nixpkgs": [ "yazi", @@ -784,11 +1502,11 @@ ] }, "locked": { - "lastModified": 1738291974, - "narHash": "sha256-wkwYJc8cKmmQWUloyS9KwttBnja2ONRuJQDEsmef320=", + "lastModified": 1737411508, + "narHash": "sha256-j9IdflJwRtqo9WpM0OfAZml47eBblUHGNQTe62OUqTw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "4c1251904d8a08c86ac6bc0d72cc09975e89aef7", + "rev": "015d461c16678fc02a2f405eb453abb509d4e1d4", "type": "github" }, "original": { @@ -832,6 +1550,51 @@ "type": "github" } }, + "systems_10": { + "locked": { + "lastModified": 1680978846, + "narHash": "sha256-Gtqg8b/v49BFDpDetjclCYXm8mAnTrUzR0JnE2nv5aw=", + "owner": "nix-systems", + "repo": "x86_64-linux", + "rev": "2ecfcac5e15790ba6ce360ceccddb15ad16d08a8", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "x86_64-linux", + "type": "github" + } + }, + "systems_11": { + "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_12": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -863,6 +1626,21 @@ } }, "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_5": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -877,22 +1655,37 @@ "type": "github" } }, - "systems_5": { + "systems_6": { "locked": { - "lastModified": 1680978846, - "narHash": "sha256-Gtqg8b/v49BFDpDetjclCYXm8mAnTrUzR0JnE2nv5aw=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "x86_64-linux", - "rev": "2ecfcac5e15790ba6ce360ceccddb15ad16d08a8", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "x86_64-linux", + "repo": "default-linux", "type": "github" } }, - "systems_6": { + "systems_7": { + "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_8": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -907,6 +1700,21 @@ "type": "github" } }, + "systems_9": { + "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" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -916,11 +1724,11 @@ ] }, "locked": { - "lastModified": 1738070913, - "narHash": "sha256-j6jC12vCFsTGDmY2u1H12lMr62fnclNjuCtAdF1a4Nk=", + "lastModified": 1737483750, + "narHash": "sha256-5An1wq5U8sNycOBBg3nsDDgpwBmR9liOpDGlhliA6Xo=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "bebf27d00f7d10ba75332a0541ac43676985dea3", + "rev": "f2cc121df15418d028a59c9737d38e3a90fbaf8f", "type": "github" }, "original": { @@ -950,11 +1758,95 @@ "type": "github" } }, + "waybar": { + "inputs": { + "flake-compat": "flake-compat_6", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1738399335, + "narHash": "sha256-OvtDGDUX0P5oz/LzhzeAcGfd6ihlUHPMKR4CZgnScTA=", + "owner": "Alexays", + "repo": "Waybar", + "rev": "0d5a4f82eca6df03b73908244d1dcd5fec2c3584", + "type": "github" + }, + "original": { + "owner": "Alexays", + "repo": "Waybar", + "type": "github" + } + }, + "wpaperd": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "rust-overlay": "rust-overlay_2", + "systems": "systems_11" + }, + "locked": { + "lastModified": 1734445299, + "narHash": "sha256-/E7Y2UaYTXIyvRguvqD/FHC3I2mAT7w9berqv7/gUI4=", + "owner": "danyspin97", + "repo": "wpaperd", + "rev": "b0b7e66fd32dca36c431a174784a2e87af7edb77", + "type": "github" + }, + "original": { + "owner": "danyspin97", + "repo": "wpaperd", + "type": "github" + } + }, + "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": 1737634991, + "narHash": "sha256-dBAnb7Kbnier30cA7AgxVSxxARmxKZ1vHZT33THSIr8=", + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "rev": "e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "type": "github" + } + }, "yazi": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_6", "nixpkgs": "nixpkgs_3", - "rust-overlay": "rust-overlay_2" + "rust-overlay": "rust-overlay_3" }, "locked": { "lastModified": 1738314122, @@ -975,7 +1867,7 @@ "flake-compat": [ "ghostty" ], - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "nixpkgs": [ "ghostty", "nixpkgs-stable" diff --git a/flake.nix b/flake.nix index 9ae0171..d8808a2 100755 --- a/flake.nix +++ b/flake.nix @@ -11,15 +11,14 @@ url = "github:hercules-ci/flake-parts"; inputs.nixpkgs-lib.follows = "nixpkgs"; }; - systems.url = "github:nix-systems/x86_64-linux"; home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - ngipkgs.url = "github:ngi-nix/ngipkgs"; ghostty = { url = "github:ghostty-org/ghostty"; }; + ngipkgs.url = "github:ngi-nix/ngipkgs"; nur = { url = "github:nix-community/NUR"; inputs.nixpkgs.follows = "nixpkgs"; @@ -28,6 +27,7 @@ url = "github:cachix/pre-commit-hooks.nix"; inputs.nixpkgs.follows = "nixpkgs"; }; + systems.url = "github:nix-systems/x86_64-linux"; sops-nix = { url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; @@ -37,6 +37,30 @@ url = "github:helix-editor/helix"; inputs.nixpkgs.follows = "nixpkgs"; }; + hyprland = { + url = "github:hyprwm/Hyprland"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + hyprland-portal = { + url = "github:hyprwm/xdg-desktop-portal-hyprland"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + hypridle = { + url = "github:hyprwm/hypridle"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + wpaperd = { + url = "github:danyspin97/wpaperd"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + waybar = { + url = "github:Alexays/Waybar"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + direnv = { + url = "github:direnv/direnv"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = diff --git a/home/default.nix b/home/default.nix index f61d53d..eee8197 100755 --- a/home/default.nix +++ b/home/default.nix @@ -50,7 +50,7 @@ in messaging sharing tools - hypr + desktop ; }; }; diff --git a/home/modules/cli/utilities/direnv/default.nix b/home/modules/cli/utilities/direnv/default.nix index 2b51c9d..1f3caeb 100755 --- a/home/modules/cli/utilities/direnv/default.nix +++ b/home/modules/cli/utilities/direnv/default.nix @@ -1,6 +1,12 @@ +{ + flake, + pkgs, + ... +}: { programs.direnv = { enable = true; + package = flake.inputs.direnv.packages.${pkgs.system}.default; nix-direnv.enable = true; }; } diff --git a/home/modules/cli/utilities/paMixer/default.nix b/home/modules/cli/utilities/paMixer/default.nix old mode 100755 new mode 100644 diff --git a/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/flake/selfHosted.nix b/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/flake/selfHosted.nix index 33086ba..b9f26fd 100755 --- a/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/flake/selfHosted.nix +++ b/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/flake/selfHosted.nix @@ -64,16 +64,16 @@ in ]; keyword = instances.forgejo.label; } - # { - # name = instances.hledger.label; - # url = "http://localhost.${builtins.toString instances.hledger.ports.port0}"; - # tags = [ - # instances.hledger.name - # "hledger" - # "finances" - # ]; - # keyword = instances.hledger.label; - # } + { + name = instances.hledger.label; + url = "http://localhost.${builtins.toString instances.hledger.ports.port0}"; + tags = [ + instances.hledger.name + "hledger" + "finances" + ]; + keyword = instances.hledger.label; + } { name = "${instances.jellyfin.label} (Internet)"; url = "https://${instances.jellyfin.name}.${instances.web.domains.url0}"; diff --git a/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/tools.nix b/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/tools.nix index c7662d5..6216df7 100755 --- a/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/tools.nix +++ b/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/tools.nix @@ -2,18 +2,9 @@ name = "Tools"; toolbar = false; bookmarks = [ - { - name = "Mullvad"; - url = "https://mullvad.net"; - tags = [ - "mullvad" - "vpn" - ]; - keyword = "Mull"; - } { name = "Cyanophage Layout Analyzer"; - url = "https://cyanophage.github.io"; + url = "https://cyanophage.github.io/"; tags = [ "cyanophage" "keyboard" @@ -21,15 +12,6 @@ ]; keyword = "Layout"; } - { - name = "Smtp2Go"; - url = "https://app-us.smtp2go.com/dashboard/main"; - tags = [ - "smtp" - "email" - ]; - keyword = "Smtp"; - } { name = "Oryx"; url = "https://configure.zsa.io/moonlander"; diff --git a/home/modules/gui/apps/browsers/firefox/config/themes/config/userChrome.css b/home/modules/gui/apps/browsers/firefox/config/themes/config/userChrome.css index ba839e4..a337c32 100755 --- a/home/modules/gui/apps/browsers/firefox/config/themes/config/userChrome.css +++ b/home/modules/gui/apps/browsers/firefox/config/themes/config/userChrome.css @@ -19,7 +19,7 @@ } .titlebar-buttonbox-container { - display: visible !important; + display: none !important; } @@ -91,8 +91,8 @@ #forward-button[disabled="true"] { display: none !important; } -.personalize-button { - display: none !important; +.personalize-button { + display: none !important; } .tab-close-button { diff --git a/home/modules/gui/apps/media/llms/alpaca/default.nix b/home/modules/gui/apps/media/llms/alpaca/default.nix deleted file mode 100755 index 9ea72d3..0000000 --- a/home/modules/gui/apps/media/llms/alpaca/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ - pkgs, - ... -}: -{ - home.packages = builtins.attrValues { - inherit (pkgs) - alpaca - ; - }; -} diff --git a/home/modules/gui/apps/media/llms/default.nix b/home/modules/gui/apps/media/llms/default.nix deleted file mode 100755 index f106bc5..0000000 --- a/home/modules/gui/apps/media/llms/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -let - content = builtins.readDir ./.; - - dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content); - - importList = map (name: ./. + "/${name}") dirContent; -in -{ - imports = importList; -} diff --git a/home/modules/gui/apps/media/3d/blender/default.nix b/home/modules/gui/apps/media/modeling/blender/default.nix similarity index 100% rename from home/modules/gui/apps/media/3d/blender/default.nix rename to home/modules/gui/apps/media/modeling/blender/default.nix diff --git a/home/modules/gui/apps/media/3d/default.nix b/home/modules/gui/apps/media/modeling/default.nix similarity index 100% rename from home/modules/gui/apps/media/3d/default.nix rename to home/modules/gui/apps/media/modeling/default.nix diff --git a/home/modules/gui/apps/media/3d/sweetHome/default.nix b/home/modules/gui/apps/media/modeling/sweetHome/default.nix similarity index 100% rename from home/modules/gui/apps/media/3d/sweetHome/default.nix rename to home/modules/gui/apps/media/modeling/sweetHome/default.nix diff --git a/home/modules/gui/apps/tools/flameshot/default.nix b/home/modules/gui/apps/tools/flameshot/default.nix index 0761a97..9246e61 100755 --- a/home/modules/gui/apps/tools/flameshot/default.nix +++ b/home/modules/gui/apps/tools/flameshot/default.nix @@ -1,5 +1,4 @@ { pkgs, ... }: - let flameshotGrim = pkgs.flameshot.overrideAttrs (oldAttrs: { src = pkgs.fetchFromGitHub { @@ -21,15 +20,10 @@ in package = flameshotGrim; settings = { General = { - disabledTrayIcon = false; + disabledTrayIcon = true; showStartupLaunchMessage = false; - # disabledGrimWarning = false; + disabledGrimWarning = true; }; }; }; - home.packages = builtins.attrValues { - inherit (pkgs) - # flameshot - ; - }; } diff --git a/home/modules/gui/apps/tools/mullvad/default.nix b/home/modules/gui/apps/tools/mullvad/default.nix deleted file mode 100755 index 27636ef..0000000 --- a/home/modules/gui/apps/tools/mullvad/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ - pkgs, - ... -}: -{ - home.packages = builtins.attrValues { - inherit (pkgs) - # mullvad - mullvad-closest - mullvad-vpn - ; - }; -} diff --git a/home/modules/gui/apps/media/llms/oterm/default.nix b/home/modules/gui/desktop/catppuccin/default.nix similarity index 71% rename from home/modules/gui/apps/media/llms/oterm/default.nix rename to home/modules/gui/desktop/catppuccin/default.nix index a17b82a..b79eb74 100755 --- a/home/modules/gui/apps/media/llms/oterm/default.nix +++ b/home/modules/gui/desktop/catppuccin/default.nix @@ -5,7 +5,8 @@ { home.packages = builtins.attrValues { inherit (pkgs) - oterm + catppuccin + catppuccin-gtk ; }; } diff --git a/home/modules/gui/desktop/hypr/dunst/config/settings.nix b/home/modules/gui/desktop/dunst/config/settings.nix similarity index 100% rename from home/modules/gui/desktop/hypr/dunst/config/settings.nix rename to home/modules/gui/desktop/dunst/config/settings.nix diff --git a/home/modules/gui/desktop/hypr/dunst/default.nix b/home/modules/gui/desktop/dunst/default.nix similarity index 100% rename from home/modules/gui/desktop/hypr/dunst/default.nix rename to home/modules/gui/desktop/dunst/default.nix diff --git a/home/modules/gui/desktop/hypr/easyEffects/default.nix b/home/modules/gui/desktop/easyEffects/default.nix similarity index 100% rename from home/modules/gui/desktop/hypr/easyEffects/default.nix rename to home/modules/gui/desktop/easyEffects/default.nix diff --git a/home/modules/gui/desktop/hypr/gammastep/default.nix b/home/modules/gui/desktop/gammastep/default.nix similarity index 100% rename from home/modules/gui/desktop/hypr/gammastep/default.nix rename to home/modules/gui/desktop/gammastep/default.nix diff --git a/home/modules/gui/desktop/gnome/default.nix b/home/modules/gui/desktop/gnome/default.nix deleted file mode 100755 index b99bea4..0000000 --- a/home/modules/gui/desktop/gnome/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = builtins.attrValues { - inherit (pkgs) - gnome-connections - gnome-tweaks - gnome-shell-extensions - gnome-remote-desktop - ulauncher - ; - inherit (pkgs.gnomeExtensions) - tiling-shell - keep-awake - notification-banner-reloaded - no-overview - wallpaper-slideshow - dash-to-panel - just-perfection - appindicator - tiling-assistant - start-overlay-in-application-view - ; - }; -} diff --git a/home/modules/gui/apps/tools/gtk/config/cursorTheme.nix b/home/modules/gui/desktop/gtk/config/cursorTheme.nix similarity index 100% rename from home/modules/gui/apps/tools/gtk/config/cursorTheme.nix rename to home/modules/gui/desktop/gtk/config/cursorTheme.nix diff --git a/home/modules/gui/apps/tools/gtk/config/gtk3.nix b/home/modules/gui/desktop/gtk/config/gtk3.nix similarity index 100% rename from home/modules/gui/apps/tools/gtk/config/gtk3.nix rename to home/modules/gui/desktop/gtk/config/gtk3.nix diff --git a/home/modules/gui/apps/tools/gtk/config/homeCursor.nix b/home/modules/gui/desktop/gtk/config/homeCursor.nix similarity index 100% rename from home/modules/gui/apps/tools/gtk/config/homeCursor.nix rename to home/modules/gui/desktop/gtk/config/homeCursor.nix diff --git a/home/modules/gui/apps/tools/gtk/config/iconTheme.nix b/home/modules/gui/desktop/gtk/config/iconTheme.nix similarity index 100% rename from home/modules/gui/apps/tools/gtk/config/iconTheme.nix rename to home/modules/gui/desktop/gtk/config/iconTheme.nix diff --git a/home/modules/gui/apps/tools/gtk/config/theme.nix b/home/modules/gui/desktop/gtk/config/theme.nix similarity index 100% rename from home/modules/gui/apps/tools/gtk/config/theme.nix rename to home/modules/gui/desktop/gtk/config/theme.nix diff --git a/home/modules/gui/apps/tools/gtk/default.nix b/home/modules/gui/desktop/gtk/default.nix similarity index 100% rename from home/modules/gui/apps/tools/gtk/default.nix rename to home/modules/gui/desktop/gtk/default.nix diff --git a/home/modules/gui/desktop/hypr/default.nix b/home/modules/gui/desktop/hypr/default.nix deleted file mode 100755 index f106bc5..0000000 --- a/home/modules/gui/desktop/hypr/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -let - content = builtins.readDir ./.; - - dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content); - - importList = map (name: ./. + "/${name}") dirContent; -in -{ - imports = importList; -} diff --git a/home/modules/gui/desktop/hypr/hypridle/config/settings.nix b/home/modules/gui/desktop/hypridle/config/settings.nix similarity index 100% rename from home/modules/gui/desktop/hypr/hypridle/config/settings.nix rename to home/modules/gui/desktop/hypridle/config/settings.nix diff --git a/home/modules/gui/desktop/hypr/hypridle/default.nix b/home/modules/gui/desktop/hypridle/default.nix similarity index 63% rename from home/modules/gui/desktop/hypr/hypridle/default.nix rename to home/modules/gui/desktop/hypridle/default.nix index 9da16ce..74bff5f 100755 --- a/home/modules/gui/desktop/hypr/hypridle/default.nix +++ b/home/modules/gui/desktop/hypridle/default.nix @@ -1,3 +1,8 @@ +{ + flake, + pkgs, + ... +}: let configPath = ./config; settingsPath = import (configPath + /settings.nix); @@ -5,6 +10,7 @@ in { services.hypridle = { enable = true; + package = flake.inputs.hypridle.packages.${pkgs.system}.hypridle; settings = settingsPath; }; } diff --git a/home/modules/gui/desktop/hypr/hyprland/config/animations.nix b/home/modules/gui/desktop/hyprland/config/animations.nix similarity index 100% rename from home/modules/gui/desktop/hypr/hyprland/config/animations.nix rename to home/modules/gui/desktop/hyprland/config/animations.nix diff --git a/home/modules/gui/desktop/hypr/hyprland/config/bind.nix b/home/modules/gui/desktop/hyprland/config/bind.nix similarity index 100% rename from home/modules/gui/desktop/hypr/hyprland/config/bind.nix rename to home/modules/gui/desktop/hyprland/config/bind.nix diff --git a/home/modules/gui/desktop/hypr/hyprland/config/bindl.nix b/home/modules/gui/desktop/hyprland/config/bindl.nix similarity index 100% rename from home/modules/gui/desktop/hypr/hyprland/config/bindl.nix rename to home/modules/gui/desktop/hyprland/config/bindl.nix diff --git a/home/modules/gui/desktop/hypr/hyprland/config/bindm.nix b/home/modules/gui/desktop/hyprland/config/bindm.nix similarity index 100% rename from home/modules/gui/desktop/hypr/hyprland/config/bindm.nix rename to home/modules/gui/desktop/hyprland/config/bindm.nix diff --git a/home/modules/gui/desktop/hypr/hyprland/config/binds.nix b/home/modules/gui/desktop/hyprland/config/binds.nix similarity index 100% rename from home/modules/gui/desktop/hypr/hyprland/config/binds.nix rename to home/modules/gui/desktop/hyprland/config/binds.nix diff --git a/home/modules/gui/desktop/hypr/hyprland/config/decoration.nix b/home/modules/gui/desktop/hyprland/config/decoration.nix similarity index 100% rename from home/modules/gui/desktop/hypr/hyprland/config/decoration.nix rename to home/modules/gui/desktop/hyprland/config/decoration.nix diff --git a/home/modules/gui/desktop/hypr/hyprland/config/dwindle.nix b/home/modules/gui/desktop/hyprland/config/dwindle.nix similarity index 100% rename from home/modules/gui/desktop/hypr/hyprland/config/dwindle.nix rename to home/modules/gui/desktop/hyprland/config/dwindle.nix diff --git a/home/modules/gui/desktop/hypr/hyprland/config/exec-once.nix b/home/modules/gui/desktop/hyprland/config/exec-once.nix similarity index 100% rename from home/modules/gui/desktop/hypr/hyprland/config/exec-once.nix rename to home/modules/gui/desktop/hyprland/config/exec-once.nix diff --git a/home/modules/gui/desktop/hypr/hyprland/config/general.nix b/home/modules/gui/desktop/hyprland/config/general.nix similarity index 100% rename from home/modules/gui/desktop/hypr/hyprland/config/general.nix rename to home/modules/gui/desktop/hyprland/config/general.nix diff --git a/home/modules/gui/desktop/hypr/hyprland/config/input.nix b/home/modules/gui/desktop/hyprland/config/input.nix similarity index 100% rename from home/modules/gui/desktop/hypr/hyprland/config/input.nix rename to home/modules/gui/desktop/hyprland/config/input.nix diff --git a/home/modules/gui/desktop/hypr/hyprland/config/misc.nix b/home/modules/gui/desktop/hyprland/config/misc.nix similarity index 100% rename from home/modules/gui/desktop/hypr/hyprland/config/misc.nix rename to home/modules/gui/desktop/hyprland/config/misc.nix diff --git a/home/modules/gui/desktop/hypr/hyprland/config/windowrulev2.nix b/home/modules/gui/desktop/hyprland/config/windowrulev2.nix similarity index 100% rename from home/modules/gui/desktop/hypr/hyprland/config/windowrulev2.nix rename to home/modules/gui/desktop/hyprland/config/windowrulev2.nix diff --git a/home/modules/gui/desktop/hypr/hyprland/config/xwayland.nix b/home/modules/gui/desktop/hyprland/config/xwayland.nix similarity index 100% rename from home/modules/gui/desktop/hypr/hyprland/config/xwayland.nix rename to home/modules/gui/desktop/hyprland/config/xwayland.nix diff --git a/home/modules/gui/desktop/hypr/hyprland/default.nix b/home/modules/gui/desktop/hyprland/default.nix similarity index 93% rename from home/modules/gui/desktop/hypr/hyprland/default.nix rename to home/modules/gui/desktop/hyprland/default.nix index 319af77..fb2ab94 100755 --- a/home/modules/gui/desktop/hypr/hyprland/default.nix +++ b/home/modules/gui/desktop/hyprland/default.nix @@ -1,4 +1,5 @@ { + pkgs, flake, config, ... @@ -28,6 +29,7 @@ in { wayland.windowManager.hyprland = { enable = true; + package = flake.inputs.hyprland.packages.${pkgs.system}.hyprland; xwayland.enable = true; systemd.enable = false; settings = configImports; diff --git a/home/modules/gui/desktop/hypr/network/default.nix b/home/modules/gui/desktop/network/default.nix similarity index 100% rename from home/modules/gui/desktop/hypr/network/default.nix rename to home/modules/gui/desktop/network/default.nix diff --git a/home/modules/gui/desktop/hypr/nwgLook/default.nix b/home/modules/gui/desktop/nwgLook/default.nix similarity index 100% rename from home/modules/gui/desktop/hypr/nwgLook/default.nix rename to home/modules/gui/desktop/nwgLook/default.nix diff --git a/home/modules/gui/desktop/hypr/plasmaNm/default.nix b/home/modules/gui/desktop/plasmaNm/default.nix similarity index 100% rename from home/modules/gui/desktop/hypr/plasmaNm/default.nix rename to home/modules/gui/desktop/plasmaNm/default.nix diff --git a/home/modules/gui/desktop/hypr/swaylock/config/settings.nix b/home/modules/gui/desktop/swaylock/config/settings.nix similarity index 100% rename from home/modules/gui/desktop/hypr/swaylock/config/settings.nix rename to home/modules/gui/desktop/swaylock/config/settings.nix diff --git a/home/modules/gui/desktop/hypr/swaylock/default.nix b/home/modules/gui/desktop/swaylock/default.nix similarity index 100% rename from home/modules/gui/desktop/hypr/swaylock/default.nix rename to home/modules/gui/desktop/swaylock/default.nix diff --git a/home/modules/gui/desktop/hypr/tofi/config/settings.nix b/home/modules/gui/desktop/tofi/config/settings.nix similarity index 100% rename from home/modules/gui/desktop/hypr/tofi/config/settings.nix rename to home/modules/gui/desktop/tofi/config/settings.nix diff --git a/home/modules/gui/desktop/hypr/tofi/default.nix b/home/modules/gui/desktop/tofi/default.nix similarity index 100% rename from home/modules/gui/desktop/hypr/tofi/default.nix rename to home/modules/gui/desktop/tofi/default.nix diff --git a/home/modules/gui/desktop/hypr/udiskie/default.nix b/home/modules/gui/desktop/udiskie/default.nix similarity index 100% rename from home/modules/gui/desktop/hypr/udiskie/default.nix rename to home/modules/gui/desktop/udiskie/default.nix diff --git a/home/modules/gui/desktop/hypr/wallet/default.nix b/home/modules/gui/desktop/wallet/default.nix similarity index 100% rename from home/modules/gui/desktop/hypr/wallet/default.nix rename to home/modules/gui/desktop/wallet/default.nix diff --git a/home/modules/gui/desktop/hypr/waybar/config/scripts/get_weather.sh b/home/modules/gui/desktop/waybar/config/scripts/get_weather.sh similarity index 100% rename from home/modules/gui/desktop/hypr/waybar/config/scripts/get_weather.sh rename to home/modules/gui/desktop/waybar/config/scripts/get_weather.sh diff --git a/home/modules/gui/desktop/hypr/waybar/config/settings.nix b/home/modules/gui/desktop/waybar/config/settings.nix similarity index 100% rename from home/modules/gui/desktop/hypr/waybar/config/settings.nix rename to home/modules/gui/desktop/waybar/config/settings.nix diff --git a/home/modules/gui/desktop/hypr/waybar/config/style.nix b/home/modules/gui/desktop/waybar/config/style.nix similarity index 100% rename from home/modules/gui/desktop/hypr/waybar/config/style.nix rename to home/modules/gui/desktop/waybar/config/style.nix diff --git a/home/modules/gui/desktop/hypr/waybar/default.nix b/home/modules/gui/desktop/waybar/default.nix similarity index 82% rename from home/modules/gui/desktop/hypr/waybar/default.nix rename to home/modules/gui/desktop/waybar/default.nix index d513e5e..9d275e8 100755 --- a/home/modules/gui/desktop/hypr/waybar/default.nix +++ b/home/modules/gui/desktop/waybar/default.nix @@ -12,6 +12,7 @@ in { programs.waybar = { enable = true; + package = flake.inputs.waybar.packages.${pkgs.system}.default; settings = settingsPath; style = stylePath; }; diff --git a/home/modules/gui/desktop/hypr/wlClipboard/default.nix b/home/modules/gui/desktop/wlClipboard/default.nix similarity index 100% rename from home/modules/gui/desktop/hypr/wlClipboard/default.nix rename to home/modules/gui/desktop/wlClipboard/default.nix diff --git a/home/modules/gui/desktop/hypr/wpaperd/default.nix b/home/modules/gui/desktop/wpaperd/default.nix similarity index 73% rename from home/modules/gui/desktop/hypr/wpaperd/default.nix rename to home/modules/gui/desktop/wpaperd/default.nix index 7d569f3..b24bb60 100755 --- a/home/modules/gui/desktop/hypr/wpaperd/default.nix +++ b/home/modules/gui/desktop/wpaperd/default.nix @@ -1,6 +1,12 @@ +{ + flake, + pkgs, + ... +}: { programs.wpaperd = { enable = true; + package = flake.inputs.wpaperd.packages.${pkgs.system}.default; settings = { "default" = { path = "~/Files/Projects/dotfiles/home/modules/gui/desktop/wpaperd/wallpaper"; diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/FTDCMyaXoAEUn5h.jpg b/home/modules/gui/desktop/wpaperd/wallpaper/FTDCMyaXoAEUn5h.jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/FTDCMyaXoAEUn5h.jpg rename to home/modules/gui/desktop/wpaperd/wallpaper/FTDCMyaXoAEUn5h.jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/pinksky.png b/home/modules/gui/desktop/wpaperd/wallpaper/pinksky.png similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/pinksky.png rename to home/modules/gui/desktop/wpaperd/wallpaper/pinksky.png diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/u6ne2q214dx71.jpg b/home/modules/gui/desktop/wpaperd/wallpaper/u6ne2q214dx71.jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/u6ne2q214dx71.jpg rename to home/modules/gui/desktop/wpaperd/wallpaper/u6ne2q214dx71.jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-0wj757.jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-0wj757.jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-0wj757.jpg rename to home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-0wj757.jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-2ege2g.jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-2ege2g.jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-2ege2g.jpg rename to home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-2ege2g.jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-4dj2qo.png b/home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-4dj2qo.png similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-4dj2qo.png rename to home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-4dj2qo.png diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-4xq6vv.png b/home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-4xq6vv.png similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-4xq6vv.png rename to home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-4xq6vv.png diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-5dyvy3.jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-5dyvy3.jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-5dyvy3.jpg rename to home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-5dyvy3.jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-735xv3.jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-735xv3.jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-735xv3.jpg rename to home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-735xv3.jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-8xe25y.jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-8xe25y.jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-8xe25y.jpg rename to home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-8xe25y.jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-g8ky73.jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-g8ky73.jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-g8ky73.jpg rename to home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-g8ky73.jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-j8wzvp.jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-j8wzvp.jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-j8wzvp.jpg rename to home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-j8wzvp.jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-nekxjk.png b/home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-nekxjk.png similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-nekxjk.png rename to home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-nekxjk.png diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-nryz87.jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-nryz87.jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-nryz87.jpg rename to home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-nryz87.jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-r7yey1.jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-r7yey1.jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-r7yey1.jpg rename to home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-r7yey1.jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-vge32m.jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-vge32m.jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-vge32m.jpg rename to home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-vge32m.jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-vgxgem.jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-vgxgem.jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-vgxgem.jpg rename to home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-vgxgem.jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (1).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (1).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (1).jpg rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (1).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (10).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (10).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (10).jpg rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (10).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (11).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (11).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (11).jpg rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (11).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (12).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (12).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (12).jpg rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (12).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (13).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (13).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (13).jpg rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (13).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (14).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (14).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (14).jpg rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (14).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (15).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (15).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (15).jpg rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (15).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (16).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (16).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (16).jpg rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (16).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (17).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (17).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (17).jpg rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (17).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (19).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (19).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (19).jpg rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (19).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (2).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (2).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (2).jpg rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (2).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (20).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (20).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (20).jpg rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (20).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (21).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (21).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (21).jpg rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (21).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (22).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (22).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (22).jpg rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (22).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (23).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (23).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (23).jpg rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (23).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (24).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (24).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (24).jpg rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (24).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (26).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (26).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (26).jpg rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (26).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (27).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (27).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (27).jpg rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (27).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (28).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (28).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (28).jpg rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (28).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (29).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (29).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (29).jpg rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (29).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (3).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (3).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (3).jpg rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (3).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (30).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (30).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (30).jpg rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (30).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (31).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (31).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (31).jpg rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (31).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (32).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (32).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (32).jpg rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (32).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (34).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (34).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (34).jpg rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (34).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (35).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (35).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (35).jpg rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (35).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (37).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (37).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (37).jpg rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (37).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (38).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (38).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (38).jpg rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (38).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (4).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (4).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (4).jpg rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (4).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (5).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (5).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (5).jpg rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (5).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (6).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (6).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (6).jpg rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (6).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (7).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (7).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (7).jpg rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (7).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (8).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (8).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (8).jpg rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (8).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (9).jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (9).jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (9).jpg rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (9).jpg diff --git a/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper.jpg b/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper.jpg similarity index 100% rename from home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper.jpg rename to home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper.jpg diff --git a/nixos/default.nix b/nixos/default.nix index e487c96..50cb6a7 100755 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -58,7 +58,6 @@ in desktop = { imports = builtins.attrValues { inherit (modules) - mullvad syncthing ollama ; diff --git a/nixos/modules/hyprland/hyprland.nix b/nixos/modules/hyprland/hyprland.nix index 4038bdd..e04e46e 100755 --- a/nixos/modules/hyprland/hyprland.nix +++ b/nixos/modules/hyprland/hyprland.nix @@ -7,8 +7,8 @@ programs.hyprland = { enable = true; xwayland.enable = true; - # package = flake.inputs.hyprland.packages.${pkgs.system}.hyprland; - # portalPackage = flake.inputs.hyprland-portal.packages.${pkgs.system}.xdg-desktop-portal-hyprland; + package = flake.inputs.hyprland.packages.${pkgs.system}.hyprland; + portalPackage = flake.inputs.hyprland-portal.packages.${pkgs.system}.xdg-desktop-portal-hyprland; }; nix = { settings = { diff --git a/nixos/modules/mullvad.nix b/nixos/modules/mullvad.nix deleted file mode 100755 index 28c51b7..0000000 --- a/nixos/modules/mullvad.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - services.mullvad-vpn = { - enable = true; - enableExcludeWrapper = false; - }; -} diff --git a/nixos/modules/ollama.nix b/nixos/modules/ollama.nix index 48eff9a..c8ecc7f 100755 --- a/nixos/modules/ollama.nix +++ b/nixos/modules/ollama.nix @@ -24,9 +24,15 @@ in enable = true; group = service.name; host = "http://${localhost}"; - models = service.paths.path1; + # models = service.paths.path1; user = service.name; }; + # llama-cpp = { + # enable = true; + # port = 8080; + # host = localhost; + # model = "/models/qwen2.5-coder-32b-instruct-q8_0-00004-of-00005.gguf"; + # }; open-webui = { enable = true; host = localhost; @@ -42,12 +48,8 @@ in }; }; - users.users.${service.name}.extraGroups = [ - "users" - ]; - systemd.tmpfiles.rules = [ - "Z ${service.paths.path1} 0777 ${service.name} ${service.name} -" + "Z ${service.paths.path1} 0755 ${service.name} ${service.name} -" ]; networking = { diff --git a/nixos/modules/services/forgejo.nix b/nixos/modules/services/forgejo.nix index 0a460ec..632fe61 100755 --- a/nixos/modules/services/forgejo.nix +++ b/nixos/modules/services/forgejo.nix @@ -7,7 +7,10 @@ let inherit (flake.config.machines.devices) server ; - inherit (flake.config.services.instances) smtp forgejo web; + inherit (flake.config.services.instances) + forgejo + web + ; service = forgejo; localhost = web.localhost.address0; host = "${service.subdomain}.${web.domains.url3}"; @@ -45,11 +48,11 @@ in }; mailer = { ENABLED = true; - SMTP_ADDR = smtp.hostname; + SMTP_ADDR = "smtp.protonmail.ch"; FROM = service.email.address0; USER = service.email.address0; PROTOCOL = "smtp+starttls"; - SMTP_PORT = smtp.ports.port0; + SMTP_PORT = 587; SEND_AS_PLAIN_TEXT = true; USE_CLIENT_CERT = false; }; diff --git a/nixos/modules/services/mastodon/default.nix b/nixos/modules/services/mastodon/default.nix index 1c10ca9..463f444 100755 --- a/nixos/modules/services/mastodon/default.nix +++ b/nixos/modules/services/mastodon/default.nix @@ -9,7 +9,10 @@ let inherit (flake.config.machines.devices) server ; - inherit (flake.config.services.instances) smtp mastodon web; + inherit (flake.config.services.instances) + mastodon + web + ; service = mastodon; host = "${mastodon.subdomain}.${web.domains.url3}"; localhost = web.localhost.address0; @@ -106,9 +109,9 @@ in authenticate = true; createLocally = false; fromAddress = "upRootNutrition <${service.email.address0}>"; - host = smtp.hostname; + host = "smtp.protonmail.ch"; passwordFile = config.sops.secrets.mastodon-smtp.path; - port = smtp.ports.port0; + port = 587; user = service.email.address0; }; }; diff --git a/nixos/modules/services/peertube.nix b/nixos/modules/services/peertube.nix index fa27c99..56ca553 100755 --- a/nixos/modules/services/peertube.nix +++ b/nixos/modules/services/peertube.nix @@ -11,7 +11,6 @@ let inherit (flake.config.services.instances) caddy peertube - smtp web ; service = peertube; @@ -56,8 +55,8 @@ in transport = "smtp"; disable_starttls = false; from_address = service.email.address0; - hostname = smtp.hostname; - port = smtp.ports.port0; + hostname = "smtp.protonmail.ch"; + port = 587; username = service.email.address0; tls = false; }; diff --git a/nixos/modules/services/vaultwarden.nix b/nixos/modules/services/vaultwarden.nix index 7dd8d4d..89ea5e2 100755 --- a/nixos/modules/services/vaultwarden.nix +++ b/nixos/modules/services/vaultwarden.nix @@ -2,14 +2,16 @@ flake, config, ... -}: -let - inherit (flake.config.services.instances) smtp vaultwarden web; +}: let + inherit + (flake.config.services.instances) + vaultwarden + web + ; service = vaultwarden; localhost = web.localhost.address0; host = "${service.subdomain}.${web.domains.url0}"; -in -{ +in { services = { vaultwarden = { backupDir = service.paths.path0; @@ -23,9 +25,9 @@ in SMTP_AUTH_MECHANISM = "Plain"; SMTP_EMBED_IMAGES = true; SMTP_FROM = service.email.address0; - SMTP_FROM_NAME = service.label; - SMTP_HOST = smtp.hostname; - SMTP_PORT = smtp.ports.port0; + SMTP_FROM_NAME = "Vaultwarden"; + SMTP_HOST = "smtp.protonmail.ch"; + SMTP_PORT = 587; SMTP_SECURITY = "starttls"; SMTP_USERNAME = service.email.address0; @@ -62,26 +64,24 @@ in }; }; - sops = - let - sopsPath = secret: { - path = "${service.sops.path0}/${service.name}-${secret}"; - owner = service.name; - mode = "600"; - }; - in - { - secrets = builtins.listToAttrs ( - map - (secret: { - name = "${service.name}/${secret}"; - value = sopsPath secret; - }) - [ - "env" - ] - ); + sops = let + sopsPath = secret: { + path = "${service.sops.path0}/${service.name}-${secret}"; + owner = service.name; + mode = "600"; }; + in { + secrets = builtins.listToAttrs ( + map + (secret: { + name = "${service.name}/${secret}"; + value = sopsPath secret; + }) + [ + "env" + ] + ); + }; systemd.tmpfiles.rules = [ "Z ${service.paths.path0} 0755 ${service.name} ${service.name} -" diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml index 035cf5b..cf315b4 100755 --- a/secrets/secrets.yaml +++ b/secrets/secrets.yaml @@ -7,20 +7,22 @@ network: server: ENC[AES256_GCM,data:EFsmXNkuf5OAMh8hjfZTixmmdjqBNIME9JjQC8azeCwcMVInm8bWdxE4OqFmxOk9MAU=,iv:pI6WeM2aQC+7vx1Xmp5O2rikqNLgzuEOg+Lo7TqFQxU=,tag:ElcA8mn9dx+IjIf38nKT5A==,type:str] fallaryn: ENC[AES256_GCM,data:O77hH3STB6zpl0b9iXsVu9OOrlLKUwfs2qI9hdqX4kMuBs3XgT/xsQ==,iv:RDKsuJoy+LIyADMc3bgOEmLKdXtu6kad2aeVetuZdJI=,tag:MrpCZ+iJUnGIjeHMgcYG6Q==,type:str] garnet: ENC[AES256_GCM,data:N8sAdjTAiubQihKrtdCkaJQBKkz6/kNdeATiaZXRhlP/HLg7zg==,iv:8QP1HnGSUGHpkwBwQY2Z0gZ6tYaK7XzMuxXexY6QQaU=,tag:fHzPh9lvqB2BmuSkVH5Ojg==,type:str] -mastodon-smtp: ENC[AES256_GCM,data:8/uQKw0bmDrepKXSv0ausw==,iv:/Dn47RsjYSjGgFEf3BrLKrosTwqzpv4J5SCNFKczdIw=,tag:7GN8oYvXiZuRCPU6mh5Slg==,type:str] +mastodon-smtp: ENC[AES256_GCM,data:kGCckgG9vSZYJv/8Z9e58g==,iv:Jw9hDAtVe7LmPpdy/nN0JD9T6j8/OHcFcYiuOjQmJuc=,tag:VlGkBZE5kkzXPgZPw9o49A==,type:str] mastodon-database: ENC[AES256_GCM,data:qPOU8yGqEQWuMJ4E/fCc+vfKp+YZONb17ZIDHXYZ9RY=,iv:HzVd2ptZBtpRA/XA593WTNL3xJx97hvNx49zIZPBlhQ=,tag:KGZ7Mw2M5O9DBhB+fv+w1Q==,type:str] mastodon-redis: ENC[AES256_GCM,data:aEEOGmyLin80X1uNiLLIuCSGlGjYX9vOl45GuxwlJqE=,iv:3qaZAqwm6tLnB1vCtZ2ZotaZO4/XmQKLe/I+pzqbJj0=,tag:K1y1QoLgGRvi8oJrzcakhQ==,type:str] -peertube-smtp: ENC[AES256_GCM,data:rBmjyf4J7fNbnKICkUIVIw==,iv:wbyTkVmBJLIB4yZibVpr3+6Jn/FMEQSSi7UFCtiCkUg=,tag:ByMTXTyyiys9ONekQGxsYw==,type:str] +peertube-smtp: ENC[AES256_GCM,data:YBqlU0FQ2hveRSTU3iWygQ==,iv:lpmfylfOdZYGg6vwCkDO/OIFeW9+7L5xzTCfiqHUDkA=,tag:VwxWLLCMJEm3W/THP97Puw==,type:str] peertube-database: ENC[AES256_GCM,data:nm0bHwTcT+ROZc2BC9jx+tXWjZ3689rdn4fdYW+7JTU=,iv:EeQVBAIXPut9gs+I9WpRf7L3f7ACTeTWycUFIKAneKk=,tag:QjGQmZ3zMAgB/WDbxTZVIQ==,type:str] peertube-redis: ENC[AES256_GCM,data:SQoPzPjgf4YN9dhvO0wo2DEra7cTgfZBx4vCBpNVSXI=,iv:mcCwYtE9E/Mb4V0j9NnU9WhaUMeBpX7BOcc8HGDiEvI=,tag:CsSiS4peZhnZ22uNtUC44w==,type:str] peertube-root: ENC[AES256_GCM,data:BR0pmqEYYJuDqK7fstyW/hvh8V1GQXVHP24iz2eDeho500IbWaMuDxkNQyfInmIfjC3YvfsHME3S,iv:EgaLKBHYrklF+q5jBPvGKFYJosZxFFMXElTcyKU0ypQ=,tag:PztyBdK5OzeEDvQi/yqRIg==,type:str] peertube-secret: ENC[AES256_GCM,data:Of4UsWGTXd+uzHE4XkxQOLKBbDd0sQHWQrLgxmn8C9bHgEB85ZnSqOe04IZ4chYKheuzBQ4Vg7pYfGFVBDjx8Q==,iv:cXuVrmQOEHtq7Q6+vzPXKdiuYjLx9hjsd3bCHpBQBqw=,tag:xL8us1XLJsdON/O+BG+xpQ==,type:str] forgejo-database: ENC[AES256_GCM,data:Stnd+vsoBDK0eLmfgaNaSdO6qY0vF1d0WgrAw1U451I=,iv:7CHPXUPXkTXP0GVqHPK3KavysbSOKuUhJ5EoeAh5Mp4=,tag:iqASITas49wrqCRN8TjLIQ==,type:str] -forgejo-smtp: ENC[AES256_GCM,data:hp1MPgzdSdgBZ47KQ+/QvQ==,iv:l/C7FFvyxPo/ndJWhOSThYUGbUZnk1WBdpCGNtnL4iE=,tag:61OGP00MTPYfmoq8yK4vEQ==,type:str] +forgejo-smtp: ENC[AES256_GCM,data:p+ARltehYqMTsiBg665PBg==,iv:uTM6Sps+4F4lEGSYUrnZYHcYSNNgpUEsxGT1TxEPUyY=,tag:pz3PN+63i/C6BPdZgy6Q5A==,type:str] +websitecastopod-smtp: ENC[AES256_GCM,data:4uyom6zG4z24f1UZywzNNq5YN94fXsu3bA==,iv:e/XsyU3QVlMxYwZ4c5iiUd4MzJZ7TZm+Wl6Zmo4II1I=,tag:lTLizICQQJaKgcj+o8Z30A==,type:str] +castopod-database: ENC[AES256_GCM,data:Yn2pHEzoEC1ZH0LVaFooHX2TzkM0V6PUboXrziIIYA0=,iv:U+oXBBmn5Yohq5Gx6N5jo2x/eRMXK8pjnxBDCMxD2Oo=,tag:i+xZW7S+tLdive+cyZpTew==,type:str] discord-token: ENC[AES256_GCM,data:PQ4VEKZUCFdSau9hHj52GkdKTnc1sdNIOrJjWbW0Wu9gNAluOutbEYd21UjP9nW/8ayPrId5dSGs6pqXQEIxT8KmnYVQXQYQ6i5xx9Ciq77pU1MipXE=,iv:lpOWnuySeLDiZMSjbsnQJCgsC3PG3v9hmaPVenlmF5g=,tag:Wdpwagj6iiiif5MZiW+yzQ==,type:str] minecraft-pass: ENC[AES256_GCM,data:0natV6dEpItFp5zsUKqgVMZLLmqRLBEf,iv:Bc7RTXnpdec0wn25Rb7SkVTf5BjXzq3YCXcjwrC7V9k=,tag:Og5qN94G6pHdpIk6YDg1ZA==,type:str] vaultwarden: - env: ENC[AES256_GCM,data:fsL+z/fSLmlhjdWJrIZ2yuF74AOo0HEnw52KMNa8lwrMRG3r6bEpjg3PD9dQ8tpqWq207Tp1QKWhYSjzmwMYjmN/7CiJpkuWMS37uWQ0bUcZN0zit+ko6g==,iv:MM9DST+uw8MdA/fnVdX+O2QtqVztQDx00DBm2c9cHSE=,tag:KTzlNSNuOY2AS4sZdvdQbg==,type:str] + env: ENC[AES256_GCM,data:UW1Waz9lhzUDfqv+n5ikiWda3z0stVca4JCb8T+4XdVGuv8peNLfZKKhcDNXvGLl2ljEJKaxzSQbRaDl5Fo+5r/dOox3kfcRhcZ2dbWpiy6O/ALN2dvs9Q==,iv:J/YjboI13JiBxNA4UHewYxc20jDDcbbNfxs+dhf56cQ=,tag:tj9cpJRxcSbSSOkpcpadTg==,type:str] dns: namecheap: ENC[AES256_GCM,data:Afxyf4cHvdnPIXYoPN3viBOzzqUOeRs3YjQ5ugerlnL9H4iSf/iAsxyzHYysOgZ/9xc0OWt6G6A7cEZHW4i82MX1+mLbvWN5ir1iHL73RtesC14=,iv:3XMTQ4TNL7iXPYFLSa+BapSgqILYuM6ZaQLMQZSJ2pc=,tag:PO69wRhCoey+CwPgnOOR6A==,type:str] nextcloud-pass: ENC[AES256_GCM,data:BJWpsEtnezl67vQWwV9WSdpPAYLg3eOXAZ301A382GE=,iv:+1LrBtbjCBcVC7m/fSbXzPnBxbVmpv+2opPoxEfcgjY=,tag:ArMw4yv+Zt6Lhm7CaS5hMg==,type:str] @@ -28,6 +30,9 @@ nextcloud-user0: ENC[AES256_GCM,data:yUZruPJ4s2Svvh6Q0f4C4lgcKCcWJDMw8CpT8cXv3m4 nextcloud-user1: ENC[AES256_GCM,data:6EsbSeWWftPjZQM=,iv:LTcx6fx55d3+SepFIoy/6cBdbgaauDeo0gvq9ACCtHA=,tag:uzoATR3ZL2Uk5z6aMiD/yw==,type:str] nextcloud-user2: ENC[AES256_GCM,data:axrWMmouq5gwqdGL,iv:BPHEn47z2g7gocKO4g5vV4ZSGb+AMA3vGYheAy1zR5Q=,tag:QOWg4fdKxMhGk2qRehH2EQ==,type:str] nextcloud-user3: ENC[AES256_GCM,data:g6ldEdtBuEmPAQYAQfaO,iv:6fElE2vZh9l/KgJuNevklpIlZZdqGHgwhnOzq1n3ojE=,tag:T0Q1IkdVTeW2T1FmGnjz8A==,type:str] +wiki-js: + pass: ENC[AES256_GCM,data:O7m5SAnwbzq/GIKxNBtDCUVpccsaE1pOs6o+quZCe/EFMElNy019J7w=,iv:bMlBND1IQ5Lxu/7lwURZfcLx4tL+7st2xZh/ne/HH7Q=,tag:/589ca3f1Y+EjKd7sJLsJQ==,type:str] + ssh: ENC[AES256_GCM,data:bhOQ2Cr9NZuCAPZttbRyEbzk08AOnxTF/5OsPkb4NNvO43X+ulIjM84pynTzeONnaBPQrq+XTXkL6jmtHzkBeZQMKeg110rWagWZfspQGOm1xT4SRgbqGjmz9pkgwlDPG2s8C/7NhPY0zPArnTJOosT3bmCANerg/WgFxv/aOqDEVzqZfqQK9t7PgFpTg2IFSIulYTys1Pwj4CA3RD9pUdW/QIUuUgAOkbHQQ2Ibo3bRR5k8nuOZe23PXt0VeT/aQ+SoK/OkkJ88+hzz2aphq3EPV/O8UeZqqcVQcVtUeG1/89eSOxwsrmiO940rh2fp3LjLTzNmpXTSjf/rxzMibKavx84TlO47FJXc0pEXJbJHdvDFta61DfQezy7pogN6ivrsE5jdL5ysJmYSePlM6z447sMZFJsRAT8QyzOA+QUvAAirY0aQfp4eBLv1XUkiXaaSb+ghP1+MqN2k9zglGXAUG5Yt6e5TLKXfDynqiVSMqywDfT8W2FrbZDSmTIVF2Bf6g1KNIv+VwJ+oeuJh,iv:EGtjs6C68rIRlOA8k0szd50zXWnL3CmEHZ4BalscqZk=,tag:LzJARDpS1N010Bskz3E4WQ==,type:str] claude-api-key: ENC[AES256_GCM,data:QzGJPBnqx4PrDjNvGeyjl0B/W9pkBS4YWK/lrDK4sx0/eBbwMk2qvi03wOhVfvz71UVRpDIZ0F3eVtB8h8Nr94Ha/8IlFQtKxrh60XIzUs/GLB2jKZursZny8IjqZMrt9YHFOphqAWawB33g,iv:XKPqQ0sGukhy0bPXATYwjJMAfSkXdeanc4kULb5TWmA=,tag:vmH+pzU5qoOF5W0fhVfhDA==,type:str] sops: kms: [] @@ -44,8 +49,8 @@ sops: bXBOa1VSakoyaWxpODJEOU11QUZCaUEK8Ch9Ten3DdrPHF1DTH2qei85AlHUOaLD aNfzakake7ej+MxJYdKEU0bcWofNMKzIlZa2uM10KZSENDP8d8qlig== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-02-03T03:16:19Z" - mac: ENC[AES256_GCM,data:zoMaGiNDQ8bZwXbmgwTK07F8mGh7HZnaMPRdcftpiy1t5HuYKXU8CdiaREaGozCyIrgvTHbtQjjtL1KFTzpCkN1+bEpL+VA75vEzAkeoImRCFNMnTVdc2I5Bo0nOg8OW5HwI7Ezdv2ZrSd3qG7YW2WZHpctvOgWAoWv2z2zGHX8=,iv:1qs7/7aQ88JbAr3wEk70t/JmxfvfIAMSWXKckPmYg74=,tag:0Tpls8L13wU4WdMU4v4e5w==,type:str] + lastmodified: "2025-01-19T05:53:28Z" + mac: ENC[AES256_GCM,data:53u+E1aSLpBL4fpZ92Hd2V995SQWV6vIMwmixBjh8Bljn0FYld9leFc9aLh8Acjx05QdPu6FCGrd9ggjPVwg59jUh4WUrptHsrO+tzPi8tuw91udLWp4navKRTU8eEH8qqu6X5x72i6j6BkvaTLk5ljyZvWfRBs7+QUmc7saTg0=,iv:ttuIjOfIzqiW660ERJ5ilIJ0578cyh363glwqYBrD/Q=,tag:CGERhUo857XVHCad+PFKkw==,type:str] pgp: [] unencrypted_suffix: _unencrypted - version: 3.9.4 + version: 3.9.3 diff --git a/systems/desktop/config/graphics.nix b/systems/desktop/config/graphics.nix index 18e5509..b67a5df 100755 --- a/systems/desktop/config/graphics.nix +++ b/systems/desktop/config/graphics.nix @@ -3,20 +3,19 @@ hardware = { graphics = { enable = true; - enable32Bit = true; extraPackages = builtins.attrValues { - # inherit (pkgs) - # amdvlk - # ; + inherit (pkgs) + amdvlk + ; inherit (pkgs.rocmPackages.clr) icd ; }; - # extraPackages32 = builtins.attrValues { - # inherit (pkgs.driversi686Linux) - # amdvlk - # ; - # }; + extraPackages32 = builtins.attrValues { + inherit (pkgs.driversi686Linux) + amdvlk + ; + }; }; }; boot.initrd.kernelModules = [ diff --git a/systems/server/config/networking.nix b/systems/server/config/networking.nix index 6f463de..d9acba9 100755 --- a/systems/server/config/networking.nix +++ b/systems/server/config/networking.nix @@ -2,11 +2,9 @@ lib, flake, ... -}: -let +}: let inherit (flake.config.machines.devices) server; -in -{ +in { networking = { hostName = server.name; networkmanager.enable = true; @@ -19,7 +17,6 @@ in 25 # SMTP 139 # SMTP 587 # SMTP - 2525 # SMTP ]; }; };