Merge remote-tracking branch 'gum/master'

5 files changed, 128 insertions, 17 deletions

diff --git a/makefu/2configs/gui/base.nix b/makefu/2configs/gui/base.nix
index b2192c7f9..b1b7c9913 100644
--- a/makefu/2configs/gui/base.nix
+++ b/makefu/2configs/gui/base.nix
@@ -18,30 +18,28 @@ in
   imports = [
     ./urxvtd.nix
     ./pipewire.nix
+    ./gnome.nix
   ];
 
 
+  # services.redshift.enable = true;
   services.xserver = {
     enable = true;
     layout = "us";
     xkbVariant = "altgr-intl";
     xkbOptions = "ctrl:nocaps, eurosign:e";
 
-    windowManager = {
-      awesome.enable = true;
-      awesome.noArgb = true;
-      awesome.luaModules = [ pkgs.luaPackages.vicious ];
-    };
-    displayManager.defaultSession = lib.mkDefault "none+awesome";
-    displayManager.autoLogin = {
-      enable = true;
-      user = mainUser;
-    };
+#    windowManager = {
+#      awesome.enable = true;
+#      awesome.noArgb = true;
+#      awesome.luaModules = [ pkgs.luaPackages.vicious ];
+#    };
+#    displayManager.defaultSession = lib.mkDefault "none+awesome";
   };
   environment.systemPackages = [ pkgs.gnome.adwaita-icon-theme ];
   # lid switch is handled via button presses
-  services.logind.lidSwitch = lib.mkDefault "ignore";
-  makefu.awesome.enable = true;
+  # services.logind.lidSwitch = lib.mkDefault "ignore";
+  #makefu.awesome.enable = true;
   console.font = "Lat2-Terminus16";
 
   fonts = {
diff --git a/makefu/2configs/gui/gnome.nix b/makefu/2configs/gui/gnome.nix
new file mode 100644
index 000000000..44ba2dd67
--- /dev/null
+++ b/makefu/2configs/gui/gnome.nix
@@ -0,0 +1,63 @@
+{ config, lib, pkgs, ... }:
+
+let
+  mainUser = config.krebs.build.user.name;
+in
+{
+  programs.gnome-terminal.enable = true;
+  services.xserver = {
+    desktopManager.gnome.enable = true;
+    displayManager.gdm.enable = true;
+    #displayManager.autoLogin = {
+    #  enable = true;
+    #  user = mainUser;
+    #};
+  };
+  programs.dconf.enable = true;
+  home-manager.users.${mainUser}.dconf = {
+    enable = true;
+    settings = {
+      "org/gnome/terminal/legacy" = {
+        mnemonics-enabled = false;
+        theme-variant = "dark";
+      };
+      "org/gnome/desktop/interface" = {
+        enable-animations = false;
+        enable-hot-corners = false;
+        show-battery-percentage = true;
+      };
+      "org/gnome/desktop/peripherals/touchpad" = {
+        edge-scrolling-enabled = false;
+        natural-scroll = false;
+        send-events = "enabled";
+        tap-to-click = true;
+        two-finger-scrolling-enabled = true;
+      };
+      "org/gnome/desktop/session".idle-delay = 900;
+      "org/gnome/desktop/wm/keybindings" = {
+        close=["<Shift><Super>c"];
+        minimize=["<Super>n"];
+        move-to-workspace-1=["<Shift><Super>1"];
+        move-to-workspace-2=["<Shift><Super>2"];
+        move-to-workspace-3=["<Shift><Super>3"];
+        move-to-workspace-4=["<Shift><Super>4"];
+        panel-run-dialog=["<Super>r"];
+        switch-to-workspace-1=["<Super>1"];
+        switch-to-workspace-2=["<Super>2"];
+        switch-to-workspace-3=["<Super>3"];
+        switch-to-workspace-4=["<Super>4"];
+        toggle-fullscreen=["<Super>f"];
+      };
+      "org/gnome/desktop/wm/preferences".num-workspaces = 4;
+      "org/gnome/settings-daemon/plugins/color".night-light-enabled = true;
+      "org/gnome/settings-daemon/plugins/media-keys" = {
+        custom-keybindings = [ "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/"];
+      };
+      "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = {
+        binding = "<Super>Return";
+        command = "gnome-terminal";
+        name = "terminal";
+      };
+    };
+  };
+}
diff --git a/makefu/2configs/gui/pipewire.nix b/makefu/2configs/gui/pipewire.nix
index eb94f75b7..d52681551 100644
--- a/makefu/2configs/gui/pipewire.nix
+++ b/makefu/2configs/gui/pipewire.nix
@@ -12,10 +12,9 @@
 
   services.pipewire = {
     enable = true;
-    systemWide = true;
+    # systemWide = true;
     alsa.enable = true;
     alsa.support32Bit = true;
     pulse.enable = true;
-    jack.enable = true;
   };
 }
diff --git a/makefu/2configs/gui/snake-kiosk.nix b/makefu/2configs/gui/snake-kiosk.nix
new file mode 100644
index 000000000..838ac3a5c
--- /dev/null
+++ b/makefu/2configs/gui/snake-kiosk.nix
@@ -0,0 +1,44 @@
+{ pkgs, lib, ... }:
+{
+
+  imports = [
+      ./base.nix
+  ];
+  users.users.kiosk = {
+    # packages = [ pkgs.chromium pkgs.vscode ];
+    group = "kiosk";
+    isNormalUser = true;
+    uid = 1003;
+    extraGroups = [ "wheel" "audio" "pulse" "pipewire" ];
+  };
+  users.groups.kiosk.gid = 989 ;
+  services.xserver = {
+    enable = true;
+
+    windowManager = lib.mkForce { awesome.enable = false; };
+    displayManager.gdm.enable = true;
+    displayManager.gdm.autoSuspend = false;
+    displayManager.autoLogin = {
+      enable = true;
+      user = lib.mkForce "kiosk";
+    };
+    displayManager.defaultSession = "gnome";
+    desktopManager.gnome.enable = true;
+  };
+
+  systemd.targets.sleep.enable = false;
+  systemd.targets.suspend.enable = false;
+  systemd.targets.hibernate.enable = false;
+  systemd.targets.hybrid-sleep.enable = false;
+
+
+
+  environment.systemPackages = [ pkgs.gnomeExtensions.appindicator ];
+  services.dbus.packages = with pkgs; [ gnome2.GConf gnome3.gnome-settings-daemon ];
+
+  services.pipewire.systemWide = lib.mkForce false;
+  services.pipewire.config.pipewire-pulse = {
+    "pulse.properties"."server.address" = [ "unix:native" "tcp:4713" ];
+  };
+
+}
diff --git a/makefu/2configs/gui/wbob-kiosk.nix b/makefu/2configs/gui/wbob-kiosk.nix
index c67aa7cfb..3a21bf213 100644
--- a/makefu/2configs/gui/wbob-kiosk.nix
+++ b/makefu/2configs/gui/wbob-kiosk.nix
@@ -5,11 +5,11 @@
       ./base.nix
   ];
   users.users.kiosk = {
-    packages = [ pkgs.chromium pkgs.vscode ];
+    packages = with pkgs;[ chromium vscode spotify tartube-yt-dlp ];
     group = "kiosk";
     isNormalUser = true;
     uid = 1003;
-    extraGroups = [ "wheel" "audio" "pulse" ];
+    extraGroups = [ "wheel" "audio" "pulse" "pipewire" ];
   };
   users.groups.kiosk.gid = 989 ;
   services.xserver = {
@@ -31,7 +31,10 @@
   };
 
 
-  environment.systemPackages = [ pkgs.gnomeExtensions.appindicator ];
+  environment.systemPackages = [
+    pkgs.gnomeExtensions.appindicator pkgs.pavucontrol pkgs.jellyfin-media-player pkgs.chromium pkgs.firefox pkgs.kodi 
+    pkgs.pavucontrol
+];
   services.dbus.packages = with pkgs; [ gnome2.GConf gnome3.gnome-settings-daemon ];
 
   systemd.services.xset-off = {
@@ -45,5 +48,9 @@
       Restart = "on-failure";
     };
   };
+  services.pipewire.systemWide = lib.mkForce false;
+  services.pipewire.config.pipewire-pulse = {
+    "pulse.properties"."server.address" = [ "unix:native" "tcp:4713" ];
+  };
 
 }