diff --git a/flake.lock b/flake.lock index 6b7bc39..db8d5f2 100644 --- a/flake.lock +++ b/flake.lock @@ -22,11 +22,11 @@ ] }, "locked": { - "lastModified": 1762276996, - "narHash": "sha256-TtcPgPmp2f0FAnc+DMEw4ardEgv1SGNR3/WFGH0N19M=", + "lastModified": 1761899396, + "narHash": "sha256-XOpKBp6HLzzMCbzW50TEuXN35zN5WGQREC7n34DcNMM=", "owner": "nix-community", "repo": "disko", - "rev": "af087d076d3860760b3323f6b583f4d828c1ac17", + "rev": "6f4cf5abbe318e4cd1e879506f6eeafd83f7b998", "type": "github" }, "original": { @@ -232,11 +232,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1762205063, - "narHash": "sha256-If6vQ+KvtKs3ARBO9G3l+4wFSCYtRBrwX1z+I+B61wQ=", + "lastModified": 1756744479, + "narHash": "sha256-EyZXusK/wRD3V9vDh00W2Re3Eg8UQ+LjVBQrrH9dq1U=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "88b8a563ff5704f4e8d8e5118fb911fa2110ca05", + "rev": "747b7912f49e2885090c83364d88cf853a020ac1", "type": "github" }, "original": { @@ -247,11 +247,11 @@ }, "master": { "locked": { - "lastModified": 1762312580, - "narHash": "sha256-WgmzqwMXH0qwIucXdc3SlOr+jFR/2srMTd70Pr0zGOs=", + "lastModified": 1762059713, + "narHash": "sha256-bNLozQP5IlPUwAt3YrR87MTb75NY3KLHJzQlncr9/Mc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8d468b88002a05348ff23a9a727abdcd6337759d", + "rev": "6a8176d2a1db4d174483e14d0f2aaf1848406858", "type": "github" }, "original": { @@ -280,7 +280,7 @@ "inputs": { "flake-parts": "flake-parts_3", "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1762041886, @@ -324,16 +324,16 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1761938829, - "narHash": "sha256-PvS0bxR2N1N+mD8WP+XdOlm+JYzzjw9CyBNiYYl3avM=", + "lastModified": 1747465671, + "narHash": "sha256-d1M0YTNodjKSzqVxMWL9Ey9CZGuhZwdbvNmTt3ytwJM=", "owner": "NixOS", "repo": "nix", - "rev": "d035d8ba8d85cb09517431e4da0d819475e84d7b", + "rev": "39f9f5d1b6f6120b2fba929b9a5faa0ec24e7746", "type": "github" }, "original": { "owner": "NixOS", - "ref": "d035d8ba8d85cb09517431e4da0d819475e84d7b", + "ref": "39f9f5d1b6f6120b2fba929b9a5faa0ec24e7746", "repo": "nix", "type": "github" } @@ -358,6 +358,28 @@ "type": "github" } }, + "nix-janitor": { + "inputs": { + "nixpkgs": [ + "unstable" + ], + "parts": "parts", + "rust-overlay": "rust-overlay_2" + }, + "locked": { + "lastModified": 1739448835, + "narHash": "sha256-7wJAmYxgrJa0mfus1GYRZeJU9ae/CSjCVsRTQ3gTfz4=", + "owner": "Nobbz", + "repo": "nix-janitor", + "rev": "f02d28fd18e7891bd35830fce22e58eb3c104007", + "type": "github" + }, + "original": { + "owner": "Nobbz", + "repo": "nix-janitor", + "type": "github" + } + }, "nixlib": { "locked": { "lastModified": 1736643958, @@ -396,11 +418,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1761880412, - "narHash": "sha256-QoJjGd4NstnyOG4mm4KXF+weBzA2AH/7gn1Pmpfcb0A=", + "lastModified": 1728538411, + "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a7fc11be66bdfb5cdde611ee5ce381c183da8386", + "rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221", "type": "github" }, "original": { @@ -426,6 +448,18 @@ "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1730504152, + "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" + } + }, "nixpkgs-regression": { "locked": { "lastModified": 1643052045, @@ -442,6 +476,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1761880412, + "narHash": "sha256-QoJjGd4NstnyOG4mm4KXF+weBzA2AH/7gn1Pmpfcb0A=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a7fc11be66bdfb5cdde611ee5ce381c183da8386", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nvim-flake": { "inputs": { "flake-compat": "flake-compat_3", @@ -453,11 +503,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1762216796, - "narHash": "sha256-eljNiDCG+MzrqSLwPfgqnKShDud4m9WMccCtjrbh29E=", + "lastModified": 1762048878, + "narHash": "sha256-hdmjC4VA+bOTcxL1EqFG55AYhNUD8NfUapzSsKo79Xo=", "owner": "Gerg-L", "repo": "nvim-flake", - "rev": "820c8be48190f21487cecff121d7d8c6fec22abe", + "rev": "4c92d83b6df6af820dd84d714df3e6076a5e10e9", "type": "github" }, "original": { @@ -466,6 +516,24 @@ "type": "github" } }, + "parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ @@ -500,6 +568,7 @@ "master": "master", "nix": "nix", "nix-index-database": "nix-index-database", + "nix-janitor": "nix-janitor", "nixos-generators": "nixos-generators", "nvim-flake": "nvim-flake", "sops-nix": "sops-nix", @@ -518,11 +587,29 @@ ] }, "locked": { - "lastModified": 1761791894, - "narHash": "sha256-myRIDh+PxaREz+z9LzbqBJF+SnTFJwkthKDX9zMyddY=", + "lastModified": 1754189623, + "narHash": "sha256-fstu5eb30UYwsxow0aQqkzxNxGn80UZjyehQVNVHuBk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "59c45eb69d9222a4362673141e00ff77842cd219", + "rev": "c582ff7f0d8a7ea689ae836dfb1773f1814f472a", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_2": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1732933841, + "narHash": "sha256-dge02pUSe2QeC/B3PriA0R8eAX+EU3aDoXj9FcS3XDw=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "c65e91d4a33abc3bc4a892d3c5b5b378bad64ea1", "type": "github" }, "original": { @@ -574,11 +661,11 @@ }, "stable": { "locked": { - "lastModified": 1761999846, - "narHash": "sha256-IYlYnp4O4dzEpL77BD/lj5NnJy2J8qbHkNSFiPBCbqo=", + "lastModified": 1761597516, + "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3de8f8d73e35724bf9abef41f1bdbedda1e14a31", + "rev": "daf6dc47aa4b44791372d6139ab7b25269184d55", "type": "github" }, "original": { @@ -655,11 +742,11 @@ }, "unstable": { "locked": { - "lastModified": 1762111121, - "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", + "lastModified": 1761907660, + "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", + "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 01fd0bb..5afd50c 100644 --- a/flake.nix +++ b/flake.nix @@ -24,7 +24,7 @@ type = "github"; owner = "NixOS"; repo = "nix"; - ref = "d035d8ba8d85cb09517431e4da0d819475e84d7b"; + ref = "39f9f5d1b6f6120b2fba929b9a5faa0ec24e7746"; inputs.nixpkgs.follows = "stable"; }; #other @@ -58,6 +58,12 @@ repo = "lanzaboote"; inputs.nixpkgs.follows = "unstable"; }; + nix-janitor = { + type = "github"; + owner = "Nobbz"; + repo = "nix-janitor"; + inputs.nixpkgs.follows = "unstable"; + }; systems = { type = "github"; owner = "nix-systems"; diff --git a/nixosConfigurations/gerg-desktop/kernel.nix b/nixosConfigurations/gerg-desktop/kernel.nix index e5eee1f..2923bc2 100644 --- a/nixosConfigurations/gerg-desktop/kernel.nix +++ b/nixosConfigurations/gerg-desktop/kernel.nix @@ -7,10 +7,10 @@ boot.kernelPackages = pkgs.linuxPackagesFor ( let - version = "6.16.9"; + version = "6.14.5"; src = pkgs.fetchurl { url = "mirror://kernel/linux/kernel/v${builtins.head (lib.splitVersion version)}.x/linux-${version}.tar.xz"; - hash = "sha256-esjIo88FR2N13qqoXfzuCVqCb/5Ve0N/Q3dPw7ZM5Y0="; + hash = "sha256-KCB+xSu+qjUHAQrv+UT0QvfZ8isoa3nK9F7G3xsk9Ak="; }; in (pkgs.linuxManualConfig { @@ -22,9 +22,6 @@ CONFIG_MODULES = "y"; }; configfile = ./kernelConfig; - extraMeta = { - broken = false; - }; }).overrideAttrs (old: { passthru = old.passthru or { } // { @@ -34,6 +31,9 @@ ia32Emulation = true; } config.boot.kernelPatches; }; + meta = old.meta or { } // { + broken = false; + }; }) ); } diff --git a/nixosConfigurations/gerg-desktop/kernelConfig b/nixosConfigurations/gerg-desktop/kernelConfig index 5768b28..7f2352e 100644 --- a/nixosConfigurations/gerg-desktop/kernelConfig +++ b/nixosConfigurations/gerg-desktop/kernelConfig @@ -5994,31 +5994,31 @@ CONFIG_DEBUG_MISC=y # # Compile-time checks and compiler options # -CONFIG_DEBUG_INFO=n -CONFIG_AS_HAS_NON_CONST_ULEB128=n +CONFIG_DEBUG_INFO=y +CONFIG_AS_HAS_NON_CONST_ULEB128=y # CONFIG_DEBUG_INFO_NONE is not set -CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=n +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y # CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_DWARF5 is not set # CONFIG_DEBUG_INFO_REDUCED is not set CONFIG_DEBUG_INFO_COMPRESSED_NONE=y # CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set # CONFIG_DEBUG_INFO_SPLIT is not set -CONFIG_DEBUG_INFO_BTF=n -CONFIG_PAHOLE_HAS_SPLIT_BTF=n -CONFIG_PAHOLE_HAS_LANG_EXCLUDE=n -CONFIG_DEBUG_INFO_BTF_MODULES=n -CONFIG_MODULE_ALLOW_BTF_MISMATCH=n +CONFIG_DEBUG_INFO_BTF=y +CONFIG_PAHOLE_HAS_SPLIT_BTF=y +CONFIG_PAHOLE_HAS_LANG_EXCLUDE=y +CONFIG_DEBUG_INFO_BTF_MODULES=y +CONFIG_MODULE_ALLOW_BTF_MISMATCH=y # CONFIG_GDB_SCRIPTS is not set CONFIG_FRAME_WARN=2048 # CONFIG_STRIP_ASM_SYMS is not set # CONFIG_READABLE_ASM is not set # CONFIG_HEADERS_INSTALL is not set # CONFIG_DEBUG_SECTION_MISMATCH is not set -CONFIG_SECTION_MISMATCH_WARN_ONLY=n +CONFIG_SECTION_MISMATCH_WARN_ONLY=y # CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_64B is not set -CONFIG_OBJTOOLn -CONFIG_NOINSTR_VALIDATION=n +CONFIG_OBJTOOL=y +CONFIG_NOINSTR_VALIDATION=y # CONFIG_VMLINUX_MAP is not set # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set # end of Compile-time checks and compiler options diff --git a/nixosConfigurations/gerg-desktop/main.nix b/nixosConfigurations/gerg-desktop/main.nix index 7e20349..ccc8577 100644 --- a/nixosConfigurations/gerg-desktop/main.nix +++ b/nixosConfigurations/gerg-desktop/main.nix @@ -26,7 +26,7 @@ packages = { inherit (pkgs) bitwarden-desktop # store stuff - pwvucontrol # gui volume control + pavucontrol # gui volume control pcmanfm # file manager mpv # play stuff ripgrep @@ -162,6 +162,7 @@ }; services.udev.packages = [ + pkgs.android-udev-rules # pkgs.via # pkgs.qmk-udev-rules ]; @@ -225,6 +226,7 @@ isNormalUser = true; extraGroups = [ "wheel" + "adbusers" "plugdev" ]; openssh.authorizedKeys.keys = builtins.attrValues { diff --git a/nixosConfigurations/media-laptop/main.nix b/nixosConfigurations/media-laptop/main.nix index a7e641d..485c4a6 100644 --- a/nixosConfigurations/media-laptop/main.nix +++ b/nixosConfigurations/media-laptop/main.nix @@ -16,7 +16,7 @@ packages = { inherit (pkgs) mpv - pwvucontrol # gui volume control + pavucontrol # gui volume control librewolf ; inherit (nvim-flake.packages) neovim; diff --git a/nixosModules/misc.nix b/nixosModules/misc.nix index 0fe9460..1fce4e0 100644 --- a/nixosModules/misc.nix +++ b/nixosModules/misc.nix @@ -1,6 +1,8 @@ { lib, + config, pkgs, + nix-janitor, }: { @@ -12,8 +14,16 @@ nix-output-monitor # nom nom nom nom; nix-tree # view packages pciutils # lspci - nix-janitor ; + nix-janitor = pkgs.symlinkJoin { + name = "nix-janitor"; + paths = [ nix-janitor.packages.default ]; + nativeBuildInputs = [ pkgs.makeBinaryWrapper ]; + postBuild = '' + wrapProgram "$out/bin/janitor" \ + --suffix PATH : ${lib.makeBinPath [ config.nix.package ]} + ''; + }; nixos-rebuild-ng = pkgs.symlinkJoin { name = "nixos-rebuild-ng"; paths = [ pkgs.nixos-rebuild-ng ];