From da08469a0bee854d9e92f0d2a16f911d752ddbc1 Mon Sep 17 00:00:00 2001 From: xunuwu Date: Wed, 21 Jan 2026 14:11:12 +0100 Subject: [PATCH 1/3] ocaml --- home/develop/langs/ocaml.nix | 3 +++ hosts/nixdesk/home.nix | 1 + 2 files changed, 4 insertions(+) create mode 100644 home/develop/langs/ocaml.nix diff --git a/home/develop/langs/ocaml.nix b/home/develop/langs/ocaml.nix new file mode 100644 index 0000000..d1ca628 --- /dev/null +++ b/home/develop/langs/ocaml.nix @@ -0,0 +1,3 @@ +{ + programs.opam.enable = true; +} diff --git a/hosts/nixdesk/home.nix b/hosts/nixdesk/home.nix index 1e0737a..95b3099 100644 --- a/hosts/nixdesk/home.nix +++ b/hosts/nixdesk/home.nix @@ -49,6 +49,7 @@ develop.langs.nix develop.langs.zig develop.langs.lua + develop.langs.ocaml develop.langs.c develop.langs.csharp develop.langs.gleam From 8adc4a80c10bbdf2496c5daacd57a33e7f1df6f3 Mon Sep 17 00:00:00 2001 From: xunuwu Date: Wed, 21 Jan 2026 14:11:35 +0100 Subject: [PATCH 2/3] update nvim config version --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index cbece50..6fc74a6 100644 --- a/flake.lock +++ b/flake.lock @@ -828,11 +828,11 @@ ] }, "locked": { - "lastModified": 1765486064, - "narHash": "sha256-6KDAsBszRoYAv5A16/o7R6rcHbMX/xIaN6a1JKj2LKk=", + "lastModified": 1769085924, + "narHash": "sha256-j7u5iyCis4SjA853AjaJXB2wPSSCulRU8TwnhlZiti4=", "owner": "xunuwu", "repo": "nvim-config", - "rev": "b0e52d97eecb8c871d836d9f47fe5227f1e76abf", + "rev": "432de76a600a40f1c920b3d08491e8e2833a98f7", "type": "github" }, "original": { From 4b40e345324f0b4ccf490bb708d26513cdbb9819 Mon Sep 17 00:00:00 2001 From: xunuwu Date: Thu, 22 Jan 2026 19:40:12 +0100 Subject: [PATCH 3/3] update lockfile --- flake.lock | 395 +++++++----------- home/desktop/sway/__waybar.nix | 4 +- home/develop/langs/nix.nix | 2 +- home/programs/firefox/default.nix | 2 +- home/programs/nvim.nix | 2 +- home/services/appusage.nix | 4 +- home/themes/dark/default.nix | 2 +- hosts/hopper/home.nix | 2 +- hosts/hopper/profiles/lab/minecraft.nix | 2 +- hosts/nixdesk/default.nix | 1 - hosts/nixdesk/hardware.nix | 16 +- hosts/nixdesk/home.nix | 5 +- hosts/rackserv/profiles/caddy.nix | 2 +- sys/profiles/network/networkd.nix | 6 +- sys/profiles/programs/adb.nix | 3 - sys/profiles/programs/fonts.nix | 2 +- sys/profiles/programs/reverse-engineering.nix | 15 +- sys/profiles/programs/thunar.nix | 2 +- 18 files changed, 179 insertions(+), 288 deletions(-) delete mode 100644 sys/profiles/programs/adb.nix diff --git a/flake.lock b/flake.lock index 6fc74a6..a66110e 100644 --- a/flake.lock +++ b/flake.lock @@ -21,28 +21,28 @@ "base16-fish": { "flake": false, "locked": { - "lastModified": 1754405784, - "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=", + "lastModified": 1765809053, + "narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=", "owner": "tomyun", "repo": "base16-fish", - "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", + "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", "type": "github" }, "original": { "owner": "tomyun", "repo": "base16-fish", - "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", + "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", "type": "github" } }, "base16-helix": { "flake": false, "locked": { - "lastModified": 1752979451, - "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=", + "lastModified": 1760703920, + "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac", + "rev": "d646af9b7d14bff08824538164af99d0c521b185", "type": "github" }, "original": { @@ -142,11 +142,11 @@ ] }, "locked": { - "lastModified": 1764350888, - "narHash": "sha256-6Rp18zavTlnlZzcoLoBTJMBahL2FycVkw2rAEs3cQvo=", + "lastModified": 1768923567, + "narHash": "sha256-GVJ0jKsyXLuBzRMXCDY6D5J8wVdwP1DuQmmvYL/Vw/Q=", "owner": "nix-community", "repo": "disko", - "rev": "2055a08fd0e2fd41318279a5355eb8a161accf26", + "rev": "00395d188e3594a1507f214a2f15d4ce5c07cb28", "type": "github" }, "original": { @@ -163,11 +163,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1764389080, - "narHash": "sha256-BEn1Z9Uv20u2DS6wzLKdzx5kAzynM3wMQ9JnGf3VJvI=", + "lastModified": 1769054619, + "narHash": "sha256-LCc0gbSgjehdy41Gi1H5WNxEuW9PtRHFVaPXoFzslQU=", "owner": "rycee", "repo": "nur-expressions", - "rev": "897437c09bf22ce59efb3370f0783d0c662dba31", + "rev": "6509620630f68dc02ac3e99f15a67760778444ff", "type": "gitlab" }, "original": { @@ -180,11 +180,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1758112371, - "narHash": "sha256-lizRM2pj6PHrR25yimjyFn04OS4wcdbc38DCdBVa2rk=", + "lastModified": 1764873433, + "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "0909cfe4a2af8d358ad13b20246a350e14c2473d", + "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92", "type": "github" }, "original": { @@ -212,43 +212,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", "owner": "edolstra", "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_4": { - "flake": false, - "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { @@ -264,11 +232,11 @@ ] }, "locked": { - "lastModified": 1763759067, - "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", + "lastModified": 1768135262, + "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", + "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", "type": "github" }, "original": { @@ -282,11 +250,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1763759067, - "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", + "lastModified": 1768135262, + "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", + "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", "type": "github" }, "original": { @@ -304,11 +272,11 @@ ] }, "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "lastModified": 1768135262, + "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", + "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", "type": "github" }, "original": { @@ -318,28 +286,6 @@ } }, "flake-parts_4": { - "inputs": { - "nixpkgs-lib": [ - "nvim-config", - "neovim-nightly-overlay", - "hercules-ci-effects", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1754487366, - "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", - "type": "github" - }, - "original": { - "id": "flake-parts", - "type": "indirect" - } - }, - "flake-parts_5": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_2" }, @@ -357,7 +303,7 @@ "type": "github" } }, - "flake-parts_6": { + "flake-parts_5": { "inputs": { "nixpkgs-lib": [ "stylix", @@ -365,11 +311,11 @@ ] }, "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "lastModified": 1767609335, + "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", + "rev": "250481aafeb741edfe23d29195671c19b36b6dca", "type": "github" }, "original": { @@ -448,62 +394,15 @@ "type": "github" } }, - "git-hooks": { - "inputs": { - "flake-compat": "flake-compat_4", - "gitignore": "gitignore", - "nixpkgs": [ - "nvim-config", - "neovim-nightly-overlay", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1757588530, - "narHash": "sha256-tJ7A8mID3ct69n9WCvZ3PzIIl3rXTdptn/lZmqSS95U=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "b084b2c2b6bc23e83bbfe583b03664eb0b18c411", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "nvim-config", - "neovim-nightly-overlay", - "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" - } - }, "gnome-shell": { "flake": false, "locked": { "host": "gitlab.gnome.org", - "lastModified": 1762869044, - "narHash": "sha256-nwm/GJ2Syigf7VccLAZ66mFC8mZJFqpJmIxSGKl7+Ds=", + "lastModified": 1767737596, + "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "680e3d195a92203f28d4bf8c6e8bb537cc3ed4ad", + "rev": "ef02db02bf0ff342734d525b5767814770d85b49", "type": "gitlab" }, "original": { @@ -516,11 +415,11 @@ }, "hardware": { "locked": { - "lastModified": 1764440730, - "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=", + "lastModified": 1769086393, + "narHash": "sha256-3ymIZ8s3+hu7sDl/Y48o6bwMxorfKrmn97KuWiw1vjY=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3", + "rev": "9f7ba891ea5fc3ededd7804f1a23fafadbcb26ca", "type": "github" }, "original": { @@ -550,29 +449,6 @@ "type": "github" } }, - "hercules-ci-effects": { - "inputs": { - "flake-parts": "flake-parts_4", - "nixpkgs": [ - "nvim-config", - "neovim-nightly-overlay", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1755233722, - "narHash": "sha256-AavrbMltJKcC2Fx0lfJoZfmy7g87ebXU0ddVenhajLA=", - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "rev": "99e03e72e3f7e13506f80ef9ebaedccb929d84d0", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -580,11 +456,32 @@ ] }, "locked": { - "lastModified": 1764361670, - "narHash": "sha256-jgWzgpIaHbL3USIq0gihZeuy1lLf2YSfwvWEwnfAJUw=", + "lastModified": 1769102673, + "narHash": "sha256-/qvRFjn1s3bIJdSKG6IpaE6ML3j9anQKUqGhmt4Qe+E=", "owner": "nix-community", "repo": "home-manager", - "rev": "780be8ef503a28939cf9dc7996b48ffb1a3e04c6", + "rev": "b0491fe55680bd19be8e74847969dad9d7784658", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "impermanence", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1768598210, + "narHash": "sha256-kkgA32s/f4jaa4UG+2f8C225Qvclxnqs76mf8zvTVPg=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "c47b2cc64a629f8e075de52e4742de688f930dc6", "type": "github" }, "original": { @@ -594,12 +491,16 @@ } }, "impermanence": { + "inputs": { + "home-manager": "home-manager_2", + "nixpkgs": "nixpkgs" + }, "locked": { - "lastModified": 1737831083, - "narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=", + "lastModified": 1768941735, + "narHash": "sha256-OyxsfXNcOkt06/kM+4bnuC8moDx+t7Qr+RB0BBa83Ig=", "owner": "nix-community", "repo": "impermanence", - "rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170", + "rev": "69ecf31e8fddc9354a4b418f3a517445d486bb54", "type": "github" }, "original": { @@ -610,23 +511,19 @@ }, "neovim-nightly-overlay": { "inputs": { - "flake-compat": "flake-compat_3", "flake-parts": "flake-parts_3", - "git-hooks": "git-hooks", - "hercules-ci-effects": "hercules-ci-effects", "neovim-src": "neovim-src", "nixpkgs": [ "nvim-config", "nixpkgs" - ], - "treefmt-nix": "treefmt-nix" + ] }, "locked": { - "lastModified": 1757808376, - "narHash": "sha256-bBlkNzJkt8OiaMcoRNlZM1dViUcXViuaqwpqxK+xK+E=", + "lastModified": 1769040284, + "narHash": "sha256-zgZfWwXyL9EDqkTEk0y7hB2wUrsNhpTjoVZpmGa3VHw=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "7ef746f86fb9e35edc54809601f58a3b4b0b2c81", + "rev": "ce27c2327ff2e41f79aa0b5933b931708d6f6804", "type": "github" }, "original": { @@ -638,11 +535,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1757806386, - "narHash": "sha256-32vMFpPcSLk8llBvUN+8UpEdQFByR9mivEgK7CC+PUo=", + "lastModified": 1768992167, + "narHash": "sha256-pCe5bvBt8VYF/IrDY2RDmA0412YR5Uq0kbYRp/zBI4g=", "owner": "neovim", "repo": "neovim", - "rev": "68f40386ed8cf813a7ae8443628b950e7707dc3e", + "rev": "25ce44845d2adf94dfc91c70eb792a50d8274aa1", "type": "github" }, "original": { @@ -659,11 +556,11 @@ ] }, "locked": { - "lastModified": 1764294866, - "narHash": "sha256-Kn0+e5avInNAX7Rf3qKlUGunpcc8ryutoZLRXzQa6BY=", + "lastModified": 1768874893, + "narHash": "sha256-1WCbVm2Dqqb+HEuahu06l8lQ393P8jIAHEjM3jhm4gc=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "f189ee5932ef2e0fcc4f63d12a698a968b8450e8", + "rev": "12c404b997930a1fe8ffcaa231f85fd8ebc6338a", "type": "github" }, "original": { @@ -679,11 +576,11 @@ ] }, "locked": { - "lastModified": 1763870992, - "narHash": "sha256-NPyc76Wxmv/vAsXJ8F+/8fXECHYcv2YGSqdiSHp/F/A=", + "lastModified": 1765267181, + "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "d7423982c7a26586aa237d130b14c8b302c7a367", + "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f", "type": "github" }, "original": { @@ -701,11 +598,11 @@ ] }, "locked": { - "lastModified": 1764208886, - "narHash": "sha256-voOx8RsK3miw3EHw05nwuOS4ltzeH8tKJnVr+mxtTPQ=", + "lastModified": 1768962252, + "narHash": "sha256-HyWOOHcySV8rl36gs4+n0sxPinxpwWOgwXibfFPYeZ0=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "7da8a2d675f9cc56b3f6d654b4cccdca5016ac8e", + "rev": "433cf697394104123e1fd02fa689534ac1733bfa", "type": "github" }, "original": { @@ -717,14 +614,14 @@ "nixos-wsl": { "inputs": { "flake-compat": "flake-compat_2", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1764072830, - "narHash": "sha256-ezkjlUCohD9o9c47Ey0/I4CamSS0QEORTqGvyGqMud0=", + "lastModified": 1768840529, + "narHash": "sha256-e22ou8nikeThx9x9/y29VdMEW4Fm7DBzlhp9ndDJUGE=", "owner": "nix-community", "repo": "nixos-wsl", - "rev": "c7832dd786175e20f2697179e0e03efadffe4201", + "rev": "b8e9a758fa2e08d8ac5c3be5d4b1fcc92fd3ce84", "type": "github" }, "original": { @@ -735,15 +632,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1763678758, - "narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=", - "owner": "NixOS", + "lastModified": 1768564909, + "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "117cc7f94e8072499b0a7aa4c52084fa4e11cc9b", + "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -751,11 +648,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1761765539, - "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=", + "lastModified": 1765674936, + "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "719359f4562934ae99f5443f20aa06c2ffff91fc", + "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", "type": "github" }, "original": { @@ -781,11 +678,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1764242076, - "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", + "lastModified": 1768564909, + "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1769018530, + "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", + "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", "type": "github" }, "original": { @@ -807,11 +720,11 @@ ] }, "locked": { - "lastModified": 1758998580, - "narHash": "sha256-VLx0z396gDCGSiowLMFz5XRO/XuNV+4EnDYjdJhHvUk=", + "lastModified": 1767810917, + "narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=", "owner": "nix-community", "repo": "NUR", - "rev": "ba8d9c98f5f4630bcb0e815ab456afd90c930728", + "rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4", "type": "github" }, "original": { @@ -828,11 +741,11 @@ ] }, "locked": { - "lastModified": 1769085924, - "narHash": "sha256-j7u5iyCis4SjA853AjaJXB2wPSSCulRU8TwnhlZiti4=", + "lastModified": 1769111606, + "narHash": "sha256-oWQSTDeEfdHQccVtOOIoaLM/wVTrpmscgIeHVWz9p4c=", "owner": "xunuwu", "repo": "nvim-config", - "rev": "432de76a600a40f1c920b3d08491e8e2833a98f7", + "rev": "cd11d2167f061c630264f5d30a30634763f0a7d2", "type": "github" }, "original": { @@ -843,7 +756,7 @@ }, "own-website": { "inputs": { - "flake-parts": "flake-parts_5", + "flake-parts": "flake-parts_4", "nixpkgs": [ "nixpkgs" ] @@ -898,7 +811,7 @@ "nix-index-database": "nix-index-database", "nix-minecraft": "nix-minecraft", "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nvim-config": "nvim-config", "own-website": "own-website", "roblox-playtime": "roblox-playtime", @@ -936,11 +849,11 @@ ] }, "locked": { - "lastModified": 1764021963, - "narHash": "sha256-1m84V2ROwNEbqeS9t37/mkry23GBhfMt8qb6aHHmjuc=", + "lastModified": 1768863606, + "narHash": "sha256-1IHAeS8WtBiEo5XiyJBHOXMzECD6aaIOJmpQKzRRl64=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c482a1c1bbe030be6688ed7dc84f7213f304f1ec", + "rev": "c7067be8db2c09ab1884de67ef6c4f693973f4a2", "type": "github" }, "original": { @@ -956,7 +869,7 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-parts": "flake-parts_6", + "flake-parts": "flake-parts_5", "gnome-shell": "gnome-shell", "nixpkgs": [ "nixpkgs" @@ -970,11 +883,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1764451865, - "narHash": "sha256-d4tfTm3ccp4rx7W1WW1BzSkTgEeMd4cZvhAJ7lP145M=", + "lastModified": 1768744881, + "narHash": "sha256-3+h7OxqfrPIB/tRsiZXWE9sCbTm7NQN5Ie428p+S6BA=", "owner": "nix-community", "repo": "stylix", - "rev": "8a096ccec828c68bfb870295d186ad994ea0ae2c", + "rev": "06684f00cfbee14da96fd4307b966884de272d3a", "type": "github" }, "original": { @@ -1094,11 +1007,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1757716333, - "narHash": "sha256-d4km8W7w2zCUEmPAPUoLk1NlYrGODuVa3P7St+UrqkM=", + "lastModified": 1767710407, + "narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=", "owner": "tinted-theming", "repo": "schemes", - "rev": "317a5e10c35825a6c905d912e480dfe8e71c7559", + "rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2", "type": "github" }, "original": { @@ -1110,11 +1023,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1757811970, - "narHash": "sha256-n5ZJgmzGZXOD9pZdAl1OnBu3PIqD+X3vEBUGbTi4JiI=", + "lastModified": 1767489635, + "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "d217ba31c846006e9e0ae70775b0ee0f00aa6b1e", + "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184", "type": "github" }, "original": { @@ -1126,11 +1039,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1757811247, - "narHash": "sha256-4EFOUyLj85NRL3OacHoLGEo0wjiRJzfsXtR4CZWAn6w=", + "lastModified": 1767488740, + "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "824fe0aacf82b3c26690d14e8d2cedd56e18404e", + "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40", "type": "github" }, "original": { @@ -1139,28 +1052,6 @@ "type": "github" } }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nvim-config", - "neovim-nightly-overlay", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1756662192, - "narHash": "sha256-F1oFfV51AE259I85av+MAia221XwMHCOtZCMcZLK2Jk=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "1aabc6c05ccbcbf4a635fb7a90400e44282f61c4", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, "utils": { "inputs": { "systems": "systems_3" @@ -1181,11 +1072,11 @@ }, "vpn-confinement": { "locked": { - "lastModified": 1759956062, - "narHash": "sha256-NUZu0Rb0fwUjfdp51zMm0xM3lcK8Kw4c97LLog7+JjA=", + "lastModified": 1767604552, + "narHash": "sha256-FddhMxnc99KYOZ/S3YNqtDSoxisIhVtJ7L4s8XD2u0A=", "owner": "Maroka-chan", "repo": "VPN-Confinement", - "rev": "fabe7247b720b5eb4c3c053e24a2b3b70e64c52b", + "rev": "a6b2da727853886876fd1081d6bb2880752937f3", "type": "github" }, "original": { diff --git a/home/desktop/sway/__waybar.nix b/home/desktop/sway/__waybar.nix index 4ac9618..562ccbe 100644 --- a/home/desktop/sway/__waybar.nix +++ b/home/desktop/sway/__waybar.nix @@ -34,12 +34,12 @@ }; "custom/miao-battery-percentage" = { return-type = "json"; - exec = "${lib.getExe self.packages.${pkgs.system}.miao-battery-percentage}"; + exec = "${lib.getExe self.packages.${pkgs.stdenv.hostPlatform.system}.miao-battery-percentage}"; restart-interval = "60"; }; "custom/keyboard-state" = { return-type = "json"; - exec = "${lib.getExe self.packages.${pkgs.system}.keyboard-state}"; + exec = "${lib.getExe self.packages.${pkgs.stdenv.hostPlatform.system}.keyboard-state}"; restart-interval = "60"; }; clock = { diff --git a/home/develop/langs/nix.nix b/home/develop/langs/nix.nix index 8e7ed75..6116c8a 100644 --- a/home/develop/langs/nix.nix +++ b/home/develop/langs/nix.nix @@ -1,3 +1,3 @@ {pkgs, ...}: { - home.packages = with pkgs; [nil nixd alejandra nixfmt-rfc-style]; + home.packages = with pkgs; [nil nixd alejandra nixfmt]; } diff --git a/home/programs/firefox/default.nix b/home/programs/firefox/default.nix index c5b2a1a..3ff6c3c 100644 --- a/home/programs/firefox/default.nix +++ b/home/programs/firefox/default.nix @@ -31,7 +31,7 @@ }; profiles.xun = { # extensions.force = true; - extensions.packages = with inputs.firefox-addons.packages.${pkgs.system}; [ + extensions.packages = with inputs.firefox-addons.packages.${pkgs.stdenv.hostPlatform.system}; [ ublock-origin # (lib.mkIf (config.xun.desktop.colorscheme == "dark") darkreader) darkreader diff --git a/home/programs/nvim.nix b/home/programs/nvim.nix index 68f0476..a582208 100644 --- a/home/programs/nvim.nix +++ b/home/programs/nvim.nix @@ -3,6 +3,6 @@ inputs, ... }: { - home.packages = [inputs.nvim-config.packages.${pkgs.system}.default]; + home.packages = [inputs.nvim-config.packages.${pkgs.stdenv.hostPlatform.system}.default]; home.sessionVariables.EDITOR = "nvim"; } diff --git a/home/services/appusage.nix b/home/services/appusage.nix index 1c76c1d..7a58901 100644 --- a/home/services/appusage.nix +++ b/home/services/appusage.nix @@ -4,7 +4,7 @@ pkgs, ... }: { - home.packages = [inputs.wayland-appusage.packages.${pkgs.system}.appusage]; + home.packages = [inputs.wayland-appusage.packages.${pkgs.stdenv.hostPlatform.system}.appusage]; systemd.user.services.appusage = { Unit = { @@ -16,7 +16,7 @@ Service = { Type = "simple"; Restart = "on-failure"; - ExecStart = "${inputs.wayland-appusage.packages.${pkgs.system}.appusage-daemon}/bin/appusage-daemon"; + ExecStart = "${inputs.wayland-appusage.packages.${pkgs.stdenv.hostPlatform.system}.appusage-daemon}/bin/appusage-daemon"; RestartSec = "5s"; }; }; diff --git a/home/themes/dark/default.nix b/home/themes/dark/default.nix index e1d4685..7e05206 100644 --- a/home/themes/dark/default.nix +++ b/home/themes/dark/default.nix @@ -5,7 +5,7 @@ ]; stylix = { - iconTheme = { + icons = { enable = true; package = pkgs.morewaita-icon-theme; dark = "MoreWaita"; diff --git a/hosts/hopper/home.nix b/hosts/hopper/home.nix index 8333d6b..d81b2e1 100644 --- a/hosts/hopper/home.nix +++ b/hosts/hopper/home.nix @@ -31,7 +31,7 @@ qpwgraph moonlight-qt - inputs.sobercookie.packages.${pkgs.system}.default + inputs.sobercookie.packages.${pkgs.stdenv.hostPlatform.system}.default ]; home = { diff --git a/hosts/hopper/profiles/lab/minecraft.nix b/hosts/hopper/profiles/lab/minecraft.nix index 6cf6be6..724478c 100644 --- a/hosts/hopper/profiles/lab/minecraft.nix +++ b/hosts/hopper/profiles/lab/minecraft.nix @@ -9,7 +9,7 @@ openFirewall = true; servers.owo = { enable = true; - package = inputs.nix-minecraft.legacyPackages.${pkgs.system}.fabricServers.fabric-1_21_5; + package = inputs.nix-minecraft.legacyPackages.${pkgs.stdenv.hostPlatform.system}.fabricServers.fabric-1_21_5; serverProperties = { max-players = 5; motd = "owo"; diff --git a/hosts/nixdesk/default.nix b/hosts/nixdesk/default.nix index d0cd579..0293133 100644 --- a/hosts/nixdesk/default.nix +++ b/hosts/nixdesk/default.nix @@ -67,7 +67,6 @@ programs.fonts programs.home-manager # programs.qt - programs.adb programs.gpg programs.openrgb programs.tools diff --git a/hosts/nixdesk/hardware.nix b/hosts/nixdesk/hardware.nix index e4e26ef..088d499 100644 --- a/hosts/nixdesk/hardware.nix +++ b/hosts/nixdesk/hardware.nix @@ -15,14 +15,14 @@ hardware.i2c.enable = true; boot = { - kernelPatches = lib.singleton { - name = "ebpf-config"; - patch = null; - structuredExtraConfig = with lib.kernel; { - BPF_KPROBE_OVERRIDE = yes; - FUNCTION_ERROR_INJECTION = yes; - }; - }; + # kernelPatches = lib.singleton { + # name = "ebpf-config"; + # patch = null; + # structuredExtraConfig = with lib.kernel; { + # BPF_KPROBE_OVERRIDE = yes; + # FUNCTION_ERROR_INJECTION = yes; + # }; + # }; # using lts for now # kernelPackages = pkgs.linuxPackages_latest; initrd = { diff --git a/hosts/nixdesk/home.nix b/hosts/nixdesk/home.nix index 95b3099..2581356 100644 --- a/hosts/nixdesk/home.nix +++ b/hosts/nixdesk/home.nix @@ -123,6 +123,7 @@ android-studio jetbrains.rider jetbrains.clion + android-tools # jetbrains.idea-ultimate # communication @@ -165,13 +166,13 @@ ryubing # switch emu rpcs3 # ps3 emu prismlauncher - inputs.sobercookie.packages.${pkgs.system}.default + inputs.sobercookie.packages.${pkgs.stdenv.hostPlatform.system}.default krunker (writeScriptBin "crosshair-overlay" '' ${lib.getExe bubblewrap} \ --ro-bind / / \ --chdir "$XDG_PICTURES_DIR" \ - -- ${inputs.crosshair-overlay.packages.${pkgs.system}.default}/bin/crosshair-overlay $@ + -- ${inputs.crosshair-overlay.packages.${pkgs.stdenv.hostPlatform.system}.default}/bin/crosshair-overlay $@ '') ]; diff --git a/hosts/rackserv/profiles/caddy.nix b/hosts/rackserv/profiles/caddy.nix index 9e732a9..d40198b 100644 --- a/hosts/rackserv/profiles/caddy.nix +++ b/hosts/rackserv/profiles/caddy.nix @@ -58,7 +58,7 @@ in { hostName = "${domain}"; useACMEHost = domain; extraConfig = '' - root * ${inputs.own-website.packages.${pkgs.system}.default} + root * ${inputs.own-website.packages.${pkgs.stdenv.hostPlatform.system}.default} file_server ''; }; diff --git a/sys/profiles/network/networkd.nix b/sys/profiles/network/networkd.nix index c6f2e65..8990197 100644 --- a/sys/profiles/network/networkd.nix +++ b/sys/profiles/network/networkd.nix @@ -5,7 +5,9 @@ }; services.resolved = { enable = true; - dnssec = "true"; - domains = ["~."]; + settings.Resolve = { + DNSSEC = "true"; + Domains = ["~."]; + }; }; } diff --git a/sys/profiles/programs/adb.nix b/sys/profiles/programs/adb.nix deleted file mode 100644 index 435add8..0000000 --- a/sys/profiles/programs/adb.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - programs.adb.enable = true; -} diff --git a/sys/profiles/programs/fonts.nix b/sys/profiles/programs/fonts.nix index a469f60..64716c8 100644 --- a/sys/profiles/programs/fonts.nix +++ b/sys/profiles/programs/fonts.nix @@ -25,7 +25,7 @@ nerd-fonts.blex-mono nerd-fonts._0xproto - self.packages.${pkgs.system}.cartograph-cf + self.packages.${pkgs.stdenv.hostPlatform.system}.cartograph-cf ]; # causes more issues than it solves diff --git a/sys/profiles/programs/reverse-engineering.nix b/sys/profiles/programs/reverse-engineering.nix index 1d8e892..a13b09b 100644 --- a/sys/profiles/programs/reverse-engineering.nix +++ b/sys/profiles/programs/reverse-engineering.nix @@ -5,14 +5,15 @@ ... }: { environment.systemPackages = with pkgs; [ - (ghidra.withExtensions (ps: - with ps; [ - gnudisassembler - machinelearning - ])) + ghidra + # (ghidra.withExtensions (ps: + # with ps; [ + # gnudisassembler + # machinelearning + # ])) - self.packages.${pkgs.system}.binaryninja-personal - self.packages.${pkgs.system}.ida-pro + self.packages.${pkgs.stdenv.hostPlatform.system}.binaryninja-personal + self.packages.${pkgs.stdenv.hostPlatform.system}.ida-pro gdb ]; diff --git a/sys/profiles/programs/thunar.nix b/sys/profiles/programs/thunar.nix index 38caf4a..10fb8be 100644 --- a/sys/profiles/programs/thunar.nix +++ b/sys/profiles/programs/thunar.nix @@ -2,7 +2,7 @@ services.tumbler.enable = true; # image thumbnails programs.thunar = { enable = true; - plugins = with pkgs.xfce; [ + plugins = with pkgs; [ thunar-archive-plugin ]; };