From 9b66abaf95a2106607784d7f0e5e4ae1e933dd68 Mon Sep 17 00:00:00 2001 From: Sky Hearn Date: Fri, 1 Mar 2024 16:37:06 -0800 Subject: [PATCH] 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 --- .gitmodules | 3 +++ configuration.nix | 25 ++++++++++++++++--------- dwm | 2 +- st | 1 + 4 files changed, 21 insertions(+), 10 deletions(-) create mode 160000 st diff --git a/.gitmodules b/.gitmodules index ea9b38f..31c34bb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "dwm"] path = dwm url = git://git.suckless.org/dwm +[submodule "st"] + path = st + url = https://git.suckless.org/st diff --git a/configuration.nix b/configuration.nix index 9b8f578..c863d31 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,5 +1,5 @@ # 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`). { config, lib, pkgs, ... }: @@ -85,12 +85,19 @@ clipcatd & builtins.elem (lib.getName pkg) [ "obsidian" ]; + + nixpkgs.config.permittedInsecurePackages = + lib.optional (pkgs.obsidian.version == "1.4.16") "electron-25.9.0"; + home-manager.useGlobalPkgs = true; # Home Manager for Sky home-manager.users.sky = {pkgs, ...}: { home.packages = with pkgs; [ - #obsidian + obsidian (callPackage (./rolldice/default.nix) {}) + gnupg + clang-tools + rclone trash-cli mumble nheko @@ -153,17 +160,14 @@ clipcatd & ]; plugins = with pkgs.vimPlugins; [ { - plugin = sonokai; + plugin = gruvbox-nvim; type = "viml"; # Better performance is off until I can figure out a way to make the cache outside the nix store config = '' if has('termguicolors') set termguicolors endif - let g:sonokai_style = 'shusia' - let g:sonokai_better_performance = 0 - colorscheme sonokai - set clipboard+=unnamedplus + colorscheme gruvbox ''; } { @@ -172,7 +176,7 @@ clipcatd & config = '' require'lualine'.setup { options = { - theme = 'sonokai' + theme = 'gruvbox' }, sections = { lualine_c = {'lsp_progress'} @@ -302,10 +306,13 @@ clipcatd & vim wget acpi - st dmenu dunst libnotify + (pkgs.st.overrideAttrs (_: { + src = ./st; + }) + ) (pkgs.slstatus.overrideAttrs (_: { src = ./slstatus; }) diff --git a/dwm b/dwm index 1a7ba5c..5d30ee7 160000 --- a/dwm +++ b/dwm @@ -1 +1 @@ -Subproject commit 1a7ba5c47946d78d6f3e4e6ee218c9f32f7c8ccc +Subproject commit 5d30ee7db5800ccbc7d99ef718d133cb9fddc420 diff --git a/st b/st new file mode 160000 index 0000000..7544d3c --- /dev/null +++ b/st @@ -0,0 +1 @@ +Subproject commit 7544d3c13dfae83ed19697265daa2ef46882f089