Merge remote-tracking branch 'refs/remotes/origin/main'

This commit is contained in:
Joey Hafner 2024-10-21 15:17:56 -07:00
commit 63167a9487
No known key found for this signature in database
7 changed files with 32 additions and 3 deletions

View File

@ -0,0 +1,9 @@
{ pkgs, ... }: {
home.packages = with pkgs; [
(wineWowPackages.full.override {
wineRelease = "staging";
mingwSupport = true;
})
winetricks
];
}

View File

@ -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";

View File

@ -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

View File

@ -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"
];
};
};
}

View File

@ -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}'';

View File

@ -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
];
}

View File

@ -3,6 +3,7 @@
# Configure system packages
environment.systemPackages = with pkgs; [
git
networkmanagerapplet
];
# Configure mouse and touchpad