From 460a5cf878c0c6f5aaab6b7cfd7025c91c94b702 Mon Sep 17 00:00:00 2001 From: elwrcl Date: Sun, 12 Apr 2026 21:30:59 +0300 Subject: [PATCH] update --- flake.nix | 92 ++++++++++++++++++++++ nixos/desktop/window-managers/hyprland.nix | 2 +- 2 files changed, 93 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index edbc613..5b8a9c8 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,41 @@ + { description = "copland nixos configurations"; + inputs = { + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + + chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; + + nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel/release"; + + zen-browser.url = "github:0xc000022070/zen-browser-flake"; + + copetch.url = "github:elwrcl/copetch"; + + home-manager = { + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + helium = { + url = "github:AlvaroParker/helium-nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + apple-fonts = { + url = "github:Lyndeno/apple-fonts.nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + noctalia = { + url = "github:noctalia-dev/noctalia-shell"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + }; + { + description = "copland nixos configurations"; + inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; @@ -44,6 +79,14 @@ copetch = inputs.copetch.packages.${system}.default; }; + gtkPortalOverlay = final: prev: { + xdg-desktop-portal-gtk = prev.xdg-desktop-portal-gtk.overrideAttrs (old: { + postInstall = (old.postInstall or "") + '' + substituteInPlace $out/share/xdg-desktop-portal/portals/gtk.portal \ + --replace "UseIn=gnome" "UseIn=gnome;Hyprland" + ''; + }); + }; in { nixosConfigurations = { @@ -80,3 +123,52 @@ }; }; } + + + outputs = inputs@{ self, nixpkgs, chaotic, home-manager, nix-cachyos-kernel, ... }: +let +system = "x86_64-linux"; + +chaoticOverlay = chaotic.overlays.default; +cachyosKernelOverlay = nix-cachyos-kernel.overlays.pinned; + +copetchOverlay = final: prev: { +copetch = inputs.copetch.packages.${system}.default; +}; + +in +{ +nixosConfigurations = { +copland = nixpkgs.lib.nixosSystem { +system = system; +specialArgs = { +inherit inputs system; +zen-browser = inputs.zen-browser; +nix-cachyos-kernel = nix-cachyos-kernel; +}; + +modules = [ +chaotic.nixosModules.default +home-manager.nixosModules.home-manager + +{ +nixpkgs.overlays = [ chaoticOverlay cachyosKernelOverlay ]; +nixpkgs.config.allowUnfree = true; +} + +{ +home-manager = { +useGlobalPkgs = true; +useUserPackages = true; +extraSpecialArgs = { inherit inputs system; }; +users.elars = import ./home; +}; +} + +./machine.nix +./nixos/default.nix +]; +}; +}; +}; +} diff --git a/nixos/desktop/window-managers/hyprland.nix b/nixos/desktop/window-managers/hyprland.nix index 7186159..6d54a1a 100644 --- a/nixos/desktop/window-managers/hyprland.nix +++ b/nixos/desktop/window-managers/hyprland.nix @@ -19,7 +19,7 @@ }; }; - environment.etc."xdg-desktop-portal/portals/gtk.portal".text = '' + environment.etc."xdg/xdg-desktop-portal/portals/gtk.portal".text = '' [portal] DBusName=org.freedesktop.impl.portal.desktop.gtk Interfaces=org.freedesktop.impl.portal.FileChooser;org.freedesktop.impl.portal.AppChooser;org.freedesktop.impl.portal.Print;org.freedesktop.impl.portal.Notification;org.freedesktop.impl.portal.Inhibit;org.freedesktop.impl.portal.Access;org.freedesktop.impl.portal.Account;org.freedesktop.impl.portal.Email;org.freedesktop.impl.portal.DynamicLauncher;org.freedesktop.impl.portal.Lockdown;org.freedesktop.impl.portal.Settings;org.freedesktop.impl.portal.Wallpaper;