euhadra.nix

@@ -6,7 +6,7 @@ let mpdStreamingPort = 8080; in
     [
       /etc/nixos/hardware-configuration.nix
       ./common-headless.nix
-      ./sway.nix
+      ./i3.nix
       ./uefi.nix
       ./fstrim.nix
       # ./nebula.nix
@@ -37,7 +37,6 @@ let mpdStreamingPort = 8080; in
     musicDirectory = "/mnt/aplysia/music";
     extraConfig = ''
       bind_to_address "10.59.0.6"
-      bind_to_address "100.97.134.100"
 
       # audio_output {
       #   type "alsa"
@@ -68,7 +67,6 @@ let mpdStreamingPort = 8080; in
       "pulse.properties"."server.address" = [
         "unix:native"
         "tcp:127.0.0.1:4713"
-        "tcp:100.97.134.100:4713"
       ];
     };
   };
@@ -98,7 +96,7 @@ let mpdStreamingPort = 8080; in
 
   networking.firewall.allowedTCPPorts = [
     config.services.mpd.network.port
-    4713 # pulseaudio
+    # 4713 # pulseaudio
     mpdStreamingPort # mpd streaming
   ];
 
@@ -120,7 +118,5 @@ let mpdStreamingPort = 8080; in
   #   };
   # };
 
-  system.stateVersion = "22.05";
+  system.stateVersion = "19.03";
-
-  time.timeZone = pkgs.lib.mkOverride 10 "US/Pacific";
 }

flake.lock

@@ -17,11 +17,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1677932085,
+        "lastModified": 1677063315,
-        "narHash": "sha256-+AB4dYllWig8iO6vAiGGYl0NEgmMgGHpy9gzWJ3322g=",
+        "narHash": "sha256-qiB4ajTeAOVnVSAwCNEEkoybrAlA+cpeiBxLobHndE8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "3c5319ad3aa51551182ac82ea17ab1c6b0f0df89",
+        "rev": "988cc958c57ce4350ec248d2d53087777f9e1949",
         "type": "github"
       },
       "original": {

flammea.nix

@@ -1,13 +1,11 @@
 { config, pkgs, ... }:
 
-let mpdStreamingPort = 8080; in
 {
   imports =
     [
       ./common-headless.nix
-      # ./sway.nix
+      ./sway.nix
       # ./i3.nix
-      ./gnome3.nix
       ./large-sw.nix
       ./uefi.nix
       ./fstrim.nix
@@ -81,8 +79,8 @@ let mpdStreamingPort = 8080; in
   services.thermald.enable = true;
 
   virtualisation.virtualbox.host = {
-    enable = true;
+    # enable = true;
-    enableExtensionPack = true;
+    # enableExtensionPack = true;
   };
   # nixpkgs.config.allowUnfree = true;
 
@@ -108,8 +106,6 @@ let mpdStreamingPort = 8080; in
   # };
   # networking.firewall.allowedTCPPorts = [ config.services.nix-serve.port ];
 
-  networking.firewall.trustedInterfaces = [ "tailscale0" ];
-
   services.openssh.forwardX11 = true;
 
   fileSystems."/mnt/aplysia".device = pkgs.lib.mkOverride 10 "//aplysia.auroch-boa.ts.net/export";
@@ -151,47 +147,4 @@ let mpdStreamingPort = 8080; in
 
   system.stateVersion = "22.11";
 
-  services.mpd = {
-    enable = true;
-    # network.listenAddress = "127.0.0.1";
-    # musicDirectory = "/mnt/aplysia/music";
-    musicDirectory = "/home/gebner/Music";
-    user = "gebner";
-    extraConfig = ''
-      bind_to_address "100.125.210.32"
-
-      # audio_output {
-      #   type "alsa"
-      #   name "dac"
-      #   device "sysdefault:CARD=QAMP"
-      # }
-
-      audio_output {
-        type "pulse"
-        name "pulse"
-        server "127.0.0.1"
-      }
-
-      audio_output {
-        type "httpd"
-        name "http"
-        encoder "flac"
-        port "${toString mpdStreamingPort}"
-      }
-
-      replaygain "auto"
-      restore_paused "yes"
-    '';
-  };
-
-  services.pipewire = {
-    config.pipewire-pulse = {
-      "pulse.properties"."server.address" = [
-        "unix:native"
-        "tcp:127.0.0.1:4713"
-        # "tcp:100.97.134.100:4713"
-      ];
-    };
-  };
-
 }

gnome3.nix

@@ -2,24 +2,21 @@
 
 {
   imports = [
-    ./pipewire.nix
+    ./pulseaudio.nix
   ];
 
   i18n.inputMethod = {
     enabled = "ibus";
-    ibus.engines = with pkgs.ibus-engines; [ mozc table-others m17n rime ];
+    ibus.engines = with pkgs.ibus-engines; [ mozc table-others m17n ];
   };
 
   environment.systemPackages = with pkgs; [
-    gnome.gnome-tweaks
+    gnome3.libgweather
+    gnome3.gnome-tweak-tool
     pavucontrol
     paprefs
-    playerctl
-    xorg.xlsclients
   ];
 
-  hardware.pulseaudio.enable = false;
-
   fonts = {
     enableDefaultFonts = false;
     fontconfig = {
@@ -84,11 +81,11 @@
 
   services.xserver = {
     enable = true;
-    # libinput.enable = true;
+    libinput.enable = true;
     displayManager.gdm.enable = true;
-    # displayManager.defaultSession = "gnome";
+    displayManager.defaultSession = "gnome";
 
-    desktopManager.gnome = {
+    desktopManager.gnome3 = {
       enable = true;
     };
   };