gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 04:19:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

nixfmt + zsh changes

Browse source
This commit is contained in:
kat witch 2021-08-23 03:34:06 +01:00
parent 7db50fa82b
commit 59dcb0c998
No known key found for this signature in database
GPG key ID: 1B477797DCA5EC72
4 changed files with 43 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

33
config/users/kat/base/zsh.nix
View file

@ -55,15 +55,17 @@ in
"listrowsfirst"
]; in
''
zmodload -i zsh/complist
zstyle ':completion:*' list-colors ""
zstyle ':completion:*:*:*:*:*' menu select
zstyle ':completion:*:cd:*' tag-order local-directories directory-stack path-directories
zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#) ([0-9a-z-]#)*=01;34=0=01'
zstyle ':completion:*:*:*:*:processes' command "ps -u $USER -o pid,user,comm -w -w"
zstyle ':completion:*:complete:pass:*:*' matcher 'r:|[./_-]=** r:|=*' 'l:|=* r:|=*'
${lib.concatStringsSep "\n" (map (opt: "setopt ${opt}") zshOpts)}
bindkey '^ ' autosuggest-accept
ZSH_TAB_TITLE_ADDITIONAL_TERMS='foot'
ZSH_TAB_TITLE_ENABLE_FULL_COMMAND=true
zmodload -i zsh/complist
zstyle ':completion:*' list-colors ""
zstyle ':completion:*:*:*:*:*' menu select
zstyle ':completion:*:cd:*' tag-order local-directories directory-stack path-directories
zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#) ([0-9a-z-]#)*=01;34=0=01'
zstyle ':completion:*:*:*:*:processes' command "ps -u $USER -o pid,user,comm -w -w"
zstyle ':completion:*:complete:pass:*:*' matcher 'r:|[./_-]=** r:|=*' 'l:|=* r:|=*'
${lib.concatStringsSep "\n" (map (opt: "setopt ${opt}") zshOpts)}
bindkey '^ ' autosuggest-accept
'';
shellAliases = {
nixdirfmt = "fd --color=never .nix | xargs nixpkgs-fmt";
@ -83,19 +85,14 @@ in
ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE = "fg=3,bold";
ZSH_AUTOSUGGEST_USE_ASYNC = 1;
};
plugins = [
plugins = with pkgs.zsh-plugins; [
(with pkgs.zsh-syntax-highlighting; {
name = "zsh-syntax-highlighting";
inherit src;
})
(with pkgs.zsh-plugins.vim-mode; {
name = "zsh-vim-mode";
inherit src;
})
(with pkgs.zsh-plugins.evil-registers; {
name = "evil-registers";
inherit src;
})
tab-title.zshPlugin
vim-mode.zshPlugin
evil-registers.zshPlugin
{
name = "z";
file = "z.sh";

8
config/users/kat/dev/rustfmt.nix
View file

@ -2,11 +2,11 @@
{
xdg.configFile."rustfmt/rustfmt.toml".text = ''
# SPDX-FileCopyrightText: V <v@anomalous.eu>
# SPDX-License-Identifier: OSL-3.0
# SPDX-FileCopyrightText: V <v@anomalous.eu>
# SPDX-License-Identifier: OSL-3.0
hard_tabs = true
imports_granularity = "One"
hard_tabs = true
imports_granularity = "One"
'';
home.packages = with pkgs; [

1
config/users/kat/gui/foot.nix
View file

@ -8,6 +8,7 @@ with lib;
settings = {
main = {
term = "foot";
locked-title = false;
font = "${config.kw.font.name}:size=${toString config.kw.font.size}, Twitter Color Emoji:size=8";
font-bold = "${config.kw.font.name}:size=${toString config.kw.font.size}:style=Bold";
font-italic = "${config.kw.font.name}:size=${toString config.kw.font.size}:style=Italic";

46
overlays/default.nix
View file

@ -6,30 +6,30 @@ let
nurpkgs = self;
pkgs = self;
};
rustfmt = super.rustfmt.overrideAttrs ({ patches ? [], ... }: {
rustfmt = super.rustfmt.overrideAttrs ({ patches ? [ ], ... }: {
patches = patches ++ [
# Adds an option variant that merges all use statements into a single block.
# Taken from https://github.com/rust-lang/rustfmt/pull/4680
./Implement-One-option-for-imports_granularity-4669.patch
];
});
linuxPackagesFor = kernel: (super.linuxPackagesFor kernel).extend (_: ksuper: {
zfsUnstable = ksuper.zfsUnstable.overrideAttrs (old: { meta = old.meta // { broken = false; }; });
});
};
pkgs = import sources.nixpkgs {
overlays = [
(import (sources.arcexprs + "/overlay.nix"))
(import (sources.katexprs + "/overlay.nix"))
(import sources.emacs-overlay)
overlay
# Adds an option variant that merges all use statements into a single block.
# Taken from https://github.com/rust-lang/rustfmt/pull/4680
./Implement-One-option-for-imports_granularity-4669.patch
];
});
linuxPackagesFor = kernel: (super.linuxPackagesFor kernel).extend (_: ksuper: {
zfsUnstable = ksuper.zfsUnstable.overrideAttrs (old: { meta = old.meta // { broken = false; }; });
});
};
pkgs = import sources.nixpkgs {
overlays = [
(import (sources.arcexprs + "/overlay.nix"))
(import (sources.katexprs + "/overlay.nix"))
(import sources.emacs-overlay)
overlay
];
config = {
allowUnfree = true;
permittedInsecurePackages = [
"ffmpeg-3.4.8"
];
config = {
allowUnfree = true;
permittedInsecurePackages = [
"ffmpeg-3.4.8"
];
};
};
};
in
pkgs
pkgs