wizardlink/linuxware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'desktop' into laptop

Browse source
This commit is contained in:
Alexandre Cavalheiro S. Tiago da Silva 2024-07-17 12:02:55 -03:00
commit 5f75e097af
Signed by: wizardlink
GPG key ID: A5767B54367CFBDF
23 changed files with 294 additions and 152 deletions
Download patch file Download diff file Expand all files Collapse all files

38
programs/alacritty.nix Normal file
View file

@ -0,0 +1,38 @@
{ pkgs, ... }:
let
catppuccin-theme = pkgs.fetchFromGitHub {
owner = "catppuccin";
repo = "alacritty";
rev = "94800165c13998b600a9da9d29c330de9f28618e";
hash = "sha256-Pi1Hicv3wPALGgqurdTzXEzJNx7vVh+8B9tlqhRpR2Y=";
};
in
{
programs.alacritty = {
enable = true;
settings = {
import = [ "${catppuccin-theme}/catppuccin-frappe.toml" ];
font = {
normal = {
family = "FantasqueSansM Nerd Font";
style = "Regular";
};
size = 13;
};
window = {
decorations = "None";
opacity = 0.88;
blur = true;
padding = {
x = 18;
y = 18;
};
};
};
};
}

8
programs/emacs/default.nix
View file

@ -10,6 +10,14 @@
fd
pandoc # For org-pandoc
(aspellWithDicts (
dicts: with dicts; [
en
pt_BR
]
)) # for flyspell
languagetool # for grammar
ledger # for accounting and org-ledger
];
# Neatly place the configuration files for doom in their right place.

7
programs/emacs/doom/init.el
View file

@ -82,8 +82,10 @@
:checkers
syntax ; tasing you for every semicolon you forget
(spell +flyspell) ; tasing you for misspelling mispelling
;;grammar ; tasing grammar mistake every you make
(spell ; tasing you for misspelling mispelling
+aspell
+flyspell)
grammar ; tasing grammar mistake every you make
:tools
;;ansible
@ -102,7 +104,6 @@
;;pass ; password manager for nerds
;;pdf ; pdf enhancements
;;prodigy ; FIXME managing external services & code builders
rgb ; creating color strings
;;taskrunner ; taskrunner for all your projects
;;terraform ; infrastructure as code
;;tmux ; an API for interacting with tmux

11
programs/hyprland/default.nix
View file

@ -197,12 +197,12 @@
bind = $mainMod SHIFT, F, fullscreen, 1
bind = $mainMod SHIFT, P, exec, ~/.local/share/scripts/hyprland/screenshot.sh
bind = $mainMod, C, killactive
bind = $mainMod, E, exec, wezterm start fish -c "ya"
bind = $mainMod, E, exec, thunar
bind = $mainMod, F, fullscreen
bind = $mainMod, M, exit
bind = $mainMod, O, togglesplit # dwindle
bind = $mainMod, P, pseudo # dwindle
bind = $mainMod, Q, exec, wezterm
bind = $mainMod, Q, exec, alacritty
bind = $mainMod, R, exec, rofi -show drun
bind = $mainMod, V, togglefloating
@ -245,6 +245,10 @@
bind = $mainMod SHIFT, L, movewindow, r
bind = $mainMod SHIFT, K, movewindow, u
bind = $mainMod SHIFT, J, movewindow, d
bind = $mainMod ALT, H, resizeactive, -5% 0
bind = $mainMod ALT, L, resizeactive, 5% 0
bind = $mainMod ALT, K, resizeactive, 0 -5%
bind = $mainMod ALT, J, resizeactive, 0 5%
bindm = $mainMod, mouse:272, movewindow
bindm = $mainMod, mouse:273, resizewindow
@ -253,6 +257,9 @@
binde = , XF86AudioLowerVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 1%-
bind = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
# Passthrough binds
bind = SHIFT CTRL, F12, pass, ^(com.obsproject.Studio)$
# Window rules
windowrulev2 = opacity 0.0 override 0.0 override,class:^(xwaylandvideobridge)$
windowrulev2 = noanim,class:^(xwaylandvideobridge)$

7
programs/neovim/default.nix
View file

@ -16,13 +16,10 @@
clang-tools
gcc # Needed for treesitter
# HTML/CSS
# HTML/CSS/JSON
emmet-ls
vscode-langservers-extracted
# JSON
nodePackages_latest.vscode-json-languageserver-bin
# LUA
lua-language-server
stylua
@ -33,7 +30,7 @@
prettierd
# Nix
nil
nixd
nixfmt-rfc-style
# TypeScript

1
programs/neovim/lua/community.lua
View file

@ -16,6 +16,7 @@ return {
},
{ import = "astrocommunity.editing-support.todo-comments-nvim" },
{ import = "astrocommunity.editing-support.zen-mode-nvim" },
{ import = "astrocommunity.motion.flash-nvim" },
{ import = "astrocommunity.motion.flit-nvim" },

17
programs/neovim/lua/plugins/astrolsp.lua
View file

@ -55,7 +55,7 @@ return {
"jsonls",
"lua_ls",
"marksman",
"nil_ls",
"nixd",
"rust_analyzer",
"svelte",
"taplo",
@ -67,6 +67,21 @@ return {
---@diagnostic disable: missing-fields
config = {
-- clangd = { capabilities = { offsetEncoding = "utf-8" } },
nixd = {
settings = {
nixd = {
options = {
nixos = {
expr = '(builtins.getFlake ("git+file:///home/wizardlink/.system")).nixosConfigurations.nixos.options',
},
home_manager = {
expr =
'(builtins.getFlake ("git+file:///home/wizardlink/.system")).homeConfigurations.wizardlink.options',
},
},
},
},
},
},
-- customize how language servers are attached
handlers = {

1
programs/neovim/lua/plugins/user.lua
View file

@ -34,6 +34,7 @@ return {
end,
},
{
-- Adds highlighting and lsp features for embedded code in documents.
"jmbuhr/otter.nvim",
dependencies = {
"hrsh7th/nvim-cmp",

6
programs/obs-studio.nix
View file

@ -5,11 +5,7 @@
enable = true;
plugins = with pkgs.obs-studio-plugins; [
input-overlay
# Currently broken due to onnxruntime failing to build.
# obs-backgroundremoval
obs-pipewire-audio-capture
obs-vaapi
obs-vkcapture
obs-backgroundremoval
];
};
}

2
programs/rofi/default.nix
View file

@ -20,7 +20,7 @@
modi = "run,drun,window";
show-icons = true;
sidebar-mode = true;
terminal = "wezterm";
terminal = "alacritty";
};
theme = ./catppuccin-frappe.rasi;

19
programs/spotify/default.nix Normal file
View file

@ -0,0 +1,19 @@
{ pkgs, spicetify-nix, ... }:
let
spicePkgs = spicetify-nix.legacyPackages.${pkgs.system};
in
{
imports = [ spicetify-nix.homeManagerModules.default ];
programs.spicetify = {
enable = true;
theme = spicePkgs.themes.catppuccin;
colorScheme = "frappe";
enabledExtensions = with spicePkgs.extensions; [
autoVolume
shuffle
];
};
}

30
programs/vtsls/package-lock.json generated
View file

@ -1,15 +1,15 @@
{
"name": "@vtsls/language-server",
"version": "0.2.3",
"version": "0.2.5",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "@vtsls/language-server",
"version": "0.2.3",
"version": "0.2.5",
"license": "MIT",
"dependencies": {
"@vtsls/language-service": "0.2.3",
"@vtsls/language-service": "0.2.5",
"vscode-languageserver": "^9.0.1",
"vscode-uri": "^3.0.8"
},
@ -20,7 +20,7 @@
"esbuild": "^0.21.3"
},
"engines": {
"node": ">=14"
"node": ">=16"
}
},
"node_modules/@esbuild/aix-ppc64": {
@ -397,21 +397,21 @@
"integrity": "sha512-KYSIHVmslkaCDyw013pphY+d7x1qV8IZupYfeIfzNA+nsaWHbn5uPuQRvdRFsa9zFzGeudPuoGoZ1Op4jrJXIQ=="
},
"node_modules/@vtsls/language-service": {
"version": "0.2.3",
"resolved": "https://registry.npmjs.org/@vtsls/language-service/-/language-service-0.2.3.tgz",
"integrity": "sha512-VqjmaSGbW0LHiJNdhBrKnxKXFrpBUUDc/FxakrRh6z26d4kg55mRpm9IM1khR0tkl3MYtejn0lLNQYcfCVHgYg==",
"version": "0.2.5",
"resolved": "https://registry.npmjs.org/@vtsls/language-service/-/language-service-0.2.5.tgz",
"integrity": "sha512-jf4624do1ZpZLEi4Q2NPZPjACpYRP+TNj3Xtc9kTs+llJDY26zQd1Yfcw9G/uDEREZAN958UTfAjkbuEkVNLYA==",
"dependencies": {
"@vscode/l10n": "^0.0.18",
"@vtsls/vscode-fuzzy": "0.0.1",
"jsonc-parser": "^3.2.0",
"semver": "7.5.2",
"typescript": "5.4.5",
"typescript": "5.5.2",
"vscode-languageserver-protocol": "^3.17.5",
"vscode-languageserver-textdocument": "^1.0.11",
"vscode-uri": "^3.0.8"
},
"engines": {
"node": ">=14"
"node": ">=16"
}
},
"node_modules/@vtsls/vscode-fuzzy": {
@ -458,9 +458,9 @@
}
},
"node_modules/jsonc-parser": {
"version": "3.2.1",
"resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz",
"integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA=="
"version": "3.3.1",
"resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
"integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ=="
},
"node_modules/lru-cache": {
"version": "6.0.0",
@ -488,9 +488,9 @@
}
},
"node_modules/typescript": {
"version": "5.4.5",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
"integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
"version": "5.5.2",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.2.tgz",
"integrity": "sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==",
"bin": {
"tsc": "bin/tsc",
"tsserver": "bin/tsserver"

6
programs/vtsls/package.nix
View file

@ -7,13 +7,13 @@
buildNpmPackage rec {
pname = "vtsls";
version = "0.2.3";
version = "0.2.5";
src = fetchFromGitHub {
owner = "yioneko";
repo = "vtsls";
rev = "server-v${version}";
hash = "sha256-rHiH42WpKR1nZjsW+Q4pit1aLbNIKxpYSy7sjPS0WGc=";
hash = "sha256-4tuVM1mT3NvtJgFf6EdTZmW5PfdiMv7lj2wCSgOOvcc=";
fetchSubmodules = true;
};
@ -24,8 +24,6 @@ buildNpmPackage rec {
packageLock = lib.importJSON ./package-lock.json;
};
npmDepsHash = "sha256-R70+8vwcZHlT9J5MMCw3rjUQmki4/IoRYHO45CC8TiI=";
npmConfigHook = importNpmLock.npmConfigHook;
dontNpmPrune = true;

27
programs/wezterm/default.nix
View file

@ -1,27 +0,0 @@
{ ... }:
{
programs.wezterm = {
enable = true;
extraConfig = # lua
''
local wezterm = require("wezterm")
return {
color_scheme = "Catppuccin Frappe",
enable_wayland = false, -- Unfortunately broken on Hyprland, AGAIN
font = wezterm.font("FantasqueSansM Nerd Font"),
font_size = 13,
hide_tab_bar_if_only_one_tab = true,
hide_mouse_cursor_when_typing = false,
window_background_opacity = 0.88,
window_padding = {
left = 18,
right = 18,
top = 18,
bottom = 18,
},
}
'';
};
}