Compare commits

..

No commits in common. "14ca7a1848b6b4eb2f2e49eb83665bfefc38d76d" and "a5b47bc75bc1f3fff4a69bdd35d04560cc989ab2" have entirely different histories.

8 changed files with 116 additions and 87 deletions

116
flake.lock generated
View file

@ -35,11 +35,11 @@
}, },
"crane": { "crane": {
"locked": { "locked": {
"lastModified": 1746291859, "lastModified": 1741481578,
"narHash": "sha256-DdWJLA+D5tcmrRSg5Y7tp/qWaD05ATI4Z7h22gd1h7Q=", "narHash": "sha256-JBTSyJFQdO3V8cgcL08VaBUByEU6P5kXbTJN6R0PFQo=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "dfd9a8dfd09db9aad544c4d3b6c47b12562544a5", "rev": "bb1c9567c43e4434f54e9481eb4b8e8e0d50f0b5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -119,11 +119,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743550720, "lastModified": 1741352980,
"narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "c621e8422220273271f52058f618c94e405bb0f5", "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -189,6 +189,24 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_2": {
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flakey-profile": { "flakey-profile": {
"locked": { "locked": {
"lastModified": 1712898590, "lastModified": 1712898590,
@ -250,15 +268,16 @@
}, },
"helix": { "helix": {
"inputs": { "inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1746902926, "lastModified": 1746366748,
"narHash": "sha256-PNZeR2LT4NuP+5IMQUGvXvzKvqs35JuFMZLQgnyOLYA=", "narHash": "sha256-B5ZgBuSwKJjCAzjQdyf5ZlKgS/BCEAsDwM4hOpkCTOs=",
"owner": "helix-editor", "owner": "helix-editor",
"repo": "helix", "repo": "helix",
"rev": "63a1a94d924edc3fadb9ca632a37d71abe6a202c", "rev": "72932a391b342d101951cf3f3280498413221c80",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -393,11 +412,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1746981380, "lastModified": 1746411742,
"narHash": "sha256-DtbrvHzKF4diOJWx1FB5wIh8SCSk1Iq5pkA7mh3JAJc=", "narHash": "sha256-5KdfDwcwjzQJC9ZeiIu6UMfaWG5cJqfhjg2mE0+nzgA=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland", "repo": "hyprland",
"rev": "04124988e8b4a9cdfc5995388ebfaad0005b4b31", "rev": "1c530cbc66dbff585d55e435efd5e6a6e5614f88",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -515,11 +534,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1746655412, "lastModified": 1745357019,
"narHash": "sha256-kVQ0bHVtX6baYxRWWIh4u3LNJZb9Zcm2xBeDPOGz5BY=", "narHash": "sha256-q/C3qj9FWHQenObXuw/nGIT8iIsWFjgmcQYcA+ZfpPs=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlang", "repo": "hyprlang",
"rev": "557241780c179cf7ef224df392f8e67dab6cef83", "rev": "397600c42b8d7a443a5b4e92aa15f46650a90f18",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -540,11 +559,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1746635225, "lastModified": 1745975815,
"narHash": "sha256-W9G9bb0zRYDBRseHbVez0J8qVpD5QbizX67H/vsudhM=", "narHash": "sha256-s3GzsRxBL/N/xYgUXZhQh4t62uR1BN4zxXgWBtJ3lWM=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "674ea57373f08b7609ce93baff131117a0dfe70d", "rev": "05878d9470c9e5cbc8807813f9ec2006627a0ca0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -605,11 +624,11 @@
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1746809399, "lastModified": 1745271491,
"narHash": "sha256-rMYfYaUpKuyMpDnodIfgFOnj6Wn0duItZvG4kQODcZo=", "narHash": "sha256-4GAHjus6JRpYHVROMIhFIz/sgLDF/klBM3UHulbSK9s=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lanzaboote", "repo": "lanzaboote",
"rev": "8f27abb5e623d83db4988ee3e864df48181e7c30", "rev": "995637eb3ab78eac33f8ee6b45cc2ecd5ede12ba",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -634,7 +653,7 @@
}, },
"lix-module": { "lix-module": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils_2",
"flakey-profile": "flakey-profile", "flakey-profile": "flakey-profile",
"lix": "lix", "lix": "lix",
"nixpkgs": [ "nixpkgs": [
@ -709,11 +728,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1746904237, "lastModified": 1746328495,
"narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -749,11 +768,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1746537231, "lastModified": 1742649964,
"narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=", "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "fa466640195d38ec97cf0493d6d6882bc4d14969", "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -775,11 +794,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1746537231, "lastModified": 1741379162,
"narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=", "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "fa466640195d38ec97cf0493d6d6882bc4d14969", "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -795,11 +814,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1747013431, "lastModified": 1745709547,
"narHash": "sha256-gCQprMblYaezaC/vkqeIXeayJvzgg5UMEY/kb/Ivp/k=", "narHash": "sha256-xfP/NVZomh+L2ka0omPkhA9mB+4PJXGPMCv/bh+G4YA=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "ca26210cc48bf48a42ad820e25fa884cc122b7b4", "rev": "67524f9d8e4ac5e09ea4427e11f2284e6a6f93fe",
"revCount": 508, "revCount": 506,
"type": "git", "type": "git",
"url": "https://git.outfoxxed.me/outfoxxed/quickshell" "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
}, },
@ -818,7 +837,7 @@
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"quickshell": "quickshell", "quickshell": "quickshell",
"schizofox": "schizofox", "schizofox": "schizofox",
"systems": "systems_3" "systems": "systems_4"
} }
}, },
"rust-overlay": { "rust-overlay": {
@ -850,11 +869,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1746671794, "lastModified": 1741573199,
"narHash": "sha256-V+mpk2frYIEm85iYf+KPDmCGG3zBRAEhbv0E3lHdG2U=", "narHash": "sha256-A2sln1GdCf+uZ8yrERSCZUCqZ3JUlOv1WE2VFqqfaLQ=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "ceec434b8741c66bb8df5db70d7e629a9d9c598f", "rev": "c777dc8a1e35407b0e80ec89817fe69970f4e81a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -871,7 +890,7 @@
"nixpak": "nixpak", "nixpak": "nixpak",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",
"searx-randomizer": "searx-randomizer", "searx-randomizer": "searx-randomizer",
"systems": "systems_2" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1744892989, "lastModified": 1744892989,
@ -926,6 +945,21 @@
} }
}, },
"systems_2": { "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": { "locked": {
"lastModified": 1689347949, "lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
@ -940,7 +974,7 @@
"type": "github" "type": "github"
} }
}, },
"systems_3": { "systems_4": {
"locked": { "locked": {
"lastModified": 1689347949, "lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",

View file

@ -3,21 +3,17 @@
# since these also get installed to server, # since these also get installed to server,
# which should have a small attack surface. # which should have a small attack surface.
{ {
lib,
self, self,
pkgs, pkgs,
... ...
}: let }: let
inherit (lib.meta) hiPrioSet;
inherit (self.packages.${pkgs.stdenv.system}) wrapped-helix fish; inherit (self.packages.${pkgs.stdenv.system}) wrapped-helix fish;
in { in {
environment.systemPackages = environment.systemPackages = builtins.attrValues {
builtins.attrValues {
inherit inherit
(pkgs) (pkgs)
cachix cachix
calc calc
delta
difftastic difftastic
eza eza
gcc gcc
@ -38,16 +34,13 @@ in {
television television
trash-cli trash-cli
util-linux util-linux
uutils-coreutils-noprefix
w3m w3m
wireguard-tools wireguard-tools
zip zip
zoxide zoxide
; ;
}
++ builtins.attrValues (hiPrioSet {
inherit wrapped-helix fish; inherit wrapped-helix fish;
}); };
# helix as the only editor, a reasonable choice. # helix as the only editor, a reasonable choice.
environment.sessionVariables.EDITOR = "hx"; environment.sessionVariables.EDITOR = "hx";
} }

View file

@ -21,7 +21,6 @@ in {
evince evince
gcc gcc
gh gh
ghostty
gnumake gnumake
gparted gparted
halloy halloy

View file

@ -9,7 +9,7 @@
inherit inherit
(pkgs) (pkgs)
calc # Calculator device calc # Calculator device
# coreutils-full # All of the GNU coreutils coreutils-full # All of the GNU coreutils
curl # I sometimes need to curl stuff curl # I sometimes need to curl stuff
git # take a guess git # take a guess
inetutils # internet stuff I need/want on every system. inetutils # internet stuff I need/want on every system.

View file

@ -3,7 +3,7 @@
documentation = { documentation = {
# whether to enable the `doc` output of packages # whether to enable the `doc` output of packages
# generally in ${pkg}/share/ as plaintext or html # generally in ${pkg}/share/ as plaintext or html
# can shave off a few megabytes # # can shave off a few megabytes
doc.enable = false; doc.enable = false;
# whether to install the `info` command and the `info` # whether to install the `info` command and the `info`
@ -22,7 +22,7 @@
generateCaches = false; generateCaches = false;
# Whether to enable mandoc as the default man page viewer. # Whether to enable mandoc as the default man page viewer.
mandoc.enable = false; # my default manpage viewer is helix, so this isn't necessary mandoc.enable = false; # my default manpage viewer is Neovim, so this isn't necessary
}; };
}; };
} }

View file

@ -18,6 +18,7 @@
lazygit, lazygit,
lib, lib,
lldb_19, lldb_19,
marksman,
nil, nil,
nixd, nixd,
ruff, ruff,
@ -124,7 +125,7 @@
gopls gopls
lldb_19 lldb_19
# Markdown # Markdown
taplo marksman
# Nix # Nix
nil nil
nixd nixd

View file

@ -71,7 +71,7 @@
name = "markdown"; name = "markdown";
auto-format = true; auto-format = true;
formatter = mark "md"; formatter = mark "md";
language-servers = ["scls" "taplo"]; language-servers = ["scls" "marksman"];
} }
{ {
name = "nix"; name = "nix";

View file

@ -40,7 +40,9 @@ builtins.attrValues {
element element
difftastic difftastic
hexyl hexyl
iputils
gnumake gnumake
gping
asciinema asciinema
inetutils inetutils
scc scc