78 current 2024-03-01 16:37:01 23.11.4801.b7ee09cf5614 6.1.79 *

- Add obsidian with a workaround for the EOL version of electron used in
1.4.16
- Add clang-tools for the clangd language server
- Add rclone
- Add gnupg
- Change themes system-wide to use "gruvbox"
- Make st a submodule and override the src attr for the st package.

Signed-off-by: Sky Hearn <sky.hearn@pm.me>
This commit is contained in:
Sky Hearn 2024-03-01 16:37:06 -08:00
parent b2c312beb9
commit 9b66abaf95
4 changed files with 21 additions and 10 deletions

3
.gitmodules vendored
View File

@ -4,3 +4,6 @@
[submodule "dwm"] [submodule "dwm"]
path = dwm path = dwm
url = git://git.suckless.org/dwm url = git://git.suckless.org/dwm
[submodule "st"]
path = st
url = https://git.suckless.org/st

View File

@ -1,5 +1,5 @@
# Edit this configuration file to define what should be installed on # Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page, on #your system. Help is available in the configuration.nix(5) man page, on
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`). # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
@ -85,12 +85,19 @@ clipcatd &
builtins.elem (lib.getName pkg) [ builtins.elem (lib.getName pkg) [
"obsidian" "obsidian"
]; ];
nixpkgs.config.permittedInsecurePackages =
lib.optional (pkgs.obsidian.version == "1.4.16") "electron-25.9.0";
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
# Home Manager for Sky # Home Manager for Sky
home-manager.users.sky = {pkgs, ...}: { home-manager.users.sky = {pkgs, ...}: {
home.packages = with pkgs; [ home.packages = with pkgs; [
#obsidian obsidian
(callPackage (./rolldice/default.nix) {}) (callPackage (./rolldice/default.nix) {})
gnupg
clang-tools
rclone
trash-cli trash-cli
mumble mumble
nheko nheko
@ -153,17 +160,14 @@ clipcatd &
]; ];
plugins = with pkgs.vimPlugins; [ plugins = with pkgs.vimPlugins; [
{ {
plugin = sonokai; plugin = gruvbox-nvim;
type = "viml"; type = "viml";
# Better performance is off until I can figure out a way to make the cache outside the nix store # Better performance is off until I can figure out a way to make the cache outside the nix store
config = '' config = ''
if has('termguicolors') if has('termguicolors')
set termguicolors set termguicolors
endif endif
let g:sonokai_style = 'shusia' colorscheme gruvbox
let g:sonokai_better_performance = 0
colorscheme sonokai
set clipboard+=unnamedplus
''; '';
} }
{ {
@ -172,7 +176,7 @@ clipcatd &
config = '' config = ''
require'lualine'.setup { require'lualine'.setup {
options = { options = {
theme = 'sonokai' theme = 'gruvbox'
}, },
sections = { sections = {
lualine_c = {'lsp_progress'} lualine_c = {'lsp_progress'}
@ -302,10 +306,13 @@ clipcatd &
vim vim
wget wget
acpi acpi
st
dmenu dmenu
dunst dunst
libnotify libnotify
(pkgs.st.overrideAttrs (_: {
src = ./st;
})
)
(pkgs.slstatus.overrideAttrs (_: { (pkgs.slstatus.overrideAttrs (_: {
src = ./slstatus; src = ./slstatus;
}) })

2
dwm

@ -1 +1 @@
Subproject commit 1a7ba5c47946d78d6f3e4e6ee218c9f32f7c8ccc Subproject commit 5d30ee7db5800ccbc7d99ef718d133cb9fddc420

1
st Submodule

@ -0,0 +1 @@
Subproject commit 7544d3c13dfae83ed19697265daa2ef46882f089