Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

evaluation: cosmic #777

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

evaluation: cosmic #777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
147 changes: 146 additions & 1 deletion flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"https://cache.ssrcdevops.tii.ae"
"https://ghaf-dev.cachix.org"
"https://cache.nixos.org/"
"https://cosmic.cachix.org/"
];
extra-trusted-substituters = [
"https://dev-cache.vedenemo.dev"
Expand All @@ -24,6 +25,7 @@
"cache.ssrcdevops.tii.ae:oOrzj9iCppf+me5/3sN/BxEkp5SaFkHfKTPPZ97xXQk="
"ghaf-dev.cachix.org-1:S3M8x3no8LFQPBfHw1jl6nmP8A7cVWKntoMKN3IsEQY="
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
"cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="
];
};

Expand All @@ -32,6 +34,11 @@
nixpkgs.url = "github:tiiuae/nixpkgs/nixos-unstable-texinfo"; # "flake:mylocalnixpkgs"; #
#nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";

nixos-cosmic = {
url = "github:lilyinstarlight/nixos-cosmic";
inputs.nixpkgs.follows = "nixpkgs";
};

ghafpkgs = {
url = "github:tiiuae/ghafpkgs";
inputs = {
Expand Down
2 changes: 1 addition & 1 deletion modules/desktop/profiles/graphics.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
}:
let
cfg = config.ghaf.profiles.graphics;
compositors = [ "labwc" ];
compositors = [ "labwc" "cosmic" ];
renderers = [
"vulkan"
"pixman"
Expand Down
5 changes: 5 additions & 0 deletions modules/microvm/virtualization/microvm/guivm.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ let
inherit (import ../../../../lib/launcher.nix { inherit pkgs lib; }) rmDesktopEntries;
guivmBaseConfiguration = {
imports = [
inputs.nixos-cosmic.nixosModules.default
inputs.impermanence.nixosModules.impermanence
inputs.self.nixosModules.givc-guivm
(import ./common/vm-networking.nix {
Expand All @@ -38,6 +39,7 @@ let
debug.enable = lib.mkDefault config.ghaf.profiles.debug.enable;
applications.enable = false;
graphics.enable = true;
graphics.compositor = lib.mkForce "cosmic";
};

# To enable screen locking set to true
Expand Down Expand Up @@ -79,6 +81,9 @@ let
};
};

services.desktopManager.cosmic.enable = true;
services.displayManager.cosmic-greeter.enable = true;

systemd.services."waypipe-ssh-keygen" =
let
keygenScript = pkgs.writeShellScriptBin "waypipe-ssh-keygen" ''
Expand Down
8 changes: 6 additions & 2 deletions targets/generic-x86_64/flake-module.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
...
}:
let
inherit (inputs) nixos-generators;
inherit (inputs) nixos-generators nixos-cosmic;
name = "generic-x86_64";
system = "x86_64-linux";
generic-x86 =
Expand Down Expand Up @@ -41,6 +41,7 @@ let
hostConfiguration = lib.nixosSystem {
inherit system;
modules = [
nixos-cosmic.nixosModules.default
nixos-generators.nixosModules.raw-efi
self.nixosModules.common
self.nixosModules.desktop
Expand Down Expand Up @@ -73,11 +74,14 @@ let
release.enable = variant == "release";
debug.enable = variant == "debug";
# Uncomment this line to use Labwc instead of Weston:
#graphics.compositor = "labwc";
graphics.compositor = "cosmic";
};
reference.programs.windows-launcher.enable = true;
};

services.desktopManager.cosmic.enable = true;
services.displayManager.cosmic-greeter.enable = true;

#TODO: how to handle the majority of laptops that need a little
# something extra?
# SEE: https://github.com/NixOS/nixos-hardware/blob/master/flake.nix
Expand Down
Loading