From 616f7d2042bfb8767d3d4979eb7c7fd1693edbb8 Mon Sep 17 00:00:00 2001 From: Faris Date: Wed, 1 Apr 2026 22:29:46 +0100 Subject: [PATCH] desktop stuff --- config/common.nix | 10 ++++++++++ config/desktop.nix | 20 ++++---------------- home/common.nix | 2 +- home/desktop.nix | 9 --------- hosts/desktop/settings.nix | 34 +++++++++++++++++++++++++++++----- hosts/server-nut/settings.nix | 22 ++++++++++++++++++++++ hosts/server/settings.nix | 3 +++ 7 files changed, 69 insertions(+), 31 deletions(-) create mode 100644 hosts/server-nut/settings.nix diff --git a/config/common.nix b/config/common.nix index d48f07f..0bb9d62 100644 --- a/config/common.nix +++ b/config/common.nix @@ -55,6 +55,7 @@ "adbusers" # adb "kvm" # virt "networkmanager" + "lp" #printing ]; packages = with pkgs; [ ]; @@ -129,6 +130,8 @@ "corefonts" "claude-code" + + "brgenml1lpr" ]; environment.systemPackages = with pkgs; [ @@ -158,6 +161,13 @@ zbar barcode ghostscript + + # documenation + man-pages + man-pages-posix ]; + # enable developer documenation + documentation.dev.enable = true; + } diff --git a/config/desktop.nix b/config/desktop.nix index 5d9937a..b8151df 100644 --- a/config/desktop.nix +++ b/config/desktop.nix @@ -12,7 +12,8 @@ services.xserver.enable = true; # Enable the GNOME Desktop Environment. - services.displayManager.gdm.enable = true; + services.displayManager.gdm.enable = false; # use sddm until gnome 50 due to https://github.com/systemd/systemd/issues/39259 + services.displayManager.sddm.enable = true; services.desktopManager.gnome.enable = true; # Configure keymap in X11 @@ -32,21 +33,7 @@ openFirewall = true; }; services.tailscale.enable = true; - # services.printing.drivers = [ pkgs.brgenml1lpr pkgs.brgenml1cupswrapper ]; - # hardware.printers = { - # ensurePrinters = [ - # { - # name = "DCP-L8410CDWW"; - # location = "Home"; - # deviceUri = "http://192.168.0.177:631/ipp/print"; - # model = "drv:///cupsfilters.drv/pwgrast.ppd"; - # ppdOptions = { - # PageSize = "A4"; - # }; - # } - # ]; - # ensureDefaultPrinter = "DCP-L8410CDWW"; - # }; + services.printing.drivers = [ pkgs.brlaser pkgs.brgenml1lpr pkgs.brgenml1cupswrapper ]; # Enable sound with pipewire. services.pulseaudio.enable = false; @@ -132,6 +119,7 @@ kiwix libreoffice obs-studio + obsidian unstable.proton-authenticator unstable.protonmail-desktop unstable.protonvpn-gui diff --git a/home/common.nix b/home/common.nix index b5e1d51..04f6f3f 100644 --- a/home/common.nix +++ b/home/common.nix @@ -61,7 +61,7 @@ oh-my-zsh = { enable = true; plugins = [ "git" ]; - theme = "robbyrussell"; + theme = "daveverwer"; }; }; diff --git a/home/desktop.nix b/home/desktop.nix index 9d46d19..b93c581 100644 --- a/home/desktop.nix +++ b/home/desktop.nix @@ -17,15 +17,6 @@ }; }; - obsidian = { - enable = true; - vaults = { - Main = { - target = "Documents/Obsidian/Main"; - }; - }; - }; - mpv = { enable = true; diff --git a/hosts/desktop/settings.nix b/hosts/desktop/settings.nix index aee4e13..27afe88 100644 --- a/hosts/desktop/settings.nix +++ b/hosts/desktop/settings.nix @@ -8,6 +8,8 @@ services.pipewire = { pulse.enable = true; wireplumber.enable = true; }; +services.xserver.displayManager.gdm.enable = false; +services.displayManager.sddm.enable = true; boot = { initrd.luks.devices."luks-cbf20b12-90f7-4fbb-95d3-1320eece4d89".device = "/dev/disk/by-uuid/cbf20b12-90f7-4fbb-95d3-1320eece4d89"; @@ -53,17 +55,39 @@ services.pipewire = { }; # this fixes the sleep/wake issue FUCK NVIDIA - systemd.services."systemd-suspend" = { - serviceConfig = { - Environment = ''"SYSTEMD_SLEEP_FREEZE_USER_SESSIONS=false"''; - }; - }; +# systemd.services."systemd-suspend" = { +# serviceConfig = { +# Environment = ''"SYSTEMD_SLEEP_FREEZE_USER_SESSIONS=false"''; +# }; +# }; # fixes hardware accel on nvidia open FUCK NVIDIA hardware.graphics.extraPackages = [ pkgs.nvidia-vaapi-driver ]; + systemd.user.services.reset-gnome-idle-on-resume = { + description = "Reset GNOME idle timer after resume"; + after = [ "suspend.target" ]; + wantedBy = [ "suspend.target" ]; + environment = { + DBUS_SESSION_BUS_ADDRESS = "unix:path=/run/user/1000/bus"; + }; + script = '' + sleep 3 + # Tell gnome-session we have user activity + ${pkgs.dbus}/bin/dbus-send \ + --session \ + --dest=org.gnome.Mutter.IdleMonitor \ + /org/gnome/Mutter/IdleMonitor/Core \ + org.gnome.Mutter.IdleMonitor.ResetIdleTime + ''; + serviceConfig = { + Type = "oneshot"; + User = "admin"; + }; +}; + environment.variables = { NVD_BACKEND = "direct"; LIBVA_DRIVER_NAME = "nvidia"; diff --git a/hosts/server-nut/settings.nix b/hosts/server-nut/settings.nix new file mode 100644 index 0000000..a8fda71 --- /dev/null +++ b/hosts/server-nut/settings.nix @@ -0,0 +1,22 @@ +{ config, pkgs, ... }: + +{ + networking = { + hostName = "nixos-server-nut"; + hostId = "d5a2ce61"; + firewall.enable = false; + interfaces.ens18 = { + ipv4.addresses = [ + { + address = "192.168.0.20"; + prefixLength = 24; + } + ]; + }; + defaultGateway = "192.168.0.1"; + nameservers = [ "192.168.0.1" "1.1.1.1" ]; + }; + + users.users.admin.linger = true; + system.stateVersion = "24.11"; +} \ No newline at end of file diff --git a/hosts/server/settings.nix b/hosts/server/settings.nix index 325881b..8cc4dbd 100644 --- a/hosts/server/settings.nix +++ b/hosts/server/settings.nix @@ -135,6 +135,9 @@ services.samba = { enable = true; openFirewall = true; + extraConfig = '' + server min protocol = SMB2 + ''; settings = { global = { "workgroup" = "WORKGROUP";