diff --git a/flake.lock b/flake.lock index 095377e..4d0afb1 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,33 @@ { "nodes": { + "cargo2nix": { + "inputs": { + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils", + "nixpkgs": [ + "nix-janitor", + "nixpkgs" + ], + "rust-overlay": [ + "nix-janitor", + "rust-overlay" + ] + }, + "locked": { + "lastModified": 1712112199, + "narHash": "sha256-5ur7bE90d+6Ny6PzC/6R0bDAa6B1+gDAk2XIFSDfAjY=", + "owner": "cargo2nix", + "repo": "cargo2nix", + "rev": "da5f5d796af00fe818aa12f3b2d46a4800e6fec8", + "type": "github" + }, + "original": { + "owner": "cargo2nix", + "ref": "release-0.12", + "repo": "cargo2nix", + "type": "github" + } + }, "crane": { "locked": { "lastModified": 1730652660, @@ -22,11 +50,11 @@ ] }, "locked": { - "lastModified": 1732988076, - "narHash": "sha256-2uMaVAZn7fiyTUGhKgleuLYe5+EAAYB/diKxrM7g3as=", + "lastModified": 1732919362, + "narHash": "sha256-3SxlMD3nSI90+pHOF27SuLEt3+wew8xl+sUJaJMeHOI=", "owner": "nix-community", "repo": "disko", - "rev": "2814a5224a47ca19e858e027f7e8bff74a8ea9f1", + "rev": "b71e3faca99b40fb801f03fd950fbefbbba691a4", "type": "github" }, "original": { @@ -42,11 +70,11 @@ ] }, "locked": { - "lastModified": 1732994874, - "narHash": "sha256-bpK503lmU1RPtqNhRENjafAdQeGYWUvUaAl7womFuOQ=", + "lastModified": 1722794965, + "narHash": "sha256-4fITQAIxcHeHKjA+/xb5mz2EXAic9jBg0qNS9Xd12Uo=", "owner": "Gerg-L", "repo": "fetch-rs", - "rev": "02da86995b637f55faec4df702111acd8b29e700", + "rev": "b58b827999c2baab8b718a203b5b0569735be9fe", "type": "github" }, "original": { @@ -90,11 +118,11 @@ "flake-compat_3": { "flake": false, "locked": { - "lastModified": 1732722421, - "narHash": "sha256-HRJ/18p+WoXpWJkcdsk9St5ZiukCqSDgbOGFa8Okehg=", + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9ed2ac151eada2306ca8c418ebd97807bb08f6ac", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", "type": "github" }, "original": { @@ -120,6 +148,22 @@ } }, "flake-compat_5": { + "flake": false, + "locked": { + "lastModified": 1732722421, + "narHash": "sha256-HRJ/18p+WoXpWJkcdsk9St5ZiukCqSDgbOGFa8Okehg=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "9ed2ac151eada2306ca8c418ebd97807bb08f6ac", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_6": { "flake": false, "locked": { "lastModified": 1696426674, @@ -135,7 +179,7 @@ "type": "github" } }, - "flake-compat_6": { + "flake-compat_7": { "flake": false, "locked": { "lastModified": 1732722421, @@ -237,9 +281,42 @@ "type": "indirect" } }, + "flake-utils": { + "locked": { + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "git-hooks": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_6", "gitignore": "gitignore_2", "nixpkgs": [ "nvim-flake", @@ -409,11 +486,11 @@ }, "master": { "locked": { - "lastModified": 1733024928, - "narHash": "sha256-n/DOfpKH1vkukuBnach91QBQId2dr5tkE7/7UrkV2zw=", + "lastModified": 1732942656, + "narHash": "sha256-64wbhC0jrYUH7dNmpXw1xYVMI9AX6xxBES91M7crX3A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2c27ab2e60502d1ebb7cf38909de38663f762a79", + "rev": "8ad72fe6962ef77520833dc2a03eb2580cf7fc77", "type": "github" }, "original": { @@ -425,11 +502,11 @@ }, "mnw": { "locked": { - "lastModified": 1733021555, - "narHash": "sha256-bc+reHXXfdn94MnDsqBrNm2ojOnJfbd64e00nzsP0EI=", + "lastModified": 1732376520, + "narHash": "sha256-fG8ozQpH48S8WBYilbq4iIZRuVUy2kxQVJs4y4e+e/o=", "owner": "gerg-l", "repo": "mnw", - "rev": "6841d93fe50eb335da45e11d4dabaa1844f3f79a", + "rev": "5d4d187cf739a7d80b3b38646d8dd4ae98f857a8", "type": "github" }, "original": { @@ -440,19 +517,19 @@ }, "neovim-nightly": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_5", "flake-parts": "flake-parts_3", "git-hooks": "git-hooks", "hercules-ci-effects": "hercules-ci-effects", "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1733012044, - "narHash": "sha256-uA/KX/TVlreFS/xZjjAPBoRzybQQWUX+Ur5mOzsF7FE=", + "lastModified": 1732925246, + "narHash": "sha256-MjqyzOEa6s9OGO8SMh5C2kqo57+iSNsgDbzPBbpi4QU=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "0d545972c93c044bed52c27cc4035054793d913a", + "rev": "7461a0b228bb48bb02af086f8b9ee9a83583120b", "type": "github" }, "original": { @@ -464,11 +541,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1732970806, - "narHash": "sha256-VKk53/3aTk91s1OmSfUt6RqFpxBjUy8ZYoYrechTUns=", + "lastModified": 1732903628, + "narHash": "sha256-JF8zmoLdqmbKCSS5Smf/Yj0jEl5f+qKhSubhPo/BvUM=", "owner": "neovim", "repo": "neovim", - "rev": "ab9cfc4dc3422af5235759efef456d3e02745217", + "rev": "2833925cfc688786759d6a980a1ad62b62d20570", "type": "github" }, "original": { @@ -490,16 +567,16 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1732892090, - "narHash": "sha256-Ka/uNdaqpTAiVL++4MPHg8fG5o1tiJeY6G2t5UiKhd8=", + "lastModified": 1728310575, + "narHash": "sha256-R13o8hNhzuTuEwUBViVOmT4OM0/I2d9DxnkxQOip1yg=", "owner": "NixOS", "repo": "nix", - "rev": "64000481168d1da9d2519f055dd1fdee22275c21", + "rev": "26c3fc11eada3fa7df0284190095868a947fefe2", "type": "github" }, "original": { "owner": "NixOS", - "ref": "64000481168d1da9d2519f055dd1fdee22275c21", + "ref": "26c3fc11eada3fa7df0284190095868a947fefe2", "repo": "nix", "type": "github" } @@ -511,11 +588,11 @@ ] }, "locked": { - "lastModified": 1733024876, - "narHash": "sha256-vy9Q41hBE7Zg0yakF79neVgb3i3PQMSMR7uHPpPywFE=", + "lastModified": 1732519917, + "narHash": "sha256-AGXhwHdJV0q/WNgqwrR2zriubLr785b02FphaBtyt1Q=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "6e0b7f81367069589a480b91603a10bcf71f3103", + "rev": "f4a5ca5771ba9ca31ad24a62c8d511a405303436", "type": "github" }, "original": { @@ -526,20 +603,24 @@ }, "nix-janitor": { "inputs": { - "nixpkgs": "nixpkgs", + "cargo2nix": "cargo2nix", + "nixpkgs": [ + "unstable" + ], "parts": "parts", "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1732999881, - "narHash": "sha256-zN7FRz6wpS/5C3RE0wQN0bBtFdgrZv9GUK87cjZ9mDQ=", + "lastModified": 1716802118, + "narHash": "sha256-KRXz2qUDWmyglXk56jL0twOQ3pWdpacddyVn95W7wl0=", "owner": "Nobbz", "repo": "nix-janitor", - "rev": "8898c37337465e8a0cc063d8dcfe1079f534c53f", + "rev": "d49fd7486d5597d2e854154bf643e7f86c5f1f6c", "type": "github" }, "original": { "owner": "Nobbz", + "ref": "d49fd7486d5597d2e854154bf643e7f86c5f1f6c", "repo": "nix-janitor", "type": "github" } @@ -582,15 +663,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1732937961, - "narHash": "sha256-B5pYT+IVaqcrfOekkwKvx/iToDnuQWzc2oyDxzzBDc4=", - "owner": "nixos", + "lastModified": 1706487304, + "narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "4703b8d2c708e13a8cab03d865f90973536dcdf5", + "rev": "90f456026d284c22b3e3497be980b2e47d0b28ac", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" @@ -614,14 +695,20 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1730504152, - "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" + "dir": "lib", + "lastModified": 1688049487, + "narHash": "sha256-100g4iaKC9MalDjUW9iN6Jl/OocTDtXdeAj7pEGIRh4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4bc72cae107788bf3f24f30db2e2f685c9298dc9", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-regression": { @@ -658,27 +745,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1728538411, - "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=", + "lastModified": 1732617236, + "narHash": "sha256-PYkz6U0bSEaEB1al7O1XsqVNeSNS+s3NVclJw7YC43w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1732937961, - "narHash": "sha256-B5pYT+IVaqcrfOekkwKvx/iToDnuQWzc2oyDxzzBDc4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4703b8d2c708e13a8cab03d865f90973536dcdf5", + "rev": "af51545ec9a44eadf3fe3547610a5cdd882bc34e", "type": "github" }, "original": { @@ -690,7 +761,7 @@ }, "nvim-flake": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "mnw": "mnw", "neovim-nightly": "neovim-nightly", "nixpkgs": [ @@ -698,11 +769,11 @@ ] }, "locked": { - "lastModified": 1733026985, - "narHash": "sha256-DtdrZiRh5rapnBHl5r/uG0GFNuZi5yzSeSJ52jBRVhA=", + "lastModified": 1732940475, + "narHash": "sha256-Hobt5yUAGoEWvgCVBJ5y0+morq6TMUZB9lKKe3zQq58=", "owner": "Gerg-L", "repo": "nvim-flake", - "rev": "dd1ef9594c5ebaf6a3856f99f1f3b85b09b47eba", + "rev": "628b7dc449230380060c53c9761bb081915b428d", "type": "github" }, "original": { @@ -716,11 +787,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1688466019, + "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec", "type": "github" }, "original": { @@ -818,14 +889,15 @@ }, "rust-overlay_2": { "inputs": { - "nixpkgs": "nixpkgs_2" + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1732933841, - "narHash": "sha256-dge02pUSe2QeC/B3PriA0R8eAX+EU3aDoXj9FcS3XDw=", + "lastModified": 1715998563, + "narHash": "sha256-krjs9VkDoRrYNQVyCTXUGUfAJziCk0Fkki1ZnnmNgjk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c65e91d4a33abc3bc4a892d3c5b5b378bad64ea1", + "rev": "4731829dec4859921bfc0e1548478207d6c9c8fa", "type": "github" }, "original": { @@ -856,17 +928,17 @@ }, "spicetify-nix": { "inputs": { - "flake-compat": "flake-compat_6", + "flake-compat": "flake-compat_7", "nixpkgs": [ "unstable" ] }, "locked": { - "lastModified": 1733026768, - "narHash": "sha256-hxjD+dVnL2W9n1kZlmYAx2ou4ttLgzfPuEdoCsiy7cE=", + "lastModified": 1732940172, + "narHash": "sha256-0at0wkwsaJfJBCGlwtXfg2JdeY30mZXhrWeoNqhLEYc=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "c7a940a0152bdd9914c02f8f1eea2697d548cc16", + "rev": "0b712938230ab50d2e0cf961cc0f3660f7b18041", "type": "github" }, "original": { @@ -877,16 +949,16 @@ }, "stable": { "locked": { - "lastModified": 1732824227, - "narHash": "sha256-fYNXgpu1AEeLyd3fQt4Ym0tcVP7cdJ8wRoqJ+CtTRyY=", + "lastModified": 1732749044, + "narHash": "sha256-T38FQOg0BV5M8FN1712fovzNakSOENEYs+CSkg31C9Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c71ad5c34d51dcbda4c15f44ea4e4aa6bb6ac1e9", + "rev": "0c5b4ecbed5b155b705336aa96d878e55acd8685", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } @@ -911,13 +983,28 @@ "type": "github" } }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "unstable": { "locked": { - "lastModified": 1732837521, - "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=", + "lastModified": 1732521221, + "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370", + "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 488d2bc..d63a92a 100644 --- a/flake.nix +++ b/flake.nix @@ -17,14 +17,14 @@ type = "github"; owner = "NixOS"; repo = "nixpkgs"; - ref = "nixos-24.11"; + ref = "nixos-24.05"; }; #nix itself nix = { type = "github"; owner = "NixOS"; repo = "nix"; - ref = "64000481168d1da9d2519f055dd1fdee22275c21"; + ref = "26c3fc11eada3fa7df0284190095868a947fefe2"; inputs.nixpkgs.follows = "stable"; }; nixos-generators = { @@ -61,7 +61,8 @@ type = "github"; owner = "Nobbz"; repo = "nix-janitor"; - #inputs.nixpkgs.follows = "unstable"; + ref = "d49fd7486d5597d2e854154bf643e7f86c5f1f6c"; + inputs.nixpkgs.follows = "unstable"; }; #my own packages spicetify-nix = { diff --git a/hosts/gerg-desktop/boot.nix b/hosts/gerg-desktop/boot.nix index 51cc1aa..dc2d358 100644 --- a/hosts/gerg-desktop/boot.nix +++ b/hosts/gerg-desktop/boot.nix @@ -112,16 +112,13 @@ in configfile = ./kernelConfig; }).overrideAttrs (old: { - passthru = old.passthru or { } // { - features = lib.foldr (x: y: x.features or { } // y) { + passthru = (old.passthru or { }) // { + features = lib.foldr (x: y: (x.features or { }) // y) { efiBootStub = true; netfilterRPFilter = true; ia32Emulation = true; } config.boot.kernelPatches; }; - meta = old.meta or { } // { - broken = false; - }; }) ); }; diff --git a/hosts/gerg-desktop/services/minecraft.nix b/hosts/gerg-desktop/services/minecraft.nix index 448a439..dcaa444 100644 --- a/hosts/gerg-desktop/services/minecraft.nix +++ b/hosts/gerg-desktop/services/minecraft.nix @@ -1,7 +1,7 @@ { lib, self' }: { # I manually switch this sometimes - config = lib.mkIf false { + config = lib.mkIf true { networking.firewall = { allowedUDPPorts = [ 24454 ]; allowedTCPPorts = [ diff --git a/hosts/gerg-desktop/services/reboot-bot.nix b/hosts/gerg-desktop/services/reboot-bot.nix index 8c5a758..35d9644 100644 --- a/hosts/gerg-desktop/services/reboot-bot.nix +++ b/hosts/gerg-desktop/services/reboot-bot.nix @@ -7,7 +7,6 @@ sops.secrets.reboot_token = { }; systemd.services.reboot_bot = { - enable = false; wantedBy = [ "multi-user.target" ]; wants = [ "network-online.target" ]; after = [ "network-online.target" ]; diff --git a/modules/misc.nix b/modules/misc.nix index 21d37b8..e4f6bec 100644 --- a/modules/misc.nix +++ b/modules/misc.nix @@ -32,15 +32,7 @@ nix-tree # view packages pciutils # lspci ; - 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 ]} - ''; - }; + inherit (nix-janitor.packages) default; } ); diff --git a/modules/theming.nix b/modules/theming.nix index 00ff435..e656b07 100644 --- a/modules/theming.nix +++ b/modules/theming.nix @@ -66,7 +66,7 @@ in fonts = { packages = [ pkgs.overpass - pkgs.nerd-fonts.symbols-only + (pkgs.nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; }) ]; enableDefaultPackages = false; fontDir.enable = true;