From 20dd0ece6ceb2a783dbfd44e5588b1b401ed1c9f Mon Sep 17 00:00:00 2001 From: Rouven Seifert Date: Mon, 19 Jun 2023 10:37:17 +0200 Subject: [PATCH] nextcloud 26 -> nextcloud 27 --- flake.lock | 50 ++++++++++++------------- hosts/nuc/default.nix | 1 + hosts/nuc/modules/nextcloud/default.nix | 2 +- users/rouven/modules/sway/default.nix | 5 +++ users/rouven/options/shikane.nix | 9 +++-- 5 files changed, 38 insertions(+), 29 deletions(-) diff --git a/flake.lock b/flake.lock index 092f524..603118f 100644 --- a/flake.lock +++ b/flake.lock @@ -170,11 +170,11 @@ ] }, "locked": { - "lastModified": 1686837967, - "narHash": "sha256-wjoR9xKW9L8HNr0cDYFvQN/CemsMo76KRRnJnXmsZ1Y=", + "lastModified": 1687098182, + "narHash": "sha256-kBys+Cwmcxzh7UNVWTrunOgaR02zl2XN3feA8fSlqVo=", "owner": "nix-community", "repo": "home-manager", - "rev": "d214b93ee3c82b2746b85e8cb96bc150c6a74e50", + "rev": "0480dabc99e1b669ebe909949180fa2786e733cd", "type": "github" }, "original": { @@ -229,11 +229,11 @@ "pre-commit-hooks-nix": "pre-commit-hooks-nix" }, "locked": { - "lastModified": 1686692834, - "narHash": "sha256-EFjJ/r4iYVKO+XdL15g9bzOKbCExTGeqNEVHSn0H7/E=", + "lastModified": 1687124707, + "narHash": "sha256-BEC2y7zwDI/Saeupr9rijLvwb0OoqTD9vntlcyciyrM=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "823ad6b70bf09b91c3a9dd9a64678ec80ba3c1ee", + "rev": "c758cdad465e0c8174db57dc493f51a89f0e3372", "type": "github" }, "original": { @@ -268,11 +268,11 @@ ] }, "locked": { - "lastModified": 1686740472, - "narHash": "sha256-b668DY2qGdBCUwIkk6Z32bcpCsUISQJrEEvhtn1gGgY=", + "lastModified": 1687097842, + "narHash": "sha256-NPAaRZx5foWLgIPfEaiEZMr9JIlEQhLEVEXpx09341Q=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "e11c61073b777e025993c5ef63ddbf776a9cca15", + "rev": "c8210cb3fcde6860255b54ddba74dc177e6232cd", "type": "github" }, "original": { @@ -297,11 +297,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1686592866, - "narHash": "sha256-riGg89eWhXJcPNrQGcSwTEEm7CGxWC06oSX44hajeMw=", + "lastModified": 1686960236, + "narHash": "sha256-AYCC9rXNLpUWzD9hm+askOfpliLEC9kwAo7ITJc4HIw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0eeebd64de89e4163f4d3cf34ffe925a5cf67a05", + "rev": "04af42f3b31dba0ef742d254456dc4c14eedac86", "type": "github" }, "original": { @@ -358,16 +358,16 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1686392259, - "narHash": "sha256-hqSS9hKhWldIZr1bBp9xKhIznnGPICGKzuehd2LH0UA=", + "lastModified": 1687031877, + "narHash": "sha256-yMFcVeI+kZ6KD2QBrFPNsvBrLq2Gt//D0baHByMrjFY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ef24b2fa0c5f290a35064b847bc211f25cb85c88", + "rev": "e2e2059d19668dab1744301b8b0e821e3aae9c99", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-22.11", + "ref": "release-23.05", "repo": "nixpkgs", "type": "github" } @@ -410,11 +410,11 @@ ] }, "locked": { - "lastModified": 1686818988, - "narHash": "sha256-lH42fCPegnZDYZguGyvRRacF6QrWhkvpYWikeosh7KE=", + "lastModified": 1687103994, + "narHash": "sha256-HqpnLauoN4+dFAGTNCuFjmGPGCTPu4U5Ftfpz+yxpEo=", "owner": "therealr5", "repo": "purge", - "rev": "3ee729993f1ad31eee8b31e0541fabe917b7b705", + "rev": "235766c0541f19a6259fdccfacd213ec40dc1c71", "type": "github" }, "original": { @@ -471,11 +471,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1686453485, - "narHash": "sha256-75iPAcS6xuw4SNfqLmFCi9wWG1JmDNKaC8l3WJUkmDk=", + "lastModified": 1687058111, + "narHash": "sha256-xDSn/APfAdJinHV4reTfplX5XnLsJSGdVwHpmdgP9Mo=", "owner": "Mic92", "repo": "sops-nix", - "rev": "cb85e297937af1bd1434cf5f85a3f86a21dc8207", + "rev": "1634d2da53f079e7f5924efa7a96511cd9596f81", "type": "github" }, "original": { @@ -506,11 +506,11 @@ ] }, "locked": { - "lastModified": 1686758268, - "narHash": "sha256-7+v3bP3WpodIHvxeCVs5/+Iu0AiLYbMZgZT+eBzXrBI=", + "lastModified": 1687101157, + "narHash": "sha256-IgYDpLUQcbBApMTd4cYwZkchPprVFLddT9PTUx0TRJM=", "owner": "therealr5", "repo": "TruckSimulatorBot", - "rev": "9ecbf74463faa5a8b7e19929c777716820472df0", + "rev": "68ad7fb76fe7667db041034968c59627fc7ff2fb", "type": "github" }, "original": { diff --git a/hosts/nuc/default.nix b/hosts/nuc/default.nix index 869fb37..325919d 100644 --- a/hosts/nuc/default.nix +++ b/hosts/nuc/default.nix @@ -58,6 +58,7 @@ htop-vim helix lsof + btdu ]; programs.git = { enable = true; diff --git a/hosts/nuc/modules/nextcloud/default.nix b/hosts/nuc/modules/nextcloud/default.nix index ec913b6..9b042af 100644 --- a/hosts/nuc/modules/nextcloud/default.nix +++ b/hosts/nuc/modules/nextcloud/default.nix @@ -26,7 +26,7 @@ in nextcloud = { enable = true; - package = pkgs.nextcloud26; # Use current latest nextcloud package + package = pkgs.nextcloud27; # Use current latest nextcloud package hostName = "${domain}"; https = true; # Use https for all urls config = { diff --git a/users/rouven/modules/sway/default.nix b/users/rouven/modules/sway/default.nix index 78c4663..435e280 100644 --- a/users/rouven/modules/sway/default.nix +++ b/users/rouven/modules/sway/default.nix @@ -31,6 +31,11 @@ xkb_layout = "us"; xkb_variant = "dvorak-alt-intl"; }; + "2:7:SynPS/2_Synaptics_TouchPad" = { + tap = "enabled"; + drag = "enabled"; + middle_emulation = "enabled"; + }; }; keybindings = lib.mkOptionDefault { diff --git a/users/rouven/options/shikane.nix b/users/rouven/options/shikane.nix index a55232b..e5304d5 100644 --- a/users/rouven/options/shikane.nix +++ b/users/rouven/options/shikane.nix @@ -1,5 +1,7 @@ { config, lib, pkgs, ... }: + with lib; + let cfg = config.services.shikane; tomlFormat = pkgs.formats.toml { }; @@ -7,7 +9,8 @@ in { meta.maintainers = [ hm.maintainers.therealr5 ]; 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 { type = types.package; default = pkgs.shikane; @@ -60,6 +63,7 @@ in }; config = mkIf cfg.enable { + xdg.configFile."shikane/config.toml".source = tomlFormat.generate "shikane-config" cfg.settings; systemd.user.services.shikane = { Unit = { Description = "Dynamic output configuration tool"; @@ -68,11 +72,10 @@ in }; Service = { - ExecStart = "${cfg.package}/bin/shikane -c ${tomlFormat.generate "shikane-config" cfg.settings}"; + ExecStart = "${cfg.package}/bin/shikane"; }; Install = { WantedBy = [ "graphical-session.target" ]; }; }; }; } -