diff --git a/flake.lock b/flake.lock index e5a1c2c..7ca1373 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1603662906, - "narHash": "sha256-d9Ww4Fa9WB00JLaqXN/cp41rVxF/MXGr3SbhMY5f11k=", + "lastModified": 1605635123, + "narHash": "sha256-8bROJh1fshk+TaFcIfU9enDcN6/1+uiOKgBgk6rSJMk=", "owner": "rycee", "repo": "home-manager", - "rev": "28eb093a1e6999d52e60811008b4bfc7e20cc591", + "rev": "7b6ebf2785cfc9dd6fc2b101cbbb2152eb68d45c", "type": "github" }, "original": { @@ -169,11 +169,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1603819826, - "narHash": "sha256-isIi2447rr2e6v6TaGMFtHp12xasYBR5JdX1dXj8E5w=", + "lastModified": 1606026386, + "narHash": "sha256-ra8yZQsD8vBb+u35lGlA0KJyJfXxaZs6gjtKuS7qqkM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0ead6f8cfd461c3a366c8bc9893037afd89f798d", + "rev": "e286f0cf3bcffd5c0f006bb1831563d63b281fb2", "type": "github" }, "original": { @@ -247,11 +247,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1604369895, - "narHash": "sha256-uB/ihiWdfTjVQ9sKdtj6xeyvb41uC2J4MXiOLkwJccs=", + "lastModified": 1605225031, + "narHash": "sha256-W+7blIrccTCTyQCCE4aGn1cFrGIuTinN96GxZrJiojs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "34ad166a830d3ac1541dcce571c52231f2f0865a", + "rev": "2deeb58f49480f468adca6b08291322de4dbce6b", "type": "github" }, "original": { @@ -313,11 +313,11 @@ "simple-nixos-mailserver": { "flake": false, "locked": { - "lastModified": 1604129676, - "narHash": "sha256-Kxou8A/LHZ7LdgPfBunllyJR5FTEg/jYIQPx6Jqj37E=", + "lastModified": 1605859935, + "narHash": "sha256-XWrZtMrSWjElf2TsHzDTGs3yNQlyqfEiC2NALF5JNtU=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "c04260cf5e685fc99ccb669654e147f94e3de8a4", + "rev": "ee1ad50830b479ed8fb46c4c51d3bcdbc2184b8b", "type": "gitlab" }, "original": { @@ -338,11 +338,11 @@ "rev": "933dcefc7b1f05e1d79a17adf34580c080eedb75", "revCount": 19, "type": "git", - "url": "ssh://gitea@code.balsoft.ru/balsoft/simple-osd-daemons" + "url": "https://code.balsoft.ru/balsoft/simple-osd-daemons.git" }, "original": { "type": "git", - "url": "ssh://gitea@code.balsoft.ru/balsoft/simple-osd-daemons" + "url": "https://code.balsoft.ru/balsoft/simple-osd-daemons.git" } }, "weechat-notify-send": { diff --git a/flake.nix b/flake.nix index 26a088d..33efe06 100644 --- a/flake.nix +++ b/flake.nix @@ -45,7 +45,7 @@ ref = "flake"; }; nixos-fhs-compat.url = github:balsoft/nixos-fhs-compat; - simple-osd-daemons.url = git+ssh://gitea@code.balsoft.ru/balsoft/simple-osd-daemons; + simple-osd-daemons.url = git+https://code.balsoft.ru/balsoft/simple-osd-daemons.git; }; outputs = { nixpkgs, nix, self, ... }@inputs: { diff --git a/modules/hardware.nix b/modules/hardware.nix index 67c74f9..3d676dc 100644 --- a/modules/hardware.nix +++ b/modules/hardware.nix @@ -15,16 +15,7 @@ with deviceSpecific; { hardware.opengl.package = pkgs.mesa_drivers; hardware.bluetooth.enable = true; - hardware.bluetooth.package = pkgs.bluezFull.overrideAttrs (_: { - patches = [ - (pkgs.fetchurl { - name = "volume-patch"; - url = "https://marc.info/?l=linux-bluetooth&m=159446824521591&q=raw"; - sha256 = - "448ce22b6fec2746d075390a898d1d08828c4008a6efcd8b98825ec60e5d1b81"; - }) - ]; - }); + hardware.bluetooth.package = pkgs.bluezFull; services.throttled = { enable = device == "T490s-Laptop"; diff --git a/modules/nextcloud.nix b/modules/nextcloud.nix index ff7ef50..e2d19d7 100644 --- a/modules/nextcloud.nix +++ b/modules/nextcloud.nix @@ -4,7 +4,7 @@ enable = true; hostName = "nextcloud.balsoft.ru"; config.adminpassFile = "/home/balsoft/nextcloud-admin"; - package = pkgs.nextcloud19; + package = pkgs.nextcloud20; https = true; }; services.nginx.virtualHosts."nextcloud.balsoft.ru" = {