diff options
| -rw-r--r-- | home/nipsy/arrakis/mutt/muttrc | 2 | ||||
| -rw-r--r-- | hosts/arrakis/default.nix | 1 | ||||
| -rw-r--r-- | hosts/caladan/default.nix | 6 | ||||
| -rw-r--r-- | hosts/common/users/nipsy/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/wayback-x11/default.nix | 64 |
6 files changed, 73 insertions, 2 deletions
diff --git a/home/nipsy/arrakis/mutt/muttrc b/home/nipsy/arrakis/mutt/muttrc index 1293092..eec5b99 100644 --- a/home/nipsy/arrakis/mutt/muttrc +++ b/home/nipsy/arrakis/mutt/muttrc @@ -53,7 +53,7 @@ set confirmcreate=no # prompt when creating new files set copy=yes # always save a copy of outgoing messages set delete=yes # purge deleted messages without asking set edit_headers # let me edit the message header when composing -set editor="vim -c 'set textwidth=65' -c 'set noautoindent' -c 'set formatoptions+=a'" # editor to use when composing messages +set editor="vim -c 'set textwidth=65' -c 'set noautoindent'" # editor to use when composing messages #set editor="/usr/bin/nvi" # editor to use when composing messages #set editor="/usr/bin/vi" # editor to use when composing messages set fast_reply # skip initial prompts when replying diff --git a/hosts/arrakis/default.nix b/hosts/arrakis/default.nix index d4d6c7a..ab40fd3 100644 --- a/hosts/arrakis/default.nix +++ b/hosts/arrakis/default.nix @@ -85,6 +85,7 @@ pkgs.extremetuxracer #pkgs.frozen-bubble pkgs.hedgewars + pkgs.igir pkgs.kobodeluxe pkgs.lidarr pkgs.mailutils diff --git a/hosts/caladan/default.nix b/hosts/caladan/default.nix index a58c29a..a2ae6bb 100644 --- a/hosts/caladan/default.nix +++ b/hosts/caladan/default.nix @@ -1,7 +1,10 @@ { config, inputs, outputs, pkgs, ... }: { boot = { initrd.kernelModules = [ "amdgpu" "zfs" ]; - kernel.sysctl."kernel.hostname" = "caladan.bitgnome.net"; + kernel.sysctl = { + "kernel.hostname" = "caladan.bitgnome.net"; + "kernel.split_lock_mitigate" = 0; # https://lwn.net/Articles/911219/ + }; kernelPackages = pkgs.master.linuxPackages_6_15; #kernelParams = [ # "amdgpu.ppfeaturemask=0xfffd3fff" @@ -50,6 +53,7 @@ pkgs.vial pkgs.vice pkgs.warzone2100 + pkgs.wayback-x11 #pkgs.wine9_22.wineWowPackages.stagingFull pkgs.wpa_supplicant pkgs.xonotic-sdl diff --git a/hosts/common/users/nipsy/default.nix b/hosts/common/users/nipsy/default.nix index 9d5bfe6..28bf79c 100644 --- a/hosts/common/users/nipsy/default.nix +++ b/hosts/common/users/nipsy/default.nix @@ -13,6 +13,7 @@ in "wheel" ] ++ ifTheyExist [ "adbusers" + "gamemode" "networkmanager" "vboxsf" "vboxusers" diff --git a/pkgs/default.nix b/pkgs/default.nix index 7d110eb..5c72764 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -2,4 +2,5 @@ pkgs: { gearmulator = pkgs.callPackage ./gearmulator { }; igir = pkgs.callPackage ./igir { }; sdrconnect = pkgs.callPackage ./sdrconnect { }; + wayback-x11 = pkgs.callPackage ./wayback-x11 { }; } diff --git a/pkgs/wayback-x11/default.nix b/pkgs/wayback-x11/default.nix new file mode 100644 index 0000000..e1b9c02 --- /dev/null +++ b/pkgs/wayback-x11/default.nix @@ -0,0 +1,64 @@ +{ + fetchFromGitLab, + lib, + libxkbcommon, + meson, + ninja, + pixman, + pkg-config, + scdoc, + stdenv, + unstableGitUpdater, + wayland, + wayland-protocols, + wayland-scanner, + wlroots_0_19, + xwayland, +}: + +stdenv.mkDerivation { + pname = "wayback"; + version = "0.1"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "wayback"; + repo = "wayback"; + rev = "156d7a86d112cd1bd70c2f75cb190fdd98565080"; + hash = "sha256-A4Ur32QZc0foS+O+jfQCug0k32nvYkB2MoacDT4W7dQ="; + }; + + strictDeps = true; + + depsBuildBuild = [ + pkg-config + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + scdoc + wayland-scanner + ]; + + buildInputs = [ + libxkbcommon + pixman + wayland + wayland-protocols + wlroots_0_19 + xwayland + ]; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + description = "X11 compatibility layer leveraging wlroots and Xwayland"; + homepage = "https://wayback.freedesktop.org"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + mainProgram = "wayback-session"; + maintainers = with lib.maintainers; [ dramforever ]; + }; +} |