Move kdeconnect to system and install qbittorrent with home manager

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711588700,
+        "lastModified": 1711934712,
-        "narHash": "sha256-vBB5HoQVnA6c/UrDOhLXKAahEwSRccw2YXYHxD7qoi4=",
+        "narHash": "sha256-sBDe+QmX/QohlnKeSEzrftcXyZL5FY09OMjZ59Rpyy4=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "502241afa3de2a24865ddcbe4c122f4546e32092",
+        "rev": "611c9ea53250f7bb22286b3d26872280a0e608f9",
         "type": "github"
       },
       "original": {
@@ -224,11 +224,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711868868,
+        "lastModified": 1712016346,
-        "narHash": "sha256-QpZanlbVu6Gb2K96u3vgu0F2BvZD74+fOsIFWcYEXoY=",
+        "narHash": "sha256-O2nO7pD+krq+4HgkLB4VThRtAucIPfXDs/jJqCGlK1w=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "30f2ec39519f4f5a8a96af808c439e730c15aeab",
+        "rev": "4be0464472675212654dedf3e021bd5f1d58b92f",
         "type": "github"
       },
       "original": {

system/gui/dwm.nix

@@ -51,6 +51,10 @@
     package = pkgs.redshift;
     executable = "/bin/redshift-gtk";
   };
+  services.geoclue2 = {
+    enable = true;
+  };
+  location.provider = "geoclue2";
 
   # File Manager
   programs.thunar = {

system/utilities/default.nix

@@ -10,5 +10,6 @@
     ./user-shell.nix
     ./samba.nix
     ./cloud.nix
+    ./phone.nix
   ];
 }

system/utilities/samba.nix

@@ -9,16 +9,14 @@
   fileSystems."/mnt/fileserver" = {
     device = "//192.168.12.5/fileserver";
     fsType = "cifs";
-    options = let
+    options =
+    let
       # this line prevents hanging on network split
       automount_opts = "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s";
-
+      username = userSettings.username;
-    in [
+      uid = config.users.users.${username}.uid;
-      "${automount_opts},
+      gid = config.users.groups.${username}.gid;
-      credentials=/etc/nixos/smb-secrets,
+    in [ "${automount_opts},credentials=/etc/nixos/smb-secrets,uid=${toString uid},gid=${toString gid}" ];
-      ${config.users.users.${userSettings.username}.uid},
-      gid=${config.users.groups.${userSettings.username}.gid}"
-    ];
     # Make sure to create `/etc/nixos/smb-secrets` with following content
     # where domain can be optional
     # username=<USERNAME>

user/utilities/default.nix

@@ -9,7 +9,6 @@
     ./passwords.nix
     ./xdg.nix
     ./screenshot.nix
-    ./phone.nix
     ./downloads.nix
   ];
 }

user/utilities/downloads.nix

@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 {
-  environment.systemPackages = with pkgs; [
+  home.packages = (with pkgs; [
     qbittorrent-qt5
-  ];
+  ]);
 }