refactor: cleaned up nixos and home dirs

modules/nixos/desktop/cosmic/default.nix

@@ -0,0 +1,16 @@
+{
+  nix.settings = {
+    substituters = [
+      "https://cosmic.cachix.org/"
+    ];
+    trusted-public-keys = [
+      "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="
+    ];
+  };
+
+  environment.sessionVariables.COSMIC_DATA_CONTROL_ENABLED = 1;
+  services = {
+    desktopManager.cosmic.enable = true;
+    displayManager.cosmic-greeter.enable = true;
+  };
+}

modules/nixos/desktop/default.nix

@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}

modules/nixos/desktop/gnome/default.nix

@@ -0,0 +1,55 @@
+{ pkgs, ... }:
+{
+  services = {
+    xserver = {
+      enable = true;
+      displayManager = {
+        gdm.enable = true;
+        gdm.wayland = true;
+      };
+      desktopManager.gnome = {
+        enable = true;
+      };
+    };
+    gnome = {
+      games.enable = false;
+      gnome-online-accounts.enable = true;
+    };
+    udev.packages = builtins.attrValues {
+      inherit (pkgs)
+        gnome-settings-daemon
+        ;
+    };
+    gvfs.enable = true;
+  };
+  environment = {
+    variables = {
+      # WEBKIT_FORCE_SANDBOX = "0";
+      # WEBKIT_DISABLE_COMPOSITING_MODE = "1";
+    };
+    gnome.excludePackages = builtins.attrValues {
+      inherit (pkgs)
+        gnome-photos
+        gnome-tour
+        epiphany # web browser
+        cheese # webcam tool
+        geary # email reader
+        evince # document viewer
+        totem # video player
+        yelp # help viewer
+        gnome-calendar
+        atomix # puzzle game
+        gnome-clocks
+        gnome-weather
+        gnome-maps
+        gnome-contacts
+        gnome-characters
+        gnome-music
+        tali # poker game
+        iagno # go game
+        hitori # sudoku game
+        ;
+    };
+  };
+  programs.dconf.enable = true;
+}

modules/nixos/desktop/hypr/default.nix

@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}

modules/nixos/desktop/hypr/idle/default.nix

@@ -0,0 +1,10 @@
+{
+  flake,
+  pkgs,
+  ...
+}:
+{
+  services.hypridle = {
+    enable = true;
+  };
+}

modules/nixos/desktop/hypr/land/default.nix

@@ -0,0 +1,32 @@
+{
+  pkgs,
+  flake,
+  ...
+}:
+{
+  programs.hyprland = {
+    enable = true;
+    xwayland.enable = true;
+    # package = flake.inputs.hyprland.packages.${pkgs.system}.hyprland;
+    # portalPackage = flake.inputs.hyprland-portal.packages.${pkgs.system}.xdg-desktop-portal-hyprland;
+  };
+  nix = {
+    settings = {
+      substituters = [
+        "https://hyprland.cachix.org"
+      ];
+      trusted-public-keys = [
+        "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
+      ];
+    };
+  };
+  environment = {
+    variables = {
+      WLR_NO_HARDWARE_CURSORS = "1";
+      WLR_DRM_NO_ATOMIC = "1";
+      FLAMESHOT_ENABLE_WAYLAND = "1";
+      USE_WAYLAND_GRIM = "1";
+      USE_WAYLAND_CLIPBOARD = "1";
+    };
+  };
+}

modules/nixos/desktop/plasma/default.nix

@@ -0,0 +1,16 @@
+{ pkgs, ... }:
+{
+  services = {
+    desktopManager.plasma6.enable = true;
+  };
+  environment.plasma6.excludePackages = builtins.attrValues {
+    inherit (pkgs.kdePackages)
+      plasma-browser-integration
+      konsole
+      kate
+      spectacle
+      kdeconnect-kde
+      khelpcenter
+      ;
+  };
+}

modules/nixos/desktop/river/default.nix

@@ -0,0 +1,26 @@
+{
+  programs.river = {
+    enable = true;
+    xwayland.enable = true;
+  };
+  environment = {
+    loginShellInit = ''
+      if [ -z $DISPLAY ] && [ "$(tty)" = "/dev/tty1" ]; then
+        exec river
+      fi
+    '';
+    sessionVariables = {
+      XDG_CURRENT_DESKTOP = "river";
+      XDG_SESSION_TYPE = "wayland";
+      XDG_SESSION_DESKTOP = "river";
+      QT_AUTO_SCREEN_SCALE_FACTOR = "1";
+      QT_QPA_PLATFORM = "wayland;xcb";
+      QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
+      QT_QPA_PLATFORMTHEME = "qt5ct";
+      _JAVA_AWT_WM_NONEREPARENTING = "1";
+      WLR_DRM_NO_ATOMIC = "1";
+      WLR_NO_HARDWARE_CURSORS = "1";
+    };
+  };
+
+}

modules/nixos/desktop/sddm/default.nix

@@ -0,0 +1,10 @@
+{
+  services = {
+    displayManager = {
+      sddm = {
+        enable = true;
+        wayland.enable = true;
+      };
+    };
+  };
+}

modules/nixos/desktop/wayland/default.nix

@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}

modules/nixos/desktop/wayland/geoclue2/default.nix

@@ -0,0 +1,3 @@
+{
+  services.geoclue2.enable = true;
+}

modules/nixos/desktop/wayland/greetd/default.nix

@@ -0,0 +1,32 @@
+{
+  config,
+  flake,
+  lib,
+  ...
+}:
+let
+  inherit (flake.config.people)
+    user0
+    ;
+in
+{
+  services = {
+    greetd = {
+      enable = true;
+      vt = 7;
+      settings =
+        let
+          default_session = {
+            command = "${lib.meta.getExe config.programs.hyprland.package}";
+            user = user0;
+          };
+        in
+        {
+          inherit
+            default_session
+            ;
+          initial_session = default_session;
+        };
+    };
+  };
+}

modules/nixos/desktop/wayland/network/default.nix

@@ -0,0 +1,3 @@
+{
+  programs.nm-applet.enable = true;
+}

modules/nixos/desktop/wayland/regreet/default.nix

@@ -0,0 +1,50 @@
+{
+  pkgs,
+  flake,
+  lib,
+  ...
+}:
+let
+  inherit (flake.config.aesthetics.themes)
+    fonts
+    ;
+in
+{
+  programs.regreet = {
+    enable = true;
+    package = pkgs.greetd.regreet;
+    # settings = {
+    #   appearance = {
+    #     greeting_msg = "Back for more, I see.";
+    #   };
+    #   GTK = {
+    #     application_prefer_dark_theme = true;
+    #     cursor_theme_name = lib.mkForce "catppuccin-macchiato-dark-cursors";
+    #     font_name = lib.mkForce "${fonts.names.name0} ${font.size.desktop}";
+    #     icon_theme_name = lib.mkForce "Papirus-Dark";
+    #     theme_name = lib.mkForce "catppuccin-macchiato-mauve-compact";
+    #   };
+    # };
+    # theme = {
+    #   name = "catppuccin-macchiato-mauve-compact";
+    #   package = pkgs.catppuccin-gtk.override {
+    #     size = "compact";
+    #     variant = "macchiato";
+    #     accents = [
+    #       "mauve"
+    #     ];
+    #   };
+    # };
+    # cursorTheme = {
+    #   name = "catppuccin-macchiato-dark-cursors";
+    #   package = pkgs.catppuccin-cursors.macchiatoDark;
+    # };
+    # iconTheme = {
+    #   name = "Papirus-Dark";
+    #   package = pkgs.catppuccin-papirus-folders.override {
+    #     flavor = "macchiato";
+    #     accent = "mauve";
+    #   };
+    # };
+  };
+}

modules/nixos/desktop/wayland/swaylock/default.nix

@@ -0,0 +1,3 @@
+{
+  security.pam.services.swaylock.text = "auth include login";
+}

modules/nixos/desktop/wayland/thunar/default.nix

@@ -0,0 +1,11 @@
+{ pkgs, ... }:
+{
+  programs.thunar = {
+    enable = true;
+    plugins = [
+      pkgs.xfce.thunar-archive-plugin
+      pkgs.xfce.thunar-volman
+      pkgs.xfce.thunar-media-tags-plugin
+    ];
+  };
+}

modules/nixos/desktop/wayland/wayland/default.nix

@@ -0,0 +1,20 @@
+{ pkgs, flake, ... }:
+{
+  environment.sessionVariables.NIXOS_OZONE_WL = "1";
+
+  xdg = {
+    portal = {
+      enable = true;
+      wlr.enable = true;
+      xdgOpenUsePortal = true;
+      extraPortals = builtins.attrValues {
+        inherit (pkgs)
+          xdg-desktop-portal-gtk
+          # xdg-desktop-portal-hyprland
+          xdg-desktop-portal-wlr
+          ;
+      };
+    };
+  };
+
+}

modules/nixos/desktop/xserver/default.nix

@@ -0,0 +1,21 @@
+{
+  services = {
+    xserver = {
+      enable = true;
+      xkb = {
+        layout = "us";
+        # variant = "colemak_dh"
+      };
+    };
+    libinput = {
+      enable = true;
+      touchpad = {
+        tapping = true;
+        naturalScrolling = false;
+      };
+      mouse.accelProfile = "flat";
+      touchpad.accelProfile = "flat";
+    };
+  };
+  console.useXkbConfig = true;
+}