diff --git a/configs/browser.nix b/configs/browser.nix index e648985..3dad123 100755 --- a/configs/browser.nix +++ b/configs/browser.nix @@ -1,9 +1,15 @@ { config, pkgs, lib, ... }: { - environment.systemPackages = [ - pkgs.brave - pkgs.firefox - pkgs.librewolf - pkgs.tor-browser-bundle-bin + programs.firefox = { + enable = true; + nativeMessagingHosts.packages = with pkgs; [ uget-integrator ]; + }; + + environment.systemPackages = with pkgs; [ + uget + brave + # firefox + librewolf + tor-browser-bundle-bin ]; } diff --git a/configs/common.nix b/configs/common.nix index ff7b940..e120fd1 100755 --- a/configs/common.nix +++ b/configs/common.nix @@ -2,7 +2,7 @@ { boot = { tmp = { - useTmpfs = true; + useTmpfs = lib.mkDefault true; cleanOnBoot = true; }; # kernelParams = [ "quiet" ]; diff --git a/configs/user-gui.nix b/configs/user-gui.nix index c4b8ae2..c7a275c 100755 --- a/configs/user-gui.nix +++ b/configs/user-gui.nix @@ -62,6 +62,7 @@ telegram-desktop discord kdenlive + shotcut ]; home-manager.users.alex = { pkgs, ... }: { @@ -83,7 +84,6 @@ kitty = { enable = true; - package = pkgs.kitty; extraConfig = '' enable_audio_bell false @@ -107,7 +107,7 @@ color14 #70c0b1 color7 #fffefe color15 #fffefe - selection_foreground #000000 + selection_foreground #000000 ''; }; }; diff --git a/flake.lock b/flake.lock index aa75f16..5aa5b61 100644 --- a/flake.lock +++ b/flake.lock @@ -2,18 +2,17 @@ "nodes": { "chaotic": { "inputs": { - "fenix": "fenix", "flake-schemas": "flake-schemas", "home-manager": "home-manager", "jovian": "jovian", "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1728587571, - "narHash": "sha256-vQmYKJ9sLQP6VivCdKNdpisXrB6xpDaaTif5U+IogzQ=", + "lastModified": 1729348269, + "narHash": "sha256-KCjrPNlEgEVFYs8wHIpd4iBelAV9L9QYsynoMYihIFw=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "d73c548a001f367048d4f22cf2ae626cd2002503", + "rev": "528723447ef037a1c081add43f4fd46440c9c3b1", "type": "github" }, "original": { @@ -23,28 +22,6 @@ "type": "github" } }, - "fenix": { - "inputs": { - "nixpkgs": [ - "chaotic", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1728455642, - "narHash": "sha256-abYGwrL6ak5sBRqwPh+V3CPJ6Pa89p378t51b7BO1lE=", - "owner": "nix-community", - "repo": "fenix", - "rev": "3b47535a5c782e4f4ad59cd4bdb23636b6926e03", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -105,11 +82,11 @@ ] }, "locked": { - "lastModified": 1728337164, - "narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=", + "lastModified": 1729027341, + "narHash": "sha256-IqWD7bA9iJVifvJlB4vs2KUXVhN+d9lECWdNB4jJ0tE=", "owner": "nix-community", "repo": "home-manager", - "rev": "038630363e7de57c36c417fd2f5d7c14773403e4", + "rev": "2a4fd1cfd8ed5648583dadef86966a8231024221", "type": "github" }, "original": { @@ -125,11 +102,11 @@ ] }, "locked": { - "lastModified": 1728791962, - "narHash": "sha256-nr5QiXwQcZmf6/auC1UpX8iAtINMtdi2mH+OkqJQVmU=", + "lastModified": 1729459288, + "narHash": "sha256-gBOVJv+q6Mx8jGvwX7cE6J8+sZmi1uxpRVsO7WxvVuQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "64c6325b28ebd708653dd41d88f306023f296184", + "rev": "1e27f213d77fc842603628bcf2df6681d7d08f7e", "type": "github" }, "original": { @@ -148,11 +125,11 @@ ] }, "locked": { - "lastModified": 1728410210, - "narHash": "sha256-vn6qupt1U0M6Hf3eXhK3/K4Du0Z7A60qYS1G14QsRY8=", + "lastModified": 1728974938, + "narHash": "sha256-pTPEx6WlM+nJVGrRUGx7Di4ljZMwE9HfvlZ6f3NzNfo=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "a25f915ec05196d15e3f7f8555ffb612d4f1045d", + "rev": "23170582b0658e6afd913149a58863af3a57b376", "type": "github" }, "original": { @@ -207,11 +184,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1728729581, - "narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=", + "lastModified": 1729455275, + "narHash": "sha256-THqzn/7um3oMHUEGXyq+1CJQE7EogwR3HjLMNOlhFBE=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806", + "rev": "9fcf30fccf8435f6390efec4a4d38e69c2268a36", "type": "github" }, "original": { @@ -223,11 +200,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "lastModified": 1729256560, + "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", "type": "github" }, "original": { @@ -239,11 +216,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1728156290, - "narHash": "sha256-uogSvuAp+1BYtdu6UWuObjHqSbBohpyARXDWqgI12Ss=", + "lastModified": 1729357638, + "narHash": "sha256-66RHecx+zohbZwJVEPF7uuwHeqf8rykZTMCTqIrOew4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "17ae88b569bb15590549ff478bab6494dde4a907", + "rev": "bb8c2cf7ea0dd2e18a52746b2c3a5b0c73b93c22", "type": "github" }, "original": { @@ -255,11 +232,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "lastModified": 1729256560, + "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", "type": "github" }, "original": { @@ -280,23 +257,6 @@ "sops-nix": "sops-nix" } }, - "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1728386838, - "narHash": "sha256-Lk64EoJkvp3WMGVJK3CR1TYcNghX0/BqHPLW5zdvmLE=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "efaf8bd5de34e2f47bd57425b83e0c7974902176", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, "sops-nix": { "inputs": { "nixpkgs": [ @@ -305,11 +265,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1728345710, - "narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=", + "lastModified": 1729394972, + "narHash": "sha256-fADlzOzcSaGsrO+THUZ8SgckMMc7bMQftztKFCLVcFI=", "owner": "mic92", "repo": "sops-nix", - "rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b", + "rev": "c504fd7ac946d7a1b17944d73b261ca0a0b226a5", "type": "github" }, "original": { diff --git a/kernelpatches/fix-netfilter-6.11.4.patch b/kernelpatches/fix-netfilter-6.11.4.patch new file mode 100644 index 0000000..9279808 --- /dev/null +++ b/kernelpatches/fix-netfilter-6.11.4.patch @@ -0,0 +1,42 @@ +diff --git a/net/netfilter/xt_NFLOG.c b/net/netfilter/xt_NFLOG.c +index d80abd6ccaf8f71fa70605fef7edada827a19ceb..6dcf4bc7e30b2ae364a1cd9ac8df954a90905c52 100644 +--- a/net/netfilter/xt_NFLOG.c ++++ b/net/netfilter/xt_NFLOG.c +@@ -79,7 +79,7 @@ static struct xt_target nflog_tg_reg[] __read_mostly = { + { + .name = "NFLOG", + .revision = 0, +- .family = NFPROTO_IPV4, ++ .family = NFPROTO_IPV6, + .checkentry = nflog_tg_check, + .destroy = nflog_tg_destroy, + .target = nflog_tg, +diff --git a/net/netfilter/xt_TRACE.c b/net/netfilter/xt_TRACE.c +index f3fa4f11348cd8ad796ce94f012cd48aa7a9020f..2a029b4adbcadf95e493b153f613a210624a9101 100644 +--- a/net/netfilter/xt_TRACE.c ++++ b/net/netfilter/xt_TRACE.c +@@ -49,6 +49,7 @@ static struct xt_target trace_tg_reg[] __read_mostly = { + .target = trace_tg, + .checkentry = trace_tg_check, + .destroy = trace_tg_destroy, ++ .me = THIS_MODULE, + }, + #endif + }; +diff --git a/net/netfilter/xt_mark.c b/net/netfilter/xt_mark.c +index f76fe04fc9a4e19f18ac323349ba6f22a00eafd7..65b965ca40ea7ea5d9feff381b433bf267a424c4 100644 +--- a/net/netfilter/xt_mark.c ++++ b/net/netfilter/xt_mark.c +@@ -62,7 +62,7 @@ static struct xt_target mark_tg_reg[] __read_mostly = { + { + .name = "MARK", + .revision = 2, +- .family = NFPROTO_IPV4, ++ .family = NFPROTO_IPV6, + .target = mark_tg, + .targetsize = sizeof(struct xt_mark_tginfo2), + .me = THIS_MODULE, + +--- +base-commit: 75aa74d52f43e75d0beb20572f98529071b700e5 +change-id: 20241018-xtables-typos-dfeadb8b122d diff --git a/machine/desktop/configuration.nix b/machine/desktop/configuration.nix index a35c555..38b4373 100755 --- a/machine/desktop/configuration.nix +++ b/machine/desktop/configuration.nix @@ -68,7 +68,7 @@ in borg-key = { sopsFile = ../../secrets-desktop.yaml; owner = config.users.users.alex.name; - group = config.users.users.alex.group; + group = config.users.users.alex.group; }; hashedPassword = { @@ -91,11 +91,17 @@ in efi = { canTouchEfiVariables = true; }; }; + tmp.useTmpfs = false; + kernelPackages = pkgs.pkgs.linuxPackages_cachyos-rc; kernelModules = [ "nct6775" ]; extraModulePackages = with pkgs.pkgs.linuxPackages_cachyos-rc; [ ryzen-smu ]; # kernelParams = [ "clearcpuid=514" ]; # kernelParams = [ "amdgpu.ppfeaturemask=0xffffffff" ]; + kernelPatches = [{ + name = "fix problems with netfilter in 6.11.4"; + patch = ../../kernelpatches/fix-netfilter-6.11.4.patch; + }]; }; systemd.services = { @@ -132,6 +138,9 @@ in qdiskinfo # fan2go # unigine-superposition + + jdk + moonlight-qt ]; hardware = { @@ -176,6 +185,11 @@ in pulse.enable = true; }; + sunshine = { + enable = true; + capSysAdmin = true; + }; + samba = { enable = true; settings = {