Noratrieb/nixos
1
0
Fork 0
mirror of https://github.com/Noratrieb/nixos.git synced 2026-01-14 19:55:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup

Browse source
This commit is contained in:
nora 2023-09-29 18:09:43 +02:00
parent 1db3122d1e
commit 82228e93cd
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
custom-pkgs/cargo-bisect-rustc/default.nix
View file

@ -1,4 +1,4 @@
pkgs: pkgs.rustPlatform.buildRustPackage rec { pkgs: pkgs.rustPlatform.buildRustPackage {
pname = "cargo-bisect-rustc"; pname = "cargo-bisect-rustc";
version = "0.6.7"; version = "0.6.7";

4
home-manager/common.nix
View file

@ -9,8 +9,8 @@
home.file.".cargo/config.toml" = { home.file.".cargo/config.toml" = {
text = '' text = ''
[target.x86_64-unknown-linux-gnu] [target.x86_64-unknown-linux-gnu]
linker = "${pkgs.llvmPackages_16.clang}/bin/clang" linker = "${lib.getExe pkgs.llvmPackages_16.clang}"
rustflags = ["-Clink-arg=-fuse-ld=${pkgs.mold}/bin/mold", "-Ctarget-cpu=native"] rustflags = ["-Clink-arg=-fuse-ld=${lib.getExe' pkgs.mold "mold"}", "-Ctarget-cpu=native"]
''; '';
}; };

6
home-manager/git.nix
View file

@ -1,4 +1,4 @@
{ pkgs, ... }: { { pkgs, lib, ... }: {
programs.git = { programs.git = {
enable = true; enable = true;
@ -10,14 +10,14 @@
fpush = "push --force-with-lease"; fpush = "push --force-with-lease";
resq = "rebase --autosquash -i"; resq = "rebase --autosquash -i";
pfush = "!echo \"hör uf ume z'pfusche und machs richtig\""; pfush = "!echo \"hör uf ume z'pfusche und machs richtig\"";
sw = "!git checkout $(git branch --format \"%(refname:lstrip=2)\" | ${pkgs.lib.getExe pkgs.fzf})"; sw = "!git checkout $(git branch --format \"%(refname:lstrip=2)\" | ${lib.getExe' pkgs.fzf "fzf"})";
}; };
difftastic = { difftastic = {
enable = true; enable = true;
}; };
extraConfig = { extraConfig = {
core.autocrlf = false; core.autocrlf = false;
core.editor = "${pkgs.neovim}/bin/nvim"; core.editor = "${lib.getExe pkgs.neovim}";
pull.ff = "only"; pull.ff = "only";
push.autoSetupRemote = true; push.autoSetupRemote = true;
init.defaultBranch = "main"; init.defaultBranch = "main";

6
home-manager/vscode.nix
View file

@ -1,4 +1,4 @@
{ pkgs, ... }: { { pkgs, lib, ... }: {
programs.vscode = { programs.vscode = {
enable = true; enable = true;
package = pkgs.vscode; package = pkgs.vscode;
@ -9,11 +9,11 @@
"[nix]"."editor.formatOnSave" = true; "[nix]"."editor.formatOnSave" = true;
"[nix]"."editor.defaultFormatter" = "jnoortheen.nix-ide"; "[nix]"."editor.defaultFormatter" = "jnoortheen.nix-ide";
"nix.enableLanguageServer" = true; "nix.enableLanguageServer" = true;
"nix.serverPath" = "${pkgs.nil}/bin/nil"; "nix.serverPath" = "${lib.getExe pkgs.nil}";
"nix.serverSettings" = { "nix.serverSettings" = {
nil = { nil = {
formatting = { formatting = {
command = [ "${pkgs.nixpkgs-fmt}/bin/nixpkgs-fmt" ]; command = [ "${lib.getExe pkgs.nixpkgs-fmt}" ];
}; };
}; };
}; };