From 0a50d682ec85bf023bebd68a3ca388001f0c0677 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Tue, 8 Oct 2019 21:44:57 +0200 Subject: mv modules settings --- system/settings/programs/accounting.nix | 10 +++++++ system/settings/programs/barrier.nix | 7 +++++ system/settings/programs/gnome.nix | 24 +++++++++++++++ system/settings/programs/gnupg.nix | 10 +++++++ system/settings/programs/i3.nix | 20 +++++++++++++ system/settings/programs/infrastructure.nix | 8 +++++ system/settings/programs/kde.nix | 20 +++++++++++++ system/settings/programs/keybase.nix | 11 +++++++ system/settings/programs/shell.nix | 8 +++++ system/settings/programs/tor.nix | 22 ++++++++++++++ system/settings/programs/window-manager.nix | 46 +++++++++++++++++++++++++++++ system/settings/programs/wine.nix | 6 ++++ 12 files changed, 192 insertions(+) create mode 100644 system/settings/programs/accounting.nix create mode 100644 system/settings/programs/barrier.nix create mode 100644 system/settings/programs/gnome.nix create mode 100644 system/settings/programs/gnupg.nix create mode 100644 system/settings/programs/i3.nix create mode 100644 system/settings/programs/infrastructure.nix create mode 100644 system/settings/programs/kde.nix create mode 100644 system/settings/programs/keybase.nix create mode 100644 system/settings/programs/shell.nix create mode 100644 system/settings/programs/tor.nix create mode 100644 system/settings/programs/window-manager.nix create mode 100644 system/settings/programs/wine.nix (limited to 'system/settings/programs') diff --git a/system/settings/programs/accounting.nix b/system/settings/programs/accounting.nix new file mode 100644 index 00000000..e98c3e7e --- /dev/null +++ b/system/settings/programs/accounting.nix @@ -0,0 +1,10 @@ +{ config, pkgs, ... }: + +{ environment.systemPackages = with pkgs; [ + ledger + bean-add + beancount + fava + reckon + ]; +} diff --git a/system/settings/programs/barrier.nix b/system/settings/programs/barrier.nix new file mode 100644 index 00000000..9a73620d --- /dev/null +++ b/system/settings/programs/barrier.nix @@ -0,0 +1,7 @@ +{ config, pkgs, ... }: { + environment.systemPackages = with pkgs; [ + barrier + ]; + + networking.firewall.allowedTCPPorts = [ 24800 ]; +} diff --git a/system/settings/programs/gnome.nix b/system/settings/programs/gnome.nix new file mode 100644 index 00000000..bd785453 --- /dev/null +++ b/system/settings/programs/gnome.nix @@ -0,0 +1,24 @@ +{ config, lib, pkgs, ... }: + +with lib; +{ services = { + gnome3 = { + gnome-documents.enable = false; + gnome-user-share.enable = false; + gnome-online-accounts.enable = false; + seahorse.enable = false; + tracker.enable = false; + }; + telepathy.enable = false; + + xserver = { + desktopManager.gnome3 = { + enable = true; + extraGSettingsOverrides = '' + [org.gnome.desktop.input-sources] + sources=[('xkb','${config.services.xserver.layout + (optionalString (config.services.xserver.xkbVariant != "") ("+" + config.services.xserver.xkbVariant))}')] + ''; + }; + }; + }; +} diff --git a/system/settings/programs/gnupg.nix b/system/settings/programs/gnupg.nix new file mode 100644 index 00000000..663bcb3c --- /dev/null +++ b/system/settings/programs/gnupg.nix @@ -0,0 +1,10 @@ +{ config, pkgs, lib, ... }: + +{ + environment.systemPackages = with pkgs; [ + gnupg + pinentry + (python3.withPackages(ps: with ps; [ trezor_agent wheel ])) + ]; + environment.variables.GNUPGHOME = "$HOME/.gnupg/trezor/"; +} diff --git a/system/settings/programs/i3.nix b/system/settings/programs/i3.nix new file mode 100644 index 00000000..b0140cdb --- /dev/null +++ b/system/settings/programs/i3.nix @@ -0,0 +1,20 @@ +{ config, pkgs, ... }: + +{ services.xserver.windowManager = { + default = "i3"; + i3 = { + enable = true; + extraSessionCommands = '' + ${pkgs.sxhkd}/bin/sxhkd & + ''; + }; + }; + + environment.systemPackages = with pkgs; [ + i3status + ]; + + imports = [ + ./window-manager.nix + ]; +} diff --git a/system/settings/programs/infrastructure.nix b/system/settings/programs/infrastructure.nix new file mode 100644 index 00000000..5e68bc8a --- /dev/null +++ b/system/settings/programs/infrastructure.nix @@ -0,0 +1,8 @@ +{ config, pkgs, ... }: + +{ environment.systemPackages = with pkgs; [ + hugo + + nixops + ]; +} diff --git a/system/settings/programs/kde.nix b/system/settings/programs/kde.nix new file mode 100644 index 00000000..652eb2a6 --- /dev/null +++ b/system/settings/programs/kde.nix @@ -0,0 +1,20 @@ +{ config, lib, pkgs, ... }: + +with lib; +{ services = { + xserver = { + desktopManager = { + plasma5.enable = true; + }; + displayManager = { + sddm.enable = true; + }; + }; + + physlock.enable = lib.mkForce false; + }; + + environment.systemPackages = with pkgs; [ + kde-gtk-config + ]; +} diff --git a/system/settings/programs/keybase.nix b/system/settings/programs/keybase.nix new file mode 100644 index 00000000..39a16b27 --- /dev/null +++ b/system/settings/programs/keybase.nix @@ -0,0 +1,11 @@ +{ config, pkgs, lib, ... }: + +{ + services.keybase.enable = true; + services.kbfs.enable = true; + environment.variables.NIX_SKIP_KEYBASE_CHECKS = "1"; + + environment.systemPackages = with pkgs; [ + keybase-gui + ]; +} diff --git a/system/settings/programs/shell.nix b/system/settings/programs/shell.nix new file mode 100644 index 00000000..a8d4f56f --- /dev/null +++ b/system/settings/programs/shell.nix @@ -0,0 +1,8 @@ +{ config, pkgs, ... }: + +{ programs.zsh = { + enable = true; + promptInit = ""; + }; + programs.bash.enableCompletion = true; +} diff --git a/system/settings/programs/tor.nix b/system/settings/programs/tor.nix new file mode 100644 index 00000000..5524aede --- /dev/null +++ b/system/settings/programs/tor.nix @@ -0,0 +1,22 @@ +{ config, pkgs, lib, ... }: + +{ + services.tor = { + enable = true; + client = { + enable = true; + socksListenAddress = "9050 IPv6Traffic"; + }; + torsocks = { + enable = true; + }; + }; + systemd.services.tor.wantedBy = lib.mkForce []; + systemd.timers.tor = { + description = "Delayed startup of Tor"; + wantedBy = [ "timers.target" ]; + timerConfig = { + OnActiveSec = "1 min"; + }; + }; +} diff --git a/system/settings/programs/window-manager.nix b/system/settings/programs/window-manager.nix new file mode 100644 index 00000000..7095d523 --- /dev/null +++ b/system/settings/programs/window-manager.nix @@ -0,0 +1,46 @@ +{ config, pkgs, ... }: + +{ services.xserver = { + desktopManager.xterm.enable = false; + + displayManager = { + lightdm = { + enable = true; + greeters.mini = { + enable = true; + user = "alan"; + }; + }; + sessionCommands = '' + ${pkgs.xorg.xrdb}/bin/xrdb -merge $HOME/.xresources/main + ${pkgs.xorg.xsetroot}/bin/xsetroot -cursor_name left_ptr -solid '#4d4d4c' + ''; + }; + xautolock = { + enable = true; + locker = "${pkgs.i3lock}/bin/i3lock -n"; + enableNotifier = true; + notifier = "${pkgs.libnotify}/bin/notify-send \"Locking in 10 seconds\""; + time = 5; + }; + }; + + services.xserver.displayManager.setupCommands = '' + ${pkgs.redshift}/bin/redshift \ + -l ${toString config.services.redshift.latitude}:${toString config.services.redshift.longitude} \ + -t ${toString config.services.redshift.temperature.day}:${toString config.services.redshift.temperature.night} \ + -b 1:1 \ + -o \ + -r \ + ''; + + environment.systemPackages = with pkgs; [ + dmenu + libnotify # for notify-send + rofi + sxhkd + maim + + perlPackages.FileMimeInfo # xdg-utils uses this when no DE + ]; +} diff --git a/system/settings/programs/wine.nix b/system/settings/programs/wine.nix new file mode 100644 index 00000000..98dd60a2 --- /dev/null +++ b/system/settings/programs/wine.nix @@ -0,0 +1,6 @@ +{ config, pkgs, ... }: + +{ environment.systemPackages = with pkgs; [ + wineStable + ]; +} -- cgit 1.4.1