common/default.nix

@@ -22,17 +22,7 @@
   programs.mosh.enable = true;
 
   environment.systemPackages = with pkgs; [
-    wget
+    wget kakoune htop git dnsutils tmux nethogs iotop pciutils usbutils
-    kakoune
-    htop
-    git git-lfs
-    dnsutils
-    tmux
-    nethogs
-    iotop
-    pciutils
-    usbutils
-    killall
   ];
 
   nixpkgs.config.allowUnfree = true;

common/pc/chromium.nix

@@ -60,8 +60,6 @@ in {
         "oboonakemofpalcgghocfoadofidjkkk" # keepassxc plugin
         "cimiefiiaegbelhefglklhhakcgmhkai" # plasma integration
         "hkgfoiooedgoejojocmhlaklaeopbecg" # picture in picture
-        "fihnjjcciajhdojfnbdddfaoknhalnja" # I don't care about cookies
-        "mnjggcdmjocbbbhaepdhchncahnbgone" # SponsorBlock
       ];
       extraOpts = {
         "BrowserSignin" = 0;

common/pc/default.nix

@@ -44,8 +44,6 @@ in {
       sauerbraten
       gnome.file-roller
       gparted
-      lm_sensors
-      libreoffice-fresh
     ];
 
     # Networking

common/pc/spotify.nix

@@ -53,7 +53,6 @@ in
     age.secrets.spotifyd = {
       file = ../../secrets/spotifyd.age;
       group = "spotifyd";
-      mode = "0440"; # group can read
     };
 
     # spotifyd to read secrets and run as user service
@@ -71,9 +70,8 @@ in
     };
 
     systemd.user.services.spotifyd-daemon = {
-      enable = true;
+      wantedBy = [ "multi-user.target" ];
-      wantedBy = [ "graphical-session.target" ];
+      after = [ "network-online.target" "sound.target" ];
-      partOf = [ "graphical-session.target" ];
       description = "spotifyd, a Spotify playing daemon";
       environment.SHELL = "/bin/sh";
       serviceConfig = {

flake.lock

@@ -2,9 +2,7 @@
   "nodes": {
     "agenix": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs"
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1646845404,
@@ -103,15 +101,15 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1646675913,
+        "lastModified": 1638587357,
-        "narHash": "sha256-ZvGf51XpXM7JojKLZ5yI0XLUq8UOFX6AwZ3bhtdcpIo=",
+        "narHash": "sha256-2ySMW3QARG8BsRPmwe7clTbdCuaObromOKewykP+UJc=",
-        "owner": "NixOS",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9b1c7ba323732ddc85a51850a7f10ecc5269b8e9",
+        "rev": "e34c5379866833f41e2a36f309912fa675d687c7",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "nixos",
         "ref": "nixos-21.11",
         "repo": "nixpkgs",
         "type": "github"
@@ -132,12 +130,70 @@
         "type": "indirect"
       }
     },
+    "nixpkgs-21_11": {
+      "locked": {
+        "lastModified": 1638371214,
+        "narHash": "sha256-0kE6KhgH7n0vyuX4aUoGsGIQOqjIx2fJavpCWtn73rc=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "a640d8394f34714578f3e6335fc767d0755d78f9",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-21.11",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1646675913,
+        "narHash": "sha256-ZvGf51XpXM7JojKLZ5yI0XLUq8UOFX6AwZ3bhtdcpIo=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "9b1c7ba323732ddc85a51850a7f10ecc5269b8e9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-21.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1621784194,
+        "narHash": "sha256-CQWN/QvVHG8qCn7UhGGwoT3jAPvnJHQUvzBlIt48FGs=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "c5265c01a944b1cecfcfab392d5204d73d65d4ec",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1626852498,
+        "narHash": "sha256-lOXUJvi0FJUXHTVSiC5qsMRtEUgqM4mGZpMESLuGhmo=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "16105403bdd843540cbef9c63fc0f16c1c6eaa70",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-unstable",
+        "type": "indirect"
+      }
+    },
     "radio": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs_3"
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1633288285,
@@ -176,7 +232,7 @@
         "dailybuild_modules": "dailybuild_modules",
         "drastikbot": "drastikbot",
         "drastikbot_modules": "drastikbot_modules",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "radio": "radio",
         "radio-web": "radio-web",
         "simple-nixos-mailserver": "simple-nixos-mailserver"
@@ -185,13 +241,9 @@
     "simple-nixos-mailserver": {
       "inputs": {
         "blobs": "blobs",
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs_4",
-          "nixpkgs"
-        ],
         "nixpkgs-21_05": "nixpkgs-21_05",
-        "nixpkgs-21_11": [
+        "nixpkgs-21_11": "nixpkgs-21_11",
-          "nixpkgs"
-        ],
         "utils": "utils"
       },
       "locked": {

flake.nix

@@ -1,19 +1,11 @@
 {
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-21.11";
-
-    # mail server
     simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-21.11";
-    simple-nixos-mailserver.inputs.nixpkgs.follows = "nixpkgs";
-    simple-nixos-mailserver.inputs.nixpkgs-21_11.follows = "nixpkgs";
-
-    # agenix
     agenix.url = "github:ryantm/agenix";
-    agenix.inputs.nixpkgs.follows = "nixpkgs";
 
     # radio
     radio.url = "git+https://git.neet.dev/zuckerberg/radio.git?ref=main";
-    radio.inputs.nixpkgs.follows = "nixpkgs";
     radio-web.url = "git+https://git.neet.dev/zuckerberg/radio-web.git";
     radio-web.flake = false;
 

machines/ray/configuration.nix

@@ -54,8 +54,6 @@ in
     publicCreateSnapshots = true;
   };
 
-  virtualisation.docker.enable = true;
-
   services.spotifyd.enable = true;
 
   services.zerotierone.enable = true;