diff --git a/patches/nixpkgs-354095.patch b/patches/nixpkgs-354095.patch deleted file mode 100644 index 3d019063..00000000 --- a/patches/nixpkgs-354095.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 13af81da96c4b706e3262f1424d1d26b3db315d1 Mon Sep 17 00:00:00 2001 -From: Andrew Marshall -Date: Wed, 6 Nov 2024 17:24:11 -0500 -Subject: [PATCH 1/2] openvdb_11: init at 11.0.0 - -There are many breaking changes in v12, which some consumers are not -ready for and would require complex changes. This is expected to go away -once it becomes unused in nixpkgs. ---- - pkgs/development/libraries/openvdb/11.nix | 19 +++++++++++++++++++ - pkgs/top-level/all-packages.nix | 1 + - 2 files changed, 20 insertions(+) - create mode 100644 pkgs/development/libraries/openvdb/11.nix - -diff --git a/pkgs/development/libraries/openvdb/11.nix b/pkgs/development/libraries/openvdb/11.nix -new file mode 100644 -index 0000000000000..a65bb286ae2e2 ---- /dev/null -+++ b/pkgs/development/libraries/openvdb/11.nix -@@ -0,0 +1,19 @@ -+{ -+ lib, -+ fetchFromGitHub, -+ openvdb, -+}: -+ -+openvdb.overrideAttrs (old: rec { -+ name = "${old.pname}-${version}"; -+ version = "11.0.0"; -+ src = fetchFromGitHub { -+ owner = "AcademySoftwareFoundation"; -+ repo = "openvdb"; -+ rev = "v${version}"; -+ sha256 = "sha256-wDDjX0nKZ4/DIbEX33PoxR43dJDj2NF3fm+Egug62GQ="; -+ }; -+ meta = old.meta // { -+ license = lib.licenses.mpl20; -+ }; -+}) -diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix -index 55968eed13554..428a42210da40 100644 ---- a/pkgs/top-level/all-packages.nix -+++ b/pkgs/top-level/all-packages.nix -@@ -22214,6 +22214,7 @@ with pkgs; - zunclient = with python311Packages; toPythonApplication python-zunclient; - - openvdb = callPackage ../development/libraries/openvdb { }; -+ openvdb_11 = callPackage ../development/libraries/openvdb/11.nix { }; - - openvr = callPackage ../by-name/op/openvr/package.nix { - inherit (darwin.apple_sdk.frameworks) Foundation AppKit; - -From 33e09c6eea89ae1d1145f2f4527f98fd7b87865b Mon Sep 17 00:00:00 2001 -From: Andrew Marshall -Date: Wed, 6 Nov 2024 17:25:29 -0500 -Subject: [PATCH 2/2] blender: fix build by using openvdb_11 - -openvdb is now v12, and has many breaking API changes. Upstream has not -yet adapted to them yet, so there is no patch to backport. Further, -OpenVDB 12 is not currently part of the anticipated upstream library -updates for Blender 4.3 or 4.4. ---- - pkgs/applications/misc/blender/default.nix | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix -index 7d89339da1026..e2af0b3f93384 100644 ---- a/pkgs/applications/misc/blender/default.nix -+++ b/pkgs/applications/misc/blender/default.nix -@@ -64,7 +64,7 @@ - openjpeg, - openpgl, - opensubdiv, -- openvdb, -+ openvdb_11, - openxr-loader, - pkg-config, - potrace, -@@ -276,7 +276,7 @@ stdenv.mkDerivation (finalAttrs: { - openjpeg - openpgl - (opensubdiv.override { inherit cudaSupport; }) -- openvdb -+ openvdb_11 - potrace - pugixml - python3 diff --git a/profiles/personal/home.nix b/profiles/personal/home.nix index b0f93ea8..5319d5bc 100644 --- a/profiles/personal/home.nix +++ b/profiles/personal/home.nix @@ -9,7 +9,6 @@ programs.home-manager.enable = true; imports = [ ../work/home.nix # Personal is essentially work system + games - ../../user/app/games/games.nix # Various videogame apps ]; home.stateVersion = "22.11"; # Please read the comment before changing. diff --git a/profiles/work/home.nix b/profiles/work/home.nix index 36f6e3b6..7435d20b 100644 --- a/profiles/work/home.nix +++ b/profiles/work/home.nix @@ -20,8 +20,6 @@ ../../user/app/virtualization/virtualization.nix # Virtual machines #../../user/app/flatpak/flatpak.nix # Flatpaks ../../user/style/stylix.nix # Styling and themes for my apps - ../../user/lang/cc/cc.nix # C and C++ tools - ../../user/app/godot # Game development ../../user/hardware/bluetooth.nix # Bluetooth ]; @@ -69,7 +67,7 @@ protonmail-bridge texliveSmall numbat - element-desktop-wayland + element-desktop openai-whisper-cpp @@ -124,6 +122,7 @@ krita pinta inkscape + godot_4 (pkgs-stable.lollypop.override { youtubeSupport = false; }) vlc mpv @@ -197,12 +196,6 @@ kdenlive ]); - home.file.".local/share/pixmaps/nixos-snowflake-stylix.svg".source = - config.lib.stylix.colors { - template = builtins.readFile ../../user/pkgs/nixos-snowflake-stylix.svg.mustache; - extension = "svg"; - }; - services.syncthing.enable = true; services.nextcloud-client = { enable = true; diff --git a/system/hardware-configuration.nix b/system/hardware-configuration.nix index 6232d374..276cd245 100644 --- a/system/hardware-configuration.nix +++ b/system/hardware-configuration.nix @@ -21,7 +21,6 @@ environment.systemPackages = with pkgs.rocmPackages; [ hipcc hip-common hiprand hipblas hipfft hipcub hipify ]; - services.xserver.videoDrivers = lib.mkDefault [ "modesetting" ]; hardware.graphics = { diff --git a/system/hardware/opengl.nix b/system/hardware/opengl.nix index 7e49f80e..58dd13af 100644 --- a/system/hardware/opengl.nix +++ b/system/hardware/opengl.nix @@ -3,7 +3,4 @@ { # OpenGL hardware.opengl.enable = true; - hardware.opengl.extraPackages = with pkgs; [ - rocmPackages.clr.icd - ]; } diff --git a/user/app/browser/floorp.nix b/user/app/browser/floorp.nix deleted file mode 100644 index c7fe4456..00000000 --- a/user/app/browser/floorp.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ pkgs, ... }: - -{ - # Module installing as default browser - home.packages = [ pkgs.floorp ]; - - home.sessionVariables = { - DEFAULT_BROWSER = "${pkgs.floorp}/bin/floorp"; - }; - - xdg.mimeApps.defaultApplications = { - "text/html" = "floorp.desktop"; - "x-scheme-handler/http" = "floorp.desktop"; - "x-scheme-handler/https" = "floorp.desktop"; - "x-scheme-handler/about" = "floorp.desktop"; - "x-scheme-handler/unknown" = "floorp.desktop"; - }; - -} diff --git a/user/app/games/games.nix b/user/app/games/games.nix deleted file mode 100644 index e37d0048..00000000 --- a/user/app/games/games.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ pkgs, pkgs-stable, ... }: -let - myRetroarch = - (pkgs-stable.retroarch.override { - cores = with pkgs-stable.libretro; [ - vba-m - (desmume.overrideAttrs (oldAttrs: { - preConfigure = '' - sed -i 's/0009BF123456/0022AA067857/g' desmume/src/firmware.cpp; - sed -i 's/outConfig.MACAddress\[0\] = 0x00/outConfig.MACAddress[0] = 0x00/g' desmume/src/firmware.cpp; - sed -i 's/outConfig.MACAddress\[1\] = 0x09/outConfig.MACAddress[1] = 0x22/g' desmume/src/firmware.cpp; - sed -i 's/outConfig.MACAddress\[2\] = 0xBF/outConfig.MACAddress[2] = 0xAA/g' desmume/src/firmware.cpp; - sed -i 's/outConfig.MACAddress\[3\] = 0x12/outConfig.MACAddress[3] = 0x06/g' desmume/src/firmware.cpp; - sed -i 's/outConfig.MACAddress\[4\] = 0x34/outConfig.MACAddress[4] = 0x78/g' desmume/src/firmware.cpp; - sed -i 's/outConfig.MACAddress\[5\] = 0x56/outConfig.MACAddress[5] = 0x57/g' desmume/src/firmware.cpp; - sed -i 's/0x00, 0x09, 0xBF, 0x12, 0x34, 0x56/0x00, 0x22, 0xAA, 0x06, 0x78, 0x57/g' desmume/src/wifi.cpp; - ''; - })) - dolphin - genesis-plus-gx - ]; - }); -in -{ - home.packages = (with pkgs; [ - # Games - pegasus-frontend - myRetroarch - libfaketime - airshipper - qjoypad - superTux - superTuxKart - gamepad-tool - ]) ++ (with pkgs-stable; [ - pokefinder - ]); - - nixpkgs.config = { - allowUnfree = true; - allowUnfreePredicate = (_: true); - }; - - # The following 2 declarations allow retroarch to be imported into gamehub - # Set retroarch core directory to ~/.local/bin/libretro - # and retroarch core info directory to ~/.local/share/libretro/info - home.file.".local/bin/libretro".source = "${myRetroarch}/lib/retroarch/cores"; - home.file.".local/bin/libretro-shaders".source = "${myRetroarch}/lib/retroarch/cores"; - home.file.".local/share/libretro/info".source = fetchTarball { - url = "https://github.com/libretro/libretro-core-info/archive/refs/tags/v1.15.0.tar.gz"; - sha256 = "004kgbsgbk7hn1v01jg3vj4b6dfb2cp3kcp5hgjyl030wqg1r22q"; - }; - -} diff --git a/user/lang/android/android.nix b/user/lang/android/android.nix deleted file mode 100644 index 9158b979..00000000 --- a/user/lang/android/android.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ pkgs, ... }: - -{ - home.packages = with pkgs; [ - # Android - android-tools - android-udev-rules - ]; -} diff --git a/user/lang/cc/cc.nix b/user/lang/cc/cc.nix deleted file mode 100644 index 12733fa3..00000000 --- a/user/lang/cc/cc.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ pkgs, ... }: - -{ - home.packages = with pkgs; [ - # CC - gcc - gnumake - cmake - autoconf - automake - libtool - ]; -} diff --git a/user/lang/godot/godot.nix b/user/lang/godot/godot.nix deleted file mode 100644 index 6cf5426e..00000000 --- a/user/lang/godot/godot.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ pkgs, ... }: - -{ - home.packages = with pkgs; [ - # Gamedev - godot_4 - ]; -} diff --git a/user/lang/haskell/haskell.nix b/user/lang/haskell/haskell.nix deleted file mode 100644 index b903e8c5..00000000 --- a/user/lang/haskell/haskell.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ pkgs, ... }: - -{ - home.packages = with pkgs; [ - # Haskell - haskellPackages.haskell-language-server - haskellPackages.stack - ]; -} diff --git a/user/lang/python/python-packages.nix b/user/lang/python/python-packages.nix deleted file mode 100644 index 10af8e8d..00000000 --- a/user/lang/python/python-packages.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ pkgs, ... }: - -{ - # Python packages - home.packages = with pkgs.python3Packages; [ - cffi - dbus-python - wheel - pyyaml - zipp - xlib - libvirt - pybind11 - pyatspi - attrs - autocommand - bcrypt - pycairo - certifi - chardet - click - cryptography - cssselect - python-dateutil - distro - dnspython - evdev - ewmh - fastjsonschema - fido2 - python-gnupg - pygobject3 - idna - importlib-metadata - inflect - isodate - jeepney - keyring - lxml - markdown - markupsafe - more-itertools - numpy - ordered-set - packaging - pillow - pip - platformdirs - ply - prettytable - proton-client - protonvpn-nm-lib - psutil - pulsectl - pycparser - pycups - pycurl - pydantic - pyinotify - pyopenssl - pyparsing - pyqt5 - pyqt5_sip - pyscard - pythondialog - pyxdg - rdflib - requests - secretstorage - setproctitle - setuptools - six - systemd - tomli - urllib3 - wcwidth - websockets - python-zbar - ]; -} diff --git a/user/lang/python/python.nix b/user/lang/python/python.nix deleted file mode 100644 index 681c7763..00000000 --- a/user/lang/python/python.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ pkgs, ... }: - -{ - home.packages = with pkgs; [ - # Python setup - python3Full - imath - pystring - ]; -} diff --git a/user/lang/rust/rust.nix b/user/lang/rust/rust.nix deleted file mode 100644 index 23bccb10..00000000 --- a/user/lang/rust/rust.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ pkgs, ... }: - -{ - home.packages = with pkgs; [ - # Rust setup - rustup - ]; -} diff --git a/user/pkgs/hyprland-logo-stylix.svg.mustache b/user/pkgs/hyprland-logo-stylix.svg.mustache deleted file mode 100644 index 93ada5a0..00000000 --- a/user/pkgs/hyprland-logo-stylix.svg.mustache +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/user/pkgs/nixos-snowflake-stylix.svg.mustache b/user/pkgs/nixos-snowflake-stylix.svg.mustache deleted file mode 100644 index d014f6e4..00000000 --- a/user/pkgs/nixos-snowflake-stylix.svg.mustache +++ /dev/null @@ -1,187 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - diff --git a/user/wm/hyprland/hyprland.nix b/user/wm/hyprland/hyprland.nix index 110f8205..da2f399e 100644 --- a/user/wm/hyprland/hyprland.nix +++ b/user/wm/hyprland/hyprland.nix @@ -16,6 +16,10 @@ in else []); + home.sessionVariables = { + + }; + gtk.cursorTheme = { package = pkgs.quintom-cursor-theme; name = if (config.stylix.polarity == "light") then "Quintom_Ink" else "Quintom_Snow"; @@ -32,6 +36,7 @@ in exec-once = hyprctl setcursor '' + config.gtk.cursorTheme.name + " " + builtins.toString config.gtk.cursorTheme.size + '' exec-once = iio-hyprland + env = NIXOS_OZONE_WL,1 env = XDG_CURRENT_DESKTOP,Hyprland env = XDG_SESSION_DESKTOP,Hyprland env = XDG_SESSION_TYPE,wayland @@ -141,7 +146,6 @@ in bindm=SUPER,mouse:272,movewindow bindm=SUPER,mouse:273,resizewindow bind=SUPER,T,togglefloating - bind=SUPER,G,exec,hyprctl dispatch focusworkspaceoncurrentmonitor 9 && pegasus-fe; bind=,code:148,exec,''+ userSettings.term + " "+''-e numbat bind=,code:107,exec,grim -g "$(slurp)" @@ -502,11 +506,6 @@ in then echo "Shouldn't suspend"; sleep 10; else echo "Should suspend"; systemctl suspend; fi '') ]); - home.file.".local/share/pixmaps/hyprland-logo-stylix.svg".source = - config.lib.stylix.colors { - template = builtins.readFile ../../pkgs/hyprland-logo-stylix.svg.mustache; - extension = "svg"; - }; home.file.".config/hypr/hypridle.conf".text = '' general { lock_cmd = pgrep hyprlock || hyprlock