diff --git a/host/Arc/configuration.nix b/host/Arc/configuration.nix
index 9f9b549..b97a8fa 100644
--- a/host/Arc/configuration.nix
+++ b/host/Arc/configuration.nix
@@ -88,7 +88,7 @@ args@{
desktopManager.plasma6.enable = true;
};
- services.xserver.desktopManager.gnome.enable = false;
+ services.desktopManager.gnome.enable = false;
environment.systemPackages = with pkgs; [
eog
#mpv
diff --git a/host/Rory-desktop/configuration.nix b/host/Rory-desktop/configuration.nix
index e16cb7e..d48d10c 100644
--- a/host/Rory-desktop/configuration.nix
+++ b/host/Rory-desktop/configuration.nix
@@ -16,20 +16,22 @@ args@{
# ../../modules/environments/home.nix
../../modules/software-templates/profilers.nix
../../modules/software-templates/dotnet.client.nix
-# ../../modules/hardware/google-stadia-controller.nix
+ #../../modules/hardware/google-stadia-controller.nix
- ./postgres.nix
- ./nginx.nix
+ ./services/nginx.nix
+ ./services/postgres.nix
# hardware-specific imports
./optional/hardware-specific/amd.nix
+ #./services/edu/mongodb.nix
+ ./optional/gui/hyprland.nix
#./optional/gui/x11.nix
- ./optional/gui/wayland.nix
- ./edu/mongodb.nix
-
-# ./printing.nix
-# ./ollama.nix
+ #./services/libvirt.nix
+ #./services/printing.nix
+ #./services/rabbitmq.nix
+ #./services/ollama.nix
+ #./services/waydroid.nix
];
boot = {
@@ -44,17 +46,11 @@ args@{
efiInstallAsRemovable = true;
};
};
- #kernelPatches = [
- # {
- # # FIXME: https://gitlab.freedesktop.org/drm/amd/-/issues/3437
- # name = "drm-amd-3437-hack";
- # patch = ./hacks/drm-amd-3437.patch;
- # }
- #];
-
- #readOnlyNixStore = false;
};
- programs.noisetorch.enable = true;
+
+ # TODO: re-enable when USB is fixed
+ #programs.noisetorch.enable = true;
+
programs.gamemode.enable = true;
users.users.Rory.extraGroups = [ "gamemode" ];
@@ -117,7 +113,7 @@ args@{
};
};
- services.xserver.desktopManager.gnome.enable = false;
+ services.desktopManager.gnome.enable = false;
environment.systemPackages = with pkgs; [
eog
mpv
@@ -131,8 +127,16 @@ args@{
# - IDEs
#jetbrains-toolbox
- (jetbrains.plugins.addPlugins jetbrains.webstorm [ "github-copilot" ])
- (jetbrains.plugins.addPlugins jetbrains.clion [ "github-copilot" "nixidea" "visual-studio-keymap" ]) #"string-manipulation"
+ (jetbrains.plugins.addPlugins jetbrains.webstorm [
+ jetbrains.plugins.github-copilot-fixed
+ #"github-copilot"
+ ])
+ (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
@@ -146,14 +150,10 @@ args@{
gimp
# - Languages
- #dotnet-sdk_8
dotnetCorePackages.sdk_9_0
#games
osu-lazer-bin
- #steam
- #steam-run
- #steam-acf
# extra packages
dmenu
@@ -167,7 +167,6 @@ args@{
#wineWowPackages.unstableFull
#winetricks
#fragments
- #peek
unrar-wrapper
@@ -180,8 +179,8 @@ args@{
#(callPackage ../../packages/mc/server/modpack/curseforge/techopolis-2/5.4.nix { })
#vesktop
- discord-development
- virt-viewer
+ #discord-development
+
# (dwarf-fortress-packages.dwarf-fortress-full.override { enableStoneSense = true; enableFPS = true; theme = dwarf-fortress-packages.themes.spacefox; })
mangohud
@@ -199,16 +198,6 @@ args@{
module: ${pkgs.opensc}/lib/opensc-pkcs11.so
'';
- programs.steam = {
- enable = true;
- gamescopeSession.enable = true;
- extraCompatPackages = with pkgs; [
- steam-play-none
- proton-ge-bin
- ];
- };
- virtualisation.waydroid.enable = true;
-
xdg = {
portal = {
enable = true;
@@ -230,6 +219,7 @@ args@{
#icons.enable = true;
#autostart.enable = true;
};
+
fonts = {
packages = with pkgs; [
#(nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
@@ -261,6 +251,7 @@ args@{
];
};
};
+
security = {
polkit.enable = true;
sudo.wheelNeedsPassword = false;
@@ -274,9 +265,6 @@ args@{
#};
# };
- virtualisation.libvirtd.enable = true;
- programs.virt-manager.enable = true;
-
monitoring = {
monitorAll = true;
localPrometheus = true;
@@ -286,6 +274,7 @@ args@{
nginxHost = "monitoring.localhost";
nginxSsl = false;
};
+
networking.hosts."127.0.0.1" = builtins.attrNames config.services.nginx.virtualHosts;
services.gvfs.enable = true;
@@ -303,9 +292,5 @@ args@{
networking.interfaces.enp34s0 = lib.mkForce { };
};
- services.rabbitmq = {
- enable = true;
- };
-
system.stateVersion = "22.11"; # DO NOT EDIT!
}
diff --git a/host/Rory-desktop/optional/gui/hyprland.nix b/host/Rory-desktop/optional/gui/hyprland.nix
new file mode 100644
index 0000000..5fcbfb4
--- /dev/null
+++ b/host/Rory-desktop/optional/gui/hyprland.nix
@@ -0,0 +1,26 @@
+{
+ pkgs,
+ hyprland,
+ hy3,
+ ...
+}:
+
+{
+ programs.hyprland = {
+ enable = true;
+ package = hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
+ };
+
+ programs.hyprlock.enable = true;
+ environment.systemPackages = with pkgs;[
+ wmenu
+ ];
+
+ 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/x11.nix b/host/Rory-desktop/optional/gui/i3.nix
index 9070298..9070298 100644
--- a/host/Rory-desktop/optional/gui/x11.nix
+++ b/host/Rory-desktop/optional/gui/i3.nix
diff --git a/host/Rory-desktop/optional/gui/wayland.nix b/host/Rory-desktop/optional/gui/sway.nix
index a8f7db7..f19635f 100644
--- a/host/Rory-desktop/optional/gui/wayland.nix
+++ b/host/Rory-desktop/optional/gui/sway.nix
@@ -35,21 +35,5 @@
];
};
- programs.hyprland = {
- enable = true;
- package = hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
- };
-
- programs.hyprlock.enable = true;
- environment.systemPackages = with pkgs;[
- wmenu
- ];
-
- 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/edu/mongodb.nix b/host/Rory-desktop/services/edu/mongodb.nix
index 92ffc6a..92ffc6a 100644
--- a/host/Rory-desktop/edu/mongodb.nix
+++ b/host/Rory-desktop/services/edu/mongodb.nix
diff --git a/host/Rory-desktop/services/libvirt.nix b/host/Rory-desktop/services/libvirt.nix
new file mode 100644
index 0000000..405a73d
--- /dev/null
+++ b/host/Rory-desktop/services/libvirt.nix
@@ -0,0 +1,8 @@
+{ pkgs, ... }:
+{
+ virtualisation.libvirtd.enable = true;
+ programs.virt-manager.enable = true;
+ environment.systemPackages = with pkgs; [
+ virt-viewer
+ ];
+}
\ No newline at end of file
diff --git a/host/Rory-desktop/mariadb.nix b/host/Rory-desktop/services/mariadb.nix
index 758cb3d..758cb3d 100644
--- a/host/Rory-desktop/mariadb.nix
+++ b/host/Rory-desktop/services/mariadb.nix
diff --git a/host/Rory-desktop/nginx.nix b/host/Rory-desktop/services/nginx.nix
index bd1f364..bd1f364 100644
--- a/host/Rory-desktop/nginx.nix
+++ b/host/Rory-desktop/services/nginx.nix
diff --git a/host/Rory-desktop/nginx/discord.localhost.nix b/host/Rory-desktop/services/nginx/discord.localhost.nix
index b40e13c..b40e13c 100755
--- a/host/Rory-desktop/nginx/discord.localhost.nix
+++ b/host/Rory-desktop/services/nginx/discord.localhost.nix
diff --git a/host/Rory-desktop/nginx/hse.localhost.nix b/host/Rory-desktop/services/nginx/hse.localhost.nix
index 5812b02..5812b02 100755
--- a/host/Rory-desktop/nginx/hse.localhost.nix
+++ b/host/Rory-desktop/services/nginx/hse.localhost.nix
diff --git a/host/Rory-desktop/nginx/matrix.opensuse.localhost.nix b/host/Rory-desktop/services/nginx/matrix.opensuse.localhost.nix
index 87287a4..87287a4 100644
--- a/host/Rory-desktop/nginx/matrix.opensuse.localhost.nix
+++ b/host/Rory-desktop/services/nginx/matrix.opensuse.localhost.nix
diff --git a/host/Rory-desktop/nginx/synapse.localhost.nix b/host/Rory-desktop/services/nginx/synapse.localhost.nix
index 9f89678..9f89678 100755
--- a/host/Rory-desktop/nginx/synapse.localhost.nix
+++ b/host/Rory-desktop/services/nginx/synapse.localhost.nix
diff --git a/host/Rory-desktop/ollama.nix b/host/Rory-desktop/services/ollama.nix
index b1b0a7a..b1b0a7a 100755
--- a/host/Rory-desktop/ollama.nix
+++ b/host/Rory-desktop/services/ollama.nix
diff --git a/host/Rory-desktop/postgres.nix b/host/Rory-desktop/services/postgres.nix
index c201b04..c201b04 100755
--- a/host/Rory-desktop/postgres.nix
+++ b/host/Rory-desktop/services/postgres.nix
diff --git a/host/Rory-desktop/printing.nix b/host/Rory-desktop/services/printing.nix
index 4f86347..4f86347 100644
--- a/host/Rory-desktop/printing.nix
+++ b/host/Rory-desktop/services/printing.nix
diff --git a/host/Rory-desktop/services/rabbitmq.nix b/host/Rory-desktop/services/rabbitmq.nix
new file mode 100644
index 0000000..f786a70
--- /dev/null
+++ b/host/Rory-desktop/services/rabbitmq.nix
@@ -0,0 +1,6 @@
+{ ... }:
+{
+ services.rabbitmq = {
+ enable = true;
+ };
+}
\ No newline at end of file
diff --git a/host/Rory-desktop/services/steam.nix b/host/Rory-desktop/services/steam.nix
new file mode 100644
index 0000000..a01b46e
--- /dev/null
+++ b/host/Rory-desktop/services/steam.nix
@@ -0,0 +1,11 @@
+{ ... }:
+{
+ programs.steam = {
+ enable = true;
+ gamescopeSession.enable = true;
+ extraCompatPackages = with pkgs; [
+ steam-play-none
+ proton-ge-bin
+ ];
+ };
+}
\ No newline at end of file
diff --git a/host/Rory-desktop/services/waydroid.nix b/host/Rory-desktop/services/waydroid.nix
new file mode 100644
index 0000000..45a90ea
--- /dev/null
+++ b/host/Rory-desktop/services/waydroid.nix
@@ -0,0 +1,4 @@
+{ ... }:
+{
+ virtualisation.waydroid.enable = true;
+}
\ No newline at end of file
diff --git a/host/Rory-laptop/configuration.nix b/host/Rory-laptop/configuration.nix
index c4aca15..bb0467b 100644
--- a/host/Rory-laptop/configuration.nix
+++ b/host/Rory-laptop/configuration.nix
@@ -110,7 +110,7 @@ args@{
};
};
- services.xserver.desktopManager.gnome.enable = false;
+ services.desktopManager.gnome.enable = false;
environment.systemPackages = with pkgs; [
eog
mpv
@@ -124,10 +124,17 @@ args@{
# - IDEs
- (jetbrains.plugins.addPlugins jetbrains.webstorm [ "github-copilot" ])
- (jetbrains.plugins.addPlugins jetbrains.idea-ultimate [ "github-copilot" ])
+ (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"
+ ])
(jetbrains.plugins.addPlugins jetbrains.clion [
- "github-copilot"
+ jetbrains.plugins.github-copilot-fixed
+ #"github-copilot"
"string-manipulation"
"nixidea"
"visual-studio-keymap"
|
