Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
moved selected xfce stuff from homemanager to system-level
  • Loading branch information
novoid committed Aug 19, 2023
1 parent 7739273 commit 07ff632
Show file tree
Hide file tree
Showing 4 changed files with 121 additions and 68 deletions.
55 changes: 2 additions & 53 deletions configuration.nix
Expand Up @@ -6,6 +6,7 @@
imports =
[
./customOptions.nix
./xfce.nix
];

## https://nixos.wiki/wiki/Flakes
Expand Down Expand Up @@ -37,18 +38,6 @@
# Enable the X11 windowing system.
services.xserver.enable = true;

# Enable the XFCE Desktop Environment.
services.xserver.displayManager = {
lightdm.enable = true;

# auto-start a few apps on xfce startup:
sessionCommands = ''
autokey-gtk &
'';
};

services.xserver.desktopManager = {
xfce.enable = true;
};


Expand Down Expand Up @@ -137,47 +126,7 @@
syncthing
cron
wpa_supplicant

# ##################################################################
# xfce: this can't be in homemanager/xfce.nix because of:
redshift
xclip
xfce.xfce4-dict
autokey
gnome-icon-theme
dejavu_fonts
gentium
yanone-kaffeesatz
wmctrl
gnome.gnome-keyring
xfce.xfwm4-themes
xfce.thunar
xfce.thunar-volman
xfce.xfce4-appfinder
xfce.xfce4-clipman-plugin
xfce.xfce4-cpugraph-plugin
xfce.xfce4-eyes-plugin
xfce.xfce4-whiskermenu-plugin
xfce.xfce4-weather-plugin
xfce.xfce4-mailwatch-plugin
xfce.xfce4-netload-plugin
xfce.xfce4-notes-plugin
xfce.xfce4-notifyd
xfce.xfce4-power-manager
xfce.xfce4-pulseaudio-plugin
xfce.xfce4-screensaver
xfce.xfce4-screenshooter
xfce.xfce4-session
xfce.xfce4-settings
xfce.xfce4-systemload-plugin
xfce.xfce4-taskmanager
xfce.xfce4-terminal
xfce.xfce4-verve-plugin
emojione
rofi
brightnessctl
# libsForQt514.oxygen-icons5 ## 2022-11-06 broken
# ##################################################################
plocate # much faster locate; not in HM because system-service

];

Expand Down
25 changes: 10 additions & 15 deletions homemanager/xfce.nix
@@ -1,24 +1,19 @@
{ config, pkgs, lib, ... }:
{

services.gnome-keyring.enable = true;
# NOTE: System-level settings are in ../xfce.nix

services.clipman.enable = true;
services.gnome-keyring.enable = true;

services.gammastep.enable = true;
services.gammastep.tray = true;
services.gammastep.latitude = "47.0"; # SPECIFICTOKARL
services.gammastep.longitude = "15.4"; # SPECIFICTOKARL
services.gammastep.temperature.day = 5700;
services.gammastep.temperature.night = 3500;
services.clipman.enable = true;

xfconf.enable = true;
services.gammastep.enable = true;
services.gammastep.tray = true;
services.gammastep.latitude = "47.0"; # SPECIFICTOKARL
services.gammastep.longitude = "15.4"; # SPECIFICTOKARL
services.gammastep.temperature.day = 5700;
services.gammastep.temperature.night = 3500;

home.packages = with pkgs; [


];

# xfconf.settings = {
# FIXXME: test from https://www.reddit.com/r/NixOS/comments/15coxtr/homemanager_using_hostname_for_hostspecific/
xfconf.settings = let
Expand Down Expand Up @@ -250,7 +245,7 @@
#"/commands/custom/<Primary>Escape" = "--menu";
"/commands/custom/<Primary>F1" = "exec /home/vk/src/misc/vksave-window-positions.sh"; # DEPENDENCY
"/commands/custom/<Primary>F2" = "exec /home/vk/src/misc/vkrestore-window-positions.sh"; # DEPENDENCY
"/commands/custom/<Primary>F7" = "emacs-everywhere"; # unconfirmed
"/commands/custom/<Primary>F7" = "emacsclient --eval '(emacs-everywhere)'"; # unconfirmed
"/commands/custom/<Primary>F8" = "rofi -monitor -2 -show window -kb-accept-alt 'Return' -kb-accept-entry 'Shift+Return' -window-command '/home/vk/src/misc/vk-switch-to-windowid.sh {window}'";
"/commands/custom/<Shift><Super>Left" = "active"; # no idea what this is
"/commands/custom/<Shift><Super>Right" = "active"; # no idea what this is
Expand Down
41 changes: 41 additions & 0 deletions pkgs/xdu.nix
@@ -0,0 +1,41 @@
{ pkgs ? import <nixpkgs> {} }:

with pkgs;

stdenv.mkDerivation {
pname = "xdu";
version = "3.0";

src = fetchFromGitHub {
owner = "vlasovskikh";
repo = "xdu";
rev = "d62444a199eb7ec21605d8960a7261affc37d2b4";
hash = "sha256-h6X2Gx0/MUjIpkcxcFGuIFCS/+UKcW2kJE9hm0NDGNU=";
};

nativeBuildInputs = with xorg; [
imake
gccmakedep
];

buildInputs = with xorg; [
libXt
libXaw
libXpm
libXext
];

configurePhase = ''
xmkmf
'';

NIX_CFLAGS_COMPILE = [
"-Wno-error=format-security"
];

installPhase = ''
mkdir -p $out/bin
cp xdu $out/bin/xdu
'';
}

68 changes: 68 additions & 0 deletions xfce.nix
@@ -0,0 +1,68 @@
{ config, pkgs, lib, ... }:
{

# NOTE: Home-manager related settings are in homemanager/xfce.nix

# Enable the XFCE Desktop Environment.
services.xserver.displayManager = {
lightdm.enable = true;

# auto-start a few apps on xfce startup:
sessionCommands = ''
autokey-gtk &
'';
};

services.xserver.desktopManager = {
xfce.enable = true;
};


environment.systemPackages = with pkgs; [

# ##################################################################
# xfce: this can't be in homemanager/xfce.nix because of:
redshift
xclip
xfce.xfce4-dict
autokey
gnome-icon-theme
dejavu_fonts
gentium
yanone-kaffeesatz
wmctrl
gnome.gnome-keyring
xfce.xfwm4-themes
xfce.thunar
xfce.thunar-volman
xfce.xfce4-appfinder
xfce.xfce4-clipman-plugin
xfce.xfce4-cpugraph-plugin
xfce.xfce4-eyes-plugin
xfce.xfce4-whiskermenu-plugin
xfce.xfce4-weather-plugin
xfce.xfce4-mailwatch-plugin
xfce.xfce4-netload-plugin
xfce.xfce4-notes-plugin
xfce.xfce4-notifyd
xfce.xfce4-power-manager
xfce.xfce4-pulseaudio-plugin
xfce.xfce4-screensaver
xfce.xfce4-screenshooter
xfce.xfce4-session
xfce.xfce4-settings
xfce.xfce4-systemload-plugin
xfce.xfce4-taskmanager
xfce.xfce4-terminal
xfce.xfce4-verve-plugin
emojione
rofi
brightnessctl
# libsForQt514.oxygen-icons5 ## 2022-11-06 broken
# ##################################################################

];

programs.xfconf.enable = true;

}

0 comments on commit 07ff632

Please sign in to comment.