Commit Graph

1086 Commits

Author SHA1 Message Date
rewine
44c752a58a deepin: don't install packages using freeimage by default 2024-01-16 13:08:43 +08:00
Maxine Aubrey
c3d027f9ce
gnome: don't include gnome-themes-extra by default
Upstream moved gnome-themes-extra to world 3 years ago
8b1708c38b
2024-01-05 16:01:12 +01:00
Bobby Rong
5cb00274f2
Merge pull request #276060 from bobby285271/fix/cinnamon-sessionpath
nixos/cinnamon: Unbreak sessionPath option
2023-12-23 21:05:08 +08:00
Bobby Rong
1ec293c599
nixos/cinnamon: Unbreak sessionPath option
It looks like XDG_CURRENT_DESKTOP is not set when we run these lines,
and sessionCommands does not seem to work when using GDM and Cinnamon wayland.
2023-12-23 10:09:35 +08:00
K900
be1866d698
Merge pull request #270958 from MinerSebas/plasma-samba
nixos/plasma5: Dont add samba a second time to `environment.systemPackages`
2023-12-16 09:15:47 +03:00
K900
3c1ad28f89
Merge pull request #266234 from SuperSamus/plasma-dconf-glib
nixos/plasma5: enable dconf by default
2023-12-05 00:23:29 +03:00
Bobby Rong
43744f5bc4
Merge pull request #268515 from NixOS/cinnamon
Cinnamon 6.0
2023-12-03 12:20:39 +08:00
Bobby Rong
9247bdfce7
nixos/cinnamon: switch to xdg.portal.configPackages
This will make sure the config is in sync with upstream.
2023-12-02 12:12:48 +08:00
h7x4
79d3d59f58
treewide: replace mkPackageOptionMD with mkPackageOption 2023-11-30 19:03:14 +01:00
Weijia Wang
feeae486de
Merge pull request #261702 from h7x4/replace-mkoption-with-mkpackageoption
treewide: use `mkPackageOption`
2023-11-30 02:49:30 +01:00
MinerSebas
95a5f14116 nixos/plasma5: Dont add samba a second time to environment.systemPackages
If `services.samba.enable` is true, the the samba Module already adds the samba Package. If a User sets a differnet Package in `services.samba.package` then `environment.systemPackages` will contain two different samba Packages.
```
system-path> warning: collision between `/nix/store/rw5fzn10lb21xk3myc0d4m49j69d0crs-samba-4.19.2/bin/testparm' and `/nix/store/ssxn9pnl293knqghcjvpbzb6ysg0f7fv-samba-4.19.2/bin/testparm'
system-path> warning: collision between `/nix/store/rw5fzn10lb21xk3myc0d4m49j69d0crs-samba-4.19.2/bin/testparm' and `/nix/store/ssxn9pnl293knqghcjvpbzb6ysg0f7fv-samba-4.19.2/bin/testparm'
system-path> warning: collision between `/nix/store/rw5fzn10lb21xk3myc0d4m49j69d0crs-samba-4.19.2/bin/nmbd' and `/nix/store/ssxn9pnl293knqghcjvpbzb6ysg0f7fv-samba-4.19.2/bin/nmbd'
system-path> warning: collision between `/nix/store/rw5fzn10lb21xk3myc0d4m49j69d0crs-samba-4.19.2/bin/nmbd' and `/nix/store/ssxn9pnl293knqghcjvpbzb6ysg0f7fv-samba-4.19.2/bin/nmbd'
system-path> warning: collision between `/nix/store/rw5fzn10lb21xk3myc0d4m49j69d0crs-samba-4.19.2/bin/smbcontrol' and `/nix/store/ssxn9pnl293knqghcjvpbzb6ysg0f7fv-samba-4.19.2/bin/smbcontrol'
system-path> warning: collision between `/nix/store/rw5fzn10lb21xk3myc0d4m49j69d0crs-samba-4.19.2/bin/smbcontrol' and `/nix/store/ssxn9pnl293knqghcjvpbzb6ysg0f7fv-samba-4.19.2/bin/smbcontrol'
system-path> warning: collision between `/nix/store/rw5fzn10lb21xk3myc0d4m49j69d0crs-samba-4.19.2/bin/gentest' and `/nix/store/ssxn9pnl293knqghcjvpbzb6ysg0f7fv-samba-4.19.2/bin/gentest'
system-path> warning: collision between `/nix/store/rw5fzn10lb21xk3myc0d4m49j69d0crs-samba-4.19.2/bin/gentest' and `/nix/store/ssxn9pnl293knqghcjvpbzb6ysg0f7fv-samba-4.19.2/bin/gentest'
system-path> warning: collision between `/nix/store/rw5fzn10lb21xk3myc0d4m49j69d0crs-samba-4.19.2/bin/smbpasswd' and `/nix/store/ssxn9pnl293knqghcjvpbzb6ysg0f7fv-samba-4.19.2/bin/smbpasswd'
system-path> warning: collision between `/nix/store/rw5fzn10lb21xk3myc0d4m49j69d0crs-samba-4.19.2/bin/smbd' and `/nix/store/ssxn9pnl293knqghcjvpbzb6ysg0f7fv-samba-4.19.2/bin/smbd'
...
```
(The original samba will still stay in the closure as `kdenetwork-filesharing` depends on it.)
2023-11-29 16:15:52 +01:00
h7x4
0a37316d6c
treewide: use mkPackageOption
This commit replaces a lot of usages of `mkOption` with the package
type, to be `mkPackageOption`, in order to reduce the amount of code.
2023-11-27 01:28:36 +01:00
rewine
12fba79491
deepin: add v23 packages 2023-11-23 10:00:44 +08:00
Jan Tojnar
b32a490b14 nixos/gnome: Do not install Photos
829b9aacc5
2023-11-21 09:21:55 +01:00
Bobby Rong
39a1279b4d nixos/desktop-managers: Add xdg.portal.config or xdg.portal.configPackages
See the changes in x-d-p 1.17 for details.
2023-11-21 08:42:17 +01:00
Bobby Rong
511d457142 nixos/gnome: Replace eog with loupe
ad3b4ca520

Acked-by: Jan Tojnar <jtojnar@gmail.com>
2023-11-21 08:41:54 +01:00
Bobby Rong
14fb201c7c nixos/gnome: Replace cheese with snapshot
f2b0abe388

Acked-by: Jan Tojnar <jtojnar@gmail.com>
2023-11-21 08:41:50 +01:00
Martino Fontana
84e51c525d nixos/plasma5: enable dconf by default 2023-11-17 11:48:00 +01:00
Anthony Roussel
e30f48be94
treewide: fix redirected and broken URLs
Using the script in maintainers/scripts/update-redirected-urls.sh
2023-11-11 10:49:01 +01:00
K900
ea9372de82
Merge pull request #265482 from alois31/plasma-setuid
nixos/plasma5: fix mismatch between nix and module system
2023-11-04 19:08:55 +03:00
Alois Wohlschlager
dee9519abe
nixos/plasma5: fix mismatch between nix and module system
In https://github.com/NixOS/nixpkgs/pull/254071, a mismatch between usage of
the Nix language and the NixOS module system was introduced. By merging the
kwin_wayland wrapper attrset into the mkIf representation, the former was
effectively ignored.
As a result, the capability wrapper for kwin_wayland stopped being installed,
leading to realtime scheduling being disabled. The issue was not detected
because the behavioral change is very subtle.

By consistently using language-level constructs, this mismatch is resolved.
The capability wrapper is thus installed again and realtime scheduling is
restored.
2023-11-04 16:33:38 +01:00
K900
60421a1622 firefox: start killing all the per-extension options 2023-10-22 17:13:42 +03:00
Bjørn Forsman
142074c2a8 nixos: fix bad mkEnableOption descriptions
Fix descriptions that don't account for (1) the "Whether to enable"
prefix or (2) the automatically added trailing dot.
2023-10-20 16:22:40 +01:00
Artturi
520e363e82
Merge pull request #259891 from l0b0/refactor/xkb-attrset 2023-10-12 08:43:28 +03:00
Victor Engmark
3a6c79cff6 nixos/x11: refactor XKB options into a single attrset
[Motivation](https://github.com/NixOS/nixpkgs/issues/257817#issuecomment-1741705042):

- Having all the XKB options in the same attribute set clarifies their
  relation better than using a common option name prefix ("xkb").
- `services.xserver.layout` is an XKB option, but this is not obvious
  from its name. Putting it with the other XKB options clarifies this.

Co-authored-by: Michele Guerini Rocco <rnhmjoj@users.noreply.github.com>
2023-10-11 09:46:37 +03:00
R. Ryantm
051963b199
cinnamon.mint-artwork: 1.7.5 -> 1.7.6
This sets the mono font to DejaVu Sans Mono 10.
2023-10-10 22:06:50 +08:00
Bobby Rong
ba82dd7148
gnome.gnome-flashback: Add mkGnomeSession
Having this in environment.systemPackages shouldn't be worse than
adding as XDG_DATA_DIRS in gnome-session.
2023-10-06 18:27:49 +08:00
Bobby Rong
21f5cd377a
gnome.gnome-flashback: Add mkWmApplication
Having this in environment.systemPackages shouldn't be worse than
adding as XDG_DATA_DIRS in gnome-session.
2023-10-06 18:22:07 +08:00
Bobby Rong
f6345cd259
gnome.gnome-panel-with-modules: init
Setting X_GNOME_PANEL_MODULESDIR in gnome-session wrapper is confusing to me.
2023-10-06 18:22:07 +08:00
Bobby Rong
fc096a6d9c
nixosTests.gnome-flashback: Fix eval
The option `nodes.machine.environment.variables.XDG_CONFIG_DIRS' is defined multiple times while it's expected to be unique.
2023-10-06 12:18:53 +08:00
K900
f33cdbcc25 nixos/gnome: remove nixpkgs.config usage
I have no idea how to keep this working, but it feels wrong anyway.
2023-09-26 18:02:01 +03:00
K900
d3c27efa36 nixos/firefox: remove nixpkgs.config usage 2023-09-26 18:02:01 +03:00
Alois Wohlschlager
bd0cbb43ec
nixos/plasma5: remove pointless setuid wrappers
The module for Plasma 5 contained two pointless setuid wrappers:
* kscreenlocker_greet was introduced when the kscreenlocker package
  dropped kcheckpass. However, this was actually replaced by making
  proper use of PAM (which finally calls its unix_chkpwd setuid binary).
  kscreenlocker_greet itself was never intended to be setuid.
  Fortunately, this is not exploitable, because QCoreApplication
  immediately aborts if it detects setuid. The wrapper is still
  incorrect and pointless, so remove it.
* start_kdeinit can optionally use setuid root or setcap
  CAP_SYS_RESOURCE to reduce its OOM killer score. However, with systemd
  startup, start_kdeinit does not get used at all. So in this case, the
  setuid wrapper is pointless, and so is removed as well. Ideally, the
  case where systemd startup is not enabled would use a capability
  wrapper instead, but since systemd startup is the default in NixOS and
  kinit is deprecated upstream for KF6, I don't bother any more.
2023-09-08 19:21:22 +02:00
Federico Damián Schonborn
5ab4510232
nixos/budgie: Use the Network Manager Applet indicator
Signed-off-by: Federico Damián Schonborn <fdschonborn@gmail.com>
2023-09-02 15:49:59 -03:00
Bobby Rong
5f75be53ea
Merge pull request #249712 from bobby285271/upd/cinnamon-qt-style
nixos/cinnamon: Override Qt apps style again
2023-08-20 11:35:23 +08:00
Bobby Rong
26adac4d27
nixos/cinnamon: Override Qt apps style again
Use gtk2 to follow Mint's decision for now.
2023-08-17 17:08:29 +08:00
Bobby Rong
fd1f73aaa2
Merge pull request #249312 from FedericoSchonborn/budgie/magpie
budgie.magpie: init at 0.9.2, replace Mutter with it on Budgie
2023-08-17 15:43:43 +08:00
Federico Damián Schonborn
9325eefbdc
nixos/budgie: Add Magpie to services.udev.packages
Signed-off-by: Federico Damián Schonborn <fdschonborn@gmail.com>
2023-08-17 00:56:43 -03:00
Bobby Rong
ddd4973ddb
nixos/cinnamon: Drop qgnomeplatform
The upstream is not maintained, and qadwaitadecoration
does not seem to be xorg-related. We should have proper
shadows when using SSD.
2023-08-13 12:21:54 +08:00
Bobby Rong
f4e1e8627d
nixos/pantheon: Drop qgnomeplatform
The upstream is not maintained, and qadwaitadecoration
does not seem to be xorg-related. We should have proper
shadows when using SSD.
2023-08-13 12:21:54 +08:00
Jan Tojnar
622745942b nixos/gnome: Do not force Qt apps to Adwaita
adwaita-qt tries valiantly to ensure a visual consistency
but unfortunately, it often falls into an uncanny valley instead.
Let’s make it opt-in again for more vanilla default experience.

Related: https://pagure.io/fedora-workstation/issue/351
2023-08-12 10:29:34 +02:00
Bobby Rong
69a7cd6718
Merge pull request #245481 from bobby285271/upd/pantheon
Pantheon updates 2023-07-26
2023-07-27 16:04:25 +08:00
Bobby Rong
497229d3c2
nixos/pantheon: Install orca
ref: ec0eb37689
2023-07-27 14:08:53 +08:00
asymmetric
46df012d2a
Merge pull request #244332 from SuperSandro2000/fonts-fonts
nixos/fonts: rename fonts.fonts option to fonts.packages, other cleanups
2023-07-25 09:49:25 +02:00
Bobby Rong
34d40c6f20
Merge pull request #245105 from thoughtfull-systems/xfce-exclude-packages
nixos/xfce: add environment.xfce.excludePackages option
2023-07-25 11:39:30 +08:00
Sandro Jäckel
b0c67b4b6e
treewide: rename fonts.fonts to fonts.packages 2023-07-24 17:34:39 +02:00
Paul Stadig
cb2f531332 nixos/xfce: allow exclusion of xfce4-notifyd
Use `environment.xfce.excludePackages` with `systemd.packages` so `xfce4-notifyd` can be excluded
from installation.
2023-07-24 07:55:10 -04:00
Paul Stadig
1c5e23c405 nixos/xfce: add environment.xfce.excludePackages option
Packages in environment.xfce.excludePackages will be excluded from the default environment.

Fixes #91169
2023-07-23 17:52:41 -04:00
Felix Bühler
0a2745684e
Merge pull request #239624 from Stunkymonkey/use-optionalString-then
treewide: use optionalString instead of 'then ""'
2023-07-22 13:02:47 +02:00
Sandro
5e3022fb17
Merge pull request #240320 from wegank/cdesktopenv-bump
cdesktopenv: 2.3.2 -> 2.5.1
2023-07-05 23:41:36 +02:00