diff --git a/home/home/default.nix b/home/default.nix similarity index 98% rename from home/home/default.nix rename to home/default.nix index 27902db..0bd95fb 100644 --- a/home/home/default.nix +++ b/home/default.nix @@ -19,6 +19,10 @@ let ]; in { + imports = [ + ./dconf.nix + ]; + home.stateVersion = "20.09"; programs.gpg.settings.default-key = "99658A3EB5CD7C13"; diff --git a/home/home/jjconfig.toml b/home/jjconfig.toml similarity index 100% rename from home/home/jjconfig.toml rename to home/jjconfig.toml diff --git a/home/modules/xdg.nix b/home/modules/xdg.nix index e9f0c0d..e252d60 100644 --- a/home/modules/xdg.nix +++ b/home/modules/xdg.nix @@ -5,8 +5,8 @@ }: with lib; let apps = { - "x-scheme-handler/mailto" = "userapp-Thunderbird-PB7NI0.desktop"; - "message/rfc822" = "userapp-Thunderbird-PB7NI0.desktop"; + "x-scheme-handler/mailto" = "evolution.desktop"; + "message/rfc822" = "evolution.desktop"; "x-scheme-handler/http" = "firefox.desktop"; "x-scheme-handler/https" = "firefox.desktop"; "x-scheme-handler/ftp" = "firefox.desktop"; @@ -18,7 +18,7 @@ with lib; let "application/xhtml+xml" = "firefox.desktop"; "application/x-extension-xhtml" = "firefox.desktop"; "application/x-extension-xht" = "firefox.desktop"; - "application/pdf" = "org.pwmt.zathura.desktop"; + "application/pdf" = "evince.desktop"; }; cfg = config.dadada.home.xdg; in @@ -44,9 +44,9 @@ in }; }; home.packages = with pkgs; [ + evince firefox xdg_utils - zathura ]; }; } diff --git a/home/home/pkgs.nix b/home/pkgs.nix similarity index 100% rename from home/home/pkgs.nix rename to home/pkgs.nix diff --git a/nixos/configurations.nix b/nixos/configurations.nix index 8b664e1..1c1728c 100644 --- a/nixos/configurations.nix +++ b/nixos/configurations.nix @@ -47,7 +47,7 @@ in { dadada.home.helix.package = pkgs.helix; } { manual.manpages.enable = false; } ]; - home-manager.users.dadada = import ../home/home; + home-manager.users.dadada = import ../home; }) ./gorgon/configuration.nix ];