Skip to content

Commit

Permalink
fix keyring
Browse files Browse the repository at this point in the history
  • Loading branch information
x0ba committed Dec 29, 2024
1 parent ec4af29 commit bd12955
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 35 deletions.
16 changes: 0 additions & 16 deletions flake.lock

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

1 change: 0 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
inputs.nixpkgs.follows = "nixpkgs";
};
impermanence.url = "github:nix-community/impermanence";
persist-retro.url = "github:Geometer1729/persist-retro";
sops-nix = {
url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs";
Expand Down
9 changes: 4 additions & 5 deletions modules/home/desktop/services/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,10 @@ in {
config = mkIf cfg.enable {
services = {
clipman.enable = true;
# wlsunset = {
# enable = true;
# latitude = "37.4";
# longitude = "-121.8";
# };
gnome-keyring = {
enable = true;
components = ["secrets"];
};
udiskie.enable = true;
};
};
Expand Down
4 changes: 0 additions & 4 deletions modules/home/desktop/sway/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,6 @@ in {
services = {
clipman.enable = true;
swayosd.enable = true;
gnome-keyring = {
enable = true;
components = ["secrets"];
};
udiskie.enable = true;
};
wayland.windowManager.sway = {
Expand Down
3 changes: 1 addition & 2 deletions modules/nixos/desktop/greeter/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ in {
};

config = mkIf cfg.enable {
services.gnome.gnome-keyring.enable = true;
services.greetd = {
enable = true;
settings = {
Expand All @@ -30,8 +31,6 @@ in {
u2fAuth = true;
};
security.polkit.enable = true;

# start a keyring daemon for sway
systemd = {
packages = [pkgs.polkit_gnome];
user.services.polkit-gnome-authentication-agent-1 = {
Expand Down
16 changes: 10 additions & 6 deletions modules/nixos/desktop/niri/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,15 @@ in {
];
programs.file-roller.enable = true;

environment.pathsToLink = ["/share/nautilus-python/extensions"];
environment.sessionVariables.NAUTILUS_4_EXTENSION_DIR = "/var/run/current-system/sw/lib/nautilus/extensions-4";
programs.nautilus-open-any-terminal = {
enable = true;
terminal = "${lib.getExe pkgs.ghostty}";
};

environment.sessionVariables.NAUTILUS_4_EXTENSION_DIR = "${pkgs.nautilus-python}/lib/nautilus/extensions-4";
environment.pathsToLink = [
"/share/nautilus-python/extensions"
];

services.dbus.packages = with pkgs; [
nautilus-open-any-terminal
Expand All @@ -54,10 +61,7 @@ in {
udisks2.enable = true;
devmon.enable = true;
# previews
gnome = {
sushi.enable = true;
gnome-keyring.enable = true;
};
gnome.sushi.enable = true;
# search metadata
gnome.tracker-miners.enable = true;
# thumbnails
Expand Down
2 changes: 1 addition & 1 deletion modules/nixos/impermanence/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ with lib.${namespace}; let
in {
imports = with inputs; [
impermanence.nixosModules.impermanence
persist-retro.nixosModules.persist-retro
];
options.${namespace}.impermanence = with types; {
enable = mkBoolOpt false "Enable impermanence";
Expand Down Expand Up @@ -70,6 +69,7 @@ in {
"Documents"
"Videos"
"Code"
"Nextcloud"
".local/state/syncthing"
".config/spotify"
".config/doom"
Expand Down

0 comments on commit bd12955

Please sign in to comment.