upgrade system

flake.lock

@@ -1,5 +1,27 @@
 {
   "nodes": {
+    "android-nixpkgs": {
+      "inputs": {
+        "devshell": "devshell",
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1635884376,
+        "narHash": "sha256-wFaY4kd8UmS7z4TMCc19tu3ZOmEPbC2hncQXcZRAkDU=",
+        "owner": "tadfisher",
+        "repo": "android-nixpkgs",
+        "rev": "22c1400141fefe7be8666b119a7fd8668176293e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tadfisher",
+        "repo": "android-nixpkgs",
+        "type": "github"
+      }
+    },
     "base16": {
       "inputs": {
         "nixpkgs": "nixpkgs"
@@ -66,6 +88,36 @@
         "type": "gitlab"
       }
     },
+    "devshell": {
+      "locked": {
+        "lastModified": 1631528035,
+        "narHash": "sha256-ZV4+WsrF1uaAOM2ynGzWD5dCmrWpKc+Rj1hZkodEPQY=",
+        "owner": "numtide",
+        "repo": "devshell",
+        "rev": "dd0d585d2ed42b9d226673dd56d4fe2dfd0bf0dc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "devshell",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "locked": {
+        "lastModified": 1631561581,
+        "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -73,11 +125,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1635285717,
+        "lastModified": 1635839387,
-        "narHash": "sha256-CGsOBSkdjIHmKEbUkik1JKQhiKCJ64Hj7dROx7yEDCo=",
+        "narHash": "sha256-2B6DqfTiwY5w2TljC4+AxEUuVYMTP5Fo2h5iGNIONvk=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "46a69810cb95d2e7286089830dc535d6719eaa6f",
+        "rev": "288faaa5a65e72e37e6027024829b15c8bb69286",
         "type": "github"
       },
       "original": {
@@ -160,11 +212,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1635332953,
+        "lastModified": 1635850405,
-        "narHash": "sha256-jL1ziAo75FUPL0LmWDRidiDJzNxX+mQlr7t9+t3EAGU=",
+        "narHash": "sha256-T+cJNPhS6KYCYaB1HR+GEaGvAmFkQg/JBybkh5PXkSQ=",
         "owner": "NixOS",
         "repo": "nix",
-        "rev": "6e684d1b8747ed0180489eacbdf920a82162e249",
+        "rev": "37b5460ebd1b29fe3c0bf43ff90e34b24045ae90",
         "type": "github"
       },
       "original": {
@@ -239,11 +291,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1635333802,
+        "lastModified": 1635858089,
-        "narHash": "sha256-HGACg/gHNOP9jSIdSCa6Gkf1i2kgyyzNB+6uMxVOFaA=",
+        "narHash": "sha256-Z72QmBdBbtfbht+yFl/giweV9r3TIvDwsJAFOlyEYH4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a90064443bc2aaed44d02aa170484d317cb130de",
+        "rev": "d916b800cc54f8f6c3388a9730621dcc0c416d6c",
         "type": "github"
       },
       "original": {
@@ -318,11 +370,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1634782485,
+        "lastModified": 1635792138,
-        "narHash": "sha256-psfh4OQSokGXG0lpq3zKFbhOo3QfoeudRcaUnwMRkQo=",
+        "narHash": "sha256-D79GqaYrwgyM4wvOPbQeKveAHROnVh97F36iSGZO9uA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "34ad3ffe08adfca17fcb4e4a47bb5f3b113687be",
+        "rev": "b165ce0c4efbb74246714b5c66b6bcdce8cde175",
         "type": "github"
       },
       "original": {
@@ -335,11 +387,11 @@
     "qbittorrent-ee": {
       "flake": false,
       "locked": {
-        "lastModified": 1630342029,
+        "lastModified": 1635705887,
-        "narHash": "sha256-KIfvEZRAegwhVESjtTdMoP5YgXAtfSgGkt8f7+bEgjA=",
+        "narHash": "sha256-MiAfqcalfk6CWBtLtENnwc0W17MLSZOoLuzfu/xP4Pw=",
         "owner": "c0re100",
         "repo": "qBittorrent-Enhanced-Edition",
-        "rev": "a0f2567d14d8e36702df9aaa066e1fd4f973027a",
+        "rev": "a3955360cd527a641d4623fd84609bc072c574e2",
         "type": "github"
       },
       "original": {
@@ -350,6 +402,7 @@
     },
     "root": {
       "inputs": {
+        "android-nixpkgs": "android-nixpkgs",
         "base16": "base16",
         "base16-horizon-scheme": "base16-horizon-scheme",
         "base16-tokyonight-scheme": "base16-tokyonight-scheme",
@@ -376,11 +429,11 @@
     "rycee": {
       "flake": false,
       "locked": {
-        "lastModified": 1635286343,
+        "lastModified": 1635841253,
-        "narHash": "sha256-9wAvo5L+k7HMQzIU7WyE/8Qb2YVbXVSFpbTVlHcFOrE=",
+        "narHash": "sha256-FXWBTqA8yTk569dIn69bk5YkbVjNVBQnSJm2ivd2aUw=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "aa654a8ade0d76a3440245c1d666f6eb3eab230c",
+        "rev": "eccc98d836e3ab47f3846972a55d999910963777",
         "type": "gitlab"
       },
       "original": {
@@ -399,11 +452,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1634237121,
+        "lastModified": 1635808698,
-        "narHash": "sha256-rOHq6XaWzMnQXRsgcDiA2Dbzl7IZ0Q5S6RI+k63z3nQ=",
+        "narHash": "sha256-qeRonS/oVIN094cU3jyBKXK+75po/Gv6lurhVAUo1rc=",
         "owner": "simple-nixos-mailserver",
         "repo": "nixos-mailserver",
-        "rev": "0d9a880c0e41a553c5d9af4efa62169db7ddeb62",
+        "rev": "ef8ca96c5d0097a0feaf6059a9b012001a096a7f",
         "type": "gitlab"
       },
       "original": {

flake.nix

@@ -10,6 +10,10 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    android-nixpkgs = {
+      url = "github:tadfisher/android-nixpkgs";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     base16.url = "github:alukardbf/base16-nix";
     base16-horizon-scheme = {
       url = "github:michael-ball/base16-horizon-scheme";

profiles/sound/default.nix

@@ -4,7 +4,6 @@
   imports = [
     ./pipewire.nix
     ./easyeffects
-    # ./mopidy.nix
   ];
 
 

profiles/sound/mopidy.nix

@@ -1,56 +0,0 @@
-{ pkgs, config, lib, ... }: {
-  # TODO: FIXIT!
-  services.mopidy = {
-    enable = true;
-    # extensionPackages = with pkgs; [ mopidy-gmusic mopidy-youtube ];
-    configuration = ''
-      [mpd]
-      hostname = 0.0.0.0
-      [audio]
-      output = pulsesink server=127.0.0.1
-      [local]
-      enabled = true
-      library = json
-      media_dir = /home/alukard/Music
-      scan_timeout = 1000
-      scan_flush_threshold = 100
-      scan_follow_symlinks = false
-    '';
-  };
-
-  systemd.services.mopidy = {
-    after = [ "network-online.target" ];
-  };
-
-  # users.users.mopidy = {
-  #   isNormalUser = false;
-  #   extraGroups = [
-  #     "smbuser"
-  #   ];
-  # };
-  # services.mopidy = {
-  #   enable = true;
-  #   # extensionPackages = with pkgs; [ mopidy-local ];
-  #   configuration = ''
-  #     [local]
-  #     enabled = true
-  #     library = json
-  #     media_dir = /home/alukard/Music
-  #     scan_timeout = 1000
-  #     scan_flush_threshold = 100
-  #     scan_follow_symlinks = false
-
-  #     [audio]
-  #     output = pulsesink server=127.0.0.1
-
-  #     [mpd]
-  #     hostname = 0.0.0.0
-  #   '';
-  # };
-  # home-manager.users.alukard.home.file.".ncmpcpp/config".text = ''
-  #   mpd_host = 127.0.0.1
-  #   mpd_port = 6600
-  #   mpd_music_dir = "/media/files/Music"
-  # '';
-
-}

roles/desktop.nix

@@ -20,7 +20,6 @@
     himalaya
     kitty
     mangohud
-    mopidy
     mpv
     ncmpcpp
     packages