From 17f13b141e8aa0cfe4f2c2b321f3162c86f3d46b Mon Sep 17 00:00:00 2001 From: 4Lost Date: Tue, 30 Sep 2025 16:25:43 +0200 Subject: [PATCH] fix nm & upgrade --- configuration.nix | 14 +++++- flake.lock | 88 +++++++++++++-------------------- home/programs/dolphin.nix | 4 +- home/programs/river/default.nix | 1 - home/services/default.nix | 2 +- home/services/nextcloud.nix | 17 +++++++ home/themes/catppuccin-sddm.nix | 5 +- 7 files changed, 69 insertions(+), 62 deletions(-) create mode 100644 home/services/nextcloud.nix diff --git a/configuration.nix b/configuration.nix index deef321..24e4d26 100644 --- a/configuration.nix +++ b/configuration.nix @@ -15,6 +15,9 @@ # Chose NetworkManager, timezone, internationalisation properties and console settings. networking.networkmanager.enable = true; + networking.networkmanager.plugins = with pkgs; [ + networkmanager-vpnc + ]; time.timeZone = "Europe/Berlin"; i18n.defaultLocale = "en_US.UTF-8"; console = { @@ -78,7 +81,7 @@ # Setting the Basic Packages. environment.systemPackages = with pkgs; [ - (libsForQt5.callPackage ./home/themes/catppuccin-sddm.nix { }) + (kdePackages.callPackage ./home/themes/catppuccin-sddm.nix { }) flutter dart @@ -90,6 +93,11 @@ dmenu cmake cups + exfatprogs + exfat + ntfs3g + parted + networkmanager-vpnc acpilight # For setting Backlight. dbus @@ -131,7 +139,9 @@ gnome.gnome-keyring.enable = true; gnome.gcr-ssh-agent.enable = false; # Disable powerbutton => for use with eww - logind.extraConfig = ''HandlePowerKey=ignore''; + logind.settings.Login = { + HandlePowerKey = "ignore"; + }; # Setting the permissions for acpilight. udev = { enable = true; diff --git a/flake.lock b/flake.lock index 858406d..52d18ee 100644 --- a/flake.lock +++ b/flake.lock @@ -40,11 +40,11 @@ ] }, "locked": { - "lastModified": 1754487366, - "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", + "rev": "4524271976b625a4a605beefd893f270620fd751", "type": "github" }, "original": { @@ -54,27 +54,6 @@ } }, "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "neovim-nightly-overlay", - "hercules-ci-effects", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1754487366, - "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", - "type": "github" - }, - "original": { - "id": "flake-parts", - "type": "indirect" - } - }, - "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "nur", @@ -105,11 +84,11 @@ ] }, "locked": { - "lastModified": 1755446520, - "narHash": "sha256-I0Ok1OGDwc1jPd8cs2VvAYZsHriUVFGIUqW+7uSsOUM=", + "lastModified": 1758108966, + "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "4b04db83821b819bbbe32ed0a025b31e7971f22e", + "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b", "type": "github" }, "original": { @@ -142,18 +121,21 @@ }, "hercules-ci-effects": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": [ + "neovim-nightly-overlay", + "flake-parts" + ], "nixpkgs": [ "neovim-nightly-overlay", "nixpkgs" ] }, "locked": { - "lastModified": 1755233722, - "narHash": "sha256-AavrbMltJKcC2Fx0lfJoZfmy7g87ebXU0ddVenhajLA=", + "lastModified": 1758022363, + "narHash": "sha256-ENUhCRWgSX4ni751HieNuQoq06dJvApV/Nm89kh+/A0=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "99e03e72e3f7e13506f80ef9ebaedccb929d84d0", + "rev": "1a3667d33e247ad35ca250698d63f49a5453d824", "type": "github" }, "original": { @@ -169,11 +151,11 @@ ] }, "locked": { - "lastModified": 1755755322, - "narHash": "sha256-spCxkNihCk3uT3LUrUwzdEAjLA/E0EtEgF3KVI05nlM=", + "lastModified": 1759236626, + "narHash": "sha256-1BjCUU2csqhR5umGYFnOOTU8r8Bi+bnB2SLsr0FLcws=", "owner": "nix-community", "repo": "home-manager", - "rev": "282b4c98de97da6667cb03de4f427371734bc39c", + "rev": "9e0453a9b0c8ef22de0355b731d712707daa6308", "type": "github" }, "original": { @@ -195,11 +177,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1755760755, - "narHash": "sha256-udzhcaKGZ+aLsKG8RTPuFSsffDi/NVWeSyhZS5QI4hg=", + "lastModified": 1759190723, + "narHash": "sha256-igpRtogRoopf/nRFOz0AooHMR3SXorSiF2GSjcryoBQ=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "f4a1e0151dc5da6ffdb6c2e97a71bf0e968db58a", + "rev": "320de62dfe008c9695b72a1f5f7ff24c5dc2a40d", "type": "github" }, "original": { @@ -211,11 +193,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1755713356, - "narHash": "sha256-wAltPeKp8xeOGP2jlVTZPViihUKXcVO0+hB7jWKaRoc=", + "lastModified": 1759187418, + "narHash": "sha256-RXthxQoYDsB87BXyRQpXXmoXvlfsqGfyzB1Fp230D4c=", "owner": "neovim", "repo": "neovim", - "rev": "848c7a7894709a5bf73cd09d5612c35426994c0e", + "rev": "e7a03dd4e8792d49c4c34fcc8a5bd981a0310208", "type": "github" }, "original": { @@ -226,11 +208,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "lastModified": 1759036355, + "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", "type": "github" }, "original": { @@ -242,11 +224,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "lastModified": 1759036355, + "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", "type": "github" }, "original": { @@ -258,15 +240,15 @@ }, "nur": { "inputs": { - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_2", "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1755804167, - "narHash": "sha256-j4QCks2TM6d8vz2nL1ss6Xl1cOYruf0++ggHsEJeRLY=", + "lastModified": 1759238591, + "narHash": "sha256-AIgAgdGfjeC8D5uBVpam4yfYz46vDLRo0LgRaWMbmyA=", "owner": "nix-community", "repo": "NUR", - "rev": "cfa95fb7da8934b301009a6ffd145f8cbfd655d6", + "rev": "dedaf24698f3f085e690e562553757655dfdfa9c", "type": "github" }, "original": { @@ -291,11 +273,11 @@ ] }, "locked": { - "lastModified": 1754847726, - "narHash": "sha256-2vX8QjO5lRsDbNYvN9hVHXLU6oMl+V/PsmIiJREG4rE=", + "lastModified": 1758728421, + "narHash": "sha256-ySNJ008muQAds2JemiyrWYbwbG+V7S5wg3ZVKGHSFu8=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "7d81f6fb2e19bf84f1c65135d1060d829fae2408", + "rev": "5eda4ee8121f97b218f7cc73f5172098d458f1d1", "type": "github" }, "original": { diff --git a/home/programs/dolphin.nix b/home/programs/dolphin.nix index f5345f6..261a27c 100644 --- a/home/programs/dolphin.nix +++ b/home/programs/dolphin.nix @@ -2,8 +2,8 @@ { home.packages = with pkgs; [ - libsForQt5.dolphin - libsForQt5.dolphin-plugins + kdePackages.dolphin + kdePackages.dolphin-plugins nautilus udisks ]; diff --git a/home/programs/river/default.nix b/home/programs/river/default.nix index e347dd3..97b3a0d 100644 --- a/home/programs/river/default.nix +++ b/home/programs/river/default.nix @@ -36,7 +36,6 @@ extraConfig = ''rivertile -view-padding 0 -outer-padding 0 &''; settings = { spawn = [ - "nextcloud --background" "/home/elias/.config/helperscripts/startEww.sh" ]; spawn-tagmask = "${all_but_scratch_tag}"; diff --git a/home/services/default.nix b/home/services/default.nix index c299f24..dd49fd1 100644 --- a/home/services/default.nix +++ b/home/services/default.nix @@ -1,5 +1,5 @@ { ... }: { - imports = [ ./ssh-agent ./gpg-agent ./hypridle.nix ]; + imports = [ ./ssh-agent ./gpg-agent ./hypridle.nix ./nextcloud.nix ./nextcloud.nix ]; } diff --git a/home/services/nextcloud.nix b/home/services/nextcloud.nix new file mode 100644 index 0000000..b56008b --- /dev/null +++ b/home/services/nextcloud.nix @@ -0,0 +1,17 @@ +{ pkgs, ... }: + +{ + systemd.user.services.nextcloud = { + description = "Nextcloud Desktop Client"; + after = [ "graphical-session.target" ]; # started nach der grafischen Sitzung + serviceConfig = { + ExecStart = "${pkgs.nextcloud}/bin/nextcloud"; + Restart = "on-failure"; + Environment = '' + MOZ_ENABLE_WAYLAND=1 + GDK_BACKEND=wayland + ''; + }; + wantedBy = [ "default.target" ]; + }; +} diff --git a/home/themes/catppuccin-sddm.nix b/home/themes/catppuccin-sddm.nix index 52a3db4..e0157a3 100644 --- a/home/themes/catppuccin-sddm.nix +++ b/home/themes/catppuccin-sddm.nix @@ -1,5 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, sddm, qtgraphicaleffects, qtquickcontrols2 -, qtsvg }: +{ lib, stdenv, fetchFromGitHub, sddm, qtgraphs, qtsvg }: stdenv.mkDerivation { pname = "catppuccin-sddm"; @@ -12,7 +11,7 @@ stdenv.mkDerivation { hash = "sha256-0zoJOTFjQq3gm5i3xCRbyk781kB7BqcWWNrrIkWf2Xk="; }; - buildInputs = [ sddm qtgraphicaleffects qtquickcontrols2 qtsvg ]; + buildInputs = [ sddm qtgraphs qtsvg ]; dontWrapQtApps = true;