update
This commit is contained in:
parent
b48391a545
commit
986c517718
23
flake.lock
23
flake.lock
|
|
@ -89,22 +89,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"kakoune-base16-themes": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1671326254,
|
||||
"narHash": "sha256-2sE2HKVH/F0dquGSmWmJuCFnFxjrCqm8CQbse3rVO5w=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "base16-kakoune",
|
||||
"rev": "5b812fdb79cc9f2507332ae840cefe0a61304ac4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "tinted-theming",
|
||||
"repo": "base16-kakoune",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"kakoune-smarttab": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
@ -226,7 +210,6 @@
|
|||
"gamescope-git": "gamescope-git",
|
||||
"grub2-themes": "grub2-themes",
|
||||
"home-manager": "home-manager",
|
||||
"kakoune-base16-themes": "kakoune-base16-themes",
|
||||
"kakoune-smarttab": "kakoune-smarttab",
|
||||
"kakoune-sort-selections": "kakoune-sort-selections",
|
||||
"mesa-git": "mesa-git",
|
||||
|
|
@ -243,11 +226,11 @@
|
|||
"sway-git": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1671727533,
|
||||
"narHash": "sha256-UYNbyFz7EkVaMFo7mnJJCor2DrJ2uQEyEKAYHjmY0Ek=",
|
||||
"lastModified": 1671983996,
|
||||
"narHash": "sha256-r5qf50YK0Wl0gFiFdSE/J6ZU+D/Cz32u1mKzOqnIuJ0=",
|
||||
"owner": "swaywm",
|
||||
"repo": "sway",
|
||||
"rev": "0500cdbfce49f11a2b010b4d66565cab2549c2a9",
|
||||
"rev": "b88b1b6302cf68cc50ee7f3279b2f2ff29e292c8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
11
flake.nix
11
flake.nix
|
|
@ -21,11 +21,6 @@
|
|||
# Fish Plugins End
|
||||
|
||||
# Kakoune Plugins
|
||||
kakoune-base16-themes = {
|
||||
url = "github:tinted-theming/base16-kakoune";
|
||||
flake = false;
|
||||
};
|
||||
|
||||
kakoune-smarttab = {
|
||||
url = "github:andreyorst/smarttab.kak";
|
||||
flake = false;
|
||||
|
|
@ -48,12 +43,12 @@
|
|||
};
|
||||
|
||||
wlroots-git = {
|
||||
url = "gitlab:wlroots/wlroots?host=gitlab.freedesktop.org";
|
||||
url = "gitlab:wlroots/wlroots/0.16.0?host=gitlab.freedesktop.org";
|
||||
flake = false;
|
||||
};
|
||||
|
||||
sway-git = {
|
||||
url = "github:swaywm/sway";
|
||||
url = "github:swaywm/sway/v1.8";
|
||||
flake = false;
|
||||
};
|
||||
|
||||
|
|
@ -121,7 +116,7 @@
|
|||
};
|
||||
|
||||
sway-unwrapped = (prev.sway-unwrapped.overrideAttrs (old: {
|
||||
version = "git";
|
||||
version = "1.8";
|
||||
buildInputs = old.buildInputs ++ [ prev.xorg.xcbutilwm prev.pcre2 ];
|
||||
nativeBuildInputs = old.nativeBuildInputs ++ [ prev.cmake ];
|
||||
src = inputs.sway-git;
|
||||
|
|
|
|||
|
|
@ -173,7 +173,6 @@
|
|||
pkgs.unrar
|
||||
pkgs.p7zip
|
||||
];
|
||||
pathsToLink = [ "/share/zsh" ];
|
||||
binsh = "${pkgs.dash}/bin/dash";
|
||||
};
|
||||
|
||||
|
|
@ -224,21 +223,21 @@
|
|||
services.transmission = {
|
||||
enable = true;
|
||||
user = "manuel";
|
||||
settings = {
|
||||
download-dir = "/mnt/hdd/Downloads/Torrents";
|
||||
incomplete-dir = "/mnt/hdd/Downloads/Torrents/.incomplete";
|
||||
};
|
||||
openFirewall = true;
|
||||
};
|
||||
|
||||
services.fwupd.enable = true;
|
||||
|
||||
services.getty.autologinUser = " manuel ";
|
||||
#: services.getty.autologinUser = " manuel ";
|
||||
|
||||
systemd.extraConfig = ''
|
||||
DefaultTimeoutStopSec=10s
|
||||
'';
|
||||
|
||||
systemd.user.extraConfig = ''
|
||||
# needed for xdg-open to find the default browser
|
||||
DefaultEnvironment="
|
||||
PATH=/etc/profiles/per-user/manuel/bin:/run/current/system/sw/bin"
|
||||
DefaultEnvironment="PATH=/etc/profiles/per-user/manuel/bin:/run/current/system/sw/bin"
|
||||
DefaultTimeoutStopSec=10s
|
||||
'';
|
||||
|
||||
nix = {
|
||||
|
|
|
|||
|
|
@ -24,11 +24,11 @@
|
|||
|
||||
'';
|
||||
|
||||
loginShellInit = ''
|
||||
if test (tty) = "/dev/tty1"
|
||||
${pkgs.sway}/bin/sway &> ~/.sway.log
|
||||
end
|
||||
'';
|
||||
# loginShellInit = ''
|
||||
# if test (tty) = "/dev/tty1"
|
||||
# ${pkgs.sway}/bin/sway &> ~/.sway.log
|
||||
# end
|
||||
#'';
|
||||
|
||||
functions = {
|
||||
#fish_prompt = ''
|
||||
|
|
|
|||
|
|
@ -10,20 +10,11 @@ let
|
|||
src = inputs.kakoune-sort-selections;
|
||||
};
|
||||
|
||||
base16-colorschemes = pkgs.kakouneUtils.buildKakounePlugin {
|
||||
name = "base16-colorschemes";
|
||||
src = inputs.kakoune-base16-themes;
|
||||
postFixup = ''
|
||||
mkdir -p $out/share/kak/colors
|
||||
mv $out/share/kak/autoload/plugins/base16-colorschemes/colors $out/share/kak/colors
|
||||
'';
|
||||
};
|
||||
in
|
||||
{
|
||||
programs.kakoune = {
|
||||
enable = true;
|
||||
plugins = with pkgs.kakounePlugins; [
|
||||
base16-colorschemes
|
||||
kak-lsp
|
||||
kakboard
|
||||
kakoune-extra-filetypes
|
||||
|
|
@ -32,7 +23,7 @@ in
|
|||
sort-selections
|
||||
];
|
||||
config = {
|
||||
colorScheme = "base16-gruvbox-dark-medium";
|
||||
colorScheme = "gruvbox-dark";
|
||||
tabStop = 4;
|
||||
indentWidth = 4;
|
||||
showMatching = true;
|
||||
|
|
|
|||
|
|
@ -22,11 +22,13 @@
|
|||
appimage-run
|
||||
discord-canary
|
||||
gamescope
|
||||
gimp
|
||||
gnome.file-roller
|
||||
gnome.gvfs
|
||||
gnome.nautilus
|
||||
lutris
|
||||
mesa-demos
|
||||
mesa-demos
|
||||
nerdfonts
|
||||
noto-fonts-cjk-sans
|
||||
noto-fonts-cjk-serif
|
||||
|
|
@ -42,17 +44,16 @@
|
|||
sxiv
|
||||
thunderbird
|
||||
twemoji-color-font
|
||||
vulkan-tools
|
||||
vulkan-validation-layers
|
||||
wineWowPackages.stagingFull
|
||||
xdg-utils
|
||||
xivlauncher
|
||||
vulkan-validation-layers
|
||||
];
|
||||
|
||||
home.sessionVariables = {
|
||||
EDITOR = "kak";
|
||||
#GTK_USE_PORTAL = "1";
|
||||
WINEDLLOVERRIDES = "winemenubuilder.exe=d";
|
||||
WLR_RENDERER = "vulkan"; #Causes hangs
|
||||
RADV_PERFTEST = "gpl";
|
||||
};
|
||||
|
||||
|
|
|
|||
Reference in New Issue