chore: more cleanup
This commit is contained in:
parent
a9162cc2ae
commit
ee1d288dce
GPG Key ID:
1D8F8FAF2294D6EA
@ -3,13 +3,15 @@ let
|
||||
inherit (builtins) attrNames isAttrs isInt readDir toJSON;
|
||||
|
||||
inherit (lib) filterAttrs hasSuffix mapAttrs' nameValuePair removeSuffix;
|
||||
in
|
||||
rec {
|
||||
|
||||
# mapFilterAttrs ::
|
||||
# (name -> value -> bool )
|
||||
# (name -> value -> { name = any; value = any; })
|
||||
# attrs
|
||||
mapFilterAttrs = seive: f: attrs: filterAttrs seive (mapAttrs' f attrs);
|
||||
in
|
||||
{
|
||||
inherit mapFilterAttrs;
|
||||
|
||||
recImport = { dir, _import ? base: import "${dir}/${base}.nix" }:
|
||||
mapFilterAttrs (_: v: v != null)
|
||||
|
||||
@ -1,6 +1,9 @@
|
||||
final: prev: {
|
||||
grit = prev.grit.overrideAttrs (old: rec {
|
||||
version = "0.3.0";
|
||||
grit = prev.grit.overrideAttrs (old:
|
||||
let version = "0.3.0";
|
||||
in
|
||||
{
|
||||
inherit version;
|
||||
|
||||
src = prev.fetchFromGitHub {
|
||||
owner = "climech";
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
final: prev: {
|
||||
hikari = prev.hikari.overrideAttrs (old: rec {
|
||||
hikari = prev.hikari.overrideAttrs (old: {
|
||||
src = prev.fetchzip {
|
||||
url = "https://hub.darcs.net/raichoo/hikari/dist/hikari.zip";
|
||||
sha256 = "sha256-c7i/lekoS8FcsAHwXUw5IojC1xWS+sNeLVOzMf+dA5Q=";
|
||||
|
||||
@ -1,6 +1,9 @@
|
||||
final: prev: {
|
||||
hydrus = prev.hydrus.overrideAttrs (old: rec {
|
||||
version = "435";
|
||||
hydrus = prev.hydrus.overrideAttrs (old:
|
||||
let version = "435";
|
||||
in
|
||||
{
|
||||
inherit version;
|
||||
|
||||
src = prev.fetchFromGitHub {
|
||||
owner = "hydrusnetwork";
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
final: prev: rec {
|
||||
final: prev: {
|
||||
kakoune-unwrapped = prev.kakoune-unwrapped.overrideAttrs (old: {
|
||||
version = "5696ed02";
|
||||
src = builtins.fetchGit {
|
||||
|
||||
@ -43,14 +43,16 @@ let
|
||||
#!${pkgs.stdenv.shell}
|
||||
chromium --enable-features=UseOzonePlatform --ozone-platform=wayland
|
||||
'';
|
||||
chromiumWaylandPkg = with pkgs; stdenv.mkDerivation {
|
||||
name = "chromium-wayland";
|
||||
chromiumWaylandPkg = with pkgs;
|
||||
let name = "chromium-wayland"; in
|
||||
stdenv.mkDerivation {
|
||||
pname = name;
|
||||
version = chromium.version;
|
||||
|
||||
nativeBuildInputs = [ copyDesktopItems ];
|
||||
desktopItems = [
|
||||
(makeDesktopItem rec {
|
||||
name = "chromium-wayland";
|
||||
(makeDesktopItem {
|
||||
inherit name;
|
||||
exec = name;
|
||||
desktopName = "Chromium Wayland";
|
||||
genericName = "Web Browser";
|
||||
@ -99,17 +101,8 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
colorSchemeDark = rec {
|
||||
primary = {
|
||||
normal = {
|
||||
background = "181818";
|
||||
foreground = "b9b9b9";
|
||||
};
|
||||
bright = {
|
||||
background = bright.black;
|
||||
foreground = bright.white;
|
||||
};
|
||||
};
|
||||
colorSchemeDark =
|
||||
let
|
||||
normal = {
|
||||
black = "252525";
|
||||
gray = "5b5b5b";
|
||||
@ -132,6 +125,20 @@ let
|
||||
cyan = "56d8c9";
|
||||
white = "dedede";
|
||||
};
|
||||
in
|
||||
{
|
||||
inherit normal bright;
|
||||
|
||||
primary = {
|
||||
normal = {
|
||||
background = "181818";
|
||||
foreground = "b9b9b9";
|
||||
};
|
||||
bright = {
|
||||
background = bright.black;
|
||||
foreground = bright.white;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
colorScheme =
|
||||
@ -181,11 +188,24 @@ let
|
||||
indicator = "#111111"; # don't care
|
||||
};
|
||||
fonts = [ fontComb ];
|
||||
|
||||
extraEnv = ''
|
||||
export SDL_VIDEODRIVER=wayland
|
||||
# needs qt5.qtwayland in systemPackages
|
||||
export QT_QPA_PLATFORM=wayland
|
||||
export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
|
||||
# Fix for some Java AWT applications (e.g. Android Studio),
|
||||
# use this if they aren't displayed properly:
|
||||
export _JAVA_AWT_WM_NONREPARENTING=1
|
||||
export QT_QPA_PLATFORMTHEME=qt5ct
|
||||
export QT_PLATFORM_PLUGIN=qt5ct
|
||||
'';
|
||||
in
|
||||
{
|
||||
home-manager.users.patriot = { config, pkgs, ... }: {
|
||||
imports = [ ../profiles/hikari.nix ];
|
||||
|
||||
# needs to be fixed to use nix profile???
|
||||
/*gtk = {
|
||||
enable = false;
|
||||
font = {
|
||||
@ -215,8 +235,6 @@ in
|
||||
homeDirectory = nixosConfig.users.users.patriot.home;
|
||||
packages = with pkgs;
|
||||
[
|
||||
discord
|
||||
ripcord
|
||||
# Font stuff
|
||||
fontPackage
|
||||
noto-fonts-cjk
|
||||
@ -224,6 +242,8 @@ in
|
||||
font-awesome
|
||||
(nerdfonts.override { fonts = [ "Iosevka" ]; })
|
||||
# Programs
|
||||
discord
|
||||
ripcord
|
||||
audacity
|
||||
krita
|
||||
kdenlive
|
||||
@ -265,17 +285,7 @@ in
|
||||
};
|
||||
sway = {
|
||||
enable = true;
|
||||
extraSessionCommands = ''
|
||||
#export SDL_VIDEODRIVER=wayland
|
||||
# needs qt5.qtwayland in systemPackages
|
||||
#export QT_QPA_PLATFORM=wayland
|
||||
#export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
|
||||
# Fix for some Java AWT applications (e.g. Android Studio),
|
||||
# use this if they aren't displayed properly:
|
||||
export _JAVA_AWT_WM_NONREPARENTING=1
|
||||
export QT_QPA_PLATFORMTHEME=qt5ct
|
||||
export QT_PLATFORM_PLUGIN=qt5ct
|
||||
'';
|
||||
extraSessionCommands = extraEnv;
|
||||
wrapperFeatures.gtk = true;
|
||||
config = {
|
||||
inherit fonts;
|
||||
@ -477,8 +487,10 @@ in
|
||||
enableCompletion = true;
|
||||
plugins =
|
||||
let
|
||||
fast-syntax-highlighting = rec {
|
||||
name = "fast-syntax-highlighting";
|
||||
fast-syntax-highlighting =
|
||||
let name = "fast-syntax-highlighting"; in
|
||||
{
|
||||
inherit name;
|
||||
src = pkgs."zsh-${name}".out;
|
||||
};
|
||||
per-directory-history = {
|
||||
@ -495,17 +507,7 @@ in
|
||||
# xdg compliant
|
||||
dotDir = ".config/zsh";
|
||||
history.path = ".local/share/zsh/history";
|
||||
envExtra = ''
|
||||
#export SDL_VIDEODRIVER=wayland
|
||||
# needs qt5.qtwayland in systemPackages
|
||||
#export QT_QPA_PLATFORM=wayland
|
||||
#export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
|
||||
# Fix for some Java AWT applications (e.g. Android Studio),
|
||||
# use this if they aren't displayed properly:
|
||||
export _JAVA_AWT_WM_NONREPARENTING=1
|
||||
export QT_QPA_PLATFORMTHEME=qt5ct
|
||||
export QT_PLATFORM_PLUGIN=qt5ct
|
||||
'';
|
||||
envExtra = extraEnv;
|
||||
loginExtra =
|
||||
''
|
||||
if [ "$(${pkgs.coreutils}/bin/tty)" = "/dev/tty1" ]; then
|
||||
@ -516,7 +518,7 @@ in
|
||||
export TERM=alacritty
|
||||
|
||||
function tomp4 () {
|
||||
${pkgs.ffmpeg}/bin/ffmpeg -i $1 -c:v libx264 -preset slow -crf 30 -c:a aac -b:a 128k $2
|
||||
${pkgs.ffmpeg}/bin/ffmpeg -i $1 -c:v libx264 -preset slow -crf 30 -c:a aac -b:a 128k "$1.mp4"
|
||||
}
|
||||
|
||||
bindkey "$terminfo[kRIT5]" forward-word
|
||||
@ -727,7 +729,7 @@ in
|
||||
'';
|
||||
};
|
||||
vscode = {
|
||||
enable = true;
|
||||
enable = false;
|
||||
package = pkgs.vscodium;
|
||||
extensions =
|
||||
let
|
||||
@ -773,13 +775,18 @@ in
|
||||
};
|
||||
|
||||
services = {
|
||||
gpg-agent = rec {
|
||||
gpg-agent =
|
||||
let
|
||||
defaultCacheTtl = 3600 * 6;
|
||||
maxCacheTtl = 3600 * 24;
|
||||
in
|
||||
{
|
||||
inherit defaultCacheTtl maxCacheTtl;
|
||||
|
||||
enable = true;
|
||||
enableSshSupport = true;
|
||||
sshKeys = [ "8369D9CA26C3EAAAB8302A88CEE6FD14B58AA965" ];
|
||||
defaultCacheTtl = 3600 * 6;
|
||||
defaultCacheTtlSsh = defaultCacheTtl;
|
||||
maxCacheTtl = 3600 * 24;
|
||||
maxCacheTtlSsh = maxCacheTtl;
|
||||
grabKeyboardAndMouse = false;
|
||||
pinentryFlavor = "qt";
|
||||
@ -789,13 +796,6 @@ in
|
||||
xdg = {
|
||||
enable = true;
|
||||
configFile = {
|
||||
# "oguri/config".text = ''
|
||||
# [output *]
|
||||
# image=/home/patriot/wallpaper.gif
|
||||
# filter=nearest
|
||||
# scaling-mode=fill
|
||||
# anchor=center
|
||||
# '';
|
||||
"kak/user/kakrc".text = ''
|
||||
source "%val{config}/user/color/colorscheme.kak"
|
||||
'';
|
||||
|
||||
Loading…
Reference in New Issue
Block a user