diff --git a/configs/desktop.nix b/configs/desktop.nix index 08184dd..10ea448 100644 --- a/configs/desktop.nix +++ b/configs/desktop.nix @@ -13,7 +13,6 @@ ../programs/ghostty.nix ../programs/gnome.nix - ../programs/java.nix ]; boot = { @@ -71,29 +70,36 @@ enable32Bit = true; }; - 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 + hm = { + imports = [ + ../programs/java.nix ]; + + home = { + packages = with pkgs; [ + chromium + (discord.override { + withOpenASAR = true; + withVencord = true; + }) + gimp + gparted + idea-ultimate-fixed + krita + 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 18fe281..58cb4ce 100644 --- a/programs/dotnet.nix +++ b/programs/dotnet.nix @@ -1,9 +1,19 @@ -{ pkgs, ... }: +# wee oo wee oo warning !!! this is a home manager module!!! destined to be put in hm's import, not nixos' !!!! { - environment.systemPackages = [ pkgs.jetbrains.rider ]; + config, + pkgs, + ... +}: +let + inherit (config.lib.file) mkOutOfStoreSymlink; +in +{ + home = { + packages = [ pkgs.jetbrains.rider ]; - systemd.tmpfiles.rules = [ - "L /opt/dotnet/8 - - - - ${pkgs.dotnet-sdk_8}/share/dotnet" - "L /opt/dotnet/mono - - - - ${pkgs.mono}" - ]; + file = { + ".dotnet/8".source = mkOutOfStoreSymlink "${pkgs.dotnet-sdk_8}/share/dotnet"; + ".dotnet/mono".source = mkOutOfStoreSymlink pkgs.mono; + }; + }; } diff --git a/programs/games.nix b/programs/games.nix index 0b09711..4cee1ff 100644 --- a/programs/games.nix +++ b/programs/games.nix @@ -8,7 +8,6 @@ hm.home.packages = with pkgs; [ obs-studio osu-lazer-bin - krita (prismlauncher.override { jdks = [ diff --git a/programs/java.nix b/programs/java.nix index 33fb810..adcc379 100644 --- a/programs/java.nix +++ b/programs/java.nix @@ -1,8 +1,16 @@ -{ pkgs, ... }: +# wee oo wee oo warning !!! this is a home manager module!!! destined to be put in hm's import, not nixos' !!!! { - 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}" - ]; + 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; + }; } diff --git a/systems/kilimandjaro/default.nix b/systems/kilimandjaro/default.nix index 70dc52b..a8bdbee 100644 --- a/systems/kilimandjaro/default.nix +++ b/systems/kilimandjaro/default.nix @@ -3,9 +3,10 @@ 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";