From d8591cb70d4884540eca0e9649582fd28dc90e03 Mon Sep 17 00:00:00 2001 From: Jay Looney Date: Tue, 25 Nov 2025 22:14:03 -0600 Subject: [PATCH] another cobalt snapshot, moving towards niri --- hosts/cobalt/configuration.nix | 16 ++++++++++++++-- modules/nixos/desktop/default.nix | 7 +------ modules/nixos/fonts.nix | 8 ++++++++ 3 files changed, 23 insertions(+), 8 deletions(-) create mode 100644 modules/nixos/fonts.nix diff --git a/hosts/cobalt/configuration.nix b/hosts/cobalt/configuration.nix index bea1e3c..12627dd 100644 --- a/hosts/cobalt/configuration.nix +++ b/hosts/cobalt/configuration.nix @@ -9,10 +9,22 @@ # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. networking.networkmanager.enable = true; + + #services.displayManager.sddm.enable = true; + services.displayManager.defaultSession = "xfce"; + services.displayManager.sessionPackages = [ pkgs.niri ]; + #services.sysc-greet.enable = true; + programs.niri.package = pkgs.niri; + + services.xserver.desktopManager = { + xterm.enable = false; + xfce.enable = true; + }; + # Desktop stuff specific to this device services.xserver.enable = true; - services.xserver.displayManager.lightdm.enable = true; - services.xserver.desktopManager.pantheon.enable = true; + #services.xserver.displayManager.lightdm.enable = true; + #services.xserver.desktopManager.pantheon.enable = true; services.xserver.xkb = { layout = "us"; variant = ""; diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix index 56e89f7..4f29d78 100644 --- a/modules/nixos/desktop/default.nix +++ b/modules/nixos/desktop/default.nix @@ -2,6 +2,7 @@ { imports = [ ./calibre.nix + ./fonts.nix ]; zw.calibre.enable = true; @@ -37,10 +38,4 @@ }; # screen sharing /w hyp services.dbus.enable = true; - - fonts.packages = with pkgs; [ - nerd-fonts.fira-code - nerd-fonts.iosevka - atkinson-hyperlegible - ]; } diff --git a/modules/nixos/fonts.nix b/modules/nixos/fonts.nix new file mode 100644 index 0000000..e39de7a --- /dev/null +++ b/modules/nixos/fonts.nix @@ -0,0 +1,8 @@ +{pkgs}: +{ + fonts.packages = with pkgs; [ + nerd-fonts.fira-code + nerd-fonts.iosevka + atkinson-hyperlegible + ]; +} \ No newline at end of file