pixelifytica/nixos
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Update Monarch config

Browse source 
Update Monarch config file for restructure
Fix Makefile for new non-nixos structure
Add MacOS background blur to wezterm
This commit is contained in:
Evie Litherland-Smith 2023-05-02 08:22:53 +01:00
parent 3e6a484489
commit 089187738e
3 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -1,6 +1,6 @@
$(eval HOSTNAME=$(shell hostname)) $(eval HOSTNAME=$(shell hostname))
NIXOS_CONFIG := $(PWD)/nixos/$(HOSTNAME).nix NIXOS_CONFIG := $(PWD)/nixos/$(HOSTNAME).nix
HOMEMANAGER_CONFIG := $(PWD)/home/$(HOSTNAME)-$(USER).nix HOMEMANAGER_CONFIG := $(PWD)/nixos/home/$(HOSTNAME)-$(USER).nix
CONFIG_DIR := $(if $(XDG_CONFIG_HOME), $(XDG_CONFIG_HOME), $(HOME)/.config) CONFIG_DIR := $(if $(XDG_CONFIG_HOME), $(XDG_CONFIG_HOME), $(HOME)/.config)
SSH_DIR := $(HOME)/.ssh SSH_DIR := $(HOME)/.ssh

17
nixos/home/Monarch-tux.nix
View file

@ -1,9 +1,16 @@
{ ... }: { pkgs, ... }:
{ {
imports = [ imports = [
./env ./git/personal.nix
./env/git/personal.nix ./env/zsh.nix
./tui ./env/bat.nix
./env/direnv.nix
./env/keychain.nix
./env/ssh.nix
./env/starship.nix
./terminal/wezterm.nix
./tui/neovim.nix
./tui/lazygit.nix
]; ];
# Home Manager needs a bit of information about you and the # Home Manager needs a bit of information about you and the
# paths it should manage. # paths it should manage.
@ -11,6 +18,8 @@
home.homeDirectory = "/Users/tux"; home.homeDirectory = "/Users/tux";
home.stateVersion = "22.11"; home.stateVersion = "22.11";
home.packages = with pkgs; [ silver-searcher ];
programs.zsh.envExtra = '' programs.zsh.envExtra = ''
eval "$(/opt/homebrew/bin/brew shellenv)" eval "$(/opt/homebrew/bin/brew shellenv)"
''; '';

1
nixos/home/terminal/config/wezterm/wezterm.lua
View file

@ -10,6 +10,7 @@ return {
audible_bell = "Disabled", audible_bell = "Disabled",
font_size = 14, font_size = 14,
window_background_opacity = 0.7, window_background_opacity = 0.7,
macos_window_background_blur = 20,
color_scheme = scheme_name, color_scheme = scheme_name,
use_fancy_tab_bar = false, use_fancy_tab_bar = false,
tab_max_width = 79, tab_max_width = 79,