Fixup home-manager on workstations

Signed-off-by: magic_rb <magic_rb@redalder.org>
This commit is contained in:
magic_rb 2023-12-24 17:02:37 +01:00
parent 97ea6ffe4a
commit 89167c684e
No known key found for this signature in database
GPG key ID: 08D5287CC5DDCA0E
3 changed files with 58 additions and 51 deletions

View file

@ -84,7 +84,7 @@ alias E='emacsclient -s'
## Set prompt ## Set prompt
export EDITOR="emacsclient" export EDITOR="emacsclient"
export BROWSER="firefox-nightly" export BROWSER="librewolf"
## Clear scrollback for vterm ## Clear scrollback for vterm
if [[ "$INSIDE_EMACS" = 'vterm' ]]; then if [[ "$INSIDE_EMACS" = 'vterm' ]]; then

View file

@ -17,7 +17,8 @@ env:
# TERM: rxvt-unicode-256color # TERM: rxvt-unicode-256color
TERM: xterm-256color TERM: xterm-256color
#window: window:
opacity: 0.8
# Window dimensions (changes require restart) # Window dimensions (changes require restart)
# #
# Specified in number of columns/lines, not pixels. # Specified in number of columns/lines, not pixels.
@ -102,7 +103,7 @@ font:
# - (macOS) Menlo # - (macOS) Menlo
# - (Linux/BSD) monospace # - (Linux/BSD) monospace
# - (Windows) Consolas # - (Windows) Consolas
family: SourceCodePro family: Iosevka Term Extended
# The `style` can be specified to pick a specific face. # The `style` can be specified to pick a specific face.
style: Regular style: Regular
@ -113,7 +114,7 @@ font:
# #
# If the bold family is not specified, it will fall back to the # If the bold family is not specified, it will fall back to the
# value specified for the normal font. # value specified for the normal font.
family: SourceCodePro family: Iosevka Term Extended
# The `style` can be specified to pick a specific face. # The `style` can be specified to pick a specific face.
style: Bold style: Bold
@ -124,7 +125,7 @@ font:
# #
# If the italic family is not specified, it will fall back to the # If the italic family is not specified, it will fall back to the
# value specified for the normal font. # value specified for the normal font.
family: SourceCodePro family: Iosevka Term Extended
# The `style` can be specified to pick a specific face. # The `style` can be specified to pick a specific face.
style: Italic style: Italic
@ -135,13 +136,13 @@ font:
# #
# If the bold italic family is not specified, it will fall back to the # If the bold italic family is not specified, it will fall back to the
# value specified for the normal font. # value specified for the normal font.
family: SourceCodePro family: Iosevka Term Extended
# The `style` can be specified to pick a specific face. # The `style` can be specified to pick a specific face.
style: Bold Italic style: Bold Italic
# Point size # Point size
size: 10.0 size: 6
# Offset is the extra space around each character. `offset.y` can be thought of # Offset is the extra space around each character. `offset.y` can be thought of
# as modifying the line spacing, and `offset.x` as modifying the letter spacing. # as modifying the line spacing, and `offset.x` as modifying the letter spacing.
@ -175,31 +176,35 @@ font:
# If `true`, bold text is drawn using the bright color variants. # If `true`, bold text is drawn using the bright color variants.
#draw_bold_text_with_bright_colors: false #draw_bold_text_with_bright_colors: false
# Theme: modus-operandi # Colors Ef-Winter
# Description: Alacritty port of modus-operandi (Modus themes for Emacs)
# Author: Protesilaos Stavrou, <https://protesilaos.com>
colors: colors:
primary:
background: '#ffffff'
foreground: '#000000'
normal: normal:
black: '#000000' black: '#1d202f'
red: '#a60000' red: '#f47359'
green: '#005e00' green: '#29a444'
yellow: '#813e00' yellow: '#b58a52'
blue: '#0031a9' blue: '#3f95f6'
magenta: '#721045' magenta: '#d369af'
cyan: '#00538b' cyan: '#4fbaef'
white: '#bfbfbf' white: '#b8c6d5'
bright: bright:
black: '#595959' black: '#4a4f62'
red: '#972500' red: '#ff6a7a'
green: '#315b00' green: '#00a392'
yellow: '#70480f' yellow: '#df9080'
blue: '#2544bb' blue: '#029fff'
magenta: '#5317ac' magenta: '#af85ea'
cyan: '#005a5f' cyan: '#35afbf'
white: '#ffffff' white: '#807c9f'
cursor:
cursor: '#ff6ff0'
text: '#0f0b15'
primary:
background: '#0f0b15'
foreground: '#b8c6d5'
selection:
background: '#342464'
text: '#b8c6d5'
# Dim colors # Dim colors
# #
@ -253,9 +258,6 @@ colors:
# Background opacity # Background opacity
# #
# Window opacity as a floating point number from `0.0` to `1.0`.
# The value `0.0` is completely transparent and `1.0` is opaque.
background_opacity: 0.9
#selection: #selection:
#semantic_escape_chars: ",│`|:\"' ()[]{}<>\t" #semantic_escape_chars: ",│`|:\"' ()[]{}<>\t"

View file

@ -1,10 +1,17 @@
{ config, pkgs, lib, inputs', ... }: {
let config,
inherit (lib) pkgs,
lib,
inputs',
...
}: let
inherit
(lib)
concatStringsSep concatStringsSep
getExe getExe
flip flip
singleton; singleton
;
combineWines = wines: combineWines = wines:
pkgs.stdenv.mkDerivation { pkgs.stdenv.mkDerivation {
@ -19,16 +26,15 @@ let
'' ''
mkdir -p $out/bin mkdir -p $out/bin
'' ''
+ + (concatStringsSep "\n"
(concatStringsSep "\n" (
(flip map wines flip map wines
(wine: '' (wine: ''
ln -s ${getExe wine} $out/bin/${wine.pname} ln -s ${getExe wine} $out/bin/${wine.pname}
'') '')
)); ));
}; };
in in {
{
imports = [ imports = [
../picom ../picom
../dunst ../dunst
@ -73,10 +79,8 @@ in
obs-studio obs-studio
mpv mpv
slack slack
# TODO remove when PR264018 is in schildichat-desktop
(schildichat-desktop.override {
electron = pkgs.electron_25;
})
# armcord # armcord
pavucontrol pavucontrol
@ -91,8 +95,7 @@ in
# 3d printing # 3d printing
openscad openscad
# TODO move back to unstable when PR263599 is in freecad
inputs'.nixpkgs-stable.legacyPackages.${stdenv.system}.freecad
cura cura
super-slicer super-slicer
@ -115,9 +118,11 @@ in
playerctl playerctl
git-annex git-annex
file file
ncdu
lsof
]; ];
home.file.".config/alacritty/alacritty.yaml".source = ./alacritty.yaml; home.file.".config/alacritty/alacritty.yml".source = ./alacritty.yaml;
home.file.".gpg-agent.conf".text = '' home.file.".gpg-agent.conf".text = ''
enable-ssh-support enable-ssh-support
pinentry-program ${pkgs.pinentry.gtk2}/bin/pinentry pinentry-program ${pkgs.pinentry.gtk2}/bin/pinentry