diff --git a/nix/home-manager/app/games/games.nix b/nix/home-manager/app/games/games.nix new file mode 100644 index 00000000..65433d6b --- /dev/null +++ b/nix/home-manager/app/games/games.nix @@ -0,0 +1,9 @@ +{ pkgs, ... }: { + home.packages = with pkgs; [ + (wineWowPackages.full.override { + wineRelease = "staging"; + mingwSupport = true; + }) + winetricks + ]; +} \ No newline at end of file diff --git a/nix/home-manager/app/vscode/vscode.nix b/nix/home-manager/app/vscode/vscode.nix index 349f8b7a..1c287b42 100644 --- a/nix/home-manager/app/vscode/vscode.nix +++ b/nix/home-manager/app/vscode/vscode.nix @@ -20,6 +20,7 @@ "git.confirmSync" = false; "editor.fontFamily" = lib.mkForce "'Symbols Nerd Font Mono', 'PowerlineSymbols', 'DejaVu Sans Mono'"; "git.enableSmartCommit" = true; + "security.workspace.trust.untrustedFiles" = "open"; }; userTasks = { version = "2.0.0"; diff --git a/nix/home-manager/users/joey.nix b/nix/home-manager/users/joey.nix index 00165ffd..834d98a7 100644 --- a/nix/home-manager/users/joey.nix +++ b/nix/home-manager/users/joey.nix @@ -9,6 +9,7 @@ ../app/browser/zen.nix ../app/flatpak/flatpak.nix ../app/git/git.nix + ../app/games/games.nix ../app/media/media.nix ../app/messaging/discord.nix ../app/obs-studio/obs-studio.nix diff --git a/nix/home-manager/wm/hyprland/hyprland.nix b/nix/home-manager/wm/hyprland/hyprland.nix index 8d781290..34eaad5e 100644 --- a/nix/home-manager/wm/hyprland/hyprland.nix +++ b/nix/home-manager/wm/hyprland/hyprland.nix @@ -7,12 +7,14 @@ monitor = ",1920x1080@60,0x0,1"; # Declare default applications "$terminal" = "kitty"; + "$terminalFloating" = "kitty --class floating --override remember_window_size=false --override initial_window_height=720 --override initial_window_width=1280"; "$fileManager" = "dolphin"; "$browser" = "flatpak run io.github.zen_browser.zen"; "$bar" = "killall .waybar-wrapped; waybar"; #"$bar" = "killall .waybar-wrapped; waybar --style ~/.config/waybar/waybar.css"; "$menu" = "wofi --show drun"; "$notifd" = "mako"; "$wallpaperd" = "swww-daemon"; + "$network" = "nm-applet --indicator"; "$screenshot" = "grimblast copy area"; # Scripted actions @@ -24,6 +26,7 @@ "$bar" "$notifd" "$wallpaperd" + "$network" ]; env = [ @@ -102,7 +105,7 @@ "$mainMod" = "SUPER"; bind = [ - "$mainMod, T, exec, $terminal" + "$mainMod, T, exec, $terminalFloating" "$mainMod, Q, killactive," "$mainMod, M, exit," "$mainMod, E, exec, $fileManager" @@ -126,7 +129,11 @@ "$mainMod CTRL, B, exec, $bar" ]; - windowrulev2 = "suppressevent maximize, class:.*"; + windowrulev2 = [ + "suppressevent maximize, class:.*" + "float, class:floating" + "float, title:Network Connections" + ]; }; }; } diff --git a/nix/home-manager/wm/hyprland/waybar.nix b/nix/home-manager/wm/hyprland/waybar.nix index c28d2f14..df183c3c 100644 --- a/nix/home-manager/wm/hyprland/waybar.nix +++ b/nix/home-manager/wm/hyprland/waybar.nix @@ -104,6 +104,8 @@ format-linked = ''{ifname} (No IP)  ''; format-disconnected = ''Disconnected ⚠ ''; format-alt = ''{ifname}: {ipaddr}/{cidr}''; + on-click = "kitty --class floating --override initial_window_width=400 --override initial_window_height=400 --override remember_window_size=false nmtui"; + on-click-right = "nm-connection-editor"; }; pulseaudio = { format = ''{volume}% {icon} {format_source}''; diff --git a/nix/nixos/steam.nix b/nix/nixos/steam.nix index 77947970..1d65ca07 100644 --- a/nix/nixos/steam.nix +++ b/nix/nixos/steam.nix @@ -4,5 +4,13 @@ nixpkgs.config.allowUnfree = true; hardware.opengl.driSupport32Bit = true; programs.steam.enable = true; - environment.systemPackages = [ pkgs.steam pkgs.bottles-unwrapped ]; + + programs.nix-ld = { + enable = true; + }; + environment.systemPackages = with pkgs; [ + steam + steam-run + lutris-unwrapped + ]; } diff --git a/nix/nixos/system.nix b/nix/nixos/system.nix index 7185a47e..3bad9694 100644 --- a/nix/nixos/system.nix +++ b/nix/nixos/system.nix @@ -3,6 +3,7 @@ # Configure system packages environment.systemPackages = with pkgs; [ git + networkmanagerapplet ]; # Configure mouse and touchpad