Commit Graph

2232 Commits

Author SHA1 Message Date
Bobby Rong
a323f4f828
mate: Install mate-panel-with-applets by default 2024-03-14 23:34:06 +08:00
Bobby Rong
c87f6b5591
mate: Install caja-with-extensions by default 2024-03-14 23:34:05 +08:00
Stzx
8bf5cc2666
pinentry: fix DM option and user conflict 2024-03-14 21:54:35 +08:00
Sandro Jäckel
b07cdeb1b3
nixos/plasma6: move out of x11
This release focuses on wayland, lets give that justice
2024-03-12 10:49:42 +01:00
éclairevoyant
6b80044d9d
Merge pull request #294584 from MinerSebas/plasma-samba
nixos/plasma6: Dont add samba a second time to environment.systemPackages
2024-03-09 23:40:45 +00:00
MinerSebas
cf3a468eee nixos/plasma6: Dont add samba a second time to environment.systemPackages 2024-03-09 17:06:25 +01:00
Franz Pletz
a270c43ea1
treewide: use sensible pinentry flavor 2024-03-08 23:09:02 +01:00
Franz Pletz
764d15f59f
pinentry: remove multiple outputs package
fixes #133156 #124753
2024-03-02 17:16:53 +01:00
K900
d7a4bf5998 nixos/plasma6: nuke sycoca on activation
This is not the right solution, but it should get us going for now.
2024-03-02 11:26:41 +03:00
Matt Moriarity
e59d120fc1 nixos/plasma6: install kcmutils 2024-02-29 20:12:42 -07:00
K900
2614e40893 sddm: add Wayland to the wrapper if enabled 2024-02-28 18:49:33 +03:00
K900
7b74d9a4ac sddm: 0.20.0-unstable -> 0.21.0 2024-02-28 18:49:33 +03:00
K900
3f650b567f nixos/plasma6: init 2024-02-28 18:49:33 +03:00
K900
8be79e54c5 nixos/pam/kwallet: rename option, allow setting package 2024-02-28 18:49:33 +03:00
K900
2248bdfbbc nixos/sddm: add extraPackages option 2024-02-28 18:49:12 +03:00
Rick van Schijndel
e5e1de76b7
Merge pull request #281058 from wineee/fi
deepin: don't install packages using freeimage by default
2024-02-20 20:27:47 +01:00
Federico Damián Schonborn
b9c8b27f89
nixos/budgie: Enable SSH socket support in BCC when needed
Signed-off-by: Federico Damián Schonborn <federicoschonborn@disroot.org>
2024-02-19 18:06:33 -03:00
Michele Guerini Rocco
f74d88a6f1
Merge pull request #281162 from kennycallado/master
nixos/icewm: Update icewm start command
2024-02-14 18:17:27 +01:00
Peder Bergebakken Sundt
40cb108adf
Merge pull request #232528 from SuperSandro2000/chromium-kde
nixos/chromium: add enablePlasmaBrowserIntegration option
2024-02-10 17:15:14 +01:00
Sandro Jäckel
42b58f2c73
nixos/plasma5: enable programs.chromium.enablePlasmaBrowserIntegration 2024-02-07 16:04:25 +01:00
Rodney Lorrimar
8513f69b24 nixos/phosh: Ensure that desktop session is identified as Phosh 2024-02-07 20:10:15 +11:00
Linus Heckemann
9f571cb4ef
Merge pull request #284508 from nikstur/etc-overlay-leading-slash
nixos/etc: remove leading slash from paths
2024-02-03 18:01:01 +01:00
K900
3176d495ff nixos/plasma5: enable qt stuff
Otherwise things like themes only work due to lucky wrapper leakage.
2024-01-30 17:36:06 +03:00
Weijia Wang
5116ea824d
Merge pull request #280549 from wineee/deepin-icon
deepin: move distribution.info back to deepin-desktop-base
2024-01-30 14:50:13 +01:00
K900
0f34032f5a nixos/plasma5: install missing style plugins 2024-01-30 11:38:10 +03:00
Bobby Rong
850bac2305
Merge pull request #284633 from FedericoSchonborn/budgie-desktop-10.9
Budgie Desktop 10.9
2024-01-29 21:58:15 +08:00
Federico Damián Schonborn
0d209c6641
nixos/budgie: Replace gnome-session with budgie-session
Signed-off-by: Federico Damián Schonborn <fdschonborn@gmail.com>
2024-01-28 20:08:59 -03:00
nikstur
dff64f549e nixos/x11: remove leading slash from environment.etc path
Even if the tools that assemble /etc can handle leading slashes, this
still is not correct. For example, you could have both /X11 and X11 in
environment.etc which makes overriding hard.
2024-01-28 13:38:09 +01:00
Naxdy
edc49b2e83
nixos/plasma5: fix plasmaMobileGear path 2024-01-26 23:52:49 +01:00
Niklas Hambüchen
305821576a
Merge pull request #273239 from nh2/issue-31138-fix-xkbvalidate-xkb-dir
xserver service: xkbvalidate: Respect `xkb.dir`
2024-01-18 21:56:39 +01:00
rewine
44c752a58a deepin: don't install packages using freeimage by default 2024-01-16 13:08:43 +08:00
kennycallado
73cb336785 nixos/icewm: Update icewm start command
Preferred way to start session in icewm. [docs](https://ice-wm.org/man/icewm-session)
2024-01-15 17:49:01 +01:00
rewine
7e27869a75 deepin: move distribution.info back to deepin-desktop-base 2024-01-15 14:19:50 +08:00
Nick Cao
5ba9fede25
Merge pull request #278593 from SuperSandro2000/xdg-data-dirs-display-managers
nixos/display-managers: only link desktop derivation if sessionPackages is not empty
2024-01-14 15:22:57 -05:00
K900
ceede53bfa
Merge pull request #207722 from SuperSandro2000/plasma5-cleanup-pkgs
nixos/plasma5: use plasma5Packages everywhere for clarity
2024-01-14 22:30:39 +03: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
Lin Jian
b05d9c12d9
Merge pull request #237904 from SuperSamus/libinput-description
nixos/libinput: update horizontalScrolling description
2024-01-04 19:55:53 +08:00
Martino Fontana
d6022b39ee nixos/libinput: update horizontalScrolling description 2024-01-04 11:34:25 +01:00
Sandro Jäckel
2db74e8339
nixos/display-managers: only link desktop derivation if sessionPackages is not empty
On a headless system there are no entries and we do not need to add it
to XDG_DATA_DIRS.
2024-01-03 23:48:54 +01:00
K900
06cc32ffc3 nixos/sddm: add package option 2024-01-03 17:20:10 +03: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
Niklas Hambüchen
f757546d0f xserver service: xkbvalidate: Respect xkb.dir. Fixes #31138.
Until now, if you set `services.xserver.xkb.dir` to a dir containing
a custom keyboard layout, and making this layout the default via
`services.xserver.xkb.layout`, `xkbvalidate` would complain:

    The value `gb-CapsLockIsHyperL' for keyboard layout is invalid.

    Please check the definition in `services.xserver.xkb.layout'.

    Detailed XKB compiler errors:

        Couldn't find file "symbols/gb-CapsLockIsHyperL" in include paths
        1 include paths searched:
            /nix/store/x1ahkafwzv66s3yxffvrjc0ixkcjiig6-xkeyboard-config-2.31/etc/X11/xkb
        3 include paths could not be added:
            /homeless-shelter/.config/xkb
            /homeless-shelter/.xkb
            /etc/xkb
        Abandoning symbols file "(unnamed)"
        Failed to compile xkb_symbols
        Failed to compile keymap

This is because the `xkb_*()` functions in `xkbvalidate` were not
told to use our `xkbDir`.

This commit fixes it by passing the dir as an environment variable
as described on:

* https://xkbcommon.org/doc/current/group__include-path.html
* https://xkbcommon.org/doc/current/group__context.html
2023-12-10 02:18:54 +01: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
Silvan Mosberger
54c8a15650
Merge pull request #271247 from h7x4/treewide-mkpackageoptionmd-to-mkpackageoption
treewide: replace `mkPackageOptionMD` with `mkPackageOption`
2023-12-01 02:09:10 +01:00
Franz Pletz
c4b7e013aa
Merge pull request #243834 from LunNova/lunnova/i3-update-session-environment 2023-11-30 20:42:13 +01: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
Weijia Wang
babc0d5e96
Merge pull request #257400 from wineee/deepin-23
deepin desktop environment: v20 -> v23Beta
2023-11-30 02:47:08 +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
Sandro Jäckel
3b73ab96a7
nixos/plasma5: use plasma5Packages everywhere for clarity 2023-11-24 13:26:00 +01:00
Chris Marchesi
54020c36a2 nixos/xscreensaver: init module
This adds a NixOS module for XScreenSaver (from @aidalgol in #130218,
with a few updates).

The module:

* Installs XScreenSaver
* Sets up a suid wrapper for xscreensaver-auth
* Sets up a user service for xscreensaver

The suid wrapper should function correctly when xscreensaver is
installed via the derivation update in 40a00547b71.

Co-authored-by: Aidan Gauland <aidalgol@fastmail.net>
Co-authored-by: Anderson Torres <torres.anderson.85@protonmail.com>
2023-11-24 08:53:00 -03: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
Paul Meyer
143680787e nixos/x11: move extraLayouts into xkb attrset
[Motivation](NixOS#257817 (comment))

`extraLayouts` was missed in #259891, so moving it to the other xkb
options with this PR.

Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
2023-11-01 11:55:25 +01:00
Luna Nova
d47bb3261f
nixos/i3: add updateSessionEnvironment option
Runs dbus-update-activation-environment and systemctl import-environment on session start
to ensure xdg portals work, and user services have correct PATH / XDG env vars.
Matches behavior of Plasma/Gnome sessions.
2023-10-22 10:18:55 -07: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
Artturin
d891f369ee nixos/x11: don't use a submodule for xkb options
A submodule is unnecessary

Improved a few descriptions
2023-10-14 04:15:53 +03:00
Artturin
d470944859 nixos/x11: create xkb option by default
without this
```
nix-repl> nixosTests.xfce.nodes.machine.services.xserver.xkb
error: The option 'nodes.machine.services.xserver.xkb' is used but not defined.
```

with this
```
nix-repl> nixosTests.xfce.nodes.machine.services.xserver.xkb
{ dir = "/nix/store/096yg7fc67py86w0bm6g7a32npgyh5ic-xkeyboard-config-2.39/etc/X11/xkb"; layout = "us"; model = "pc104"; options = "terminate:ctrl_alt_bksp"; variant = ""; }
```
2023-10-13 01:16:14 +03: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
76917ca3ae nixos/sddm: add option to enable Wayland support via Weston 2023-10-03 12:48:58 +03: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
K900
7a7c1859cd nixos/lightdm-tiny-greeter: remove nixpkgs.config usage 2023-09-26 18:02:00 +03:00
K900
daebf5c6e2
Merge pull request #254071 from alois31/plasma-setuid
nixos/plasma5: remove pointless setuid wrappers
2023-09-22 14:21:03 +03:00
Artturi
ff10769cc9
Merge pull request #165298 from danielfullmer/gdm-banner 2023-09-21 23:40:15 +03:00
Daniel Fullmer
67c5103f40 nixos/gdm: add banner option
This exposes the banner message option in GDM. Some computing
environments have compliance requirements which include displaying a
message to the user before logon.
2023-09-19 05:17:59 +03:00
Anderson Torres
77671b681c oroborus: remove
Because it is dead.
2023-09-11 01:56:45 +00: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
Bobby Rong
a8e3f93bcd
Merge pull request #252986 from FedericoSchonborn/budgie-module-update
nixos/budgie: Use Network Manager Applet indicator, budgie.budgie-gsettings-overrides: Update defaults
2023-09-05 00:02:22 +08: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
Jan Tojnar
434d160d7c
Merge pull request #234615 from linsui/dconf
nixos/dconf: support generating from attrs
2023-08-28 18:31:52 +02:00
Theodore Ni
c68a6a21ca
Merge pull request #247909 from Sigmanificient/ragnarwm
ragnarwm: init at 1.3.1
2023-08-27 13:41:04 -07:00
Janik
1f0c325739
Merge pull request #250976 from Shados/sddm-include-tmpfile-config 2023-08-26 20:21:20 +02:00
Ilan Joselevich
649fadd226
Merge pull request #250761 from gepbird/dwm-fix-java-gui
dwm: add _JAVA_AWT_WM_NONREPARENTING=1
2023-08-24 22:02:38 +03:00
Alexei Robyn
4d0d7fb93e nixos/sddm: avoid systemd-tmpfiles-clean removing user's $XAUTHORITY 2023-08-23 22:52:50 +10:00
Gutyina Gergő
2a71e7815e
dwm: add _JAVA_AWT_WM_NONREPARENTING=1
dwm is not in Java's internal list of non-reparrenting
window managers. Running Java GUI programs without this
variable on window managers (eg. jd-gui) causes the window
to be blank.
2023-08-22 12:56:59 +02:00
Sigmanificient
0482394fe0 ragnarwm: init at 1.3.1 2023-08-20 18:20:39 +02: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
Niki4tap
bd0b732bef dwm: use correct hash in example 2023-08-17 21:14:35 +03: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