From 99551246bcdcf0cde5124939c1d9c8da786b09e2 Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Tue, 20 Aug 2024 21:55:45 +0200 Subject: [PATCH] flake.nix: remove inputs --- flake.lock | 303 ++++++++--------------------- flake.nix | 8 +- modules/programs/editors/helix.nix | 3 +- modules/programs/gui/schizofox.nix | 2 +- 4 files changed, 79 insertions(+), 237 deletions(-) diff --git a/flake.lock b/flake.lock index 4b311a4..a571c56 100644 --- a/flake.lock +++ b/flake.lock @@ -34,27 +34,6 @@ } }, "crane": { - "inputs": { - "nixpkgs": [ - "helix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709610799, - "narHash": "sha256-5jfLQx0U9hXbi2skYMGodDJkIgffrjIOgMRjZqms2QE=", - "owner": "ipetkov", - "repo": "crane", - "rev": "81c393c776d5379c030607866afef6406ca1be57", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "crane_2": { "inputs": { "nixpkgs": [ "schizofox", @@ -239,7 +218,8 @@ "flake-parts_4": { "inputs": { "nixpkgs-lib": [ - "nixpak", + "nixpkgs-wayland", + "nix-eval-jobs", "nixpkgs" ] }, @@ -258,28 +238,6 @@ } }, "flake-parts_5": { - "inputs": { - "nixpkgs-lib": [ - "nixpkgs-wayland", - "nix-eval-jobs", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_6": { "inputs": { "nixpkgs-lib": [ "schizofox", @@ -300,7 +258,7 @@ "type": "github" } }, - "flake-parts_7": { + "flake-parts_6": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_4" }, @@ -338,25 +296,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1710146030, @@ -372,7 +312,7 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_3": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -387,7 +327,7 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_4": { "locked": { "lastModified": 1667395993, "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", @@ -402,9 +342,9 @@ "type": "github" } }, - "flake-utils_6": { + "flake-utils_5": { "inputs": { - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1710146030, @@ -420,34 +360,15 @@ "type": "github" } }, - "helix": { - "inputs": { - "crane": "crane", - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_2", - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1723657484, - "narHash": "sha256-oSxczvhDKCc/ilTPiMz46RmTLhyBoVxhGWhp7Ee54eA=", - "owner": "helix-editor", - "repo": "helix", - "rev": "ff33b07756548935577aefc15cf48a1beb27b162", - "type": "github" - }, - "original": { - "owner": "helix-editor", - "repo": "helix", - "type": "github" - } - }, "hercules-ci-effects": { "inputs": { "flake-parts": [ + "schizofox", "nixpak", "flake-parts" ], "nixpkgs": [ + "schizofox", "nixpak", "nixpkgs" ] @@ -543,8 +464,8 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_3", - "systems": "systems_3", + "nixpkgs": "nixpkgs_2", + "systems": "systems_2", "xdph": "xdph" }, "locked": { @@ -699,24 +620,9 @@ "type": "github" } }, - "impurity": { - "locked": { - "lastModified": 1689836741, - "narHash": "sha256-82KeRg2sAqDXCdzVs8P8GoqVaPsZjkWgrfsj6kgOLTY=", - "owner": "outfoxxed", - "repo": "impurity.nix", - "rev": "bbc41b69ab5485cd55aa315d08cff865781d3913", - "type": "github" - }, - "original": { - "owner": "outfoxxed", - "repo": "impurity.nix", - "type": "github" - } - }, "lib-aggregate": { "inputs": { - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_5", "nixpkgs-lib": "nixpkgs-lib_3" }, "locked": { @@ -789,7 +695,7 @@ "neovim-flake": { "inputs": { "flake-parts": "flake-parts_2", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "mnw": "mnw", "nil": "nil", "nixpkgs": [ @@ -897,7 +803,7 @@ "plugin-vim-vsnip": "plugin-vim-vsnip", "plugin-which-key": "plugin-which-key", "rnix-lsp": "rnix-lsp", - "systems": "systems_5", + "systems": "systems_4", "zig": "zig" }, "locked": { @@ -924,7 +830,7 @@ "neovim-flake", "nixpkgs" ], - "rust-overlay": "rust-overlay_2" + "rust-overlay": "rust-overlay" }, "locked": { "lastModified": 1714571717, @@ -942,9 +848,9 @@ }, "nix-eval-jobs": { "inputs": { - "flake-parts": "flake-parts_5", + "flake-parts": "flake-parts_4", "nix-github-actions": "nix-github-actions", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_7", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -1003,7 +909,7 @@ "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_3", "libgit2": "libgit2", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "nixpkgs-23-11": "nixpkgs-23-11", "nixpkgs-regression": "nixpkgs-regression", "pre-commit-hooks": "pre-commit-hooks" @@ -1040,18 +946,22 @@ }, "nixpak": { "inputs": { - "flake-parts": "flake-parts_4", + "flake-parts": [ + "schizofox", + "flake-parts" + ], "hercules-ci-effects": "hercules-ci-effects", "nixpkgs": [ + "schizofox", "nixpkgs" ] }, "locked": { - "lastModified": 1723688652, - "narHash": "sha256-yag+lCB908g2ZPIeRBu6EO2R2Kmx0JfFojoOrtKZa0E=", + "lastModified": 1724161388, + "narHash": "sha256-IQKkLdZdj2sm4GzCXUPtYzsBkzySbai1FAH9e48qtfM=", "owner": "nixpak", "repo": "nixpak", - "rev": "ebffe76fb837b03bc0d54c4eeba9837e7a0541d9", + "rev": "7b924406fead4e9529c0d295f5edfefd2631ccc2", "type": "github" }, "original": { @@ -1186,7 +1096,7 @@ "flake-compat": "flake-compat_3", "lib-aggregate": "lib-aggregate", "nix-eval-jobs": "nix-eval-jobs", - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1723573444, @@ -1202,39 +1112,7 @@ "type": "github" } }, - "nixpkgs_10": { - "locked": { - "lastModified": 1720957393, - "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { - "locked": { - "lastModified": 1709479366, - "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "b8697e57f10292a6165a20f03d2f42920dfaf973", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1723637854, "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", @@ -1250,7 +1128,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1656753965, "narHash": "sha256-BCrB3l0qpJokOnIVc3g2lHiGhnjUi0MoXiw6t1o8H1E=", @@ -1266,7 +1144,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1702350026, "narHash": "sha256-A+GNZFZdfl4JdDphYKBJ5Ef1HOiFsP18vQe9mqjmUis=", @@ -1282,7 +1160,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1721560568, "narHash": "sha256-L61BXz7n/yNzOeZ3FqlnUmxj4145JOVeq9fvQTQzbNM=", @@ -1298,7 +1176,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1723637854, "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", @@ -1314,7 +1192,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1723221148, "narHash": "sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8=", @@ -1330,7 +1208,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1723362943, "narHash": "sha256-dFZRVSgmJkyM0bkPpaYRtG/kRMRTorUIDj8BxoOt1T4=", @@ -1346,6 +1224,22 @@ "type": "github" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1720957393, + "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nmd": { "flake": false, "locked": { @@ -2968,7 +2862,7 @@ "flake-compat": [ "nix-super" ], - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_4", "gitignore": [ "nix-super" ], @@ -2998,7 +2892,7 @@ "rnix-lsp": { "inputs": { "naersk": "naersk", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "utils": "utils" }, "locked": { @@ -3020,16 +2914,13 @@ "devshell": "devshell", "emacs-overlay": "emacs-overlay", "flake-parts": "flake-parts", - "helix": "helix", "home-manager": "home-manager", "hyprland": "hyprland", "hyprland-plugins": "hyprland-plugins", - "impurity": "impurity", "neovim-flake": "neovim-flake", "nix-super": "nix-super", "nixos-hardware": "nixos-hardware", - "nixpak": "nixpak", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_6", "nixpkgs-wayland": "nixpkgs-wayland", "schizofox": "schizofox", "split-monitor-workspaces": "split-monitor-workspaces", @@ -3037,31 +2928,6 @@ } }, "rust-overlay": { - "inputs": { - "flake-utils": [ - "helix", - "flake-utils" - ], - "nixpkgs": [ - "helix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709604635, - "narHash": "sha256-le4fwmWmjGRYWwkho0Gr7mnnZndOOe4XGbLw68OvF40=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "e86c0fb5d3a22a5f30d7f64ecad88643fe26449d", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_2": { "inputs": { "flake-utils": [ "neovim-flake", @@ -3091,16 +2957,14 @@ "schizofox": { "inputs": { "flake-compat": "flake-compat_4", - "flake-parts": "flake-parts_6", + "flake-parts": "flake-parts_5", "home-manager": "home-manager_2", - "nixpak": [ - "nixpak" - ], + "nixpak": "nixpak", "nixpkgs": [ "nixpkgs" ], "searx-randomizer": "searx-randomizer", - "systems": "systems_7" + "systems": "systems_6" }, "locked": { "lastModified": 1723400986, @@ -3118,8 +2982,8 @@ }, "searx-randomizer": { "inputs": { - "crane": "crane_2", - "flake-parts": "flake-parts_7", + "crane": "crane", + "flake-parts": "flake-parts_6", "nixpkgs": [ "schizofox", "nixpkgs" @@ -3176,21 +3040,6 @@ } }, "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_3": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -3205,6 +3054,21 @@ "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" + } + }, "systems_4": { "locked": { "lastModified": 1681028828, @@ -3236,21 +3100,6 @@ } }, "systems_6": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_7": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -3289,7 +3138,7 @@ }, "treefmt-nix_2": { "inputs": { - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1723656612, @@ -3353,8 +3202,8 @@ "zig": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_5" + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1716725305, diff --git a/flake.nix b/flake.nix index 533a032..39b61b5 100644 --- a/flake.nix +++ b/flake.nix @@ -23,7 +23,7 @@ # nixpkgs for wayland nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland"; - # Sandboxing + # # Sandboxing nixpak = { url = "github:nixpak/nixpak"; inputs.nixpkgs.follows = "nixpkgs"; @@ -42,12 +42,6 @@ # Hardware for my laptop nixos-hardware.url = "github:NixOS/nixos-hardware/master"; - # Helix my beloved - helix.url = "github:helix-editor/helix"; - - # Impurity, ruining my nice pure system - impurity.url = "github:outfoxxed/impurity.nix"; - # Hyprland, my main compositor hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; diff --git a/modules/programs/editors/helix.nix b/modules/programs/editors/helix.nix index ad6c09a..6498391 100644 --- a/modules/programs/editors/helix.nix +++ b/modules/programs/editors/helix.nix @@ -2,7 +2,6 @@ config, lib, pkgs, - inputs', ... }: let cfg = config.modules.system.programs.editors.helix; @@ -14,7 +13,7 @@ in { programs.helix = { enable = true; # thanks fuf, this is great! - package = inputs'.helix.packages.default.overrideAttrs (previousAttrs: { + package = pkgs.helix.overrideAttrs (previousAttrs: { makeWrapperArgs = with pkgs; previousAttrs.makeWrapperArgs or [] diff --git a/modules/programs/gui/schizofox.nix b/modules/programs/gui/schizofox.nix index 312cbbd..3365241 100644 --- a/modules/programs/gui/schizofox.nix +++ b/modules/programs/gui/schizofox.nix @@ -161,7 +161,7 @@ in { security = { sanitizeOnShutdown = false; - sandbox = false; + sandbox = true; noSessionRestore = false; userAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:106.0) Gecko/20100101 Firefox/106.0"; };