diff --git a/flake.lock b/flake.lock
index 46dc4d4..bf07e26 100644
--- a/flake.lock
+++ b/flake.lock
@@ -663,16 +663,16 @@
},
"nixpkgs-RoryNix": {
"locked": {
- "lastModified": 1720535198,
- "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=",
+ "lastModified": 1704290814,
+ "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5",
+ "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixos-23.11",
+ "ref": "nixos-23.05",
"repo": "nixpkgs",
"type": "github"
}
diff --git a/flake.nix b/flake.nix
index cfb4519..1af15de 100755
--- a/flake.nix
+++ b/flake.nix
@@ -22,8 +22,7 @@
};
nixpkgs-RoryNix = {
- #url = "github:NixOS/nixpkgs/nixos-23.05";
- url = "github:NixOS/nixpkgs/nixos-23.11";
+ url = "github:NixOS/nixpkgs/nixos-23.05";
};
# Draupnir module/package
@@ -128,7 +127,7 @@
modules = [
./host/Rory-nginx/configuration.nix
./hardware-configuration.nix
- ./modules/packages/redpanda-connect/module.nix
+ ./packages/redpanda-connect/module.nix
home-manager.nixosModules.home-manager
lix-module.nixosModules.default
grapevine.nixosModules.default
@@ -296,7 +295,7 @@
modules = {
monitoring = import ./modules/monitoring/module.nix;
- redpanda-connect = import ./modules/packages/redpanda-connect/module.nix;
+ redpanda-connect = import ./packages/redpanda-connect/module.nix;
};
}
// flake-utils.lib.eachSystem flake-utils.lib.allSystems (
@@ -306,15 +305,15 @@
in
{
packages.nheko-git = (
- pkgs.callPackage ./modules/packages/nheko-git.nix {
+ pkgs.callPackage ./packages/nheko-git.nix {
inherit nhekoSrc;
inherit mtxclientSrc;
voipSupport = false;
}
);
- packages.mtxclient-git = (pkgs.callPackage ./modules/packages/mtxclient-git.nix { inherit mtxclientSrc; });
- packages.nbtexplorer = pkgs.callPackage ./modules/packages/nbtexplorer.nix { };
+ packages.mtxclient-git = (pkgs.callPackage ./packages/mtxclient-git.nix { inherit mtxclientSrc; });
+ packages.nbtexplorer = pkgs.callPackage ./packages/nbtexplorer.nix { };
# untested
packages.draupnir-main = pkgs.draupnir.overrideAttrs (oldAttrs: {
@@ -322,7 +321,7 @@
version = draupnirSrc.rev;
});
- packages.redpanda-connect = (pkgs.callPackage ./modules/packages/redpanda-connect/default.nix { });
+ packages.redpanda-connect = (pkgs.callPackage ./packages/redpanda-connect/default.nix { });
}
);
}
diff --git a/host/Arc/configuration.nix b/host/Arc/configuration.nix
index c8fe0fd..45b1945 100644
--- a/host/Arc/configuration.nix
+++ b/host/Arc/configuration.nix
@@ -1,9 +1,7 @@
-args@{
+{
config,
pkgs,
lib,
- nhekoSrc,
- mtxclientSrc,
...
}:
@@ -11,13 +9,10 @@ args@{
imports = [
# base imports
../../modules/base-client.nix
- ../../modules/packages/vim.nix
+ ../../packages/vim.nix
../../modules/users/Arci.nix
- # hardware-specific imports
./optional/hardware-specific/nvidia.nix
-
- #./optional/gui/x11.nix
./optional/gui/wayland.nix
];
@@ -43,19 +38,6 @@ args@{
ZSH_DISABLE_COMPFIX = "true";
};
- services.udev.extraRules = ''
- #SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", MODE="0664", GROUP="users"
- # SDP protocol
- KERNEL=="hidraw*", ATTRS{idVendor}=="1fc9", MODE="0666"
- ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="1fc9", MODE="0666"
- ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="0d28", MODE="0666"
- # Flashloader
- KERNEL=="hidraw*", ATTRS{idVendor}=="15a2", MODE="0666"
- # Controller
- KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="18d1", MODE="0666"
- SUBSYSTEMS=="usb", ATTRS{idVendor}=="18d1", ATTRS{idProduct}=="9400", MODE="0660", TAG+="uaccess"
- '';
-
networking = {
hostName = "Arc";
networkmanager.enable = true;
@@ -106,7 +88,7 @@ args@{
jack.enable = true;
alsa.enable = true;
};
-
+
desktopManager.plasma6.enable = true;
};
@@ -129,12 +111,10 @@ args@{
gimp
# - Languages
- #dotnet-sdk_8
dotnetCorePackages.sdk_9_0
#games
osu-lazer-bin
- #steam
steam-run
steam-acf
@@ -144,7 +124,7 @@ args@{
nemo
file-roller
firefox-bin
- ungoogled-chromium #needed for Rider in order to debug WASM
+ ungoogled-chromium # needed for Rider in order to debug WASM
unrar-wrapper
mangohud
@@ -167,7 +147,7 @@ args@{
extraPortals = with pkgs; [
#xdg-desktop-portal-gtk
xdg-desktop-portal-xapp
- # (callPackage ../../modules/packages/xdg-desktop-portal-gtk.nix { })
+ # (callPackage ../../packages/xdg-desktop-portal-gtk.nix { })
];
config = {
common = {
@@ -184,7 +164,6 @@ args@{
};
fonts = {
packages = with pkgs; [
- #(nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
nerd-fonts.jetbrains-mono
noto-fonts-monochrome-emoji
];
@@ -192,8 +171,6 @@ args@{
fontconfig.defaultFonts.sansSerif = with pkgs; [ "JetBrainsMonoNL Nerd Font,JetBrainsMonoNL NF:style=Regular" ];
fontconfig.defaultFonts.serif = with pkgs; [ "JetBrainsMonoNL Nerd Font,JetBrainsMonoNL NF:style=Regular" ];
fontconfig.defaultFonts.emoji = with pkgs; [ "freefont" ];
- enableDefaultPackages = lib.mkForce false;
- enableGhostscriptFonts = lib.mkForce false;
};
nixpkgs = {
@@ -218,12 +195,6 @@ args@{
programs.dconf.enable = true;
- #networking.wireguard.interfaces = {
- # wg-KP-Ran = {
-
- #};
- # };
-
virtualisation.libvirtd.enable = true;
programs.virt-manager.enable = true;
@@ -246,10 +217,6 @@ args@{
services.pcscd.enable = true;
virtualisation.vmVariant = {
- users = {
- mutableUsers = false;
- users.Rory.password = "password";
- };
networking.interfaces.enp34s0 = lib.mkForce { };
};
diff --git a/host/Arc/hacks/drm-amd-3437.patch b/host/Arc/hacks/drm-amd-3437.patch
deleted file mode 100644
index 1867762..0000000
--- a/host/Arc/hacks/drm-amd-3437.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
-index c556c8b653fa..272ad5e4a328 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
-@@ -180,7 +180,7 @@ void amdgpu_bo_placement_from_domain(struct amdgpu_bo *abo, u32 domain)
- * When GTT is just an alternative to VRAM make sure that we
- * only use it as fallback and still try to fill up VRAM first.
- */
-- if (domain & abo->preferred_domains & AMDGPU_GEM_DOMAIN_VRAM)
-+ if (domain & abo->preferred_domains & AMDGPU_GEM_DOMAIN_VRAM && !(adev->flags & AMD_IS_APU))
- places[c].flags |= TTM_PL_FLAG_FALLBACK;
- c++;
- }
\ No newline at end of file
diff --git a/host/Rory-desktop/configuration.nix b/host/Rory-desktop/configuration.nix
index 95c9775..29004c3 100644
--- a/host/Rory-desktop/configuration.nix
+++ b/host/Rory-desktop/configuration.nix
@@ -12,10 +12,11 @@ args@{
# base imports
../../modules/base-client.nix
# (import ../../modules/base-secrets.nix { path = "/home/rory/.config/sops/config.yaml"; })
- ../../modules/packages/vim.nix
+ ../../packages/vim.nix
# ../../modules/environments/home.nix
../../modules/software-templates/profilers.nix
../../modules/software-templates/dotnet.client.nix
+ ../../modules/hardware/google-stadia-controller.nix
./postgres.nix
./nginx.nix
@@ -27,7 +28,7 @@ args@{
./optional/gui/wayland.nix
./printing.nix
- ./ollama.nix
+ #./ollama.nix
];
boot = {
@@ -60,18 +61,7 @@ args@{
ZSH_DISABLE_COMPFIX = "true";
};
- services.udev.extraRules = ''
- #SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", MODE="0664", GROUP="users"
- # SDP protocol
- KERNEL=="hidraw*", ATTRS{idVendor}=="1fc9", MODE="0666"
- ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="1fc9", MODE="0666"
- ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="0d28", MODE="0666"
- # Flashloader
- KERNEL=="hidraw*", ATTRS{idVendor}=="15a2", MODE="0666"
- # Controller
- KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="18d1", MODE="0666"
- SUBSYSTEMS=="usb", ATTRS{idVendor}=="18d1", ATTRS{idProduct}=="9400", MODE="0660", TAG+="uaccess"
- '';
+ hardware.google-stadia-controller.enable = true;
networking = {
hostName = "Rory-desktop";
@@ -179,12 +169,12 @@ args@{
unrar-wrapper
#(schildichat-desktop.override { electron = electron; })
- (callPackage ../../modules/packages/nheko-git.nix {
+ (callPackage ../../packages/nheko-git.nix {
inherit nhekoSrc;
inherit mtxclientSrc;
voipSupport = false;
})
- #(callPackage ../../modules/packages/mc/server/modpack/curseforge/techopolis-2/5.4.nix { })
+ #(callPackage ../../packages/mc/server/modpack/curseforge/techopolis-2/5.4.nix { })
#vesktop
virt-viewer
@@ -221,7 +211,7 @@ args@{
extraPortals = with pkgs; [
#xdg-desktop-portal-gtk
xdg-desktop-portal-xapp
- # (callPackage ../../modules/packages/xdg-desktop-portal-gtk.nix { })
+ # (callPackage ../../packages/xdg-desktop-portal-gtk.nix { })
];
config = {
common = {
diff --git a/host/Rory-desktop/nginx.nix b/host/Rory-desktop/nginx.nix
index dfb1d03..98ef48b 100644
--- a/host/Rory-desktop/nginx.nix
+++ b/host/Rory-desktop/nginx.nix
@@ -16,7 +16,7 @@
# recommendedGzipSettings = true;
recommendedBrotliSettings = true;
recommendedOptimisation = true;
- #defaultMimeTypes = ../../../../modules/packages/nginx/mime.types;
+ #defaultMimeTypes = ../../../../packages/nginx/mime.types;
appendConfig = ''
worker_processes 16;
'';
diff --git a/host/Rory-nginx/services/nginx/nginx.nix b/host/Rory-nginx/services/nginx/nginx.nix
index bd6e62d..2bc8d44 100755
--- a/host/Rory-nginx/services/nginx/nginx.nix
+++ b/host/Rory-nginx/services/nginx/nginx.nix
@@ -22,7 +22,7 @@ in
#recommendedGzipSettings = true;
recommendedBrotliSettings = true;
recommendedOptimisation = true;
- defaultMimeTypes = ../../../../modules/packages/nginx/mime.types;
+ defaultMimeTypes = ../../../../packages/nginx/mime.types;
appendConfig = ''
worker_processes 16;
'';
diff --git a/host/Rory-portable/configuration.nix b/host/Rory-portable/configuration.nix
index 759379f..936055a 100644
--- a/host/Rory-portable/configuration.nix
+++ b/host/Rory-portable/configuration.nix
@@ -9,7 +9,7 @@
{
imports = [
../../modules/base-client.nix
- ../../modules/packages/vim.nix
+ ../../packages/vim.nix
./optional/gui/wayland.nix
];
@@ -27,19 +27,6 @@
#readOnlyNixStore = false;
};
- services.udev.extraRules = ''
- #SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", MODE="0664", GROUP="users"
- # SDP protocol
- KERNEL=="hidraw*", ATTRS{idVendor}=="1fc9", MODE="0666"
- ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="1fc9", MODE="0666"
- ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="0d28", MODE="0666"
- # Flashloader
- KERNEL=="hidraw*", ATTRS{idVendor}=="15a2", MODE="0666"
- # Controller
- KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="18d1", MODE="0666"
- SUBSYSTEMS=="usb", ATTRS{idVendor}=="18d1", ATTRS{idProduct}=="9400", MODE="0660", TAG+="uaccess"
- '';
-
#systemd.services.NetworkManager-wait-online.enable = false;
networking = {
@@ -52,7 +39,7 @@
# allowedUDPPorts = [ ... ];
};
- #interfaces.enp34s0.ipv4.addresses = [ {
+ #interfaces.enp34s0.ipv4.addresses = [ {
# address = "192.168.0.3";
# prefixLength = 24;
#} ];
@@ -123,7 +110,7 @@
# - Languages
#dotnet-sdk_7
#dotnet-sdk_8
- #(callPackage ../../modules/packages/dotnet-pack.nix { inherit pkgs; })
+ #(callPackage ../../packages/dotnet-pack.nix { inherit pkgs; })
#games
#osu-lazer-bin
@@ -141,12 +128,12 @@
unrar-wrapper
#(schildichat-desktop.override { electron = electron; })
- (callPackage ../../modules/packages/nheko-git.nix {
+ (callPackage ../../packages/nheko-git.nix {
inherit nhekoSrc;
inherit mtxclientSrc;
voipSupport = false;
})
- #(callPackage ../../modules/packages/mc/server/modpack/curseforge/techopolis-2/5.4.nix { })
+ #(callPackage ../../packages/mc/server/modpack/curseforge/techopolis-2/5.4.nix { })
#vesktop
virt-viewer
@@ -169,7 +156,7 @@
extraPortals = with pkgs; [
#xdg-desktop-portal-gtk
xdg-desktop-portal-xapp
-# (callPackage ../../modules/packages/xdg-desktop-portal-gtk.nix { })
+ # (callPackage ../../packages/xdg-desktop-portal-gtk.nix { })
];
config = {
common = {
diff --git a/host/Rory-wsl/configuration.nix b/host/Rory-wsl/configuration.nix
index b155058..5d170ef 100644
--- a/host/Rory-wsl/configuration.nix
+++ b/host/Rory-wsl/configuration.nix
@@ -54,7 +54,7 @@
# - Languages
#dotnet-sdk_7
#dotnet-sdk_8
- # (callPackage ../../modules/packages/dotnet-pack.nix { inherit pkgs; })
+ # (callPackage ../../packages/dotnet-pack.nix { inherit pkgs; })
# temurin-bin
# obsidian
@@ -64,7 +64,7 @@
unrar-wrapper
#(schildichat-desktop.override { electron = electron; })
- (callPackage ../../modules/packages/nheko-git.nix {
+ (callPackage ../../packages/nheko-git.nix {
inherit nhekoSrc;
inherit mtxclientSrc;
})
diff --git a/host/RoryNix/configuration.nix b/host/RoryNix/configuration.nix
index 5876d2f..4482849 100644
--- a/host/RoryNix/configuration.nix
+++ b/host/RoryNix/configuration.nix
@@ -8,9 +8,9 @@
{
imports = [
# ./hardware-configuration.nix
- ../../modules/packages/vim.nix
+ ../../packages/vim.nix
../../modules/environments/home.nix
- # ../../modules/packages/overlays/haskell/basement/IntWord64.nix
+ # ../../packages/overlays/haskell/basement/IntWord64.nix
];
boot = {
diff --git a/modules/base.nix b/modules/base.nix
index b56f33e..15bfd08 100755
--- a/modules/base.nix
+++ b/modules/base.nix
@@ -7,12 +7,12 @@
{
imports = [
- ./packages/vim.nix
+ ../packages/vim.nix
./users/Rory.nix
./extra-substituters.nix
./monitoring/module.nix
- ./packages/overlays/openvpn.nix # Temporary: Fix a build failure
+# ../packages/overlays/openvpn.nix # Temporary: Fix a build failure
];
boot = {
diff --git a/modules/hardware/google-stadia-controller.nix b/modules/hardware/google-stadia-controller.nix
new file mode 100644
index 0000000..7b59e13
--- /dev/null
+++ b/modules/hardware/google-stadia-controller.nix
@@ -0,0 +1,24 @@
+{
+ lib,
+ config,
+ ...
+}:
+{
+ options.hardware.google-stadia-controller = {
+ enable = lib.mkEnableOption "Enable Google Stadia Controller support";
+ };
+ config = lib.mkIf config.hardware.google-stadia-controller.enable {
+ services.udev.extraRules = ''
+ #SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", MODE="0664", GROUP="users"
+ # SDP protocol
+ KERNEL=="hidraw*", ATTRS{idVendor}=="1fc9", MODE="0666"
+ ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="1fc9", MODE="0666"
+ ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="0d28", MODE="0666"
+ # Flashloader
+ KERNEL=="hidraw*", ATTRS{idVendor}=="15a2", MODE="0666"
+ # Controller
+ KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="18d1", MODE="0666"
+ SUBSYSTEMS=="usb", ATTRS{idVendor}=="18d1", ATTRS{idProduct}=="9400", MODE="0660", TAG+="uaccess"
+ '';
+ };
+}
diff --git a/modules/users/Rory.nix b/modules/users/Rory.nix
index dd8b2d1..98696fe 100755
--- a/modules/users/Rory.nix
+++ b/modules/users/Rory.nix
@@ -42,6 +42,14 @@
programs.zsh.enable = true;
environment.shells = with pkgs; [ zsh ];
+ virtualisation.vmVariant = {
+ users = {
+ mutableUsers = false;
+ users.Rory.password = "password";
+ };
+ networking.interfaces.enp34s0 = lib.mkForce { };
+ };
+
home-manager.users.Rory = {
home.preferXdgDirectories = true;
home.sessionVariables = {
diff --git a/modules/packages/dotnet-pack.nix b/packages/dotnet-pack.nix
index 0e4a9b4..0e4a9b4 100644
--- a/modules/packages/dotnet-pack.nix
+++ b/packages/dotnet-pack.nix
diff --git a/modules/packages/gitfs.nix b/packages/gitfs.nix
index 728e836..728e836 100755
--- a/modules/packages/gitfs.nix
+++ b/packages/gitfs.nix
diff --git a/modules/packages/mtxclient-git.nix b/packages/mtxclient-git.nix
index 2392312..2392312 100644
--- a/modules/packages/mtxclient-git.nix
+++ b/packages/mtxclient-git.nix
diff --git a/modules/packages/nbtexplorer.nix b/packages/nbtexplorer.nix
index abe495d..abe495d 100644
--- a/modules/packages/nbtexplorer.nix
+++ b/packages/nbtexplorer.nix
diff --git a/modules/packages/nginx/mime.types b/packages/nginx/mime.types
index 3ac8468..3ac8468 100644
--- a/modules/packages/nginx/mime.types
+++ b/packages/nginx/mime.types
diff --git a/modules/packages/nheko-git.nix b/packages/nheko-git.nix
index c392d2f..c392d2f 100644
--- a/modules/packages/nheko-git.nix
+++ b/packages/nheko-git.nix
diff --git a/modules/packages/overlays/haskell/basement/IntWord64.nix b/packages/overlays/haskell/basement/IntWord64.nix
index d407bf0..d407bf0 100644
--- a/modules/packages/overlays/haskell/basement/IntWord64.nix
+++ b/packages/overlays/haskell/basement/IntWord64.nix
diff --git a/modules/packages/overlays/haskell/basement/IntWord64.patch b/packages/overlays/haskell/basement/IntWord64.patch
index 0d1cdf7..0d1cdf7 100644
--- a/modules/packages/overlays/haskell/basement/IntWord64.patch
+++ b/packages/overlays/haskell/basement/IntWord64.patch
diff --git a/modules/packages/overlays/openvpn-iomanip.patch b/packages/overlays/openvpn-iomanip.patch
index f334a34..f334a34 100644
--- a/modules/packages/overlays/openvpn-iomanip.patch
+++ b/packages/overlays/openvpn-iomanip.patch
diff --git a/modules/packages/overlays/openvpn.nix b/packages/overlays/openvpn.nix
index f927f80..f927f80 100644
--- a/modules/packages/overlays/openvpn.nix
+++ b/packages/overlays/openvpn.nix
diff --git a/modules/packages/redpanda-connect/module.nix b/packages/redpanda-connect/module.nix
index f803c14..f803c14 100644
--- a/modules/packages/redpanda-connect/module.nix
+++ b/packages/redpanda-connect/module.nix
diff --git a/modules/packages/redpanda-connect/package.nix b/packages/redpanda-connect/package.nix
index 2f9a6d9..2f9a6d9 100644
--- a/modules/packages/redpanda-connect/package.nix
+++ b/packages/redpanda-connect/package.nix
diff --git a/modules/packages/vim.nix b/packages/vim.nix
index 1b7bb37..1b7bb37 100755
--- a/modules/packages/vim.nix
+++ b/packages/vim.nix
diff --git a/modules/packages/xdg-desktop-portal-gtk.nix b/packages/xdg-desktop-portal-gtk.nix
index c849b17..c849b17 100644
--- a/modules/packages/xdg-desktop-portal-gtk.nix
+++ b/packages/xdg-desktop-portal-gtk.nix
|
