From cda51d2990b2279125db1b28bbe5abc43339cdd1 Mon Sep 17 00:00:00 2001
From: CherryKitten <sammy@cherrykitten.dev>
Date: Wed, 15 May 2024 13:22:46 +0200
Subject: [PATCH] update desktop foo

---
 hive.nix                          |  2 +-
 hosts/dinictis/default.nix        |  3 ---
 profiles/desktop/default.nix      | 17 ++++++++++++++++-
 profiles/desktop/sway/default.nix | 23 ++++++++++++++++++++++-
 4 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/hive.nix b/hive.nix
index 23ccfda..1a1d449 100644
--- a/hive.nix
+++ b/hive.nix
@@ -3,7 +3,7 @@ let
   inherit (inputs) nixpkgs nixpkgs-unstable;
   inherit (self) outputs;
   pkgs = import nixpkgs { system = "x86_64-linux"; };
-  pkgs-unstable = import nixpkgs-unstable { system = "x86_64-linux"; };
+  pkgs-unstable = import nixpkgs-unstable { system = "x86_64-linux"; config.allowUnfree = true; };
 in
 {
   flake = rec {
diff --git a/hosts/dinictis/default.nix b/hosts/dinictis/default.nix
index 9924701..987d9d6 100644
--- a/hosts/dinictis/default.nix
+++ b/hosts/dinictis/default.nix
@@ -12,9 +12,6 @@
   # Enable CUPS to print documents.
   services.printing.enable = true;
 
-  # Enable sound.
-  # sound.enable = true;
-  hardware.pulseaudio.enable = true;
 
   home-manager.users.sammy.programs.ssh.includes = [
     "./famedly-config"
diff --git a/profiles/desktop/default.nix b/profiles/desktop/default.nix
index d6f3b12..3e162b8 100644
--- a/profiles/desktop/default.nix
+++ b/profiles/desktop/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }: {
+{ pkgs, pkgs-unstable, ... }: {
 
   imports = [
     ./sway
@@ -9,8 +9,23 @@
   users.users.sammy.packages = with pkgs; [
     telegram-desktop
     mpv
+    thunderbird
+    pkgs-unstable.obsidian
+    bluez-tools
+    blueman
+    pavucontrol
   ];
 
+  home-manager.users.sammy.services.nextcloud-client.enable = true;
+
+  services.rpcbind.enable = true; # needed for NFS
+
+  # Enable sound.
+  sound.enable = true;
+  hardware.pulseaudio.enable = true;
+  hardware.pulseaudio.package = pkgs.pulseaudioFull;
+
+  hardware.bluetooth.enable = true;
   services.logind.lidSwitch = "suspend-then-hibernate";
   services.logind.powerKey = "hibernate";
   services.logind.powerKeyLongPress = "poweroff";
diff --git a/profiles/desktop/sway/default.nix b/profiles/desktop/sway/default.nix
index de4b379..5fed03e 100644
--- a/profiles/desktop/sway/default.nix
+++ b/profiles/desktop/sway/default.nix
@@ -47,6 +47,7 @@
         ];
         timeouts = [
           { timeout = 300; command = lockCommand; }
+          { timeout = 1800; command = "systemctl hybrid-sleep"; }
         ];
       };
     wayland.windowManager.sway =
@@ -70,9 +71,15 @@
             hideEdgeBorders = "both";
           };
           gaps.inner = 10;
+          gaps.smartGaps = true;
 
           output = {
-            "*" = { };
+            "eDP-1" = {
+              position = "0 1080";
+            };
+            "DP-6" = {
+              position = "0 0";
+            };
           };
 
           input = {
@@ -176,6 +183,11 @@
             "${cfg.config.modifier}+9" = "workspace 9";
             "${cfg.config.modifier}+0" = "workspace 10";
 
+            "${cfg.config.modifier}+Alt+Right" = "workspace next";
+            "${cfg.config.modifier}+Alt+Left" = "workspace prev";
+            "${cfg.config.modifier}+Alt+Up" = "move workspace to output up";
+            "${cfg.config.modifier}+Alt+Down" = "move workspace to output down";
+
             "${cfg.config.modifier}+Shift+1" = "move container to workspace 1";
             "${cfg.config.modifier}+Shift+2" = "move container to workspace 2";
             "${cfg.config.modifier}+Shift+3" = "move container to workspace 3";
@@ -187,6 +199,9 @@
             "${cfg.config.modifier}+Shift+9" = "move container to workspace 9";
             "${cfg.config.modifier}+Shift+0" = "move container to workspace 10";
 
+            "${cfg.config.modifier}+Alt+N" = "move container to workspace next";
+            "${cfg.config.modifier}+Alt+P" = "move container to workspace prev";
+
             "XF86AudioRaiseVolume" = "exec --no-startup-id ${pkgs.pamixer}/bin/pamixer -i 5";
             "XF86AudioLowerVolume" = "exec --no-startup-id ${pkgs.pamixer}/bin/pamixer -d 5";
             "XF86AudioMute" = "exec --no-startup-id ${pkgs.pamixer}/bin/pamixer -t";
@@ -196,6 +211,12 @@
 
             "${cfg.config.modifier}+r" = "mode resize";
           };
+
+          startup = [{
+            command = "systemctl --user restart nextcloud-client";
+            always = true;
+          }];
+
         };
 
         extraConfig = ''