chore(flake): update flake.lock (#115)

* flake.lock: Update Flake lock file updates: • Updated input 'darwin': 'github:lnl7/nix-darwin/bbde06bed1b72eddff063fa42f18644e90a0121e' (2024-02-24) → 'github:lnl7/nix-darwin/36524adc31566655f2f4d55ad6b875fb5c1a4083' (2024-03-30) • Updated input 'home-manager': 'github:nix-community/home-manager/4ee704cb13a5a7645436f400b9acc89a67b9c08a' (2024-02-24) → 'github:nix-community/home-manager/820be197ccf3adaad9a8856ef255c13b6cc561a6' (2024-03-31) • Updated input 'neovim-flake': 'github:neovim/neovim/0fcbda59871ebc5fc91cac7fa430a4a93f6698c2?dir=contrib' (2024-02-25) → 'github:neovim/neovim/b8858dddbf7b7f1ee3033acfab3d6f54a0ed3114?dir=contrib' (2024-04-01) • Updated input 'nixos-hardware': 'github:nixos/nixos-hardware/3f7d0bca003eac1a1a7f4659bbab9c8f8c2a0958' (2024-02-22) → 'github:nixos/nixos-hardware/9a763a7acc4cfbb8603bb0231fec3eda864f81c0' (2024-03-25) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/73de017ef2d18a04ac4bfd0c02650007ccb31c2a' (2024-02-24) → 'github:nixos/nixpkgs/d8fe5e6c92d0d190646fb9f1056741a229980089' (2024-03-29) • Updated input 'nur': 'github:nix-community/nur/1fe352ab8a7560c8bbd793852c52979894a7705e' (2024-02-25) → 'github:nix-community/nur/327169ed2b4766f8112d4fb144bc8f8a7cebf8bd' (2024-03-31) • Updated input 'nushell-src': 'github:nushell/nushell/e09b4817e11496a168c4b22abe91db72079a016d' (2024-02-24) → 'github:nushell/nushell/0cf7de598b2cbeba8fbe955baa0557de9d9df121' (2024-03-30) * fix(nvim): rnix-lsp was removed as it is unmaintained * fix(gpg): pinentryFlavor has been deprecated * fix(nix): fonts.fonts was changed to fonts.packages * fix(nix): services.xserver.layout to services.xserver.xkb --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
EdenEast · Apr 5, 2024 · 17d0dbd · 17d0dbd
1 parent 6b8e9e8
commit 17d0dbd
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 29 deletions.
diff --git a/config/.config/nvim/lua/eden/mod/lsp/init.lua b/config/.config/nvim/lua/eden/mod/lsp/init.lua
@@ -113,7 +113,6 @@ return {
           },
         },
         pyright = {},
-        rnix = {},
         vimls = {},
       }
 

diff --git a/flake.lock b/flake.lock
diff --git a/home/modules/shell/neovim.nix b/home/modules/shell/neovim.nix
@@ -34,7 +34,6 @@ in
         nodePackages.typescript-language-server
         nodePackages.vim-language-server
         nodePackages.write-good
-        rnix-lsp
       ] ++ optionals pkgs.stdenv.isLinux [
         omnisharp-roslyn
         lua-language-server

diff --git a/system/common/profiles/desktop.nix b/system/common/profiles/desktop.nix
@@ -11,7 +11,7 @@ in
 
   config = mkIf cfg.enable {
     fonts = {
-      fonts = with pkgs; [
+      packages = with pkgs; [
         (
           nerdfonts.override {
             fonts = [ "JetBrainsMono" "Hack" "Meslo" "UbuntuMono" ];

diff --git a/system/nixos/modules/yubikey/default.nix b/system/nixos/modules/yubikey/default.nix
@@ -8,10 +8,10 @@ in
   options.nyx.modules.yubikey = {
     enable = mkEnableOption "yubikey support";
     istty = mkEnableOption "Set pinentry to curses if no display";
-    pinentryFlavor = mkOption {
-      type = types.nullOr (types.enum pkgs.pinentry.flavors);
+    pinentryPackage = mkOption {
+      type = types.nullOr types.package;
       default = null;
-      description = "Pinentry Flavor";
+      description = "Pinentry Package";
     };
   };
 
@@ -24,7 +24,7 @@ in
     programs.gnupg.agent = {
       enable = true;
       enableSSHSupport = true;
-      pinentryFlavor = if cfg.pinentryFlavor != null then cfg.pinentryFlavor else if cfg.istty then "curses" else "qt";
+      pinentryPackage = cfg.pinentryPackage;
     };
     # environment.shellInit = ''
     #   export SSH_AUTH_SOCK="/run/user/$UID/gnupg/S.gpg-agent.ssh"

diff --git a/system/nixos/profiles/desktop/default.nix b/system/nixos/profiles/desktop/default.nix
@@ -23,6 +23,8 @@ in
   };
 
   config = mkIf cfg.enable {
+    nyx.modules.yubikey.pinentryPackage = pkgs.pinentry-qt;
+
     services.printing.enable = true;
 
     environment.systemPackages = with pkgs; [
@@ -51,7 +53,7 @@ in
     # Desktop environment flavor
     services.xserver = {
       enable = true;
-      layout = "us";
+      xkb.layout = "us";
       libinput = mkIf cfg.laptop {
         enable = true;
         touchpad = {
-Original file line number
+Diff line change
@@ Expand Up / @@ -113,7 +113,6 @@ return { @@
               },
             },
             pyright = {},
-            rnix = {},
             vimls = {},
           }
@@ Expand Down @@