diff options
| -rw-r--r-- | machines/profpatsch/base-workstation.nix | 5 | ||||
| -rw-r--r-- | pkgs/profpatsch/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/profpatsch/xdg-open/default.nix | 3 |
3 files changed, 7 insertions, 8 deletions
diff --git a/machines/profpatsch/base-workstation.nix b/machines/profpatsch/base-workstation.nix index d5989e24..5c182f8f 100644 --- a/machines/profpatsch/base-workstation.nix +++ b/machines/profpatsch/base-workstation.nix @@ -51,7 +51,6 @@ in { # Graphical System services.xserver = { - enable = true; layout = "de"; xkbVariant = "neo"; @@ -74,8 +73,9 @@ in { sessionCommands = with pkgs; '' #TODO add as nixpkg export PATH+=":$HOME/scripts" #add utility scripts - export TERMINAL=${lilyterm-git}/bin/lilyterm + export PATH+=":$HOME/bin" #add user-specific binaries (filled by nix-home) export EDITOR="emacsclient --create-frame" + export TERMINAL=terminal-emulator ${xorg.xset}/bin/xset r rate 250 35 @@ -133,7 +133,6 @@ in { ]; # minimal set of gui applications guiPkgs = [ - lilyterm-git # terminal emulator, best one around dmenu # minimal launcher (pkgs.vuizvui.profpatsch.binify { exe = pkgs.vuizvui.profpatsch.xdg-open; name = "xdg-open"; }) # override the crap freedesktop crap ]; diff --git a/pkgs/profpatsch/default.nix b/pkgs/profpatsch/default.nix index 3dcde9c3..bc81aa6e 100644 --- a/pkgs/profpatsch/default.nix +++ b/pkgs/profpatsch/default.nix @@ -119,7 +119,7 @@ let ''; src = pkgs.fetchgit { url = "https://code.tvl.fyi/depot.git"; - rev = tvlCommit; # 2021-11-13 + rev = tvlCommit; sha256 = tvlSha256; }; prepareSource = runExeclineFns.runExeclineLocalNoSeqL "prepare-tvl" {} [ @@ -133,10 +133,11 @@ let in rec { + # tvl = import /home/philip/depot {}; tvl = importTvl { - tvlCommit = "e2fbc10ebdb5d85813fd15c5dd371ee8e1e87a22"; # 2021-11-13 - tvlSha256 = "14hrzx31a7bas64n8rz89388nwfhmy77l5s85g82vvzd5fxg61by"; + tvlCommit = "72b46e8fe80d9c8c708602387b4d46cce6bb266d"; # 2022-02-28 + tvlSha256 = "sha256-uWrsbMWe3CZVlsstMrJB4HP3tzU8GgFB7VAsanUBI2g="; nixpkgsPath = pkgs.path; }; diff --git a/pkgs/profpatsch/xdg-open/default.nix b/pkgs/profpatsch/xdg-open/default.nix index 4d0e6804..83e8105d 100644 --- a/pkgs/profpatsch/xdg-open/default.nix +++ b/pkgs/profpatsch/xdg-open/default.nix @@ -19,7 +19,6 @@ let // getBins pkgs.s6 [ "s6-ioconnect" ] // getBins pkgs.s6-portable-utils [ "s6-test" ] // getBins pkgs.s6-networking [ "s6-tcpclient" ] - // getBins pkgs.lilyterm-git [ "lilyterm" ] // getBins pkgs.netcat-openbsd [ "nc" ] // getBins pkgs.dmenu [ "dmenu" "dmenu_path" ] # TODO: make sure these are the ones from the environment @@ -96,7 +95,7 @@ let }; exec-in-terminal-emulator = {exe, args}: { - exe = bins.lilyterm; + exe = pkgs.vuizvui.profpatsch.tvl.users.Profpatsch.alacritty; args = file: [ ({Variable, String}: String "--execute") ({Variable, String}: String exe) |