prescientmoon/satellite
1
Fork 0
Code Activity

Start the process of switching to nixpkgs-unstable

Browse source
This commit is contained in:
Matei Adriel 2023-09-28 03:13:35 +03:00
parent 346d1b78d9
commit a81103f78e
No known key found for this signature in database
19 changed files with 512 additions and 438 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/themes/default.nix
View file

@ -13,7 +13,7 @@ let
catppuccin-latte = { catppuccin-latte = {
stylix = { stylix = {
image = ./wallpapers/watercag.png; image = ./wallpapers/needygirloverdose.jpg;
base16Scheme = "${inputs.catppuccin-base16}/base16/latte.yaml"; base16Scheme = "${inputs.catppuccin-base16}/base16/latte.yaml";
polarity = "light"; polarity = "light";
}; };

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

@ -33,106 +33,106 @@ vim.opt.foldmethod = "expr"
local abbreviations = { local abbreviations = {
-- {{{ Greek chars -- {{{ Greek chars
{ "eps", "\\epsilon" }, { "eps", "\\epsilon" },
{ "delta", "\\delta" }, { "delta", "\\delta" },
{ "Delta", "\\Delta" }, { "Delta", "\\Delta" },
{ "pi", "\\pi" }, { "pi", "\\pi" },
{ "psi", "\\psi" }, { "psi", "\\psi" },
{ "alpha", "\\alpha" }, { "alpha", "\\alpha" },
{ "beta", "\\beta" }, { "beta", "\\beta" },
{ "theta", "\\theta" }, { "theta", "\\theta" },
{ "gamma", "\\gamma" }, { "gamma", "\\gamma" },
{ "lam", "\\lambda" }, { "lam", "\\lambda" },
{ "lambda", "\\lambda" }, { "lambda", "\\lambda" },
{ "omega", "\\omega" }, { "omega", "\\omega" },
{ "Omega", "\\Omega" }, { "Omega", "\\Omega" },
{ "nuls", "\\varnothing" }, { "nuls", "\\varnothing" },
-- }}} -- }}}
-- 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
-- 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" },
-- 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}" },
-- }}} -- }}}
-- {{{ 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,
}, },
@ -145,7 +145,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:

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

@ -21,6 +21,7 @@ return {
prepend_note_id = true, prepend_note_id = true,
}, },
mappings = {}, mappings = {},
disable_frontmatter = true,
}, },
keys = { keys = {
{ "<C-O>", "<cmd>ObsidianQuickSwitch<cr>" }, { "<C-O>", "<cmd>ObsidianQuickSwitch<cr>" },

722
flake.lock
View file

File diff suppressed because it is too large Load diff

4
flake.nix
View file

@ -4,13 +4,13 @@
# {{{ Inputs # {{{ Inputs
inputs = { inputs = {
# Nixpkgs # Nixpkgs
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
# Nixpkgs-unstable # Nixpkgs-unstable
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
# Home manager # Home manager
home-manager.url = "github:nix-community/home-manager/release-23.05"; home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
# NUR # NUR

2
home/features/cli/default.nix
View file

@ -1,6 +1,6 @@
{ pkgs, inputs, ... }: { { pkgs, inputs, ... }: {
imports = [ imports = [
./exa.nix ./eza.nix
./bat.nix ./bat.nix
./ssh.nix ./ssh.nix
./gpg.nix ./gpg.nix

11
home/features/cli/exa.nix → home/features/cli/eza.nix
View file

@ -1,16 +1,17 @@
{ pkgs, ... }: { { upkgs, lib, ... }: {
home.packages = [ pkgs.exa ]; # REASON: not yet in nixpkgs-stable
home.packages = [ upkgs.eza ];
# TODO: generalize alias creation to all shells # TODO: generalize alias creation to all shells
programs.fish.shellAliases = programs.fish.shellAliases =
let exa = "${pkgs.exa}/bin/exa"; let eza = lib.getExe upkgs.eza;
in in
rec { rec {
ls = "${exa} --icons --long"; ls = "${eza} --icons --long";
la = "${ls} --all"; la = "${ls} --all";
lt = "${ls} --tree"; # Similar to tree, but also has --long! lt = "${ls} --tree"; # Similar to tree, but also has --long!
# I am used to using pkgs.tree, so this is nice to have! # I am used to using pkgs.tree, so this is nice to have!
tree = "${exa} --icons --tree"; tree = "${eza} --icons --tree";
}; };
} }

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

@ -12,7 +12,8 @@ let
nil # nix nil # nix
inputs.nixd.packages.${system}.nixd # nix inputs.nixd.packages.${system}.nixd # nix
haskell-language-server # haskell haskell-language-server # haskell
dhall-lsp-server # dhall # REASON: marked as broken
# dhall-lsp-server # dhall
tectonic # something related to latex (?) tectonic # something related to latex (?)
texlab # latex texlab # latex
nodePackages_latest.vscode-langservers-extracted # web stuff nodePackages_latest.vscode-langservers-extracted # web stuff

3
home/features/wayland/hyprland/default.nix
View file

@ -14,7 +14,8 @@ in
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;
recommendedEnvironment = true; package = inputs.hyprland.packages.${pkgs.system}.hyprland;
settings = { };
extraConfig = '' extraConfig = ''
${builtins.readFile ./hyprland.conf} ${builtins.readFile ./hyprland.conf}
${hyprland-monitors} ${hyprland-monitors}

1
home/global/default.nix
View file

@ -6,7 +6,6 @@ let
inputs.homeage.homeManagerModules.homeage inputs.homeage.homeManagerModules.homeage
inputs.nur.nixosModules.nur inputs.nur.nixosModules.nur
inputs.impermanence.nixosModules.home-manager.impermanence inputs.impermanence.nixosModules.home-manager.impermanence
inputs.hyprland.homeManagerModules.default
inputs.spicetify-nix.homeManagerModules.spicetify inputs.spicetify-nix.homeManagerModules.spicetify
inputs.anyrun.homeManagerModules.default inputs.anyrun.homeManagerModules.default

2
hosts/nixos/common/global/openssh.nix
View file

@ -40,7 +40,7 @@ in
# Passwordless sudo when SSH'ing with keys # Passwordless sudo when SSH'ing with keys
# TODO: is this safe? Can we ssh back and gain root access this way? # TODO: is this safe? Can we ssh back and gain root access this way?
security.pam.enableSSHAgentAuth = true; # security.pam.enableSSHAgentAuth = true;
# SSH on slow connections # SSH on slow connections
programs.mosh.enable = true; programs.mosh.enable = true;

5
hosts/nixos/common/optional/hyprland.nix
View file

@ -1,3 +1,6 @@
{ { inputs, pkgs, ... }: {
programs.hyprland.enable = true; programs.hyprland.enable = true;
programs.hyprland.package =
inputs.hyprland.packages.${pkgs.system}.hyprland;
} }

18
hosts/nixos/common/optional/syncthing.nix
View file

@ -15,15 +15,17 @@ in
overrideDevices = true; overrideDevices = true;
overrideFolders = true; overrideFolders = true;
devices = { settings = {
enceladus.id = "QWOAERM-V2FNXPI-TB7NFUS-LKW7JTB-IZY4OEZ-FYDPJNP-6IKPW4Y-YREXDQM"; devices = {
lapetus.id = "VVHM7RC-ZSDOZJI-EGBIJR4-2DOGAXG-OEJZWSH-OYUK5XT-7CDMWSL-3AVM2AZ"; enceladus.id = "QWOAERM-V2FNXPI-TB7NFUS-LKW7JTB-IZY4OEZ-FYDPJNP-6IKPW4Y-YREXDQM";
tethys.id = "NGHX5G4-IY3ZXL2-NQMMRQV-2GDQLC6-LIDWSNG-DAJUAQH-KBAP64V-55K2LQ6"; lapetus.id = "VVHM7RC-ZSDOZJI-EGBIJR4-2DOGAXG-OEJZWSH-OYUK5XT-7CDMWSL-3AVM2AZ";
}; tethys.id = "NGHX5G4-IY3ZXL2-NQMMRQV-2GDQLC6-LIDWSNG-DAJUAQH-KBAP64V-55K2LQ6";
};
extraOptions = { extraOptions = {
options = { options = {
crashReportingEnabled = false; crashReportingEnabled = false;
};
}; };
}; };
}; };

2
hosts/nixos/common/users/adrielus.nix
View file

@ -13,7 +13,7 @@
isNormalUser = true; isNormalUser = true;
# File containing my password, managed by agenix # File containing my password, managed by agenix
passwordFile = config.age.secrets.adrielusPassword.path; hashedPasswordFile = config.age.secrets.adrielusPassword.path;
# Set default shell # Set default shell
shell = pkgs.fish; shell = pkgs.fish;

2
hosts/nixos/lapetus/services/syncthing.nix
View file

@ -6,6 +6,6 @@
services.syncthing = { services.syncthing = {
guiAddress = "0.0.0.0:8384"; # TODO: put this behind nginx guiAddress = "0.0.0.0:8384"; # TODO: put this behind nginx
folders = { }; settings.folders = { };
}; };
} }

2
hosts/nixos/tethys/services/syncthing.nix
View file

@ -1,7 +1,7 @@
{ {
imports = [ ../../common/optional/syncthing.nix ]; imports = [ ../../common/optional/syncthing.nix ];
services.syncthing.folders = { services.syncthing.settings.folders = {
"mythical-vault" = { "mythical-vault" = {
path = "/home/adrielus/.password-store"; path = "/home/adrielus/.password-store";
devices = [ "enceladus" "lapetus" ]; devices = [ "enceladus" "lapetus" ];

1
modules/nixos/default.nix
View file

@ -2,5 +2,4 @@
{ {
# example = import ./example.nix; # example = import ./example.nix;
font-compat = import ./font-compat.nix;
} }

7
modules/nixos/font-compat.nix
View file

@ -1,7 +0,0 @@
{ lib, config, ... }: {
options.fonts.packages = lib.mkOption {
type = lib.types.listOf lib.types.package;
};
config.fonts.fonts = config.fonts.packages;
}

4
pkgs/vimclip.nix
View file

@ -15,13 +15,15 @@ let vimclip = pkgs.stdenv.mkDerivation rec {
cp ./vimclip $out/bin/vimclip cp ./vimclip $out/bin/vimclip
chmod +x $out/bin/vimclip chmod +x $out/bin/vimclip
''; '';
meta.mainProgram = "vimclip";
}; in }; in
pkgs.writeShellScriptBin "vimclip" '' pkgs.writeShellScriptBin "vimclip" ''
if [ "wayland" = $XDG_SESSION_TYPE ] if [ "wayland" = $XDG_SESSION_TYPE ]
then then
export VIMCLIP_CLIPBOARD_COMMAND=${pkgs.wl-clipboard}/bin/wl-copy export VIMCLIP_CLIPBOARD_COMMAND=${pkgs.wl-clipboard}/bin/wl-copy
else else
export VIMCLIP_CLIPBOARD_COMMAND=${lib.getExe pkgs.xsel} export VIMCLIP_CLIPBOARD_COMMAND=${pkgs.xsel}/bin/xsel
fi fi
${lib.getExe vimclip} ${lib.getExe vimclip}