huge restructure of modules

8 files changed, 0 insertions, 173 deletions

diff --git a/modules/client/1password/default.nix b/modules/client/1password/default.nix
deleted file mode 100644
index 7d01e3d..0000000
--- a/modules/client/1password/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  programs = {
-    _1password.enable = true;
-    _1password-gui = {
-      enable = true;
-      polkitPolicyOwners = [ "aethrvmn" ];
-    };
-  };
-
-  environment.etc ={
-    "1password/custom_allowed_browsers" = {
-      text = ''
-        firefox
-        librewolf
-      '';
-      mode = "0755";
-    };
-  };
-}
-
diff --git a/modules/client/bluetooth/default.nix b/modules/client/bluetooth/default.nix
deleted file mode 100644
index 2dfd66d..0000000
--- a/modules/client/bluetooth/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  services.blueman.enable = true;
-}
diff --git a/modules/client/cinnamon/default.nix b/modules/client/cinnamon/default.nix
deleted file mode 100644
index b73cda5..0000000
--- a/modules/client/cinnamon/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ pkgs, lib, ... }:
-{
-  imports = [
-    ../xserver
-  ];
-
-  services = {
-    xserver = {
-
-      desktopManager.cinnamon = {
-        enable = true;
-      };
-
-      displayManager = {
-        sessionCommands = ''
-          eval $(gnome-keyring-daemon --start --daemonize --components=secrets)
-        '';
-
-        lightdm = {
-          enable = true;
-        };
-      };
-    };
-
-    ## Just in case this needs to be enabled 
-    # cinnamon.apps.enable = true;
-
-    gnome = {
-      gnome-keyring.enable = true;
-      # disable gNOME's "usecase?" ssh-agent
-      gcr-ssh-agent.enable = lib.mkForce false;
-    };
-  };
-
-  security.pam = {
-    services = {
-      lightdm = {
-        enableGnomeKeyring = true;
-      };
-    };
-  };
-
-  # Exclude specific packages
-  environment.cinnamon.excludePackages = with pkgs; [
-    orca
-  ];
-
-}
diff --git a/modules/client/default.nix b/modules/client/default.nix
deleted file mode 100644
index ea3f803..0000000
--- a/modules/client/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  imports = [
-    ./1password
-    ./bluetooth
-    ./cinnamon
-    ./flatpak
-    # ./labwc
-  ];
-}
diff --git a/modules/client/flatpak/default.nix b/modules/client/flatpak/default.nix
deleted file mode 100644
index e5a636f..0000000
--- a/modules/client/flatpak/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ pkgs, lib, ...}:
-{
-  services.flatpak = {
-    enable = true;
-    
-    remotes = [
-      {
-        name = "flathub";
-        location = "https://flathub.org/repo/flathub.flatpakrepo";
-      }
-    ];
-
-    packages = [
-      "app.grayjay.Grayjay"
-      "com.github.tchx84.Flatseal"
-      "com.obsproject.Studio"
-      "fi.skyjake.Lagrange"
-      "media.emby.EmbyTheater"
-      "net.lutris.Lutris"
-      "org.gimp.GIMP"
-      "org.inkscape.Inkscape"
-      "org.localsend.localsend_app"
-      "org.musicbrainz.Picard"
-      "org.nickvision.money"
-      "org.nicotine_plus.Nicotine"
-    ];
-
-    update = {
-      auto = {
-        enable = true;
-        onCalendar = "weekly"; # Default value
-      };
-      onActivation = true;
-    };
-    
-  	overrides = {
-      global = {
-        # Enable for both wayland and x11
-        Context.sockets = [ "wayland" "x11" "!fallback-x11" ];
-
-        Environment = {
-          # Fix un-themed cursor in some Wayland apps
-          XCURSOR_PATH = "/run/host/user-share/icons:/run/host/share/icons";
-        };
-      };
-    };
-  };
-}
diff --git a/modules/client/thunar/default.nix b/modules/client/thunar/default.nix
deleted file mode 100644
index 0caaabf..0000000
--- a/modules/client/thunar/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ config, pkgs, ... }:
-{
-  services = {
-    gvfs.enable = true;
-    # TODO: Check if I need these
-    # udisks2.enable = true;
-    # devmon.enable = true;
-    tumbler.enable = true;
-  };
-
-  programs = {
-    thunar = {
-      enable = true;
-
-      plugins = with pkgs.xfce; [
-        thunar-archive-plugin
-        thunar-media-tags-plugin
-        thunar-volman
-      ];
-    };
-
-    file-roller.enable = true;
-  };
-}
diff --git a/modules/client/waybar/default.nix b/modules/client/waybar/default.nix
deleted file mode 100644
index ec27a77..0000000
--- a/modules/client/waybar/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  programs.waybar = {
-      enable = true;
-  };
-}
diff --git a/modules/client/xserver/default.nix b/modules/client/xserver/default.nix
deleted file mode 100644
index 6cd0252..0000000
--- a/modules/client/xserver/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-# XServer
-{
-  services.xserver = {
-    enable = lib.mkForce true;
-    xkb = {
-      layout = "us, gr";
-      options = "grp:alt_shift_toggle";
-    };
-
-    wacom.enable = true;
-  };
-}