faukah/nichts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: faukah:8ab86a1204f2f604dd4105d772c3e16bc82f145c
Branches Tags
faukah:main
faukah:website
..
compare: faukah:c02522ffc48c1756b5edb58394e2b8c0096fcf33
Branches Tags
faukah:main
faukah:website

3 commits
8ab86a1204 ... c02522ffc4

Author SHA1 Message Date
Bloxx12
c02522ffc4 flake.lock: bump inputs 2025-04-29 13:55:04 +02:00
Bloxx12
84c05eb005 hermit/programs.nix: add manix, remove python3 2025-04-26 23:37:39 +02:00
Bloxx12
af0fd0f55e helix: use upstream version 2025-04-26 16:24:47 +02:00
6 changed files with 160 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

173
flake.lock generated
View file

@ -20,11 +20,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743265529, "lastModified": 1744289235,
"narHash": "sha256-QbjP15/2N+VJl0b5jxrrTc+VOt39aU4XrDvtP0Lz5ik=", "narHash": "sha256-ZFkHLdimtFzQACsVVyZkZlfYdj4iNy3PkzXfrwmlse8=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "aquamarine", "repo": "aquamarine",
"rev": "1d2dbd72c2bbaceab031c592d4810f744741d203", "rev": "c8282f4982b56dfa5e9b9f659809da93f8d37e7a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -35,11 +35,11 @@
}, },
"crane": { "crane": {
"locked": { "locked": {
"lastModified": 1741148495, "lastModified": 1741481578,
"narHash": "sha256-EV8KUaIZ2/CdBXlutXrHoZYbWPeB65p5kKZk71gvDRI=", "narHash": "sha256-JBTSyJFQdO3V8cgcL08VaBUByEU6P5kXbTJN6R0PFQo=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "75390a36cd0c2cdd5f1aafd8a9f827d7107f2e53", "rev": "bb1c9567c43e4434f54e9481eb4b8e8e0d50f0b5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -119,11 +119,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1740872218, "lastModified": 1741352980,
"narHash": "sha256-ZaMw0pdoUKigLpv9HiNDH2Pjnosg7NBYMJlHTIsHEUo=", "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "3876f6b87db82f33775b1ef5ea343986105db764", "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -171,6 +171,24 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils": {
"inputs": {
"systems": "systems"
},
"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"
}
},
"gitignore": { "gitignore": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -215,6 +233,26 @@
"type": "github" "type": "github"
} }
}, },
"helix": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs",
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1745302248,
"narHash": "sha256-MEEYZaOYmU2SlgzAKRFjF4vtODRx/AUG33nRJ+nKy78=",
"owner": "helix-editor",
"repo": "helix",
"rev": "0815b52e0959e21ec792ea41d508a050b552f850",
"type": "github"
},
"original": {
"owner": "helix-editor",
"repo": "helix",
"type": "github"
}
},
"hercules-ci-effects": { "hercules-ci-effects": {
"inputs": { "inputs": {
"flake-parts": [ "flake-parts": [
@ -308,11 +346,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739049071, "lastModified": 1745015490,
"narHash": "sha256-3+7TpXMrbsUXSwgr5VAKAnmkzMb6JO+Rvc9XRb5NMg4=", "narHash": "sha256-apEJ9zoSzmslhJ2vOKFcXTMZLUFYzh1ghfB6Rbw3Low=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprgraphics", "repo": "hyprgraphics",
"rev": "175c6b29b6ff82100539e7c4363a35a02c74dd73", "rev": "60754910946b4e2dc1377b967b7156cb989c5873",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -341,11 +379,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1744214922, "lastModified": 1745593751,
"narHash": "sha256-136gjyhECXU5t9uFCpWsC4t50lUJnI4PJ9KZsNIaydg=", "narHash": "sha256-TJ/Nijr83ydAi473NGeazYqcQ0t8lCPU7aaQv98oGg8=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland", "repo": "hyprland",
"rev": "0dc531c4a7d6849f2db61084497b3007e92f470b", "rev": "742bce016cb848d222fbfcfcf8d3894ea3fdaeff",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -463,11 +501,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741191527, "lastModified": 1744468525,
"narHash": "sha256-kM+11Nch47Xwfgtw2EpRitJuORy4miwoMuRi5tyMBDY=", "narHash": "sha256-9HySx+EtsbbKlZDlY+naqqOV679VdxP6x6fP3wxDXJk=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlang", "repo": "hyprlang",
"rev": "72df3861f1197e41b078faa3e38eedd60e00018d", "rev": "f1000c54d266e6e4e9d646df0774fac5b8a652df",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -550,14 +588,14 @@
"nixpkgs" "nixpkgs"
], ],
"pre-commit-hooks-nix": "pre-commit-hooks-nix", "pre-commit-hooks-nix": "pre-commit-hooks-nix",
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1741442524, "lastModified": 1745271491,
"narHash": "sha256-tVcxLDLLho8dWcO81Xj/3/ANLdVs0bGyCPyKjp70JWk=", "narHash": "sha256-4GAHjus6JRpYHVROMIhFIz/sgLDF/klBM3UHulbSK9s=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lanzaboote", "repo": "lanzaboote",
"rev": "d8099586d9a84308ffedac07880e7f07a0180ff4", "rev": "995637eb3ab78eac33f8ee6b45cc2ecd5ede12ba",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -594,15 +632,15 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1744932701, "lastModified": 1740560979,
"narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=",
"owner": "NixOS", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", "rev": "5135c59491985879812717f4c9fea69604e7f26f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "nixos",
"ref": "nixos-unstable", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
@ -621,6 +659,22 @@
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": {
"lastModified": 1745526057,
"narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "f771eb401a46846c1aebd20552521b233dd7e18b",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1736429638, "lastModified": 1736429638,
"narHash": "sha256-dDWqQqSgMQXw5eFtcyoVijv7HbYJZOIo+jWQdJtsxn4=", "narHash": "sha256-dDWqQqSgMQXw5eFtcyoVijv7HbYJZOIo+jWQdJtsxn4=",
@ -672,11 +726,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1740915799, "lastModified": 1741379162,
"narHash": "sha256-JvQvtaphZNmeeV+IpHgNdiNePsIpHD5U/7QN5AeY44A=", "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "42b1ba089d2034d910566bf6b40830af6b8ec732", "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -687,15 +741,37 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"helix": "helix",
"hyprland": "hyprland", "hyprland": "hyprland",
"impermanence": "impermanence", "impermanence": "impermanence",
"lanzaboote": "lanzaboote", "lanzaboote": "lanzaboote",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs_2",
"schizofox": "schizofox", "schizofox": "schizofox",
"systems": "systems_2" "systems": "systems_3"
} }
}, },
"rust-overlay": { "rust-overlay": {
"inputs": {
"nixpkgs": [
"helix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1740623427,
"narHash": "sha256-3SdPQrZoa4odlScFDUHd4CUPQ/R1gtH4Mq9u8CBiK8M=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "d342e8b5fd88421ff982f383c853f0fc78a847ab",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"rust-overlay_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"lanzaboote", "lanzaboote",
@ -703,11 +779,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741228283, "lastModified": 1741573199,
"narHash": "sha256-VzqI+k/eoijLQ5am6rDFDAtFAbw8nltXfLBC6SIEJAE=", "narHash": "sha256-A2sln1GdCf+uZ8yrERSCZUCqZ3JUlOv1WE2VFqqfaLQ=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "38e9826bc4296c9daf18bc1e6aa299f3e932a403", "rev": "c777dc8a1e35407b0e80ec89817fe69970f4e81a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -722,9 +798,9 @@
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts_2",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpak": "nixpak", "nixpak": "nixpak",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_3",
"searx-randomizer": "searx-randomizer", "searx-randomizer": "searx-randomizer",
"systems": "systems" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1744892989, "lastModified": 1744892989,
@ -764,6 +840,21 @@
} }
}, },
"systems": { "systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_2": {
"locked": { "locked": {
"lastModified": 1689347949, "lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
@ -778,7 +869,7 @@
"type": "github" "type": "github"
} }
}, },
"systems_2": { "systems_3": {
"locked": { "locked": {
"lastModified": 1689347949, "lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
@ -821,11 +912,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741934139, "lastModified": 1744644585,
"narHash": "sha256-ZhTcTH9FoeAtbPfWGrhkH7RjLJZ7GeF18nygLAMR+WE=", "narHash": "sha256-p0D/e4J6Sv6GSb+9u8OQcVHSE2gPNYB5ygIfGDyEiXQ=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "150b0b6f52bb422a1b232a53698606fe0320dde0", "rev": "be6771e754345f18244fb00aae5c9e5ab21ccc26",
"type": "github" "type": "github"
}, },
"original": { "original": {

16
flake.nix
View file

@ -13,12 +13,20 @@
packages = eachSystem ( packages = eachSystem (
system: { system: {
inherit (import ./packages pkgsFor.${system}) fish helix kakoune; inherit
(import ./packages {
pkgs = pkgsFor.${system};
helix = inputs.helix.packages.${pkgs.system}.default;
})
fish
wrapped-helix
kakoune
;
} }
); );
apps = eachSystem (system: let apps = eachSystem (system: let
inherit (inputs.self.packages.${system}) fish helix; inherit (inputs.self.packages.${system}) fish wrapped-helix;
in { in {
default = { default = {
type = "app"; type = "app";
@ -26,7 +34,7 @@
}; };
helix = { helix = {
type = "app"; type = "app";
program = "${helix}/bin/hx"; program = "${wrapped-helix}/bin/hx";
}; };
}); });
}; };
@ -51,5 +59,7 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.systems.follows = "systems"; inputs.systems.follows = "systems";
}; };
helix.url = "github:helix-editor/helix";
}; };
} }

6
hosts/common.nix
View file

@ -7,7 +7,7 @@
pkgs, pkgs,
... ...
}: let }: let
inherit (self.packages.${pkgs.stdenv.system}) helix fish; inherit (self.packages.${pkgs.stdenv.system}) wrapped-helix fish;
in { in {
environment.systemPackages = builtins.attrValues { environment.systemPackages = builtins.attrValues {
inherit inherit
@ -39,8 +39,8 @@ in {
zip zip
zoxide zoxide
; ;
inherit 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 = pkgs.lib.getExe' helix "hx"; environment.sessionVariables.EDITOR = pkgs.lib.getExe' wrapped-helix "hx";
} }

3
hosts/hermit/programs.nix
View file

@ -52,6 +52,7 @@
nitch nitch
obsidian obsidian
swww swww
manix
microfetch microfetch
nmap nmap
pamixer pamixer
@ -62,7 +63,6 @@
playerctl playerctl
polkit polkit
pulsemixer pulsemixer
python3
ripgrep ripgrep
rmpc rmpc
signal-desktop signal-desktop
@ -79,6 +79,5 @@
wordgrinder wordgrinder
xournalpp xournalpp
; ;
inherit (self.packages.${pkgs.stdenv.system}) helix;
}; };
} }

9
packages/default.nix
View file

@ -1,7 +1,10 @@
pkgs: let {
helix = pkgs.callPackage ./helix.nix {}; pkgs,
helix,
}: let
wrapped-helix = pkgs.callPackage ./helix.nix {inherit helix;};
kakoune = pkgs.callPackage ./kakoune.nix {}; kakoune = pkgs.callPackage ./kakoune.nix {};
fish = pkgs.callPackage ./shell {}; fish = pkgs.callPackage ./shell {};
in { in {
inherit helix kakoune fish; inherit wrapped-helix kakoune fish;
} }

11
packages/helix.nix
View file

@ -4,7 +4,6 @@
alejandra, alejandra,
basedpyright, basedpyright,
bash-language-server, bash-language-server,
black,
clang-tools, clang-tools,
clippy, clippy,
cmake-format, cmake-format,
@ -15,25 +14,23 @@
gdb, gdb,
golangci-lint-langserver, golangci-lint-langserver,
gopls, gopls,
helix,
lazygit, lazygit,
lib, lib,
lldb_19, lldb_19,
marksman, marksman,
nil, nil,
pyright, nixd,
ruff, ruff,
rust-analyzer, rust-analyzer,
rustfmt, rustfmt,
shellcheck, shellcheck,
shfmt, shfmt,
solargraph,
stdenv,
superhtml, superhtml,
taplo, taplo,
tinymist, tinymist,
typescript-language-server, typescript-language-server,
vscode-langservers-extracted, vscode-langservers-extracted,
helix,
... ...
}: let }: let
inherit (lib.meta) getExe; inherit (lib.meta) getExe;
@ -277,6 +274,8 @@
wrapped-helix = symlinkJoin { wrapped-helix = symlinkJoin {
name = "helix-wrapped"; name = "helix-wrapped";
paths = [ paths = [
helix
# Bash # Bash
bash-language-server bash-language-server
# C/C++ # C/C++
@ -284,12 +283,12 @@
clippy clippy
golangci-lint-langserver golangci-lint-langserver
gopls gopls
helix
lldb_19 lldb_19
# Markdown # Markdown
marksman marksman
# Nix # Nix
nil nil
nixd
rust-analyzer rust-analyzer
rustfmt rustfmt
# Shell # Shell