From 6ea7577261f1cf30bd50cf923ef0d8f05937438b Mon Sep 17 00:00:00 2001 From: harry123 Date: Sun, 12 Jan 2025 09:12:36 +0100 Subject: [PATCH 1/4] added wine --- hosts/goober/features/software/default.nix | 1 + hosts/goober/features/software/wine.nix | 27 ++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 hosts/goober/features/software/wine.nix diff --git a/hosts/goober/features/software/default.nix b/hosts/goober/features/software/default.nix index 84fecea..7333f70 100644 --- a/hosts/goober/features/software/default.nix +++ b/hosts/goober/features/software/default.nix @@ -1,6 +1,7 @@ {config, ...}: { imports = [ + ./wine.nix ./neovim.nix ./flatpak.nix ./discord.nix diff --git a/hosts/goober/features/software/wine.nix b/hosts/goober/features/software/wine.nix new file mode 100644 index 0000000..4eeec14 --- /dev/null +++ b/hosts/goober/features/software/wine.nix @@ -0,0 +1,27 @@ +{config, pkgs, ...}: +{ + environment.systemPackages = with pkgs; [ + # ... + + # support both 32- and 64-bit applications + wineWowPackages.stable + + # support 32-bit only + wine + + # support 64-bit only + (wine.override { wineBuild = "wine64"; }) + + # support 64-bit only + wine64 + + # wine-staging (version with experimental features) + wineWowPackages.staging + + # winetricks (all versions) + winetricks + + # native wayland support (unstable) + wineWowPackages.waylandFull +]; +} From e04301b9ffdf82604a67bf6ca481b925b87a6027 Mon Sep 17 00:00:00 2001 From: harry123 Date: Sun, 19 Jan 2025 18:30:54 +0100 Subject: [PATCH 2/4] more customization --- home-manager/dotfiles/waybar/config.jsonc | 26 ++++++++++++++++++--- home-manager/dotfiles/waybar/style.css | 12 +++++++--- home-manager/home.nix | 11 +++++++++ hosts/goober/features/hardware/pipewire.nix | 1 + 4 files changed, 44 insertions(+), 6 deletions(-) diff --git a/home-manager/dotfiles/waybar/config.jsonc b/home-manager/dotfiles/waybar/config.jsonc index 29eddbe..0220674 100644 --- a/home-manager/dotfiles/waybar/config.jsonc +++ b/home-manager/dotfiles/waybar/config.jsonc @@ -1,13 +1,13 @@ { "layer": "top", "modules-left": ["sway/workspaces", "sway/mode"], - "modules-center": ["wireplumber", "mpris"], - "modules-right": ["cpu", "bluetooth", "network", "clock", "privacy"], + "modules-center": [ ], + "modules-right": ["mpris", "wireplumber","cpu", "bluetooth", "network", "clock", "privacy"], "clock": { "format-alt": "{:%a, %d. %b %H:%M}" }, "wireplumber": { - "format": " {volume}%", + "format": "{volume}% ", "format-muted": "", "max-volume": 120, "scroll-step": 0.2 @@ -33,6 +33,26 @@ "tooltip-icon-size": 24 } ] + }, + "cpu": { + "format": "{}%  " + }, + "network": { + "interface": "wlp3s0", + "format": "{ifname}", + "format-wifi": "{essid} ({signalStrength}%)  ", + "format-ethernet": "{ipaddr}/{cidr} 󰊗", + "format-disconnected": "", //An empty format will hide the module. + "tooltip-format": "{ifname} via {gwaddr} 󰊗", + "tooltip-format-wifi": "{essid} ({signalStrength}%)  ", + "tooltip-format-ethernet": "{ifname}  ", + "tooltip-format-disconnected": "Disconnected", + "max-length": 50 + }, + "bluetooth": { + "format": "", + "format-disabled": "", + "format-connected": "" } } diff --git a/home-manager/dotfiles/waybar/style.css b/home-manager/dotfiles/waybar/style.css index 5bcb99b..c667dc8 100644 --- a/home-manager/dotfiles/waybar/style.css +++ b/home-manager/dotfiles/waybar/style.css @@ -2,11 +2,11 @@ font-family: "CodeNewRoman Nerd Font"; font-weight: bold; font-size: 12px; - color: #fff; + color: #000; } window#waybar { - background-color: #000; + background-color: #fff; } @@ -15,9 +15,15 @@ window#waybar { } #workspaces button.focused { - background-color: #7b002c; + border-bottom: solid 2px #7b002c; + border-radius: 0; } #workspaces { padding: 4px 0; } + +window#waybar { + min-height: 14px; /* set waybar's height to 18px */ + font-size: 14px; /* set only the font size to be bigger, which in turn will adjust the height of other elements */ +} diff --git a/home-manager/home.nix b/home-manager/home.nix index f18d650..b0a7f0b 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -63,6 +63,17 @@ pkgs.gammastep pkgs.lazygit + pkgs.xfce.thunar + pkgs.gimp-with-plugins + pkgs.fzf + pkgs.why3 + pkgs.alt-ergo + pkgs.cvc4 + pkgs.z3 + pkgs.prismlauncher + + pkgs.audacious + pkgs.audacious-plugins # # You can also create simple shell scripts directly inside your # # configuration. For example, this adds a command 'my-hello' to your # # environment: diff --git a/hosts/goober/features/hardware/pipewire.nix b/hosts/goober/features/hardware/pipewire.nix index 08ba1e1..3c80aa4 100644 --- a/hosts/goober/features/hardware/pipewire.nix +++ b/hosts/goober/features/hardware/pipewire.nix @@ -4,6 +4,7 @@ services.pipewire.enable = false; hardware.pulseaudio.enable = true; hardware.pulseaudio.support32Bit = true; + services.pipewire.wireplumber.enable = true; environment.systemPackages = [ pkgs.pwvucontrol From b912d4c809a05322c999d8650ed918206f7ebdc4 Mon Sep 17 00:00:00 2001 From: harry123 Date: Sun, 19 Jan 2025 20:13:58 +0100 Subject: [PATCH 3/4] irc config --- hosts/sisyphe/features/services/irc-server.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/sisyphe/features/services/irc-server.nix b/hosts/sisyphe/features/services/irc-server.nix index cebf4ea..f69b01e 100644 --- a/hosts/sisyphe/features/services/irc-server.nix +++ b/hosts/sisyphe/features/services/irc-server.nix @@ -1,5 +1,7 @@ {config, pkgs, ...}: { + environment.systemPackages = with pkgs; [ ircdHybrid ]; + services.ircdHybrid = { enable = true; serverName = "irc.hypervirtual.world"; From 7cd9906bc1ec580f8a17d35438f109a97e74790a Mon Sep 17 00:00:00 2001 From: harry123 Date: Sun, 19 Jan 2025 20:14:03 +0100 Subject: [PATCH 4/4] added krita --- home-manager/home.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home-manager/home.nix b/home-manager/home.nix index b0a7f0b..0961f3e 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -74,6 +74,8 @@ pkgs.audacious pkgs.audacious-plugins + + pkgs.krita # # You can also create simple shell scripts directly inside your # # configuration. For example, this adds a command 'my-hello' to your # # environment: