fontconfig, patches, tabs
This commit is contained in:
parent
2d19ec3ea3
commit
2e19627dd7
9 changed files with 65 additions and 13 deletions
|
@ -12,7 +12,7 @@ window:
|
||||||
# Set font
|
# Set font
|
||||||
font:
|
font:
|
||||||
normal:
|
normal:
|
||||||
family: FiraCode Nerd Font Mono
|
family: monospace # FiraCode Nerd Font Mono
|
||||||
style: Regular
|
style: Regular
|
||||||
bold:
|
bold:
|
||||||
style: Bold
|
style: Bold
|
||||||
|
|
BIN
home-config/fonts/FiraMonoNerdFont-Regular.otf
Normal file
BIN
home-config/fonts/FiraMonoNerdFont-Regular.otf
Normal file
Binary file not shown.
|
@ -14,6 +14,7 @@
|
||||||
(gnu home services shells)
|
(gnu home services shells)
|
||||||
(gnu home services desktop)
|
(gnu home services desktop)
|
||||||
(gnu home services gnupg)
|
(gnu home services gnupg)
|
||||||
|
(gnu home services fontutils)
|
||||||
(gnu home services)
|
(gnu home services)
|
||||||
(home-services pipewire)
|
(home-services pipewire)
|
||||||
(home-packages shells)
|
(home-packages shells)
|
||||||
|
@ -101,6 +102,8 @@
|
||||||
|
|
||||||
|
|
||||||
"font-google-noto-sans-cjk" ;; fonts
|
"font-google-noto-sans-cjk" ;; fonts
|
||||||
|
"font-fira-mono"
|
||||||
|
"font-dejavu"
|
||||||
|
|
||||||
|
|
||||||
"alacritty" ;; gui applicatiosn
|
"alacritty" ;; gui applicatiosn
|
||||||
|
@ -167,6 +170,35 @@
|
||||||
(".scripts" ,(local-file "scripts" #:recursive? #t))
|
(".scripts" ,(local-file "scripts" #:recursive? #t))
|
||||||
(".gitconfig" ,(local-file "git/gitconfig"))))
|
(".gitconfig" ,(local-file "git/gitconfig"))))
|
||||||
|
|
||||||
|
(simple-service 'additional-fonts-service
|
||||||
|
home-fontconfig-service-type
|
||||||
|
(list "~/.local/share/fonts"
|
||||||
|
"~/.nix-profile/share/fonts"
|
||||||
|
"~/.nix-profile/share/fonts"
|
||||||
|
'(alias
|
||||||
|
(family "serif")
|
||||||
|
(prefer
|
||||||
|
(family "Twemoji")
|
||||||
|
(family "Font Awesome 6 Pro Regular")
|
||||||
|
(family "Times New Roman")
|
||||||
|
(family "DejaVu Serif")))
|
||||||
|
'(alias
|
||||||
|
(family "sans-serif")
|
||||||
|
(prefer
|
||||||
|
(family "Twemoji")
|
||||||
|
(family "Font Awesome 6 Pro Regular")
|
||||||
|
(family "Cantarell")
|
||||||
|
(family "Noto Sans")
|
||||||
|
(family "DejaVu Sans")))
|
||||||
|
'(alias
|
||||||
|
(family "monospace")
|
||||||
|
(prefer
|
||||||
|
(family "FiraMono Nerd Font")
|
||||||
|
(family "Fira Mono")
|
||||||
|
(family "Font Awesome Pro Regular")
|
||||||
|
(family "Twemoji")
|
||||||
|
(family "DejaVu Sans Mono")))))
|
||||||
|
|
||||||
(service home-pipewire-service-type)
|
(service home-pipewire-service-type)
|
||||||
(service home-dbus-service-type)
|
(service home-dbus-service-type)
|
||||||
(service home-gpg-agent-service-type
|
(service home-gpg-agent-service-type
|
||||||
|
|
|
@ -26,9 +26,11 @@
|
||||||
pcem
|
pcem
|
||||||
cider
|
cider
|
||||||
gzdoom
|
gzdoom
|
||||||
|
yarn
|
||||||
unityhub
|
unityhub
|
||||||
yuzu-early-access
|
yuzu-early-access
|
||||||
sonar-scanner-cli
|
sonar-scanner-cli
|
||||||
|
tailscale
|
||||||
#steam
|
#steam
|
||||||
|
|
||||||
# Gstreamer
|
# Gstreamer
|
||||||
|
@ -59,6 +61,10 @@
|
||||||
lua52Packages.dkjson
|
lua52Packages.dkjson
|
||||||
lua52Packages.luaposix
|
lua52Packages.luaposix
|
||||||
lua-language-server
|
lua-language-server
|
||||||
|
|
||||||
|
# Fonts
|
||||||
|
cantarell-fonts
|
||||||
|
twemoji-color-font
|
||||||
];
|
];
|
||||||
|
|
||||||
# Let Home Manager install and manage itself.
|
# Let Home Manager install and manage itself.
|
||||||
|
|
|
@ -34,5 +34,6 @@ Plug('folke/trouble.nvim')
|
||||||
Plug('kylechui/nvim-surround')
|
Plug('kylechui/nvim-surround')
|
||||||
Plug('akinsho/toggleterm.nvim', {tag = '*'})
|
Plug('akinsho/toggleterm.nvim', {tag = '*'})
|
||||||
Plug('goolord/alpha-nvim')
|
Plug('goolord/alpha-nvim')
|
||||||
|
Plug('Darazaki/indent-o-matic')
|
||||||
|
|
||||||
vim.call('plug#end')
|
vim.call('plug#end')
|
||||||
|
|
|
@ -40,6 +40,12 @@ require('lualine').setup {
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
require('indent-o-matic').setup {
|
||||||
|
max_lines = 2048,
|
||||||
|
standard_widths = { 2, 4, 8 },
|
||||||
|
skip_multiline = true,
|
||||||
|
}
|
||||||
|
|
||||||
vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
|
vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
|
||||||
vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
|
vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
|
||||||
vim.api.nvim_set_hl(0, "NvimTreeNormal", { bg = "none" })
|
vim.api.nvim_set_hl(0, "NvimTreeNormal", { bg = "none" })
|
||||||
|
|
|
@ -2,6 +2,7 @@ local set = vim.opt
|
||||||
set.tabstop = 4
|
set.tabstop = 4
|
||||||
set.softtabstop = 4
|
set.softtabstop = 4
|
||||||
set.shiftwidth = 4
|
set.shiftwidth = 4
|
||||||
|
--set.noexpandtab = true
|
||||||
set.mouse = "a"
|
set.mouse = "a"
|
||||||
set.clipboard = "unnamedplus"
|
set.clipboard = "unnamedplus"
|
||||||
set.hlsearch = true
|
set.hlsearch = true
|
||||||
|
|
|
@ -9,7 +9,7 @@ get_mode() {
|
||||||
get_name() {
|
get_name() {
|
||||||
swaymsg -t get_outputs -r | jq -r ".[$1].name"
|
swaymsg -t get_outputs -r | jq -r ".[$1].name"
|
||||||
}
|
}
|
||||||
sg
|
|
||||||
get_width() {
|
get_width() {
|
||||||
get_mode "$1" | jq ".width"
|
get_mode "$1" | jq ".width"
|
||||||
}
|
}
|
||||||
|
@ -71,7 +71,7 @@ get_id() {
|
||||||
}
|
}
|
||||||
|
|
||||||
PRIMARY=$(get_id "eDP-1")
|
PRIMARY=$(get_id "eDP-1")
|
||||||
EXTERNAL=$(get_id "DP-1" || get_id "HDMI-1")
|
EXTERNAL=$(get_id "DP-1" || get_id "HDMI-1" || get_id "HDMI-A-1")
|
||||||
|
|
||||||
PRIMARY_SCALE=1.5
|
PRIMARY_SCALE=1.5
|
||||||
EXTERNAL_SCALE=1
|
EXTERNAL_SCALE=1
|
||||||
|
|
|
@ -107,11 +107,14 @@
|
||||||
"vulkan-headers"
|
"vulkan-headers"
|
||||||
"spirv-tools"
|
"spirv-tools"
|
||||||
"spirv-headers"
|
"spirv-headers"
|
||||||
|
"shaderc"
|
||||||
"sdl2"
|
"sdl2"
|
||||||
|
"glm"
|
||||||
"openal"
|
"openal"
|
||||||
"freealut"
|
"freealut"
|
||||||
"xf86-video-qxl"
|
"xf86-video-qxl"
|
||||||
"v4l2loopback-linux-module"
|
"v4l2loopback-linux-module"
|
||||||
|
"fuse@2"
|
||||||
|
|
||||||
|
|
||||||
"xdg-desktop-portal" ;; graphics
|
"xdg-desktop-portal" ;; graphics
|
||||||
|
@ -163,6 +166,9 @@
|
||||||
(service pam-limits-service-type)
|
(service pam-limits-service-type)
|
||||||
(service fprintd-service-type)
|
(service fprintd-service-type)
|
||||||
(service docker-service-type)
|
(service docker-service-type)
|
||||||
|
(service special-files-service-type
|
||||||
|
`(("/lib/ld-linux-x86-64.so.2"
|
||||||
|
,(file-append (canonical-package glibc) "/lib/ld-linux-x86-64.so.2"))))
|
||||||
(udev-rules-service 'fido2 libfido2 #:groups '("plugdev")))
|
(udev-rules-service 'fido2 libfido2 #:groups '("plugdev")))
|
||||||
|
|
||||||
;; This is the default list of services we
|
;; This is the default list of services we
|
||||||
|
|
Loading…
Reference in a new issue