fix nm & upgrade

This commit is contained in:
2025-09-30 16:25:43 +02:00
parent 84ee3b6b12
commit 17f13b141e
7 changed files with 69 additions and 62 deletions

View File

@@ -15,6 +15,9 @@
# Chose NetworkManager, timezone, internationalisation properties and console settings. # Chose NetworkManager, timezone, internationalisation properties and console settings.
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
networking.networkmanager.plugins = with pkgs; [
networkmanager-vpnc
];
time.timeZone = "Europe/Berlin"; time.timeZone = "Europe/Berlin";
i18n.defaultLocale = "en_US.UTF-8"; i18n.defaultLocale = "en_US.UTF-8";
console = { console = {
@@ -78,7 +81,7 @@
# Setting the Basic Packages. # Setting the Basic Packages.
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
(libsForQt5.callPackage ./home/themes/catppuccin-sddm.nix { }) (kdePackages.callPackage ./home/themes/catppuccin-sddm.nix { })
flutter flutter
dart dart
@@ -90,6 +93,11 @@
dmenu dmenu
cmake cmake
cups cups
exfatprogs
exfat
ntfs3g
parted
networkmanager-vpnc
acpilight # For setting Backlight. acpilight # For setting Backlight.
dbus dbus
@@ -131,7 +139,9 @@
gnome.gnome-keyring.enable = true; gnome.gnome-keyring.enable = true;
gnome.gcr-ssh-agent.enable = false; gnome.gcr-ssh-agent.enable = false;
# Disable powerbutton => for use with eww # Disable powerbutton => for use with eww
logind.extraConfig = ''HandlePowerKey=ignore''; logind.settings.Login = {
HandlePowerKey = "ignore";
};
# Setting the permissions for acpilight. # Setting the permissions for acpilight.
udev = { udev = {
enable = true; enable = true;

88
flake.lock generated
View File

@@ -40,11 +40,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1754487366, "lastModified": 1756770412,
"narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", "rev": "4524271976b625a4a605beefd893f270620fd751",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -54,27 +54,6 @@
} }
}, },
"flake-parts_2": { "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": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
"nur", "nur",
@@ -105,11 +84,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1755446520, "lastModified": 1758108966,
"narHash": "sha256-I0Ok1OGDwc1jPd8cs2VvAYZsHriUVFGIUqW+7uSsOUM=", "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "4b04db83821b819bbbe32ed0a025b31e7971f22e", "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -142,18 +121,21 @@
}, },
"hercules-ci-effects": { "hercules-ci-effects": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_2", "flake-parts": [
"neovim-nightly-overlay",
"flake-parts"
],
"nixpkgs": [ "nixpkgs": [
"neovim-nightly-overlay", "neovim-nightly-overlay",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1755233722, "lastModified": 1758022363,
"narHash": "sha256-AavrbMltJKcC2Fx0lfJoZfmy7g87ebXU0ddVenhajLA=", "narHash": "sha256-ENUhCRWgSX4ni751HieNuQoq06dJvApV/Nm89kh+/A0=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "hercules-ci-effects", "repo": "hercules-ci-effects",
"rev": "99e03e72e3f7e13506f80ef9ebaedccb929d84d0", "rev": "1a3667d33e247ad35ca250698d63f49a5453d824",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -169,11 +151,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1755755322, "lastModified": 1759236626,
"narHash": "sha256-spCxkNihCk3uT3LUrUwzdEAjLA/E0EtEgF3KVI05nlM=", "narHash": "sha256-1BjCUU2csqhR5umGYFnOOTU8r8Bi+bnB2SLsr0FLcws=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "282b4c98de97da6667cb03de4f427371734bc39c", "rev": "9e0453a9b0c8ef22de0355b731d712707daa6308",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -195,11 +177,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1755760755, "lastModified": 1759190723,
"narHash": "sha256-udzhcaKGZ+aLsKG8RTPuFSsffDi/NVWeSyhZS5QI4hg=", "narHash": "sha256-igpRtogRoopf/nRFOz0AooHMR3SXorSiF2GSjcryoBQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "f4a1e0151dc5da6ffdb6c2e97a71bf0e968db58a", "rev": "320de62dfe008c9695b72a1f5f7ff24c5dc2a40d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -211,11 +193,11 @@
"neovim-src": { "neovim-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1755713356, "lastModified": 1759187418,
"narHash": "sha256-wAltPeKp8xeOGP2jlVTZPViihUKXcVO0+hB7jWKaRoc=", "narHash": "sha256-RXthxQoYDsB87BXyRQpXXmoXvlfsqGfyzB1Fp230D4c=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "848c7a7894709a5bf73cd09d5612c35426994c0e", "rev": "e7a03dd4e8792d49c4c34fcc8a5bd981a0310208",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -226,11 +208,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1755615617, "lastModified": 1759036355,
"narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "20075955deac2583bb12f07151c2df830ef346b4", "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -242,11 +224,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1755615617, "lastModified": 1759036355,
"narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "20075955deac2583bb12f07151c2df830ef346b4", "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -258,15 +240,15 @@
}, },
"nur": { "nur": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_3", "flake-parts": "flake-parts_2",
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1755804167, "lastModified": 1759238591,
"narHash": "sha256-j4QCks2TM6d8vz2nL1ss6Xl1cOYruf0++ggHsEJeRLY=", "narHash": "sha256-AIgAgdGfjeC8D5uBVpam4yfYz46vDLRo0LgRaWMbmyA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "cfa95fb7da8934b301009a6ffd145f8cbfd655d6", "rev": "dedaf24698f3f085e690e562553757655dfdfa9c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -291,11 +273,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1754847726, "lastModified": 1758728421,
"narHash": "sha256-2vX8QjO5lRsDbNYvN9hVHXLU6oMl+V/PsmIiJREG4rE=", "narHash": "sha256-ySNJ008muQAds2JemiyrWYbwbG+V7S5wg3ZVKGHSFu8=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "7d81f6fb2e19bf84f1c65135d1060d829fae2408", "rev": "5eda4ee8121f97b218f7cc73f5172098d458f1d1",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -2,8 +2,8 @@
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
libsForQt5.dolphin kdePackages.dolphin
libsForQt5.dolphin-plugins kdePackages.dolphin-plugins
nautilus nautilus
udisks udisks
]; ];

View File

@@ -36,7 +36,6 @@
extraConfig = ''rivertile -view-padding 0 -outer-padding 0 &''; extraConfig = ''rivertile -view-padding 0 -outer-padding 0 &'';
settings = { settings = {
spawn = [ spawn = [
"nextcloud --background"
"/home/elias/.config/helperscripts/startEww.sh" "/home/elias/.config/helperscripts/startEww.sh"
]; ];
spawn-tagmask = "${all_but_scratch_tag}"; spawn-tagmask = "${all_but_scratch_tag}";

View File

@@ -1,5 +1,5 @@
{ ... }: { ... }:
{ {
imports = [ ./ssh-agent ./gpg-agent ./hypridle.nix ]; imports = [ ./ssh-agent ./gpg-agent ./hypridle.nix ./nextcloud.nix ./nextcloud.nix ];
} }

View File

@@ -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" ];
};
}

View File

@@ -1,5 +1,4 @@
{ lib, stdenv, fetchFromGitHub, sddm, qtgraphicaleffects, qtquickcontrols2 { lib, stdenv, fetchFromGitHub, sddm, qtgraphs, qtsvg }:
, qtsvg }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "catppuccin-sddm"; pname = "catppuccin-sddm";
@@ -12,7 +11,7 @@ stdenv.mkDerivation {
hash = "sha256-0zoJOTFjQq3gm5i3xCRbyk781kB7BqcWWNrrIkWf2Xk="; hash = "sha256-0zoJOTFjQq3gm5i3xCRbyk781kB7BqcWWNrrIkWf2Xk=";
}; };
buildInputs = [ sddm qtgraphicaleffects qtquickcontrols2 qtsvg ]; buildInputs = [ sddm qtgraphs qtsvg ];
dontWrapQtApps = true; dontWrapQtApps = true;