diff --git a/flake.lock b/flake.lock index 2ebbe0b..df7b2f4 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1790021793, - "narHash": "sha256-wXAdaLBAjbQK/OfESV/i0pgolkz+Uo4SbBP/MbfGLHU=", + "lastModified": 1790265244, + "narHash": "sha256-PFNTZbWRxWk5/JreN2mB8e2ED3s/KiwGuBjl0Vg9pbw=", "owner": "nix-community", "repo": "home-manager", - "rev": "a3dfb887d40d134af29fa8e924ba85a3e3a99194", + "rev": "e3b0881f91f42bea70bcc516220880cce9daf122", "type": "github" }, "original": { @@ -91,13 +91,29 @@ "type": "github" } }, + "nixpkgs-eurooffice": { + "locked": { + "lastModified": 1789894997, + "narHash": "sha256-N6yIfIYhPnejFsqZpIHLBoHg0R7u1wSlwZmgo/ZGPJU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3e78b1bdde2520039911b21e2e135cc951733a6f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "pull/536503/head", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { - "lastModified": 1789998861, - "narHash": "sha256-62XMQD4WLdMAfdT0/8gJmPH2dKeTw908ryNloAplTr8=", + "lastModified": 1790218706, + "narHash": "sha256-6e4Na3z008XpdVyOXgfasXIn1aN+z8AXFG+jXdQSyuI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1e8bc658fc985ef27ccd66d107d767b32bb7ef98", + "rev": "c508844df6c28fa6dabc1b6af70f3ccbd65c5201", "type": "github" }, "original": { @@ -109,11 +125,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1789921291, - "narHash": "sha256-Ft/BRnIqw1MywFoXydKobjjWmDFgDdYtSpJliE8+yUw=", + "lastModified": 1790185690, + "narHash": "sha256-xJ+X4hBtOcAFGBOe5nAMyMUeF9foJBmIOu3NjBqBycU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "44a91898084f46797b5fac650c7e8c9ac38c43d4", + "rev": "4975466d324710c576dc11ad614684e6bd8cad8e", "type": "github" }, "original": { @@ -216,6 +232,7 @@ "hydration-notifier": "hydration-notifier", "lightcontrol": "lightcontrol", "modrinth-statistics": "modrinth-statistics", + "nixpkgs-eurooffice": "nixpkgs-eurooffice", "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", "plasma-manager": "plasma-manager", @@ -232,11 +249,11 @@ ] }, "locked": { - "lastModified": 1789890976, - "narHash": "sha256-GKwH3zpy7tartuJMG0Rv/xUsdetG1QLmTVv8UKgJLmA=", + "lastModified": 1790247521, + "narHash": "sha256-TNfgoHsqsYYvaJImlWctfRkh4PseTagzegU1Dgdbehw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "7214124c20c1542c90deb54af50e2f53ae02711f", + "rev": "2bd00bd9bb35fe6d114888c8f1c2e946c541dd8f", "type": "github" }, "original": { @@ -292,11 +309,11 @@ ] }, "locked": { - "lastModified": 1789962061, - "narHash": "sha256-gyzlqZi+R1cq/n/c6vh5Rz10M7QausR/O8v+YGAOyTA=", + "lastModified": 1790234305, + "narHash": "sha256-zgshjjI5uhmRQor+bmXH4EYx/E0LUdJEqv0L8WnTFOw=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "1c3a1fcacf97eb3792e9292e3afc0edbfcfa01d4", + "rev": "2b7fec6557495d97736f1b31904f79312671ca2a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 539c637..54dfb5d 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,8 @@ inputs = { nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-26.05"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs-eurooffice.url = "github:NixOS/nixpkgs/pull/536503/head"; + home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs-unstable"; @@ -37,6 +39,7 @@ { nixpkgs-stable, nixpkgs-unstable, + nixpkgs-eurooffice, ... }@inputs: let @@ -76,7 +79,13 @@ laptop = nixpkgs-unstable.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = { inherit inputs; }; + specialArgs = { + inherit inputs; + pkgs-eurooffice = import nixpkgs-eurooffice { + system = "x86_64-linux"; + config.allowUnfree = true; + }; + }; modules = [ ./hosts/laptop/configuration.nix ./shared/default.nix @@ -91,7 +100,13 @@ pc = nixpkgs-unstable.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = { inherit inputs; }; + specialArgs = { + inherit inputs; + pkgs-eurooffice = import nixpkgs-eurooffice { + system = "x86_64-linux"; + config.allowUnfree = true; + }; + }; modules = [ ./hosts/pc/configuration.nix ./shared/default.nix diff --git a/shared/app/office.nix b/shared/app/office.nix index 7e36c21..e96cbb8 100644 --- a/shared/app/office.nix +++ b/shared/app/office.nix @@ -2,6 +2,7 @@ pkgs, config, lib, + pkgs-eurooffice, ... }: @@ -16,7 +17,8 @@ typst - libreoffice + pkgs-eurooffice.euro-office-desktopeditors + drawy nextcloud-client