merge changes from main

2 files changed, 0 insertions, 229 deletions

diff --git a/modules/desktop/system/environments/gnome.nix b/modules/desktop/system/environments/gnome.nix
deleted file mode 100644
index e298756..0000000
--- a/modules/desktop/system/environments/gnome.nix
+++ /dev/null
@@ -1,124 +0,0 @@
-{
-  pkgs,
-  config,
-  lib,
-  ...
-}: let
-  cfg = config.collinux.desktop.gnome;
-in
-  lib.mkIf cfg.enable {
-    services.displayManager.gdm = {
-      enable = true;
-      wayland = true;
-    };
-    services.desktopManager.gnome.enable = true;
-
-    environment.gnome.excludePackages = with pkgs; [
-      orca
-      evince
-      file-roller
-      geary
-      gnome-disk-utility
-      seahorse
-      # sushi
-      # sysprof
-      # gnome-shell-extensions
-      adwaita-icon-theme
-      # nixos-background-info
-      gnome-backgrounds
-      # gnome-bluetooth
-      # gnome-color-manager
-      # gnome-control-center
-      # gnome-shell-extensions
-      gnome-tour # GNOME Shell detects the .desktop file on first log-in.
-      gnome-user-docs
-      # glib # for gsettings program
-      # gnome-menus
-      # gtk3.out # for gtk-launch program
-      # xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
-      # xdg-user-dirs-gtk # Used to create the default bookmarks
-      #
-      baobab
-      epiphany
-      gnome-text-editor
-      gnome-calculator
-      gnome-calendar
-      gnome-characters
-      # gnome-clocks
-      gnome-console
-      gnome-contacts
-      gnome-font-viewer
-      gnome-logs
-      gnome-maps
-      gnome-music
-      # gnome-system-monitor
-      gnome-weather
-      # loupe
-      # nautilus
-      gnome-connections
-      simple-scan
-      snapshot
-      totem
-      yelp
-      gnome-software
-    ];
-
-    hjem.users."${config.collinux.user.name}".packages = with pkgs.gnomeExtensions; [blur-my-shell dash-to-dock];
-
-    programs.dconf = {
-      enable = true;
-      profiles.user.databases = [
-        {
-          settings = {
-            "org/gnome/mutter" = {
-              workspaces-only-on-primary = false;
-            };
-            "org/gnome/shell/app-switcher" = {
-              current-workspace-only = true;
-            };
-
-            # Idle settings
-            "org/gnome/desktop/session" = {
-              idle-delay = lib.gvariant.mkInt16 0;
-            };
-            "org/gnome/settings-daemon/plugins/power" = {
-              sleep-inactive-ac-type = "nothing";
-            };
-
-            # Keybindings
-            "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = {
-              binding = "<Super>Return";
-              command = "blackbox";
-              name = "Terminal";
-            };
-            "org/gnome/settings-daemon/plugins/media-keys" = {
-              custom-keybindings = [
-                "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/"
-              ];
-            };
-
-            # Background
-            "org/gnome/desktop/background" = rec {
-              picture-uri = "file://${pkgs.gnome-backgrounds}/share/backgrounds/gnome/blobs-d.svg";
-              picture-uri-dark = picture-uri;
-            };
-
-            # Extensions
-            "org/gnome/shell" = {
-              disable-user-extensions = false;
-              enabled-extensions = with pkgs.gnomeExtensions; [
-                blur-my-shell.extensionUuid
-                dash-to-dock.extensionUuid
-              ];
-            };
-
-            "org/gnome/shell/extensions/dash-to-dock" = {
-              dash-max-icon-size = lib.gvariant.mkInt16 48;
-              show-trash = false;
-              show-mounts = false;
-            };
-          };
-        }
-      ];
-    };
-  }
diff --git a/modules/desktop/system/environments/sway.nix b/modules/desktop/system/environments/sway.nix
deleted file mode 100644
index 4ea3378..0000000
--- a/modules/desktop/system/environments/sway.nix
+++ /dev/null
@@ -1,105 +0,0 @@
-{
-  pkgs,
-  config,
-  lib,
-  ...
-}: let
-  cfg = config.collinux.desktop.sway;
-
-  colors = ''
-    set $rosewater #f5e0dc
-    set $flamingo #f2cdcd
-    set $pink #f5c2e7
-    set $mauve #cba6f7
-    set $red #f38ba8
-    set $maroon #eba0ac
-    set $peach #fab387
-    set $yellow #f9e2af
-    set $green #a6e3a1
-    set $teal #94e2d5
-    set $sky #89dceb
-    set $sapphire #74c7ec
-    set $blue #89b4fa
-    set $lavender #b4befe
-    set $text #cdd6f4
-    set $subtext1 #bac2de
-    set $subtext0 #a6adc8
-    set $overlay2 #9399b2
-    set $overlay1 #7f849c
-    set $overlay0 #6c7086
-    set $surface2 #585b70
-    set $surface1 #45475a
-    set $surface0 #313244
-    set $base #1e1e2e
-    set $mantle #181825
-    set $crust #11111b
-  '';
-
-  settings = ''
-    exec ${pkgs.foot}/bin/foot --server
-    exec ${pkgs.swaybg}/bin/swaybg -i ${config.collinux.desktop.wallpaper}
-    exec ${pkgs.dunst}/bin/dunst
-
-    include catppuccin-mocha
-
-    # target                 title     bg    text   indicator  border
-    client.focused           $lavender $base $text  $rosewater $lavender
-    client.focused_inactive  $overlay0 $base $text  $rosewater $overlay0
-    client.unfocused         $overlay0 $base $text  $rosewater $overlay0
-    client.urgent            $peach    $base $peach $overlay0  $peach
-    client.placeholder       $overlay0 $base $text  $overlay0  $overlay0
-    client.background        $base
-
-    input type:keyboard {
-      xkb_options caps:none
-    }
-
-    bindsym Mod4+1 workspace number 1
-    bindsym Mod4+2 workspace number 2
-    bindsym Mod4+3 workspace number 3
-    bindsym Mod4+4 workspace number 4
-    bindsym Mod4+Shift+1 move container to workspace number 1
-    bindsym Mod4+Shift+2 move container to workspace number 2
-    bindsym Mod4+Shift+3 move container to workspace number 3
-    bindsym Mod4+Shift+4 move container to workspace number 4
-
-    bindsym Mod4+Return exec "${pkgs.foot}/bin/footclient"
-    bindsym Mod4+Shift+Return exec ${pkgs.foot}/bin/foot
-    bindsym Mod4+Space exec ${pkgs.fuzzel}/bin/fuzzel
-    bindsym Mod4+b exec ${pkgs.firefox}/bin/firefox
-    bindsym Mod4+Shift+b exec ${pkgs.qutebrowser}/bin/qutebrowser
-    bindsym Mod4+q kill
-
-    bindsym XF86AudioRaiseVolume  exec 'wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+; dunstify -t 300 -h string:x-canonical-private-synchronous:audio "Volume: " -h "int:value:$(dec=$(wpctl get-volume @DEFAULT_AUDIO_SINK@ | cut -d\" \" -f2);echo "$dec * 100" | bc)"'
-    bindsym XF86AudioLowerVolume  exec 'wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-; dunstify -t 300 -h string:x-canonical-private-synchronous:audio "Volume: " -h "int:value:$(dec=$(wpctl get-volume @DEFAULT_AUDIO_SINK@ | cut -d\" \" -f2);echo "$dec * 100" | bc)"'
-
-    bindsym XF86MonBrightnessUp   exec 'brightnessctl set 5%+; dunstify -t 300 -h string:x-canonical-private-synchronous:brightness "Brightness: " -h "int:value:$(g=$(brightnessctl get);m=$(brightnessctl max);echo $((g * 100 / m)))"'
-    bindsym XF86MonBrightnessDown exec 'brightnessctl set 5%-; dunstify -t 300 -h string:x-canonical-private-synchronous:brightness "Brightness: " -h "int:value:$(g=$(brightnessctl get);m=$(brightnessctl max);echo $((g * 100 / m)))"'
-
-    default_border pixel 2
-    smart_borders on
-    smart_gaps on
-  '';
-in
-  lib.mkIf cfg.enable {
-    hjem.users."${config.collinux.user.name}" = {
-      files = {
-        ".config/sway/config".text = settings;
-        ".config/sway/catppuccin-mocha".text = colors;
-      };
-
-      packages = [pkgs.sway pkgs.bc pkgs.brightnessctl];
-    };
-
-    # Greetd
-    services.greetd = {
-      enable = true;
-      settings = rec {
-        initial_session = {
-          command = "${pkgs.sway}/bin/sway";
-          user = config.collinux.user.name;
-        };
-        default_session = initial_session;
-      };
-    };
-  }