diff --git a/host/Rory-desktop/configuration.nix b/host/Rory-desktop/configuration.nix
index d758710..054f03f 100644
--- a/host/Rory-desktop/configuration.nix
+++ b/host/Rory-desktop/configuration.nix
@@ -16,8 +16,9 @@ args@{
# ../../modules/environments/home.nix
../../modules/users/cb.nix
../../modules/software-templates/profilers.nix
- ../../modules/software-templates/dotnet.client.nix
- #../../modules/hardware/google-stadia-controller.nix
+ ../../modules/software-templates/eid-mw.nix
+ ../../modules/software-templates/devenv/dotnet.nix
+ ../../modules/software-templates/devenv/javascript.nix
./services/nginx.nix
./services/postgres.nix
@@ -25,16 +26,18 @@ args@{
# hardware-specific imports
./optional/hardware-specific/amd.nix
- #./services/edu/mongodb.nix
./optional/gui/hyprland.nix
- #./optional/gui/x11.nix
./services/libvirt.nix
- #./services/printing.nix
./services/rabbitmq.nix
+ #./services/edu/mongodb.nix
+ #./optional/gui/x11.nix
+ #./services/printing.nix
#./services/ollama.nix
#./services/waydroid.nix
];
+ #services.flatpak.enable = true;
+
boot = {
kernelPackages = pkgs.linuxPackages_latest;
loader = {
@@ -86,7 +89,7 @@ args@{
i18n.defaultLocale = "en_US.UTF-8";
services = {
- displayManager.gdm.enable = true;
+ displayManager.sddm.enable = true;
xserver = {
displayManager.lightdm.enable = false;
enable = true;
@@ -116,6 +119,7 @@ args@{
services.desktopManager.gnome.enable = false;
environment.systemPackages = with pkgs; [
+ adwaita-icon-theme
eog
mpv
libreoffice
@@ -126,29 +130,6 @@ args@{
kitty
youtube-music
- # - IDEs
- #jetbrains-toolbox
- (jetbrains.plugins.addPlugins jetbrains.webstorm [
- jetbrains.plugins.github-copilot-fixed
- #"github-copilot"
- ])
- (jetbrains.plugins.addPlugins jetbrains.idea-ultimate [
- jetbrains.plugins.github-copilot-fixed
- #"github-copilot"
- "nixidea"
- "visual-studio-keymap"
- ]) # "string-manipulation"
- (jetbrains.plugins.addPlugins jetbrains.clion [
- jetbrains.plugins.github-copilot-fixed
- #"github-copilot"
- "nixidea"
- "visual-studio-keymap"
- ]) # "string-manipulation"
- #jetbrains.rider
- #jetbrains.clion
- #github-copilot-intellij-agent
- openjdk17
-
dbeaver-bin
#insomnia
vscode
@@ -157,11 +138,8 @@ args@{
inkscape-with-extensions
gimp
- # - Languages
- dotnetCorePackages.sdk_9_0
-
#games
- osu-lazer-bin
+ #osu-lazer-bin
# extra packages
dmenu
@@ -195,15 +173,9 @@ args@{
thunderbird
- p11-kit
- opensc
- eid-mw
jitsi-meet-electron
#nixd
];
- environment.etc."pkcs11/modules/opensc-pkcs11".text = ''
- module: ${pkgs.opensc}/lib/opensc-pkcs11.so
- '';
xdg = {
portal = {
@@ -289,7 +261,6 @@ args@{
enable = true;
memoryPercent = 200;
};
- services.pcscd.enable = true;
virtualisation.vmVariant = {
users = {
diff --git a/host/Rory-desktop/optional/gui/hyprland.nix b/host/Rory-desktop/optional/gui/hyprland.nix
index 0932f37..22fca5b 100644
--- a/host/Rory-desktop/optional/gui/hyprland.nix
+++ b/host/Rory-desktop/optional/gui/hyprland.nix
@@ -22,11 +22,11 @@
keepassxc
];
- environment.etc."hyprPlugins" = {
- text = ''
- plugin = ${hy3.packages.${pkgs.stdenv.hostPlatform.system}.hy3}/lib/libhy3.so
- '';
- };
+ #environment.etc."hyprPlugins" = {
+ # text = ''
+ # plugin = ${hy3.packages.${pkgs.stdenv.hostPlatform.system}.hy3}/lib/libhy3.so
+ # '';
+ #};
xdg.portal.wlr.enable = true;
}
diff --git a/host/Rory-desktop/optional/gui/i3.nix b/host/Rory-desktop/optional/gui/i3.nix
index 9070298..7ed5264 100644
--- a/host/Rory-desktop/optional/gui/i3.nix
+++ b/host/Rory-desktop/optional/gui/i3.nix
@@ -2,8 +2,6 @@
config,
pkgs,
lib,
- nhekoSrc,
- mtxclientSrc,
...
}:
diff --git a/host/Rory-desktop/optional/hardware-specific/amd.nix b/host/Rory-desktop/optional/hardware-specific/amd.nix
index e4758a6..225442f 100644
--- a/host/Rory-desktop/optional/hardware-specific/amd.nix
+++ b/host/Rory-desktop/optional/hardware-specific/amd.nix
@@ -2,8 +2,6 @@
config,
pkgs,
lib,
- nhekoSrc,
- mtxclientSrc,
...
}:
diff --git a/host/Rory-desktop/optional/hardware-specific/nvidia.nix b/host/Rory-desktop/optional/hardware-specific/nvidia.nix
index c146c3a..c896e1c 100644
--- a/host/Rory-desktop/optional/hardware-specific/nvidia.nix
+++ b/host/Rory-desktop/optional/hardware-specific/nvidia.nix
@@ -2,8 +2,6 @@
config,
pkgs,
lib,
- nhekoSrc,
- mtxclientSrc,
...
}:
|
