diff --git a/configs/bluetooth.nix b/configs/bluetooth.nix index d7ede24..243ded5 100644 --- a/configs/bluetooth.nix +++ b/configs/bluetooth.nix @@ -1,16 +1,15 @@ -{ pkgs, ... }: +{ pkgs, lib, ... }: { hardware.bluetooth = { enable = true; - extraConfig = '' - [General] - Enable=Source,Sink,Media,Socket - ''; + extraConfig = lib.generators.toINI {} { + General.Enable = lib.concatStringsSep "," ["Source" "Sink" "Media" "Socket"]; + }; }; environment.systemPackages = [ pkgs.blueman ]; home-manager.users.me = { - services.blueman-applet.enable = true; + services.blueman-applet.enable = false; }; } diff --git a/configs/cloud.nix b/configs/cloud.nix index cdc3311..d3bd163 100644 --- a/configs/cloud.nix +++ b/configs/cloud.nix @@ -6,20 +6,20 @@ ]; - niveum.dropbox = { - enable = true; - user = config.users.users.me; - }; - - niveum.seafile = { - enable = true; - user = config.users.users.me; - }; - - niveum.google-drive = rec { - enable = true; - directory = "${user.home}/cloud/gdrive"; - user = config.users.users.me; + niveum = { + dropbox = { + enable = true; + user = config.users.users.me; + }; + seafile = { + enable = true; + user = config.users.users.me; + }; + google-drive = rec { + enable = true; + directory = "${user.home}/cloud/gdrive"; + user = config.users.users.me; + }; }; services.syncthing = rec { diff --git a/configs/gollum.nix b/configs/gollum.nix index 8c618dd..c9b2e20 100644 --- a/configs/gollum.nix +++ b/configs/gollum.nix @@ -1,5 +1,5 @@ { services.gollum = { - enable = true; + enable = false; }; } diff --git a/configs/home-assistant.nix b/configs/home-assistant.nix index ef2ef53..925599f 100644 --- a/configs/home-assistant.nix +++ b/configs/home-assistant.nix @@ -1,6 +1,6 @@ { services.home-assistant = { - enable = true; + enable = false; configWritable = true; lovelaceConfigWritable = true; }; diff --git a/configs/kdeconnect.nix b/configs/kdeconnect.nix index 67853fa..4b5678b 100644 --- a/configs/kdeconnect.nix +++ b/configs/kdeconnect.nix @@ -6,7 +6,7 @@ home-manager.users.me = { services.kdeconnect = { - enable = true; + enable = false; indicator = true; }; }; diff --git a/configs/mopidy.nix b/configs/mopidy.nix index 28a071d..6cd003f 100644 --- a/configs/mopidy.nix +++ b/configs/mopidy.nix @@ -2,7 +2,7 @@ let secrets = import ; in { services.mopidy = { - enable = true; + enable = false; extensionPackages = [ pkgs.mopidy-gmusic pkgs.mopidy-iris diff --git a/configs/newsboat.nix b/configs/newsboat.nix index 47cbff1..50064d6 100644 --- a/configs/newsboat.nix +++ b/configs/newsboat.nix @@ -1,7 +1,7 @@ { home-manager.users.me = { programs.newsboat = { - enable = true; + enable = false; urls = [ { url = "https://kmein.github.io/meteora/atom.xml"; tags = [ "poetry" ]; } ]; diff --git a/configs/packages/default.nix b/configs/packages/default.nix index e66f9e8..56a0115 100644 --- a/configs/packages/default.nix +++ b/configs/packages/default.nix @@ -27,15 +27,15 @@ aria2 firefox tor-browser-bundle-bin - thunderbird + # thunderbird unstable.tdesktop w3m wget - httpie + # httpie whois ddgr - python3Packages.instaloader - mtr # my traceroute + # python3Packages.instaloader + # mtr # my traceroute ] ++ [ gnome3.nautilus ] ++ [ # media @@ -97,16 +97,17 @@ ] ++ [ # math bc ] ++ [ # shell - (pass.withExtensions (ext: [ext.pass-otp])) + pass + # (pass.withExtensions (ext: [ext.pass-otp])) fzf gnupg - kmein.mnemosyne + # kmein.mnemosyne kmein.favicon kmein.autorenkalender - kmein.bvg + # kmein.bvg kmein.daybook kmein.depp - kmein.dirmir + # kmein.dirmir kmein.genius kmein.instaget kmein.literature-quote diff --git a/configs/packages/haskell/default.nix b/configs/packages/haskell/default.nix index 4454c8e..2defa41 100644 --- a/configs/packages/haskell/default.nix +++ b/configs/packages/haskell/default.nix @@ -22,7 +22,7 @@ }; services.hoogle = { - enable = true; + enable = false; packages = import ./packages.nix; port = 8091; }; diff --git a/configs/packages/programming.nix b/configs/packages/programming.nix index 7e46244..b6e6daa 100644 --- a/configs/packages/programming.nix +++ b/configs/packages/programming.nix @@ -19,9 +19,6 @@ gnumake gcc binutils # strip, ld, ... - iolanguage - ruby - rubocop rustup shellcheck ]; diff --git a/configs/packages/writing.nix b/configs/packages/writing.nix index b7c528c..f8a339d 100644 --- a/configs/packages/writing.nix +++ b/configs/packages/writing.nix @@ -2,11 +2,11 @@ { environment.systemPackages = with pkgs; [ texlive.combined.scheme-full - (aspellWithDicts (dict: [dict.de dict.en dict.la dict.en-computers dict.ru])) + (aspellWithDicts (dict: [dict.de dict.en dict.en-computers])) unstable.haskellPackages.pandoc-citeproc libreoffice unstable.pandoc - proselint + # proselint unstable.asciidoctor wordnet ]; diff --git a/configs/sway.nix b/configs/sway.nix index 30be2e9..ee9ce26 100644 --- a/configs/sway.nix +++ b/configs/sway.nix @@ -1,3 +1,3 @@ { - programs.sway.enable = true; + programs.sway.enable = false; } diff --git a/configs/todoist.nix b/configs/todoist.nix index 76492c7..e031fe9 100644 --- a/configs/todoist.nix +++ b/configs/todoist.nix @@ -5,7 +5,7 @@ in { imports = [ ]; niveum.todoist = { - enable = true; + enable = false; token = secrets.todoist.token; }; diff --git a/configs/unclutter.nix b/configs/unclutter.nix index 485f14c..0b5d0fe 100644 --- a/configs/unclutter.nix +++ b/configs/unclutter.nix @@ -1,6 +1,6 @@ { services.unclutter = { - enable = true; + enable = false; timeout = 10; }; } diff --git a/dot/matterbridge.nix b/dot/matterbridge.nix index 3574a43..e76987e 100644 --- a/dot/matterbridge.nix +++ b/dot/matterbridge.nix @@ -1,25 +1,24 @@ -{ token }: '' - [general] - RemoteNickFormat = "[{NOPINGNICK}] " - - [telegram] - [telegram.kmein] - Token = "${token}" - - [irc] - [irc.freenode] - Server = "irc.freenode.net:6667" - Nick = "tg_bridge" - - [[gateway]] - name = "krebs-bridge" - enable = true - - [[gateway.inout]] - account = "irc.freenode" - channel = "#krebs" - - [[gateway.inout]] - account = "telegram.kmein" - channel = "-330372458" -'' +{ token }: { + general.RemoteNickFormat = "[{NOPINGNICK}] "; + telegram.kmein.Token = token; + irc.freenode = { + Server = "irc.freenode.net:6667"; + Nick = "tg_bridge"; + }; + gateway = [ + { + name = "krebs-bridge"; + enable = true; + inout = [ + { + account = "irc.freenode"; + channel = "#krebs"; + } + { + account = "telegram.kmein"; + channel = "-330372458"; + } + ]; + } + ]; +} diff --git a/modules/retiolum.nix b/modules/retiolum.nix index 800d07a..a5f9510 100644 --- a/modules/retiolum.nix +++ b/modules/retiolum.nix @@ -56,20 +56,24 @@ in { environment.systemPackages = [ config.services.tinc.networks.${netname}.package ]; - networking.firewall.allowedTCPPorts = [ 655 ]; - networking.firewall.allowedUDPPorts = [ 655 ]; + networking.firewall = { + allowedTCPPorts = [ 655 ]; + allowedUDPPorts = [ 655 ]; + }; #services.netdata.portcheck.checks.tinc.port = 655; - systemd.network.enable = true; - systemd.network.networks = { - "${netname}".extraConfig = '' - [Match] - Name = tinc.${netname} + systemd.network = { + enable = true; + networks = { + "${netname}".extraConfig = '' + [Match] + Name = tinc.${netname} - [Network] - Address=${cfg.ipv4}/12 - Address=${cfg.ipv6}/16 - ''; + [Network] + Address=${cfg.ipv4}/12 + Address=${cfg.ipv6}/16 + ''; + }; }; }; } diff --git a/packages/gfs-fonts.nix b/packages/gfs-fonts.nix index b10a5ea..0c61be3 100644 --- a/packages/gfs-fonts.nix +++ b/packages/gfs-fonts.nix @@ -5,8 +5,8 @@ let url = "http://www.greekfontsociety-gfs.gr/_assets/fonts/${name}.zip"; postFetch = '' mkdir -p $out/share/fonts - unzip -j $downloadedFile "*.otf" -d $out/share/fonts/opentype - unzip -j $downloadedFile "**/*.otf" -d $out/share/fonts/opentype + unzip -j -o $downloadedFile "*.otf" -d $out/share/fonts/opentype + unzip -j -o $downloadedFile "**/*.otf" -d $out/share/fonts/opentype ''; }; in symlinkJoin { diff --git a/systems/catullus/configuration.nix b/systems/catullus/configuration.nix index de2c385..9852cb5 100644 --- a/systems/catullus/configuration.nix +++ b/systems/catullus/configuration.nix @@ -103,7 +103,7 @@ in { { services.matterbridge = { enable = true; - configPath = toString (pkgs.writeText "matterbridge.toml" (import { + configPath = toString (pkgs.writeTOML (import { token = lib.strings.removeSuffix "\n" (builtins.readFile ); })); };