Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(flake): update flake.lock #115

Merged
merged 5 commits into from
Apr 5, 2024
Merged

chore(flake): update flake.lock #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
47fa3e8
flake.lock: Update
github-actions[bot] Apr 1, 2024
5ec5af8
fix(nvim): rnix-lsp was removed as it is unmaintained
EdenEast Apr 5, 2024
a096010
fix(gpg): pinentryFlavor has been deprecated
EdenEast Apr 5, 2024
6e71a3f
fix(nix): fonts.fonts was changed to fonts.packages
EdenEast Apr 5, 2024
4be030b
fix(nix): services.xserver.layout to services.xserver.xkb
EdenEast Apr 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion config/.config/nvim/lua/eden/mod/lsp/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ return {
},
},
pyright = {},
rnix = {},
vimls = {},
}

Expand Down
42 changes: 21 additions & 21 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion home/modules/shell/neovim.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion system/common/profiles/desktop.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ in

config = mkIf cfg.enable {
fonts = {
fonts = with pkgs; [
packages = with pkgs; [
(
nerdfonts.override {
fonts = [ "JetBrainsMono" "Hack" "Meslo" "UbuntuMono" ];
Expand Down
8 changes: 4 additions & 4 deletions system/nixos/modules/yubikey/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
};
};

Expand All @@ -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"
Expand Down
4 changes: 3 additions & 1 deletion system/nixos/profiles/desktop/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ in
};

config = mkIf cfg.enable {
nyx.modules.yubikey.pinentryPackage = pkgs.pinentry-qt;

services.printing.enable = true;

environment.systemPackages = with pkgs; [
Expand Down Expand Up @@ -51,7 +53,7 @@ in
# Desktop environment flavor
services.xserver = {
enable = true;
layout = "us";
xkb.layout = "us";
libinput = mkIf cfg.laptop {
enable = true;
touchpad = {
Expand Down
Loading