diff --git a/dotfiles/neovim/lazy-lock.json b/dotfiles/neovim/lazy-lock.json index 76022e8..e08c9c9 100644 --- a/dotfiles/neovim/lazy-lock.json +++ b/dotfiles/neovim/lazy-lock.json @@ -3,7 +3,7 @@ "abbreinder.nvim": { "branch": "main", "commit": "5b2b5ff08a9ada42238d733aeebc6d3d96314d77" }, "abbremand.nvim": { "branch": "main", "commit": "d633341f632b0b2666dfc6dfe6b9842ba1610a1d" }, "catppuccin": { "branch": "main", "commit": "6eb93f7240476ac51cec909fe0016e9a269c2a92" }, - "clipboard-image.nvim": { "branch": "main", "commit": "d1550dc26729b7954f95269952e90471b838fa25" }, + "clipboard-image.nvim": { "branch": "main", "commit": "3d10d535cb3bf300fb8e74d886840edb81a63bd4" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "af88e700417c6449719fc77f6f3745f88e42d5da" }, "cmp-emoji": { "branch": "main", "commit": "19075c36d5820253d32e2478b6aaf3734aeaafa0" }, @@ -16,6 +16,7 @@ "dressing.nvim": { "branch": "master", "commit": "0e3e1eba147fee6e638ac1ac28f0495bcde17319" }, "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" }, "firenvim": { "branch": "master", "commit": "ee4ef314bd990b2b05b7fbd95b857159e444a2fe" }, + "github-actions-yaml.vim": { "branch": "master", "commit": "f2f16243447cea174daa6b4a9ffd3ff9213814ef" }, "gitlinker.nvim": { "branch": "master", "commit": "cc59f732f3d043b626c8702cb725c82e54d35c25" }, "glow.nvim": { "branch": "main", "commit": "a3f24fdaa71d2c25a2b88026032b34f5b6a6e215" }, "harpoon": { "branch": "master", "commit": "f7040fd0c44e7a4010369136547de5604b9c22a1" }, @@ -28,6 +29,7 @@ "knap": { "branch": "main", "commit": "8c083d333b8a82421a521539eb1c450b06c90eb6" }, "kotlin-vim": { "branch": "master", "commit": "53fe045906df8eeb07cb77b078fc93acda6c90b8" }, "lazy.nvim": { "branch": "main", "commit": "5c89dc52f42e5058a46b0912d7d9042f564e44e0" }, + "lean.nvim": { "branch": "main", "commit": "157ca8a08ad13845cf67b440a595b55b25b9a459" }, "leap": { "branch": "main", "commit": "0eb3611593e135150e2f7880ec67568ccb51c17a" }, "live-command.nvim": { "branch": "main", "commit": "ce4b104ce702c7bb9fdff863059af6d47107ca61" }, "lspkind.nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" }, diff --git a/dotfiles/neovim/lua/my/lazy.lua b/dotfiles/neovim/lua/my/lazy.lua index 414dc14..adb6e48 100644 --- a/dotfiles/neovim/lua/my/lazy.lua +++ b/dotfiles/neovim/lua/my/lazy.lua @@ -1,3 +1,4 @@ +-- TODO(imperanence): handle persistence local M = {} function M.setup() diff --git a/dotfiles/neovim/lua/my/plugins/clipboard-image.lua b/dotfiles/neovim/lua/my/plugins/clipboard-image.lua index b09fb82..ef2aca5 100644 --- a/dotfiles/neovim/lua/my/plugins/clipboard-image.lua +++ b/dotfiles/neovim/lua/my/plugins/clipboard-image.lua @@ -1,6 +1,5 @@ local M = { - -- paste images from clipbaord - "ekickx/clipboard-image.nvim", + "postfen/clipboard-image.nvim", cmd = "PasteImg", } diff --git a/dotfiles/neovim/lua/my/plugins/init.lua b/dotfiles/neovim/lua/my/plugins/init.lua index 5c6db22..565bc2d 100644 --- a/dotfiles/neovim/lua/my/plugins/init.lua +++ b/dotfiles/neovim/lua/my/plugins/init.lua @@ -47,6 +47,12 @@ return { ft = "dhall", cond = env.vscode.not_active(), }, + + { + "yasuhiroki/github-actions-yaml.vim", + ft = { "yml", "yaml" }, + cond = env.vscode.not_active(), + }, --}}} { diff --git a/dotfiles/neovim/lua/my/plugins/jupytext.lua b/dotfiles/neovim/lua/my/plugins/jupytext.lua index eba887a..f1637b2 100644 --- a/dotfiles/neovim/lua/my/plugins/jupytext.lua +++ b/dotfiles/neovim/lua/my/plugins/jupytext.lua @@ -2,7 +2,7 @@ local env = require("my.helpers.env") local M = { "goerz/jupytext.vim", - lazy = false, -- Otherwise I can't get this to work with nvim *.ipynb + ft = "ipynb", cond = env.vscode.not_active(), } diff --git a/dotfiles/neovim/lua/my/plugins/lean.lua b/dotfiles/neovim/lua/my/plugins/lean.lua index cc2a850..291d05c 100644 --- a/dotfiles/neovim/lua/my/plugins/lean.lua +++ b/dotfiles/neovim/lua/my/plugins/lean.lua @@ -3,7 +3,11 @@ local lspconfig = require("my.plugins.lspconfig") local M = { "Julian/lean.nvim", -- lean support - dependencies = { "neovim/nvim-lspconfig", "nvim-lua/plenary.nvim", "hrsh7th/nvim-cmp" }, + dependencies = { + "neovim/nvim-lspconfig", + "nvim-lua/plenary.nvim", + "hrsh7th/nvim-cmp", + }, ft = "lean", config = function() require("lean").setup({ @@ -19,4 +23,4 @@ local M = { cond = env.vscode.not_active(), } -return {} +return M diff --git a/dotfiles/neovim/lua/my/plugins/lspconfig.lua b/dotfiles/neovim/lua/my/plugins/lspconfig.lua index 4c8a177..45ca17a 100644 --- a/dotfiles/neovim/lua/my/plugins/lspconfig.lua +++ b/dotfiles/neovim/lua/my/plugins/lspconfig.lua @@ -159,6 +159,10 @@ local servers = { forwardSearchAfter = true, onSave = true, }, + chktex = { + onOpenAndSave = true, + onEdit = true, + }, }, }, }, diff --git a/dotfiles/vscode-snippets/snippets/latex/core.json b/dotfiles/vscode-snippets/snippets/latex/core.json index 64bf170..94353da 100644 --- a/dotfiles/vscode-snippets/snippets/latex/core.json +++ b/dotfiles/vscode-snippets/snippets/latex/core.json @@ -2,7 +2,11 @@ "Begin": { "prefix": "begin", "description": "Begin anything", - "body": ["\\begin{$1}", "\t$0", "\\end{$1}"] + "body": [ + "\\begin{$1}", + "\t$0", + "\\end{$1}" + ] }, "Set": { "prefix": "set", @@ -27,33 +31,53 @@ "Lemma": { "prefix": "lemma", "description": "Create a lemma", - "body": ["\\begin{lemma}[$1] \\label{lem:$1}", "\t$0", "\\end{lemma}"] + "body": [ + "\\begin{lemma}[$1]\\label{lem:$1}", + "\t$0", + "\\end{lemma}" + ] }, "Example*": { "prefix": "example*", "description": "Create an example*", - "body": ["\\begin{example*}", "\t$0", "\\end{example*}"] + "body": [ + "\\begin{example*}", + "\t$0", + "\\end{example*}" + ] }, "Example": { "prefix": "example", "description": "Create an example", - "body": ["\\begin{example}[$1] \\label{exp:$1}", "\t$0", "\\end{example}"] + "body": [ + "\\begin{example}[$1]\\label{exp:$1}", + "\t$0", + "\\end{example}" + ] }, "Theorem": { "prefix": "theorem", "description": "Create a theorem", - "body": ["\\begin{theorem}[$1] \\label{thm:$1}", "\t$0", "\\end{theorem}"] + "body": [ + "\\begin{theorem}[$1]\\label{thm:$1}", + "\t$0", + "\\end{theorem}" + ] }, "Exercise": { "prefix": "exercise", "description": "Create a exercise", - "body": ["\\begin{exercise}[$1] \\label{exe:$1}", "\t$0", "\\end{exercise}"] + "body": [ + "\\begin{exercise}[$1]\\label{exe:$1}", + "\t$0", + "\\end{exercise}" + ] }, "Definition": { "prefix": "definition", "description": "Create a definition", "body": [ - "\\begin{definition}[$1] \\label{def:$1}", + "\\begin{definition}[$1]\\label{def:$1}", "\t$0", "\\end{definition}" ] @@ -61,7 +85,11 @@ "Display math": { "prefix": "dm", "description": "Display math section", - "body": ["\\[", "$0", "\\]"] + "body": [ + "\\[", + "$0", + "\\]" + ] }, "Subscript": { "prefix": "ss", @@ -91,36 +119,60 @@ "Section": { "prefix": "section", "description": "Add section", - "body": ["\\section{$1}", "$0"] + "body": [ + "\\section{$1}", + "$0" + ] }, "Subsection": { "prefix": "subsection", "description": "Add subsection", - "body": ["\\subsection{$1}", "$0"] + "body": [ + "\\subsection{$1}", + "$0" + ] }, "Subsubsection": { "prefix": "subsubsection", "description": "Add subsubsection", - "body": ["\\subsubsection{$1}", "$0"] + "body": [ + "\\subsubsection{$1}", + "$0" + ] }, "Chapter": { "prefix": "chapter", "description": "Add chapter", - "body": ["\\chapter{$1}", "$0"] + "body": [ + "\\chapter{$1}", + "$0" + ] }, "Proof": { "prefix": "proof", "description": "Create proof", - "body": ["\\begin{proof}", "\t$0", "\\end{proof}"] + "body": [ + "\\begin{proof}", + "\t$0", + "\\end{proof}" + ] }, "Itemize": { "prefix": "item", - "body": ["\\\\begin{itemize}", "\t\\item $0", "\\\\end{itemize}"], + "body": [ + "\\\\begin{itemize}", + "\t\\item $0", + "\\\\end{itemize}" + ], "description": "Itemize env" }, "Enumerate": { "prefix": "enum", - "body": ["\\\\begin{enumerate}", "\t\\item $0", "\\\\end{enumerate}"], + "body": [ + "\\\\begin{enumerate}", + "\t\\item $0", + "\\\\end{enumerate}" + ], "description": "Enumerate env" }, "Reference definition": { @@ -201,7 +253,11 @@ "Aligned": { "prefix": "aligned", "description": "Create an aligned environment", - "body": ["\\begin{aligned}", "\t$0", "\\end{aligned}"] + "body": [ + "\\begin{aligned}", + "\t$0", + "\\end{aligned}" + ] }, "Let": { "prefix": "let", @@ -216,7 +272,11 @@ "Aligned display math": { "prefix": "maligned", "description": "Create an aligned display math environment", - "body": ["\\begin{align*}", "\t$0", "\\end{align*}"] + "body": [ + "\\begin{align*}", + "\t$0", + "\\end{align*}" + ] }, "System of equations": { "prefix": "eqsystem", @@ -232,7 +292,10 @@ "Aligned equation": { "prefix": "aleq", "description": "Aligned equation", - "body": ["\\\\\\ $1 &= $2", "$0"] + "body": [ + "\\\\\\ $1 &= $2", + "$0" + ] }, "2x2 matrices": { "prefix": "mat22", @@ -296,5 +359,10 @@ "\\end{enumerate}", "$0" ] + }, + "quote": { + "prefix": "quote", + "description": "Quote a bunch of text", + "body": "``$1''$0" } } diff --git a/home/adrielus/features/desktop/common/discord.nix b/home/adrielus/features/desktop/common/discord.nix index a116780..ebf1935 100644 --- a/home/adrielus/features/desktop/common/discord.nix +++ b/home/adrielus/features/desktop/common/discord.nix @@ -1,3 +1,4 @@ +# TODO(imperanence): handle persistence { programs.discord = { enable = true; diff --git a/home/adrielus/features/desktop/common/firefox.nix b/home/adrielus/features/desktop/common/firefox.nix index 81c904c..078d359 100644 --- a/home/adrielus/features/desktop/common/firefox.nix +++ b/home/adrielus/features/desktop/common/firefox.nix @@ -1,3 +1,4 @@ +# TODO(imperanence): handle persistence { pkgs, inputs, ... }: let mkBasicSearchEngine = { aliases, url, param }: { diff --git a/home/adrielus/features/desktop/common/games/default.nix b/home/adrielus/features/desktop/common/games/default.nix new file mode 100644 index 0000000..55e843d --- /dev/null +++ b/home/adrielus/features/desktop/common/games/default.nix @@ -0,0 +1,3 @@ +{ + imports = [./wine.nix ./lutris.nix]; + } diff --git a/home/adrielus/features/desktop/common/games/lutris.nix b/home/adrielus/features/desktop/common/games/lutris.nix new file mode 100644 index 0000000..5a8ee8f --- /dev/null +++ b/home/adrielus/features/desktop/common/games/lutris.nix @@ -0,0 +1,12 @@ +{ pkgs, config, ... }: { + home.packages = [ + pkgs.lutris + ]; + + # home.persistence."/persist".directories = [ + # "${config.xdg.configHome}/lutris" # General config data + # "${config.xdg.cacheHome}/banners" # Game banners + # "${config.xdg.cacheHome}/coverart" # Game cover art + # "${config.home.homeDirectory}/Games" # Game directory + # ]; +} diff --git a/home/adrielus/features/desktop/common/games/wine.nix b/home/adrielus/features/desktop/common/games/wine.nix new file mode 100644 index 0000000..f47a7af --- /dev/null +++ b/home/adrielus/features/desktop/common/games/wine.nix @@ -0,0 +1,6 @@ +# TODO(imperanence): handle persistence +{ pkgs, ... }: { + home.packages = [ + pkgs.wine + ]; +} diff --git a/home/adrielus/features/desktop/common/qbittorrent.nix b/home/adrielus/features/desktop/common/qbittorrent.nix new file mode 100644 index 0000000..a8d0fa7 --- /dev/null +++ b/home/adrielus/features/desktop/common/qbittorrent.nix @@ -0,0 +1,11 @@ +{ pkgs, config, ... }: { + home.packages = [ + pkgs.qbittorrent + ]; + + # home.persistence."/persist".directories = [ + # "${config.xdg.configHome}/qBittorrent" # Config options + # # TODO: investigate which subdirectories/files I actually want to keep + # "${config.xdg.dataHome}/qBittorrent" # Torrent files, logs, etc + # ]; +} diff --git a/home/adrielus/features/neovim/default.nix b/home/adrielus/features/neovim/default.nix index 75ed651..dfb4a99 100644 --- a/home/adrielus/features/neovim/default.nix +++ b/home/adrielus/features/neovim/default.nix @@ -1,3 +1,4 @@ +# TODO(imperanence): handle persistence of things like harpoon, lazy, etc { pkgs, upkgs, lib, config, paths, inputs, ... }: let # {{{ extraPackages @@ -57,6 +58,8 @@ let texlive.combined.scheme-full # Latex stuff python38Packages.pygments # required for latex syntax highlighting + sage + sagetex # sage in latex # required for the telescope fzf extension gnumake diff --git a/home/adrielus/tethys.nix b/home/adrielus/tethys.nix index 5964229..6abacc6 100644 --- a/home/adrielus/tethys.nix +++ b/home/adrielus/tethys.nix @@ -3,8 +3,10 @@ ./global ./features/desktop/xmonad.nix ./features/desktop/common/discord.nix + ./features/desktop/common/qbittorrent.nix ./features/desktop/common/zathura.nix ./features/desktop/common/firefox.nix + ./features/desktop/common/games ]; # Arbitrary extra packages diff --git a/hosts/nixos/common/optional/sddm.nix b/hosts/nixos/common/optional/sddm.nix deleted file mode 100644 index 37473ed..0000000 --- a/hosts/nixos/common/optional/sddm.nix +++ /dev/null @@ -1,8 +0,0 @@ -# Not using this for now, because I cannot get any theme to fucking work with it for some reason :( -{ - services.xserver = { - enable = true; - displayManager.sddm.enable = true; - }; -} - diff --git a/hosts/nixos/common/optional/steam.nix b/hosts/nixos/common/optional/steam.nix new file mode 100644 index 0000000..5ec9327 --- /dev/null +++ b/hosts/nixos/common/optional/steam.nix @@ -0,0 +1,14 @@ +# TODO(imperanence): handle persistence +{ lib, ... }: { + programs.steam = { + enable = true; + remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play + dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server + }; + + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ + "steam" + "steam-original" + "steam-runtime" + ]; +} diff --git a/hosts/nixos/tethys/default.nix b/hosts/nixos/tethys/default.nix index 6870a8d..cb142cc 100644 --- a/hosts/nixos/tethys/default.nix +++ b/hosts/nixos/tethys/default.nix @@ -7,8 +7,9 @@ ../common/optional/touchpad.nix ../common/optional/xserver.nix ../common/optional/lightdm.nix - ../common/optional/xmonad + ../common/optional/steam.nix ../common/optional/slambda.nix + ../common/optional/xmonad ./hardware-configuration.nix ./boot.nix @@ -20,14 +21,31 @@ # A few ad-hoc settings hardware.opengl.enable = true; programs.kdeconnect.enable = true; + programs.extra-container.enable = true; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion system.stateVersion = "22.11"; # Temp stuff: - containers.euporie = import ../euoprie; - programs.gnupg.agent = { + services.postgresql = { enable = true; - enableSSHSupport = true; + package = pkgs.postgresql_15; + enableTCPIP = true; + authentication = pkgs.lib.mkOverride 10 '' + local all all trust + host all all 127.0.0.1/32 trust + host all all ::1/128 trust + ''; + initialScript = pkgs.writeText "backend-initScript" '' + CREATE ROLE adrielus WITH + LOGIN + SUPERUSER + INHERIT + CREATEDB + CREATEROLE + REPLICATION; + CREATE DATABASE lunarbox; + GRANT ALL PRIVILEGES ON DATABASE lunarbox TO adrielus; + ''; }; } diff --git a/pkgs/sherlock.nix b/pkgs/sherlock.nix index 9dce3ba..f564e08 100644 --- a/pkgs/sherlock.nix +++ b/pkgs/sherlock.nix @@ -15,7 +15,7 @@ let pandas ]); in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "sherlock"; version = "unstable-2023-02-27";