Compare commits
3 commits
5f61631957
...
c59b47c1ce
Author | SHA1 | Date | |
---|---|---|---|
Natsu Kagami | c59b47c1ce | ||
Natsu Kagami | ea7e32973a | ||
Natsu Kagami | 99b653229e |
33
flake.lock
33
flake.lock
|
@ -738,6 +738,26 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"home-manager-unstable": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs-unstable"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1719037157,
|
||||
"narHash": "sha256-aOKd8+mhBsLQChCu1mn/W5ww79ta5cXVE59aJFrifM8=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "cd886711998fe5d9ff7979fdd4b4cbd17b1f1511",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"kak-lsp": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
@ -854,11 +874,11 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1718806950,
|
||||
"narHash": "sha256-E+W/kbedZAiOuPtT+KQRposLaXGDLd7lyK7oL3IH/5U=",
|
||||
"lastModified": 1719007440,
|
||||
"narHash": "sha256-ll9zg1P0W8cMk1Co1BOQOrICr9dDgUw+ZL3mGy5GnOg=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "acb4f0e9bfa8ca2d6fca5e692307b5c994e7dbda",
|
||||
"rev": "e6d40db8924c3a663e1f76e0daed09510fea51c3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -975,11 +995,11 @@
|
|||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1718606988,
|
||||
"narHash": "sha256-pmjP5ePc1jz+Okona3HxD7AYT0wbrCwm9bXAlj08nDM=",
|
||||
"lastModified": 1718983919,
|
||||
"narHash": "sha256-+1xgeIow4gJeiwo4ETvMRvWoircnvb0JOt7NS9kUhoM=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "38d3352a65ac9d621b0cd3074d3bef27199ff78f",
|
||||
"rev": "90338afd6177fc683a04d934199d693708c85a3b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -1205,6 +1225,7 @@
|
|||
"dtth-phanpy": "dtth-phanpy",
|
||||
"flake-utils": "flake-utils_5",
|
||||
"home-manager": "home-manager",
|
||||
"home-manager-unstable": "home-manager-unstable",
|
||||
"kak-lsp": "kak-lsp",
|
||||
"kakoune": "kakoune",
|
||||
"lanzaboote": "lanzaboote",
|
||||
|
|
10
flake.nix
10
flake.nix
|
@ -9,6 +9,8 @@
|
|||
darwin.inputs.nixpkgs.follows = "nixpkgs-unstable";
|
||||
home-manager.url = "github:nix-community/home-manager/release-24.05";
|
||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||
home-manager-unstable.url = "github:nix-community/home-manager";
|
||||
home-manager-unstable.inputs.nixpkgs.follows = "nixpkgs-unstable";
|
||||
sops-nix.url = "github:Mic92/sops-nix";
|
||||
sops-nix.inputs.nixpkgs.follows = "nixpkgs-unstable";
|
||||
sops-nix.inputs.nixpkgs-stable.follows = "nixpkgs";
|
||||
|
@ -59,6 +61,8 @@
|
|||
overlays = import ./overlay.nix inputs;
|
||||
lib = nixpkgs.lib;
|
||||
|
||||
hmOf = nixpkgs: if nixpkgs == inputs.nixpkgs then home-manager else inputs.home-manager-unstable;
|
||||
|
||||
applyOverlays = { ... }: {
|
||||
nixpkgs.overlays = lib.mkBefore overlays;
|
||||
};
|
||||
|
@ -164,10 +168,10 @@
|
|||
];
|
||||
};
|
||||
# framework configuration
|
||||
nixosConfigurations."nki-framework" = nixpkgs.lib.nixosSystem rec {
|
||||
nixosConfigurations."nki-framework" = nixpkgs-unstable.lib.nixosSystem rec {
|
||||
system = "x86_64-linux";
|
||||
modules = [
|
||||
(common-nixos nixpkgs)
|
||||
(common-nixos nixpkgs-unstable)
|
||||
inputs.lanzaboote.nixosModules.lanzaboote
|
||||
inputs.nixos-hardware.nixosModules.framework-13-7040-amd
|
||||
({ ... }: {
|
||||
|
@ -179,7 +183,7 @@
|
|||
};
|
||||
})
|
||||
./nki-framework/configuration.nix
|
||||
home-manager.nixosModules.home-manager
|
||||
(hmOf nixpkgs-unstable).nixosModules.home-manager
|
||||
{
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
|
|
|
@ -153,7 +153,7 @@ in
|
|||
} else
|
||||
{
|
||||
executable = "${pkgs.zathura}/bin/zathura";
|
||||
args = [ "--synctex-forward" "%l:1:%f" "%p" "-x" "/home/nki/.bin/kaktex jump %{input} %{line}" ];
|
||||
args = [ "--synctex-forward" "%l:1:%f" "%p" "-x" "${./kaktex} jump %%{input} %%{line} %%{column}" ];
|
||||
});
|
||||
};
|
||||
};
|
||||
|
|
|
@ -3,11 +3,11 @@
|
|||
function usage
|
||||
echo "Usage: "
|
||||
echo " kaktex set [client] [session]"
|
||||
echo " kaktex jump [file] [line]"
|
||||
echo " kaktex jump [file] [line] [column]"
|
||||
exit 1
|
||||
end
|
||||
|
||||
if test (count $argv) -ne 3
|
||||
if test (count $argv) -lt 3
|
||||
usage
|
||||
end
|
||||
|
||||
|
@ -19,7 +19,7 @@ switch $argv[1]
|
|||
echo "
|
||||
evaluate-commands -client $_kaktex_client %{
|
||||
evaluate-commands -try-client $_kaktex_client %{
|
||||
edit -- $argv[2] $argv[3]
|
||||
edit -existing -- $argv[2] $(math $argv[3] + 1) $(math $argv[4] + 1)
|
||||
}
|
||||
}
|
||||
" | kak -p $_kaktex_session
|
||||
|
|
|
@ -1,22 +1,12 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
|
||||
let
|
||||
kaktexScript = ./kaktex;
|
||||
in
|
||||
{
|
||||
# Create kak-tex executable
|
||||
home.file.kaktex = {
|
||||
source = kaktexScript;
|
||||
executable = true;
|
||||
target = ".bin/kaktex";
|
||||
};
|
||||
|
||||
# Source kaktex whenever we have a tex file
|
||||
programs.my-kakoune.rc = ''
|
||||
hook global WinSetOption filetype=(tex|latex) %{
|
||||
hook window WinDisplay '.*' %{
|
||||
eval %sh{
|
||||
${kaktexScript} set $kak_client $kak_session
|
||||
${./kaktex} set $kak_client $kak_session
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -59,8 +59,6 @@ in
|
|||
cinny-desktop
|
||||
gajim
|
||||
vivaldi
|
||||
# Note taking
|
||||
logseq
|
||||
# Audio
|
||||
qpwgraph # Pipewire graph
|
||||
|
||||
|
@ -92,8 +90,8 @@ in
|
|||
nki.programs.discord.enable = pkgs.stdenv.isx86_64;
|
||||
nki.programs.discord.package = pkgs.vesktop.overrideAttrs (attrs: {
|
||||
nativeBuildInputs = attrs.nativeBuildInputs ++ [ pkgs.nss_latest pkgs.makeWrapper ];
|
||||
postInstall = ''
|
||||
makeWrapper $out/bin/vesktop $out/bin/discord
|
||||
postFixup = (attrs.postFixup or "") + ''
|
||||
ln -s $out/bin/vesktop $out/bin/discord
|
||||
'';
|
||||
});
|
||||
|
||||
|
@ -163,10 +161,10 @@ in
|
|||
|
||||
# Text
|
||||
"text/plain" = [ "kakoune.desktop" ];
|
||||
"application/pdf" = [ "org.gnome.Evince.desktop" ];
|
||||
"application/pdf" = [ "okularApplication_pdf.desktop" ];
|
||||
|
||||
# Files
|
||||
"inode/directory" = [ "nemo.desktop" ];
|
||||
"inode/directory" = [ "dolphin.desktop" ];
|
||||
};
|
||||
|
||||
# Add one for kakoune
|
||||
|
|
|
@ -286,7 +286,6 @@ in
|
|||
# Gaming! (not for ARM64)
|
||||
programs.steam.enable = !pkgs.stdenv.isAarch64;
|
||||
hardware.opengl.enable = true;
|
||||
hardware.opengl.driSupport = true;
|
||||
hardware.opengl.driSupport32Bit = !pkgs.stdenv.isAarch64; # For 32 bit applications
|
||||
|
||||
## Services
|
||||
|
|
Loading…
Reference in a new issue