diff --git a/devices/wim/default.nix b/devices/wim/default.nix index 09d38bf..efa3106 100644 --- a/devices/wim/default.nix +++ b/devices/wim/default.nix @@ -38,7 +38,6 @@ in { imports = [ ../../home/firefox - ./home/dotfiles.nix ./home/packages.nix ]; diff --git a/devices/wim/home/dotfiles.nix b/devices/wim/home/dotfiles.nix deleted file mode 100644 index 5db1471..0000000 --- a/devices/wim/home/dotfiles.nix +++ /dev/null @@ -1,13 +0,0 @@ -{config, ...}: let - inherit (config.vars) configDir; - symlink = config.lib.file.mkOutOfStoreSymlink; -in { - xdg.configFile = { - "dolphinrc".source = symlink "${configDir}/dolphinrc"; - "kdeglobals".source = symlink "${configDir}/kdeglobals"; - "kiorc".source = symlink "${configDir}/kiorc"; - "mimeapps.list".source = symlink "${configDir}/mimeapps.list"; - "neofetch".source = symlink "${configDir}/neofetch"; - "swappy".source = symlink "${configDir}/swappy"; - }; -} diff --git a/devices/wim/config/dolphinrc b/modules/hyprland/config/dolphinrc similarity index 100% rename from devices/wim/config/dolphinrc rename to modules/hyprland/config/dolphinrc diff --git a/devices/wim/config/kdeglobals b/modules/hyprland/config/kdeglobals similarity index 100% rename from devices/wim/config/kdeglobals rename to modules/hyprland/config/kdeglobals diff --git a/devices/wim/config/kiorc b/modules/hyprland/config/kiorc similarity index 100% rename from devices/wim/config/kiorc rename to modules/hyprland/config/kiorc diff --git a/devices/wim/config/mimeapps.list b/modules/hyprland/config/mimeapps.list similarity index 88% rename from devices/wim/config/mimeapps.list rename to modules/hyprland/config/mimeapps.list index 6c985b6..6da8914 100644 --- a/devices/wim/config/mimeapps.list +++ b/modules/hyprland/config/mimeapps.list @@ -1,10 +1,12 @@ [Added Associations] application/pdf=firefox.desktop; +text/x-java=nvim.desktop; x-scheme-handler/mailto=userapp-Thunderbird-9ME591.desktop; x-scheme-handler/mid=userapp-Thunderbird-9ME591.desktop; [Default Applications] application/pdf=firefox.desktop; message/rfc822=userapp-Thunderbird-9ME591.desktop +text/x-java=nvim.desktop; x-scheme-handler/mailto=userapp-Thunderbird-9ME591.desktop x-scheme-handler/mid=userapp-Thunderbird-9ME591.desktop diff --git a/devices/wim/config/neofetch/config.conf b/modules/hyprland/config/neofetch/config.conf similarity index 100% rename from devices/wim/config/neofetch/config.conf rename to modules/hyprland/config/neofetch/config.conf diff --git a/devices/wim/config/swappy/config b/modules/hyprland/config/swappy/config similarity index 100% rename from devices/wim/config/swappy/config rename to modules/hyprland/config/swappy/config diff --git a/modules/hyprland/packages.nix b/modules/hyprland/packages.nix index 9cd2ac5..a0c9e8e 100644 --- a/modules/hyprland/packages.nix +++ b/modules/hyprland/packages.nix @@ -17,6 +17,20 @@ in { ../../home/mpv ../../home/obs.nix ../../home/wofi + + ({config, ...}: let + symlink = config.lib.file.mkOutOfStoreSymlink; + configDir = "/home/${mainUser}/.nix/modules/hyprland/config"; + in { + xdg.configFile = { + "dolphinrc".source = symlink "${configDir}/dolphinrc"; + "kdeglobals".source = symlink "${configDir}/kdeglobals"; + "kiorc".source = symlink "${configDir}/kiorc"; + "mimeapps.list".source = symlink "${configDir}/mimeapps.list"; + "neofetch".source = symlink "${configDir}/neofetch"; + "swappy".source = symlink "${configDir}/swappy"; + }; + }) ]; home.packages = with pkgs; [