diff --git a/flake.lock b/flake.lock index f765c72..be76ce9 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1736899990, - "narHash": "sha256-S79Hqn2EtSxU4kp99t8tRschSifWD4p/51++0xNWUxw=", + "lastModified": 1741628778, + "narHash": "sha256-RsvHGNTmO2e/eVfgYK7g+eYEdwwh7SbZa+gZkT24MEA=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "91ca1f82d717b02ceb03a3f423cbe8082ebbb26d", + "rev": "5a81d390bb64afd4e81221749ec4bffcbeb5fa80", "type": "github" }, "original": { @@ -115,7 +115,6 @@ } }, "flake-compat_3": { - "flake": false, "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -130,27 +129,31 @@ "type": "github" } }, - "flake-utils": { + "flake-parts": { "inputs": { - "systems": "systems" + "nixpkgs-lib": [ + "stylix", + "nur", + "nixpkgs" + ] }, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { - "owner": "numtide", - "repo": "flake-utils", + "owner": "hercules-ci", + "repo": "flake-parts", "type": "github" } }, - "flake-utils_2": { + "flake-utils": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1681202837, @@ -166,7 +169,7 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_2": { "inputs": { "systems": [ "stylix", @@ -216,11 +219,11 @@ ] }, "locked": { - "lastModified": 1735882644, - "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", + "lastModified": 1741379162, + "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", + "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc", "type": "github" }, "original": { @@ -275,11 +278,11 @@ ] }, "locked": { - "lastModified": 1738275749, - "narHash": "sha256-PM+cGduJ05EZ+YXulqAwUFjvfKpPmW080mcuN6R1POw=", + "lastModified": 1742771635, + "narHash": "sha256-HQHzQPrg+g22tb3/K/4tgJjPzM+/5jbaujCZd8s2Mls=", "owner": "nix-community", "repo": "home-manager", - "rev": "a8159195bfaef3c64df75d3b1e6a68d49d392be9", + "rev": "ad0614a1ec9cce3b13169e20ceb7e55dfaf2a818", "type": "github" }, "original": { @@ -296,11 +299,11 @@ ] }, "locked": { - "lastModified": 1736785676, - "narHash": "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=", + "lastModified": 1741635347, + "narHash": "sha256-2aYfV44h18alHXopyfL4D9GsnpE5XlSVkp4MGe586VU=", "owner": "nix-community", "repo": "home-manager", - "rev": "fc52a210b60f2f52c74eac41a8647c1573d2071d", + "rev": "7fb8678716c158642ac42f9ff7a18c0800fea551", "type": "github" }, "original": { @@ -312,17 +315,15 @@ "nix-alien": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils", - "nix-filter": "nix-filter", "nix-index-database": "nix-index-database", "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1736952083, - "narHash": "sha256-zLhLqxc2JKvUtr0mSRRvOeKXN5dl5bn1e99z7EOp3bI=", + "lastModified": 1742038403, + "narHash": "sha256-mzZdujmFWC+wHRvm0tKUlXL0LLz3YI3EDUCnFCtzgxY=", "owner": "thiagokokada", "repo": "nix-alien", - "rev": "7e687663d2054fa1708284bd42731c6be62b1667", + "rev": "876d83ac35fc52145674282f87898824182edc48", "type": "github" }, "original": { @@ -331,21 +332,6 @@ "type": "github" } }, - "nix-filter": { - "locked": { - "lastModified": 1731533336, - "narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "f7653272fd234696ae94229839a99b73c9ab7de0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "nix-filter", - "type": "github" - } - }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -354,11 +340,11 @@ ] }, "locked": { - "lastModified": 1736652904, - "narHash": "sha256-8uolHABgroXqzs03QdulHp8H9e5kWQZnnhcda1MKbBM=", + "lastModified": 1741619381, + "narHash": "sha256-koZtlJRqi0/MD/AKd0KrXLA2NuBOVzlIyAJprjzpxZE=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "271e5bd7c57e1f001693799518b10a02d1123b12", + "rev": "66537fb185462ba9b07f4e6f2d54894a1b2d04ab", "type": "github" }, "original": { @@ -370,7 +356,7 @@ "nix-minecraft": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": "nixpkgs_2" }, "locked": { @@ -389,11 +375,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1736798957, - "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=", + "lastModified": 1741851582, + "narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3", + "rev": "6607cf789e541e7873d40d3a8f7815ea92204f32", "type": "github" }, "original": { @@ -421,11 +407,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1738142207, - "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=", - "owner": "nixos", + "lastModified": 1743194642, + "narHash": "sha256-rGntfb2ke1xlmb9Jt/Y/lBnkiDGuTdqVPI4phtlmWbg=", + "owner": "Nobody-alias-N", "repo": "nixpkgs", - "rev": "9d3ae807ebd2981d593cddd0080856873139aa40", + "rev": "c8c18f2aa3f88168e9dfdb85eee337c84b1da227", "type": "github" }, "original": { @@ -437,11 +423,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1736798957, - "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=", + "lastModified": 1741513245, + "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3", + "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", "type": "github" }, "original": { @@ -451,6 +437,29 @@ "type": "github" } }, + "nur": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": [ + "stylix", + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1741693509, + "narHash": "sha256-emkxnsZstiJWmGACimyAYqIKz2Qz5We5h1oBVDyQjLw=", + "owner": "nix-community", + "repo": "NUR", + "rev": "5479646b2574837f1899da78bdf9a48b75a9fb27", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NUR", + "type": "github" + } + }, "root": { "inputs": { "home-manager": "home-manager", @@ -468,11 +477,11 @@ ] }, "locked": { - "lastModified": 1738291974, - "narHash": "sha256-wkwYJc8cKmmQWUloyS9KwttBnja2ONRuJQDEsmef320=", + "lastModified": 1742700801, + "narHash": "sha256-ZGlpUDsuBdeZeTNgoMv+aw0ByXT2J3wkYw9kJwkAS4M=", "owner": "Mic92", "repo": "sops-nix", - "rev": "4c1251904d8a08c86ac6bc0d72cc09975e89aef7", + "rev": "67566fe68a8bed2a7b1175fdfb0697ed22ae8852", "type": "github" }, "original": { @@ -489,23 +498,25 @@ "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", "nixpkgs": "nixpkgs_4", - "systems": "systems_3", + "nur": "nur", + "systems": "systems_2", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", + "tinted-schemes": "tinted-schemes", "tinted-tmux": "tinted-tmux", "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1738278499, - "narHash": "sha256-q1SUyXSQ9znHTME53/vPLe+Ga3V1wW3X3gWfa8JsBUM=", + "lastModified": 1742753562, + "narHash": "sha256-EBXgl3sPi5AQUM58XGuuC8HQl/Df+Dbt6pOLInInJ/k=", "owner": "danth", "repo": "stylix", - "rev": "b00c9f46ae6c27074d24d2db390f0ac5ebcc329f", + "rev": "d9df91c55643a8b5229a3ae3a496a30f14965457", "type": "github" }, "original": { @@ -544,21 +555,6 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tinted-foot": { "flake": false, "locked": { @@ -593,14 +589,30 @@ "type": "github" } }, + "tinted-schemes": { + "flake": false, + "locked": { + "lastModified": 1741468895, + "narHash": "sha256-YKM1RJbL68Yp2vESBqeZQBjTETXo8mCTTzLZyckCfZk=", + "owner": "tinted-theming", + "repo": "schemes", + "rev": "47c8c7726e98069cade5827e5fb2bfee02ce6991", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "schemes", + "type": "github" + } + }, "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1735737224, - "narHash": "sha256-FO2hRBkZsjlIRqzNHCPc/52yxg11kHGA8MEtSun9RwE=", + "lastModified": 1740877430, + "narHash": "sha256-zWcCXgdC4/owfH/eEXx26y5BLzTrefjtSLFHWVD5KxU=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "aead506a9930c717ebf81cc83a2126e9ca08fa64", + "rev": "d48ee86394cbe45b112ba23ab63e33656090edb4", "type": "github" }, "original": { @@ -624,6 +636,28 @@ "repo": "base16-zed", "type": "github" } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "stylix", + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } } }, "root": "root", diff --git a/hosts/muon/configuration.nix b/hosts/muon/configuration.nix index ae613ac..41fc7a4 100644 --- a/hosts/muon/configuration.nix +++ b/hosts/muon/configuration.nix @@ -27,6 +27,7 @@ in { mods.containers.steam.enable = false; mods.server.astral.enable = false; mods.server.astral.autoStart = false; + mods.server.nvr.enable = true; mods.docker.enable = true; mods.docker.media.enable = false; diff --git a/modules/home/desktop/development.nix b/modules/home/desktop/development.nix index 7e9a785..a6b15c5 100644 --- a/modules/home/desktop/development.nix +++ b/modules/home/desktop/development.nix @@ -3,7 +3,7 @@ lib.mkEnableOption "enables gui development tools"; config = lib.mkIf config.mods.desktop.development.enable { - # home.packages = with pkgs; []; + home.packages = with pkgs; [ godot ]; programs.qutebrowser = { enable = true; diff --git a/modules/home/desktop/productivity.nix b/modules/home/desktop/productivity.nix index 62c8a65..2aa4902 100644 --- a/modules/home/desktop/productivity.nix +++ b/modules/home/desktop/productivity.nix @@ -23,16 +23,19 @@ in with lib; { bitwarden-desktop # file management - breeze-icons + libsForQt5.breeze-icons libsForQt5.qt5ct - dolphin + libsForQt5.dolphin # documents texliveFull # texstudio + + # 3D + blender ]; - qt.platformTheme = "qt5ct"; + # qt.platformTheme = "qtct"; home.sessionVariables.BROWSER = "librewolf"; programs.zsh.sessionVariables.BROWSER = "librewolf"; diff --git a/modules/home/desktop/social.nix b/modules/home/desktop/social.nix index 02b8ef2..3f84ec0 100644 --- a/modules/home/desktop/social.nix +++ b/modules/home/desktop/social.nix @@ -4,7 +4,7 @@ let patches = previousAttrs.patches ++ [ (builtins.fetchurl { url = "https://codeberg.org/muon/gists/raw/branch/main/micfix.patch"; - sha256 = "18zmq68m5mx3s924iqfbmm8a7r8qbjnw86hvvax2vg8w94g7mrqp"; + sha256 = "1klz3s5wl0g340nvm5kf8g14q264s7nsjiv1v1lx4hfbimdqmlvq"; }) ]; })); diff --git a/modules/nixos/core/network.nix b/modules/nixos/core/network.nix index e6b2171..b1c7d76 100644 --- a/modules/nixos/core/network.nix +++ b/modules/nixos/core/network.nix @@ -73,6 +73,7 @@ in with lib; { presharedKeyFile = "/home/muon/wireguard-keys/psk-${config.networking.hostName}"; allowedIPs = [ "10.0.0.${toString wg.id}/24" ]; + # allowedIPs = [ "0.0.0.0/0" ]; # ip route add 93.95.230.11 via 192.168.0.1 endpoint = "93.95.230.11:51820"; persistentKeepalive = 25; diff --git a/modules/nixos/server/default.nix b/modules/nixos/server/default.nix index 57cfd7e..3b2b7e0 100644 --- a/modules/nixos/server/default.nix +++ b/modules/nixos/server/default.nix @@ -20,5 +20,6 @@ ./cal.nix ./chat.nix ./dash.nix + ./nvr.nix ]; } diff --git a/modules/nixos/server/grav/default.nix b/modules/nixos/server/grav/default.nix index 9b4b22f..80920cf 100644 --- a/modules/nixos/server/grav/default.nix +++ b/modules/nixos/server/grav/default.nix @@ -19,7 +19,7 @@ in with lib; { config = let port = 5001; in { networking.firewall = { allowedTCPPorts = [ port ]; }; - services.grav = mkIf cfg.grav.enable { + mods.services.grav = mkIf cfg.grav.enable { inherit port; enable = true; root = cfg.grav.location; diff --git a/modules/nixos/server/grav/service.nix b/modules/nixos/server/grav/service.nix index eeb2347..6ca3167 100644 --- a/modules/nixos/server/grav/service.nix +++ b/modules/nixos/server/grav/service.nix @@ -27,7 +27,7 @@ let # yamlFormat.generate "grav-settings.yaml" cfg.systemSettings; in { - options.services.grav = { + options.mods.services.grav = { enable = mkEnableOption "grav"; root = mkOption { diff --git a/modules/nixos/server/nvr.nix b/modules/nixos/server/nvr.nix new file mode 100644 index 0000000..130ccb8 --- /dev/null +++ b/modules/nixos/server/nvr.nix @@ -0,0 +1,25 @@ +{ pkgs, lib, config, ... }: +let + cfg = config.mods.server.nvr; + # port = config.mods.server.nginx.ports.vault; +in with lib; { + options.mods.server = { + nvr = { + enable = mkEnableOption { + default = false; + description = "enables zoneminder server"; + }; + }; + }; + + config = mkIf cfg.enable { + networking.firewall.allowedTCPPorts = [ 8095 ]; + services.zoneminder = { + enable = true; + database = { + createLocally = true; + username = "zoneminder"; + }; + }; + }; +} diff --git a/modules/nixos/unfree/default.nix b/modules/nixos/unfree/default.nix index 288c341..adeea05 100644 --- a/modules/nixos/unfree/default.nix +++ b/modules/nixos/unfree/default.nix @@ -7,6 +7,7 @@ in { imports = [ ./steam.nix ./nvidia.nix ./minecraft.nix ]; nixpkgs.config.allowUnfreePredicate = pkg: - builtins.elem (lib.getName pkg) - ((mkPackages "steam") ++ (mkPackages "minecraft") ++ (mkPackages "nvidia")); + builtins.elem (lib.getName pkg) ((mkPackages "steam") + ++ (mkPackages "minecraft") ++ (mkPackages "nvidia") + ++ [ "stremio-shell" "stremio-server" ]); }