diff --git a/flake.nix b/flake.nix index 7b197d7..beb7cdb 100644 --- a/flake.nix +++ b/flake.nix @@ -106,7 +106,6 @@ { login-manager.greetd.enable = desktop == "sway"; my.gnome.enable = desktop == "gnome"; - my.cosmic.enable = desktop == "cosmic"; my.kde.enable = desktop == "kde"; } diff --git a/system/configuration.nix b/system/configuration.nix index e79ad12..69badf0 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -31,7 +31,6 @@ ./sops.nix ./greetd.nix ./gnome.nix - ./cosmic.nix ./kde.nix ./home-manager.nix ../settings diff --git a/system/cosmic.nix b/system/cosmic.nix deleted file mode 100644 index 9b1a34b..0000000 --- a/system/cosmic.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - config, - lib, - ... -}: -{ - options.my.cosmic.enable = lib.mkEnableOption { }; - - config = lib.mkIf config.my.cosmic.enable { - # See https://wiki.nixos.org/wiki/COSMIC - services.displayManager.cosmic-greeter.enable = true; - services.desktopManager.cosmic.enable = true; - - # Same as GNOME: avoids conflict with graphics manager autologin - # (e.g.: https://github.com/NixOS/nixpkgs/issues/103746) - systemd.services."getty@tty1".enable = false; - systemd.services."autovt@tty1".enable = false; - - services.displayManager.autoLogin = { - enable = true; - user = config.my.username; - }; - - programs.dconf.enable = true; - - programs.kdeconnect.enable = true; - - hardware.opentabletdriver.enable = lib.mkForce false; - }; -} diff --git a/user/cosmic.nix b/user/cosmic.nix deleted file mode 100644 index 9ca81b6..0000000 --- a/user/cosmic.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - pkgs, - lib, - config, - ... -}: -lib.mkIf (config.my.desktop == "cosmic") { - - home.pointerCursor = { - name = "Adwaita"; - size = 24; - package = pkgs.adwaita-icon-theme; - gtk.enable = true; - }; - - home.packages = with pkgs; [ - adw-gtk3 - - newsflash - foliate - amberol - pitivi - keepassxc - menulibre - - libsForQt5.qt5ct - libsForQt5.qtstyleplugin-kvantum - qt6Packages.qt6ct - qt6Packages.qtstyleplugin-kvantum - ]; - - services.gpg-agent.pinentry.package = lib.mkForce pkgs.pinentry-gnome3; - - xdg.defaultApplications = { - enable = lib.mkForce false; - }; - - # Wiki COSMIC: Firefox ignores DE theme because of libadwaita - programs.firefox.profiles.dev-edition-default.settings = { - "widget.gtk.libadwaita-colors.enabled" = false; - }; -} diff --git a/user/dummy.nix b/user/dummy.nix index b19b7b9..7a0aac4 100644 --- a/user/dummy.nix +++ b/user/dummy.nix @@ -6,7 +6,6 @@ media-packages.enable = lib.mkEnableOption { }; containers.enable = lib.mkEnableOption { }; gnome.enable = lib.mkEnableOption { }; - cosmic.enable = lib.mkEnableOption { }; kde.enable = lib.mkEnableOption { }; }; } diff --git a/user/home.nix b/user/home.nix index 5d280bc..98fc13a 100644 --- a/user/home.nix +++ b/user/home.nix @@ -16,7 +16,6 @@ ./vscode ./fish ./firefox.nix - ./cosmic.nix ./alacritty.nix ./git.nix ./ssh.nix