diff options
| author | Karel Kočí <cynerd@email.cz> | 2026-06-01 08:00:04 +0200 |
|---|---|---|
| committer | Karel Kočí <cynerd@email.cz> | 2026-06-01 08:00:04 +0200 |
| commit | 145ec21371dee6bf0339578e0d68410f9dd34fd5 (patch) | |
| tree | a600f6db1e51a706d78563f3c499bb530777cf96 | |
| parent | cdb82f8f3e05bd46b07dda5fe1e9dbb5bf0193f8 (diff) | |
| download | nixos-personal-145ec21371dee6bf0339578e0d68410f9dd34fd5.tar.gz nixos-personal-145ec21371dee6bf0339578e0d68410f9dd34fd5.tar.bz2 nixos-personal-145ec21371dee6bf0339578e0d68410f9dd34fd5.zip | |
Tweak the server adn add playerctl on desktop
| -rw-r--r-- | flake.lock | 130 | ||||
| -rw-r--r-- | flake.nix | 2 | ||||
| -rw-r--r-- | nixos/configurations/lipwig.nix | 31 | ||||
| -rw-r--r-- | nixos/modules/desktop.nix | 1 |
4 files changed, 98 insertions, 66 deletions
@@ -76,7 +76,7 @@ }, "flakepy": { "inputs": { - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "systems": "systems_3" }, "locked": { @@ -95,7 +95,7 @@ }, "flakepy_2": { "inputs": { - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_9", "systems": "systems_5" }, "locked": { @@ -114,7 +114,7 @@ }, "flakepy_3": { "inputs": { - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_11", "systems": "systems_7" }, "locked": { @@ -177,7 +177,7 @@ "impermanence": { "inputs": { "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_13" + "nixpkgs": "nixpkgs_14" }, "locked": { "lastModified": 1769548169, @@ -194,12 +194,15 @@ } }, "nixos-hardware": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, "locked": { - "lastModified": 1779058144, - "narHash": "sha256-OFaHDx6EMVUfufD2cxkLHXT3AZdhLnjS+RChKPLIyAI=", + "lastModified": 1780065812, + "narHash": "sha256-SCSLUKBmwlSLGQ8Xbr8PjRFtiHNk0l9ktqkcmqdBkfE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "8ea1d787af06d65d83885264cb5572d966bfa289", + "rev": "b76b5639c0593e0aeb0b5879ad62d4b30596c144", "type": "github" }, "original": { @@ -209,7 +212,7 @@ }, "nixosdeploy": { "inputs": { - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "systems": "systems_2" }, "locked": { @@ -244,11 +247,11 @@ }, "nixpkgsUnstable": { "locked": { - "lastModified": 1778869304, - "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", + "lastModified": 1779560665, + "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", + "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786", "type": "github" }, "original": { @@ -260,6 +263,20 @@ }, "nixpkgs_10": { "locked": { + "lastModified": 1769433173, + "narHash": "sha256-Gf1dFYgD344WZ3q0LPlRoWaNdNQq8kSBDLEWulRQSEs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "13b0f9e6ac78abbbb736c635d87845c4f4bee51b", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_11": { + "locked": { "lastModified": 1761880412, "narHash": "sha256-QoJjGd4NstnyOG4mm4KXF+weBzA2AH/7gn1Pmpfcb0A=", "owner": "NixOS", @@ -272,7 +289,7 @@ "type": "indirect" } }, - "nixpkgs_11": { + "nixpkgs_12": { "locked": { "lastModified": 1769433173, "narHash": "sha256-Gf1dFYgD344WZ3q0LPlRoWaNdNQq8kSBDLEWulRQSEs=", @@ -286,7 +303,7 @@ "type": "indirect" } }, - "nixpkgs_12": { + "nixpkgs_13": { "locked": { "lastModified": 1707877513, "narHash": "sha256-sp0w2apswd3wv0sAEF7StOGHkns3XUQaO5erhWFZWXk=", @@ -300,7 +317,7 @@ "type": "indirect" } }, - "nixpkgs_13": { + "nixpkgs_14": { "locked": { "lastModified": 1768564909, "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", @@ -316,13 +333,13 @@ "type": "github" } }, - "nixpkgs_14": { + "nixpkgs_15": { "locked": { - "lastModified": 1778737229, - "narHash": "sha256-6xWoytx8jFW4PF1GjRm/i/53trbpKGfz6zjzQGBr4cI=", + "lastModified": 1779796641, + "narHash": "sha256-ZsIrKmhp4vbBXoXXmR/tBXA/UCsAQiJL9vsgZEduhVY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d7a713c0b7e47c908258e71cba7a2d77cc8d71d5", + "rev": "25f538306313eae3927264466c70d7001dcea1df", "type": "github" }, "original": { @@ -334,6 +351,19 @@ }, "nixpkgs_2": { "locked": { + "lastModified": 1767892417, + "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=", + "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba", + "type": "tarball", + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre924538.3497aa5c9457/nixexprs.tar.xz" + }, + "original": { + "type": "tarball", + "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" + } + }, + "nixpkgs_3": { + "locked": { "lastModified": 1776329215, "narHash": "sha256-a8BYi3mzoJ/AcJP8UldOx8emoPRLeWqALZWu4ZvjPXw=", "owner": "NixOS", @@ -346,22 +376,22 @@ "type": "indirect" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { - "lastModified": 1778869304, - "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", + "lastModified": 1780206209, + "narHash": "sha256-33WNQ5sssy+8+xhUz953aEnjR1Oh828j0DgLU1TfMqE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", + "rev": "45cf63e030188dd38532669b2450182bfc2d4653", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-unstable", + "ref": "nixos-unstable-small", "type": "indirect" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1755268003, "narHash": "sha256-nNaeJjo861wFR0tjHDyCnHs1rbRtrMgxAKMoig9Sj/w=", @@ -375,7 +405,7 @@ "type": "indirect" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1761880412, "narHash": "sha256-QoJjGd4NstnyOG4mm4KXF+weBzA2AH/7gn1Pmpfcb0A=", @@ -389,7 +419,7 @@ "type": "indirect" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1769433173, "narHash": "sha256-Gf1dFYgD344WZ3q0LPlRoWaNdNQq8kSBDLEWulRQSEs=", @@ -403,7 +433,7 @@ "type": "indirect" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1678875422, "narHash": "sha256-T3o6NcQPwXjxJMn2shz86Chch4ljXgZn746c2caGxd8=", @@ -417,7 +447,7 @@ "type": "indirect" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1761880412, "narHash": "sha256-QoJjGd4NstnyOG4mm4KXF+weBzA2AH/7gn1Pmpfcb0A=", @@ -431,23 +461,9 @@ "type": "indirect" } }, - "nixpkgs_9": { - "locked": { - "lastModified": 1769433173, - "narHash": "sha256-Gf1dFYgD344WZ3q0LPlRoWaNdNQq8kSBDLEWulRQSEs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "13b0f9e6ac78abbbb736c635d87845c4f4bee51b", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, "nixturris": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1764584903, @@ -465,11 +481,11 @@ }, "personal-secret": { "locked": { - "lastModified": 1778483387, - "narHash": "sha256-GFZfCna4pnfSlbgVhoYpIxtCWs37E10Qb3YwOxoFNqw=", + "lastModified": 1780293536, + "narHash": "sha256-smiItLdoP25gdth1eNwJ2YEV/cr6Zm/gZTt0uSHrn4c=", "ref": "refs/heads/master", - "rev": "fa262e8140eb6b01d839eaf39ea9ca10438a6bab", - "revCount": 149, + "rev": "3e7d6e2d0e7687b205f27b0778bab3bd66dbd32a", + "revCount": 150, "type": "git", "url": "ssh://git@cynerd.cz/nixos-personal-secret" }, @@ -481,7 +497,7 @@ "pyshv": { "inputs": { "flakepy": "flakepy", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "systems": "systems_4" }, "locked": { @@ -501,7 +517,7 @@ "pyshv_2": { "inputs": { "flakepy": "flakepy_2", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_10", "systems": "systems_6" }, "locked": { @@ -521,7 +537,7 @@ "pyshv_3": { "inputs": { "flakepy": "flakepy_3", - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_12", "systems": "systems_8" }, "locked": { @@ -543,7 +559,7 @@ "agenix": "agenix", "nixos-hardware": "nixos-hardware", "nixosdeploy": "nixosdeploy", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixturris": "nixturris", "personal-secret": "personal-secret", "pyshv": "pyshv", @@ -558,7 +574,7 @@ "shellrc": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1768810903, @@ -773,7 +789,7 @@ "usbkey": { "inputs": { "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_12" + "nixpkgs": "nixpkgs_13" }, "locked": { "lastModified": 1744029480, @@ -792,15 +808,15 @@ "vpsadminos": { "inputs": { "impermanence": "impermanence", - "nixpkgs": "nixpkgs_14", + "nixpkgs": "nixpkgs_15", "nixpkgsUnstable": "nixpkgsUnstable" }, "locked": { - "lastModified": 1778997620, - "narHash": "sha256-JSB+0OQEmEA4oEeXycYrJyWvFYYl1gKXa/u3rbhhTQQ=", + "lastModified": 1780240507, + "narHash": "sha256-mMMmJtRXGelAg8k5ewJh14B8Xc6lBmSCQLB2tdjt7PM=", "owner": "vpsfreecz", "repo": "vpsadminos", - "rev": "6316d308d801b67e523594ef8f8f701727dba510", + "rev": "dfed89a5d985cff2dbaeac05b5c2c0fa4529252b", "type": "github" }, "original": { @@ -2,7 +2,7 @@ description = "Cynerd's personal flake"; inputs = { - nixpkgs.url = "flake:nixpkgs/nixos-unstable"; + nixpkgs.url = "flake:nixpkgs/nixos-unstable-small"; nixos-hardware.url = "nixos-hardware"; nixosdeploy.url = "gitlab:cynerd/nixosdeploy"; personal-secret.url = "git+ssh://git@cynerd.cz/nixos-personal-secret"; diff --git a/nixos/configurations/lipwig.nix b/nixos/configurations/lipwig.nix index f075b3b..a3b2765 100644 --- a/nixos/configurations/lipwig.nix +++ b/nixos/configurations/lipwig.nix @@ -255,6 +255,16 @@ ; # Additional modules can be fetched with: # NEXTCLOUD_VERSIONS=33 nix run .#nc4nix -- -apps "passwords,money,integration_github,integration_gitlab,fileslibreofficeedit" + analytics = pkgs.fetchNextcloudApp { + url = "https://github.com/Rello/analytics/releases/download/6.3.4/analytics.tar.gz"; + hash = "sha256-t/WJRIVdwfoomkUOTsH6f4MrXdRs+9XdK841I+FSdoE="; + license = "agpl3Plus"; + }; + flow_notifications = pkgs.fetchNextcloudApp { + url = "https://github.com/nextcloud-releases/flow_notifications/releases/download/v4.0.0/flow_notifications-v4.0.0.tar.gz"; + hash = "sha256-D+eGGb+Eto5JtmEsnGhrLp2dKyI6twek5rwKEJGMSxw="; + license = "agpl3Plus"; + }; fileslibreofficeedit = pkgs.fetchNextcloudApp { url = "https://github.com/allotropia/nextcloud_files_libreoffice_edit/releases/download/v2.0.1/fileslibreofficeedit.tar.gz"; hash = "sha256-Xqx5snQWintYJG3Q1Crw22TkNw18DdADXkurMQqt3X8="; @@ -270,11 +280,6 @@ hash = "sha256-f0D9UrlX8bsf4BSTCzb9bN1gYKDlSY9JxmgO6el7HZw="; license = "agpl3Plus"; }; - #money = pkgs.fetchNextcloudApp { - # url = "https://github.com/powerpaul17/nc_money/releases/download/v0.31.0/money.tar.gz"; - # hash = "sha256-6RlxWTCw6NP9RquHnfoLLBw/dmAXx21INCzYUcp3E/4="; - # license = "agpl3Plus"; - #}; passwords = pkgs.fetchNextcloudApp { url = "https://git.mdns.eu/api/v4/projects/45/packages/generic/passwords/2026.5.0/passwords.tar.gz"; hash = "sha256-SJh+MhO3PysP/qIgzZuyKVVjmNKgXoh06IdNRF4fSgQ="; @@ -286,15 +291,25 @@ # Postgresql ############################################################### services.postgresql = { enable = true; + enableTCPIP = true; ensureUsers = [ - {name = "cynerd";} + { + name = "cynerd"; + ensureClauses = { + login = true; + createdb = true; + createrole = true; + bypassrls = true; + replication = true; + }; + } { name = "nextcloud"; ensureDBOwnership = true; } ]; - ensureDatabases = ["nextcloud"]; - #extraPlugins = ps: with ps; [timescaledb]; + ensureDatabases = ["nextcloud" "monitoring"]; + extraPlugins = ps: [ps.timescaledb]; }; # SearX #################################################################### diff --git a/nixos/modules/desktop.nix b/nixos/modules/desktop.nix index 575b85e..37695e9 100644 --- a/nixos/modules/desktop.nix +++ b/nixos/modules/desktop.nix @@ -270,6 +270,7 @@ in { '') ]; }; + playerctld.enable = true; upower.enable = true; hardware.openrgb = { |
