Compare commits
29 Commits
9b66abaf95
...
cd9946699d
Author | SHA1 | Date |
---|---|---|
Sky Hearn | cd9946699d | |
Sky Hearn | e6aa7bb147 | |
Sky Hearn | 0d9b01da13 | |
Sky Hearn | fffeb726dc | |
Sky Hearn | ea20aa5bba | |
Sky Hearn | 7f095e0c5d | |
Sky Hearn | 8f6b8576b6 | |
Sky Hearn | 91e2296818 | |
Sky Hearn | 4fc5c31654 | |
Sky Hearn | ffa53ad2e8 | |
Sky Hearn | a2735e25cc | |
Sky Hearn | 96d5267072 | |
Sky Hearn | 17cf571296 | |
Sky Hearn | b653dbc0ca | |
Sky Hearn | eabf444e34 | |
Sky Hearn | abaeb7c598 | |
Sky Hearn | 18fb6eaee6 | |
Sky Hearn | f521ffecf7 | |
Sky Hearn | 95ae003413 | |
Sky Hearn | 329d7b1ab3 | |
Sky Hearn | 369df10eba | |
Sky Hearn | e1c592cef3 | |
Sky Hearn | 7b2d100cd3 | |
Sky Hearn | 9ee4009437 | |
Sky Hearn | 3e764e0b66 | |
Sky Hearn | 506b261a4c | |
Sky Hearn | a8c282a5fc | |
Sky Hearn | eb141ac2d5 | |
Sky Hearn | 15b8e99f33 |
|
@ -1,3 +1,9 @@
|
||||||
[submodule "slstatus"]
|
[submodule "slstatus"]
|
||||||
path = slstatus
|
path = slstatus
|
||||||
url = git://git.suckless.org/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
|
||||||
|
|
|
@ -50,8 +50,13 @@
|
||||||
useXkbConfig = true; # use xkb.options in tty.
|
useXkbConfig = true; # use xkb.options in tty.
|
||||||
};
|
};
|
||||||
|
|
||||||
# Enable the X11 windowing system.
|
# Enable the X11 windowing system
|
||||||
services.xserver.enable = true;
|
services.xserver.enable = true;
|
||||||
|
services.xserver.displayManager.sessionCommands = ''
|
||||||
|
slstatus &
|
||||||
|
nitrogen --restore &
|
||||||
|
clipcatd &
|
||||||
|
'';
|
||||||
|
|
||||||
# Configure keymap in X11
|
# Configure keymap in X11
|
||||||
services.xserver.xkb.layout = "us";
|
services.xserver.xkb.layout = "us";
|
||||||
|
@ -68,23 +73,40 @@
|
||||||
services.xserver.libinput.enable = true;
|
services.xserver.libinput.enable = true;
|
||||||
|
|
||||||
# Enable dwm
|
# Enable dwm
|
||||||
|
services.xserver.windowManager.dwm.package = pkgs.dwm.overrideAttrs {
|
||||||
|
src = ./dwm;
|
||||||
|
};
|
||||||
services.xserver.windowManager.dwm.enable = true;
|
services.xserver.windowManager.dwm.enable = true;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Sky User
|
# Sky User
|
||||||
users.users.sky.isNormalUser = true;
|
users.users.sky.isNormalUser = true;
|
||||||
users.users.sky.extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
|
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 for Sky
|
||||||
home-manager.users.sky = {pkgs, ...}: {
|
home-manager.users.sky = {pkgs, ...}: {
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
|
obsidian
|
||||||
|
(callPackage (./rolldice/default.nix) {})
|
||||||
|
clang-tools
|
||||||
|
rclone
|
||||||
|
trash-cli
|
||||||
|
mumble
|
||||||
|
nheko
|
||||||
|
zim
|
||||||
|
moonlight-embedded
|
||||||
|
nitrogen
|
||||||
firefox-bin
|
firefox-bin
|
||||||
neofetch
|
neofetch
|
||||||
ncpamixer
|
ncpamixer
|
||||||
tree
|
tree
|
||||||
neovim
|
|
||||||
xclip
|
xclip
|
||||||
grpc
|
grpc
|
||||||
clipcat
|
clipcat
|
||||||
|
@ -96,6 +118,20 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
vSync = true;
|
vSync = true;
|
||||||
backend = "glx";
|
backend = "glx";
|
||||||
|
inactiveOpacity = 0.9;
|
||||||
|
settings = {
|
||||||
|
blur = {
|
||||||
|
method = "dual-kawase";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
programs.bash = {
|
||||||
|
enable = true;
|
||||||
|
shellAliases = {
|
||||||
|
nv = "nvim";
|
||||||
|
ccm = "clipcat-menu";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.git = {
|
programs.git = {
|
||||||
|
@ -104,9 +140,161 @@
|
||||||
userEmail = "sky.hearn@pm.me";
|
userEmail = "sky.hearn@pm.me";
|
||||||
signing = {
|
signing = {
|
||||||
key = "DAB485883AE426EC";
|
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";
|
home.stateVersion = "23.11";
|
||||||
};
|
};
|
||||||
# List packages installed in system profile. To search, run:
|
# List packages installed in system profile. To search, run:
|
||||||
|
@ -117,8 +305,13 @@
|
||||||
vim
|
vim
|
||||||
wget
|
wget
|
||||||
acpi
|
acpi
|
||||||
st
|
|
||||||
dmenu
|
dmenu
|
||||||
|
dunst
|
||||||
|
libnotify
|
||||||
|
(pkgs.st.overrideAttrs (_: {
|
||||||
|
src = ./st;
|
||||||
|
})
|
||||||
|
)
|
||||||
(pkgs.slstatus.overrideAttrs (_: {
|
(pkgs.slstatus.overrideAttrs (_: {
|
||||||
src = ./slstatus;
|
src = ./slstatus;
|
||||||
})
|
})
|
||||||
|
@ -129,23 +322,6 @@
|
||||||
# Some programs need SUID wrappers, can be configured further or are
|
# Some programs need SUID wrappers, can be configured further or are
|
||||||
# started in user sessions.
|
# started in user sessions.
|
||||||
programs.mtr.enable = true;
|
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:
|
# List services that you want to enable:
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 5d30ee7db5800ccbc7d99ef718d133cb9fddc420
|
|
@ -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
|
||||||
|
'';
|
||||||
|
}
|
2
slstatus
2
slstatus
|
@ -1 +1 @@
|
||||||
Subproject commit b0f33c6d3d4b2cb2396c76084aa921ebf120a120
|
Subproject commit f227db9662f3c4f96fdfd0d025e3ed4060ded0a2
|
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 7544d3c13dfae83ed19697265daa2ef46882f089
|
Loading…
Reference in New Issue