From 3479927d320c2a776c5c5a0279cf6ba677ea761d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?= Date: Sat, 1 Jun 2024 21:32:11 +0200 Subject: [PATCH] 24.05: Fixed warnings --- hm/shell/default.nix | 2 +- hm/vim/code.nix | 2 +- hm/vim/decoration.nix | 4 ++-- hm/vim/default.nix | 34 ++++++++++++++++-------------- hm/vim/lsp.nix | 6 ++---- os/desktop.nix | 46 +++++++++++++++++++++-------------------- os/geoffrey.nix | 2 +- os/printing/default.nix | 2 +- result-buildable | 1 + 9 files changed, 52 insertions(+), 47 deletions(-) create mode 120000 result-buildable diff --git a/hm/shell/default.nix b/hm/shell/default.nix index 1dcc90e..d9f53ad 100644 --- a/hm/shell/default.nix +++ b/hm/shell/default.nix @@ -19,7 +19,7 @@ in }; zsh = { enable = true; - enableAutosuggestions = true; + autosuggestion.enable = true; enableCompletion = true; syntaxHighlighting.enable = true; historySubstringSearch.enable = true; diff --git a/hm/vim/code.nix b/hm/vim/code.nix index bc7d93a..8f6edc8 100644 --- a/hm/vim/code.nix +++ b/hm/vim/code.nix @@ -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. diff --git a/hm/vim/decoration.nix b/hm/vim/decoration.nix index cbb7457..b48e833 100644 --- a/hm/vim/decoration.nix +++ b/hm/vim/decoration.nix @@ -34,7 +34,7 @@ ] ++ (map (n: { key = ""; action = "BufferGoto ${builtins.toString n}"; 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; }; }; }; diff --git a/hm/vim/default.nix b/hm/vim/default.nix index 49171cc..b2f7409 100644 --- a/hm/vim/default.nix +++ b/hm/vim/default.nix @@ -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. diff --git a/hm/vim/lsp.nix b/hm/vim/lsp.nix index 1d15d14..2b68f12 100644 --- a/hm/vim/lsp.nix +++ b/hm/vim/lsp.nix @@ -15,8 +15,7 @@ { mode = "n"; key = "wl"; - lua = true; - action = '' + action.__raw = '' function() print(vim.inspect(vim.lsp.buf.list_workspace_folders())) end @@ -26,8 +25,7 @@ { mode = "n"; key = "f"; - lua = true; - action = '' + action.__raw = '' function() vim.lsp.buf.format { async = true } end diff --git a/os/desktop.nix b/os/desktop.nix index 891ff9c..d0641ee 100644 --- a/os/desktop.nix +++ b/os/desktop.nix @@ -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 diff --git a/os/geoffrey.nix b/os/geoffrey.nix index 6f67aa3..4b29474 100644 --- a/os/geoffrey.nix +++ b/os/geoffrey.nix @@ -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 diff --git a/os/printing/default.nix b/os/printing/default.nix index 1f22101..02a102e 100644 --- a/os/printing/default.nix +++ b/os/printing/default.nix @@ -3,7 +3,7 @@ config = lib.mkIf config.services.printing.enable { services.avahi = { enable = true; - nssmdns = true; + nssmdns4 = true; openFirewall = true; }; }; diff --git a/result-buildable b/result-buildable new file mode 120000 index 0000000..f14126e --- /dev/null +++ b/result-buildable @@ -0,0 +1 @@ +/nix/store/6887mr1xmcjgb99saw2ilv2mfjb8s2xq-nixos-system-curacao-24.05.20240531.805a384 \ No newline at end of file