diff --git a/flake.nix b/flake.nix
index afc16b4..ebe3bb9 100755
--- a/flake.nix
+++ b/flake.nix
@@ -334,6 +334,9 @@
specialArgs = {
inherit home-manager;
inherit nixpkgs-stable;
+
+ inherit hyprland;
+ inherit hy3;
};
};
diff --git a/host/Arc/configuration.nix b/host/Arc/configuration.nix
index 5ff36b2..9f9b549 100644
--- a/host/Arc/configuration.nix
+++ b/host/Arc/configuration.nix
@@ -11,11 +11,11 @@ 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/hardware-specific/nvidia.nix
#./optional/gui/x11.nix
./optional/gui/wayland.nix
@@ -43,19 +43,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;
@@ -79,7 +66,6 @@ args@{
enable = true;
updateDbusEnvironment = true;
xkb.layout = "us";
- wacom.enable = true;
};
libinput.enable = true;
@@ -105,30 +91,30 @@ args@{
services.xserver.desktopManager.gnome.enable = false;
environment.systemPackages = with pkgs; [
eog
- mpv
- libreoffice
+ #mpv
+ #libreoffice
qt6.qtwayland
- easyeffects
+ #easyeffects
kitty
- youtube-music
+ #youtube-music
dbeaver-bin
vscode
# - Utilities
- inkscape-with-extensions
- gimp
+ #inkscape-with-extensions
+ #gimp
# - Languages
#dotnet-sdk_8
dotnetCorePackages.sdk_9_0
#games
- osu-lazer-bin
+ #osu-lazer-bin
#steam
steam-run
- steam-acf
+ #steam-acf
# extra packages
dmenu
@@ -136,24 +122,27 @@ 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
- prismlauncher
- vesktop
- mindustry
+ #mangohud
+ #prismlauncher
+ #vesktop
+ #mindustry
+
+ blueman
+ ft2-clone
];
programs.steam = {
- enable = true;
+ enable = false;
gamescopeSession.enable = true;
extraCompatPackages = with pkgs; [
steam-play-none
proton-ge-bin
];
};
- virtualisation.waydroid.enable = true;
+ virtualisation.waydroid.enable = false;
xdg = {
portal = {
@@ -222,7 +211,7 @@ args@{
programs.virt-manager.enable = true;
monitoring = {
- monitorAll = true;
+ monitorAll = false;
localPrometheus = true;
exposePrometheus = true;
localGrafana = true;
diff --git a/host/Arc/optional/gui/wayland.nix b/host/Arc/optional/gui/wayland.nix
index eac6391..281c72d 100644
--- a/host/Arc/optional/gui/wayland.nix
+++ b/host/Arc/optional/gui/wayland.nix
@@ -1,37 +1,63 @@
{
pkgs,
+ hyprland,
+ hy3,
...
}:
{
- programs.sway = {
+ #programs.sway = {
+ # enable = true;
+#
+ # wrapperFeatures.gtk = true;
+ # extraSessionCommands = ''
+ # # -- Wayland fixes
+ # # SDL:
+ # export SDL_VIDEODRIVER=wayland
+ # # QT (needs qt5.qtwayland in systemPackages):
+ # export QT_QPA_PLATFORM=wayland-egl
+ # export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
+ # # Fix for some Java AWT applications (e.g. Android Studio),
+ # # use this if they aren't displayed properly:
+ # export _JAVA_AWT_WM_NONREPARENTING=1
+ # '';
+#
+ # extraPackages = with pkgs; [
+ # swaybg
+ # #swayidle
+ # #swaylock
+ # waybar
+ # wl-clipboard
+ # grim
+ # slurp
+ # easyeffects
+ # keepassxc
+ # ];
+ #};
+
+ programs.hyprland = {
enable = true;
+ package = hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
+ };
- wrapperFeatures.gtk = true;
- extraSessionCommands = ''
- # -- Wayland fixes
- # SDL:
- export SDL_VIDEODRIVER=wayland
- # QT (needs qt5.qtwayland in systemPackages):
- export QT_QPA_PLATFORM=wayland-egl
- export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
- # Fix for some Java AWT applications (e.g. Android Studio),
- # use this if they aren't displayed properly:
- export _JAVA_AWT_WM_NONREPARENTING=1
- '';
+ programs.hyprlock.enable = true;
+ environment.systemPackages = with pkgs;[
+ wmenu
- extraPackages = with pkgs; [
- swaybg
- #swayidle
- #swaylock
- waybar
- wl-clipboard
- grim
- slurp
- easyeffects
- keepassxc
- ];
- };
+ waybar
+ wl-clipboard
+ grim
+ slurp
+ #easyeffects
+ keepassxc
+ networkmanagerapplet
+ ];
+
+ #environment.etc."hyprPlugins" = {
+ # text = ''
+ # plugin = ${hy3.packages.${pkgs.stdenv.hostPlatform.system}.hy3}/lib/libhy3.so
+ # '';
+ #};
xdg.portal.wlr.enable = true;
}
|
