Temporarily remove neovide

This commit is contained in:
DashieTM 2024-11-17 13:41:10 +01:00
parent 10e362af18
commit 05e3b8b222
5 changed files with 24 additions and 12 deletions

View file

@ -14,7 +14,8 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
sops-nix.url = "github:Mic92/sops-nix"; # wow... major fuckup -> TODO remove
sops-nix.url = "github:Mic92/sops-nix?ref=d2bd7f433b28db6bc7ae03d5eca43564da0af054";
Hyprspace = { Hyprspace = {
url = "github:KZDKM/Hyprspace"; url = "github:KZDKM/Hyprspace";
@ -63,6 +64,7 @@
system = "x86_64-linux"; system = "x86_64-linux";
overlays = [ inputs.nur.overlay ]; overlays = [ inputs.nur.overlay ];
config = { config = {
allowUnsupportedSystem = true;
permittedInsecurePackages = [ "olm-3.2.16" ]; permittedInsecurePackages = [ "olm-3.2.16" ];
allowUnfree = true; allowUnfree = true;
}; };

View file

@ -119,7 +119,7 @@
package = pkgs.nix-direnv; package = pkgs.nix-direnv;
}; };
}; };
ssh.startAgent = true; #ssh.startAgent = true;
gnupg.agent.enable = true; gnupg.agent.enable = true;
} }
// config.mods.basePackages.specialPrograms // config.mods.basePackages.specialPrograms

View file

@ -451,7 +451,8 @@
home.packages = home.packages =
with pkgs; with pkgs;
[ [
(lib.mkIf config.mods.coding.dashvim neovide) # TODO re-enable, fucking amazing experience right now
# (lib.mkIf config.mods.coding.dashvim neovide)
(lib.mkIf config.mods.coding.jetbrains jetbrains-toolbox) (lib.mkIf config.mods.coding.jetbrains jetbrains-toolbox)
] ]
++ config.mods.coding.additionalPackages ++ config.mods.coding.additionalPackages

View file

@ -29,6 +29,9 @@
config = lib.mkIf config.mods.gnomeServices.enable ( config = lib.mkIf config.mods.gnomeServices.enable (
lib.optionalAttrs (options ? services.gnome.gnome-keyring) { lib.optionalAttrs (options ? services.gnome.gnome-keyring) {
programs.dconf.enable = true; programs.dconf.enable = true;
environment.extraInit = ''
export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/keyring/ssh"
'';
services = { services = {
# needed for GNOME services outside of GNOME Desktop # needed for GNOME services outside of GNOME Desktop
dbus.packages = with pkgs; [ dbus.packages = with pkgs; [
@ -41,15 +44,19 @@
}; };
} }
// lib.optionalAttrs (options ? home.packages) { // lib.optionalAttrs (options ? home.packages) {
home.packages = services.gnome-keyring.enable = true;
home = {
packages =
let let
packages = with pkgs; [ packages = with pkgs; [
gcr
nautilus nautilus
sushi sushi
nautilus-python nautilus-python
]; ];
in in
lib.mkIf config.mods.nautilus.enable packages; lib.mkIf config.mods.nautilus.enable packages;
};
} }
); );
} }

View file

@ -135,6 +135,8 @@
# unlock GPG keyring on login # unlock GPG keyring on login
security.pam.services.greetd.enableGnomeKeyring = true; security.pam.services.greetd.enableGnomeKeyring = true;
security.pam.services.greetd.sshAgentAuth = true;
security.pam.sshAgentAuth.enable = true;
} }
// lib.optionalAttrs (options ? home) { // lib.optionalAttrs (options ? home) {
xdg.configFile."regreet/regreet.toml".source = xdg.configFile."regreet/regreet.toml".source =