diff --git a/modules/desktop/creative.nix b/modules/desktop/creative.nix index 1f7f1c0..6f89ec6 100644 --- a/modules/desktop/creative.nix +++ b/modules/desktop/creative.nix @@ -17,6 +17,8 @@ in with lib; { fspy scribus + onlyoffice-bin + digikam darktable rawtherapee diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index cf04f76..b84ed3b 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -52,18 +52,19 @@ in with lib; { ./social.nix ./xkeysnail.nix ./mail.nix + ./specific-hardware ]).content; options.jade.desktop = { enable = mkEnableOption "Enable the i3 setup"; }; config = mkIf cfg.enable { fonts.fonts = with pkgs; [ - nerdfonts montserrat noto-fonts + nerdfonts montserrat noto-fonts atkinson-hyperlegible ]; hardware.bluetooth.enable = true; hardware.keyboard.uhk.enable = true; - hardware.spacenavd.enable = true; + #hardware.spacenavd.enable = true; programs.seahorse.enable = true; security.pam.services.jade.enableGnomeKeyring = true; @@ -149,15 +150,15 @@ in with lib; { home-manager.users.jade = { pkgs, ... }: { home.packages = with pkgs; [ # categories - # filemanager - xfce.thunar - xfce.tumbler - xfce.thunar-archive-plugin - gnome.file-roller - # media/file viewers - vlc - evince - nomacs + # filemanager + xfce.thunar + xfce.tumbler + xfce.thunar-archive-plugin + gnome.file-roller + # media/file viewers + vlc + evince + nomacs # from environment.systemPackages cleanup font-manager @@ -180,9 +181,6 @@ in with lib; { qdirstat ffmpeg_5 - spacenav-cube-example - spacenavd - libspnav # external libnotify diff --git a/modules/desktop/gaming.nix b/modules/desktop/gaming.nix index 2027662..79e262a 100644 --- a/modules/desktop/gaming.nix +++ b/modules/desktop/gaming.nix @@ -7,9 +7,9 @@ in with lib; { enable = mkEnableOption "Enable gaming stuff"; }; config = mkIf cfg.enable { - nixpkgs.overlays = [ - (import (builtins.fetchTarball "https://github.com/PrismLauncher/PrismLauncher/archive/develop.tar.gz")).overlay - ]; + #nixpkgs.overlays = [ + #(import (builtins.fetchTarball "https://github.com/PrismLauncher/PrismLauncher/archive/develop.tar.gz")).overlay + #]; programs.steam.enable = true; home-manager.users.jade = { pkgs, ... }: { home.packages = with pkgs; [ diff --git a/modules/desktop/specific-hardware/default.nix b/modules/desktop/specific-hardware/default.nix index e69de29..b21370c 100644 --- a/modules/desktop/specific-hardware/default.nix +++ b/modules/desktop/specific-hardware/default.nix @@ -0,0 +1,6 @@ +{ config, lib, pkgs, ... }: +{ + imports = [ + ./spacenav.nix + ]; +} diff --git a/modules/desktop/specific-hardware/spacenav.nix b/modules/desktop/specific-hardware/spacenav.nix index e69de29..25cd981 100644 --- a/modules/desktop/specific-hardware/spacenav.nix +++ b/modules/desktop/specific-hardware/spacenav.nix @@ -0,0 +1,11 @@ +{ config, lib, pkgs, ... }: +{ + environment.systemPackages = with pkgs; [ + spacenavd + libspnav + ]; + systemd.services.spacenavd = { + wantedBy = [ "graphical.target" ]; + script = "${pkgs.spacenavd}/bin/spacenavd -d"; + }; +} diff --git a/monosodium-glutamate-g/configuration.nix b/monosodium-glutamate-g/configuration.nix index ec38e6c..31c3cca 100644 --- a/monosodium-glutamate-g/configuration.nix +++ b/monosodium-glutamate-g/configuration.nix @@ -54,6 +54,7 @@ # TODO: clean up. nvtop-amd libGL + libreoffice-fresh ]; environment.pathsToLink = [ diff --git a/other/wallpaper.jpg b/other/wallpaper.jpg index 1d372c9..5b31b96 100644 Binary files a/other/wallpaper.jpg and b/other/wallpaper.jpg differ