diff --git a/config.nix b/config.nix index f7ad82b..6fb7928 100644 --- a/config.nix +++ b/config.nix @@ -189,6 +189,7 @@ in { home.file = { # ".background-image".source = ./art/37333571_p0_master1200.jpg; ".config/mpv/input.conf".text = import ./dot/mpv.nix; + ".config/Typora/themes/base.user.css".text = import ./dot/typora.nix; ".config/zathura/zathurarc".text = "set selection-clipboard clipboard"; ".ghc/ghci.conf".text = import ./dot/ghci.nix { inherit pkgs; }; ".ssh/config".text = import ./dot/ssh.nix { inherit lib; }; diff --git a/configs/networks.nix b/configs/networks.nix index 3b3348e..68aa9cf 100644 --- a/configs/networks.nix +++ b/configs/networks.nix @@ -22,16 +22,18 @@ in { "192.168.178.27" = [ "printer.local" ]; }; - networking.wireless.enable = true; - networking.wireless.userControlled.enable = true; - networking.wireless.networks = { - Aether = { pskRaw = "e1b18af54036c5c9a747fe681c6a694636d60a5f8450f7dec0d76bc93e2ec85a"; }; - eduroam_5GHz = eduroamConfig; - eduroam = eduroamConfig; - "Asoziales Netzwerk" = { pskRaw = "8e234041ec5f0cd1b6a14e9adeee9840ed51b2f18856a52137485523e46b0cb6"; }; - "c-base-public" = {}; - "FlixBus" = {}; - "FlixBus Wi-Fi" = {}; + networking.wireless = { + enable = true; + userControlled.enable = true; + networks = { + Aether = { pskRaw = "e1b18af54036c5c9a747fe681c6a694636d60a5f8450f7dec0d76bc93e2ec85a"; }; + eduroam_5GHz = eduroamConfig; + eduroam = eduroamConfig; + "Asoziales Netzwerk" = { pskRaw = "8e234041ec5f0cd1b6a14e9adeee9840ed51b2f18856a52137485523e46b0cb6"; }; + "c-base-public" = {}; + "FlixBus" = {}; + "FlixBus Wi-Fi" = {}; + }; }; networking.retiolum = { diff --git a/configs/packages.nix b/configs/packages.nix index 8e907b3..d5d4a2e 100644 --- a/configs/packages.nix +++ b/configs/packages.nix @@ -9,6 +9,7 @@ with pkgs; eb-garamond fira font-awesome-ttf + libertine lmodern powerline-fonts roboto @@ -35,6 +36,7 @@ with pkgs; mpv pamixer pavucontrol + perl pmount ranger ripgrep tree @@ -96,20 +98,17 @@ with pkgs; nodejs ocaml par - perl python3 python36Packages.black python36Packages.flake8 racket-minimal - ruby rustup scala seafile-client shellcheck spotify stack - swiProlog - tinycc + typora zeroad ]; } diff --git a/configs/retiolum.nix b/configs/retiolum.nix index a84f958..85816dc 100644 --- a/configs/retiolum.nix +++ b/configs/retiolum.nix @@ -46,7 +46,7 @@ in { name = "retiolum.hosts"; url = "https://lassul.us/retiolum.hosts"; # FIXME - sha256 = "1rqivqbf5p3sb92d8pzxk5ssq5rvrcgnfds2svs2dg845qd31sd6"; + sha256 = "1p7mbam6bkdxzli9znmj7051d64v4vzbjzv7r1fcs89n9fw65fr5"; }); environment.systemPackages = [ config.services.tinc.networks.${netname}.package ]; diff --git a/dot/scripts.nix b/dot/scripts.nix index 2c44cdb..8c4a0e6 100644 --- a/dot/scripts.nix +++ b/dot/scripts.nix @@ -18,20 +18,8 @@ let done ''; colorize = pkgs.writers.writeDash "colorize.sh" '' - highlight=$(which highlight 2>/dev/null) - pygmentize=$(which pygmentize 2>/dev/null) - colorize() { - if [ "$TERM" == "dumb" -o "$NO_COLORS" == "1" ] - then - cat - else - if [ "$1" == "haskell" ]; then - ${pkgs.haskellPackages.hscolour}/bin/HsColour -tty - else - ${pkgs.python36Packages.pygments}/bin/pygmentize -l $1 -O bg=dark - fi - fi + ${pkgs.python36Packages.pygments}/bin/pygmentize -l $1 -O bg=dark } if [ -z "$2" ]; then diff --git a/dot/typora.nix b/dot/typora.nix new file mode 100644 index 0000000..5ed3092 --- /dev/null +++ b/dot/typora.nix @@ -0,0 +1,5 @@ +'' +body { + font-family: 'Linux Libertine O'; +} +'' diff --git a/generate-shell-nix b/generate-shell-nix deleted file mode 100644 index e69de29..0000000