Compare commits

...

6 commits

8 changed files with 87 additions and 116 deletions

116
flake.lock generated
View file

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

View file

@ -3,44 +3,51 @@
# 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 = builtins.attrValues { environment.systemPackages =
inherit builtins.attrValues {
(pkgs) inherit
cachix (pkgs)
calc cachix
difftastic calc
eza delta
gcc difftastic
git eza
httpie gcc
inetutils git
jujutsu httpie
just inetutils
lazygit jujutsu
linuxHeaders just
neofetch lazygit
microfetch linuxHeaders
mprocs neofetch
nmap microfetch
polkit mprocs
ripgrep nmap
smartmontools polkit
television ripgrep
trash-cli smartmontools
util-linux television
w3m trash-cli
wireguard-tools util-linux
zip uutils-coreutils-noprefix
zoxide w3m
; wireguard-tools
inherit wrapped-helix fish; zip
}; zoxide
;
}
++ builtins.attrValues (hiPrioSet {
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,6 +21,7 @@ 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 Neovim, so this isn't necessary mandoc.enable = false; # my default manpage viewer is helix, so this isn't necessary
}; };
}; };
} }

View file

@ -18,7 +18,6 @@
lazygit, lazygit,
lib, lib,
lldb_19, lldb_19,
marksman,
nil, nil,
nixd, nixd,
ruff, ruff,
@ -125,7 +124,7 @@
gopls gopls
lldb_19 lldb_19
# Markdown # Markdown
marksman taplo
# 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" "marksman"]; language-servers = ["scls" "taplo"];
} }
{ {
name = "nix"; name = "nix";

View file

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