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/modules/programs/accounting.nix | 10 ------- system/modules/programs/barrier.nix | 7 ----- system/modules/programs/gnome.nix | 24 ---------------- system/modules/programs/gnupg.nix | 10 ------- system/modules/programs/i3.nix | 20 ------------- system/modules/programs/infrastructure.nix | 8 ------ system/modules/programs/kde.nix | 20 ------------- system/modules/programs/keybase.nix | 11 ------- system/modules/programs/shell.nix | 8 ------ system/modules/programs/tor.nix | 22 -------------- system/modules/programs/window-manager.nix | 46 ------------------------------ system/modules/programs/wine.nix | 6 ---- 12 files changed, 192 deletions(-) delete mode 100644 system/modules/programs/accounting.nix delete mode 100644 system/modules/programs/barrier.nix delete mode 100644 system/modules/programs/gnome.nix delete mode 100644 system/modules/programs/gnupg.nix delete mode 100644 system/modules/programs/i3.nix delete mode 100644 system/modules/programs/infrastructure.nix delete mode 100644 system/modules/programs/kde.nix delete mode 100644 system/modules/programs/keybase.nix delete mode 100644 system/modules/programs/shell.nix delete mode 100644 system/modules/programs/tor.nix delete mode 100644 system/modules/programs/window-manager.nix delete mode 100644 system/modules/programs/wine.nix (limited to 'system/modules/programs') diff --git a/system/modules/programs/accounting.nix b/system/modules/programs/accounting.nix deleted file mode 100644 index e98c3e7e..00000000 --- a/system/modules/programs/accounting.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ config, pkgs, ... }: - -{ environment.systemPackages = with pkgs; [ - ledger - bean-add - beancount - fava - reckon - ]; -} diff --git a/system/modules/programs/barrier.nix b/system/modules/programs/barrier.nix deleted file mode 100644 index 9a73620d..00000000 --- a/system/modules/programs/barrier.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ config, pkgs, ... }: { - environment.systemPackages = with pkgs; [ - barrier - ]; - - networking.firewall.allowedTCPPorts = [ 24800 ]; -} diff --git a/system/modules/programs/gnome.nix b/system/modules/programs/gnome.nix deleted file mode 100644 index bd785453..00000000 --- a/system/modules/programs/gnome.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ 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/modules/programs/gnupg.nix b/system/modules/programs/gnupg.nix deleted file mode 100644 index 663bcb3c..00000000 --- a/system/modules/programs/gnupg.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ 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/modules/programs/i3.nix b/system/modules/programs/i3.nix deleted file mode 100644 index b0140cdb..00000000 --- a/system/modules/programs/i3.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ 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/modules/programs/infrastructure.nix b/system/modules/programs/infrastructure.nix deleted file mode 100644 index 5e68bc8a..00000000 --- a/system/modules/programs/infrastructure.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ config, pkgs, ... }: - -{ environment.systemPackages = with pkgs; [ - hugo - - nixops - ]; -} diff --git a/system/modules/programs/kde.nix b/system/modules/programs/kde.nix deleted file mode 100644 index 652eb2a6..00000000 --- a/system/modules/programs/kde.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ 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/modules/programs/keybase.nix b/system/modules/programs/keybase.nix deleted file mode 100644 index 39a16b27..00000000 --- a/system/modules/programs/keybase.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ 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/modules/programs/shell.nix b/system/modules/programs/shell.nix deleted file mode 100644 index a8d4f56f..00000000 --- a/system/modules/programs/shell.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ config, pkgs, ... }: - -{ programs.zsh = { - enable = true; - promptInit = ""; - }; - programs.bash.enableCompletion = true; -} diff --git a/system/modules/programs/tor.nix b/system/modules/programs/tor.nix deleted file mode 100644 index 5524aede..00000000 --- a/system/modules/programs/tor.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ 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/modules/programs/window-manager.nix b/system/modules/programs/window-manager.nix deleted file mode 100644 index 7095d523..00000000 --- a/system/modules/programs/window-manager.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ 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/modules/programs/wine.nix b/system/modules/programs/wine.nix deleted file mode 100644 index 98dd60a2..00000000 --- a/system/modules/programs/wine.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ config, pkgs, ... }: - -{ environment.systemPackages = with pkgs; [ - wineStable - ]; -} -- cgit 1.4.1