summaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/desktop/awesome/rc.lua2
-rw-r--r--modules/desktop/awesome/theme.lua50
-rw-r--r--modules/desktop/default.nix1
-rw-r--r--modules/desktop/hyprland/default.nix36
-rw-r--r--modules/desktop/rofi.nix7
-rw-r--r--modules/games/games.nix7
-rw-r--r--modules/programs/programs.nix10
7 files changed, 85 insertions, 28 deletions
diff --git a/modules/desktop/awesome/rc.lua b/modules/desktop/awesome/rc.lua
index 41728fa..99abc89 100644
--- a/modules/desktop/awesome/rc.lua
+++ b/modules/desktop/awesome/rc.lua
@@ -94,7 +94,7 @@ awful.layout.layouts = {
-- awful.layout.suit.spiral,
-- awful.layout.suit.spiral.dwindle,
awful.layout.suit.max,
- -- awful.layout.suit.max.fullscreen,
+ awful.layout.suit.max.fullscreen,
-- awful.layout.suit.magnifier,
-- awful.layout.suit.corner.nw,
-- awful.layout.suit.corner.ne,
diff --git a/modules/desktop/awesome/theme.lua b/modules/desktop/awesome/theme.lua
index 18be5db..401eebb 100644
--- a/modules/desktop/awesome/theme.lua
+++ b/modules/desktop/awesome/theme.lua
@@ -77,31 +77,31 @@ theme.menu_width = dpi(100)
-- Define the image to load
--- theme.titlebar_close_button_normal = themes_path.."zenburn/titlebar/close_normal.png"
--- theme.titlebar_close_button_focus = themes_path.."zenburn/titlebar/close_focus.png"
-
--- theme.titlebar_minimize_button_normal = themes_path.."zenburn/titlebar/minimize_normal.png"
--- theme.titlebar_minimize_button_focus = themes_path.."zenburn/titlebar/minimize_focus.png"
-
--- theme.titlebar_ontop_button_normal_inactive = themes_path.."zenburn/titlebar/ontop_normal_inactive.png"
--- theme.titlebar_ontop_button_focus_inactive = themes_path.."zenburn/titlebar/ontop_focus_inactive.png"
--- theme.titlebar_ontop_button_normal_active = themes_path.."zenburn/titlebar/ontop_normal_active.png"
--- theme.titlebar_ontop_button_focus_active = themes_path.."zenburn/titlebar/ontop_focus_active.png"
-
--- theme.titlebar_sticky_button_normal_inactive = themes_path.."zenburn/titlebar/sticky_normal_inactive.png"
--- theme.titlebar_sticky_button_focus_inactive = themes_path.."zenburn/titlebar/sticky_focus_inactive.png"
--- theme.titlebar_sticky_button_normal_active = themes_path.."zenburn/titlebar/sticky_normal_active.png"
--- theme.titlebar_sticky_button_focus_active = themes_path.."zenburn/titlebar/sticky_focus_active.png"
-
--- theme.titlebar_floating_button_normal_inactive = themes_path.."zenburn/titlebar/floating_normal_inactive.png"
--- theme.titlebar_floating_button_focus_inactive = themes_path.."zenburn/titlebar/floating_focus_inactive.png"
--- theme.titlebar_floating_button_normal_active = themes_path.."zenburn/titlebar/floating_normal_active.png"
--- theme.titlebar_floating_button_focus_active = themes_path.."zenburn/titlebar/floating_focus_active.png"
-
--- theme.titlebar_maximized_button_normal_inactive = themes_path.."zenburn/titlebar/maximized_normal_inactive.png"
--- theme.titlebar_maximized_button_focus_inactive = themes_path.."zenburn/titlebar/maximized_focus_inactive.png"
--- theme.titlebar_maximized_button_normal_active = themes_path.."zenburn/titlebar/maximized_normal_active.png"
--- theme.titlebar_maximized_button_focus_active = themes_path.."zenburn/titlebar/maximized_focus_active.png"
+theme.titlebar_close_button_normal = themes_path.."zenburn/titlebar/close_normal.png"
+theme.titlebar_close_button_focus = themes_path.."zenburn/titlebar/close_focus.png"
+
+theme.titlebar_minimize_button_normal = themes_path.."zenburn/titlebar/minimize_normal.png"
+theme.titlebar_minimize_button_focus = themes_path.."zenburn/titlebar/minimize_focus.png"
+
+theme.titlebar_ontop_button_normal_inactive = themes_path.."zenburn/titlebar/ontop_normal_inactive.png"
+theme.titlebar_ontop_button_focus_inactive = themes_path.."zenburn/titlebar/ontop_focus_inactive.png"
+theme.titlebar_ontop_button_normal_active = themes_path.."zenburn/titlebar/ontop_normal_active.png"
+theme.titlebar_ontop_button_focus_active = themes_path.."zenburn/titlebar/ontop_focus_active.png"
+
+theme.titlebar_sticky_button_normal_inactive = themes_path.."zenburn/titlebar/sticky_normal_inactive.png"
+theme.titlebar_sticky_button_focus_inactive = themes_path.."zenburn/titlebar/sticky_focus_inactive.png"
+theme.titlebar_sticky_button_normal_active = themes_path.."zenburn/titlebar/sticky_normal_active.png"
+theme.titlebar_sticky_button_focus_active = themes_path.."zenburn/titlebar/sticky_focus_active.png"
+
+theme.titlebar_floating_button_normal_inactive = themes_path.."zenburn/titlebar/floating_normal_inactive.png"
+theme.titlebar_floating_button_focus_inactive = themes_path.."zenburn/titlebar/floating_focus_inactive.png"
+theme.titlebar_floating_button_normal_active = themes_path.."zenburn/titlebar/floating_normal_active.png"
+theme.titlebar_floating_button_focus_active = themes_path.."zenburn/titlebar/floating_focus_active.png"
+
+theme.titlebar_maximized_button_normal_inactive = themes_path.."zenburn/titlebar/maximized_normal_inactive.png"
+theme.titlebar_maximized_button_focus_inactive = themes_path.."zenburn/titlebar/maximized_focus_inactive.png"
+theme.titlebar_maximized_button_normal_active = themes_path.."zenburn/titlebar/maximized_normal_active.png"
+theme.titlebar_maximized_button_focus_active = themes_path.."zenburn/titlebar/maximized_focus_active.png"
theme.wallpaper = themes_path.."zenburn/zenburn-background.png"
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index 18f184e..546d7de 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -1,6 +1,7 @@
[
./xserver
./awesome
+ ./hyprland
./picom.nix
./rofi.nix
]
diff --git a/modules/desktop/hyprland/default.nix b/modules/desktop/hyprland/default.nix
new file mode 100644
index 0000000..2acf5b6
--- /dev/null
+++ b/modules/desktop/hyprland/default.nix
@@ -0,0 +1,36 @@
+{ config, lib, pkgs, user, ... }:
+with lib;
+let
+in
+{
+ options = {
+ hyprland = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ };
+ };
+ };
+
+ config = mkIf (config.hyprland.enable)
+ {
+ environment.variables.WLR_NO_HARDWARE_CURSORS = "1";
+ environment.systemPackages = with pkgs; [
+ wayland
+ glib
+ wl-clipboard
+ wdisplays
+ hyprpaper
+ ];
+
+ programs.hyprland = {
+ enable = true;
+ xwayland.enable = true;
+ enableNvidiaPatches = true;
+ };
+
+ programs.waybar = {
+ enable = true;
+ };
+ };
+}
diff --git a/modules/desktop/rofi.nix b/modules/desktop/rofi.nix
index d5aba06..85726b8 100644
--- a/modules/desktop/rofi.nix
+++ b/modules/desktop/rofi.nix
@@ -11,7 +11,12 @@ with lib;
};
config.home-manager.users.${user} = mkIf (config.rofi.enable) {
- programs.rofi = {
+
+ programs.rofi = mkIf (config.xserver.enable) {
+ enable = true;
+ };
+
+ programs.wofi = mkIf (config.hyprland.enable) {
enable = true;
};
};
diff --git a/modules/games/games.nix b/modules/games/games.nix
index 509b105..b345aac 100644
--- a/modules/games/games.nix
+++ b/modules/games/games.nix
@@ -12,12 +12,17 @@ with lib;
config = mkIf (config.games.enable) {
environment.systemPackages = with pkgs; [
+ steam
steam-run
+ wineWowPackages.staging
+ winetricks
+ protontricks
+ dotnet-sdk_7
];
home-manager.users.${user}.home.packages = with pkgs; [
minetest
- vintagestory
+ prismlauncher
];
};
}
diff --git a/modules/programs/programs.nix b/modules/programs/programs.nix
index 2ef9ec9..ccc9019 100644
--- a/modules/programs/programs.nix
+++ b/modules/programs/programs.nix
@@ -3,11 +3,20 @@ with lib;
{
config = mkIf (config.xserver.enable)
{
+ services.flatpak.enable = true;
+ xdg.portal = {
+ enable = true;
+ wlr.enable = true;
+ };
+
home-manager.users.${user} = {
home.packages = with pkgs; [
libreoffice
hunspell
hunspellDicts.en_US
+
+ flatpak
+ gnome.gnome-software
(pass.withExtensions (exts: [exts.pass-otp ]))
thefuck
@@ -22,6 +31,7 @@ with lib;
enable = true;
package = pkgs.vscode.fhs;
};
+
};
};
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-30 10:27:14 +0000