Commit Graph

2173 Commits

Author SHA1 Message Date
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