diff options
Diffstat (limited to 'hosts/sofue')
| -rw-r--r-- | hosts/sofue/configuration.nix | 53 | ||||
| -rw-r--r-- | hosts/sofue/programs.nix | 9 |
2 files changed, 35 insertions, 27 deletions
diff --git a/hosts/sofue/configuration.nix b/hosts/sofue/configuration.nix index c85e81a..f3f908e 100644 --- a/hosts/sofue/configuration.nix +++ b/hosts/sofue/configuration.nix @@ -11,8 +11,8 @@ in rec { ../../nix/user.nix ../../nix/bluetooth.nix ../../nix/email.nix - #../../nix/amdgpu.nix - ../../nix/intel.nix + ../../nix/amdgpu.nix + #../../nix/intel.nix ../../nix/gaming.nix ../../nix/steam.nix ../../nix/virtualisation.nix @@ -30,41 +30,45 @@ in rec { local = rec { font = { - name = "Iosevka Comfy"; - size = 15; - baseline = 0; + name = "Comic Code"; + size = 13; + baseline = -2; + cell-height-offset = 1; }; ui-font = { - name = "M+ 2p"; + name = "Livvic"; size = 11; baseline = 0; + cell-height-offset = 0; }; emoji-font = { name = "Blobmoji"; size = ui-font.size; baseline = 0; + cell-height-offset = 0; }; - scheme = import ../../themes/spring_2025/spring_2025.nix; + scheme = import ../../themes/street_fighter_summer/street_fighter_summer.nix; starter = { top_padding = 2; - picture = ../../themes/spring_2025/splash2.png; - width = 49; + picture = ../../themes/street_fighter_summer/cammy_splash.png; + width = 60; padding = { - top = -2; - left = -8; - text = 0; + top = -9; + left = -9; + text = 5; }; position = "left"; + header = ""; footer = ""; footer-offset = 0; }; monitors = { - monitor1 = "DP-2"; - monitor2 = "HDMI-A-3"; - monitor3 = "DP-1"; - #monitor1 = "DP-1"; - #monitor2 = "DP-2"; - #monitor3 = "HDMI-A-1"; + #monitor1 = "DP-2"; + #monitor2 = "HDMI-A-3"; + #monitor3 = "DP-1"; + monitor1 = "DP-1"; + monitor2 = "DP-2"; + monitor3 = "HDMI-A-1"; }; }; @@ -128,6 +132,8 @@ in rec { options = disks.cdrom_options; }; + services.flatpak.enable = true; + environment.systemPackages = with pkgs; [ linuxPackages_latest.perf linuxPackages_latest.cpupower @@ -138,7 +144,7 @@ in rec { export PULSE_SERVER=unix:/home/andrew/.pulsewire-native-socket export PIPEWIRE_REMOTE=/tmp/pipewire-0-manager cd $HOME - exec ${kbd}/bin/openvt --switch --login --console 3 -f -- ${sway}/bin/sway + exec ${kbd}/bin/openvt --switch --login --console 3 -f -- ${swayfx}/bin/sway '') pipewire # Using server from host. pavucontrol @@ -182,7 +188,7 @@ in rec { max_render_time = "off"; adaptive_sync = "on"; render_bit_depth = "10"; - bg = "${../../themes/spring_2025/wallpaper1.png} fit"; + bg = "${../../themes/street_fighter_summer/wallpaper1.png} fit"; }; "${monitor2}" = { mode = "1920x1080@60.000Hz"; @@ -192,7 +198,7 @@ in rec { allow_tearing = "no"; max_render_time = "7"; render_bit_depth = "10"; - bg = "#${colo.background-alt} solid_color"; + bg = "${../../themes/street_fighter_summer/wallpaper_vert2.png} fit"; }; "${monitor3}" = { mode = "1920x1080@60.000Hz"; @@ -240,7 +246,10 @@ in rec { "${mod4}+r" = "exec swaymsg -- output ${monitor1} transform 90"; "${mod4}+Shift+r" = "exec swaymsg -- output ${monitor1} transform 0"; "${mod4}+F1" = "exec swaymsg -- output ${monitor1} bg \\#${colo.background-alt} solid_color"; - "${mod4}+F2" = "exec swaymsg -- output ${monitor1} bg ${../../themes/spring_2025/wallpaper1.png} fit"; + "${mod4}+F2" = "exec swaymsg -- output ${monitor1} bg ${../../themes/street_fighter_summer/wallpaper1.png} fit"; + "${mod4}+F3" = "exec swaymsg -- output ${monitor2} bg \\#${colo.background-alt} solid_color"; + "${mod4}+F4" = "exec swaymsg -- output ${monitor2} bg ${../../themes/street_fighter_summer/wallpaper_vert1.png} fit"; + "${mod4}+F5" = "exec swaymsg -- output ${monitor2} bg ${../../themes/street_fighter_summer/wallpaper_vert2.png} fit"; #"${mod4}+F1" = "exec printf '||' > $HOME/.config/taro/${monitor1}/selection"; #"${mod4}+F2" = "exec printf '||' > $HOME/.config/taro/${monitor1}/selection"; "Pause" = "exec $HOME/c/camu/scripts/cmv_add.sh PAUSE"; diff --git a/hosts/sofue/programs.nix b/hosts/sofue/programs.nix index 2bb12d8..d964fbf 100644 --- a/hosts/sofue/programs.nix +++ b/hosts/sofue/programs.nix @@ -1,8 +1,7 @@ { lib, pkgs, ... }: { environment.systemPackages = with pkgs; lib.lists.flatten [ - #dia + (asNeeded "dia" ["dia"]) (asNeeded "gftp" ["gftp"]) - (asNeeded "cdrtools" ["btcflash" "cdda2mp3" "cdda2ogg" "cdda2wav" "cdrecord" "devdump" "isodebug" "isodump" "isoinfo" "isovfy" "mkhybrid" "mkisofs" "readcd" "rscsi" "scgcheck" "scgskeleton"]) (asNeeded "audacity" ["audacity"]) (asNeeded "krita" ["krita"]) (asNeeded "olive-editor" ["olive-editor"]) @@ -20,9 +19,9 @@ (asNeeded "imv" ["imv"]) (asNeeded "mpv" ["mpv"]) (asNeeded "vlc" ["vlc"]) - camu - camu-devshell - mauri + #camu + #camu-devshell + #mauri ]; local.scripts.imports = [ "discord-wayland" |