This commit is contained in:
Varris 2022-12-27 10:40:36 +01:00
parent b48391a545
commit 986c517718
6 changed files with 23 additions and 54 deletions

View File

@ -89,22 +89,6 @@
"type": "github" "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": { "kakoune-smarttab": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -226,7 +210,6 @@
"gamescope-git": "gamescope-git", "gamescope-git": "gamescope-git",
"grub2-themes": "grub2-themes", "grub2-themes": "grub2-themes",
"home-manager": "home-manager", "home-manager": "home-manager",
"kakoune-base16-themes": "kakoune-base16-themes",
"kakoune-smarttab": "kakoune-smarttab", "kakoune-smarttab": "kakoune-smarttab",
"kakoune-sort-selections": "kakoune-sort-selections", "kakoune-sort-selections": "kakoune-sort-selections",
"mesa-git": "mesa-git", "mesa-git": "mesa-git",
@ -243,11 +226,11 @@
"sway-git": { "sway-git": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1671727533, "lastModified": 1671983996,
"narHash": "sha256-UYNbyFz7EkVaMFo7mnJJCor2DrJ2uQEyEKAYHjmY0Ek=", "narHash": "sha256-r5qf50YK0Wl0gFiFdSE/J6ZU+D/Cz32u1mKzOqnIuJ0=",
"owner": "swaywm", "owner": "swaywm",
"repo": "sway", "repo": "sway",
"rev": "0500cdbfce49f11a2b010b4d66565cab2549c2a9", "rev": "b88b1b6302cf68cc50ee7f3279b2f2ff29e292c8",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -21,11 +21,6 @@
# Fish Plugins End # Fish Plugins End
# Kakoune Plugins # Kakoune Plugins
kakoune-base16-themes = {
url = "github:tinted-theming/base16-kakoune";
flake = false;
};
kakoune-smarttab = { kakoune-smarttab = {
url = "github:andreyorst/smarttab.kak"; url = "github:andreyorst/smarttab.kak";
flake = false; flake = false;
@ -48,12 +43,12 @@
}; };
wlroots-git = { wlroots-git = {
url = "gitlab:wlroots/wlroots?host=gitlab.freedesktop.org"; url = "gitlab:wlroots/wlroots/0.16.0?host=gitlab.freedesktop.org";
flake = false; flake = false;
}; };
sway-git = { sway-git = {
url = "github:swaywm/sway"; url = "github:swaywm/sway/v1.8";
flake = false; flake = false;
}; };
@ -121,7 +116,7 @@
}; };
sway-unwrapped = (prev.sway-unwrapped.overrideAttrs (old: { sway-unwrapped = (prev.sway-unwrapped.overrideAttrs (old: {
version = "git"; version = "1.8";
buildInputs = old.buildInputs ++ [ prev.xorg.xcbutilwm prev.pcre2 ]; buildInputs = old.buildInputs ++ [ prev.xorg.xcbutilwm prev.pcre2 ];
nativeBuildInputs = old.nativeBuildInputs ++ [ prev.cmake ]; nativeBuildInputs = old.nativeBuildInputs ++ [ prev.cmake ];
src = inputs.sway-git; src = inputs.sway-git;

View File

@ -173,7 +173,6 @@
pkgs.unrar pkgs.unrar
pkgs.p7zip pkgs.p7zip
]; ];
pathsToLink = [ "/share/zsh" ];
binsh = "${pkgs.dash}/bin/dash"; binsh = "${pkgs.dash}/bin/dash";
}; };
@ -224,21 +223,21 @@
services.transmission = { services.transmission = {
enable = true; enable = true;
user = "manuel"; user = "manuel";
settings = {
download-dir = "/mnt/hdd/Downloads/Torrents";
incomplete-dir = "/mnt/hdd/Downloads/Torrents/.incomplete";
};
openFirewall = true; openFirewall = true;
}; };
services.fwupd.enable = true; services.fwupd.enable = true;
services.getty.autologinUser = " manuel "; #: services.getty.autologinUser = " manuel ";
systemd.extraConfig = ''
DefaultTimeoutStopSec=10s
'';
systemd.user.extraConfig = '' systemd.user.extraConfig = ''
# needed for xdg-open to find the default browser # needed for xdg-open to find the default browser
DefaultEnvironment=" DefaultEnvironment="PATH=/etc/profiles/per-user/manuel/bin:/run/current/system/sw/bin"
PATH=/etc/profiles/per-user/manuel/bin:/run/current/system/sw/bin" DefaultTimeoutStopSec=10s
''; '';
nix = { nix = {

View File

@ -24,11 +24,11 @@
''; '';
loginShellInit = '' # loginShellInit = ''
if test (tty) = "/dev/tty1" # if test (tty) = "/dev/tty1"
${pkgs.sway}/bin/sway &> ~/.sway.log # ${pkgs.sway}/bin/sway &> ~/.sway.log
end # end
''; #'';
functions = { functions = {
#fish_prompt = '' #fish_prompt = ''

View File

@ -10,20 +10,11 @@ let
src = inputs.kakoune-sort-selections; 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 in
{ {
programs.kakoune = { programs.kakoune = {
enable = true; enable = true;
plugins = with pkgs.kakounePlugins; [ plugins = with pkgs.kakounePlugins; [
base16-colorschemes
kak-lsp kak-lsp
kakboard kakboard
kakoune-extra-filetypes kakoune-extra-filetypes
@ -32,7 +23,7 @@ in
sort-selections sort-selections
]; ];
config = { config = {
colorScheme = "base16-gruvbox-dark-medium"; colorScheme = "gruvbox-dark";
tabStop = 4; tabStop = 4;
indentWidth = 4; indentWidth = 4;
showMatching = true; showMatching = true;

View File

@ -22,11 +22,13 @@
appimage-run appimage-run
discord-canary discord-canary
gamescope gamescope
gimp
gnome.file-roller gnome.file-roller
gnome.gvfs gnome.gvfs
gnome.nautilus gnome.nautilus
lutris lutris
mesa-demos mesa-demos
mesa-demos
nerdfonts nerdfonts
noto-fonts-cjk-sans noto-fonts-cjk-sans
noto-fonts-cjk-serif noto-fonts-cjk-serif
@ -42,17 +44,16 @@
sxiv sxiv
thunderbird thunderbird
twemoji-color-font twemoji-color-font
vulkan-tools
vulkan-validation-layers
wineWowPackages.stagingFull wineWowPackages.stagingFull
xdg-utils xdg-utils
xivlauncher xivlauncher
vulkan-validation-layers
]; ];
home.sessionVariables = { home.sessionVariables = {
EDITOR = "kak"; EDITOR = "kak";
#GTK_USE_PORTAL = "1";
WINEDLLOVERRIDES = "winemenubuilder.exe=d"; WINEDLLOVERRIDES = "winemenubuilder.exe=d";
WLR_RENDERER = "vulkan"; #Causes hangs
RADV_PERFTEST = "gpl"; RADV_PERFTEST = "gpl";
}; };