zoriya/flake
1
0
Fork 0
mirror of https://github.com/zoriya/flake.git synced 2026-06-06 12:02:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update things

Browse Source
This commit is contained in:
Zoe Roux
2025-03-25 09:43:07 +01:00
parent 8d0f43f754
commit 49638985b0
6 changed files with 64 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.lock
Generated
+62 -62
View File
@@ -7,11 +7,11 @@
]
},
"locked": {
"lastModified": 1741863581,
"narHash": "sha256-datQsagelizLX/7Mb7aSOic7X49GZUzZsWzBzDZOY4U=",
"lastModified": 1742571008,
"narHash": "sha256-5WgfJAeBpxiKbTR/gJvxrGYfqQRge5aUDcGKmU1YZ1Q=",
"owner": "aylur",
"repo": "astal",
"rev": "69efb4c91e590adcb5a3d8938454f987982e3891",
"rev": "dc0e5d37abe9424c53dcbd2506a4886ffee6296e",
"type": "github"
},
"original": {
@@ -114,11 +114,11 @@
]
},
"locked": {
"lastModified": 1738453229,
"narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
"lastModified": 1741352980,
"narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
"rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9",
"type": "github"
},
"original": {
@@ -171,14 +171,14 @@
"nixpkgs"
],
"zig": "zig",
"zig2nix": "zig2nix"
"zon2nix": "zon2nix"
},
"locked": {
"lastModified": 1741969750,
"narHash": "sha256-AM5cNVUrbloxsu3rGE+cR3mMapbTAa+PecF9atXPqqA=",
"lastModified": 1742838227,
"narHash": "sha256-LSmn3lGFH4WWeDDMR01c+bgGXwbSN+cl//58PtP6IKg=",
"owner": "mitchellh",
"repo": "ghostty",
"rev": "234b804872af665ca8091892ff3ea35ea278b32c",
"rev": "5d9bee98e8ef8e36f3e8fb18d0fcedc7b9eef17f",
"type": "github"
},
"original": {
@@ -197,11 +197,11 @@
]
},
"locked": {
"lastModified": 1741379162,
"narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=",
"lastModified": 1742649964,
"narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc",
"rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
"type": "github"
},
"original": {
@@ -241,11 +241,11 @@
]
},
"locked": {
"lastModified": 1739595404,
"narHash": "sha256-0CjCfbq0yHWexOrpO06e2WU1r5JAqR6ffy1zgM3NksI=",
"lastModified": 1742014779,
"narHash": "sha256-I6fG1zrfdLFcp/imGZElig0BJO3YU0QEXLgvwWoOpJ8=",
"owner": "hercules-ci",
"repo": "hercules-ci-effects",
"rev": "06519cec8fb32d219006da6eacd255504a9996af",
"rev": "524637ef84c177661690b924bf64a1ce18072a2c",
"type": "github"
},
"original": {
@@ -261,11 +261,11 @@
]
},
"locked": {
"lastModified": 1741955947,
"narHash": "sha256-2lbURKclgKqBNm7hVRtWh0A7NrdsibD0EaWhahUVhhY=",
"lastModified": 1742871411,
"narHash": "sha256-F3xBdOs5m0SE6Gq3jz+JxDOPvsLs22vbGfD05uF6xEc=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "4e12151c9e014e2449e0beca2c0e9534b96a26b4",
"rev": "869f2ec2add75ce2a70a6dbbf585b8399abec625",
"type": "github"
},
"original": {
@@ -319,11 +319,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1741911010,
"narHash": "sha256-CIKnxI//A8J3N0cUXQ8HMqwpo/1igU89H8eIOrlrNts=",
"lastModified": 1742862181,
"narHash": "sha256-IlVr0Ft7OJwDTIIb4FnwwbQxtot1FrOQrs9kCxKjvzU=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
"rev": "6b175fb7c9d12ff039dc3e7f944256522658581d",
"rev": "458f080e8f7005a9c464101100831f066b21a97e",
"type": "github"
},
"original": {
@@ -335,11 +335,11 @@
"neovim-src": {
"flake": false,
"locked": {
"lastModified": 1741907753,
"narHash": "sha256-T8iwRFgFGQyENPRm/RIIpjDxP+GDIwTlYuFcY1LexQ8=",
"lastModified": 1742850922,
"narHash": "sha256-N6S+yUH0wcgGJuXGYWFeWoPSGtvFeWSDIU4pPshu/wg=",
"owner": "neovim",
"repo": "neovim",
"rev": "4f6196e91d23f17e6b25ea7356d5bbc5b87d95b6",
"rev": "5719f2b91a3100785c8b454e28054b5c7848271d",
"type": "github"
},
"original": {
@@ -355,11 +355,11 @@
]
},
"locked": {
"lastModified": 1741906019,
"narHash": "sha256-c9L0yCdpBzPVTcExcqTti6vP6GuPVaCaVCDf0M8eu+I=",
"lastModified": 1742869675,
"narHash": "sha256-rgwUZJZVztaNYPTsf6MIqirPL5r2JTMMyHuzk1ezyYk=",
"owner": "LnL7",
"repo": "nix-darwin",
"rev": "4d8a451649b6de429ea7e169378488305d0d9399",
"rev": "bb81755a3674951724d79b8cba6bbff01409d44d",
"type": "github"
},
"original": {
@@ -375,11 +375,11 @@
]
},
"locked": {
"lastModified": 1741619381,
"narHash": "sha256-koZtlJRqi0/MD/AKd0KrXLA2NuBOVzlIyAJprjzpxZE=",
"lastModified": 1742701275,
"narHash": "sha256-AulwPVrS9859t+eJ61v24wH/nfBEIDSXYxlRo3fL/SA=",
"owner": "nix-community",
"repo": "nix-index-database",
"rev": "66537fb185462ba9b07f4e6f2d54894a1b2d04ab",
"rev": "36dc43cb50d5d20f90a28d53abb33a32b0a2aae6",
"type": "github"
},
"original": {
@@ -390,11 +390,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1741792691,
"narHash": "sha256-f0BVt1/cvA0DQ/q3rB+HY4g4tKksd03ZkzI4xehC2Ew=",
"lastModified": 1742806253,
"narHash": "sha256-zvQ4GsCJT6MTOzPKLmlFyM+lxo0JGQ0cSFaZSACmWfY=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "e1f12151258b12c567f456d8248e4694e9390613",
"rev": "ecaa2d911e77c265c2a5bac8b583c40b0f151726",
"type": "github"
},
"original": {
@@ -412,11 +412,11 @@
]
},
"locked": {
"lastModified": 1741870048,
"narHash": "sha256-odXRdNZGdXg1LmwlAeWL85kgy/FVHsgKlDwrvbR2BsU=",
"lastModified": 1742481215,
"narHash": "sha256-m7I/2UaGEFOI+Cy0RoADBi10NZt1WD5N3q2jUwPprE4=",
"owner": "nix-community",
"repo": "NixOS-WSL",
"rev": "5d76001e33ee19644a598ad80e7318ab0957b122",
"rev": "96d7df91cce0d7cd30d1958fe1aefcb5f9bfced7",
"type": "github"
},
"original": {
@@ -427,11 +427,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1741851582,
"narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=",
"lastModified": 1742669843,
"narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "6607cf789e541e7873d40d3a8f7815ea92204f32",
"rev": "1e5b653dff12029333a6546c11e108ede13052eb",
"type": "github"
},
"original": {
@@ -443,11 +443,11 @@
"river-src": {
"flake": false,
"locked": {
"lastModified": 1734359263,
"narHash": "sha256-wD8GSFBZLeCjAbHAT6WXlgM+X/o39Loxt5xjI4qKGWo=",
"lastModified": 1742891484,
"narHash": "sha256-7ZSKYw0ZbYUWBp2Djw2W2Gg15W2TQzBLYpoarqpJFN8=",
"owner": "zoriya",
"repo": "river",
"rev": "ebdbaaeb6c6006165cd18120b60e8dd114e78bae",
"rev": "a40883358d4a00e96e43ef95bd115172749b81a9",
"type": "github"
},
"original": {
@@ -494,11 +494,11 @@
"tmux": {
"flake": false,
"locked": {
"lastModified": 1741687272,
"narHash": "sha256-Xb/fVdgZjM8tAADtjqh3IXSMR8ASj9gbRYqS3f4V5H8=",
"lastModified": 1742853671,
"narHash": "sha256-c4Ve/WjBED0GCIECJ9rNYzQz0LKDXs/Ol9prNh1KbWI=",
"owner": "tmux",
"repo": "tmux",
"rev": "d4b8635f50f997bf48764caa4972c4b5fc8802fd",
"rev": "9e1f110db0776ff0ca3f1b41ee3a6c8ccaf6452b",
"type": "github"
},
"original": {
@@ -515,11 +515,11 @@
]
},
"locked": {
"lastModified": 1739829690,
"narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=",
"lastModified": 1742370146,
"narHash": "sha256-XRE8hL4vKIQyVMDXykFh4ceo3KSpuJF3ts8GKwh5bIU=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "3d0579f5cc93436052d94b73925b48973a104204",
"rev": "adc195eef5da3606891cedf80c0d9ce2d3190808",
"type": "github"
},
"original": {
@@ -535,11 +535,11 @@
]
},
"locked": {
"lastModified": 1741838758,
"narHash": "sha256-nGTC/y9e+1+QIVCzIbiSpPiXM2HfS8YwIDCp52CcOQ4=",
"lastModified": 1742616341,
"narHash": "sha256-4/jpVPcN5VKomVhC/4KG0wU1KPxoDi1zVmu+GuuP6PU=",
"owner": "youwen5",
"repo": "zen-browser-flake",
"rev": "03a7fc89bc48344aed00e01b409c1d6ffc4c52ce",
"rev": "33f2c77de9b296992436dc9e17c3580c727511a7",
"type": "github"
},
"original": {
@@ -563,11 +563,11 @@
]
},
"locked": {
"lastModified": 1741702955,
"narHash": "sha256-Emk3VnNByigCBlBN34IH2cMrsUqIhdex02uw9TSDsN0=",
"lastModified": 1741825901,
"narHash": "sha256-aeopo+aXg5I2IksOPFN79usw7AeimH1+tjfuMzJHFdk=",
"owner": "mitchellh",
"repo": "zig-overlay",
"rev": "1152ce759114a94134081270affd970ae1b957ed",
"rev": "0b14285e283f5a747f372fb2931835dd937c4383",
"type": "github"
},
"original": {
@@ -576,7 +576,7 @@
"type": "github"
}
},
"zig2nix": {
"zon2nix": {
"inputs": {
"flake-utils": [
"ghostty",
@@ -588,17 +588,17 @@
]
},
"locked": {
"lastModified": 1741816255,
"narHash": "sha256-SJQMnm1vwXy8Td2qp/omjybn+4xZ/MDdZHeK6aa2nb0=",
"lastModified": 1742104771,
"narHash": "sha256-LhidlyEA9MP8jGe1rEnyjGFCzLLgCdDpYeWggibayr0=",
"owner": "jcollie",
"repo": "zig2nix",
"rev": "c2a24405298373123e12ca81805e436da648aaf5",
"repo": "zon2nix",
"rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
"type": "github"
},
"original": {
"owner": "jcollie",
"ref": "c2a24405298373123e12ca81805e436da648aaf5",
"repo": "zig2nix",
"ref": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
"repo": "zon2nix",
"type": "github"
}
}
modules/cli/zsh/default.nix
+1
View File
@@ -35,6 +35,7 @@
gswm = "git switch $(git master)";
grbm = "git rebase origin/$(git master)";
grhhm = "grhh origin/$(git master)";
grhsm = "grhs origin/$(git master)";
grhho = "grhh @{u}";
gmm = "git merge origin $(git master)";
gcam = "git commit --amend";
modules/gui/ghostty.nix
+1 -1
View File
@@ -28,7 +28,7 @@
window-padding-color = "extend";
window-decoration = false;
adw-toast = false;
app-notifications = false;
confirm-close-surface = false;
resize-overlay = "never";
# avoid dreadfully long startup times
nvim/default.nix
-3
View File
@@ -156,8 +156,5 @@ in
# might need to find a way to disable it for projects that use prettier but it's just more convenient to have it always on
# (for json or to allow use without an outer shell)
biome
# Give access to gdbus for color-scheme detection (vim-lumen).
glib
];
}
overlays/default.nix
-2
View File
@@ -49,6 +49,4 @@ in {
vesktop = enableWayland super.vesktop ["vesktop"];
youtube-music = enableWayland super.youtube-music ["youtube-music"];
vscode = enableWayland super.vscode ["code"];
htop-vim = super.callPackage ./htop-vim.nix {};
}
overlays/htop-vim.nix
-83
View File
@@ -1,83 +0,0 @@
# from https://github.com/NixOS/nixpkgs/pull/389674
{
lib,
fetchFromGitHub,
fetchpatch2,
stdenv,
autoreconfHook,
pkg-config,
ncurses,
darwin,
libcap,
libnl,
sensorsSupport ? stdenv.hostPlatform.isLinux,
lm_sensors,
systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd,
systemd,
}:
assert systemdSupport -> stdenv.hostPlatform.isLinux;
stdenv.mkDerivation rec {
pname = "htop-vim";
version = "unstable-2023-02-16";
src = fetchFromGitHub {
owner = "KoffeinFlummi";
repo = pname;
rev = "b2b58f8f152343b70c33b79ba51a298024278621";
hash = "sha256-ZfdBAlnjoy8g6xwrR/i2+dGldMOfLlX6DRlNqB8pkGM=";
};
patches = [
# See https://github.com/htop-dev/htop/pull/1412
# Remove when updating to 3.4.0
(fetchpatch2 {
name = "htop-resolve-configuration-path.patch";
url = "https://github.com/htop-dev/htop/commit/0dac8e7d38ec3aeae901a987717b5177986197e4.patch";
hash = "sha256-Er1d/yV1fioYfEmXNlLO5ayAyXkyy+IaGSx1KWXvlv0=";
})
];
nativeBuildInputs = [ autoreconfHook ] ++ lib.optional stdenv.hostPlatform.isLinux pkg-config;
buildInputs =
[ ncurses ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.IOKit ]
++ lib.optionals stdenv.hostPlatform.isLinux [
libcap
libnl
]
++ lib.optional sensorsSupport lm_sensors
++ lib.optional systemdSupport systemd;
configureFlags =
[
"--enable-unicode"
"--sysconfdir=/etc"
]
++ lib.optionals stdenv.hostPlatform.isLinux [
"--enable-affinity"
"--enable-capabilities"
"--enable-delayacct"
]
++ lib.optional sensorsSupport "--enable-sensors";
postFixup =
let
optionalPatch = pred: so: lib.optionalString pred "patchelf --add-needed ${so} $out/bin/htop";
in
lib.optionalString (!stdenv.hostPlatform.isStatic) ''
${optionalPatch sensorsSupport "${lib.getLib lm_sensors}/lib/libsensors.so"}
${optionalPatch systemdSupport "${systemd}/lib/libsystemd.so"}
'';
meta = with lib; {
description = "Interactive process viewer, with vim-style keybindings";
homepage = "https://github.com/KoffeinFlummi/htop-vim";
license = licenses.gpl2Only;
platforms = platforms.all;
maintainers = with maintainers; [ thiagokokada ];
mainProgram = "htop";
};
}