Compare commits

...

23 Commits

Author SHA1 Message Date
Sky Hearn 9b66abaf95 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>
2024-03-06 02:37:00 -08:00
Sky Hearn b2c312beb9 neovim configuration - thanks ku <3
Signed-off-by: Sky Hearn <sky.hearn@pm.me>
2024-03-06 02:23:21 -08:00
Sky Hearn 239f862c29 76 current 2024-03-01 14:17:16 23.11.4801.b7ee09cf5614 6.1.79 *
Signed-off-by: Sky Hearn <sky.hearn@pm.me>
2024-03-06 02:23:21 -08:00
Sky Hearn 300a74bc26 75 current 2024-03-01 14:06:14 23.11.4801.b7ee09cf5614 6.1.79 *
Signed-off-by: Sky Hearn <sky.hearn@pm.me>
2024-03-06 02:23:21 -08:00
Sky Hearn ff9deb5e40 74 current 2024-03-01 02:17:17 23.11.4801.b7ee09cf5614 6.1.79 *
Signed-off-by: Sky Hearn <sky.hearn@pm.me>
2024-03-06 02:23:21 -08:00
Sky Hearn 36c42b3ee0 74 current 2024-03-01 02:17:17 23.11.4801.b7ee09cf5614 6.1.79 *
Signed-off-by: Sky Hearn <sky.hearn@pm.me>
2024-03-06 02:23:21 -08:00
Sky Hearn c144abfda9 73 current 2024-03-01 02:15:56 23.11.4801.b7ee09cf5614 6.1.79 *
Signed-off-by: Sky Hearn <sky.hearn@pm.me>
2024-03-06 02:23:21 -08:00
Sky Hearn 44acbb8246 72 current 2024-03-01 02:08:18 23.11.4801.b7ee09cf5614 6.1.79 *
Signed-off-by: Sky Hearn <sky.hearn@pm.me>
2024-03-06 02:23:21 -08:00
Sky Hearn 2a4b3abfd3 71 current 2024-03-01 02:05:57 23.11.4801.b7ee09cf5614 6.1.79 *
Signed-off-by: Sky Hearn <sky.hearn@pm.me>
2024-03-06 02:23:21 -08:00
Sky Hearn 9027b29229 70 current 2024-03-01 01:24:53 23.11.4801.b7ee09cf5614 6.1.79 *
Signed-off-by: Sky Hearn <sky.hearn@pm.me>
2024-03-06 02:23:21 -08:00
Sky Hearn d20f9ff686 69 current 2024-03-01 00:55:17 23.11.4801.b7ee09cf5614 6.1.79 *
Signed-off-by: Sky Hearn <sky.hearn@pm.me>
2024-03-06 02:23:21 -08:00
Sky Hearn 15f4249f9b 68 current 2024-03-01 00:22:19 23.11.4801.b7ee09cf5614 6.1.79 *
Signed-off-by: Sky Hearn <sky.hearn@pm.me>
2024-03-06 02:23:21 -08:00
Sky Hearn 3558897e4e 67 current 2024-02-28 18:00:45 23.11.4801.b7ee09cf5614 6.1.79 *
Signed-off-by: Sky Hearn <sky.hearn@pm.me>
2024-03-06 02:23:21 -08:00
Sky Hearn 6c5c849003 66 current 2024-02-28 17:58:29 23.11.4801.b7ee09cf5614 6.1.79 *
Signed-off-by: Sky Hearn <sky.hearn@pm.me>
2024-03-06 02:23:21 -08:00
Sky Hearn a564a2680b Moonlight Client
Signed-off-by: Sky Hearn <sky.hearn@pm.me>
2024-03-06 02:23:21 -08:00
Sky Hearn a490498ea3 64 current 2024-02-27 23:55:28 23.11.4801.b7ee09cf5614 6.1.79 *
Signed-off-by: Sky Hearn <sky.hearn@pm.me>
2024-03-06 02:23:21 -08:00
Sky Hearn b493fb88c5 62 current 2024-02-27 23:23:49 23.11.4801.b7ee09cf5614 6.1.79 *
Signed-off-by: Sky Hearn <sky.hearn@pm.me>
2024-03-06 02:23:21 -08:00
Sky Hearn a65dc9ea24 49 current 2024-02-27 21:29:53 23.11.4801.b7ee09cf5614 6.1.79 *
Signed-off-by: Sky Hearn <sky.hearn@pm.me>
2024-03-06 02:23:21 -08:00
Sky Hearn 9bd3b38586 46 current 2024-02-27 20:28:27 23.11.4801.b7ee09cf5614 6.1.79 *
Signed-off-by: Sky Hearn <sky.hearn@pm.me>
2024-03-06 02:23:21 -08:00
Sky Hearn 2234a104ec 45 current 2024-02-27 19:54:42 23.11.4801.b7ee09cf5614 6.1.79 *
Signed-off-by: Sky Hearn <sky.hearn@pm.me>
2024-03-06 02:23:21 -08:00
Sky Hearn 3669abe7ca 44 current 2024-02-27 19:41:39 23.11.4801.b7ee09cf5614 6.1.79 *
Signed-off-by: Sky Hearn <sky.hearn@pm.me>
2024-03-06 02:23:21 -08:00
Sky Hearn af03677ec3 43 current 2024-02-27 17:58:27 23.11.4801.b7ee09cf5614 6.1.79 *
Signed-off-by: Sky Hearn <sky.hearn@pm.me>
2024-03-06 02:23:21 -08:00
Sky Hearn 65779f0766 42 current 2024-02-27 17:56:22 23.11.4801.b7ee09cf5614 6.1.79 *
Signed-off-by: Sky Hearn <sky.hearn@pm.me>
2024-03-06 02:23:21 -08:00
6 changed files with 241 additions and 28 deletions

6
.gitmodules vendored
View File

@ -1,3 +1,9 @@
[submodule "slstatus"]
path = slstatus
url = git://git.suckless.org/slstatus
[submodule "dwm"]
path = 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
# 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, ... }:
@ -50,8 +50,13 @@
useXkbConfig = true; # use xkb.options in tty.
};
# Enable the X11 windowing system.
# Enable the X11 windowing system
services.xserver.enable = true;
services.xserver.displayManager.sessionCommands = ''
slstatus &
nitrogen --restore &
clipcatd &
'';
# Configure keymap in X11
services.xserver.xkb.layout = "us";
@ -68,23 +73,41 @@
services.xserver.libinput.enable = true;
# Enable dwm
services.xserver.windowManager.dwm.package = pkgs.dwm.overrideAttrs {
src = ./dwm;
};
services.xserver.windowManager.dwm.enable = true;
# Sky User
users.users.sky.isNormalUser = true;
users.users.sky.extraGroups = [ "wheel" ]; # Enable sudo for the user.
nixpkgs.config.allowUnfreePredicate = pkg:
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
(callPackage (./rolldice/default.nix) {})
gnupg
clang-tools
rclone
trash-cli
mumble
nheko
zim
moonlight-embedded
nitrogen
firefox-bin
neofetch
ncpamixer
tree
neovim
xclip
grpc
clipcat
@ -96,6 +119,20 @@
enable = true;
vSync = true;
backend = "glx";
inactiveOpacity = 0.9;
settings = {
blur = {
method = "dual-kawase";
};
};
};
programs.bash = {
enable = true;
shellAliases = {
nv = "nvim";
ccm = "clipcat-menu";
};
};
programs.git = {
@ -104,9 +141,161 @@
userEmail = "sky.hearn@pm.me";
signing = {
key = "DAB485883AE426EC";
signByDefault = true;
signByDefault = false;
};
};
programs.neovim = {
enable = true;
defaultEditor = true;
extraConfig = ''
set shiftwidth=2 smarttab
set expandtab
set tabstop=8 softtabstop=0
'';
extraPackages = with pkgs; [
# Use the project flake's language server to prevent version mismatches
# clang_12
# rust-analyzer
];
plugins = with pkgs.vimPlugins; [
{
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
colorscheme gruvbox
'';
}
{
plugin = lualine-nvim;
type = "lua";
config = ''
require'lualine'.setup {
options = {
theme = 'gruvbox'
},
sections = {
lualine_c = {'lsp_progress'}
}
}
'';
}
{
plugin = lsp-status-nvim;
type = "lua";
config = ''
require'lsp-status'.register_progress()
'';
}
{
plugin = nvim-lspconfig;
type = "lua";
config = ''
-- Mappings.
-- See `:help vim.diagnostic.*` for documentation on any of the below functions
local opts = { noremap=true, silent=true }
vim.keymap.set('n', '<space>e', vim.diagnostic.open_float, opts)
vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts)
vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts)
vim.keymap.set('n', '<space>q', vim.diagnostic.setloclist, opts)
-- Use an on_attach function to only map the following keys
-- after the language server attaches to the current buffer
local on_attach = function(client, bufnr)
-- Set up status tracking
require'lsp-status'.on_attach(client)
-- Enable completion triggered by <c-x><c-o>
vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
-- Mappings.
-- See `:help vim.lsp.*` for documentation on any of the below functions
local bufopts = { noremap=true, silent=true, buffer=bufnr }
vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts)
vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts)
vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts)
vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts)
vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, bufopts)
vim.keymap.set('n', '<space>wa', vim.lsp.buf.add_workspace_folder, bufopts)
vim.keymap.set('n', '<space>wr', vim.lsp.buf.remove_workspace_folder, bufopts)
vim.keymap.set('n', '<space>wl', function()
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
end, bufopts)
vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition, bufopts)
vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, bufopts)
vim.keymap.set('n', '<space>ca', vim.lsp.buf.code_action, bufopts)
vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
vim.keymap.set('n', '<space>f', function() vim.lsp.buf.format { async = true } end, bufopts)
end
local lsp_flags = {
-- This is the default in Nvim 0.7+
debounce_text_changes = 150,
}
local servers = { 'clangd', 'rust_analyzer' }
for _, lsp in ipairs(servers) do
require'lspconfig'[lsp].setup(
vim.tbl_extend('keep',
require('coq').lsp_ensure_capabilities({
on_attach = on_attach,
flags = lsp_flags
}) or {},
require'lsp-status'.capabilities
)
)
end
'';
}
{
plugin = coq_nvim;
type = "lua";
config = ''
vim.g.coq_settings = { auto_start = 'shut-up', xdg = true }
'';
}
{
plugin = nvim-treesitter.withAllGrammars;
type = "lua";
config = ''
require'nvim-treesitter.configs'.setup {
-- TODO: Make this use stdpath("data")
-- parser_install_dir = "~/.local/share/nvim/site",
-- ensure_installed = { "nix", "help", "rust", "c", "lua" },
-- auto_install = true,
highlight = {
enable = true
},
incremental_selection = {
enable = true,
keymaps = {
init_selection = "gnn", -- set to `false` to disable one of the mappings
node_incremental = "grn",
scope_incremental = "grc",
node_decremental = "grm",
}
},
indent = {
enable = true
},
}
vim.cmd([[
set foldmethod=expr
set foldexpr=nvim_treesitter#foldexpr()
set nofoldenable
]])
'';
}
{
plugin = telescope-nvim;
}
];
};
home.stateVersion = "23.11";
};
# List packages installed in system profile. To search, run:
@ -117,8 +306,13 @@
vim
wget
acpi
st
dmenu
dunst
libnotify
(pkgs.st.overrideAttrs (_: {
src = ./st;
})
)
(pkgs.slstatus.overrideAttrs (_: {
src = ./slstatus;
})
@ -129,23 +323,6 @@
# Some programs need SUID wrappers, can be configured further or are
# started in user sessions.
programs.mtr.enable = true;
programs.gnupg.agent = {
enable = true;
enableSSHSupport = true;
};
# clipcat systemd service
systemd.services.clipcat = {
partOf = [ "graphical-session.target" ];
wantedBy = [ "graphical-session.target" ];
description = "Clipcat Daemon";
serviceConfig = {
ExecStart = ''/usr/bin/clipcatd --no-daemon --replace''; # TODO: find where to actually run clipcatd
Restart = "on-failure";
Type = "simple";
};
};
# List services that you want to enable:

1
dwm Submodule

@ -0,0 +1 @@
Subproject commit 5d30ee7db5800ccbc7d99ef718d133cb9fddc420

28
rolldice/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ lib
, stdenv
, fetchzip
, readline
}:
stdenv.mkDerivation rec {
name = "rolldice";
version = "1.16-1";
src = fetchzip {
url = "https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/rolldice/1.16-1build1/rolldice_1.16.orig.tar.gz";
sha256 = "sha256-gyBwPzO0UO6LvGvaWk5bn1uFUPtedC3Y1/uN3FdyJSQ=";
};
buildInputs = [
readline
];
buildPhase = ''
make
'';
installPhase = ''
mkdir -p $out/bin
mv rolldice $out/bin
'';
}

@ -1 +1 @@
Subproject commit b0f33c6d3d4b2cb2396c76084aa921ebf120a120
Subproject commit f227db9662f3c4f96fdfd0d025e3ed4060ded0a2

1
st Submodule

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