diff --git a/configs/desktop.nix b/configs/desktop.nix index 49e8dbd..08184dd 100644 --- a/configs/desktop.nix +++ b/configs/desktop.nix @@ -13,6 +13,7 @@ ../programs/ghostty.nix ../programs/gnome.nix + ../programs/java.nix ]; boot = { @@ -70,35 +71,29 @@ enable32Bit = true; }; - hm = { - imports = [ - ../programs/java.nix + hm.home = { + packages = with pkgs; [ + chromium + (discord.override { + withOpenASAR = true; + withVencord = true; + }) + gimp + gparted + idea-ultimate-fixed + mpv + obsidian + strawberry + teams-for-linux + thunderbird + vscode + + # libreoffice stuff + libreoffice-qt6-fresh + hunspell + hunspellDicts.en_US + hunspellDicts.fr-moderne ]; - - home = { - packages = with pkgs; [ - chromium - (discord.override { - withOpenASAR = true; - withVencord = true; - }) - gimp - gparted - idea-ultimate-fixed - mpv - obsidian - strawberry - teams-for-linux - thunderbird - vscode - - # libreoffice stuff - libreoffice-qt6-fresh - hunspell - hunspellDicts.en_US - hunspellDicts.fr-moderne - ]; - }; }; i18n.extraLocaleSettings = { diff --git a/programs/dotnet.nix b/programs/dotnet.nix index 58cb4ce..18fe281 100644 --- a/programs/dotnet.nix +++ b/programs/dotnet.nix @@ -1,19 +1,9 @@ -# wee oo wee oo warning !!! this is a home manager module!!! destined to be put in hm's import, not nixos' !!!! +{ pkgs, ... }: { - config, - pkgs, - ... -}: -let - inherit (config.lib.file) mkOutOfStoreSymlink; -in -{ - home = { - packages = [ pkgs.jetbrains.rider ]; + environment.systemPackages = [ pkgs.jetbrains.rider ]; - file = { - ".dotnet/8".source = mkOutOfStoreSymlink "${pkgs.dotnet-sdk_8}/share/dotnet"; - ".dotnet/mono".source = mkOutOfStoreSymlink pkgs.mono; - }; - }; + systemd.tmpfiles.rules = [ + "L /opt/dotnet/8 - - - - ${pkgs.dotnet-sdk_8}/share/dotnet" + "L /opt/dotnet/mono - - - - ${pkgs.mono}" + ]; } diff --git a/programs/java.nix b/programs/java.nix index adcc379..33fb810 100644 --- a/programs/java.nix +++ b/programs/java.nix @@ -1,16 +1,8 @@ -# wee oo wee oo warning !!! this is a home manager module!!! destined to be put in hm's import, not nixos' !!!! +{ pkgs, ... }: { - config, - pkgs, - ... -}: -let - inherit (config.lib.file) mkOutOfStoreSymlink; -in -{ - home.file = { - ".jdks/temurin-21".source = mkOutOfStoreSymlink pkgs.temurin-bin-21; - ".jdks/temurin-17".source = mkOutOfStoreSymlink pkgs.temurin-bin-17; - ".jdks/temurin-8".source = mkOutOfStoreSymlink pkgs.temurin-bin-8; - }; + systemd.tmpfiles.rules = [ + "L /opt/temurin-21 - - - - ${pkgs.temurin-bin-21}" + "L /opt/temurin-17 - - - - ${pkgs.temurin-bin-17}" + "L /opt/temurin-8 - - - - ${pkgs.temurin-bin-8}" + ]; } diff --git a/systems/kilimandjaro/default.nix b/systems/kilimandjaro/default.nix index a8bdbee..70dc52b 100644 --- a/systems/kilimandjaro/default.nix +++ b/systems/kilimandjaro/default.nix @@ -3,10 +3,9 @@ imports = [ camasca.nixosModules.asus-numpad ../../programs/games.nix + ../../programs/dotnet.nix.nix ]; - hm.imports = [ ../../programs/dotnet.nix ]; - services.asus-numpad = { enable = true; settings.layout = "M433IA";