diff options
Diffstat (limited to 'makefu/2configs')
-rw-r--r-- | makefu/2configs/bitlbee.nix | 8 | ||||
-rw-r--r-- | makefu/2configs/default.nix | 11 | ||||
-rw-r--r-- | makefu/2configs/deployment/events-publisher/default.nix | 9 | ||||
-rw-r--r-- | makefu/2configs/gui/xpra.nix | 3 | ||||
-rw-r--r-- | makefu/2configs/pyload.nix | 10 | ||||
-rw-r--r-- | makefu/2configs/share/gum-client.nix | 23 | ||||
-rw-r--r-- | makefu/2configs/share/gum.nix | 2 | ||||
-rw-r--r-- | makefu/2configs/tools/mic92.nix | 9 |
8 files changed, 60 insertions, 15 deletions
diff --git a/makefu/2configs/bitlbee.nix b/makefu/2configs/bitlbee.nix new file mode 100644 index 000000000..17efa7113 --- /dev/null +++ b/makefu/2configs/bitlbee.nix @@ -0,0 +1,8 @@ +{pkgs, ... }: +# state: /var/lib/bitlbee +{ + services.bitlbee = { + enable = true; + libpurple_plugins = [ pkgs.telegram-purple ]; + }; +} diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix index 0a89d2023..6192a92a5 100644 --- a/makefu/2configs/default.nix +++ b/makefu/2configs/default.nix @@ -8,13 +8,16 @@ with import <stockholm/lib>; mapAttrs (_: h: { hashedPassword = h; }) (import <secrets/hashedPasswords.nix>); } - ./vim.nix + ./editor/vim.nix ./binary-cache/nixos.nix ]; boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest; programs.command-not-found.enable = false; + + nix.package = pkgs.nixUnstable; + nixpkgs.config.allowUnfreePredicate = (pkg: pkgs.lib.hasPrefix "unrar-" pkg.name); krebs = { enable = true; @@ -158,4 +161,10 @@ with import <stockholm/lib>; "-a task,never" ]; }; + system.activationScripts.state = optionalString (config.state != []) '' + cat << EOF + This machine is burdened with state: + ${concatMapStringsSep "\n" (d: "* ${d}") config.state} + EOF + ''; } diff --git a/makefu/2configs/deployment/events-publisher/default.nix b/makefu/2configs/deployment/events-publisher/default.nix index a09554e6a..37d74c282 100644 --- a/makefu/2configs/deployment/events-publisher/default.nix +++ b/makefu/2configs/deployment/events-publisher/default.nix @@ -2,12 +2,13 @@ with import <stockholm/lib>; let shack-announce = pkgs.callPackage (builtins.fetchTarball { - url = "https://github.com/makefu/events-publisher/archive/4cef900ba10348050208367af6b2035f5a0ef8b6.tar.gz"; - sha256 = "137vsibr289p3xxlw37xhizi309sygki95919hmj02dxgwmy1k74"; + url = "https://github.com/makefu/events-publisher/archive/c5218195e6afdc646cb7682d8f355a7ec2b90716.tar.gz"; + sha256 = "0xk74q7gah3l5zy3bkvih3k9fr1hclvf71rm3ixcmslhicl7khav"; }) {} ; home = "/var/lib/shackannounce"; user = "shackannounce"; creds = (toString <secrets>) + "/shack-announce.json"; + LOL = "DEBUG"; in { users.users.${user}= { @@ -32,14 +33,14 @@ in if test ! -e announce.state; then echo "initializing state" announce-daemon \ - --lol INFO \ + --lol ${LOL} \ --creds creds.json \ --state announce.state \ --clean --init fi echo "Running announce" announce-daemon \ - --lol INFO \ + --lol ${LOL} \ --creds creds.json \ --state announce.state ''; diff --git a/makefu/2configs/gui/xpra.nix b/makefu/2configs/gui/xpra.nix new file mode 100644 index 000000000..2384acbaa --- /dev/null +++ b/makefu/2configs/gui/xpra.nix @@ -0,0 +1,3 @@ +{ + services.xserver.displayManager.xpra.enable = true; +} diff --git a/makefu/2configs/pyload.nix b/makefu/2configs/pyload.nix new file mode 100644 index 000000000..3aa5048a4 --- /dev/null +++ b/makefu/2configs/pyload.nix @@ -0,0 +1,10 @@ +{pkgs, ... }: +{ + nixpkgs.config.unfreeRedistributable = true; + users.users.makefu.packages = with pkgs;[ + pyload + spidermonkey + tesseract + ]; + +} diff --git a/makefu/2configs/share/gum-client.nix b/makefu/2configs/share/gum-client.nix new file mode 100644 index 000000000..be9ab026b --- /dev/null +++ b/makefu/2configs/share/gum-client.nix @@ -0,0 +1,23 @@ +{ config, lib, pkgs, ... }: + +let + automount_opts = + [ "x-systemd.automount" + "noauto" "x-systemd.idle-timeout=600" + "x-systemd.device-timeout=5s" + "x-systemd.mount-timeout=5s" + ]; + host = "nextgum"; #TODO +in { + fileSystems."/media/download" = { + device = "//${host}/download"; + fsType = "cifs"; + options = automount_opts ++ + [ "credentials=/var/src/secrets/download.smb" + "file_mode=0775" + "dir_mode=0775" + "uid=9001" + ]; + }; + +} diff --git a/makefu/2configs/share/gum.nix b/makefu/2configs/share/gum.nix index f5942a0f7..cc59ce3cc 100644 --- a/makefu/2configs/share/gum.nix +++ b/makefu/2configs/share/gum.nix @@ -10,7 +10,7 @@ in { # description = "smb guest user"; # home = "/var/empty"; # }; - + environment.systemPackages = [ pkgs.samba ]; users.users.download.uid = genid "download"; services.samba = { enable = true; diff --git a/makefu/2configs/tools/mic92.nix b/makefu/2configs/tools/mic92.nix deleted file mode 100644 index 176e461c7..000000000 --- a/makefu/2configs/tools/mic92.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ pkgs, ... }: -{ - nixpkgs.overlays = [ - (import <mic92/nixos/overlays/mypackages>) - ]; - users.users.makefu.packages = [ - pkgs.nix-review - ]; -} |