From 223b012798efd7dea0e31ca926a4fa7d4e73d972 Mon Sep 17 00:00:00 2001 From: KeksNino Date: Tue, 8 Sep 2026 18:24:51 +0200 Subject: [PATCH] remove gsr-ui input + add office.nix remove gsr-ui input as it has been merged into nixpkgs --- flake.lock | 169 ++++++++---------------- flake.nix | 12 +- hosts/desktop/configuration.nix | 6 + hosts/desktop/home-manager/programs.nix | 1 + hosts/desktop/packages.nix | 1 + modules/office.nix | 22 +++ 6 files changed, 88 insertions(+), 123 deletions(-) create mode 100644 modules/office.nix diff --git a/flake.lock b/flake.lock index 214d117..5cb5325 100644 --- a/flake.lock +++ b/flake.lock @@ -99,11 +99,11 @@ }, "crane": { "locked": { - "lastModified": 1766774972, - "narHash": "sha256-8qxEFpj4dVmIuPn9j9z6NTbU+hrcGjBOvaxTzre5HmM=", + "lastModified": 1785782307, + "narHash": "sha256-MPaRdVkf6zZP5fCPxYCi8Dr4pZzgmXzg8T9nVEbp3Mw=", "owner": "ipetkov", "repo": "crane", - "rev": "01bc1d404a51a0a07e9d8759cd50a7903e218c82", + "rev": "2c71e194474d13de031d729b729c968ddbe3507f", "type": "github" }, "original": { @@ -136,11 +136,11 @@ ] }, "locked": { - "lastModified": 1785627969, - "narHash": "sha256-4dtXQk/NMePegK/nWp5NSeuZKLATItOq61lpEvmXqGw=", + "lastModified": 1787559586, + "narHash": "sha256-onL0VLf9vPllmT0H/OlURIU5r5t5WIEl7t4tVNKT0Nw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "427bf4bd9435fdf21321c8cc628c24efc14c0f7a", + "rev": "9d0d87172c374f89da73c1cfe6d81ae62feac1f1", "type": "github" }, "original": { @@ -154,11 +154,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1765835352, - "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", + "lastModified": 1785627969, + "narHash": "sha256-4dtXQk/NMePegK/nWp5NSeuZKLATItOq61lpEvmXqGw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "a34fae9c08a15ad73f295041fec82323541400a9", + "rev": "427bf4bd9435fdf21321c8cc628c24efc14c0f7a", "type": "github" }, "original": { @@ -167,24 +167,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -208,28 +190,6 @@ "type": "github" } }, - "gsr-ui": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1785593957, - "narHash": "sha256-16DqCLB7701mKEvsNCMNay/Mv69ZGvNnQ8nsvNQCdIQ=", - "owner": "rPlakama", - "repo": "gsr-ui-nix", - "rev": "c1ac4ac2fd962b7c985edb1e420bdc5b3dce56f6", - "type": "github" - }, - "original": { - "owner": "rPlakama", - "repo": "gsr-ui-nix", - "rev": "c1ac4ac2fd962b7c985edb1e420bdc5b3dce56f6", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -237,11 +197,11 @@ ] }, "locked": { - "lastModified": 1786719456, - "narHash": "sha256-B74DLQs/VjlqyhnnX3tguWwghqJHWSJX30TKZuAljIg=", + "lastModified": 1788651960, + "narHash": "sha256-v9wJd32eZ2bvhBzVOd7TIjLQd011P7nwOhjKtWlci5I=", "owner": "nix-community", "repo": "home-manager", - "rev": "83b7606dcf44abe3a94b86e8bb2b3355d22e8797", + "rev": "2c0350c759688177331b8f5242311fae8877bdb3", "type": "github" }, "original": { @@ -258,11 +218,11 @@ ] }, "locked": { - "lastModified": 1786719456, - "narHash": "sha256-B74DLQs/VjlqyhnnX3tguWwghqJHWSJX30TKZuAljIg=", + "lastModified": 1788229478, + "narHash": "sha256-G0F2rFORVcFkEvVdE/qWQTnYekIc77YP5/vRF9nZlxU=", "owner": "nix-community", "repo": "home-manager", - "rev": "83b7606dcf44abe3a94b86e8bb2b3355d22e8797", + "rev": "1dc2d1f720ab17fc7981e087346bf54b26d284b1", "type": "github" }, "original": { @@ -348,7 +308,7 @@ "hyprwire": "hyprwire", "nixpkgs": "nixpkgs", "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems_2", + "systems": "systems", "xdph": "xdph" }, "locked": { @@ -648,11 +608,11 @@ }, "locked": { "dir": "packages/nix", - "lastModified": 1786390927, - "narHash": "sha256-rG9VwNR5bZIOzjYRjuY0SRqfx37spn0QQywPgITszQY=", + "lastModified": 1788565178, + "narHash": "sha256-bjItIyGxVAUqaSpr2tdN/YTd8BP2DY+wAmun136LrZs=", "owner": "SteamClientHomebrew", "repo": "Millennium", - "rev": "816514f939ce8696ae8262b4e0c2123f593db08c", + "rev": "5cbebb86628767f365de987c451a2839afe153bc", "type": "github" }, "original": { @@ -665,17 +625,17 @@ "millennium-src": { "flake": false, "locked": { - "lastModified": 1783268941, - "narHash": "sha256-MJLJ0I48HXgfOpISTAbDMYMUdWj9A6M+jGQz4uAvwyw=", + "lastModified": 1787082953, + "narHash": "sha256-zgr4cdJfye4qunpD3ClNnZ9D1WPGQAXV0CnYwEbB52s=", "owner": "SteamClientHomebrew", "repo": "Millennium", - "rev": "f37f05bdbd4727d873a1ad83ce72d062ef9a0c48", + "rev": "513b02e809b0eb120ecf0ae12e548798dd756323", "type": "github" }, "original": { "owner": "SteamClientHomebrew", "repo": "Millennium", - "rev": "f37f05bdbd4727d873a1ad83ce72d062ef9a0c48", + "rev": "513b02e809b0eb120ecf0ae12e548798dd756323", "type": "github" } }, @@ -713,11 +673,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1765674936, - "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", + "lastModified": 1785031560, + "narHash": "sha256-OmshNvn2vupOFpYinLUu+1Dnpu4n7Q5N3ggGVNHpkUI=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", + "rev": "0e79af5e3d4dcfcd676ab5ba3f95d2e3352e078c", "type": "github" }, "original": { @@ -740,11 +700,11 @@ }, "nixpkgs-patcher": { "locked": { - "lastModified": 1786578629, - "narHash": "sha256-oGghYTSoPQkTmFdQNQUmNxIcd6xMJ0VxwKRtVIa0hmY=", + "lastModified": 1787266535, + "narHash": "sha256-uvnBghsG8XzMEwW8PH2GnPQRBOxQEyHi6OEMmkx5GSY=", "owner": "gepbird", "repo": "nixpkgs-patcher", - "rev": "59ecdb2d3783c2b1fd27e595b3f11411a5db730c", + "rev": "5f1edc3a7b554c2ddef7e2a79af97dec707c825a", "type": "github" }, "original": { @@ -787,11 +747,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1786820742, - "narHash": "sha256-NqFjXL1rR+G++M7tsEaJynI9MqpQpMGazpI/4VAHe9I=", + "lastModified": 1788879035, + "narHash": "sha256-puPcHJJbpTDaAUGYO+q2K42eaPT8iXjqQWgq2q1mJ/E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3de07e001d8c15051c9484eb0c0b2350e24d1d3b", + "rev": "97184999c19cca9eb397c564cb1774f81b4c18e1", "type": "github" }, "original": { @@ -802,11 +762,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1786348146, - "narHash": "sha256-we5zDEFfn8TgzeWKjKDMIjeQZ59omEPl23NIF+13/ys=", + "lastModified": 1787631388, + "narHash": "sha256-vMiXptXarfSdJb1Gkc+FYVOAibuBRj7qxGa8z68q1Uw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d482ef84049d9b7276b83a06e4e4d76983830097", + "rev": "ac6b2166e7a9375683b8e98f860f273222337b16", "type": "github" }, "original": { @@ -818,11 +778,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1767026758, - "narHash": "sha256-7fsac/f7nh/VaKJ/qm3I338+wAJa/3J57cOGpXi0Sbg=", + "lastModified": 1785747939, + "narHash": "sha256-D740uKsMbgsfK2oaDenJLLPIZfq7W0/g4KN/Fls8eKs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "346dd96ad74dc4457a9db9de4f4f57dab2e5731d", + "rev": "104240a772428cc2e20d8fd86c9ddbb886bbaff2", "type": "github" }, "original": { @@ -834,11 +794,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1786599213, - "narHash": "sha256-yNJd40f11EzXBjSByCB7IPpeFFAdeoSKKM67dGkfFoU=", + "lastModified": 1788179007, + "narHash": "sha256-hn1oU2rue2SYK8dAr8+WNZWtbsz1S2W5mnHlSEuh3bo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0e251e24a4f24e036a084b6b4b2d2491af4167f4", + "rev": "34ab99075ac4f7e40cf037eef32cb1c360bb85e9", "type": "github" }, "original": { @@ -852,14 +812,14 @@ "inputs": { "flake-parts": "flake-parts", "nixpkgs": "nixpkgs_5", - "systems": "systems_3" + "systems": "systems_2" }, "locked": { - "lastModified": 1786577888, - "narHash": "sha256-EVSCHLGozO2S4d14WianQ9JiU9tpPgdFv9uD74/xqeQ=", + "lastModified": 1788190018, + "narHash": "sha256-59BAfH0txPAZrPBF4QJqwvUWppD+ICrcjA1LZAmPnrQ=", "owner": "nix-community", "repo": "nixvim", - "rev": "738351a7813be094fb00fce1a149bcc25e936c36", + "rev": "41844750e55f17b1385d5b09ca7ade5f11f49506", "type": "github" }, "original": { @@ -896,7 +856,6 @@ "inputs": { "assella": "assella", "bcdl-free": "bcdl-free", - "gsr-ui": "gsr-ui", "home-manager": "home-manager", "hyprsplit": "hyprsplit", "millennium": "millennium", @@ -949,21 +908,6 @@ } }, "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_2": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -978,7 +922,8 @@ "type": "github" } }, - "systems_3": { + "systems_2": { + "flake": false, "locked": { "lastModified": 1774449309, "narHash": "sha256-brhZ8DmuGtzkCYHJg4HEd602amKm89Y9ytsFZ5uWD1w=", @@ -1061,16 +1006,16 @@ "xremap": { "flake": false, "locked": { - "lastModified": 1782465938, - "narHash": "sha256-BgRp0y5bkmMwRCdIKHrXIbv6Kl7Hn9IphburN7i7sE8=", + "lastModified": 1787823445, + "narHash": "sha256-h6aWgV+wlERel7CVhuUG17Pqo6F2V7h5OlaAegHvSz4=", "owner": "k0kubun", "repo": "xremap", - "rev": "6d1d06436ecd54002257029bc26a22ef058d4b63", + "rev": "7e6649e442ca445b781e4cf0e90c165f86e717db", "type": "github" }, "original": { "owner": "k0kubun", - "ref": "v0.15.9", + "ref": "v0.15.12", "repo": "xremap", "type": "github" } @@ -1083,11 +1028,11 @@ "xremap": "xremap" }, "locked": { - "lastModified": 1785858454, - "narHash": "sha256-hMJE6NyEVGbGFiYkUMH/0z9DedcmB0oSMamlvlljWdM=", + "lastModified": 1788397935, + "narHash": "sha256-8ag5CiJFb0G9kykfrHEEqoHC7up6gHg6utoIjOH7bUA=", "owner": "xremap", "repo": "nix-flake", - "rev": "abbd07e92837c797ae1b98a1ff2c95fc805fe7b1", + "rev": "3569aeddf628fe918b49d8a65c1ae0d06b2613ea", "type": "github" }, "original": { @@ -1102,11 +1047,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1786764320, - "narHash": "sha256-FO8IkyM+S1nFHPetg20r+EsLicLPuh+yy5WKqxG20JI=", + "lastModified": 1788864239, + "narHash": "sha256-a2BIiekLSIgruRro3fXQgohmw3xlCFJBGW/TKK4x+E8=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "a19fe7e45d173d5e455771d7ecce9bbd02a9598f", + "rev": "018726119b87c9fb906857af802d3cbfbc10a46d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index aad4c06..6a95f91 100644 --- a/flake.nix +++ b/flake.nix @@ -9,10 +9,6 @@ url = "github:AceSLS/SLSsteam/a1b30e8183651a6d3a016365b18d8893964af7cc"; inputs.nixpkgs.follows = "nixpkgs"; }; - gsr-ui = { - url = "github:rPlakama/gsr-ui-nix/c1ac4ac2fd962b7c985edb1e420bdc5b3dce56f6"; - inputs.nixpkgs.follows = "nixpkgs"; - }; zen-browser.url = "github:0xc000022070/zen-browser-flake"; xremap-flake.url = "github:xremap/nix-flake"; millennium.url = "github:SteamClientHomebrew/Millennium?dir=packages/nix"; @@ -42,7 +38,6 @@ xremap-flake, sls-steam, millennium, - gsr-ui, bcdl-free, nixvim, hyprsplit, @@ -71,7 +66,7 @@ ./modules/desktop/xremap.nix ./modules/desktop/flatpak.nix home-manager.nixosModules.home-manager - gsr-ui.nixosModules.default + # gsr-ui.nixosModules.default xremap-flake.nixosModules.default nixvim.nixosModules.nixvim nix-flatpak.nixosModules.nix-flatpak @@ -93,11 +88,6 @@ inherit hyprsplit; }; - programs.gpu-screen-recorder = { - package = gsr-ui.packages.${system}.gpu-screen-recorder; - enable = true; - ui.enable = true; - }; } ]; }; diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index 43bf9ee..631a524 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -11,6 +11,7 @@ ./packages.nix ./hardware-configuration.nix ../../modules/git.nix + ../../modules/office.nix ../../modules/scripts.nix ../../modules/desktop/vr.nix ../../modules/virtualization.nix @@ -139,6 +140,11 @@ }; }; + programs.gpu-screen-recorder = { + enable = true; + ui.enable = true; + }; + programs.nix-ld = { enable = true; libraries = diff --git a/hosts/desktop/home-manager/programs.nix b/hosts/desktop/home-manager/programs.nix index d011176..27678cf 100644 --- a/hosts/desktop/home-manager/programs.nix +++ b/hosts/desktop/home-manager/programs.nix @@ -14,6 +14,7 @@ imv.enable = true; librewolf.enable = true; java.enable = true; + libreoffice.enable = true; rofi = { enable = true; diff --git a/hosts/desktop/packages.nix b/hosts/desktop/packages.nix index 52fa75b..0cf3c7f 100644 --- a/hosts/desktop/packages.nix +++ b/hosts/desktop/packages.nix @@ -84,5 +84,6 @@ nerd-fonts.caskaydia-mono nerd-fonts.symbols-only nerd-fonts.jetbrains-mono + ibm-plex ]; } diff --git a/modules/office.nix b/modules/office.nix new file mode 100644 index 0000000..e24425a --- /dev/null +++ b/modules/office.nix @@ -0,0 +1,22 @@ +{ pkgs, ... }: +{ + services.printing = { + enable = true; + drivers = with pkgs; [ + cups-filters + cups-browsed + samsung-unified-linux-driver + hplip + ]; + }; + + services.avahi = { + enable = true; + nssmdns4 = true; + openFirewall = true; + }; + + home-manager.users.user = { + programs.libreoffice.enable = true; + }; +}