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.

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

feat: add cinnamon #74242

Closed
wants to merge 73 commits into from
Closed
Show file tree
Hide file tree
Changes from 46 commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
afbbff5
feat: add cinnamon
mkg20001 Nov 26, 2019
43dbe25
feat: enable cinnamon
mkg20001 Nov 26, 2019
b5801d5
feat: add new and old cinnamon port
mkg20001 Nov 26, 2019
f7c8459
feat: cinnamon scope
mkg20001 Nov 26, 2019
2d32d11
refactor: move cinnamon new into cinnamon target
mkg20001 Nov 26, 2019
c752458
feat: add myself as maintainer
mkg20001 Nov 26, 2019
060ea83
feat: make it build
mkg20001 Nov 26, 2019
8dcc791
Revert "spidermonkey_52: drop, as is unused"
mkg20001 Nov 26, 2019
6c374de
feat: hooks and fixes
mkg20001 Nov 26, 2019
e8b03dc
feat: fixesnstuff
mkg20001 Nov 26, 2019
478656b
fix: more patches
mkg20001 Nov 26, 2019
0609403
fix: hash
mkg20001 Nov 26, 2019
db40928
fix: hash for real
mkg20001 Nov 26, 2019
a9d0947
feat: more package fixes
mkg20001 Nov 27, 2019
f7823b8
fix: cinnamon translations
mkg20001 Nov 27, 2019
34e67e1
fix: xapps can't find g-codegen
mkg20001 Nov 27, 2019
d4742a1
misc: cleanup old file
mkg20001 Nov 27, 2019
e1b2e96
feat: rewrite cinnamon-control-center package
mkg20001 Nov 27, 2019
7e2a732
fix: more fixes
mkg20001 Nov 27, 2019
5219f49
fix: cinnamon
mkg20001 Nov 27, 2019
b418fdc
fix: use right path to cinnamon session
mkg20001 Nov 27, 2019
1cc7e6e
feat: upgrade cjs
mkg20001 Nov 27, 2019
5958b7e
fix: control-center build
mkg20001 Nov 28, 2019
77be741
feat: add cinnamon session & desktop as sys packages
mkg20001 Nov 28, 2019
3847c08
fix: finally fix cinnamon control center
mkg20001 Nov 28, 2019
c267e76
fix: cinnamon build
mkg20001 Nov 28, 2019
68d83e2
fix: link share as well to fix cinnamon session
mkg20001 Nov 28, 2019
b81a764
fix: tzdata hardcoded paths
mkg20001 Nov 28, 2019
56f54c8
fix: datetime/backward missing
mkg20001 Nov 28, 2019
9aa476f
fix: control-center tests
mkg20001 Nov 28, 2019
93350d0
fix: menu lib desc
mkg20001 Nov 28, 2019
f540f43
fix: nixos style
mkg20001 Nov 28, 2019
7712f83
fix: metadata
mkg20001 Nov 28, 2019
5233e01
fix: add cinnamon to cinnamon de
mkg20001 Nov 28, 2019
1ddc6da
fix: rename cinnamon to cinnamon-common
mkg20001 Nov 28, 2019
366a8b4
feat: add cinnamon-screensaver
mkg20001 Nov 28, 2019
44b34cd
feat: add nemo
mkg20001 Nov 28, 2019
82b4e17
feat: add nm-applet
mkg20001 Nov 28, 2019
362b7be
fix: confFixPhase => postPatch & gobjectIntrospection alias fix
mkg20001 Nov 28, 2019
eb066d2
fix: nemo dbl $out & DESTDIR usage
mkg20001 Nov 28, 2019
756df6c
chore: upgrade xapps
mkg20001 Nov 28, 2019
ad9123e
refactor: deps in cinnamon-session
mkg20001 Nov 28, 2019
b299e8e
fix: add review changes
mkg20001 Nov 28, 2019
ccea405
chore: upgrade deps
mkg20001 Nov 28, 2019
140a8ca
fix: use non-aliases
mkg20001 Nov 28, 2019
8b3a33d
fix: gobject introspection
mkg20001 Nov 28, 2019
dfc0221
refactor: cleanup pkgs/desktops/cinnamon/cinnamon-screensaver/default…
mkg20001 Nov 28, 2019
bb9ad38
fix: use py3 with pkgs
mkg20001 Nov 28, 2019
0bb5ff0
fix: add setproctitle as dep to cinnamon-screensaver
mkg20001 Nov 28, 2019
d23fe88
fix: remove another alias
mkg20001 Nov 28, 2019
63821af
fix: remove more aliases
mkg20001 Nov 29, 2019
5b8e515
fix: apply review comments
mkg20001 Nov 29, 2019
5aea87b
fix: hardcoded path
mkg20001 Nov 29, 2019
3b5a543
feat: package xapp python
mkg20001 Nov 29, 2019
acf1093
fix: cinnamon killer bad interpreter
mkg20001 Nov 29, 2019
4d76913
fix: add dep
mkg20001 Nov 29, 2019
20b4e8b
fix: cinnamon-screensaver deps
mkg20001 Nov 29, 2019
2846140
feat: add adwaita icon theme
mkg20001 Nov 29, 2019
01332ca
chore: add missing deps
mkg20001 Nov 29, 2019
f998322
fix: add xapps dep
mkg20001 Nov 29, 2019
b7e4f87
fix: dep
mkg20001 Nov 29, 2019
8a5b393
fix: add killall as dep
mkg20001 Nov 29, 2019
4ed31de
feat: use cinnamon-session-cinnamon instead of cinnamon-session
mkg20001 Nov 29, 2019
72b212e
feat: add 2d session
mkg20001 Nov 29, 2019
4f0e8f8
fix: add pycairo
mkg20001 Nov 29, 2019
0c63a5f
fix: add cairo
mkg20001 Nov 29, 2019
e8244e5
fix: cairo bug
mkg20001 Nov 29, 2019
5003659
fix: typo
mkg20001 Nov 29, 2019
e31bcd6
feat: add caribou
mkg20001 Nov 29, 2019
92709d9
typo
mkg20001 Nov 29, 2019
6e5a6b7
fix: cinnamon
mkg20001 Dec 1, 2019
94d8de5
fix: cinnamon fonts
mkg20001 Dec 1, 2019
f7737be
fix: theme & icons
mkg20001 Dec 1, 2019
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
10 changes: 10 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4528,6 +4528,16 @@
githubId = 22477669;
name = "Mark K Gardner";
};
mkg20001 = {
email = "[email protected]";
github = "mkg20001";
githubId = 7735145;
name = "Maciej Krüger";
keys = [{
longkeyid = "rsa4096/0x0D948CE19CF49C5F";
fingerprint = "E90C BA34 55B3 6236 740C 038F 0D94 8CE1 9CF4 9C5F";
}];
};
mlieberman85 = {
email = "[email protected]";
github = "mlieberman85";
Expand Down
52 changes: 52 additions & 0 deletions nixos/modules/services/x11/desktop-managers/cinnamon.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{ config, lib, pkgs, ... }:

with lib;

let
cfg = config.services.xserver.desktopManager.cinnamon;
in

{

options = {
services.xserver.desktopManager.cinnamon = {
enable = mkOption {
type = types.bool;
default = false;
description = "Enable the Cinnamon desktop environment.";
};
};
};

config = mkIf cfg.enable {
environment.systemPackages = with pkgs.cinnamon // pkgs; [
# common-files
cinnamon-common
cinnamon-session
cinnamon-desktop

# session requirements
cinnamon-screensaver
# nemo-autostart: provided by nemo
pkgs.gnome3.networkmanagerapplet
# cinnamon-killer-daemon: provided by cinnamon-common

# packages
nemo
];

environment.pathsToLink = [
"/share" # TODO: https://github.com/NixOS/nixpkgs/issues/47173
];

services.xserver.desktopManager.session = [{
name = "cinnamon";
bgSupport = true;
start = ''
${pkgs.runtimeShell} ${pkgs.cinnamon.cinnamon-session}/bin/cinnamon-session & # cinnamon-session-cinnamon &
# or cinnamon-session-cinnamon2d for 2d/sw-rendering. how to add?
waitPID=$!
'';
}];
};
}
2 changes: 1 addition & 1 deletion nixos/modules/services/x11/desktop-managers/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ in
imports = [
./none.nix ./xterm.nix ./xfce.nix ./plasma5.nix ./lumina.nix
./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix ./maxx.nix
./mate.nix ./pantheon.nix ./surf-display.nix
./mate.nix ./pantheon.nix ./surf-display.nix ./cinnamon.nix
];

options = {
Expand Down
Loading