From 596ca3f1a3640c638120fc2f3bfd8b5edcbc34f0 Mon Sep 17 00:00:00 2001 From: muon Date: Thu, 20 Feb 2025 13:58:28 +0000 Subject: [PATCH 1/6] Update nix --- flake.lock | 129 ++++++++++---------------- modules/home/desktop/productivity.nix | 2 +- modules/home/desktop/social.nix | 2 +- 3 files changed, 50 insertions(+), 83 deletions(-) diff --git a/flake.lock b/flake.lock index f765c72..d257b40 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": 1739223196, + "narHash": "sha256-vAxN2f3rvl5q62gQQjZGVSvF93nAsOxntuFz+e/655w=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "91ca1f82d717b02ceb03a3f423cbe8082ebbb26d", + "rev": "a89108e6272426f4eddd93ba17d0ea101c34fb21", "type": "github" }, "original": { @@ -134,24 +134,6 @@ "inputs": { "systems": "systems" }, - "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_2": { - "inputs": { - "systems": "systems_2" - }, "locked": { "lastModified": 1681202837, "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", @@ -166,7 +148,7 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_2": { "inputs": { "systems": [ "stylix", @@ -275,11 +257,11 @@ ] }, "locked": { - "lastModified": 1738275749, - "narHash": "sha256-PM+cGduJ05EZ+YXulqAwUFjvfKpPmW080mcuN6R1POw=", + "lastModified": 1739992710, + "narHash": "sha256-9kEscmGnXHjSgcqyJR4TzzHhska4yz1inSQs6HuO9qU=", "owner": "nix-community", "repo": "home-manager", - "rev": "a8159195bfaef3c64df75d3b1e6a68d49d392be9", + "rev": "1c189f011447810af939a886ba7bee33532bb1f9", "type": "github" }, "original": { @@ -296,11 +278,11 @@ ] }, "locked": { - "lastModified": 1736785676, - "narHash": "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=", + "lastModified": 1737630279, + "narHash": "sha256-wJQCxyMRc4P26zDrHmZiRD5bbfcJpqPG3e2djdGG3pk=", "owner": "nix-community", "repo": "home-manager", - "rev": "fc52a210b60f2f52c74eac41a8647c1573d2071d", + "rev": "0db5c8bfcce78583ebbde0b2abbc95ad93445f7c", "type": "github" }, "original": { @@ -312,17 +294,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": 1739614676, + "narHash": "sha256-iDX6hXrO0J79hY3MqwU7t8b95j8DbqwdOug/Xdz4g6E=", "owner": "thiagokokada", "repo": "nix-alien", - "rev": "7e687663d2054fa1708284bd42731c6be62b1667", + "rev": "6255ffad7785bf04c7cff222f440de576c63363f", "type": "github" }, "original": { @@ -331,21 +311,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 +319,11 @@ ] }, "locked": { - "lastModified": 1736652904, - "narHash": "sha256-8uolHABgroXqzs03QdulHp8H9e5kWQZnnhcda1MKbBM=", + "lastModified": 1739071773, + "narHash": "sha256-/Ak+Quinhmdxa9m3shjm4lwwwqmzG8zzGhhhhgR1k9I=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "271e5bd7c57e1f001693799518b10a02d1123b12", + "rev": "895d81b6228bbd50a6ef22f5a58a504ca99763ea", "type": "github" }, "original": { @@ -370,7 +335,7 @@ "nix-minecraft": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": "nixpkgs_2" }, "locked": { @@ -389,11 +354,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1736798957, - "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=", + "lastModified": 1739446958, + "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3", + "rev": "2ff53fe64443980e139eaa286017f53f88336dd0", "type": "github" }, "original": { @@ -421,11 +386,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1738142207, - "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=", + "lastModified": 1740057738, + "narHash": "sha256-1/hlCrRQsrQyN1DHCps+9ZARHHCE5o9CJPCTZi8gMS4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9d3ae807ebd2981d593cddd0080856873139aa40", + "rev": "50d1c13414650572d98d8a580956bcb09ed14d81", "type": "github" }, "original": { @@ -468,11 +433,11 @@ ] }, "locked": { - "lastModified": 1738291974, - "narHash": "sha256-wkwYJc8cKmmQWUloyS9KwttBnja2ONRuJQDEsmef320=", + "lastModified": 1739262228, + "narHash": "sha256-7JAGezJ0Dn5qIyA2+T4Dt/xQgAbhCglh6lzCekTVMeU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "4c1251904d8a08c86ac6bc0d72cc09975e89aef7", + "rev": "07af005bb7d60c7f118d9d9f5530485da5d1e975", "type": "github" }, "original": { @@ -489,23 +454,24 @@ "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", + "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": 1740055719, + "narHash": "sha256-6UaZqK8+7byU2ORz6YpGccjDDoEd95Btr6qE6qbg5YM=", "owner": "danth", "repo": "stylix", - "rev": "b00c9f46ae6c27074d24d2db390f0ac5ebcc329f", + "rev": "c424b22396c5e40d2513ce03f94d0aa6d9cdd38f", "type": "github" }, "original": { @@ -544,21 +510,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,6 +544,22 @@ "type": "github" } }, + "tinted-schemes": { + "flake": false, + "locked": { + "lastModified": 1737565458, + "narHash": "sha256-y+9cvOA6BLKT0WfebDsyUpUa/YxKow9hTjBp6HpQv68=", + "owner": "tinted-theming", + "repo": "schemes", + "rev": "ae31625ba47aeaa4bf6a98cf11a8d4886f9463d9", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "schemes", + "type": "github" + } + }, "tinted-tmux": { "flake": false, "locked": { diff --git a/modules/home/desktop/productivity.nix b/modules/home/desktop/productivity.nix index 62c8a65..f2f36fd 100644 --- a/modules/home/desktop/productivity.nix +++ b/modules/home/desktop/productivity.nix @@ -32,7 +32,7 @@ in with lib; { # texstudio ]; - 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"; }) ]; })); From a5be7e4c4f7fcf15fc3cc4a25f18f2bb54984202 Mon Sep 17 00:00:00 2001 From: muon Date: Sun, 23 Feb 2025 21:35:52 +0000 Subject: [PATCH 2/6] Add traffic route comment --- modules/nixos/core/network.nix | 1 + 1 file changed, 1 insertion(+) 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; From dee1430ee59687dc83804791633147840fe0470d Mon Sep 17 00:00:00 2001 From: muon Date: Fri, 7 Mar 2025 09:24:07 +0000 Subject: [PATCH 3/6] Update nix --- flake.lock | 8 ++++---- modules/home/desktop/productivity.nix | 4 ++-- modules/nixos/server/grav/default.nix | 2 +- modules/nixos/server/grav/service.nix | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index d257b40..b40ae0c 100644 --- a/flake.lock +++ b/flake.lock @@ -386,11 +386,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1740057738, - "narHash": "sha256-1/hlCrRQsrQyN1DHCps+9ZARHHCE5o9CJPCTZi8gMS4=", - "owner": "nixos", + "lastModified": 1740340503, + "narHash": "sha256-sXbnZSKc5h89E4lmPZSmWVZcc1+7kOYq/J5njKoKDnE=", + "owner": "ddogfoodd", "repo": "nixpkgs", - "rev": "50d1c13414650572d98d8a580956bcb09ed14d81", + "rev": "d1805ec47aa3a89c2ab5ee99b5651ee1742df6e5", "type": "github" }, "original": { diff --git a/modules/home/desktop/productivity.nix b/modules/home/desktop/productivity.nix index f2f36fd..0a69c58 100644 --- a/modules/home/desktop/productivity.nix +++ b/modules/home/desktop/productivity.nix @@ -23,9 +23,9 @@ in with lib; { bitwarden-desktop # file management - breeze-icons + libsForQt5.breeze-icons libsForQt5.qt5ct - dolphin + libsForQt5.dolphin # documents texliveFull 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 { From bb2d16410ca4ef06831fd24cb06388713e6e33b0 Mon Sep 17 00:00:00 2001 From: muon Date: Tue, 18 Mar 2025 20:05:25 +0000 Subject: [PATCH 4/6] Add nvr --- hosts/muon/configuration.nix | 1 + modules/nixos/server/default.nix | 1 + modules/nixos/server/nvr.nix | 25 +++++++++++++++++++++++++ 3 files changed, 27 insertions(+) create mode 100644 modules/nixos/server/nvr.nix 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/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/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"; + }; + }; + }; +} From ea84a06f6159323b36b2148227e439c64160c3de Mon Sep 17 00:00:00 2001 From: muon Date: Wed, 19 Mar 2025 09:18:07 +0000 Subject: [PATCH 5/6] Update nix --- flake.lock | 149 +++++++++++++++++++-------- modules/home/desktop/development.nix | 2 +- modules/nixos/unfree/default.nix | 5 +- 3 files changed, 112 insertions(+), 44 deletions(-) diff --git a/flake.lock b/flake.lock index b40ae0c..9327e4e 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1739223196, - "narHash": "sha256-vAxN2f3rvl5q62gQQjZGVSvF93nAsOxntuFz+e/655w=", + "lastModified": 1741628778, + "narHash": "sha256-RsvHGNTmO2e/eVfgYK7g+eYEdwwh7SbZa+gZkT24MEA=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "a89108e6272426f4eddd93ba17d0ea101c34fb21", + "rev": "5a81d390bb64afd4e81221749ec4bffcbeb5fa80", "type": "github" }, "original": { @@ -115,7 +115,6 @@ } }, "flake-compat_3": { - "flake": false, "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -130,6 +129,28 @@ "type": "github" } }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "stylix", + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -198,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": { @@ -257,11 +278,11 @@ ] }, "locked": { - "lastModified": 1739992710, - "narHash": "sha256-9kEscmGnXHjSgcqyJR4TzzHhska4yz1inSQs6HuO9qU=", + "lastModified": 1742326330, + "narHash": "sha256-Tumt3tcMXJniSh7tw2gW+WAnVLeB3WWm+E+yYFnLBXo=", "owner": "nix-community", "repo": "home-manager", - "rev": "1c189f011447810af939a886ba7bee33532bb1f9", + "rev": "22a36aa709de7dd42b562a433b9cefecf104a6ee", "type": "github" }, "original": { @@ -278,11 +299,11 @@ ] }, "locked": { - "lastModified": 1737630279, - "narHash": "sha256-wJQCxyMRc4P26zDrHmZiRD5bbfcJpqPG3e2djdGG3pk=", + "lastModified": 1741635347, + "narHash": "sha256-2aYfV44h18alHXopyfL4D9GsnpE5XlSVkp4MGe586VU=", "owner": "nix-community", "repo": "home-manager", - "rev": "0db5c8bfcce78583ebbde0b2abbc95ad93445f7c", + "rev": "7fb8678716c158642ac42f9ff7a18c0800fea551", "type": "github" }, "original": { @@ -298,11 +319,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1739614676, - "narHash": "sha256-iDX6hXrO0J79hY3MqwU7t8b95j8DbqwdOug/Xdz4g6E=", + "lastModified": 1742038403, + "narHash": "sha256-mzZdujmFWC+wHRvm0tKUlXL0LLz3YI3EDUCnFCtzgxY=", "owner": "thiagokokada", "repo": "nix-alien", - "rev": "6255ffad7785bf04c7cff222f440de576c63363f", + "rev": "876d83ac35fc52145674282f87898824182edc48", "type": "github" }, "original": { @@ -319,11 +340,11 @@ ] }, "locked": { - "lastModified": 1739071773, - "narHash": "sha256-/Ak+Quinhmdxa9m3shjm4lwwwqmzG8zzGhhhhgR1k9I=", + "lastModified": 1741619381, + "narHash": "sha256-koZtlJRqi0/MD/AKd0KrXLA2NuBOVzlIyAJprjzpxZE=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "895d81b6228bbd50a6ef22f5a58a504ca99763ea", + "rev": "66537fb185462ba9b07f4e6f2d54894a1b2d04ab", "type": "github" }, "original": { @@ -354,11 +375,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739446958, - "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=", + "lastModified": 1741851582, + "narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2ff53fe64443980e139eaa286017f53f88336dd0", + "rev": "6607cf789e541e7873d40d3a8f7815ea92204f32", "type": "github" }, "original": { @@ -386,11 +407,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1740340503, - "narHash": "sha256-sXbnZSKc5h89E4lmPZSmWVZcc1+7kOYq/J5njKoKDnE=", - "owner": "ddogfoodd", + "lastModified": 1742069588, + "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "d1805ec47aa3a89c2ab5ee99b5651ee1742df6e5", + "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", "type": "github" }, "original": { @@ -402,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": { @@ -416,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", @@ -433,11 +477,11 @@ ] }, "locked": { - "lastModified": 1739262228, - "narHash": "sha256-7JAGezJ0Dn5qIyA2+T4Dt/xQgAbhCglh6lzCekTVMeU=", + "lastModified": 1742239755, + "narHash": "sha256-ptn8dR4Uat3UUadGYNnB7CIH9SQm8mK69D2A/twBUXQ=", "owner": "Mic92", "repo": "sops-nix", - "rev": "07af005bb7d60c7f118d9d9f5530485da5d1e975", + "rev": "787afce414bcce803b605c510b60bf43c11f4b55", "type": "github" }, "original": { @@ -459,6 +503,7 @@ "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", "nixpkgs": "nixpkgs_4", + "nur": "nur", "systems": "systems_2", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", @@ -467,11 +512,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1740055719, - "narHash": "sha256-6UaZqK8+7byU2ORz6YpGccjDDoEd95Btr6qE6qbg5YM=", + "lastModified": 1742299802, + "narHash": "sha256-enlpX8hwrfmjv/dHTKWzAB5Cwt1Kr6+ptikjX3Ob+FY=", "owner": "danth", "repo": "stylix", - "rev": "c424b22396c5e40d2513ce03f94d0aa6d9cdd38f", + "rev": "ff9ae322bcaeccabc65812390000276455331123", "type": "github" }, "original": { @@ -547,11 +592,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1737565458, - "narHash": "sha256-y+9cvOA6BLKT0WfebDsyUpUa/YxKow9hTjBp6HpQv68=", + "lastModified": 1741468895, + "narHash": "sha256-YKM1RJbL68Yp2vESBqeZQBjTETXo8mCTTzLZyckCfZk=", "owner": "tinted-theming", "repo": "schemes", - "rev": "ae31625ba47aeaa4bf6a98cf11a8d4886f9463d9", + "rev": "47c8c7726e98069cade5827e5fb2bfee02ce6991", "type": "github" }, "original": { @@ -563,11 +608,11 @@ "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": { @@ -591,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/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/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" ]); } From 82536d7f14c9acdddc8ec6bd9f1d9a48351abd4a Mon Sep 17 00:00:00 2001 From: muon Date: Sun, 13 Apr 2025 15:08:16 +0000 Subject: [PATCH 6/6] Update nix Add blender --- flake.lock | 26 +++++++++++++------------- modules/home/desktop/productivity.nix | 3 +++ 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index 9327e4e..be76ce9 100644 --- a/flake.lock +++ b/flake.lock @@ -278,11 +278,11 @@ ] }, "locked": { - "lastModified": 1742326330, - "narHash": "sha256-Tumt3tcMXJniSh7tw2gW+WAnVLeB3WWm+E+yYFnLBXo=", + "lastModified": 1742771635, + "narHash": "sha256-HQHzQPrg+g22tb3/K/4tgJjPzM+/5jbaujCZd8s2Mls=", "owner": "nix-community", "repo": "home-manager", - "rev": "22a36aa709de7dd42b562a433b9cefecf104a6ee", + "rev": "ad0614a1ec9cce3b13169e20ceb7e55dfaf2a818", "type": "github" }, "original": { @@ -407,11 +407,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1742069588, - "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", - "owner": "nixos", + "lastModified": 1743194642, + "narHash": "sha256-rGntfb2ke1xlmb9Jt/Y/lBnkiDGuTdqVPI4phtlmWbg=", + "owner": "Nobody-alias-N", "repo": "nixpkgs", - "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", + "rev": "c8c18f2aa3f88168e9dfdb85eee337c84b1da227", "type": "github" }, "original": { @@ -477,11 +477,11 @@ ] }, "locked": { - "lastModified": 1742239755, - "narHash": "sha256-ptn8dR4Uat3UUadGYNnB7CIH9SQm8mK69D2A/twBUXQ=", + "lastModified": 1742700801, + "narHash": "sha256-ZGlpUDsuBdeZeTNgoMv+aw0ByXT2J3wkYw9kJwkAS4M=", "owner": "Mic92", "repo": "sops-nix", - "rev": "787afce414bcce803b605c510b60bf43c11f4b55", + "rev": "67566fe68a8bed2a7b1175fdfb0697ed22ae8852", "type": "github" }, "original": { @@ -512,11 +512,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1742299802, - "narHash": "sha256-enlpX8hwrfmjv/dHTKWzAB5Cwt1Kr6+ptikjX3Ob+FY=", + "lastModified": 1742753562, + "narHash": "sha256-EBXgl3sPi5AQUM58XGuuC8HQl/Df+Dbt6pOLInInJ/k=", "owner": "danth", "repo": "stylix", - "rev": "ff9ae322bcaeccabc65812390000276455331123", + "rev": "d9df91c55643a8b5229a3ae3a496a30f14965457", "type": "github" }, "original": { diff --git a/modules/home/desktop/productivity.nix b/modules/home/desktop/productivity.nix index 0a69c58..2aa4902 100644 --- a/modules/home/desktop/productivity.nix +++ b/modules/home/desktop/productivity.nix @@ -30,6 +30,9 @@ in with lib; { # documents texliveFull # texstudio + + # 3D + blender ]; # qt.platformTheme = "qtct";