From 5eebe93f72a59801190688bc5be0e5e40d3665cc Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sun, 15 Sep 2024 14:46:12 -0400 Subject: [PATCH] Added cosmic --- flake.lock | 145 ++++++++++++++++++++++++++++++ flake.nix | 7 ++ hosts/fwbook.nix | 7 +- modules/lib.nix | 8 ++ modules/nixos/desktop/cosmic.nix | 18 ++++ modules/nixos/desktop/default.nix | 1 + 6 files changed, 185 insertions(+), 1 deletion(-) create mode 100644 modules/nixos/desktop/cosmic.nix diff --git a/flake.lock b/flake.lock index 728b61a..d4b622f 100644 --- a/flake.lock +++ b/flake.lock @@ -33,6 +33,44 @@ "type": "github" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1717312683, + "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=", + "owner": "nix-community", + "repo": "flake-compat", + "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "nixos-cosmic", + "nix-update", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -297,6 +335,53 @@ "type": "github" } }, + "nix-update": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": [ + "nixos-cosmic", + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1726334963, + "narHash": "sha256-L8ICz9iELkvQl/ufdSWy9lRm8DLNpKDFxoeHQfPu4E8=", + "owner": "Mic92", + "repo": "nix-update", + "rev": "84d7535d076c5e06fba272738448c80698eb3d40", + "type": "github" + }, + "original": { + "owner": "Mic92", + "repo": "nix-update", + "type": "github" + } + }, + "nixos-cosmic": { + "inputs": { + "flake-compat": "flake-compat", + "nix-update": "nix-update", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1726412209, + "narHash": "sha256-QgwbKp6e6oHidv3BMPdLdw+t7PHUaR9VNpkDny53a7I=", + "owner": "lilyinstarlight", + "repo": "nixos-cosmic", + "rev": "c893f7113553b8dcc27f398deb285e3ada568577", + "type": "github" + }, + "original": { + "owner": "lilyinstarlight", + "repo": "nixos-cosmic", + "type": "github" + } + }, "nixos-hardware": { "locked": { "lastModified": 1725477728, @@ -329,6 +414,22 @@ "type": "github" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1726062281, + "narHash": "sha256-PyFVySdGj3enKqm8RQuo4v1KLJLmNLOq2yYOHsI6e2Q=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e65aa8301ba4f0ab8cb98f944c14aa9da07394f8", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1725407940, @@ -352,6 +453,7 @@ "hyprland": "hyprland", "hyprspace": "hyprspace", "nix-darwin": "nix-darwin", + "nixos-cosmic": "nixos-cosmic", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", "systems": "systems_2", @@ -359,6 +461,27 @@ "unstable-home-manager": "unstable-home-manager" } }, + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "nixos-cosmic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1726280639, + "narHash": "sha256-YfLRPlFZWrT2oRLNAoqf7G3+NnUTDdlIJk6tmBU7kXM=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "e9f8641c92f26fd1e076e705edb12147c384171d", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -389,6 +512,28 @@ "type": "github" } }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nixos-cosmic", + "nix-update", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1719887753, + "narHash": "sha256-p0B2r98UtZzRDM5miGRafL4h7TwGRC4DII+XXHDHqek=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "bdb6355009562d8f9313d9460c0d3860f525bc6c", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "unstable": { "locked": { "lastModified": 1725638002, diff --git a/flake.nix b/flake.nix index 4d985ea..1112eff 100644 --- a/flake.nix +++ b/flake.nix @@ -6,6 +6,11 @@ # Nixpkgs unstable.url = "github:NixOS/nixpkgs/master"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; + # Cosmic + nixos-cosmic = { + url = "github:lilyinstarlight/nixos-cosmic"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # Hyprland hyprland = { url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; @@ -45,6 +50,7 @@ , gBar , hyprland , hyprspace + , nixos-cosmic }: let user = { @@ -94,6 +100,7 @@ nix-darwin hlCommonSettings systems + nixos-cosmic ; specialArgs = { inputs = { diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index 06f9b90..46af843 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -15,13 +15,14 @@ in skyg.nixos.desktop = { enabled = true; kde.enabled = true; + cosmic.enabled = true; hyprland = { enabled = true; useNWG = false; }; crypto.enabled = true; }; - services.displayManager.defaultSession = "hyprland"; + services.displayManager.defaultSession = "plasma"; skyg.nixos.common.hardware.sound.enable = true; # Firmware updater services.fwupd.enable = true; @@ -65,8 +66,12 @@ in dvc-with-remotes google-cloud-sdk awscli + dbeaver-bin # Web chromium + # Photo Editing + krita + gimp-with-plugins ]; programs.firefox = { enable = true; diff --git a/modules/lib.nix b/modules/lib.nix index d27c59e..50b7987 100644 --- a/modules/lib.nix +++ b/modules/lib.nix @@ -3,6 +3,7 @@ , nix-darwin , systems , hlCommonSettings +, nixos-cosmic , specialArgs }: let @@ -32,6 +33,13 @@ let modules = (makeImports { attrs = joinedttrs; extraConfiguration = [ + { + nix.settings = { + substituters = [ "https://cosmic.cachix.org/" ]; + trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ]; + }; + } + nixos-cosmic.nixosModules.default home-manager.nixosModules.default ]; }); diff --git a/modules/nixos/desktop/cosmic.nix b/modules/nixos/desktop/cosmic.nix new file mode 100644 index 0000000..7c0c321 --- /dev/null +++ b/modules/nixos/desktop/cosmic.nix @@ -0,0 +1,18 @@ +{ config, lib, pkgs, ... }: +with lib; + +let + cfg = config.skyg.nixos.cosmic.kde; +in +{ + options = { + skyg.nixos.desktop.cosmic = { + enabled = mkEnableOption + "Cosmic"; + }; + }; + config = mkIf cfg.enabled { + services.desktopManager.cosmic.enable = true; + services.displayManager.cosmic-greeter.enable = true; + }; +} diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix index c870b26..929ee4d 100644 --- a/modules/nixos/desktop/default.nix +++ b/modules/nixos/desktop/default.nix @@ -8,6 +8,7 @@ in imports = [ ./hyprland ./kde.nix + ./cosmic.nix ./wayland.nix ./x11.nix ./packages.nix