diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 index 41fbeb0..c41aa9d --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ **/result + +.pre-commit-config.yaml diff --git a/.sops.yaml b/.sops.yaml old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/docs/fcitx.md b/docs/fcitx.md old mode 100644 new mode 100755 diff --git a/docs/hyprland.md b/docs/hyprland.md old mode 100644 new mode 100755 diff --git a/docs/yazi.md b/docs/yazi.md old mode 100644 new mode 100755 diff --git a/flake.lock b/flake.lock old mode 100644 new mode 100755 index f0b5fb9..213f672 --- a/flake.lock +++ b/flake.lock @@ -344,6 +344,22 @@ } }, "flake-compat_5": { + "flake": false, + "locked": { + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", + "repo": "flake-compat", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_6": { "flake": false, "locked": { "lastModified": 1761588595, @@ -359,7 +375,7 @@ "type": "github" } }, - "flake-compat_6": { + "flake-compat_7": { "flake": false, "locked": { "lastModified": 1747046372, @@ -375,7 +391,7 @@ "type": "github" } }, - "flake-compat_7": { + "flake-compat_8": { "flake": false, "locked": { "lastModified": 1751685974, @@ -639,7 +655,7 @@ }, "flake-utils_8": { "inputs": { - "systems": "systems_11" + "systems": "systems_12" }, "locked": { "lastModified": 1731533236, @@ -693,7 +709,48 @@ "type": "github" } }, + "git-hooks": { + "inputs": { + "flake-compat": "flake-compat_4", + "gitignore": "gitignore", + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1767281941, + "narHash": "sha256-6MkqajPICgugsuZ92OMoQcgSHnD6sJHwk8AxvMcIgTE=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "f0927703b7b1c8d97511c4116eb9b4ec6645a0fa", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "gitignore": { + "inputs": { + "nixpkgs": [ + "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" + } + }, + "gitignore_2": { "inputs": { "nixpkgs": [ "hyprland", @@ -715,7 +772,7 @@ "type": "github" } }, - "gitignore_2": { + "gitignore_3": { "inputs": { "nixpkgs": [ "lanzaboote", @@ -845,7 +902,7 @@ "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "hyprwire": "hyprwire", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "pre-commit-hooks": "pre-commit-hooks", "systems": "systems_3", "xdph": "xdph" @@ -1268,7 +1325,7 @@ "inputs": { "flake-parts": "flake-parts_2", "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1764979571, @@ -1312,11 +1369,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1764971746, - "narHash": "sha256-PPwnDjR6ZjPooITfu6SWnoPsj3EV4fLrXk93U2RhjZ0=", + "lastModified": 1767833217, + "narHash": "sha256-HLr9k8g1Geq40PLsNw7I5N8TZkBYtQVjkgDPV/Kehxk=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "b0ebfba3a0774cc0b3f3b9a345ebad57de04b666", + "rev": "a789aa1512a9157d5d3392b27e60621fd0d83438", "type": "github" }, "original": { @@ -1368,11 +1425,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1764966114, - "narHash": "sha256-nC0Fsu4zSdabdR4tHHMCrTgqLms612eEDy5VCdQVZFk=", + "lastModified": 1767792726, + "narHash": "sha256-qS4tdG2iUQwSld9dTH1gk8GcIOrRi9umMgPv8MGDIA0=", "owner": "YaLTeR", "repo": "niri", - "rev": "ba29735fbbd8cf8319c71ccb55b54a0580007c80", + "rev": "10df9f4717cbd4efd20ae796eb6b0aa400127bdc", "type": "github" }, "original": { @@ -1424,7 +1481,7 @@ }, "nix-minecraft": { "inputs": { - "flake-compat": "flake-compat_6", + "flake-compat": "flake-compat_7", "flake-utils": "flake-utils_6", "nixpkgs": [ "nixpkgs" @@ -1447,7 +1504,7 @@ "nix-search-tv": { "inputs": { "flake-utils": "flake-utils_7", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1763912269, @@ -1552,11 +1609,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1764831616, - "narHash": "sha256-OtzF5wBvO0jgW1WW1rQU9cMGx7zuvkF7CAVJ1ypzkxA=", + "lastModified": 1767799921, + "narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c97c47f2bac4fa59e2cbdeba289686ae615f8ed4", + "rev": "d351d0653aeb7877273920cd3e823994e7579b0b", "type": "github" }, "original": { @@ -1566,6 +1623,22 @@ "type": "github" } }, + "nixpkgs_10": { + "locked": { + "lastModified": 1763806073, + "narHash": "sha256-FHsEKDvfWpzdADWj99z7vBk4D716Ujdyveo5+A048aI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "878e468e02bfabeda08c79250f7ad583037f2227", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1764947035, @@ -1593,6 +1666,22 @@ } }, "nixpkgs_4": { + "locked": { + "lastModified": 1764947035, + "narHash": "sha256-EYHSjVM4Ox4lvCXUMiKKs2vETUSL5mx+J2FfutM7T9w=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a672be65651c80d3f592a89b3945466584a22069", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { "locked": { "lastModified": 1767379071, "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", @@ -1608,7 +1697,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1764915887, "narHash": "sha256-CeBCJ9BMsuzVgn8GVfuSRZ6xeau7szzG0Xn6O/OxP9M=", @@ -1624,7 +1713,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1757584362, "narHash": "sha256-XeTX/w16rUNUNBsfaOVCDoMMa7Xu7KvIMT7tn1zIEcg=", @@ -1640,7 +1729,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1767364772, "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=", @@ -1656,7 +1745,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1764445028, "narHash": "sha256-ik6H/0Zl+qHYDKTXFPpzuVHSZE+uvVz2XQuQd1IVXzo=", @@ -1672,22 +1761,6 @@ "type": "github" } }, - "nixpkgs_9": { - "locked": { - "lastModified": 1763806073, - "narHash": "sha256-FHsEKDvfWpzdADWj99z7vBk4D716Ujdyveo5+A048aI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "878e468e02bfabeda08c79250f7ad583037f2227", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "noctalia": { "inputs": { "nixpkgs": [ @@ -1695,11 +1768,11 @@ ] }, "locked": { - "lastModified": 1764990750, - "narHash": "sha256-oC3RAbXX2Yu+zkIQJlWgaT8mdKcv6JDiuI0XIOEGHyo=", + "lastModified": 1767851722, + "narHash": "sha256-33madeYEiounlmTjaTZk3KV0NutlT6qwwf/RgOuIdmQ=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "bdffb0f95941a4dd45287395b0f377e7c7895834", + "rev": "f9cbc7bc57315a92af99dce80385f8e42ccfe64f", "type": "github" }, "original": { @@ -1735,7 +1808,7 @@ }, "nvf": { "inputs": { - "flake-compat": "flake-compat_7", + "flake-compat": "flake-compat_8", "flake-parts": "flake-parts_4", "mnw": "mnw", "ndg": "ndg", @@ -1760,8 +1833,8 @@ }, "pre-commit": { "inputs": { - "flake-compat": "flake-compat_5", - "gitignore": "gitignore_2", + "flake-compat": "flake-compat_6", + "gitignore": "gitignore_3", "nixpkgs": [ "lanzaboote", "nixpkgs" @@ -1783,8 +1856,8 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_4", - "gitignore": "gitignore", + "flake-compat": "flake-compat_5", + "gitignore": "gitignore_2", "nixpkgs": [ "hyprland", "nixpkgs" @@ -1833,6 +1906,7 @@ "caelestia-shell": "caelestia-shell", "disko": "disko", "ghostty": "ghostty", + "git-hooks": "git-hooks", "home-manager": "home-manager", "hyprland": "hyprland", "hyprland-plugins": "hyprland-plugins", @@ -1849,12 +1923,13 @@ "nix-search-tv": "nix-search-tv", "nix-tmodloader": "nix-tmodloader", "nixd": "nixd", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "noctalia": "noctalia", "nvf": "nvf", "rust-overlay": "rust-overlay_3", "sops-nix": "sops-nix", "stylix": "stylix", + "systems": "systems_11", "yazi": "yazi", "zen-browser": "zen-browser" } @@ -1944,7 +2019,7 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1764483358, @@ -2041,6 +2116,20 @@ } }, "systems_11": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "id": "systems", + "type": "indirect" + } + }, + "systems_12": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -2338,11 +2427,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1764721075, - "narHash": "sha256-ChH4nq0cMEEkzkHqKlQt5Z7wxrk8ybcEHuA1YKAYmV0=", + "lastModified": 1767830382, + "narHash": "sha256-0PgS7M1SV6JCN3MugFZPaP8J+Mr2o7lSDFTPVYZSIAY=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "1b918e29b419e89910014054e8b71d54c9235ea5", + "rev": "74cf1a95a35fd7aec76432bc2cd9b310e0d908c5", "type": "github" }, "original": { @@ -2354,7 +2443,7 @@ "yazi": { "inputs": { "flake-utils": "flake-utils_8", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_10", "rust-overlay": "rust-overlay_4" }, "locked": { @@ -2381,11 +2470,11 @@ ] }, "locked": { - "lastModified": 1764995001, - "narHash": "sha256-jx0CmXLSJP0kttcrh7AvTMttS5gbst44h03Xe2fBCmM=", + "lastModified": 1767763594, + "narHash": "sha256-5ysv8EuVAgDoYmNuXEUNf7vBzdeRaFxeIlIndv5HMvs=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "298788c28f8e1d912a678ab4108383c1ac979801", + "rev": "8b2302d8c10369c9135552cc892da75cff5ddb03", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix old mode 100644 new mode 100755 index 5d43f62..d67648e --- a/flake.nix +++ b/flake.nix @@ -134,6 +134,8 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + git-hooks.url = "github:cachix/git-hooks.nix"; + # ==== Shell ==== # caelestia-shell = { url = "github:caelestia-dots/shell"; @@ -144,34 +146,35 @@ url = "github:noctalia-dev/noctalia-shell"; inputs.nixpkgs.follows = "nixpkgs"; }; - }; outputs = { self, nixpkgs, + systems, ... }@inputs: let inherit (builtins) mapAttrs; + forEachSystem = nixpkgs.lib.genAttrs (import systems); hosts = { dn-pre7780 = { system = "x86_64-linux"; - path = ./system/dev/dn-pre7780; + confPath = ./system/dev/dn-pre7780; }; dn-server = { system = "x86_64-linux"; - path = ./system/dev/dn-server; + confPath = ./system/dev/dn-server; }; dn-lap = { system = "x86_64-linux"; - path = ./system/dev/dn-lap; + confPath = ./system/dev/dn-lap; }; skydrive-lap = { system = "x86_64-linux"; - path = ./system/dev/skydrive-lap; + confPath = ./system/dev/skydrive-lap; }; }; in @@ -181,7 +184,7 @@ mapAttrs ( hostname: conf: let - inherit (conf) path system; + inherit (conf) confPath system; pkgs = import nixpkgs { inherit system; }; @@ -232,12 +235,47 @@ ./options # ==== Private Configuration ==== # - (import path { inherit hostname; }) + (import confPath { inherit hostname; }) ]; } ) hosts ); + formatter = forEachSystem ( + system: + let + pkgs = nixpkgs.legacyPackages.${system}; + config = self.checks.${system}.pre-commit-check.config; + inherit (config) package configFile; + script = '' + ${pkgs.lib.getExe package} run --all-files --config ${configFile} + ''; + in + pkgs.writeShellScriptBin "pre-commit-run" script + ); + + checks = forEachSystem (system: { + pre-commit-check = inputs.git-hooks.lib.${system}.run { + src = ./.; + hooks = { + nixfmt.enable = true; + }; + }; + }); + + devShells = forEachSystem (system: { + default = + let + pkgs = import nixpkgs { inherit system; }; + inherit (self.checks.${system}.pre-commit-check) shellHook enabledPackages; + in + pkgs.mkShell { + inherit shellHook; + name = "nixos"; + buildInputs = enabledPackages; + }; + }); + # ==== MicroVM Packages ==== # # packages."${system}" = { # vm-1 = self.nixosConfigurations.vm-1.config.microvm.declaredRunner; diff --git a/helper/default.nix b/helper/default.nix old mode 100644 new mode 100755 diff --git a/home/config/.face b/home/config/.face old mode 100644 new mode 100755 diff --git a/home/config/firefox/autohide_toolbox.css b/home/config/firefox/autohide_toolbox.css old mode 100644 new mode 100755 diff --git a/home/config/firefox/nightTab.json b/home/config/firefox/nightTab.json old mode 100644 new mode 100755 diff --git a/home/config/fish/functions/fish_prompt.fish b/home/config/fish/functions/fish_prompt.fish old mode 100644 new mode 100755 diff --git a/home/config/gh/config.yaml b/home/config/gh/config.yaml old mode 100644 new mode 100755 diff --git a/home/config/ghostty/shader/mnoise.glsl b/home/config/ghostty/shader/mnoise.glsl old mode 100644 new mode 100755 diff --git a/home/config/rofi/apps.rasi b/home/config/rofi/apps.rasi old mode 100644 new mode 100755 diff --git a/home/config/rofi/config.rasi b/home/config/rofi/config.rasi old mode 100644 new mode 100755 diff --git a/home/config/rofi/gruvbox-material.rasi b/home/config/rofi/gruvbox-material.rasi old mode 100644 new mode 100755 diff --git a/home/config/tmux.yaml b/home/config/tmux.yaml old mode 100644 new mode 100755 diff --git a/home/config/wlogout/icons/hibernate.svg b/home/config/wlogout/icons/hibernate.svg old mode 100644 new mode 100755 diff --git a/home/config/wlogout/icons/lock.svg b/home/config/wlogout/icons/lock.svg old mode 100644 new mode 100755 diff --git a/home/config/wlogout/icons/logout.svg b/home/config/wlogout/icons/logout.svg old mode 100644 new mode 100755 diff --git a/home/config/wlogout/icons/reboot.svg b/home/config/wlogout/icons/reboot.svg old mode 100644 new mode 100755 diff --git a/home/config/wlogout/icons/shutdown.svg b/home/config/wlogout/icons/shutdown.svg old mode 100644 new mode 100755 diff --git a/home/config/wlogout/icons/suspend.svg b/home/config/wlogout/icons/suspend.svg old mode 100644 new mode 100755 diff --git a/home/config/zen/zen-keyboard-shortcuts.json b/home/config/zen/zen-keyboard-shortcuts.json old mode 100644 new mode 100755 diff --git a/home/options/default.nix b/home/options/default.nix old mode 100644 new mode 100755 diff --git a/home/options/hyprlock.nix b/home/options/hyprlock.nix old mode 100644 new mode 100755 diff --git a/home/options/noctalia.nix b/home/options/noctalia.nix old mode 100644 new mode 100755 diff --git a/home/options/ntfy-client.nix b/home/options/ntfy-client.nix old mode 100644 new mode 100755 diff --git a/home/options/sunsetr.nix b/home/options/sunsetr.nix old mode 100644 new mode 100755 diff --git a/home/presets/basic.nix b/home/presets/basic.nix old mode 100644 new mode 100755 diff --git a/home/scripts/md2html.nix b/home/scripts/md2html.nix old mode 100644 new mode 100755 diff --git a/home/scripts/memeSelector.nix b/home/scripts/memeSelector.nix old mode 100644 new mode 100755 index 7b90a36..824d523 --- a/home/scripts/memeSelector.nix +++ b/home/scripts/memeSelector.nix @@ -3,68 +3,68 @@ url, ... }: -pkgs.writers.writePython3Bin "memeSelector" {libraries = with pkgs.python3Packages; [requests];} -'' - import requests - import xml.etree.ElementTree as ET - import urllib.parse - import sys - import os - import tempfile - import subprocess +pkgs.writers.writePython3Bin "memeSelector" { libraries = with pkgs.python3Packages; [ requests ]; } + '' + import requests + import xml.etree.ElementTree as ET + import urllib.parse + import sys + import os + import tempfile + import subprocess - BASE_URL = "${url}" - headers = {"Depth": "1"} - resp = requests.request( - "PROPFIND", - BASE_URL, - headers=headers, - verify="${"" + ../../system/extra/ca.crt}" - ) + BASE_URL = "${url}" + headers = {"Depth": "1"} + resp = requests.request( + "PROPFIND", + BASE_URL, + headers=headers, + verify="${"" + ../../system/extra/ca.crt}" + ) - if resp.status_code not in (200, 207): - print(f"Error: Http {resp.status_code}") - sys.exit(1) + if resp.status_code not in (200, 207): + print(f"Error: Http {resp.status_code}") + sys.exit(1) - root = ET.fromstring(resp.text) - ns = {"d": "DAV:"} + root = ET.fromstring(resp.text) + ns = {"d": "DAV:"} - files = [] - for href in root.findall(".//d:href", ns): - path = href.text - if not path: - continue - filename = urllib.parse.unquote(path.split("/")[-1]) + files = [] + for href in root.findall(".//d:href", ns): + path = href.text + if not path: + continue + filename = urllib.parse.unquote(path.split("/")[-1]) - if filename and not filename.endswith("/"): - files.append(filename) + if filename and not filename.endswith("/"): + files.append(filename) - if not files: - print("No files found") - sys.exit(0) + if not files: + print("No files found") + sys.exit(0) - rofi = subprocess.run( - ["rofi", "-i", "-dmenu", "-p", "Meme"], - input="\n".join(files).encode(), - stdout=subprocess.PIPE - ) + rofi = subprocess.run( + ["rofi", "-i", "-dmenu", "-p", "Meme"], + input="\n".join(files).encode(), + stdout=subprocess.PIPE + ) - selected = rofi.stdout.decode().strip() - if not selected: - sys.exit(0) + selected = rofi.stdout.decode().strip() + if not selected: + sys.exit(0) - url = BASE_URL + urllib.parse.quote(selected) - tmpfile = os.path.join(tempfile.gettempdir(), selected) + url = BASE_URL + urllib.parse.quote(selected) + tmpfile = os.path.join(tempfile.gettempdir(), selected) - subprocess.run(["wget", "-q", "-O", tmpfile, url], check=True) + subprocess.run(["wget", "-q", "-O", tmpfile, url], check=True) - with open(tmpfile, "rb") as f: - subprocess.run("wl-copy", stdin=f) + with open(tmpfile, "rb") as f: + subprocess.run("wl-copy", stdin=f) - subprocess.run([ - "notify-send", - "-i", tmpfile, - "Meme Copied: ", - f"{selected}" - ]) -'' + subprocess.run([ + "notify-send", + "-i", tmpfile, + "Meme Copied: ", + f"{selected}" + ]) + '' diff --git a/home/scripts/mkWall.nix b/home/scripts/mkWall.nix old mode 100644 new mode 100755 diff --git a/home/scripts/ntfy.nix b/home/scripts/ntfy.nix old mode 100644 new mode 100755 diff --git a/home/scripts/rbwSelector.nix b/home/scripts/rbwSelector.nix old mode 100644 new mode 100755 diff --git a/home/scripts/record.nix b/home/scripts/record.nix old mode 100644 new mode 100755 diff --git a/home/scripts/remoteRebuild.nix b/home/scripts/remoteRebuild.nix old mode 100644 new mode 100755 diff --git a/home/scripts/rofiwall.nix b/home/scripts/rofiwall.nix old mode 100644 new mode 100755 diff --git a/home/user/bitwarden.nix b/home/user/bitwarden.nix old mode 100644 new mode 100755 diff --git a/home/user/config.nix b/home/user/config.nix old mode 100644 new mode 100755 diff --git a/home/user/direnv.nix b/home/user/direnv.nix old mode 100644 new mode 100755 diff --git a/home/user/environment.nix b/home/user/environment.nix old mode 100644 new mode 100755 diff --git a/home/user/firefox.nix b/home/user/firefox.nix old mode 100644 new mode 100755 diff --git a/home/user/ghostty.nix b/home/user/ghostty.nix old mode 100644 new mode 100755 diff --git a/home/user/git.nix b/home/user/git.nix old mode 100644 new mode 100755 diff --git a/home/user/gtk.nix b/home/user/gtk.nix old mode 100644 new mode 100755 diff --git a/home/user/hypr/bind.nix b/home/user/hypr/bind.nix old mode 100644 new mode 100755 diff --git a/home/user/hypr/input.nix b/home/user/hypr/input.nix old mode 100644 new mode 100755 diff --git a/home/user/hypr/window.nix b/home/user/hypr/window.nix old mode 100644 new mode 100755 diff --git a/home/user/hypr/windowrule.nix b/home/user/hypr/windowrule.nix old mode 100644 new mode 100755 diff --git a/home/user/hypr/workspace.nix b/home/user/hypr/workspace.nix old mode 100644 new mode 100755 diff --git a/home/user/hyprland.nix b/home/user/hyprland.nix old mode 100644 new mode 100755 diff --git a/home/user/internationalisation.nix b/home/user/internationalisation.nix old mode 100644 new mode 100755 diff --git a/home/user/music-production.nix b/home/user/music-production.nix old mode 100644 new mode 100755 diff --git a/home/user/nvf/default.nix b/home/user/nvf/default.nix old mode 100644 new mode 100755 index 9c73d8a..8613edf --- a/home/user/nvf/default.nix +++ b/home/user/nvf/default.nix @@ -7,8 +7,9 @@ ... }: let + inherit (builtins) concatStringsSep; inherit (lib.generators) mkLuaInline; - inherit (lib) concatStringsSep optionalString; + inherit (lib) optionalString; suda-nvim = pkgs.vimUtils.buildVimPlugin { name = "vim-suda"; @@ -369,11 +370,11 @@ in formatter = { conform-nvim = { enable = true; - setupOpts = { - formatters_by_ft = { - nix = [ "nixfmt" ]; - }; - }; + # setupOpts = { + # formatters_by_ft = { + # nix = [ "nixfmt" ]; + # }; + # }; }; }; @@ -420,7 +421,10 @@ in nix = { enable = true; extraDiagnostics.enable = false; - format.enable = false; # Manually configured in conform-nvim + format = { + type = [ "nixfmt" ]; + enable = true; + }; lsp.servers = [ "nixd" ]; }; sql.enable = true; diff --git a/home/user/nvf/extra-lsp.nix b/home/user/nvf/extra-lsp.nix old mode 100644 new mode 100755 diff --git a/home/user/nvf/plugins/leetcode/default.nix b/home/user/nvf/plugins/leetcode/default.nix old mode 100644 new mode 100755 diff --git a/home/user/nvf/plugins/lualine/default.nix b/home/user/nvf/plugins/lualine/default.nix old mode 100644 new mode 100755 diff --git a/home/user/nvf/plugins/snacks-nvim/default.nix b/home/user/nvf/plugins/snacks-nvim/default.nix old mode 100644 new mode 100755 diff --git a/home/user/nvf/plugins/snacks-nvim/keymaps.nix b/home/user/nvf/plugins/snacks-nvim/keymaps.nix old mode 100644 new mode 100755 diff --git a/home/user/packages.nix b/home/user/packages.nix old mode 100644 new mode 100755 diff --git a/home/user/podman.nix b/home/user/podman.nix old mode 100644 new mode 100755 diff --git a/home/user/shell.nix b/home/user/shell.nix old mode 100644 new mode 100755 diff --git a/home/user/shellAlias.nix b/home/user/shellAlias.nix old mode 100644 new mode 100755 diff --git a/home/user/shells/caelestia.nix b/home/user/shells/caelestia.nix old mode 100644 new mode 100755 diff --git a/home/user/tmux.nix b/home/user/tmux.nix old mode 100644 new mode 100755 diff --git a/home/user/virtualization.nix b/home/user/virtualization.nix old mode 100644 new mode 100755 diff --git a/home/user/vscode.nix b/home/user/vscode.nix old mode 100644 new mode 100755 diff --git a/home/user/wallpaper-engine.nix b/home/user/wallpaper-engine.nix old mode 100644 new mode 100755 diff --git a/home/user/waybar.nix b/home/user/waybar.nix old mode 100644 new mode 100755 diff --git a/home/user/wlogout.nix b/home/user/wlogout.nix old mode 100644 new mode 100755 diff --git a/home/user/wm-service.nix b/home/user/wm-service.nix old mode 100644 new mode 100755 diff --git a/home/user/yazi.nix b/home/user/yazi.nix old mode 100644 new mode 100755 diff --git a/home/user/zellij.nix b/home/user/zellij.nix old mode 100644 new mode 100755 diff --git a/home/user/zen-browser.nix b/home/user/zen-browser.nix old mode 100644 new mode 100755 diff --git a/options/default.nix b/options/default.nix old mode 100644 new mode 100755 diff --git a/options/systemconf.nix b/options/systemconf.nix old mode 100644 new mode 100755 diff --git a/pkgs/assets/discord.svg b/pkgs/assets/discord.svg old mode 100644 new mode 100755 diff --git a/pkgs/assets/peepoLeave.gif.base64 b/pkgs/assets/peepoLeave.gif.base64 old mode 100644 new mode 100755 diff --git a/pkgs/fonts/dfkai-sb/default.nix b/pkgs/fonts/dfkai-sb/default.nix old mode 100644 new mode 100755 diff --git a/pkgs/fonts/sf-pro-display-bold/default.nix b/pkgs/fonts/sf-pro-display-bold/default.nix old mode 100644 new mode 100755 diff --git a/pkgs/overlays/default.nix b/pkgs/overlays/default.nix old mode 100644 new mode 100755 diff --git a/pkgs/overlays/powerdns-admin.nix b/pkgs/overlays/powerdns-admin.nix old mode 100644 new mode 100755 diff --git a/pkgs/overlays/stalwart-mail/default.nix b/pkgs/overlays/stalwart-mail/default.nix old mode 100644 new mode 100755 diff --git a/pkgs/overlays/stalwart-mail/enable_root_ca.patch b/pkgs/overlays/stalwart-mail/enable_root_ca.patch old mode 100644 new mode 100755 diff --git a/pkgs/overlays/vesktop.nix b/pkgs/overlays/vesktop.nix old mode 100644 new mode 100755 diff --git a/pkgs/patches/splash.patch b/pkgs/patches/splash.patch old mode 100644 new mode 100755 diff --git a/preview.png b/preview.png old mode 100644 new mode 100755 diff --git a/system/dev/dn-lap/common/boot.nix b/system/dev/dn-lap/common/boot.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-lap/common/default.nix b/system/dev/dn-lap/common/default.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-lap/common/hardware-configuration.nix b/system/dev/dn-lap/common/hardware-configuration.nix old mode 100644 new mode 100755 index bb2d14f..39eee71 --- a/system/dev/dn-lap/common/hardware-configuration.nix +++ b/system/dev/dn-lap/common/hardware-configuration.nix @@ -1,28 +1,42 @@ # 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, ... }: +{ + config, + lib, + pkgs, + modulesPath, + ... +}: { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "uas" "sd_mod" "rtsx_pci_sdmmc" ]; + boot.initrd.availableKernelModules = [ + "xhci_pci" + "thunderbolt" + "nvme" + "uas" + "sd_mod" + "rtsx_pci_sdmmc" + ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { - device = "/dev/disk/by-label/nixos"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-label/nixos"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { - device = "/dev/disk/by-label/BOOT"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-label/BOOT"; + fsType = "vfat"; + options = [ + "fmask=0077" + "dmask=0077" + ]; + }; swapDevices = [ { device = "/dev/disk/by-label/swap"; } @@ -36,6 +50,5 @@ # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = - lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/system/dev/dn-lap/default.nix b/system/dev/dn-lap/default.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-lap/games/default.nix b/system/dev/dn-lap/games/default.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-lap/home/default.nix b/system/dev/dn-lap/home/default.nix old mode 100644 new mode 100755 index 368e8db..d37f782 --- a/system/dev/dn-lap/home/default.nix +++ b/system/dev/dn-lap/home/default.nix @@ -55,10 +55,6 @@ in imports = [ ../../../../home/presets/basic.nix - (import ../../../../home/user/bitwarden.nix { - email = "danny@net.dn"; - baseUrl = "https://bitwarden.net.dn"; - }) # waybar (import ../../../../home/user/waybar.nix { diff --git a/system/dev/dn-lap/network/default.nix b/system/dev/dn-lap/network/default.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-lap/office/default.nix b/system/dev/dn-lap/office/default.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-lap/services/default.nix b/system/dev/dn-lap/services/default.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-lap/sops/default.nix b/system/dev/dn-lap/sops/default.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-lap/sops/secret.yaml b/system/dev/dn-lap/sops/secret.yaml old mode 100644 new mode 100755 diff --git a/system/dev/dn-lap/sops/sops-conf.nix b/system/dev/dn-lap/sops/sops-conf.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-lap/utility/default.nix b/system/dev/dn-lap/utility/default.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-lap/virtualisation/default.nix b/system/dev/dn-lap/virtualisation/default.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-pre7780/common/boot.nix b/system/dev/dn-pre7780/common/boot.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-pre7780/common/default.nix b/system/dev/dn-pre7780/common/default.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-pre7780/common/hardware-configuration.nix b/system/dev/dn-pre7780/common/hardware-configuration.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-pre7780/common/nvidia.nix b/system/dev/dn-pre7780/common/nvidia.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-pre7780/default.nix b/system/dev/dn-pre7780/default.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-pre7780/expr/default.nix b/system/dev/dn-pre7780/expr/default.nix old mode 100644 new mode 100755 index 6f80563..dec4e60 --- a/system/dev/dn-pre7780/expr/default.nix +++ b/system/dev/dn-pre7780/expr/default.nix @@ -1,5 +1,6 @@ { imports = [ # ./osx-kvm.nix + ./noise-cancel.nix ]; } diff --git a/system/dev/dn-pre7780/expr/noise-cancel.nix b/system/dev/dn-pre7780/expr/noise-cancel.nix new file mode 100755 index 0000000..d6548bf --- /dev/null +++ b/system/dev/dn-pre7780/expr/noise-cancel.nix @@ -0,0 +1,4 @@ +{ ... }: +{ + programs.noisetorch.enable = true; +} diff --git a/system/dev/dn-pre7780/expr/osx-kvm.nix b/system/dev/dn-pre7780/expr/osx-kvm.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-pre7780/expr/vm-settings.nix b/system/dev/dn-pre7780/expr/vm-settings.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-pre7780/expr/vm.nix b/system/dev/dn-pre7780/expr/vm.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-pre7780/games/default.nix b/system/dev/dn-pre7780/games/default.nix old mode 100644 new mode 100755 index d11d1c4..4ddf930 --- a/system/dev/dn-pre7780/games/default.nix +++ b/system/dev/dn-pre7780/games/default.nix @@ -3,5 +3,6 @@ ../../../modules/gaming.nix ./shadps4.nix ./minecraft.nix + ./heroic.nix ]; } diff --git a/system/dev/dn-pre7780/games/heroic.nix b/system/dev/dn-pre7780/games/heroic.nix new file mode 100755 index 0000000..3ce7bb7 --- /dev/null +++ b/system/dev/dn-pre7780/games/heroic.nix @@ -0,0 +1,10 @@ +{ pkgs, ... }: +{ + home-manager.sharedModules = [ + { + home.packages = with pkgs; [ + heroic + ]; + } + ]; +} diff --git a/system/dev/dn-pre7780/games/minecraft.nix b/system/dev/dn-pre7780/games/minecraft.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-pre7780/games/shadps4.nix b/system/dev/dn-pre7780/games/shadps4.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-pre7780/home/default.nix b/system/dev/dn-pre7780/home/default.nix old mode 100644 new mode 100755 index 7d1588a..cdc87da --- a/system/dev/dn-pre7780/home/default.nix +++ b/system/dev/dn-pre7780/home/default.nix @@ -126,12 +126,6 @@ in ./expr ./wm - # Bitwarden client - (import ../../../../home/user/bitwarden.nix { - email = "danny@net.dn"; - baseUrl = "https://bitwarden.net.dn"; - }) - # waybar (import ../../../../home/user/waybar.nix { matchByDesc = true; diff --git a/system/dev/dn-pre7780/home/expr/default.nix b/system/dev/dn-pre7780/home/expr/default.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-pre7780/home/expr/helix.nix b/system/dev/dn-pre7780/home/expr/helix.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-pre7780/home/wm/default.nix b/system/dev/dn-pre7780/home/wm/default.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-pre7780/home/wm/hyprland.nix b/system/dev/dn-pre7780/home/wm/hyprland.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-pre7780/network/default.nix b/system/dev/dn-pre7780/network/default.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-pre7780/services/default.nix b/system/dev/dn-pre7780/services/default.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-pre7780/services/mail.nix b/system/dev/dn-pre7780/services/mail.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-pre7780/services/nextcloud.nix b/system/dev/dn-pre7780/services/nextcloud.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-pre7780/services/nginx.nix b/system/dev/dn-pre7780/services/nginx.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-pre7780/services/pangolin.nix b/system/dev/dn-pre7780/services/pangolin.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-pre7780/sops/default.nix b/system/dev/dn-pre7780/sops/default.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-pre7780/sops/secret.yaml b/system/dev/dn-pre7780/sops/secret.yaml old mode 100644 new mode 100755 diff --git a/system/dev/dn-pre7780/sops/sops-conf.nix b/system/dev/dn-pre7780/sops/sops-conf.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-pre7780/utility/airplay.nix b/system/dev/dn-pre7780/utility/airplay.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-pre7780/utility/blender.nix b/system/dev/dn-pre7780/utility/blender.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-pre7780/utility/davinci-resolve.nix b/system/dev/dn-pre7780/utility/davinci-resolve.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-pre7780/utility/default.nix b/system/dev/dn-pre7780/utility/default.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-pre7780/virtualisation/default.nix b/system/dev/dn-pre7780/virtualisation/default.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-pre7780/virtualisation/kvm.nix b/system/dev/dn-pre7780/virtualisation/kvm.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-server/common/backup.nix b/system/dev/dn-server/common/backup.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-server/common/boot.nix b/system/dev/dn-server/common/boot.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-server/common/default.nix b/system/dev/dn-server/common/default.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-server/common/hardware-configuration.nix b/system/dev/dn-server/common/hardware-configuration.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-server/common/networking.nix b/system/dev/dn-server/common/networking.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-server/common/nvidia.nix b/system/dev/dn-server/common/nvidia.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-server/default.nix b/system/dev/dn-server/default.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-server/home/default.nix b/system/dev/dn-server/home/default.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-server/network/default.nix b/system/dev/dn-server/network/default.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-server/network/nginx.nix b/system/dev/dn-server/network/nginx.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-server/network/services.nix b/system/dev/dn-server/network/services.nix old mode 100644 new mode 100755 index 3a69a42..f67a42d --- a/system/dev/dn-server/network/services.nix +++ b/system/dev/dn-server/network/services.nix @@ -5,9 +5,11 @@ ... }: let + inherit (builtins) concatStringsSep; inherit (config.systemConf) username security; - inherit (lib) concatStringsSep mkForce optionalString; + inherit (lib) mkForce optionalString; inherit (helper.nftables) mkElementsStatement; + netbirdCfg = config.services.netbird; ethInterface = "enp0s31f6"; diff --git a/system/dev/dn-server/network/step-ca.nix b/system/dev/dn-server/network/step-ca.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-server/network/wireguard.nix b/system/dev/dn-server/network/wireguard.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-server/nix/atticd.nix b/system/dev/dn-server/nix/atticd.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-server/nix/default.nix b/system/dev/dn-server/nix/default.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-server/options/default.nix b/system/dev/dn-server/options/default.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-server/options/network.nix b/system/dev/dn-server/options/network.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-server/security/crowdsec.nix b/system/dev/dn-server/security/crowdsec.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-server/security/default.nix b/system/dev/dn-server/security/default.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-server/security/fail2ban.nix b/system/dev/dn-server/security/fail2ban.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-server/services/actual-budget.nix b/system/dev/dn-server/services/actual-budget.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-server/services/bitwarden.nix b/system/dev/dn-server/services/bitwarden.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-server/services/default.nix b/system/dev/dn-server/services/default.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-server/services/docmost.nix b/system/dev/dn-server/services/docmost.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-server/services/forgejo.nix b/system/dev/dn-server/services/forgejo.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-server/services/hideTTY.nix b/system/dev/dn-server/services/hideTTY.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-server/services/keycloak.nix b/system/dev/dn-server/services/keycloak.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-server/services/mail-server.nix b/system/dev/dn-server/services/mail-server.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-server/services/metrics.nix b/system/dev/dn-server/services/metrics.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-server/services/minecraft-server.nix b/system/dev/dn-server/services/minecraft-server.nix old mode 100644 new mode 100755 index 98e2905..1eeb44b --- a/system/dev/dn-server/services/minecraft-server.nix +++ b/system/dev/dn-server/services/minecraft-server.nix @@ -27,6 +27,7 @@ in "mods" = "${modpack}/mods"; }; serverProperties = { + server-port = 25565; difficulty = 3; gamemode = "survival"; diff --git a/system/dev/dn-server/services/netbird.nix b/system/dev/dn-server/services/netbird.nix old mode 100644 new mode 100755 index 9eac81c..c83978e --- a/system/dev/dn-server/services/netbird.nix +++ b/system/dev/dn-server/services/netbird.nix @@ -10,8 +10,7 @@ let cfg = config.services.netbird; srv = cfg.server; - # TODO: Change realm to master - realm = "netbird"; + realm = "master"; in { sops.secrets."netbird/wt0-setupKey" = { @@ -30,7 +29,7 @@ in inherit realm vDomain; domain = "netbird.${domain}"; oidcURL = "https://${config.services.keycloak.settings.hostname}"; - enableNginx = false; + enableNginx = true; oidcType = "keycloak"; }) ]; @@ -71,49 +70,11 @@ in real_ip_recursive on; ''; - services.nginx.virtualHosts."netbird.local" = { - locations = { - "/" = { - root = cfg.server.dashboard.finalDrv; - tryFiles = "$uri $uri.html $uri/ =404"; - }; - - "/404.html".extraConfig = '' - internal; - ''; - - "/api" = { - extraConfig = '' - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - ''; - proxyPass = "http://127.0.0.1:${builtins.toString srv.management.port}"; - }; - - "/management.ManagementService/".extraConfig = '' - client_body_timeout 1d; - - grpc_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - - grpc_pass grpc://127.0.0.1:${builtins.toString srv.management.port}; - grpc_read_timeout 1d; - grpc_send_timeout 1d; - grpc_socket_keepalive on; - ''; - - "/signalexchange.SignalExchange/".extraConfig = '' - client_body_timeout 1d; - - grpc_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - - grpc_pass grpc://127.0.0.1:${builtins.toString srv.signal.port}; - grpc_read_timeout 1d; - grpc_send_timeout 1d; - grpc_socket_keepalive on; + services.nginx.virtualHosts."${srv.domain}" = { + locations."/api" = { + extraConfig = '' + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; ''; }; - - extraConfig = '' - error_page 404 /404.html; - ''; }; } diff --git a/system/dev/dn-server/services/nextcloud.nix b/system/dev/dn-server/services/nextcloud.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-server/services/ntfy.nix b/system/dev/dn-server/services/ntfy.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-server/services/paperless-ngx.nix b/system/dev/dn-server/services/paperless-ngx.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-server/sops/default.nix b/system/dev/dn-server/sops/default.nix old mode 100644 new mode 100755 diff --git a/system/dev/dn-server/sops/secret.yaml b/system/dev/dn-server/sops/secret.yaml old mode 100644 new mode 100755 index f028377..5cf0bc6 --- a/system/dev/dn-server/sops/secret.yaml +++ b/system/dev/dn-server/sops/secret.yaml @@ -3,7 +3,7 @@ wireguard: wg1.conf: ENC[AES256_GCM,data:Wq8PgaNaEZNYpxqC2sO9CY+Cc+Qsk+sWpQ43FkjXqY5rSYo7rSjzN3sde44ba2IY85Dwyo+TKNp+mmLnjDM3Bgxb3h/sLLEJRwVGS1lU7GQKuT2ZL3MupnKVYXyK/2VmP+Umfw75AHYeMM809HRr7UroDEFQEll3DVqNqWSJRAll2hR14lnxUQpZIewMWTerEE0b+SEADXhPCOsgTUXFxJMtXTfsifGjf0HO2sLrW7EQvMxuiTvSCwosUilc/HgaA/+vNm+UkZ3pSwybYm9fIFvEu0IEqHuLyvy41J70DdxFdS9mNAcYcpeOFrTR4BE6NQ==,iv:zgyIqdH9OWEXPNkHs94Tcet16zvbxV7rbkwzVybkQBc=,tag:GJgAAGyrAhhaxVmcsT/reA==,type:str] netbird: oidc: - secret: ENC[AES256_GCM,data:zZ8zuDqUdZANk1VV44kfp/Y4eXxJDwead9440QJma4Q=,iv:d6/RSEtuhqL+RQDuOQMJhyC9U9ikcasEz0DIdtaBtKg=,tag:8be6FBymbIN+To0dFz2ncA==,type:str] + secret: ENC[AES256_GCM,data:6LEiompRgmip9NJUSHBevdwbnDhR3IXrSSorK7ToNlk=,iv:UshQW7lNdXZ6K/LX4prpRhZXTItXSM9fEIkJhOysYtc=,tag:aOrs44I7DbDQmdioB64Peg==,type:str] dataStoreKey: ENC[AES256_GCM,data:FGyqII1DZMtImMtWiUx0e1I4J+yMzrWKwhBB6kjmRHqlLz8Oy+C/zCM5SQ8=,iv:AXD8u9vcha8CSRnMPabtdXDQoeqpqKIbWGwfcgIc8Dw=,tag:3nSIt0V+G6NJQ7JSslNOWg==,type:str] coturn: password: ENC[AES256_GCM,data:AMWBkWLcj1EFfufl8pALpVOG0PE=,iv:sngIedZE4X8clhGIsQyiGKbdsheRbEqeU57Emz2DWJM=,tag:daRLPNrO5fq84rtieYuYYw==,type:str] @@ -19,7 +19,7 @@ nextcloud: backendsecret: ENC[AES256_GCM,data:pV5yw755RkAwHBdmfeP37/SobFZqJouWyIiRJ+Y2mk0iiVdW04vhYVsyjcI=,iv:NhkewgnyE2Dw8mQMMSq6AWo6IOWu8BlyPZvZAszyZuQ=,tag:BlZO15qZWViV8pCWIgZHZQ==,type:str] step_ca: password: ENC[AES256_GCM,data:3NtUAl344gHiXLlMl88X17Vsm/4OKFM0W8bntzbXC0U=,iv:q9cWW8xTxYQnRYohBxnPIsbVSpvkZYVpYLRVeZgmsRM=,tag:ibumK7ebPKNO/CXAS0eeRA==,type:str] -vaultwarden: ENC[AES256_GCM,data:5gn2+IYznojrYbmzCJx17qAlBvJBv3CnMEZensyep9JpKEHVz29teOYDh5Zetv0mSrgmrUxCTdNsm0OZCX9EswhslNl5ay6zkhoL+64JIyUcNFWcvu7oD2w1qynWgz41GS2yzuw91LntN4mcpODKhHNN8XFCU9d71Z9zTSIdWn2PoG8wME2hVBJ2YxLpqzDyJYlkWYf4VYUnn9vXZatZqQd0n7bjx3dgX3ogFG/UNfMAs2oLCfuYLkxBqpR2cGNktIxWctCEAWwG68Pfk7X66KMi5w==,iv:JcExp8YkGwV2nMbCK+n0KSL3+SryJZ0iKtVcU/Q+Cgs=,tag:Ut6ahXVAuOKlcwk6DE56Ig==,type:str] +vaultwarden: ENC[AES256_GCM,data:h8GFyXRMI51DZutX60up4vXTQLNY3q0pr+BWpZ5frJHwy6PVBTYts81K0aTIIU71epT4SVR3p3e8yUdU7jXS1Tw1ol0RnPL+bBNv7JyUede9mkrP4pnozmuCQqOdlHCaUvYyIoWFPrLiz/drXX7gJvWh6zYTTFn9mQ3wQE9J6rxoLzbMyS6raSn2O8Ke+YM0VRXYgVvsyEL3Aa0wV3qO5NDCZ67rZp4TG5U8tOrziw0gnKU3eBCuNyL/uU/7ySvfdxwv631vEi24+dxN+Kx6rlaJpJIywx9xxxoRhOz5TrHzptqRMWpg2GZL5qdVXiUxqYLgC3s7Ri0P2BwOslteO6Z6NXk0HSravbpz3sevEu+bRS7u2MLvL3keP48+EBsXNebnKY7nfqCoIPUQ86CIVGw5fNI+irnRR8kq6oV0MBDGXu6DgmzKV7crFp65zzVSqfFOntVYSqgtQnnM1CmkuGJD,iv:51zbASyFgprzYCMswiEM81p8C0kFhSc28VavCHqRsF0=,tag:LvcY2DbeA71/PXEnjph3dw==,type:str] ldap: password: ENC[AES256_GCM,data:gz5WBopSffGyvJxKDPekPQ==,iv:bX7N9/oNMhtE/KbPah2ge4s87P2VsxHGoFkOyl83dxs=,tag:YoTe6NPAJgp/0nvhHC9Y5A==,type:str] env: ENC[AES256_GCM,data:68EvTHeBqtCVfde5oO+Wzny+l/YIMWQmbcNQ0Wl59EjMrSlJM0rmFm2lMJpxKzCN2cFs0N2z6zG1/eQ9t/SxxyVBrNA6ECnCZrerIo2YGlaT30tc1rffpd8TchMH1VKP5qHnbLUqORMx5z0LR4U49l2HVcHgSCjt/1f127oMi411vIU=,iv:+m1F0CBaoJGv6Z1u+h6rbsXGPUhxgHouTalj13ccJiY=,tag:I/hK65yPaIcgHEZVaXJHBA==,type:str] @@ -89,7 +89,7 @@ sops: OFloWEFuTC9GTXJsMG5NNktmdmIrY1kK0yN0ae0xNaydujV5lt2FiwXdyursG0DK 9i/B3TTAm9csDMMSTSFbiAUJDzG7kIqn++JU/cxvsGScSnhMqjEK/g== -----END AGE ENCRYPTED FILE----- - lastmodified: "2026-01-07T08:19:02Z" - mac: ENC[AES256_GCM,data:hWVuAT2P1vXtSWUiCYh52vr2FY60611QlO+lNf9GbB98Tzk6K3/RaEtQR8a1KVGz9qoJFwxRk0jm9Mo78ezxaCmjePWklyDYFTPGCcBZbPNGTcZfiCfp5yzFGDbGsR2s3nVDHP+a+BIwIWYEJZz2T4Gi/sPK2rUwGdvq6b0rnKQ=,iv:trEF/xsJobs87q96BdRxDkZHmInEU9krhUQiMvNu87g=,tag:PkYNLlnl72J+dxgnWhvWAw==,type:str] + lastmodified: "2026-01-09T04:59:21Z" + mac: ENC[AES256_GCM,data:NIHLAoNatyAhKHwCNdRGMR8+rUv00y/ssoGSQlq9/QayYt/GATfelgNwcqksSWf/db5v+Jz92bbk3RT9SKeoMWRxjm+8xzARbjhHGrzxAeLoerGPjQpEpkYYWbFC2ihSODrE+ar3HskAkQmVxmiGKEtYSg3+X2hiEy6ydZkP5Ps=,iv:mAyO820PpeG6NWQlmQf+l9MLIL4OTGJXCBSqYbmozZk=,tag:+Bex5hyAGBXiFoqxqVtaqg==,type:str] unencrypted_suffix: _unencrypted version: 3.11.0 diff --git a/system/dev/dn-server/sops/sops-conf.nix b/system/dev/dn-server/sops/sops-conf.nix old mode 100644 new mode 100755 index e123c75..97535c1 --- a/system/dev/dn-server/sops/sops-conf.nix +++ b/system/dev/dn-server/sops/sops-conf.nix @@ -6,7 +6,6 @@ in sops.secrets = { "wireguard/privateKey" = { }; "step_ca/password" = { }; - vaultwarden = { }; "oauth/password" = { }; "oauth/adminEnv" = { }; "ldap/password" = lib.mkIf config.mail-server.enable { diff --git a/system/dev/generic/default.nix b/system/dev/generic/default.nix old mode 100644 new mode 100755 diff --git a/system/dev/generic/disk.nix b/system/dev/generic/disk.nix old mode 100644 new mode 100755 diff --git a/system/dev/generic/hardware-configuration.nix b/system/dev/generic/hardware-configuration.nix old mode 100644 new mode 100755 index d2ae606..44a9a05 --- a/system/dev/generic/hardware-configuration.nix +++ b/system/dev/generic/hardware-configuration.nix @@ -1,12 +1,21 @@ # 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, ... }: +{ + config, + lib, + pkgs, + modulesPath, + ... +}: { imports = [ ]; - boot.initrd.availableKernelModules = [ "virtio_scsi" "sd_mod" ]; + boot.initrd.availableKernelModules = [ + "virtio_scsi" + "sd_mod" + ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ ]; boot.extraModulePackages = [ ]; diff --git a/system/dev/public/dn/common.nix b/system/dev/public/dn/common.nix old mode 100644 new mode 100755 diff --git a/system/dev/public/dn/default.nix b/system/dev/public/dn/default.nix old mode 100644 new mode 100755 diff --git a/system/dev/public/dn/ntfy.nix b/system/dev/public/dn/ntfy.nix old mode 100644 new mode 100755 diff --git a/system/dev/public/dn/yubikey.nix b/system/dev/public/dn/yubikey.nix old mode 100644 new mode 100755 diff --git a/system/dev/public/sops/dn-secret.yaml b/system/dev/public/sops/dn-secret.yaml old mode 100644 new mode 100755 diff --git a/system/dev/public/sops/secret.yaml b/system/dev/public/sops/secret.yaml old mode 100644 new mode 100755 diff --git a/system/dev/skydrive-lap/common/boot.nix b/system/dev/skydrive-lap/common/boot.nix old mode 100644 new mode 100755 diff --git a/system/dev/skydrive-lap/common/default.nix b/system/dev/skydrive-lap/common/default.nix old mode 100644 new mode 100755 diff --git a/system/dev/skydrive-lap/common/disk.nix b/system/dev/skydrive-lap/common/disk.nix old mode 100644 new mode 100755 diff --git a/system/dev/skydrive-lap/common/hardware-configuration.nix b/system/dev/skydrive-lap/common/hardware-configuration.nix old mode 100644 new mode 100755 index 0555636..c2aec52 --- a/system/dev/skydrive-lap/common/hardware-configuration.nix +++ b/system/dev/skydrive-lap/common/hardware-configuration.nix @@ -1,14 +1,25 @@ # 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, ... }: +{ + config, + lib, + pkgs, + modulesPath, + ... +}: { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" ]; + boot.initrd.availableKernelModules = [ + "xhci_pci" + "ahci" + "nvme" + "usbhid" + ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; diff --git a/system/dev/skydrive-lap/common/nvidia.nix b/system/dev/skydrive-lap/common/nvidia.nix old mode 100644 new mode 100755 diff --git a/system/dev/skydrive-lap/default.nix b/system/dev/skydrive-lap/default.nix old mode 100644 new mode 100755 index 1af18c4..ab73d81 --- a/system/dev/skydrive-lap/default.nix +++ b/system/dev/skydrive-lap/default.nix @@ -10,7 +10,8 @@ in systemConf = { inherit hostname username; domain = "net.dn"; - # hyprland.enable = true; + enableHomeManager = true; + hyprland.enable = false; niri.enable = true; face = pkgs.fetchurl { url = "https://git.dnywe.com/dachxy/skydrive-avatar/raw/branch/main/skydrive.jpg"; @@ -26,6 +27,8 @@ in ./sops ./utility ./network + ./home + ../../modules/shells/noctalia ]; users.users.root.openssh.authorizedKeys.keys = [ diff --git a/system/dev/skydrive-lap/games/default.nix b/system/dev/skydrive-lap/games/default.nix old mode 100644 new mode 100755 diff --git a/system/dev/skydrive-lap/home/default.nix b/system/dev/skydrive-lap/home/default.nix old mode 100644 new mode 100755 diff --git a/system/dev/skydrive-lap/network/default.nix b/system/dev/skydrive-lap/network/default.nix old mode 100644 new mode 100755 diff --git a/system/dev/skydrive-lap/network/netbird.nix b/system/dev/skydrive-lap/network/netbird.nix old mode 100644 new mode 100755 diff --git a/system/dev/skydrive-lap/sops/default.nix b/system/dev/skydrive-lap/sops/default.nix old mode 100644 new mode 100755 diff --git a/system/dev/skydrive-lap/sops/secret.yaml b/system/dev/skydrive-lap/sops/secret.yaml old mode 100644 new mode 100755 diff --git a/system/dev/skydrive-lap/sops/sops-conf.nix b/system/dev/skydrive-lap/sops/sops-conf.nix old mode 100644 new mode 100755 diff --git a/system/dev/skydrive-lap/utility/default.nix b/system/dev/skydrive-lap/utility/default.nix old mode 100644 new mode 100755 diff --git a/system/extra/ca.crt b/system/extra/ca.crt old mode 100644 new mode 100755 diff --git a/system/modules/actual/default.nix b/system/modules/actual/default.nix old mode 100644 new mode 100755 diff --git a/system/modules/airplay.nix b/system/modules/airplay.nix old mode 100644 new mode 100755 diff --git a/system/modules/auto-mount.nix b/system/modules/auto-mount.nix old mode 100644 new mode 100755 diff --git a/system/modules/auto-upgrade.nix b/system/modules/auto-upgrade.nix old mode 100644 new mode 100755 diff --git a/system/modules/battery-life.nix b/system/modules/battery-life.nix old mode 100644 new mode 100755 diff --git a/system/modules/bluetooth.nix b/system/modules/bluetooth.nix old mode 100644 new mode 100755 diff --git a/system/modules/ca.nix b/system/modules/ca.nix old mode 100644 new mode 100755 diff --git a/system/modules/cockpit.nix b/system/modules/cockpit.nix old mode 100644 new mode 100755 diff --git a/system/modules/crowdsec.nix b/system/modules/crowdsec.nix old mode 100644 new mode 100755 diff --git a/system/modules/davinci-resolve.nix b/system/modules/davinci-resolve.nix old mode 100644 new mode 100755 diff --git a/system/modules/display-manager.nix b/system/modules/display-manager.nix old mode 100644 new mode 100755 diff --git a/system/modules/dns-server/default.nix b/system/modules/dns-server/default.nix old mode 100644 new mode 100755 diff --git a/system/modules/docmost.nix b/system/modules/docmost.nix old mode 100644 new mode 100755 diff --git a/system/modules/environment.nix b/system/modules/environment.nix old mode 100644 new mode 100755 diff --git a/system/modules/fail2ban.nix b/system/modules/fail2ban.nix old mode 100644 new mode 100755 diff --git a/system/modules/gaming.nix b/system/modules/gaming.nix old mode 100644 new mode 100755 diff --git a/system/modules/gc.nix b/system/modules/gc.nix old mode 100644 new mode 100755 diff --git a/system/modules/gitea.nix b/system/modules/gitea.nix old mode 100644 new mode 100755 diff --git a/system/modules/gnome.nix b/system/modules/gnome.nix old mode 100644 new mode 100755 diff --git a/system/modules/grafana.nix b/system/modules/grafana.nix old mode 100644 new mode 100755 diff --git a/system/modules/hardware.nix b/system/modules/hardware.nix old mode 100644 new mode 100755 diff --git a/system/modules/hyprland.nix b/system/modules/hyprland.nix old mode 100644 new mode 100755 diff --git a/system/modules/internationalisation.nix b/system/modules/internationalisation.nix old mode 100644 new mode 100755 diff --git a/system/modules/kubernetes.nix b/system/modules/kubernetes.nix old mode 100644 new mode 100755 diff --git a/system/modules/localsend.nix b/system/modules/localsend.nix old mode 100644 new mode 100755 diff --git a/system/modules/misc.nix b/system/modules/misc.nix old mode 100644 new mode 100755 diff --git a/system/modules/netbird-client.nix b/system/modules/netbird-client.nix old mode 100644 new mode 100755 diff --git a/system/modules/netbird-server.nix b/system/modules/netbird-server.nix old mode 100644 new mode 100755 diff --git a/system/modules/networking.nix b/system/modules/networking.nix old mode 100644 new mode 100755 diff --git a/system/modules/nextcloud.nix b/system/modules/nextcloud.nix old mode 100644 new mode 100755 diff --git a/system/modules/niri.nix b/system/modules/niri.nix old mode 100644 new mode 100755 index 657ed78..bda7c54 --- a/system/modules/niri.nix +++ b/system/modules/niri.nix @@ -8,11 +8,8 @@ let inherit (lib) getExe pipe - map - listToAttrs - genList ; - inherit (builtins) fetchurl; + inherit (builtins) fetchurl genList listToAttrs; inherit (config.systemConf) username; # nvidia-offload-enabled = config.hardware.nvidia.prime.offload.enableOffloadCmd; @@ -20,8 +17,8 @@ let terminal = "ghostty"; browser = "zen-twilight"; - brightnessStep = builtins.toString 10; - volumeStep = builtins.toString 4; + brightnessStep = toString 10; + volumeStep = toString 4; execOnceScript = pkgs.writeShellScript "startupExec" '' # Fix nemo open in terminal @@ -163,7 +160,10 @@ in ]; input = { - focus-follows-mouse.enable = true; + focus-follows-mouse = { + max-scroll-amount = "90%"; + enable = true; + }; mouse.accel-speed = -0.1; keyboard = { repeat-delay = 250; @@ -226,11 +226,11 @@ in "Mod+WheelScrollLeft".action = focus-column-left; # Touchpad - "TouchpadScrollDown" = { + "Mod+TouchpadScrollDown" = { cooldown-ms = 150; action = focus-window-or-workspace-down; }; - "TouchpadScrollUp" = { + "Mod+TouchpadScrollUp" = { cooldown-ms = 150; action = focus-window-or-workspace-up; }; diff --git a/system/modules/nixsettings.nix b/system/modules/nixsettings.nix old mode 100644 new mode 100755 diff --git a/system/modules/nvidia.nix b/system/modules/nvidia.nix old mode 100644 new mode 100755 diff --git a/system/modules/obs-studio.nix b/system/modules/obs-studio.nix old mode 100644 new mode 100755 diff --git a/system/modules/opencloud.nix b/system/modules/opencloud.nix old mode 100644 new mode 100755 diff --git a/system/modules/openldap.nix b/system/modules/openldap.nix old mode 100644 new mode 100755 diff --git a/system/modules/packages.nix b/system/modules/packages.nix old mode 100644 new mode 100755 diff --git a/system/modules/paperless-ngx.nix b/system/modules/paperless-ngx.nix old mode 100644 new mode 100755 diff --git a/system/modules/plymouth.nix b/system/modules/plymouth.nix old mode 100644 new mode 100755 diff --git a/system/modules/polkit.nix b/system/modules/polkit.nix old mode 100644 new mode 100755 diff --git a/system/modules/postgresql.nix b/system/modules/postgresql.nix old mode 100644 new mode 100755 diff --git a/system/modules/presets/basic.nix b/system/modules/presets/basic.nix old mode 100644 new mode 100755 diff --git a/system/modules/presets/minimal.nix b/system/modules/presets/minimal.nix old mode 100644 new mode 100755 diff --git a/system/modules/printer.nix b/system/modules/printer.nix old mode 100644 new mode 100755 diff --git a/system/modules/programs.nix b/system/modules/programs.nix old mode 100644 new mode 100755 diff --git a/system/modules/prometheus.nix b/system/modules/prometheus.nix old mode 100644 new mode 100755 diff --git a/system/modules/rustdesk-server.nix b/system/modules/rustdesk-server.nix old mode 100644 new mode 100755 diff --git a/system/modules/secure-boot.nix b/system/modules/secure-boot.nix old mode 100644 new mode 100755 diff --git a/system/modules/security.nix b/system/modules/security.nix old mode 100644 new mode 100755 diff --git a/system/modules/services.nix b/system/modules/services.nix old mode 100644 new mode 100755 index dffbe2c..3ddb865 --- a/system/modules/services.nix +++ b/system/modules/services.nix @@ -32,13 +32,5 @@ in PermitRootLogin = lib.mkDefault "no"; }; }; - - xserver = { - enable = false; - xkb = { - layout = "us"; - options = "caps:swapescape"; - }; - }; }; } diff --git a/system/modules/shells/noctalia/bar.nix b/system/modules/shells/noctalia/bar.nix old mode 100644 new mode 100755 diff --git a/system/modules/shells/noctalia/controlCenter.nix b/system/modules/shells/noctalia/controlCenter.nix old mode 100644 new mode 100755 diff --git a/system/modules/shells/noctalia/default.nix b/system/modules/shells/noctalia/default.nix old mode 100644 new mode 100755 diff --git a/system/modules/shells/noctalia/sessionMenu.nix b/system/modules/shells/noctalia/sessionMenu.nix old mode 100644 new mode 100755 diff --git a/system/modules/shells/noctalia/systemMonitor.nix b/system/modules/shells/noctalia/systemMonitor.nix old mode 100644 new mode 100755 diff --git a/system/modules/shells/noctalia/templates.nix b/system/modules/shells/noctalia/templates.nix old mode 100644 new mode 100755 diff --git a/system/modules/sops-nix.nix b/system/modules/sops-nix.nix old mode 100644 new mode 100755 diff --git a/system/modules/sound.nix b/system/modules/sound.nix old mode 100644 new mode 100755 diff --git a/system/modules/stalwart.nix b/system/modules/stalwart.nix old mode 100644 new mode 100755 diff --git a/system/modules/stylix.nix b/system/modules/stylix.nix old mode 100644 new mode 100755 diff --git a/system/modules/sunshine.nix b/system/modules/sunshine.nix old mode 100644 new mode 100755 diff --git a/system/modules/systemd-resolv.nix b/system/modules/systemd-resolv.nix old mode 100644 new mode 100755 diff --git a/system/modules/time.nix b/system/modules/time.nix old mode 100644 new mode 100755 diff --git a/system/modules/tmux.nix b/system/modules/tmux.nix old mode 100644 new mode 100755 index 1d9d879..bb08238 --- a/system/modules/tmux.nix +++ b/system/modules/tmux.nix @@ -2,7 +2,8 @@ pkgs, config, ... -}: let +}: +let getIconScript = pkgs.writeShellScript "get-icon" '' get_icons() { local session_name="$1" @@ -30,7 +31,8 @@ prefixKey = "C-Space"; tmuxConfigPath = "/etc/tmux.conf"; -in { +in +{ environment = { variables = { TMUXINATOR_CONFIG = "/etc/tmuxinator"; diff --git a/system/modules/users.nix b/system/modules/users.nix old mode 100644 new mode 100755 diff --git a/system/modules/vaultwarden.nix b/system/modules/vaultwarden.nix old mode 100644 new mode 100755 index 1894571..ee251a5 --- a/system/modules/vaultwarden.nix +++ b/system/modules/vaultwarden.nix @@ -1,6 +1,12 @@ { domain }: { config, ... }: +let + inherit (config.sops) secrets; + cfg = config.services.vaultwarden; +in { + sops.secrets."vaultwarden" = { }; + services.postgresql = { enable = true; ensureUsers = [ @@ -17,7 +23,7 @@ services.vaultwarden = { enable = true; dbBackend = "postgresql"; - environmentFile = config.sops.secrets.vaultwarden.path; + environmentFile = secrets.vaultwarden.path; config = { DOMAIN = "https://${domain}"; SIGNUPS_ALLOWED = true; @@ -26,6 +32,11 @@ ROCKET_ADDRESS = "127.0.0.1"; ROCKET_LOG = "critical"; + SSO_ENABLED = true; + SSO_ONLY = true; + SSO_SIGNUPS_MATCH_EMAIL = true; + SSO_AUTH_ONLY_NOT_SESSION = true; + DATABASE_URL = "postgresql:///vaultwarden"; }; }; @@ -34,7 +45,7 @@ enableACME = true; forceSSL = true; locations."/" = { - proxyPass = "http://127.0.0.1:${toString config.services.vaultwarden.config.ROCKET_PORT}/"; + proxyPass = "http://127.0.0.1:${toString cfg.config.ROCKET_PORT}/"; proxyWebsockets = true; }; }; diff --git a/system/modules/virtualization.nix b/system/modules/virtualization.nix old mode 100644 new mode 100755 diff --git a/system/modules/webcam.nix b/system/modules/webcam.nix old mode 100644 new mode 100755 diff --git a/system/modules/wine.nix b/system/modules/wine.nix old mode 100644 new mode 100755 diff --git a/system/modules/wireguard.nix b/system/modules/wireguard.nix old mode 100644 new mode 100755