diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 85026ce..ad4fff8 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -3,7 +3,7 @@ updates: - package-ecosystem: github-actions directory: "/" schedule: - interval: weekly + interval: daily time: "04:00" open-pull-requests-limit: 10 reviewers: diff --git a/.github/workflows/flake-update.yml b/.github/workflows/flake-update.yml index c3e737b..5d302fa 100644 --- a/.github/workflows/flake-update.yml +++ b/.github/workflows/flake-update.yml @@ -2,7 +2,7 @@ name: flake-update on: workflow_dispatch: schedule: - - cron: '0 5 * * 0' + - cron: '0 5 * * *' jobs: lockfile: diff --git a/flake.lock b/flake.lock index 1545d92..9846ac6 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ ] }, "locked": { - "lastModified": 1737589030, - "narHash": "sha256-vEomFIFl2nXUJQC0fuSKexUYqufhebbkyx+hF2l1bX8=", + "lastModified": 1737334938, + "narHash": "sha256-oqUk3TpNovAFjS386PGNeSq5A6tU4jhE/MoZYxIbTqI=", "owner": "Gerg-L", "repo": "fetch-rs", - "rev": "b9b2e406412a6f416d6ac2c6fab24ac79cb78d15", + "rev": "6fa8c9649a37954c0e9dbe23058d1f275935affa", "type": "github" }, "original": { @@ -248,11 +248,11 @@ ] }, "locked": { - "lastModified": 1737465171, - "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", + "lastModified": 1737301351, + "narHash": "sha256-2UNmLCKORvdBRhPGI8Vx0b6l7M8/QBey/nHLIxOl4jE=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", + "rev": "15a87cedeb67e3dbc8d2f7b9831990dffcf4e69f", "type": "github" }, "original": { @@ -372,11 +372,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1737639419, - "narHash": "sha256-AEEDktApTEZ5PZXNDkry2YV2k6t0dTgLPEmAZbnigXU=", + "lastModified": 1737299073, + "narHash": "sha256-hOydnO9trHDo3qURqLSDdmE/pHNWDzlhkmyZ/gcBX2s=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "a65905a09e2c43ff63be8c0e86a93712361f871e", + "rev": "64d20cb2afaad8b73f4e38de41d27fb30a782bb5", "type": "github" }, "original": { @@ -387,11 +387,11 @@ }, "master": { "locked": { - "lastModified": 1738062650, - "narHash": "sha256-7zzGA17LnRQltAf1lNqqmpxhgmgTaVgDLgn1lygfy3o=", + "lastModified": 1737520781, + "narHash": "sha256-oqUsEe0gOaUPye4GVHSTFzXFJ9nJKXAukGJPZX9Sulk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8fe793656cf86f14e1549568eae010761660459f", + "rev": "a993849e624d6fb2126b242765a9f87c8b164bb1", "type": "github" }, "original": { @@ -403,11 +403,11 @@ }, "mnw": { "locked": { - "lastModified": 1737682369, - "narHash": "sha256-g9s/XvCLViSaaekyCgQrRAbsltkksrrdMH/jDrgc+5E=", + "lastModified": 1735150973, + "narHash": "sha256-OJhcCAoaMMXeD6o4qI/hxBCNELJp4dN8D5LJZc8w8XA=", "owner": "gerg-l", "repo": "mnw", - "rev": "23e63d54cec2a42552512c3205e4617f25205cb8", + "rev": "40cd0b006cc48dffd0f8698ad7f54cf1d56779a6", "type": "github" }, "original": { @@ -427,11 +427,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1737961008, - "narHash": "sha256-GYzjvr6qsy1KQY0jdtkTloeKAAsF1Ls5jpPved3l1PY=", + "lastModified": 1737444129, + "narHash": "sha256-RDwsCYHgjFf6iTi5JSfpOAnuQenDh8VFKU01XluVWM8=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "af9d81d77c8b81856a2d56048c8cb48e98bb929e", + "rev": "ac8238031094d5242da26947bfc7174369c12e33", "type": "github" }, "original": { @@ -443,11 +443,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1737934383, - "narHash": "sha256-aMMwHoHpaKbCaPoDd18N9gCCzA/IRPTrrRQmAWFQO54=", + "lastModified": 1737414984, + "narHash": "sha256-A1ITJgtOOwhSC5wB/jfBV9ZuAftroeYRYFqA+aFKgac=", "owner": "neovim", "repo": "neovim", - "rev": "1759b7844a2d468310b6d0ceca899fec6f2d4b84", + "rev": "855a2a75e6f7d08376c221a46e0179e5c76176ec", "type": "github" }, "original": { @@ -489,11 +489,11 @@ ] }, "locked": { - "lastModified": 1737861961, - "narHash": "sha256-LIRtMvAwLGb8pBoamzgEF67oKlNPz4LuXiRPVZf+TpE=", + "lastModified": 1737257306, + "narHash": "sha256-lEGgpA4kGafc76+Amnz+gh1L/cwUS2pePFlf22WEyh8=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "79b7b8eae3243fc5aa9aad34ba6b9bbb2266f523", + "rev": "744d330659e207a1883d2da0141d35e520eb87bd", "type": "github" }, "original": { @@ -638,11 +638,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1737879851, - "narHash": "sha256-H+FXIKj//kmFHTTW4DFeOjR7F1z2/3eb2iwN6Me4YZk=", + "lastModified": 1737370608, + "narHash": "sha256-hFA6SmioeqvGW/XvZa9bxniAeulksCOcj3kokdNT/YE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5d3221fd57cc442a1a522a15eb5f58230f45a304", + "rev": "300081d0cc72df578b02d914df941b8ec62240e6", "type": "github" }, "original": { @@ -663,11 +663,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1738027094, - "narHash": "sha256-nNqG9PeLwpJYNJh+OBYTp5FeLX9gDtvhLHyKt5+e0to=", + "lastModified": 1737519635, + "narHash": "sha256-rsgBbVZnumOBospz7Ha3XtegrBXjmJhxzL3LltGGhVU=", "owner": "Gerg-L", "repo": "nvim-flake", - "rev": "800a954d141922a08dcaaeef28de48c4f57bcf85", + "rev": "266ccb5c86a32d7b399823f16ed45c9b3b808135", "type": "github" }, "original": { @@ -757,7 +757,7 @@ "spicetify-nix": "spicetify-nix", "stable": "stable", "suckless": "suckless", - "systems": "systems_3", + "systems": "systems_2", "unstable": "unstable" } }, @@ -825,15 +825,14 @@ "flake-compat": "flake-compat_6", "nixpkgs": [ "unstable" - ], - "systems": "systems_2" + ] }, "locked": { - "lastModified": 1738062977, - "narHash": "sha256-zW1zK0jl5mU27WawATAeFOiALa/NjBnN2KRa+3TU01k=", + "lastModified": 1737519350, + "narHash": "sha256-OW4xWGC+gWwAYoZtmXhuoX6WV+RFpadoev/uOPzYEpU=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "b81153eab0ef97b43a9bd25707a2ebdf8572ee62", + "rev": "7212e19f7866c4f494b8cb45c1b20564b7e16c05", "type": "github" }, "original": { @@ -844,11 +843,11 @@ }, "stable": { "locked": { - "lastModified": 1737885640, - "narHash": "sha256-GFzPxJzTd1rPIVD4IW+GwJlyGwBDV1Tj5FLYwDQQ9sM=", + "lastModified": 1737299813, + "narHash": "sha256-Qw2PwmkXDK8sPQ5YQ/y/icbQ+TYgbxfjhgnkNJyT1X8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4e96537f163fad24ed9eb317798a79afc85b51b7", + "rev": "107d5ef05c0b1119749e381451389eded30fb0d5", "type": "github" }, "original": { @@ -908,21 +907,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" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -932,11 +916,11 @@ ] }, "locked": { - "lastModified": 1737483750, - "narHash": "sha256-5An1wq5U8sNycOBBg3nsDDgpwBmR9liOpDGlhliA6Xo=", + "lastModified": 1737103437, + "narHash": "sha256-uPNWcYbhY2fjY3HOfRCR5jsfzdzemhfxLSxwjXYXqNc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "f2cc121df15418d028a59c9737d38e3a90fbaf8f", + "rev": "d1ed3b385f8130e392870cfb1dbfaff8a63a1899", "type": "github" }, "original": { @@ -947,11 +931,11 @@ }, "unstable": { "locked": { - "lastModified": 1737885589, - "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", + "lastModified": 1737469691, + "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", + "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 707c73a..bcf8fe4 100644 --- a/flake.nix +++ b/flake.nix @@ -27,7 +27,6 @@ ref = "2cb0ddfe4eb216fab6d826c1056743c152722720"; inputs.nixpkgs.follows = "stable"; }; - #other nixos-generators = { type = "github"; owner = "nix-community"; @@ -64,11 +63,6 @@ repo = "nix-janitor"; inputs.nixpkgs.follows = "unstable"; }; - systems = { - type = "github"; - owner = "nix-systems"; - repo = "default"; - }; #my own packages spicetify-nix = { type = "github"; @@ -100,6 +94,12 @@ repo = "reboot-bot"; inputs.nixpkgs.follows = "unstable"; }; + systems = { + type = "github"; + owner = "nix-systems"; + repo = "default"; + }; + }; outputs = inputs: diff --git a/nixosConfigurations/gerg-desktop/boot.nix b/nixosConfigurations/gerg-desktop/boot.nix index 40f592f..4a7153b 100644 --- a/nixosConfigurations/gerg-desktop/boot.nix +++ b/nixosConfigurations/gerg-desktop/boot.nix @@ -40,8 +40,6 @@ in }; }; systemd = { - # For linuxManualConfig to work: - strip = lib.mkForce false; network = { enable = true; networks.enp11s0 = { @@ -97,12 +95,13 @@ in timeout = lib.mkForce 5; efi.efiSysMountPoint = "/efi22"; }; + kernelPackages = pkgs.linuxPackagesFor ( let - version = "6.12.11"; + version = "6.10.11"; src = pkgs.fetchurl { url = "mirror://kernel/linux/kernel/v${builtins.head (lib.splitVersion version)}.x/linux-${version}.tar.xz"; - hash = "sha256-R1Fy/b2HoVPxI6V5Umcudzvbba9bWKQX0aXkGfz+7Ek="; + hash = "sha256-+02gRvjBhRWfRTfe2IejCsxp2RxVWg/3+rxFIPWaMJY="; }; in (pkgs.linuxManualConfig { diff --git a/nixosConfigurations/gerg-desktop/main.nix b/nixosConfigurations/gerg-desktop/main.nix index 6946a54..4dbae45 100644 --- a/nixosConfigurations/gerg-desktop/main.nix +++ b/nixosConfigurations/gerg-desktop/main.nix @@ -24,7 +24,6 @@ "steam" "steam-unwrapped" "steam-run" - "hplip" ]; packages = { inherit (pkgs) @@ -179,17 +178,6 @@ }; }; - # printing - services.avahi = { - enable = true; - nssmdns4 = true; - openFirewall = true; - }; - services.printing = { - enable = true; - drivers = [ pkgs.hplipWithPlugin ]; - }; - #user managment sops.secrets.gerg.neededForUsers = true; diff --git a/nixosConfigurations/gerg-desktop/services/nginx.nix b/nixosConfigurations/gerg-desktop/services/nginx.nix index 7df0f54..1a00aee 100644 --- a/nixosConfigurations/gerg-desktop/services/nginx.nix +++ b/nixosConfigurations/gerg-desktop/services/nginx.nix @@ -28,15 +28,7 @@ }; }; - fileSystems."/var/lib/acme" = { - device = "/persist/services/acme"; - fsType = "none"; - options = [ "bind" ]; - depends = [ - "/persist" - "/var" - ]; - }; + systemd.tmpfiles.rules = [ "L+ /var/lib/acme - - - - /persist/services/acme" ]; users.users.${config.services.nginx.user}.extraGroups = [ "acme" ]; diff --git a/nixosConfigurations/gerg-desktop/zfs.nix b/nixosConfigurations/gerg-desktop/zfs.nix index e379cd4..47fbcc5 100644 --- a/nixosConfigurations/gerg-desktop/zfs.nix +++ b/nixosConfigurations/gerg-desktop/zfs.nix @@ -1,6 +1,7 @@ { config, lib, + pkgs, }: { #link some stuff @@ -22,6 +23,7 @@ supportedFilesystems.ntfs = true; zfs = { + package = pkgs.zfs_unstable; devNodes = "/dev/disk/by-id/"; forceImportAll = true; }; diff --git a/nixosModules/misc.nix b/nixosModules/misc.nix index f114143..d0188cb 100644 --- a/nixosModules/misc.nix +++ b/nixosModules/misc.nix @@ -24,6 +24,7 @@ nix-output-monitor # nom nom nom nom; nix-tree # view packages pciutils # lspci + nixos-rebuild-ng ; nix-janitor = pkgs.symlinkJoin { name = "nix-janitor"; @@ -81,6 +82,6 @@ # Useless with flakes (without configuring) programs.command-not-found.enable = false; - system.rebuild.enableNg = true; + system.switch.enableNg = true; }; } diff --git a/packages/lint/package.nix b/packages/lint/package.nix index 1b96569..0fde6dc 100644 --- a/packages/lint/package.nix +++ b/packages/lint/package.nix @@ -14,7 +14,13 @@ writeShellApplication { fd ]; text = '' - fd "$@" -t f -e nix -x statix fix -- '{}' - fd "$@" -t f -e nix -X deadnix -e -- '{}' \; -X nixfmt '{}' + if [ -z "''${1:-""}" ] || [ "$1" == "." ]; then + fd '.*\.nix' . -x statix fix -- {} \; + fd '.*\.nix' . -X deadnix -e -- {} \; -X nixfmt {} \; + else + statix fix -- "$1" + deadnix -e "$1" + nixfmt "$1" + fi ''; }