nki/nix-home
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

Compare commits

base: nki:20287ca12f5265ed2070f6fd50368bed745c3d21
Branches Tags
nki:master
nki:remove-macbook
nki:invi
nki:local-net
nki:test
...
compare: nki:c678fc9009206438a5badb960641143d8bba67db
Branches Tags
nki:master
nki:remove-macbook
nki:invi
nki:local-net
nki:test

2 commits
20287ca12f ... c678fc9009

Author SHA1 Message Date
Natsu Kagami
c678fc9009
framework: move default browser to zen 2025-02-22 15:40:37 +01:00
Natsu Kagami
0ada1ba34f
kak-lsp: build with rustPlatform.buildRustApplication 2025-02-22 15:40:35 +01:00
4 changed files with 24 additions and 17 deletions
Show stats Expand all files Collapse all files

1
flake.nix
View file

@ -114,6 +114,7 @@
sops-nix.nixosModules.sops
inputs.lix-module.nixosModules.default
];
config.nix.settings.extra-deprecated-features = [ "url-literals" ]; # So lix won't complain
};
common-nixos = stable: { ... }: {
imports = [

3
home/nki-framework.nix
View file

@ -29,7 +29,8 @@
# Graphical set up
linux.graphical.type = "wayland";
linux.graphical.wallpaper = ./images/wallpaper_0.png;
linux.graphical.defaults.webBrowser.package = pkgs.librewolf;
linux.graphical.defaults.webBrowser.package = pkgs.zen-browser-bin;
linux.graphical.defaults.webBrowser.desktopFile = "zen.desktop";
# Enable sway
programs.my-sway.enable = true;
programs.my-sway.fontSize = 14.0;

29
overlay.nix
View file

@ -100,19 +100,24 @@ let
overlay-packages = final: prev: {
kak-tree-sitter = final.callPackage ./packages/common/kak-tree-sitter { rustPlatform = final.unstable.rustPlatform; };
kak-lsp =
let
src = inputs.kak-lsp;
cargoArtifacts = final.libs.crane.buildDepsOnly { inherit src; };
in
final.libs.crane.buildPackage {
inherit src cargoArtifacts;
buildInputs = (with final;
lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration CoreServices ])
) ++ (with final; [ libiconv ]);
kak-lsp = final.rustPlatform.buildRustPackage {
name = "kak-lsp";
src = inputs.kak-lsp;
cargoHash = "sha256-U9KxTHzIDtdJ3A62rcdvWlxJfnhbFnS6KDRaV0HJOHE=";
buildInputs = [ final.libiconv ];
meta.mainProgram = "kak-lsp";
};
meta.mainProgram = "kak-lsp";
};
# cargoArtifacts = final.libs.crane.buildDepsOnly { inherit src; };
# in
# final.libs.crane.buildPackage {
# inherit src cargoArtifacts;
# buildInputs = (with final;
# lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration CoreServices ])
# ) ++ (with final; [ libiconv ]);
# meta.mainProgram = "kak-lsp";
# };
zen-browser-bin = inputs.zen-browser.packages.${final.stdenv.system}.zen-browser.override {
inherit (inputs.zen-browser.packages.${final.stdenv.system}) zen-browser-unwrapped;

8
packages/common/kak-tree-sitter/default.nix
View file

@ -3,15 +3,15 @@ let
src = fetchFromSourcehut {
owner = "~hadronized";
repo = "kak-tree-sitter";
rev = "kak-tree-sitter-v1.1.2";
hash = "sha256-wBWfSyR8LGtug/mCD0bJ4lbdN3trIA/03AnCxZoEOSA=";
rev = "kak-tree-sitter-v1.1.3";
hash = "sha256-vQZ+zQgwIw5ZBdIuMDD37rIdhe+WpNBmq0TciXBNiSU=";
};
kak-tree-sitter = rustPlatform.buildRustPackage {
inherit src;
pname = "kak-tree-sitter";
version = "1.1.2";
cargoHash = "sha256-ruHklps7NZzsI1ub1trRKyufrP9tufWWrQ+urvEsIdA=";
version = "1.1.3";
cargoHash = "sha256-1OwPfl1446SYt1556jwR9mvWOWEv+ab+wH7GZQeS4/E=";
cargoBuildOptions = [ "--package" "kak-tree-sitter" "--package" "ktsctl" ];
nativeBuildInputs = [ clang git ];