Start the process of switching to nixpkgs-unstable
This commit is contained in:
Matei Adriel
parent
346d1b78d9
commit
a81103f78e
|
|
@ -13,7 +13,7 @@ let
|
|||
|
||||
catppuccin-latte = {
|
||||
stylix = {
|
||||
image = ./wallpapers/watercag.png;
|
||||
image = ./wallpapers/needygirloverdose.jpg;
|
||||
base16Scheme = "${inputs.catppuccin-base16}/base16/latte.yaml";
|
||||
polarity = "light";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -33,106 +33,106 @@ vim.opt.foldmethod = "expr"
|
|||
|
||||
local abbreviations = {
|
||||
-- {{{ Greek chars
|
||||
{ "eps", "\\epsilon" },
|
||||
{ "delta", "\\delta" },
|
||||
{ "Delta", "\\Delta" },
|
||||
{ "pi", "\\pi" },
|
||||
{ "psi", "\\psi" },
|
||||
{ "alpha", "\\alpha" },
|
||||
{ "beta", "\\beta" },
|
||||
{ "theta", "\\theta" },
|
||||
{ "gamma", "\\gamma" },
|
||||
{ "lam", "\\lambda" },
|
||||
{ "eps", "\\epsilon" },
|
||||
{ "delta", "\\delta" },
|
||||
{ "Delta", "\\Delta" },
|
||||
{ "pi", "\\pi" },
|
||||
{ "psi", "\\psi" },
|
||||
{ "alpha", "\\alpha" },
|
||||
{ "beta", "\\beta" },
|
||||
{ "theta", "\\theta" },
|
||||
{ "gamma", "\\gamma" },
|
||||
{ "lam", "\\lambda" },
|
||||
{ "lambda", "\\lambda" },
|
||||
{ "omega", "\\omega" },
|
||||
{ "Omega", "\\Omega" },
|
||||
{ "nuls", "\\varnothing" },
|
||||
{ "omega", "\\omega" },
|
||||
{ "Omega", "\\Omega" },
|
||||
{ "nuls", "\\varnothing" },
|
||||
-- }}}
|
||||
-- Other fancy symvols
|
||||
{ "tmat", "^T" }, -- Tranpose of a matrix
|
||||
{ "cmat", "^*" }, -- Conjugate of a matrix
|
||||
{ "sneg", "^C" }, -- Set complement
|
||||
{ "ortco", "^{\\bot}" }, -- Orthogonal complement
|
||||
{ "sinter", "^{\\circ}" }, -- Interior of a set
|
||||
{ "tmat", "^T" }, -- Tranpose of a matrix
|
||||
{ "cmat", "^*" }, -- Conjugate of a matrix
|
||||
{ "sneg", "^C" }, -- Set complement
|
||||
{ "ortco", "^\\bot" }, -- Orthogonal complement
|
||||
{ "sinter", "^\\circ" }, -- Interior of a set
|
||||
|
||||
-- Basic commands
|
||||
{ "mangle", "\\measuredangle" },
|
||||
{ "aangle", "\\angle" },
|
||||
{ "sdiff", "\\setminus" },
|
||||
{ "sst", "\\subset" },
|
||||
{ "spt", "\\supset" },
|
||||
{ "sseq", "\\subseteq" },
|
||||
{ "speq", "\\supseteq" },
|
||||
{ "nin", "\\not\\in" },
|
||||
{ "iin", "\\in" },
|
||||
{ "tto", "\\to" },
|
||||
{ "land", "\\land" },
|
||||
{ "lor", "\\lor" },
|
||||
{ "ssin", "\\sin" },
|
||||
{ "ccos", "\\cos" },
|
||||
{ "ttan", "\\ttan" },
|
||||
{ "ssec", "\\sec" },
|
||||
{ "lln", "\\ln" },
|
||||
{ "frl", "\\forall" },
|
||||
{ "exs", "\\exists" },
|
||||
{ "iinf", "\\infty" },
|
||||
{ "ninf", "-\\infty" },
|
||||
{ "nlnl", "\\pm" }, -- had this as npnp first but it was hard-ish to type
|
||||
{ "ccup", "\\cup" },
|
||||
{ "ccap", "\\cap" },
|
||||
{ "nope", "\\bot" },
|
||||
{ "yee", "\\top" },
|
||||
{ "ccan", "\\cancel" },
|
||||
{ "com", "\\circ" },
|
||||
{ "mul", "\\cdot" },
|
||||
{ "smul", "\\times" },
|
||||
{ "card", "\\#" },
|
||||
{ "div", "\\|" },
|
||||
{ "ndiv", "\\not\\|\\:" },
|
||||
{ "perp", "\\perp" },
|
||||
{ "sdiff", "\\setminus" },
|
||||
{ "sst", "\\subset" },
|
||||
{ "spt", "\\supset" },
|
||||
{ "sseq", "\\subseteq" },
|
||||
{ "speq", "\\supseteq" },
|
||||
{ "nin", "\\not\\in" },
|
||||
{ "iin", "\\in" },
|
||||
{ "tto", "\\to" },
|
||||
{ "land", "\\land" },
|
||||
{ "lor", "\\lor" },
|
||||
{ "ssin", "\\sin" },
|
||||
{ "ccos", "\\cos" },
|
||||
{ "ttan", "\\ttan" },
|
||||
{ "ssec", "\\sec" },
|
||||
{ "lln", "\\ln" },
|
||||
{ "frl", "\\forall" },
|
||||
{ "exs", "\\exists" },
|
||||
{ "iinf", "\\infty" },
|
||||
{ "ninf", "-\\infty" },
|
||||
{ "nlnl", "\\pm" }, -- had this as npnp first but it was hard-ish to type
|
||||
{ "ccup", "\\cup" },
|
||||
{ "ccap", "\\cap" },
|
||||
{ "nope", "\\bot" },
|
||||
{ "yee", "\\top" },
|
||||
{ "ccan", "\\cancel" },
|
||||
{ "com", "\\circ" },
|
||||
{ "mul", "\\cdot" },
|
||||
{ "smul", "\\times" },
|
||||
{ "card", "\\#" },
|
||||
{ "div", "\\|" },
|
||||
{ "ndiv", "\\not\\|\\:" },
|
||||
{ "perp", "\\perp" },
|
||||
|
||||
-- Custom commands
|
||||
{ "abs", "\\abs" }, -- custom abs command
|
||||
{ "norm", "\\norm" }, -- custom norm command
|
||||
{ "iprod", "\\iprod" }, -- custom inner product command
|
||||
{ "abs", "\\abs" }, -- custom abs command
|
||||
{ "norm", "\\norm" }, -- custom norm command
|
||||
{ "iprod", "\\iprod" }, -- custom inner product command
|
||||
{ "diprod", "\\dprod" }, -- custom self inner product command
|
||||
{ "prob", "\\prob" }, -- custom probability function
|
||||
{ "dist", "\\dist" }, -- custom dist function
|
||||
{ "diam", "\\diam" }, -- custom diam operator
|
||||
{ "gen", "\\gen" }, -- custom command for group generated by element
|
||||
{ "ord", "\\ordop" }, -- order of a group
|
||||
{ "vsm", "\\vecspace" }, -- custom math vector space
|
||||
{ "prob", "\\prob" }, -- custom probability function
|
||||
{ "dist", "\\dist" }, -- custom dist function
|
||||
{ "diam", "\\diam" }, -- custom diam operator
|
||||
{ "gen", "\\gen" }, -- custom command for group generated by element
|
||||
{ "ord", "\\ordop" }, -- order of a group
|
||||
{ "vsm", "\\vecspace" }, -- custom math vector space
|
||||
}
|
||||
|
||||
-- Todo: convert exponents and subscripts
|
||||
-- to use this more concise notation.
|
||||
local abolishAbbreviations = {
|
||||
-- {{{ General phrases
|
||||
{ "thrf", "therefore" },
|
||||
{ "bcla", "by contradiction let's assume" },
|
||||
{ "wlg", "without loss of generality" },
|
||||
{ "tits", "that is to say," },
|
||||
{ "wpbd", "we will prove the statement in both directions." },
|
||||
{ "stam{,s}", "statement{}" },
|
||||
{ "{ww,tt}{m,i}", "{which,this} {means,implies}" },
|
||||
{ "cex{,s}", "counterexample{}" },
|
||||
{ "er{t,s,r}", "{transitivity,symmetry,reflexivity}" },
|
||||
{ "thrf", "therefore" },
|
||||
{ "bcla", "by contradiction let's assume" },
|
||||
{ "wlg", "without loss of generality" },
|
||||
{ "tits", "that is to say," },
|
||||
{ "wpbd", "we will prove the statement in both directions." },
|
||||
{ "stam{,s}", "statement{}" },
|
||||
{ "{ww,tt}{m,i}", "{which,this} {means,implies}" },
|
||||
{ "cex{,s}", "counterexample{}" },
|
||||
{ "er{t,s,r}", "{transitivity,symmetry,reflexivity}" },
|
||||
-- }}}
|
||||
-- {{{ Calculus & analysis
|
||||
{ "ib{p,s}", "integration by {parts,substitution}" },
|
||||
{ "nb{,h}{,s}", "neighbour{,hood}{}" },
|
||||
{ "ib{p,s}", "integration by {parts,substitution}" },
|
||||
{ "nb{,h}{,s}", "neighbour{,hood}{}" },
|
||||
-- }}}
|
||||
-- {{{ Linear algebra
|
||||
{ "rref", "reduced row echalon form" },
|
||||
{ "rref", "reduced row echalon form" },
|
||||
{ "eg{va,ve,p}{,s}", "eigen{value,vector,pair}{}" },
|
||||
{ "mx{,s}", "matri{x,ces}" },
|
||||
{ "dete{,s}", "determinant{}" },
|
||||
{ "ort{n,g}", "orto{normal,gonal}" },
|
||||
{ "l{in,de}", "linearly {independent,dependent}" },
|
||||
{ "lcon{,s}", "linear combination{}" },
|
||||
{ "vst{,s}", "vector space{}" }, -- text vector space
|
||||
{ "mx{,s}", "matri{x,ces}" },
|
||||
{ "dete{,s}", "determinant{}" },
|
||||
{ "ort{n,g}", "orto{normal,gonal}" },
|
||||
{ "l{in,de}", "linearly {independent,dependent}" },
|
||||
{ "lcon{,s}", "linear combination{}" },
|
||||
{ "vst{,s}", "vector space{}" }, -- text vector space
|
||||
{
|
||||
"rizz", -- ok please ignore this one 💀
|
||||
"rizz", -- ok please ignore this one 💀
|
||||
"Riesz vector",
|
||||
options = A.no_capitalization,
|
||||
},
|
||||
|
|
@ -145,7 +145,7 @@ local abolishAbbreviations = {
|
|||
},
|
||||
-- }}}
|
||||
-- {{{ Graph theory
|
||||
{ "vx{,s}", "vert{ex,ices}" },
|
||||
{ "vx{,s}", "vert{ex,ices}" },
|
||||
{ "edg{,s}", "edge{}" },
|
||||
|
||||
-- Graph theory function syntax:
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@ return {
|
|||
prepend_note_id = true,
|
||||
},
|
||||
mappings = {},
|
||||
disable_frontmatter = true,
|
||||
},
|
||||
keys = {
|
||||
{ "<C-O>", "<cmd>ObsidianQuickSwitch<cr>" },
|
||||
|
|
|
|||
722
flake.lock
722
flake.lock
File diff suppressed because it is too large
Load diff
|
|
@ -4,13 +4,13 @@
|
|||
# {{{ Inputs
|
||||
inputs = {
|
||||
# Nixpkgs
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
|
||||
# Nixpkgs-unstable
|
||||
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
|
||||
# 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";
|
||||
|
||||
# NUR
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ pkgs, inputs, ... }: {
|
||||
imports = [
|
||||
./exa.nix
|
||||
./eza.nix
|
||||
./bat.nix
|
||||
./ssh.nix
|
||||
./gpg.nix
|
||||
|
|
|
|||
|
|
@ -1,16 +1,17 @@
|
|||
{ pkgs, ... }: {
|
||||
home.packages = [ pkgs.exa ];
|
||||
{ upkgs, lib, ... }: {
|
||||
# REASON: not yet in nixpkgs-stable
|
||||
home.packages = [ upkgs.eza ];
|
||||
|
||||
# TODO: generalize alias creation to all shells
|
||||
programs.fish.shellAliases =
|
||||
let exa = "${pkgs.exa}/bin/exa";
|
||||
let eza = lib.getExe upkgs.eza;
|
||||
in
|
||||
rec {
|
||||
ls = "${exa} --icons --long";
|
||||
ls = "${eza} --icons --long";
|
||||
la = "${ls} --all";
|
||||
lt = "${ls} --tree"; # Similar to tree, but also has --long!
|
||||
|
||||
# I am used to using pkgs.tree, so this is nice to have!
|
||||
tree = "${exa} --icons --tree";
|
||||
tree = "${eza} --icons --tree";
|
||||
};
|
||||
}
|
||||
|
|
@ -12,7 +12,8 @@ let
|
|||
nil # nix
|
||||
inputs.nixd.packages.${system}.nixd # nix
|
||||
haskell-language-server # haskell
|
||||
dhall-lsp-server # dhall
|
||||
# REASON: marked as broken
|
||||
# dhall-lsp-server # dhall
|
||||
tectonic # something related to latex (?)
|
||||
texlab # latex
|
||||
nodePackages_latest.vscode-langservers-extracted # web stuff
|
||||
|
|
|
|||
|
|
@ -14,7 +14,8 @@ in
|
|||
|
||||
wayland.windowManager.hyprland = {
|
||||
enable = true;
|
||||
recommendedEnvironment = true;
|
||||
package = inputs.hyprland.packages.${pkgs.system}.hyprland;
|
||||
settings = { };
|
||||
extraConfig = ''
|
||||
${builtins.readFile ./hyprland.conf}
|
||||
${hyprland-monitors}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ let
|
|||
inputs.homeage.homeManagerModules.homeage
|
||||
inputs.nur.nixosModules.nur
|
||||
inputs.impermanence.nixosModules.home-manager.impermanence
|
||||
inputs.hyprland.homeManagerModules.default
|
||||
inputs.spicetify-nix.homeManagerModules.spicetify
|
||||
inputs.anyrun.homeManagerModules.default
|
||||
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ in
|
|||
|
||||
# Passwordless sudo when SSH'ing with keys
|
||||
# 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
|
||||
programs.mosh.enable = true;
|
||||
|
|
|
|||
|
|
@ -1,3 +1,6 @@
|
|||
{
|
||||
{ inputs, pkgs, ... }: {
|
||||
|
||||
programs.hyprland.enable = true;
|
||||
programs.hyprland.package =
|
||||
inputs.hyprland.packages.${pkgs.system}.hyprland;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,15 +15,17 @@ in
|
|||
overrideDevices = true;
|
||||
overrideFolders = true;
|
||||
|
||||
devices = {
|
||||
enceladus.id = "QWOAERM-V2FNXPI-TB7NFUS-LKW7JTB-IZY4OEZ-FYDPJNP-6IKPW4Y-YREXDQM";
|
||||
lapetus.id = "VVHM7RC-ZSDOZJI-EGBIJR4-2DOGAXG-OEJZWSH-OYUK5XT-7CDMWSL-3AVM2AZ";
|
||||
tethys.id = "NGHX5G4-IY3ZXL2-NQMMRQV-2GDQLC6-LIDWSNG-DAJUAQH-KBAP64V-55K2LQ6";
|
||||
};
|
||||
settings = {
|
||||
devices = {
|
||||
enceladus.id = "QWOAERM-V2FNXPI-TB7NFUS-LKW7JTB-IZY4OEZ-FYDPJNP-6IKPW4Y-YREXDQM";
|
||||
lapetus.id = "VVHM7RC-ZSDOZJI-EGBIJR4-2DOGAXG-OEJZWSH-OYUK5XT-7CDMWSL-3AVM2AZ";
|
||||
tethys.id = "NGHX5G4-IY3ZXL2-NQMMRQV-2GDQLC6-LIDWSNG-DAJUAQH-KBAP64V-55K2LQ6";
|
||||
};
|
||||
|
||||
extraOptions = {
|
||||
options = {
|
||||
crashReportingEnabled = false;
|
||||
extraOptions = {
|
||||
options = {
|
||||
crashReportingEnabled = false;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
isNormalUser = true;
|
||||
|
||||
# File containing my password, managed by agenix
|
||||
passwordFile = config.age.secrets.adrielusPassword.path;
|
||||
hashedPasswordFile = config.age.secrets.adrielusPassword.path;
|
||||
|
||||
# Set default shell
|
||||
shell = pkgs.fish;
|
||||
|
|
|
|||
|
|
@ -6,6 +6,6 @@
|
|||
services.syncthing = {
|
||||
guiAddress = "0.0.0.0:8384"; # TODO: put this behind nginx
|
||||
|
||||
folders = { };
|
||||
settings.folders = { };
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
imports = [ ../../common/optional/syncthing.nix ];
|
||||
|
||||
services.syncthing.folders = {
|
||||
services.syncthing.settings.folders = {
|
||||
"mythical-vault" = {
|
||||
path = "/home/adrielus/.password-store";
|
||||
devices = [ "enceladus" "lapetus" ];
|
||||
|
|
|
|||
|
|
@ -2,5 +2,4 @@
|
|||
|
||||
{
|
||||
# example = import ./example.nix;
|
||||
font-compat = import ./font-compat.nix;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +0,0 @@
|
|||
{ lib, config, ... }: {
|
||||
options.fonts.packages = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.package;
|
||||
};
|
||||
|
||||
config.fonts.fonts = config.fonts.packages;
|
||||
}
|
||||
|
|
@ -15,13 +15,15 @@ let vimclip = pkgs.stdenv.mkDerivation rec {
|
|||
cp ./vimclip $out/bin/vimclip
|
||||
chmod +x $out/bin/vimclip
|
||||
'';
|
||||
|
||||
meta.mainProgram = "vimclip";
|
||||
}; in
|
||||
pkgs.writeShellScriptBin "vimclip" ''
|
||||
if [ "wayland" = $XDG_SESSION_TYPE ]
|
||||
then
|
||||
export VIMCLIP_CLIPBOARD_COMMAND=${pkgs.wl-clipboard}/bin/wl-copy
|
||||
else
|
||||
export VIMCLIP_CLIPBOARD_COMMAND=${lib.getExe pkgs.xsel}
|
||||
export VIMCLIP_CLIPBOARD_COMMAND=${pkgs.xsel}/bin/xsel
|
||||
fi
|
||||
|
||||
${lib.getExe vimclip}
|
||||
|
|
|
|||
Loading…
Reference in a new issue