nextcloud 26 -> nextcloud 27

This commit is contained in:
Rouven Seifert 2023-06-19 10:37:17 +02:00
parent fa6f58e0e9
commit 20dd0ece6c
Signed by: rouven.seifert
GPG key ID: B95E8FE6B11C4D09
5 changed files with 38 additions and 29 deletions

View file

@ -170,11 +170,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1686837967, "lastModified": 1687098182,
"narHash": "sha256-wjoR9xKW9L8HNr0cDYFvQN/CemsMo76KRRnJnXmsZ1Y=", "narHash": "sha256-kBys+Cwmcxzh7UNVWTrunOgaR02zl2XN3feA8fSlqVo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d214b93ee3c82b2746b85e8cb96bc150c6a74e50", "rev": "0480dabc99e1b669ebe909949180fa2786e733cd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -229,11 +229,11 @@
"pre-commit-hooks-nix": "pre-commit-hooks-nix" "pre-commit-hooks-nix": "pre-commit-hooks-nix"
}, },
"locked": { "locked": {
"lastModified": 1686692834, "lastModified": 1687124707,
"narHash": "sha256-EFjJ/r4iYVKO+XdL15g9bzOKbCExTGeqNEVHSn0H7/E=", "narHash": "sha256-BEC2y7zwDI/Saeupr9rijLvwb0OoqTD9vntlcyciyrM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lanzaboote", "repo": "lanzaboote",
"rev": "823ad6b70bf09b91c3a9dd9a64678ec80ba3c1ee", "rev": "c758cdad465e0c8174db57dc493f51a89f0e3372",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -268,11 +268,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1686740472, "lastModified": 1687097842,
"narHash": "sha256-b668DY2qGdBCUwIkk6Z32bcpCsUISQJrEEvhtn1gGgY=", "narHash": "sha256-NPAaRZx5foWLgIPfEaiEZMr9JIlEQhLEVEXpx09341Q=",
"owner": "Mic92", "owner": "Mic92",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "e11c61073b777e025993c5ef63ddbf776a9cca15", "rev": "c8210cb3fcde6860255b54ddba74dc177e6232cd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -297,11 +297,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1686592866, "lastModified": 1686960236,
"narHash": "sha256-riGg89eWhXJcPNrQGcSwTEEm7CGxWC06oSX44hajeMw=", "narHash": "sha256-AYCC9rXNLpUWzD9hm+askOfpliLEC9kwAo7ITJc4HIw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0eeebd64de89e4163f4d3cf34ffe925a5cf67a05", "rev": "04af42f3b31dba0ef742d254456dc4c14eedac86",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -358,16 +358,16 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1686392259, "lastModified": 1687031877,
"narHash": "sha256-hqSS9hKhWldIZr1bBp9xKhIznnGPICGKzuehd2LH0UA=", "narHash": "sha256-yMFcVeI+kZ6KD2QBrFPNsvBrLq2Gt//D0baHByMrjFY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ef24b2fa0c5f290a35064b847bc211f25cb85c88", "rev": "e2e2059d19668dab1744301b8b0e821e3aae9c99",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "release-22.11", "ref": "release-23.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -410,11 +410,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1686818988, "lastModified": 1687103994,
"narHash": "sha256-lH42fCPegnZDYZguGyvRRacF6QrWhkvpYWikeosh7KE=", "narHash": "sha256-HqpnLauoN4+dFAGTNCuFjmGPGCTPu4U5Ftfpz+yxpEo=",
"owner": "therealr5", "owner": "therealr5",
"repo": "purge", "repo": "purge",
"rev": "3ee729993f1ad31eee8b31e0541fabe917b7b705", "rev": "235766c0541f19a6259fdccfacd213ec40dc1c71",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -471,11 +471,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1686453485, "lastModified": 1687058111,
"narHash": "sha256-75iPAcS6xuw4SNfqLmFCi9wWG1JmDNKaC8l3WJUkmDk=", "narHash": "sha256-xDSn/APfAdJinHV4reTfplX5XnLsJSGdVwHpmdgP9Mo=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "cb85e297937af1bd1434cf5f85a3f86a21dc8207", "rev": "1634d2da53f079e7f5924efa7a96511cd9596f81",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -506,11 +506,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1686758268, "lastModified": 1687101157,
"narHash": "sha256-7+v3bP3WpodIHvxeCVs5/+Iu0AiLYbMZgZT+eBzXrBI=", "narHash": "sha256-IgYDpLUQcbBApMTd4cYwZkchPprVFLddT9PTUx0TRJM=",
"owner": "therealr5", "owner": "therealr5",
"repo": "TruckSimulatorBot", "repo": "TruckSimulatorBot",
"rev": "9ecbf74463faa5a8b7e19929c777716820472df0", "rev": "68ad7fb76fe7667db041034968c59627fc7ff2fb",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -58,6 +58,7 @@
htop-vim htop-vim
helix helix
lsof lsof
btdu
]; ];
programs.git = { programs.git = {
enable = true; enable = true;

View file

@ -26,7 +26,7 @@ in
nextcloud = { nextcloud = {
enable = true; enable = true;
package = pkgs.nextcloud26; # Use current latest nextcloud package package = pkgs.nextcloud27; # Use current latest nextcloud package
hostName = "${domain}"; hostName = "${domain}";
https = true; # Use https for all urls https = true; # Use https for all urls
config = { config = {

View file

@ -31,6 +31,11 @@
xkb_layout = "us"; xkb_layout = "us";
xkb_variant = "dvorak-alt-intl"; xkb_variant = "dvorak-alt-intl";
}; };
"2:7:SynPS/2_Synaptics_TouchPad" = {
tap = "enabled";
drag = "enabled";
middle_emulation = "enabled";
};
}; };
keybindings = keybindings =
lib.mkOptionDefault { lib.mkOptionDefault {

View file

@ -1,5 +1,7 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
with lib; with lib;
let let
cfg = config.services.shikane; cfg = config.services.shikane;
tomlFormat = pkgs.formats.toml { }; tomlFormat = pkgs.formats.toml { };
@ -7,7 +9,8 @@ in
{ {
meta.maintainers = [ hm.maintainers.therealr5 ]; meta.maintainers = [ hm.maintainers.therealr5 ];
options.services.shikane = { options.services.shikane = {
enable = mkEnableOption "shikane, A dynamic output configuration tool that automatically detects and configures connected outputs based on a set of profiles."; enable = mkEnableOption
"shikane, A dynamic output configuration tool that automatically detects and configures connected outputs based on a set of profiles.";
package = mkOption { package = mkOption {
type = types.package; type = types.package;
default = pkgs.shikane; default = pkgs.shikane;
@ -60,6 +63,7 @@ in
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
xdg.configFile."shikane/config.toml".source = tomlFormat.generate "shikane-config" cfg.settings;
systemd.user.services.shikane = { systemd.user.services.shikane = {
Unit = { Unit = {
Description = "Dynamic output configuration tool"; Description = "Dynamic output configuration tool";
@ -68,11 +72,10 @@ in
}; };
Service = { Service = {
ExecStart = "${cfg.package}/bin/shikane -c ${tomlFormat.generate "shikane-config" cfg.settings}"; ExecStart = "${cfg.package}/bin/shikane";
}; };
Install = { WantedBy = [ "graphical-session.target" ]; }; Install = { WantedBy = [ "graphical-session.target" ]; };
}; };
}; };
} }