From 8ed3dfc9ebc52a50c3e6d4623204847822944422 Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Sat, 12 Feb 2022 13:47:59 -0800 Subject: move configurations and modules around Sorry, this is a mess, hopefully the last one. --- modules/desktop/default.nix | 8 -------- modules/desktop/fonts.nix | 18 ------------------ modules/desktop/sound.nix | 20 -------------------- modules/desktop/xserver.nix | 34 ---------------------------------- 4 files changed, 80 deletions(-) delete mode 100644 modules/desktop/default.nix delete mode 100644 modules/desktop/fonts.nix delete mode 100644 modules/desktop/sound.nix delete mode 100644 modules/desktop/xserver.nix (limited to 'modules/desktop') diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix deleted file mode 100644 index f150066..0000000 --- a/modules/desktop/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{lib, config, pkgs, ...}: -{ - imports = [ - ./fonts.nix - ./sound.nix - ./xserver.nix - ]; -} diff --git a/modules/desktop/fonts.nix b/modules/desktop/fonts.nix deleted file mode 100644 index a840582..0000000 --- a/modules/desktop/fonts.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ pkgs, config, lib, ... }: - -{ - fonts = { - fontconfig.enable = true; - fonts = with pkgs; [ - noto-fonts-emoji - dejavu_fonts - source-code-pro - source-sans-pro - source-serif-pro - ]; - - fontconfig.defaultFonts = { - monospace = [ "Source Code Pro" ]; - }; - }; -} diff --git a/modules/desktop/sound.nix b/modules/desktop/sound.nix deleted file mode 100644 index 95c7c75..0000000 --- a/modules/desktop/sound.nix +++ /dev/null @@ -1,20 +0,0 @@ -{pkgs, config, lib, ...}: - -{ - sound.enable = true; - - environment.systemPackages = with pkgs; [ - # We install it to get access to pactl. It isn't enabled or run as a service. - pulseaudio - ]; - - services.pipewire = { - enable = true; - # Compatibility shims, adjust according to your needs - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - jack.enable = true; - }; - hardware.pulseaudio.enable = false; -} diff --git a/modules/desktop/xserver.nix b/modules/desktop/xserver.nix deleted file mode 100644 index 1b96d03..0000000 --- a/modules/desktop/xserver.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ config, pkgs, lib, ... }: - -{ - services.xserver = { - enable = true; - layout = "us"; - xkbOptions = "eurosign:e,ctrl:swapcaps"; - libinput.enable = true; - - desktopManager = { - xterm.enable = false; - }; - - displayManager = { - lightdm.enable = true; - defaultSession = "none+i3"; - }; - - windowManager = { - i3.enable = true; - }; - }; - - programs.gnupg.agent = { - enable = true; - enableSSHSupport = true; - }; - - environment.sessionVariables.TERMINAL = [ "alacritty" ]; - environment.sessionVariables.TERM = [ "xterm-256color" ]; - - services.gnome.gnome-keyring.enable = true; - services.gvfs.enable = true; -} -- cgit 1.4.1