diff --git a/config/hosts/aspects/doloro-desktop/home.nix b/config/hosts/aspects/doloro-desktop/home.nix index c382f45..8e131c1 100644 --- a/config/hosts/aspects/doloro-desktop/home.nix +++ b/config/hosts/aspects/doloro-desktop/home.nix @@ -11,6 +11,7 @@ den.aspects.doloro-shared modules.sops + modules.flatpaks modules.hyprland modules.fish modules.tuigreet @@ -95,6 +96,19 @@ blender bottles pi-coding-agent + (pkgs.symlinkJoin { + name = "orca-slicer"; + paths = [ pkgs.orca-slicer ]; + buildInputs = [ pkgs.makeWrapper ]; + postBuild = '' + wrapProgram $out/bin/orca-slicer \ + --prefix LC_ALL : C \ + --prefix MESA_LOADER_DRIVER_OVERRIDE : zink \ + --prefix WEBKIT_DISABLE_DMABUF_RENDERER : 1 \ + --prefix __EGL_VENDOR_LIBRARY_FILENAMES : ${pkgs.mesa}/share/glvnd/egl_vendor.d/50_mesa.json \ + --prefix GALLIUM_DRIVER : zink + ''; + }) ]; programs.lutris.enable = true; nixpkgs.overlays = [ diff --git a/config/modules/flatpaks.nix b/config/modules/flatpaks.nix new file mode 100644 index 0000000..48d7338 --- /dev/null +++ b/config/modules/flatpaks.nix @@ -0,0 +1,36 @@ +{ modules, inputs, ... }: +{ + flake-file.inputs = { + nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest"; + }; + modules.flatpaks = { + nixos = { + imports = [ + inputs.nix-flatpak.nixosModules.nix-flatpak + ]; + services.flatpak = { + enable = true; + }; + }; + homeManager = { + imports = [ + inputs.nix-flatpak.homeManagerModules.nix-flatpak + ]; + services.flatpak = { + enable = true; + packages = [ + { + flatpakref = "https://dl.flathub.org/repo/appstream/org.vinegarhq.Sober.flatpakref"; + sha256 = "15ak2i5nk64wbmswqml2cqfgidczawqybmc7pmw94yp8wcd4yv6i"; + } + ]; + }; + services.flatpak.remotes = [ + { + name = "flathub-beta"; + location = "https://flathub.org/beta-repo/flathub-beta.flatpakrepo"; + } + ]; + }; + }; +} diff --git a/config/modules/nixvim/default.nix b/config/modules/nixvim/default.nix index 3321dcf..384c1c7 100644 --- a/config/modules/nixvim/default.nix +++ b/config/modules/nixvim/default.nix @@ -109,12 +109,12 @@ lsp = { enable = true; servers = { - qmlls = { - enable = true; - config = { - cmd = "-E"; - }; - }; + # qmlls = { + # enable = true; + # config = { + # cmd = "-E"; + # }; + # }; rust_analyzer = { enable = true; installCargo = false; diff --git a/flake.lock b/flake.lock index 90e2d32..0e903ea 100644 --- a/flake.lock +++ b/flake.lock @@ -998,6 +998,22 @@ "type": "github" } }, + "nix-flatpak": { + "locked": { + "lastModified": 1767983141, + "narHash": "sha256-7ZCulYUD9RmJIDULTRkGLSW1faMpDlPKcbWJLYHoXcs=", + "owner": "gmodena", + "repo": "nix-flatpak", + "rev": "440818969ac2cbd77bfe025e884d0aa528991374", + "type": "github" + }, + "original": { + "owner": "gmodena", + "ref": "latest", + "repo": "nix-flatpak", + "type": "github" + } + }, "nixos-hardware": { "inputs": { "nixpkgs": "nixpkgs_7" @@ -1457,6 +1473,7 @@ "nik-pkgs": "nik-pkgs", "niri-flake": "niri-flake", "nix-cachyos-kernel": "nix-cachyos-kernel", + "nix-flatpak": "nix-flatpak", "nixos-hardware": "nixos-hardware", "nixos-raspberrypi": "nixos-raspberrypi", "nixos-wsl": "nixos-wsl", diff --git a/flake.nix b/flake.nix index cc8cbbb..0874f08 100644 --- a/flake.nix +++ b/flake.nix @@ -28,6 +28,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel/release"; + nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-raspberrypi.url = "github:nvmd/nixos-raspberrypi/main"; nixos-wsl.url = "github:nix-community/NixOS-WSL";