prescientmoon/satellite
1
Fork 0
Code Activity

Remove upkgs, add new vim keybind and ff addon

Browse source
This commit is contained in:
Matei Adriel 2023-11-11 06:55:14 +01:00
parent ad3eaf120a
commit eca258cdfc
No known key found for this signature in database
20 changed files with 152 additions and 160 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
devshells/purescript.nix
View file

@ -1,6 +1,5 @@
# shell containing the tools i most commonly use for purescript work! # shell containing the tools i most commonly use for purescript work!
{ pkgs, upkgs, ... }: { pkgs, ... }:
pkgs.mkShell { pkgs.mkShell {
# reason: purescript 0.15.10 nativebuildinputs = with pkgs; [ purescript spago typescript nodejs ];
nativebuildinputs = with pkgs; [ upkgs.purescript spago typescript nodejs ];
} }

5
devshells/typst.nix
View file

@ -1,8 +1,7 @@
# Shell for using a pinned version of typst # Shell for using a pinned version of typst
{ pkgs, upkgs, ... }: { pkgs, ... }:
pkgs.mkShell { pkgs.mkShell {
nativeBuildInputs = [ nativeBuildInputs = [
# REASON: version 0.7.0 pkgs.typst
upkgs.typst
]; ];
} }

1
dotfiles/neovim/README.md
View file

@ -19,6 +19,7 @@ I feel like macro recording is a rare thing, so I moved it to `yq/yQ`. This free
| ----------- | ------------------------------------------------ | ------- | | ----------- | ------------------------------------------------ | ------- |
| \<leader>a | [A]lternate file | | | \<leader>a | [A]lternate file | |
| \<leader>rw | [R]eplace [w]ord under cursor in the entire file | | | \<leader>rw | [R]eplace [w]ord under cursor in the entire file | |
| \<leader>sw | toggle word [w]rap and visual-line keybinds | |
| Q | [Q]uit all buffers | | | Q | [Q]uit all buffers | |
| [d | Previous [d]iagnostic | | | [d | Previous [d]iagnostic | |
| d] | Next [d]iagnostic | | | d] | Next [d]iagnostic | |

2
dotfiles/neovim/ftplugin/markdown.lua
View file

@ -1 +1 @@
require("my.helpers.wrapMovement").setup() require("my.helpers.wrapMovement").enable()

140
dotfiles/neovim/ftplugin/tex.lua
View file

@ -1,7 +1,7 @@
local A = require("my.abbreviations") local A = require("my.abbreviations")
local scrap = require("scrap") local scrap = require("scrap")
require("my.helpers.wrapMovement").setup() require("my.helpers.wrapMovement").enable()
vim.opt.conceallevel = 0 vim.opt.conceallevel = 0
@ -33,82 +33,82 @@ vim.opt.conceallevel = 0
local abbreviations = { local abbreviations = {
-- Other fancy symvols -- Other fancy symvols
{ "tmat", "^T" }, -- Tranpose of a matrix { "tmat", "^T" }, -- Tranpose of a matrix
{ "cmat", "^*" }, -- Conjugate of a matrix { "cmat", "^*" }, -- Conjugate of a matrix
{ "sneg", "^C" }, -- Set complement { "sneg", "^C" }, -- Set complement
{ "ortco", "^\\bot" }, -- Orthogonal complement { "ortco", "^\\bot" }, -- Orthogonal complement
{ "sinter", "^\\circ" }, -- Interior of a set { "sinter", "^\\circ" }, -- Interior of a set
{ "nuls", "\\varnothing" }, { "nuls", "\\varnothing" },
-- Basic commands -- Basic commands
{ "mangle", "\\measuredangle" }, { "mangle", "\\measuredangle" },
{ "aangle", "\\angle" }, { "aangle", "\\angle" },
{ "sdiff", "\\setminus" }, { "sdiff", "\\setminus" },
{ "sst", "\\subset" }, { "sst", "\\subset" },
{ "spt", "\\supset" }, { "spt", "\\supset" },
{ "sseq", "\\subseteq" }, { "sseq", "\\subseteq" },
{ "speq", "\\supseteq" }, { "speq", "\\supseteq" },
{ "nin", "\\not\\in" }, { "nin", "\\not\\in" },
{ "iin", "\\in" }, { "iin", "\\in" },
{ "tto", "\\to" }, { "tto", "\\to" },
{ "land", "\\land" }, { "land", "\\land" },
{ "lor", "\\lor" }, { "lor", "\\lor" },
{ "ssin", "\\sin" }, { "ssin", "\\sin" },
{ "ccos", "\\cos" }, { "ccos", "\\cos" },
{ "ttan", "\\ttan" }, { "ttan", "\\ttan" },
{ "ssec", "\\sec" }, { "ssec", "\\sec" },
{ "lln", "\\ln" }, { "lln", "\\ln" },
{ "frl", "\\forall" }, { "frl", "\\forall" },
{ "exs", "\\exists" }, { "exs", "\\exists" },
{ "iinf", "\\infty" }, { "iinf", "\\infty" },
{ "ninf", "-\\infty" }, { "ninf", "-\\infty" },
{ "nlnl", "\\pm" }, -- had this as npnp first but it was hard-ish to type { "nlnl", "\\pm" }, -- had this as npnp first but it was hard-ish to type
{ "ccup", "\\cup" }, { "ccup", "\\cup" },
{ "ccap", "\\cap" }, { "ccap", "\\cap" },
{ "nope", "\\bot" }, { "nope", "\\bot" },
{ "yee", "\\top" }, { "yee", "\\top" },
{ "ccan", "\\cancel" }, { "ccan", "\\cancel" },
{ "com", "\\circ" }, { "com", "\\circ" },
{ "mul", "\\cdot" }, { "mul", "\\cdot" },
{ "smul", "\\times" }, { "smul", "\\times" },
{ "card", "\\#" }, { "card", "\\#" },
{ "div", "\\|" }, { "div", "\\|" },
{ "ndiv", "\\not\\|\\:" }, { "ndiv", "\\not\\|\\:" },
{ "perp", "\\perp" }, { "perp", "\\perp" },
{ "cdots", "\\cdots" }, -- center dots { "cdots", "\\cdots" }, -- center dots
{ "ldots", "\\ldots" }, -- low dots { "ldots", "\\ldots" }, -- low dots
{ "cldots", ",\\ldots," }, -- comma, low dots { "cldots", ",\\ldots," }, -- comma, low dots
-- Decorations -- Decorations
{ "hat", "\\hat" }, { "hat", "\\hat" },
{ "bar", "\\bar" }, { "bar", "\\bar" },
-- Custom commands -- Custom commands
{ "abs", "\\abs" }, -- custom abs command { "abs", "\\abs" }, -- custom abs command
{ "norm", "\\norm" }, -- custom norm command { "norm", "\\norm" }, -- custom norm command
{ "iprod", "\\iprod" }, -- custom inner product command { "iprod", "\\iprod" }, -- custom inner product command
{ "diprod", "\\dprod" }, -- custom self inner product command { "diprod", "\\dprod" }, -- custom self inner product command
{ "prob", "\\prob" }, -- custom probability function { "prob", "\\prob" }, -- custom probability function
{ "dist", "\\dist" }, -- custom dist function { "dist", "\\dist" }, -- custom dist function
{ "diam", "\\diam" }, -- custom diam operator { "diam", "\\diam" }, -- custom diam operator
{ "gen", "\\gen" }, -- custom command for group generated by element { "gen", "\\gen" }, -- custom command for group generated by element
{ "ord", "\\ordop" }, -- order of a group { "ord", "\\ordop" }, -- order of a group
{ "vsm", "\\vecspace" }, -- custom math vector space { "vsm", "\\vecspace" }, -- custom math vector space
} }
-- Todo: convert exponents and subscripts -- Todo: convert exponents and subscripts
-- to use this more concise notation. -- to use this more concise notation.
local abolishAbbreviations = { local abolishAbbreviations = {
-- {{{ General phrases -- {{{ General phrases
{ "thrf", "therefore" }, { "thrf", "therefore" },
{ "bcla", "by contradiction let's assume" }, { "bcla", "by contradiction let's assume" },
{ "wlg", "without loss of generality" }, { "wlg", "without loss of generality" },
{ "tits", "that is to say," }, { "tits", "that is to say," },
{ "wpbd", "we will prove the statement in both directions." }, { "wpbd", "we will prove the statement in both directions." },
{ "stam{,s}", "statement{}" }, { "stam{,s}", "statement{}" },
{ "{ww,tt}{m,i}", "{which,this} {means,implies}" }, { "{ww,tt}{m,i}", "{which,this} {means,implies}" },
{ "cex{,s}", "counterexample{}" }, { "cex{,s}", "counterexample{}" },
{ "er{t,s,r}", "{transitivity,symmetry,reflexivity}" }, { "er{t,s,r}", "{transitivity,symmetry,reflexivity}" },
-- }}} -- }}}
-- {{{ Exponents and subscripts: -- {{{ Exponents and subscripts:
-- {operation}{argument} -- {operation}{argument}
@ -183,20 +183,20 @@ local abolishAbbreviations = {
}, },
-- }}} -- }}}
-- {{{ Calculus & analysis -- {{{ Calculus & analysis
{ "ib{p,s}", "integration by {parts,substitution}" }, { "ib{p,s}", "integration by {parts,substitution}" },
{ "nb{,h}{,s}", "neighbour{,hood}{}" }, { "nb{,h}{,s}", "neighbour{,hood}{}" },
-- }}} -- }}}
-- {{{ Linear algebra -- {{{ Linear algebra
{ "rref", "reduced row echalon form" }, { "rref", "reduced row echalon form" },
{ "eg{va,ve,p}{,s}", "eigen{value,vector,pair}{}" }, { "eg{va,ve,p}{,s}", "eigen{value,vector,pair}{}" },
{ "mx{,s}", "matri{x,ces}" }, { "mx{,s}", "matri{x,ces}" },
{ "dete{,s}", "determinant{}" }, { "dete{,s}", "determinant{}" },
{ "ort{n,g}", "orto{normal,gonal}" }, { "ort{n,g}", "orto{normal,gonal}" },
{ "l{in,de}", "linearly {independent,dependent}" }, { "l{in,de}", "linearly {independent,dependent}" },
{ "lcon{,s}", "linear combination{}" }, { "lcon{,s}", "linear combination{}" },
{ "vst{,s}", "vector space{}" }, -- text vector space { "vst{,s}", "vector space{}" }, -- text vector space
{ {
"rizz", -- ok please ignore this one 💀 "rizz", -- ok please ignore this one 💀
"Riesz vector", "Riesz vector",
options = A.no_capitalization, options = A.no_capitalization,
}, },
@ -209,7 +209,7 @@ local abolishAbbreviations = {
}, },
-- }}} -- }}}
-- {{{ Graph theory -- {{{ Graph theory
{ "vx{,s}", "vert{ex,ices}" }, { "vx{,s}", "vert{ex,ices}" },
{ "edg{,s}", "edge{}" }, { "edg{,s}", "edge{}" },
-- Graph theory function syntax: -- Graph theory function syntax:

2
dotfiles/neovim/ftplugin/typst.lua
View file

@ -1 +1 @@
require("my.helpers.wrapMovement").setup() require("my.helpers.wrapMovement").enable()

24
dotfiles/neovim/lua/my/helpers/wrapMovement.lua
View file

@ -5,7 +5,12 @@ local function swap(key)
vim.keymap.set({ "n", "v" }, "g" .. key, key, { buffer = true }) vim.keymap.set({ "n", "v" }, "g" .. key, key, { buffer = true })
end end
function M.setup() local function unswap(key)
vim.keymap.del({ "n", "v" }, key)
vim.keymap.del({ "n", "v" }, "g" .. key)
end
function M.enable()
vim.opt.wrap = true vim.opt.wrap = true
swap("j") swap("j")
@ -14,4 +19,21 @@ function M.setup()
swap("$") swap("$")
end end
function M.disable()
vim.opt.wrap = false
unswap("j")
unswap("k")
unswap("0")
unswap("$")
end
function M.toggle()
if vim.opt.wrap == true then
M.disable()
else
M.enable()
end
end
return M return M

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

@ -65,6 +65,13 @@ function M.setup()
-- {{{ Replace word in file -- {{{ Replace word in file
M.nmap("<leader>rw", ":%s/<C-r><C-w>/", "[R]eplace [w]ord in file") M.nmap("<leader>rw", ":%s/<C-r><C-w>/", "[R]eplace [w]ord in file")
-- }}} -- }}}
-- {{{ Toggle settings
M.nmap(
"<leader>sw",
require("my.helpers.wrapMovement").toggle,
"toggle word [w]rap"
)
-- }}}
-- {{{ Text objects -- {{{ Text objects
M.delimitedTextobject("q", '"', "[q]uotes") M.delimitedTextobject("q", '"', "[q]uotes")
M.delimitedTextobject("a", "'", "[a]postrophes") M.delimitedTextobject("a", "'", "[a]postrophes")
@ -104,7 +111,6 @@ function M.setup()
end, end,
}) })
-- }}} -- }}}
-- -- {{{ Winblend -- -- {{{ Winblend
vim.api.nvim_create_autocmd("FileType", { vim.api.nvim_create_autocmd("FileType", {
pattern = { "*" }, pattern = { "*" },
@ -114,8 +120,6 @@ function M.setup()
end, end,
}) })
-- -- }}} -- -- }}}
return M
end end
return M return M

2
dotfiles/neovim/lua/my/plugins/gitsigns.lua
View file

@ -52,7 +52,7 @@ local M = {
local prefix = "<leader>h" local prefix = "<leader>h"
wk.register({ wk.register({
[prefix] = { name = "gitsigns" }, ["<leader>"] = { h = { name = "gitsigns" } },
}) })
-- {{{ Normal mode -- {{{ Normal mode

2
dotfiles/neovim/lua/my/plugins/neogit.lua
View file

@ -9,7 +9,7 @@ local M = {
vim.keymap.set("n", "<C-g>", "<cmd>Neogit<cr>", { desc = "Open neo[g]it" }) vim.keymap.set("n", "<C-g>", "<cmd>Neogit<cr>", { desc = "Open neo[g]it" })
end, end,
config = function() config = function()
require("neogit").setup() require("neogit").setup({})
-- {{{ Disable folds inside neogit -- {{{ Disable folds inside neogit
vim.api.nvim_create_autocmd("FileType", { vim.api.nvim_create_autocmd("FileType", {

1
dotfiles/neovim/lua/my/plugins/whichkey.lua
View file

@ -23,6 +23,7 @@ function M.config()
l = { name = "[L]ocal" }, l = { name = "[L]ocal" },
w = { name = "[W]orkspace" }, w = { name = "[W]orkspace" },
y = { name = "[Y]ank" }, y = { name = "[Y]ank" },
s = { name = "[S]ettings" },
}, },
}) })
end end

49
flake.lock
View file

@ -369,7 +369,7 @@
"disko": { "disko": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs-unstable" "nixpkgs"
] ]
}, },
"locked": { "locked": {
@ -427,11 +427,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1694585600, "lastModified": 1699474771,
"narHash": "sha256-X+3lxErOk5DNuyJZM7dNAaIpxadv8wMjj6pYxwpjPkc=", "narHash": "sha256-447mf95EXA3anSyLlVXCt49pyFhxcDgoNcdQi1xqFCU=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "1d028825099440cd83f934967dd20cf1f0a453f5", "rev": "157a2f215a4e7e04a49ef672070da835e4a98107",
"revCount": 3084, "revCount": 3206,
"type": "git", "type": "git",
"url": "https://gitlab.com/rycee/nur-expressions?dir=pkgs/firefox-addons" "url": "https://gitlab.com/rycee/nur-expressions?dir=pkgs/firefox-addons"
}, },
@ -1260,11 +1260,11 @@
"nixpkgs": "nixpkgs_8" "nixpkgs": "nixpkgs_8"
}, },
"locked": { "locked": {
"lastModified": 1692099905, "lastModified": 1695108154,
"narHash": "sha256-/pSusGhmIdSdAaywQRFA5dVbfdIzlWQTecM+E46+cJ0=", "narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2a6679aa9cc3872c29ba2a57fe1b71b3e3c5649f", "rev": "07682fff75d41f18327a871088d20af2710d4744",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1298,7 +1298,7 @@
"inputs": { "inputs": {
"hyprland-protocols": "hyprland-protocols", "hyprland-protocols": "hyprland-protocols",
"nixpkgs": [ "nixpkgs": [
"nixpkgs-unstable" "nixpkgs"
], ],
"systems": "systems", "systems": "systems",
"wlroots": "wlroots", "wlroots": "wlroots",
@ -1321,7 +1321,7 @@
"hyprland-contrib": { "hyprland-contrib": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs-unstable" "nixpkgs"
] ]
}, },
"locked": { "locked": {
@ -1680,7 +1680,7 @@
"nixinate": { "nixinate": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs-unstable" "nixpkgs"
] ]
}, },
"locked": { "locked": {
@ -1878,29 +1878,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": {
"locked": {
"lastModified": 1695145219,
"narHash": "sha256-Eoe9IHbvmo5wEDeJXKFOpKUwxYJIOxKUesounVccNYk=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "5ba549eafcf3e33405e5f66decd1a72356632b96",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-wayland": { "nixpkgs-wayland": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_4", "flake-compat": "flake-compat_4",
"lib-aggregate": "lib-aggregate", "lib-aggregate": "lib-aggregate",
"nix-eval-jobs": "nix-eval-jobs", "nix-eval-jobs": "nix-eval-jobs",
"nixpkgs": [ "nixpkgs": [
"nixpkgs-unstable" "nixpkgs"
] ]
}, },
"locked": { "locked": {
@ -2127,11 +2111,11 @@
}, },
"nixpkgs_9": { "nixpkgs_9": {
"locked": { "locked": {
"lastModified": 1692525914, "lastModified": 1699291058,
"narHash": "sha256-MUgZ9/9mE/EbEQA6JPdcQHkjoR5fgvaKhpy6UO67uEc=", "narHash": "sha256-5ggduoaAMPHUy4riL+OrlAZE14Kh7JWX4oLEs22ZqfU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "475d5ae2c4cb87b904545bdb547af05681198fcc", "rev": "41de143fda10e33be0f47eab2bfe08a50f234267",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2365,7 +2349,6 @@
"nixinate": "nixinate", "nixinate": "nixinate",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_6", "nixpkgs": "nixpkgs_6",
"nixpkgs-unstable": "nixpkgs-unstable",
"nixpkgs-wayland": "nixpkgs-wayland", "nixpkgs-wayland": "nixpkgs-wayland",
"nur": "nur", "nur": "nur",
"rosepine-base16": "rosepine-base16", "rosepine-base16": "rosepine-base16",
@ -2606,7 +2589,7 @@
"inputs": { "inputs": {
"flake-utils": "flake-utils_7", "flake-utils": "flake-utils_7",
"nixpkgs": [ "nixpkgs": [
"nixpkgs-unstable" "nixpkgs"
] ]
}, },
"locked": { "locked": {

20
flake.nix
View file

@ -6,9 +6,6 @@
# Nixpkgs # Nixpkgs
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
# Nixpkgs-unstable
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
# Home manager # Home manager
home-manager.url = "github:nix-community/home-manager"; home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
@ -58,15 +55,15 @@
# Hyprland (available in nix unstable only atm) # Hyprland (available in nix unstable only atm)
hyprland.url = "github:hyprwm/Hyprland"; hyprland.url = "github:hyprwm/Hyprland";
hyprland.inputs.nixpkgs.follows = "nixpkgs-unstable"; hyprland.inputs.nixpkgs.follows = "nixpkgs";
# Hyprland (available in nix unstable only atm) # Hyprland (available in nix unstable only atm)
hyprland-contrib.url = "github:hyprwm/contrib"; hyprland-contrib.url = "github:hyprwm/contrib";
hyprland-contrib.inputs.nixpkgs.follows = "nixpkgs-unstable"; hyprland-contrib.inputs.nixpkgs.follows = "nixpkgs";
# Contains a bunch of wayland stuff not on nixpkgs # Contains a bunch of wayland stuff not on nixpkgs
nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland"; nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland";
nixpkgs-wayland.inputs.nixpkgs.follows = "nixpkgs-unstable"; nixpkgs-wayland.inputs.nixpkgs.follows = "nixpkgs";
# Nix language server # Nix language server
# [the docs](https://github.com/nix-community/nixd/blob/main/docs/user-guide.md#installation) # [the docs](https://github.com/nix-community/nixd/blob/main/docs/user-guide.md#installation)
@ -75,11 +72,11 @@
# Spotify client # Spotify client
spicetify-nix.url = "github:the-argus/spicetify-nix"; spicetify-nix.url = "github:the-argus/spicetify-nix";
spicetify-nix.inputs.nixpkgs.follows = "nixpkgs-unstable"; spicetify-nix.inputs.nixpkgs.follows = "nixpkgs";
# Disko # Disko
disko.url = "github:nix-community/disko"; disko.url = "github:nix-community/disko";
disko.inputs.nixpkgs.follows = "nixpkgs-unstable"; disko.inputs.nixpkgs.follows = "nixpkgs";
# Deploy-rs # Deploy-rs
deploy-rs.url = "github:serokell/deploy-rs"; deploy-rs.url = "github:serokell/deploy-rs";
@ -87,7 +84,7 @@
# Nixinate # Nixinate
nixinate.url = "github:matthewcroughan/nixinate"; nixinate.url = "github:matthewcroughan/nixinate";
nixinate.inputs.nixpkgs.follows = "nixpkgs-unstable"; nixinate.inputs.nixpkgs.follows = "nixpkgs";
# Anyrun # Anyrun
anyrun.url = "github:Kirottu/anyrun"; anyrun.url = "github:Kirottu/anyrun";
@ -104,7 +101,8 @@
# {{{ Self management # {{{ Self management
# Smos # Smos
smos.url = "github:NorfairKing/smos"; smos.url = "github:NorfairKing/smos";
# smos.inputs.nixpkgs.follows = "nixpkgs-unstable"; # REASON: smos fails to build this way
# smos.inputs.nixpkgs.follows = "nixpkgs";
# smos.inputs.home-manager.follows = "home-manager"; # smos.inputs.home-manager.follows = "home-manager";
# Intray # Intray
@ -133,8 +131,6 @@
specialArgs = system: { specialArgs = system: {
inherit inputs outputs; inherit inputs outputs;
# This is used so often it makes sense to have it as it's own thing
upkgs = inputs.nixpkgs-unstable.legacyPackages.${system};
}; };
# }}} # }}}
in in

2
home/features/desktop/alacritty.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, lib, ... }: { config, lib, ... }:
{ {
stylix.targets.alacritty.enable = true; stylix.targets.alacritty.enable = true;

1
home/features/desktop/firefox/default.nix
View file

@ -10,6 +10,7 @@ let
don-t-fuck-with-paste # disallows certain websites from disabling pasting don-t-fuck-with-paste # disallows certain websites from disabling pasting
decentraleyes # Serves local copies of a bunch of things instead of reaching a CDN decentraleyes # Serves local copies of a bunch of things instead of reaching a CDN
gesturefy # mouse gestures gesturefy # mouse gestures
indie-wiki-buddy # redirects fandom wiki urls to the proper wikis
i-dont-care-about-cookies i-dont-care-about-cookies
localcdn # caches libraries locally localcdn # caches libraries locally
privacy-badger # blocks some trackers privacy-badger # blocks some trackers

5
home/features/desktop/wezterm/default.nix
View file

@ -1,6 +1,5 @@
{ upkgs, config, ... }: { { pkgs, config, ... }: {
# REASON: newer version home.packages = [ pkgs.wezterm ];
home.packages = [ upkgs.wezterm ];
# Create link to config # Create link to config
xdg.configFile."wezterm/colorscheme.lua".text = config.satellite.colorscheme.lua; xdg.configFile."wezterm/colorscheme.lua".text = config.satellite.colorscheme.lua;

9
home/features/neovim/default.nix
View file

@ -1,13 +1,12 @@
# TODO(imperanence): handle persistence of things like harpoon, lazy, etc # TODO(imperanence): handle persistence of things like harpoon, lazy, etc
{ pkgs, upkgs, lib, config, inputs, ... }: { pkgs, lib, config, inputs, ... }:
let let
# {{{ extraPackages # {{{ extraPackages
extraPackages = with pkgs; [ extraPackages = with pkgs; [
# Language servers # Language servers
nodePackages.typescript-language-server # typescript nodePackages.typescript-language-server # typescript
nodePackages_latest.purescript-language-server # purescript nodePackages_latest.purescript-language-server # purescript
# REASON: not in stable lua-language-server # lua
upkgs.lua-language-server # lua
rnix-lsp # nix rnix-lsp # nix
nil # nix nil # nix
inputs.nixd.packages.${system}.nixd # nix inputs.nixd.packages.${system}.nixd # nix
@ -20,7 +19,7 @@ let
python310Packages.python-lsp-server # python python310Packages.python-lsp-server # python
pyright # python pyright # python
rust-analyzer # rust rust-analyzer # rust
upkgs.typst-lsp # typst typst-lsp # typst
# Formatters # Formatters
luaformatter # Lua luaformatter # Lua
@ -32,7 +31,7 @@ let
nodePackages_latest.purs-tidy # Purescript nodePackages_latest.purs-tidy # Purescript
nodePackages_latest.prettier # Js & friends nodePackages_latest.prettier # Js & friends
nodePackages_latest.prettier_d_slim # Js & friends nodePackages_latest.prettier_d_slim # Js & friends
upkgs.typst-fmt # Typst typst-fmt # Typst
# Linters # Linters
ruff # Python linter ruff # Python linter

2
home/features/wayland/anyrun.nix
View file

@ -25,7 +25,7 @@
maxEntries = 7; maxEntries = 7;
}; };
extraCss = '' extraCss = /* css */ ''
/* {{{ Global overrides */ /* {{{ Global overrides */
#window, #window,
#entry, #entry,

28
home/features/wayland/default.nix
View file

@ -1,5 +1,5 @@
# Common wayland stuff # Common wayland stuff
{ lib, pkgs, upkgs, ... }: { { lib, pkgs, ... }: {
imports = [ imports = [
./dunst.nix ./dunst.nix
./wlsunset.nix ./wlsunset.nix
@ -10,28 +10,16 @@
../desktop/eww ../desktop/eww
]; ];
# Makes some stuff run on wayland (?)
# Taken from [here](https://github.com/fufexan/dotfiles/blob/3b0075fa7a5d38de13c8c32140c4b020b6b32761/home/wayland/default.nix#L14)
# TODO: ask author what those do
# home.sessionVariables = {
# QT_QPA_PLATFORM = "wayland";
# SDL_VIDEODRIVER = "wayland";
# XDG_SESSION_TYPE = "wayland";
# };
# TODO: set up # TODO: set up
# - wallpaper
# - notification daemon
# - screen recording
# - volume/backlight controls # - volume/backlight controls
# - eww bar # - eww bar
# - configure hyprland colors using base16 stuff # - configure hyprland colors using base16 stuff
# - look into swaylock or whatever people use # - look into swaylock or whatever people use
# - look into greetd or something
# - multiple keyboard layouts # - multiple keyboard layouts
home.packages = home.packages =
let let
# {{{ OCR
_ = lib.getExe; _ = lib.getExe;
wl-copy = "${pkgs.wl-clipboard}/bin/wl-copy"; wl-copy = "${pkgs.wl-clipboard}/bin/wl-copy";
@ -45,20 +33,20 @@
| ${wl-copy} | ${wl-copy}
${_ pkgs.libnotify} "Run ocr on area with output \"$(${wl-paste})\"" ${_ pkgs.libnotify} "Run ocr on area with output \"$(${wl-paste})\""
''; '';
# }}}
in in
with pkgs; [ with pkgs; [
# Utils # {{{ Utils
libnotify # Send notifications libnotify # Send notifications
wl-ocr # Custom ocr script wl-ocr # Custom ocr script
wl-clipboard # Clipboard manager wl-clipboard # Clipboard manager
wlogout # Nice logout script wlogout # Nice logout script
wlsunset # Day/night gamma display adjustments wlsunset # Day/night gamma display adjustments
hyprpicker # Color picker
# REASON: not available on stable yet # }}}
upkgs.hyprpicker # Color picker # {{{ Screenshot related tools
# Screenshot related tools
grim # Take screenshot grim # Take screenshot
slurp # Area selector slurp # Area selector
# }}}
]; ];
} }

2
modules/home-manager/firefox/default.nix
View file

@ -1,5 +1,5 @@
# Allows installing web apps as desktop apps # Allows installing web apps as desktop apps
{ lib, pkgs, config, ... }: { lib, config, ... }:
let cfg = config.programs.firefox.apps; let cfg = config.programs.firefox.apps;
in in
{ {