diff --git a/modules/cachix/cosmic.nix b/modules/cachix/cosmic.nix new file mode 100644 index 0000000..8f89747 --- /dev/null +++ b/modules/cachix/cosmic.nix @@ -0,0 +1,12 @@ +{ + nix = { + settings = { + substituters = [ + "https://cosmic.cachix.org" + ]; + trusted-public-keys = [ + "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" + ]; + }; + }; +} diff --git a/modules/cachix/nix-community.nix b/modules/cachix/nix-community.nix index f809233..8a94395 100644 --- a/modules/cachix/nix-community.nix +++ b/modules/cachix/nix-community.nix @@ -2,10 +2,9 @@ nix = { settings = { substituters = - [ "https://nix-community.cachix.org" "https://cosmic.cachix.org/" ]; + [ "https://nix-community.cachix.org" ]; trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ]; }; }; diff --git a/modules/desktop.nix b/modules/desktop.nix index d38dedb..927f475 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -28,6 +28,7 @@ boot.supportedFilesystems = [ "ntfs" ]; services = { + desktopManager.cosmic.enable = true; desktopManager.plasma6 = { enable = true; # runUsingSystemd = true; @@ -89,34 +90,32 @@ swaylock = { }; }; - # services.displayManager.sddm = { - # enable = false; - # theme = "${pkgs.elegant-sddm}"; - # wayland.enable = true; - # }; + services.displayManager.cosmic-greeter = { + enable = false; + }; services.greetd = { enable = true; - settings = rec { - initial_session = { - command = "dbus-run-session Hyprland"; - # command = "dbus-run-session startplasma-wayland"; - user = "chris"; - }; - default_session = { - command = - "${pkgs.greetd.tuigreet}/bin/tuigreet --time -r --window-padding 2 --cmd 'dbus-run-session Hyprland' -s /etc/greetd/environments"; - user = "greeter"; - }; - plasma_session = { - command = "dbus-run-session startplasma-wayland"; - user = "chris"; - }; - hyprland_session = { - command = "Hyprland"; - user = "chris"; - }; - }; + # settings = rec { + # initial_session = { + # command = "dbus-run-session Hyprland"; + # # command = "dbus-run-session startplasma-wayland"; + # user = "chris"; + # }; + # default_session = { + # command = + # "${pkgs.greetd.tuigreet}/bin/tuigreet --time -r --window-padding 2 --cmd 'dbus-run-session Hyprland' -s /etc/greetd/environments"; + # user = "greeter"; + # }; + # plasma_session = { + # command = "dbus-run-session startplasma-wayland"; + # user = "chris"; + # }; + # hyprland_session = { + # command = "Hyprland"; + # user = "chris"; + # }; + # }; }; programs.regreet = { enable = true; };