thohlt/nixos-config
1
0
Fork 0
mirror of https://github.com/thiloho/nixos-config.git synced 2025-11-22 11:31:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Change to Plasma and remove unnecessary packages"

Browse Source 
This reverts commit 90625b6837.
This commit is contained in:
thiloho
2024-08-06 14:04:28 +02:00
parent 8846dffcf3
commit 32060797a1
3 changed files with 79 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
nixos-configurations/laptop/default.nix
View File

@@ -15,6 +15,33 @@
package = pkgs.mariadb;
};
systemd.tmpfiles.rules = [
"L+ /run/gdm/.config/monitors.xml - - - - ${pkgs.writeText "gdm-monitors.xml" ''
<monitors version="2">
<configuration>
<logicalmonitor>
<x>0</x>
<y>0</y>
<scale>1</scale>
<monitor>
<monitorspec>
<connector>eDP-1</connector>
<vendor>BOE</vendor>
<product>0x074f</product>
<serial>0x00000000</serial>
</monitorspec>
<mode>
<width>1920</width>
<height>1080</height>
<rate>60.012</rate>
</mode>
</monitor>
</logicalmonitor>
</configuration>
</monitors>
''}"
];
home-manager.users.thiloho = { pkgs, ... }: {
programs.git.signing.key = "5CF074CA31DD6686";
home = { stateVersion = "23.05"; };

31
nixos-configurations/pc/default.nix
View File

@@ -1,4 +1,4 @@
{ inputs, ... }:
{ inputs, pkgs, ... }:
{
imports = [
@@ -26,6 +26,35 @@
programs.adb.enable = true;
users.users.thiloho.extraGroups = [ "adbusers" ];
# Use same monitor settings for GDM as for GNOME user
systemd.tmpfiles.rules = [
"L+ /run/gdm/.config/monitors.xml - - - - ${pkgs.writeText "gdm-monitors.xml" ''
<monitors version="2">
<configuration>
<logicalmonitor>
<x>0</x>
<y>0</y>
<scale>2</scale>
<primary>yes</primary>
<monitor>
<monitorspec>
<connector>DP-3</connector>
<vendor>GBT</vendor>
<product>M27U</product>
<serial>23323B000497</serial>
</monitorspec>
<mode>
<width>3840</width>
<height>2160</height>
<rate>160.000</rate>
</mode>
</monitor>
</logicalmonitor>
</configuration>
</monitors>
''}"
];
home-manager.users.thiloho = { pkgs, lib, ... }: {
programs.git.signing.key = "5ECD00BDC15A987E";
home = {

33
nixos-configurations/shared-desktop.nix
View File

@@ -4,14 +4,18 @@
services = {
xserver = {
enable = true;
};
displayManager = {
sddm = {
displayManager.gdm.enable = true;
desktopManager.gnome = {
enable = true;
wayland.enable = true;
# extraGSettingsOverridePackages = [ pkgs.gnome.mutter ];
# fractional scaling support
# extraGSettingsOverrides = ''
# [org.gnome.mutter]
# experimental-features=['scale-monitor-framebuffer']
# '';
};
excludePackages = [ pkgs.xterm ];
};
desktopManager.plasma6.enable = true;
pipewire = {
enable = true;
alsa.enable = true;
@@ -28,6 +32,7 @@
postgresql = {
enable = true;
package = pkgs.postgresql_15;
ensureDatabases = [ "dcbot" "todos" ];
authentication = lib.mkForce ''
local all all trust
host all all 0.0.0.0/0 scram-sha-256
@@ -36,11 +41,6 @@
};
};
environment.plasma6.excludePackages = with pkgs.kdePackages; [
plasma-browser-integration
kate
];
users = {
mutableUsers = false;
users = {
@@ -76,6 +76,7 @@
};
hardware.pulseaudio.enable = false;
hardware.bluetooth.enable = true;
home-manager.users.thiloho = { pkgs, lib, config, ... }: {
@@ -112,7 +113,6 @@
}
];
userSettings = {
"window.titleBarStyle" = "custom";
"nix.enableLanguageServer" = true;
"nix.serverPath" = "nil";
"editor.indentSize" = 2;
@@ -142,17 +142,28 @@
home = {
sessionVariables = { NIXOS_OZONE_WL = 1; };
packages = with pkgs; [
libreoffice
airshipper
tldr
prismlauncher
ventoy-full
psensor
nil
zoom-us
qbittorrent
neofetch
godot_4
backblaze-b2
localsend
mullvad-browser
postman
dbeaver-bin
texliveFull
gnome-tweaks
gnome-themes-extra
melonDS
amberol
zed-editor
];
};
};