prescientmoon/satellite
1
Fork 0
Code Activity

I hate my life

Browse source
This commit is contained in:
Matei Adriel 2022-06-19 00:09:21 +03:00
parent a1f39da01d
commit 265ddbf84b
29 changed files with 146 additions and 124 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
configuration.nix
View file

@ -5,13 +5,15 @@ in
{ {
imports = [ ./modules ]; imports = [ ./modules ];
boot.loader.systemd-boot.enable = true;
boot.tmpOnTmpfs = true; boot.tmpOnTmpfs = true;
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
services.xserver.videoDrivers = [ "displaylink" "modesetting" ]; services.xserver.videoDrivers = [
# "displaylink"
"modesetting"
];
hardware = { hardware = {
pulseaudio = { pulseaudio = {
@ -20,6 +22,7 @@ in
}; };
boot.loader = { boot.loader = {
# systemd-boot.enable = true;
efi = { efi = {
canTouchEfiVariables = true; canTouchEfiVariables = true;
# assuming /boot is the mount point of the EFI partition in NixOS (as the installation section recommends). # assuming /boot is the mount point of the EFI partition in NixOS (as the installation section recommends).
@ -62,7 +65,7 @@ in
}; };
system.stateVersion = "21.11"; system.stateVersion = "22.05";
# TODO: put nixpkgs stuff inside their own file # TODO: put nixpkgs stuff inside their own file
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;

47
dotfiles/neovim/README.md
View file

@ -1,5 +1,10 @@
# Neovim config # Neovim config
## Articles
- [Textobjects](https://blog.carbonfive.com/vim-text-objects-the-definitive-guide/)
- [Registers](https://www.brianstorti.com/vim-registers/)
## Keybinds ## Keybinds
Table of my own keybinds. Here as documentation for myself. I am yet to include any of the keybinds for cmp here. Table of my own keybinds. Here as documentation for myself. I am yet to include any of the keybinds for cmp here.
@ -7,28 +12,25 @@ Table of my own keybinds. Here as documentation for myself. I am yet to include
> Things written using italics are chords > Things written using italics are chords
> (aka all the keys need to be pressed at the same time) > (aka all the keys need to be pressed at the same time)
| Keybind | Description | Plugins | | Keybind | Description | Plugins |
| ------------ | ------------------------------------------- | ------------------ | | ------------ | ----------------------------------- | ------------------ |
| vv | Create vertical split | | | vv | Create vertical split | |
| _jl_ | Save | | | _cp_ | Use system clipboard | |
| _jk_ | Exit insert mode | | | _jl_ | Save | |
| _\<leader>k_ | Insert digraph | | | _jk_ | Exit insert mode | |
| _\<leader>a_ | Swap last 2 used buffers | | | _\<leader>k_ | Insert digraph | |
| C-n | Open tree | nvim-tree | | _\<leader>a_ | Swap last 2 used buffers | |
| _vp_ | Run command in another tmux pane | vimux | | C-n | Open tree | nvim-tree |
| _sk_ | Move to previous lh-bracket marker | lh-brackets | | _vp_ | Run command in another tmux pane | vimux |
| _sj_ | Move to next lh-bracket marker | lh-brackets | | C-hjkl | Navigation between vim & tmux panes | vim-tmux-navigator |
| _mo_ | Move outside the current brackets | lh-brackets | | J | Show line diagnostics | lspconfig |
| _ml_ | Remove all markers and move to the last one | lh-brackets | | K | Show hover info | lspconfig |
| C-hjkl | Navigation between vim & tmux panes | vim-tmux-navigator | | L | Signature help (?) | lspconfig |
| J | Show line diagnostics | lspconfig | | gD | Go to declaration | lspconfig |
| K | Show hover info | lspconfig | | gd | Go to definition | lspconfig |
| L | Signature help (?) | lspconfig | | gi | Go to implementation | lspconfig |
| gD | Go to declaration | lspconfig | | \<leader>rn | Rename | lspconfig |
| gd | Go to definition | lspconfig | | \<leader>f | format | lspconfig |
| gi | Go to implementation | lspconfig |
| \<leader>rn | Rename | lspconfig |
| \<leader>f | format | lspconfig |
### Lh-brackets ### Lh-brackets
@ -41,7 +43,6 @@ The default brackets I load in each buffer are (), [], "", '', {} and \`\`. Diff
| Ctrl-P | Find files | | | Ctrl-P | Find files | |
| Ctrl-F | Grep in project | | | Ctrl-F | Grep in project | |
| \<leader>d | Diagnostics | lspconfig | | \<leader>d | Diagnostics | lspconfig |
| \<leader>wd | Workspace diagnostics | lspconfig |
| \<leader>ca | Code actions | lspconfig | | \<leader>ca | Code actions | lspconfig |
| \<leader>t | Show builtin pickers | | | \<leader>t | Show builtin pickers | |
| \<leader>s | Show symbols using tree-sitter | | | \<leader>s | Show symbols using tree-sitter | |

1
dotfiles/neovim/lua/my/keymaps.lua
View file

@ -31,6 +31,7 @@ function M.setup()
arpeggio.chord("i", "jk", "<Esc>") -- Remap Esc to jk arpeggio.chord("i", "jk", "<Esc>") -- Remap Esc to jk
arpeggio.chord("i", "<Leader>k", "<C-k><cr>") -- Rebind digraph insertion to leader+k arpeggio.chord("i", "<Leader>k", "<C-k><cr>") -- Rebind digraph insertion to leader+k
arpeggio.chord("inv", "<Leader>a", "<C-6><cr>") -- Rebind switching to the last pane using leader+a arpeggio.chord("inv", "<Leader>a", "<C-6><cr>") -- Rebind switching to the last pane using leader+a
arpeggio.chord("nv", "cp", "\"+") -- Press cp to use the global clipboard
end end
return M return M

3
dotfiles/neovim/lua/my/options.lua
View file

@ -12,6 +12,9 @@ function M.setup()
opt.number = true -- Show line numbers opt.number = true -- Show line numbers
opt.relativenumber = true -- Relative line numbers opt.relativenumber = true -- Relative line numbers
-- TODO: only do this for specific filestypes
opt.expandtab = true -- Use spaces for the tab char
opt.scrolloff = 4 -- Lines of context opt.scrolloff = 4 -- Lines of context
opt.shiftround = true -- Round indent opt.shiftround = true -- Round indent
opt.shiftwidth = 2 -- Size of an indent opt.shiftwidth = 2 -- Size of an indent

4
dotfiles/neovim/lua/my/paq.lua
View file

@ -26,8 +26,8 @@ function M.setup()
{"andweeb/presence.nvim", run = ":DownloadUnicode"}, -- discord rich presence {"andweeb/presence.nvim", run = ":DownloadUnicode"}, -- discord rich presence
"Julian/lean.nvim", -- lean support "Julian/lean.nvim", -- lean support
"kmonad/kmonad-vim", -- kmonad config support "kmonad/kmonad-vim", -- kmonad config support
"LucHermitte/lh-vim-lib", -- dependency for lh-brackets -- "LucHermitte/lh-vim-lib", -- dependency for lh-brackets
"LucHermitte/lh-brackets", -- kinda useless bruh -- "LucHermitte/lh-brackets", -- kinda useless bruh, should find something better
-- Cmp related stuff -- Cmp related stuff
"hrsh7th/cmp-nvim-lsp", -- lsp completion "hrsh7th/cmp-nvim-lsp", -- lsp completion
"hrsh7th/cmp-buffer", -- idr what this is "hrsh7th/cmp-buffer", -- idr what this is

8
dotfiles/neovim/lua/my/plugins/init.lua
View file

@ -3,26 +3,26 @@ local M = {}
function M.setup() function M.setup()
-- Other unconfigured plugins -- Other unconfigured plugins
require('nvim-autopairs').setup() require('nvim-autopairs').setup()
require("startup").setup({theme = "dashboard"}) require("startup").setup()
require("presence"):setup({}) -- wtf does the : do here? require("presence"):setup({}) -- wtf does the : do here?
-- Plugins with their own configs: -- Plugins with their own configs:
require("my.plugins.vim-tmux-navigator").setup()
-- require("my.plugins.fzf-lua").setup() -- require("my.plugins.fzf-lua").setup()
-- require("my.plugins.nerdtree").setup() -- require("my.plugins.nerdtree").setup()
require("my.plugins.treesitter").setup()
require("my.plugins.cmp").setup() require("my.plugins.cmp").setup()
require("my.plugins.lspconfig").setup() require("my.plugins.lspconfig").setup()
require("my.plugins.null-ls").setup() require("my.plugins.null-ls").setup()
require("my.plugins.lualine").setup() require("my.plugins.lualine").setup()
require("my.plugins.treesitter").setup()
require("my.plugins.comment").setup() require("my.plugins.comment").setup()
require("my.plugins.nvim-tree").setup() require("my.plugins.nvim-tree").setup()
require("my.plugins.vimtex").setup() require("my.plugins.vimtex").setup()
require("my.plugins.telescope").setup() require("my.plugins.telescope").setup()
require("my.plugins.vimux").setup() require("my.plugins.vimux").setup()
-- require("my.plugins.idris").setup() -- require("my.plugins.idris").setup()
-- require("my.plugins.lh-brackets").setup()
require("my.plugins.lean").setup() require("my.plugins.lean").setup()
require("my.plugins.vim-tmux-navigator").setup()
require("my.plugins.lh-brackets").setup()
end end
return M return M

2
dotfiles/neovim/lua/my/plugins/lh-brackets.lua
View file

@ -6,7 +6,7 @@ local M = {}
local extraBrackets = { local extraBrackets = {
lean = {{"⟨", "⟩"}}, -- lean lean = {{"⟨", "⟩"}}, -- lean
all = { all = {
{"(", ")"}, {"[", "]"}, {"'", "'"}, {'"', '"'}, {"{", "}"}, {"`", "`"} -- {"(", ")"}, {"[", "]"}, {"'", "'"}, {'"', '"'}, {"{", "}"}, {"`", "`"}
} -- more general stuff } -- more general stuff
} }

3
dotfiles/neovim/lua/my/plugins/treesitter.lua
View file

@ -11,9 +11,6 @@ function M.setup()
indent = {enable = true}, indent = {enable = true},
highlight = { highlight = {
enable = false, enable = false,
disable = {
"lua", "json", "yaml", "bash", "scss", "html", "javascript"
}, -- WHY TF
-- Setting this to true will run `:h syntax` and tree-sitter at the same time. -- Setting this to true will run `:h syntax` and tree-sitter at the same time.
-- Set this to `true` if you depend on 'syntax' being enabled (like for indentation). -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).

8
dotfiles/neovim/lua/my/plugins/vim-tmux-navigator.lua
View file

@ -6,10 +6,10 @@ local M = {}
function M.setup() function M.setup()
vim.g.tmux_navigator_no_mappings = 1 vim.g.tmux_navigator_no_mappings = 1
map("n", "<leader>h", ":TmuxNavigateLeft<cr>") map("n", "C-h", ":TmuxNavigateLeft<cr>")
map("n", "<leader>j", ":TmuxNavigateDown<cr>") map("n", "C-j", ":TmuxNavigateDown<cr>")
map("n", "<leader>k", ":TmuxNavigateUp<cr>") map("n", "C-k", ":TmuxNavigateUp<cr>")
map("n", "<leader>l", ":TmuxNavigateRight<cr>") map("n", "C-l", ":TmuxNavigateRight<cr>")
end end
return M return M

20
dotfiles/neovim/lua/telescope/extensions/unicode.lua
View file

@ -19,7 +19,18 @@ local unicodeChars = {
arrow = "→", arrow = "→",
compose = "∘", compose = "∘",
inverse = "⁻¹", inverse = "⁻¹",
dots = "…" dots = "…",
alpha = "ɑ",
beta = "β",
pi = "π",
Pi = 'Π',
sigma = "σ",
Sigma = "Σ",
tau = "τ",
theta = "θ",
gamma = "γ",
Gamma = "Γ",
context = "Γ"
} }
-- our picker function for unicode chars -- our picker function for unicode chars
@ -52,7 +63,7 @@ function M.picker(opts)
local selection = action_state.get_selected_entry() local selection = action_state.get_selected_entry()
if selection == nil then if selection == nil then
utils.__warn_no_selection "builtin.planets" utils.__warn_no_selection "my.abbreviations"
return return
end end
@ -64,7 +75,8 @@ function M.picker(opts)
}):find() }):find()
end end
function M.setupAbbreviations(ending) function M.setupAbbreviations(prefix, ending)
prefix = prefix or ""
ending = ending or "" ending = ending or ""
if not add_abbreviations then return end if not add_abbreviations then return end
@ -73,7 +85,7 @@ function M.setupAbbreviations(ending)
for key, value in pairs(unicodeChars) do for key, value in pairs(unicodeChars) do
-- By default abbreviations are triggered using "_" -- By default abbreviations are triggered using "_"
abbreviate(key .. ending, value) abbreviate(prefix .. key .. ending, value)
end end
end end

4
dotfiles/tmux/tmux.conf
View file

@ -7,8 +7,8 @@ bind C-a send-prefix
set-option -g allow-rename off set-option -g allow-rename off
# Visual stuff # Visual stuff
set -g default-terminal "xterm-256color" set -g default-terminal "screen-256color"
set-option -ga terminal-overrides ",xterm-256color:Tc" set-option -ga terminal-overrides ",screen-256color:Tc"
set -g -a terminal-overrides ',*:Ss=\E[%p1%d q:Se=\E[2 q' # Supposedly helps with cursor shapes under vim (spoiler: it does not) set -g -a terminal-overrides ',*:Ss=\E[%p1%d q:Se=\E[2 q' # Supposedly helps with cursor shapes under vim (spoiler: it does not)
# Split panes with \ and - # Split panes with \ and -

16
flake.lock
View file

@ -275,16 +275,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1651519540, "lastModified": 1654113405,
"narHash": "sha256-3k6p8VsTwwRPQjE8rrMh+o2AZACZn/eeYJ7ivdQ/Iro=", "narHash": "sha256-VpK+0QaWG2JRgB00lw77N9TjkE3ec0iMYIX1TzGpxa4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d93d56ab8c1c6aa575854a79b9d2f69d491db7d0", "rev": "ac2287df5a2d6f0a44bbcbd11701dbbf6ec43675",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-21.11", "ref": "release-22.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -571,16 +571,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1653565689, "lastModified": 1654605205,
"narHash": "sha256-xdJ6bmPxDPIMItZJWsDxopPXUTAFPWMkNkyOOcptWSc=", "narHash": "sha256-aRTGBWpAr6DlLMoUyIvctWRcL59vpW98CdWUl+BhnXg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9bc0e974545d5bc4c24e1ed047be0dc4e30e494b", "rev": "daa78e40e9592dbbcfd53937cbd9aae9e69a2999",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "release-21.11", "ref": "release-22.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

4
flake.nix
View file

@ -2,12 +2,12 @@
description = "NixOS configuration"; description = "NixOS configuration";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/release-21.11"; nixpkgs.url = "github:nixos/nixpkgs/release-22.05";
nixos-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixos-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-21.11"; url = "github:nix-community/home-manager/release-22.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };

1
modules/applications/direnv.nix
View file

@ -3,6 +3,5 @@
home-manager.users.adrielus = { home-manager.users.adrielus = {
programs.direnv.enable = true; programs.direnv.enable = true;
programs.direnv.nix-direnv.enable = true; programs.direnv.nix-direnv.enable = true;
programs.direnv.nix-direnv.enableFlakes = true;
}; };
} }

7
modules/applications/kdeconnect.nix
View file

@ -3,12 +3,7 @@
services.kdeconnect.enable = true; services.kdeconnect.enable = true;
}; };
# Open port for kdeconfig # Open port for kdeconnect
# networking.firewall.extraCommands = ''
# iptables -A nixos-fw -p tcp --source 192.0.2.0/24 --dport 1714:1764 -j nixos-fw-accept
# iptables -A nixos-fw -p udp --source 192.0.2.0/24 --dport 1714:1764 -j nixos-fw-accept
# '';
networking.firewall.allowedTCPPortRanges = [{ from = 1714; to = 1764; }]; networking.firewall.allowedTCPPortRanges = [{ from = 1714; to = 1764; }];
networking.firewall.allowedUDPPortRanges = [{ from = 1714; to = 1764; }]; networking.firewall.allowedUDPPortRanges = [{ from = 1714; to = 1764; }];
} }

7
modules/applications/misc.nix
View file

@ -48,9 +48,9 @@
# teams # teams
# browsers # browsers
google-chrome unstable.google-chrome
# brave # brave
# firefox firefox
# other stuff # other stuff
obsidian # knowedge base obsidian # knowedge base
@ -75,7 +75,8 @@
# fceux # fceux
# games # games
tetrio-desktop # tetrio-desktop
vassal
# mindustry # mindustry
# edopro # edopro
]; ];

4
modules/applications/neovim.nix
View file

@ -37,7 +37,7 @@ let
]; ];
myConfig = '' myConfig = ''
vim.g.lualineTheme = ${theme.neovim.lualineTheme} vim.g.lualineTheme = "${theme.neovim.lualineTheme}"
vim.opt.runtimepath:append("${paths.dotfiles}/neovim") vim.opt.runtimepath:append("${paths.dotfiles}/neovim")
require("my.init").setup() require("my.init").setup()
''; '';
@ -60,9 +60,9 @@ in
home.file.".local/share/nvim/site/pack/paqs/start/paq-nvim".source = paq; home.file.".local/share/nvim/site/pack/paqs/start/paq-nvim".source = paq;
xdg.configFile."nvim/init.lua".text = myConfig; xdg.configFile."nvim/init.lua".text = myConfig;
xdg.configFile."nvim/lua/my/theme.lua".source = theme.neovim.theme; xdg.configFile."nvim/lua/my/theme.lua".source = theme.neovim.theme;
home.packages = [ home.packages = [
neovim neovim
# idk why I need to install this here
]; ];
programs.neovim = { programs.neovim = {

8
modules/applications/shells/sessionVariables.nix
View file

@ -1,7 +1,7 @@
{ ... }: { pkgs, ... }:
with import ../../../secrets.nix; with import ../../../secrets.nix;
let let
theme = "github-dark"; theme = pkgs.myThemes.current;
variables = { variables = {
# Configure github cli # Configure github cli
GITHUB_USERNAME = "Mateiadrielrafael"; GITHUB_USERNAME = "Mateiadrielrafael";
@ -12,5 +12,9 @@ let
}; };
in in
{ {
imports = [{
home-manager.users.adrielus.home.sessionVariables = theme.env or { };
}];
home-manager.users.adrielus = { home.sessionVariables = variables; }; home-manager.users.adrielus = { home.sessionVariables = variables; };
} }

2
modules/dev/default.nix
View file

@ -12,7 +12,7 @@
# ./elm.nix # ./elm.nix
# Proof assistants # Proof assistants
./agda.nix # ./agda.nix
# ./idris.nix # ./idris.nix
./lean.nix ./lean.nix
]; ];

2
modules/dev/javascript.nix
View file

@ -1,6 +1,6 @@
{ pkgs, ... }: { pkgs, ... }:
let let
node = pkgs.nodejs-17_x; node = pkgs.nodejs;
yarn = pkgs.yarn.override { nodejs = node; }; yarn = pkgs.yarn.override { nodejs = node; };
in in
{ {

2
modules/dev/nix.nix
View file

@ -2,7 +2,5 @@
home-manager.users.adrielus.home.packages = with pkgs; home-manager.users.adrielus.home.packages = with pkgs;
[ [
nixfmt nixfmt
# niv
# cached-nix-shell
]; ];
} }

14
modules/dev/purescript.nix
View file

@ -1,12 +1,12 @@
{ pkgs, ... }: { { pkgs, ... }: {
home-manager.users.adrielus.home.packages = with pkgs.easy-purescript-nix; [ home-manager.users.adrielus.home.packages = with pkgs.unstable; [
purescript purescript
spago spago
purty # haskellPackages.zephyr
pscid # purty # purescript formatter
pulp # purs-tidy # purescript formatter
zephyr # pscid
psa # pulp
purs-tidy # psa
]; ];
} }

3
modules/overlays/legacy.nix
View file

@ -6,7 +6,8 @@ let
config.allowUnfree = true; config.allowUnfree = true;
config.allowBroken = true; config.allowBroken = true;
}; };
in { in
{
nixpkgs.overlays = [ nixpkgs.overlays = [
(self: super: (self: super:
with self; rec { with self; rec {

9
modules/overlays/npm.nix
View file

@ -1,7 +1,12 @@
self: super: self: super:
let customPackages = (import ./npm) { nodejs = self.nodejs-17_x; pkgs = self; };
let
node = self.nodejs-18_x;
customPackages = (import ./npm) { nodejs = node; pkgs = self; };
in in
with self; { with self; {
nodejs = node;
# Faster prettier for editors # Faster prettier for editors
prettierd = customPackages."@fsouza/prettierd"; prettierd = customPackages."@fsouza/prettierd";

7
modules/overlays/npm/default.nix
View file

@ -1,11 +1,8 @@
# This file has been generated by node2nix 1.9.0. Do not edit! # This file has been generated by node2nix 1.9.0. Do not edit!
{ pkgs ? import <nixpkgs> { {pkgs ? import <nixpkgs> {
inherit system; inherit system;
} }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
, system ? builtins.currentSystem
, nodejs ? pkgs."nodejs-12_x"
}:
let let
nodeEnv = import ./node-env.nix { nodeEnv = import ./node-env.nix {

60
modules/overlays/npm/node-packages.nix
View file

@ -4,22 +4,22 @@
let let
sources = { sources = {
"core-js-3.22.5" = { "core-js-3.23.1" = {
name = "core-js"; name = "core-js";
packageName = "core-js"; packageName = "core-js";
version = "3.22.5"; version = "3.23.1";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/core-js/-/core-js-3.22.5.tgz"; url = "https://registry.npmjs.org/core-js/-/core-js-3.23.1.tgz";
sha512 = "VP/xYuvJ0MJWRAobcmQ8F2H6Bsn+s7zqAAjFaHGBMc5AQm7zaelhD1LGduFn2EehEcQcU+br6t+fwbpQ5d1ZWA=="; sha512 = "wfMYHWi1WQjpgZNC9kAlN4ut04TM9fUTdi7CqIoTVM7yaiOUQTklOzfb+oWH3r9edQcT3F887swuVmxrV+CC8w==";
}; };
}; };
"core_d-4.0.0" = { "core_d-5.0.1" = {
name = "core_d"; name = "core_d";
packageName = "core_d"; packageName = "core_d";
version = "4.0.0"; version = "5.0.1";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/core_d/-/core_d-4.0.0.tgz"; url = "https://registry.npmjs.org/core_d/-/core_d-5.0.1.tgz";
sha512 = "dBxd0Ocxj3D3K+rJxutTAZ9LQHkuMZoc9HPWYwYRYK7swou5wuIRXxgJ39YLNDvFHfHyV3JbxVYluF/AOhcRnw=="; sha512 = "37lZyhJY1hzgFbfU4LzY4zL09QPwPfV2W/3YBOtN7mkdvVaeP1OVnDZI6zxggtlPwG/BuE5wIr0xptlVJk5EPA==";
}; };
}; };
"has-flag-4.0.0" = { "has-flag-4.0.0" = {
@ -49,13 +49,13 @@ let
sha512 = "GyQkE8M32pULhQk7Sko5raoIbPalAk90ICG+An4fq6fCsFHsP6fB2K46WGXVdoJpy4SGMnZ/EKbo123fZJomWg=="; sha512 = "GyQkE8M32pULhQk7Sko5raoIbPalAk90ICG+An4fq6fCsFHsP6fB2K46WGXVdoJpy4SGMnZ/EKbo123fZJomWg==";
}; };
}; };
"prettier-2.6.2" = { "prettier-2.7.1" = {
name = "prettier"; name = "prettier";
packageName = "prettier"; packageName = "prettier";
version = "2.6.2"; version = "2.7.1";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/prettier/-/prettier-2.6.2.tgz"; url = "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz";
sha512 = "PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew=="; sha512 = "ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==";
}; };
}; };
"regenerator-runtime-0.13.9" = { "regenerator-runtime-0.13.9" = {
@ -85,13 +85,13 @@ let
sha512 = "MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q=="; sha512 = "MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==";
}; };
}; };
"typescript-4.6.4" = { "typescript-4.7.4" = {
name = "typescript"; name = "typescript";
packageName = "typescript"; packageName = "typescript";
version = "4.6.4"; version = "4.7.4";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/typescript/-/typescript-4.6.4.tgz"; url = "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz";
sha512 = "9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg=="; sha512 = "C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==";
}; };
}; };
"vscode-css-languageservice-5.4.2" = { "vscode-css-languageservice-5.4.2" = {
@ -148,13 +148,13 @@ let
sha512 = "BNlAYgQoYwlSgDLJhSG+DeA8G1JyECqRzM2YO6tMmMji3Ad9Mw6AW7vnZMti90qlAKb0LqAlJfSVGEdqMMNzKg=="; sha512 = "BNlAYgQoYwlSgDLJhSG+DeA8G1JyECqRzM2YO6tMmMji3Ad9Mw6AW7vnZMti90qlAKb0LqAlJfSVGEdqMMNzKg==";
}; };
}; };
"vscode-languageserver-textdocument-1.0.4" = { "vscode-languageserver-textdocument-1.0.5" = {
name = "vscode-languageserver-textdocument"; name = "vscode-languageserver-textdocument";
packageName = "vscode-languageserver-textdocument"; packageName = "vscode-languageserver-textdocument";
version = "1.0.4"; version = "1.0.5";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.4.tgz"; url = "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.5.tgz";
sha512 = "/xhqXP/2A2RSs+J8JNXpiiNVvvNM0oTosNVmQnunlKvq9o4mupHOBAnnzH0lwIPKazXKvAKsVp1kr+H/K4lgoQ=="; sha512 = "1ah7zyQjKBudnMiHbZmxz5bYNM9KKZYz+5VQLj+yr8l+9w3g+WAhCkUkWbhMEdC5u0ub4Ndiye/fDyS8ghIKQg==";
}; };
}; };
"vscode-languageserver-types-3.17.1" = { "vscode-languageserver-types-3.17.1" = {
@ -190,16 +190,16 @@ in
"@fsouza/prettierd" = nodeEnv.buildNodePackage { "@fsouza/prettierd" = nodeEnv.buildNodePackage {
name = "_at_fsouza_slash_prettierd"; name = "_at_fsouza_slash_prettierd";
packageName = "@fsouza/prettierd"; packageName = "@fsouza/prettierd";
version = "0.20.0"; version = "0.21.1";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/@fsouza/prettierd/-/prettierd-0.20.0.tgz"; url = "https://registry.npmjs.org/@fsouza/prettierd/-/prettierd-0.21.1.tgz";
sha512 = "FQ2WX17r2RErbsheFTg6ZjdP1FTZ02Urc9uORAxc3OXPRJaVmx1AzYgTY0w3LmPZs4YyiH0IZO+BrstobhjCjA=="; sha512 = "xLGvk2csfCqTT3MZfXC7uGxdAy0HkMiYoVz2vCQbxNHCLSLBEoejNcbNh+MPWulRPSVBYN8jJJge6yychCU5KA==";
}; };
dependencies = [ dependencies = [
sources."core_d-4.0.0" sources."core_d-5.0.1"
sources."has-flag-4.0.0" sources."has-flag-4.0.0"
sources."nanolru-1.0.0" sources."nanolru-1.0.0"
sources."prettier-2.6.2" sources."prettier-2.7.1"
sources."supports-color-8.1.1" sources."supports-color-8.1.1"
]; ];
buildInputs = globalBuildInputs; buildInputs = globalBuildInputs;
@ -209,7 +209,7 @@ in
license = "ISC"; license = "ISC";
}; };
production = true; production = true;
bypassCache = true; bypassCache = false;
reconstructLock = true; reconstructLock = true;
}; };
vscode-langservers-extracted = nodeEnv.buildNodePackage { vscode-langservers-extracted = nodeEnv.buildNodePackage {
@ -221,18 +221,18 @@ in
sha512 = "Un7gzQgvACjGtsT0Yll5QqHgL65a4mTK5ChgMnO4dgTZ3tuwJCaP84oztBqvuFZzN9QxA3C07J4QEQvf1xjcgQ=="; sha512 = "Un7gzQgvACjGtsT0Yll5QqHgL65a4mTK5ChgMnO4dgTZ3tuwJCaP84oztBqvuFZzN9QxA3C07J4QEQvf1xjcgQ==";
}; };
dependencies = [ dependencies = [
sources."core-js-3.22.5" sources."core-js-3.23.1"
sources."jsonc-parser-3.0.0" sources."jsonc-parser-3.0.0"
sources."regenerator-runtime-0.13.9" sources."regenerator-runtime-0.13.9"
sources."request-light-0.5.8" sources."request-light-0.5.8"
sources."typescript-4.6.4" sources."typescript-4.7.4"
sources."vscode-css-languageservice-5.4.2" sources."vscode-css-languageservice-5.4.2"
sources."vscode-html-languageservice-4.2.5" sources."vscode-html-languageservice-4.2.5"
sources."vscode-json-languageservice-4.2.1" sources."vscode-json-languageservice-4.2.1"
sources."vscode-jsonrpc-8.0.1" sources."vscode-jsonrpc-8.0.1"
sources."vscode-languageserver-8.0.1" sources."vscode-languageserver-8.0.1"
sources."vscode-languageserver-protocol-3.17.1" sources."vscode-languageserver-protocol-3.17.1"
sources."vscode-languageserver-textdocument-1.0.4" sources."vscode-languageserver-textdocument-1.0.5"
sources."vscode-languageserver-types-3.17.1" sources."vscode-languageserver-types-3.17.1"
sources."vscode-nls-5.0.1" sources."vscode-nls-5.0.1"
sources."vscode-uri-3.0.3" sources."vscode-uri-3.0.3"
@ -244,7 +244,7 @@ in
license = "MIT"; license = "MIT";
}; };
production = true; production = true;
bypassCache = true; bypassCache = false;
reconstructLock = true; reconstructLock = true;
}; };
} }

8
modules/themes/catppuccin/default.nix
View file

@ -2,12 +2,16 @@
let let
githubTheme = pkgs.myVimPlugins.githubNvimTheme; # github theme for neovim githubTheme = pkgs.myVimPlugins.githubNvimTheme; # github theme for neovim
foreign = pkgs.callPackage (import ./foreign.nix) { }; foreign = pkgs.callPackage (import ./foreign.nix) { };
v = (a: b: if variant == "light" then a else b); v = (a: b: if variant == "latte" then a else b);
in in
{ {
name = "catppuccin"; name = "catppuccin";
wallpaper = wallpaper.foreign or "${foreign.wallpapers}/${wallpaper}"; wallpaper = wallpaper.foreign or "${foreign.wallpapers}/${wallpaper}";
env = {
CATPPUCCIN_FLAVOUR = variant;
};
neovim = { neovim = {
theme = ./nvim.lua; theme = ./nvim.lua;
lualineTheme = "catppuccin"; lualineTheme = "catppuccin";
@ -57,7 +61,7 @@ in
y = 4; y = 4;
}; };
gtk_theme_variant = "dark"; gtk_theme_variant = v "light" "dark";
}; };
background_opacity = transparency; background_opacity = transparency;

5
modules/themes/catppuccin/nvim.lua
View file

@ -6,10 +6,11 @@ function M.setup()
local catppuccin = require("catppuccin") local catppuccin = require("catppuccin")
catppuccin.setup({ catppuccin.setup({
transparent_background = true, transparent_background = false,
integrations = {nvimtree = {transparent_panel = true}} integrations = {nvimtree = {transparent_panel = false}}
}) })
vim.g.catppuccin_flavour = os.getenv("CATPPUCCIN_FLAVOUR")
vim.cmd [[colorscheme catppuccin]] vim.cmd [[colorscheme catppuccin]]
end end

2
modules/themes/themes.nix
View file

@ -13,7 +13,7 @@ lib.lists.map (theme: pkgs.callPackage theme { }) [
wallpaper = "misc/rainbow.png"; wallpaper = "misc/rainbow.png";
# wallpaper.foreign = ./wallpapers/eye.png; # wallpaper.foreign = ./wallpapers/eye.png;
transparency = 0.93; transparency = 0.93;
variant = "light"; variant = "latte";
}) })
(githubVariant { (githubVariant {
variant = "light"; variant = "light";