24.05: Fixed warnings
This commit is contained in:
parent
71385d9ba9
commit
3479927d32
GPG key ID:
C72403E7F82E6AD8
|
|
@ -19,7 +19,7 @@ in
|
|||
};
|
||||
zsh = {
|
||||
enable = true;
|
||||
enableAutosuggestions = true;
|
||||
autosuggestion.enable = true;
|
||||
enableCompletion = true;
|
||||
syntaxHighlighting.enable = true;
|
||||
historySubstringSearch.enable = true;
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ in
|
|||
vim-shot-f # Highlight relevant characters for f/F/t/T modes
|
||||
quick-scope # Highlight relevant characters for f/F modes one per word but always
|
||||
];
|
||||
options = {
|
||||
opts = {
|
||||
# From https://www.hillelwayne.com/post/intermediate-vim/
|
||||
scrolloff = 10;
|
||||
lazyredraw = true; # Do not redraw screen in the middle of a macro. Makes them complete faster.
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
] ++ (map
|
||||
(n: { key = "<C-${builtins.toString n}>"; action = "<Cmd>BufferGoto ${builtins.toString n}<CR>"; inherit options; })
|
||||
(lib.lists.range 1 9));
|
||||
options = {
|
||||
opts = {
|
||||
showmode = false;
|
||||
number = true;
|
||||
relativenumber = true;
|
||||
|
|
@ -151,7 +151,7 @@
|
|||
# Show context on top if scrolled out
|
||||
treesitter-context = {
|
||||
enable = true;
|
||||
maxLines = 5;
|
||||
settings.max_lines = 5;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
};
|
||||
programs.nixvim = {
|
||||
colorschemes.base16.setUpBar = false; # We want the custom theme for lualine, probably
|
||||
options = {
|
||||
opts = {
|
||||
ignorecase = true;
|
||||
smartcase = true;
|
||||
gdefault = true;
|
||||
|
|
@ -52,23 +52,27 @@
|
|||
gS = "search_history";
|
||||
gC = "commands";
|
||||
};
|
||||
defaults = {
|
||||
vimgrep_arguments = [
|
||||
"${pkgs.ripgrep}/bin/rg"
|
||||
"--color=never"
|
||||
"--no-heading"
|
||||
"--with-filename"
|
||||
"--line-number"
|
||||
"--column"
|
||||
"--smart-case"
|
||||
];
|
||||
settings = {
|
||||
defaults = {
|
||||
vimgrep_arguments = [
|
||||
"${pkgs.ripgrep}/bin/rg"
|
||||
"--color=never"
|
||||
"--no-heading"
|
||||
"--with-filename"
|
||||
"--line-number"
|
||||
"--column"
|
||||
"--smart-case"
|
||||
];
|
||||
};
|
||||
};
|
||||
extensions.fzf-native = {
|
||||
enable = true;
|
||||
caseMode = "smart_case";
|
||||
fuzzy = true;
|
||||
overrideFileSorter = true;
|
||||
overrideGenericSorter = true;
|
||||
settings = {
|
||||
case_mode = "smart_case";
|
||||
fuzzy = true;
|
||||
override_file_sorter = true;
|
||||
override_generic_sorter = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
# TODO Go to any symbol in the current working directory, for when LSP doesn't support it.
|
||||
|
|
|
|||
|
|
@ -15,8 +15,7 @@
|
|||
{
|
||||
mode = "n";
|
||||
key = "<space>wl";
|
||||
lua = true;
|
||||
action = ''
|
||||
action.__raw = ''
|
||||
function()
|
||||
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
|
||||
end
|
||||
|
|
@ -26,8 +25,7 @@
|
|||
{
|
||||
mode = "n";
|
||||
key = "<space>f";
|
||||
lua = true;
|
||||
action = ''
|
||||
action.__raw = ''
|
||||
function()
|
||||
vim.lsp.buf.format { async = true }
|
||||
end
|
||||
|
|
|
|||
|
|
@ -3,41 +3,43 @@
|
|||
config = lib.mkIf config.frogeye.desktop.xorg {
|
||||
services = {
|
||||
blueman.enable = true;
|
||||
displayManager.defaultSession = "none+i3";
|
||||
xserver = {
|
||||
enable = true;
|
||||
windowManager.i3.enable = true;
|
||||
displayManager.defaultSession = "none+i3";
|
||||
|
||||
# Keyboard layout
|
||||
extraLayouts.qwerty-fr = {
|
||||
description = "QWERTY-fr";
|
||||
languages = [ "fr" ];
|
||||
symbolsFile = "${pkgs.stdenv.mkDerivation {
|
||||
name = "qwerty-fr-keypad";
|
||||
src = builtins.fetchGit {
|
||||
url = "https://github.com/qwerty-fr/qwerty-fr.git";
|
||||
rev = "3a4d13089e8ef016aa20baf6b2bf3ea53de674b8";
|
||||
xkb = {
|
||||
extraLayouts.qwerty-fr = {
|
||||
description = "QWERTY-fr";
|
||||
languages = [ "fr" ];
|
||||
symbolsFile = "${pkgs.stdenv.mkDerivation {
|
||||
name = "qwerty-fr-keypad";
|
||||
src = builtins.fetchGit {
|
||||
url = "https://github.com/qwerty-fr/qwerty-fr.git";
|
||||
rev = "3a4d13089e8ef016aa20baf6b2bf3ea53de674b8";
|
||||
};
|
||||
patches = [ ./qwerty-fr-keypad.diff ];
|
||||
# TODO This doesn't seem to be applied... it's the whole point of the derivation :(
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/linux
|
||||
cp $src/linux/us_qwerty-fr $out/linux
|
||||
runHook postInstall
|
||||
'';
|
||||
}}/linux/us_qwerty-fr";
|
||||
};
|
||||
patches = [ ./qwerty-fr-keypad.diff ];
|
||||
# TODO This doesn't seem to be applied... it's the whole point of the derivation :(
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/linux
|
||||
cp $src/linux/us_qwerty-fr $out/linux
|
||||
runHook postInstall
|
||||
'';
|
||||
}}/linux/us_qwerty-fr";
|
||||
layout = "qwerty-fr";
|
||||
};
|
||||
layout = "qwerty-fr";
|
||||
};
|
||||
};
|
||||
|
||||
# Enable sound & bluetooth
|
||||
sound.enable = true;
|
||||
hardware = {
|
||||
bluetooth.enable = true;
|
||||
pulseaudio.enable = true;
|
||||
# TODO Try pipewire
|
||||
bluetooth.enable = true;
|
||||
pulseaudio.enable = true;
|
||||
# TODO Try pipewire
|
||||
};
|
||||
|
||||
# So we can use gnome3 pinentry flavour
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@
|
|||
programs.dconf.enable = true;
|
||||
|
||||
# Because everything is encrypted and I'm the only user, this is fine.
|
||||
services.xserver.displayManager.autoLogin.user = "geoffrey";
|
||||
services.displayManager.autoLogin.user = "geoffrey";
|
||||
};
|
||||
imports = [
|
||||
home-manager.nixosModules.home-manager
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
config = lib.mkIf config.services.printing.enable {
|
||||
services.avahi = {
|
||||
enable = true;
|
||||
nssmdns = true;
|
||||
nssmdns4 = true;
|
||||
openFirewall = true;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
1
result-buildable
Symbolic link
1
result-buildable
Symbolic link
|
|
@ -0,0 +1 @@
|
|||
/nix/store/6887mr1xmcjgb99saw2ilv2mfjb8s2xq-nixos-system-curacao-24.05.20240531.805a384
|
||||
Loading…
Reference in a new issue