feat: cleanup etc
This commit is contained in:
parent
7a42db9d6f
commit
232adff8dc
GPG key ID:
3786770EDBC2B481
15 changed files with 103 additions and 286 deletions
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"catppuccin-bat": {
|
||||
"cargoLocks": null,
|
||||
"date": "2024-03-12",
|
||||
"date": "2024-04-09",
|
||||
"extract": null,
|
||||
"name": "catppuccin-bat",
|
||||
"passthru": null,
|
||||
|
|
@ -11,12 +11,12 @@
|
|||
"fetchSubmodules": false,
|
||||
"leaveDotGit": false,
|
||||
"name": null,
|
||||
"rev": "7f5f4f8be7ca2a71712c82e3ce8723674a22bab1",
|
||||
"sha256": "sha256-DkNZqPhs+U/LCMiYp4gFAorElWik5OGWe12dYinqKWc=",
|
||||
"rev": "b8134f01b0ac176f1cf2a7043a5abf5a1a29457b",
|
||||
"sha256": "sha256-gzf0/Ltw8mGMsEFBTUuN33MSFtUP4xhdxfoZFntaycQ=",
|
||||
"type": "git",
|
||||
"url": "https://github.com/catppuccin/bat"
|
||||
},
|
||||
"version": "7f5f4f8be7ca2a71712c82e3ce8723674a22bab1"
|
||||
"version": "b8134f01b0ac176f1cf2a7043a5abf5a1a29457b"
|
||||
},
|
||||
"catppuccin-wezterm": {
|
||||
"cargoLocks": null,
|
||||
|
|
@ -39,7 +39,7 @@
|
|||
},
|
||||
"catppuccin-zsh-fsh": {
|
||||
"cargoLocks": null,
|
||||
"date": "2024-03-25",
|
||||
"date": "2024-04-09",
|
||||
"extract": null,
|
||||
"name": "catppuccin-zsh-fsh",
|
||||
"passthru": null,
|
||||
|
|
@ -49,12 +49,12 @@
|
|||
"fetchSubmodules": false,
|
||||
"leaveDotGit": false,
|
||||
"name": null,
|
||||
"rev": "8af8701de8a00b10c072b7bef4f7b74558a2cd15",
|
||||
"sha256": "sha256-O80XzCAw02/bXkMLgf3v71NLjVI4uCaC1i0eAZstA/0=",
|
||||
"rev": "dd7baca6e0e943f36d1a6721820346e91f25065f",
|
||||
"sha256": "sha256-qd/+MHmgP+dOnYm6meSu5oCZ/TunCWGHnHqAXm79ERw=",
|
||||
"type": "git",
|
||||
"url": "https://github.com/catppuccin/zsh-fsh"
|
||||
},
|
||||
"version": "8af8701de8a00b10c072b7bef4f7b74558a2cd15"
|
||||
"version": "dd7baca6e0e943f36d1a6721820346e91f25065f"
|
||||
},
|
||||
"nekowinston-wezterm-bar": {
|
||||
"cargoLocks": null,
|
||||
|
|
|
|||
|
|
@ -3,16 +3,16 @@
|
|||
{
|
||||
catppuccin-bat = {
|
||||
pname = "catppuccin-bat";
|
||||
version = "7f5f4f8be7ca2a71712c82e3ce8723674a22bab1";
|
||||
version = "b8134f01b0ac176f1cf2a7043a5abf5a1a29457b";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/catppuccin/bat";
|
||||
rev = "7f5f4f8be7ca2a71712c82e3ce8723674a22bab1";
|
||||
rev = "b8134f01b0ac176f1cf2a7043a5abf5a1a29457b";
|
||||
fetchSubmodules = false;
|
||||
deepClone = false;
|
||||
leaveDotGit = false;
|
||||
sha256 = "sha256-DkNZqPhs+U/LCMiYp4gFAorElWik5OGWe12dYinqKWc=";
|
||||
sha256 = "sha256-gzf0/Ltw8mGMsEFBTUuN33MSFtUP4xhdxfoZFntaycQ=";
|
||||
};
|
||||
date = "2024-03-12";
|
||||
date = "2024-04-09";
|
||||
};
|
||||
catppuccin-wezterm = {
|
||||
pname = "catppuccin-wezterm";
|
||||
|
|
@ -29,16 +29,16 @@
|
|||
};
|
||||
catppuccin-zsh-fsh = {
|
||||
pname = "catppuccin-zsh-fsh";
|
||||
version = "8af8701de8a00b10c072b7bef4f7b74558a2cd15";
|
||||
version = "dd7baca6e0e943f36d1a6721820346e91f25065f";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/catppuccin/zsh-fsh";
|
||||
rev = "8af8701de8a00b10c072b7bef4f7b74558a2cd15";
|
||||
rev = "dd7baca6e0e943f36d1a6721820346e91f25065f";
|
||||
fetchSubmodules = false;
|
||||
deepClone = false;
|
||||
leaveDotGit = false;
|
||||
sha256 = "sha256-O80XzCAw02/bXkMLgf3v71NLjVI4uCaC1i0eAZstA/0=";
|
||||
sha256 = "sha256-qd/+MHmgP+dOnYm6meSu5oCZ/TunCWGHnHqAXm79ERw=";
|
||||
};
|
||||
date = "2024-03-25";
|
||||
date = "2024-04-09";
|
||||
};
|
||||
nekowinston-wezterm-bar = {
|
||||
pname = "nekowinston-wezterm-bar";
|
||||
|
|
|
|||
99
flake.lock
99
flake.lock
|
|
@ -17,11 +17,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1712079060,
|
||||
"narHash": "sha256-/JdiT9t+zzjChc5qQiF+jhrVhRt8figYH29rZO7pFe4=",
|
||||
"lastModified": 1714136352,
|
||||
"narHash": "sha256-BtWQ2Th/jamO1SlD+2ASSW5Jaf7JhA/JLpQHk0Goqpg=",
|
||||
"owner": "ryantm",
|
||||
"repo": "agenix",
|
||||
"rev": "1381a759b205dff7a6818733118d02253340fd5e",
|
||||
"rev": "24a7ea390564ccd5b39b7884f597cfc8d7f6f44e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -77,11 +77,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1713403580,
|
||||
"narHash": "sha256-VP3AiTLL40Zhr+99SwKjIE+ifRy/elhvGIF5W92J+fs=",
|
||||
"lastModified": 1713966850,
|
||||
"narHash": "sha256-AHAkkTUjk86rED3pQh8i4OiSze+OHe697L0o3zhv89A=",
|
||||
"owner": "catppuccin",
|
||||
"repo": "vscode",
|
||||
"rev": "4dd5fa89173bc931e882f21da0de1609f1db9f39",
|
||||
"rev": "75d96f3ae48b249f77124688a026ca5d7eeb5fb2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -97,11 +97,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1713543876,
|
||||
"narHash": "sha256-olEWxacm1xZhAtpq+ZkEyQgR4zgfE7ddpNtZNvubi3g=",
|
||||
"lastModified": 1713946171,
|
||||
"narHash": "sha256-lc75rgRQLdp4Dzogv5cfqOg6qYc5Rp83oedF2t0kDp8=",
|
||||
"owner": "lnl7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "9e7c20ffd056e406ddd0276ee9d89f09c5e5f4ed",
|
||||
"rev": "230a197063de9287128e2c68a7a4b0cd7d0b50a7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -200,11 +200,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1713732794,
|
||||
"narHash": "sha256-AYCofb8Zu4Mbc1lHDtju/uxeARawRijmOueAqEMEfMU=",
|
||||
"lastModified": 1714042918,
|
||||
"narHash": "sha256-4AItZA3EQIiSNAxliuYEJumw/LaVfrMv84gYyrs0r3U=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "670d9ecc3e46a6e3265c203c2d136031a3d3548e",
|
||||
"rev": "0c5704eceefcb7bb238a958f532a86e3b59d76db",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -219,11 +219,11 @@
|
|||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1713683280,
|
||||
"narHash": "sha256-6ll6cjXdrJ8jPT6C4ZSLAt2opdOCb3ezW2SHtUCAG8g=",
|
||||
"lastModified": 1714118177,
|
||||
"narHash": "sha256-7OkL9iZeJAHuHqGA0efWalYvdyQA5jCzE0g8R8wqm6M=",
|
||||
"owner": "nekowinston",
|
||||
"repo": "nur",
|
||||
"rev": "2fac00c44699317fc3dff89aa5c1def9767f72b1",
|
||||
"rev": "01c681d41bb4e3d0c483586c5b0ab0d23dd83dbd",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -232,26 +232,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix-deno": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1706786668,
|
||||
"narHash": "sha256-MDbSYWjitdx9Cqyzc0JPLWDvIeX109i4VZPwdkWAyHY=",
|
||||
"owner": "nekowinston",
|
||||
"repo": "nix-deno",
|
||||
"rev": "a5664f47572c365e8ef31d8b3a6c8abfe88648ce",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nekowinston",
|
||||
"repo": "nix-deno",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix-index-database": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
|
@ -259,11 +239,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1713668931,
|
||||
"narHash": "sha256-rVlwWQlgFGGK3aPVcKmtYqWgjYnPah5FOIsYAqrMN2w=",
|
||||
"lastModified": 1713869268,
|
||||
"narHash": "sha256-o3CMQeu/S8/4zU0pMtYg51rd1FWdJsI2Xohzng1Ysdg=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "07ece11b22217b8459df589f858e92212b74f1a1",
|
||||
"rev": "dcb6ac44922858ce3a5b46f77a36d6030181460c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -283,11 +263,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1713662650,
|
||||
"narHash": "sha256-pAAXTH3bUBELrXFGgRjzy/67Lm5trkFB2SXp6epMxX0=",
|
||||
"lastModified": 1714094499,
|
||||
"narHash": "sha256-SC6tm901h2tzRxd6hfzn5/bgLJ8R4ng39R7SIkg6wlo=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-vscode-extensions",
|
||||
"rev": "03c7d19b4fbf7dd0f9890c310e809ca04da76c4e",
|
||||
"rev": "e05ff96b9f710d57d7cd60641f0273176debf222",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -314,11 +294,11 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1713537308,
|
||||
"narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=",
|
||||
"lastModified": 1714076141,
|
||||
"narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f",
|
||||
"rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -346,11 +326,11 @@
|
|||
},
|
||||
"nur": {
|
||||
"locked": {
|
||||
"lastModified": 1713732355,
|
||||
"narHash": "sha256-7dtWxV9O1ujFcZcYmaiBVdL3Snk0Y7AFL6pufM31alk=",
|
||||
"lastModified": 1714170749,
|
||||
"narHash": "sha256-ISFPLQfdYvIJjGfsBop5TuB13JcGU2IDME3C4g70FDE=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nur",
|
||||
"rev": "9982d9ed76f4b0335d8e016fe7c71f21fd4ef5eb",
|
||||
"rev": "d8399969cca6025f5cbbfc4aa1e721877dd6d583",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -374,11 +354,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1712897695,
|
||||
"narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=",
|
||||
"lastModified": 1713954846,
|
||||
"narHash": "sha256-RWFafuSb5nkWGu8dDbW7gVb8FOQOPqmX/9MlxUUDguw=",
|
||||
"owner": "cachix",
|
||||
"repo": "pre-commit-hooks.nix",
|
||||
"rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8",
|
||||
"rev": "6fb82e44254d6a0ece014ec423cb62d92435336f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -398,7 +378,6 @@
|
|||
"flake-utils": "flake-utils",
|
||||
"home-manager": "home-manager",
|
||||
"nekowinston-nur": "nekowinston-nur",
|
||||
"nix-deno": "nix-deno",
|
||||
"nix-index-database": "nix-index-database",
|
||||
"nix-vscode-extensions": "nix-vscode-extensions",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
|
|
@ -435,11 +414,11 @@
|
|||
"scenefx": "scenefx"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1713498711,
|
||||
"narHash": "sha256-VxTnCdx+17tASYxsOiqKCAAda22P9eV7IFxnXl3wZh8=",
|
||||
"lastModified": 1713822111,
|
||||
"narHash": "sha256-aQVHGi6oqceTlyzzzZnErVHYDJbDfG0sdWe+ItuH8a4=",
|
||||
"owner": "willpower3309",
|
||||
"repo": "swayfx",
|
||||
"rev": "4b954d5a05d986afcaaf488e744c5566a2d031ef",
|
||||
"rev": "a5a69d4d4e9a8fe306e27ca46cde3a8b9d312ae3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -473,11 +452,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1709622318,
|
||||
"narHash": "sha256-bTscF0366xtoIXgH7Zq+Mn0mpX3w4h/2xKpHiYMyLNc=",
|
||||
"lastModified": 1713958148,
|
||||
"narHash": "sha256-8PDNi/dgoI2kyM7uSiU4eoLBqUKoA+3TXuz+VWmuCOc=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixos-vscode-server",
|
||||
"rev": "d0ed9b8cf1f0a71f110df9119489ab047e0726bd",
|
||||
"rev": "fc900c16efc6a5ed972fb6be87df018bcf3035bc",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -497,11 +476,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1713528946,
|
||||
"narHash": "sha256-IBQta+xrEaI2S5UmYrXcgV7Tu7rGLQu2V3TeJseLPSg=",
|
||||
"lastModified": 1714134704,
|
||||
"narHash": "sha256-jgTn20s3qzar/IqhjQcEO+dIQbT4hBFIloVntiCURkA=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixos-wsl",
|
||||
"rev": "63c1247e12f269396ed2df8cdec3aed1f0f3928c",
|
||||
"rev": "4fb773cffed9bf1efdabcc01b25637eaeb4e8e9c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -127,10 +127,6 @@
|
|||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
nekowinston-nur.url = "github:nekowinston/nur";
|
||||
nix-deno = {
|
||||
url = "github:nekowinston/nix-deno";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
catppuccin-vsc = {
|
||||
url = "github:catppuccin/vscode";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
|
|
|||
|
|
@ -6,60 +6,11 @@
|
|||
}: let
|
||||
inherit (pkgs.stdenv) isDarwin isLinux;
|
||||
|
||||
overrides = {
|
||||
mocha = {
|
||||
rosewater = "#ece3e1";
|
||||
flamingo = "#e1d2d2";
|
||||
pink = "#ddccd8";
|
||||
mauve = "#bbb2c9";
|
||||
red = "#c4a2aa";
|
||||
maroon = "#cbadb1";
|
||||
peach = "#d5beb4";
|
||||
yellow = "#ece3d3";
|
||||
green = "#b9ddb6";
|
||||
teal = "#badad4";
|
||||
sky = "#b8d4db";
|
||||
sapphire = "#a9c0ce";
|
||||
blue = "#aab3c7";
|
||||
lavender = "#bfc1d2";
|
||||
text = "#d3d6e1";
|
||||
subtext1 = "#bec2d2";
|
||||
subtext0 = "#a8adc3";
|
||||
overlay2 = "#9299b4";
|
||||
overlay1 = "#7c84a5";
|
||||
overlay0 = "#686f94";
|
||||
surface2 = "#555a7b";
|
||||
surface1 = "#434664";
|
||||
surface0 = "#30314b";
|
||||
base = "#101010";
|
||||
mantle = "#090909";
|
||||
crust = "#080808";
|
||||
};
|
||||
};
|
||||
|
||||
removeHashes = attrs: builtins.mapAttrs (k: v: lib.removePrefix "#" v) attrs;
|
||||
|
||||
fromYAMLfile = f: let
|
||||
jsonFile = pkgs.runCommand "in-${f}.json" {nativeBuildInputs = [pkgs.gojq];} ''
|
||||
gojq --yaml-input < "${f}" > "$out"
|
||||
'';
|
||||
in
|
||||
builtins.fromJSON (builtins.readFile jsonFile);
|
||||
|
||||
vividYaml = let
|
||||
f = flavor: fromYAMLfile "${pkgs.vivid.src}/themes/catppuccin-${flavor}.yml";
|
||||
in {
|
||||
latte = builtins.toJSON (f "latte");
|
||||
mocha = builtins.toJSON (lib.recursiveUpdate (f "mocha") {colors = removeHashes overrides.mocha;});
|
||||
};
|
||||
|
||||
vividBuilder = flavor:
|
||||
pkgs.runCommand "vivid-${flavor}" {
|
||||
nativeBuildInputs = [pkgs.vivid];
|
||||
} ''
|
||||
echo '${builtins.getAttr flavor vividYaml}' > flavor.yml
|
||||
cat ./flavor.yml
|
||||
vivid generate ./flavor.yml > $out
|
||||
vivid generate ${pkgs.vivid.src}/themes/catppuccin-${flavor}.yml > $out
|
||||
'';
|
||||
vividLatte = vividBuilder "latte";
|
||||
vividMocha = vividBuilder "mocha";
|
||||
|
|
@ -68,7 +19,7 @@ in {
|
|||
home.packages = [
|
||||
(pkgs.writeShellApplication {
|
||||
name = "dark-mode-ternary";
|
||||
runtimeInputs = [pkgs.gnugrep];
|
||||
runtimeInputs = lib.optionals isLinux [pkgs.dbus pkgs.gnugrep];
|
||||
text = let
|
||||
queryCommand =
|
||||
if isLinux
|
||||
|
|
|
|||
|
|
@ -8,8 +8,7 @@
|
|||
in {
|
||||
config = lib.mkIf config.isGraphical {
|
||||
home.packages =
|
||||
[]
|
||||
++ (lib.optionals isDarwin [
|
||||
(lib.optionals isDarwin [
|
||||
(pkgs.discord.override {withOpenASAR = true;})
|
||||
])
|
||||
++ (lib.optionals isLinux [
|
||||
|
|
|
|||
|
|
@ -7,36 +7,6 @@
|
|||
"statusBar.noFolderForeground": "accent"
|
||||
}
|
||||
},
|
||||
"catppuccin.colorOverrides": {
|
||||
"mocha": {
|
||||
"rosewater": "#ece3e1",
|
||||
"flamingo": "#e1d2d2",
|
||||
"pink": "#ddccd8",
|
||||
"mauve": "#bbb2c9",
|
||||
"red": "#c4a2aa",
|
||||
"maroon": "#cbadb1",
|
||||
"peach": "#d5beb4",
|
||||
"yellow": "#ece3d3",
|
||||
"green": "#b9ddb6",
|
||||
"teal": "#badad4",
|
||||
"sky": "#b8d4db",
|
||||
"sapphire": "#a9c0ce",
|
||||
"blue": "#aab3c7",
|
||||
"lavender": "#bfc1d2",
|
||||
"text": "#d3d6e1",
|
||||
"subtext1": "#bec2d2",
|
||||
"subtext0": "#a8adc3",
|
||||
"overlay2": "#9299b4",
|
||||
"overlay1": "#7c84a5",
|
||||
"overlay0": "#686f94",
|
||||
"surface2": "#555a7b",
|
||||
"surface1": "#434664",
|
||||
"surface0": "#30314b",
|
||||
"base": "#101010",
|
||||
"mantle": "#090909",
|
||||
"crust": "#080808"
|
||||
}
|
||||
},
|
||||
"catppuccin.extraBordersEnabled": true,
|
||||
"debug.onTaskErrors": "debugAnyway",
|
||||
"diffEditor.ignoreTrimWhitespace": false,
|
||||
|
|
@ -78,8 +48,7 @@
|
|||
"window.autoDetectColorScheme": true,
|
||||
"window.commandCenter": false,
|
||||
"window.titleBarStyle": "custom",
|
||||
"workbench.colorTheme": "Catppuccin Latte",
|
||||
"workbench.iconTheme": "material-icon-theme",
|
||||
"workbench.colorTheme": "Catppuccin Mocha",
|
||||
"workbench.preferredDarkColorTheme": "Catppuccin Mocha",
|
||||
"workbench.layoutControl.enabled": false,
|
||||
"workbench.preferredLightColorTheme": "Catppuccin Latte",
|
||||
|
|
@ -288,5 +257,24 @@
|
|||
"material-icon-theme.saturation": 0.2,
|
||||
"zenMode.centerLayout": false,
|
||||
"zenMode.fullScreen": false,
|
||||
"zenMode.showTabs": "none"
|
||||
"zenMode.showTabs": "none",
|
||||
"workbench.iconTheme": "catppuccin-mocha",
|
||||
"remote.SSH.useLocalServer": false,
|
||||
"remote.SSH.remotePlatform": {
|
||||
"local-nixos": "linux"
|
||||
},
|
||||
"vscord.app.whitelist": ["505490445468696576"],
|
||||
"vscord.app.whitelistEnabled": true,
|
||||
"vscord.ignore.workspaces": [
|
||||
"/Users/winston/Code/freelance",
|
||||
"/Users/winston/Code/work",
|
||||
"/home/winston/Code/freelance",
|
||||
"/home/winston/Code/work"
|
||||
],
|
||||
"vscord.ignore.workspacesText": {
|
||||
"/Users/winston/Code/freelance": "Freelancing",
|
||||
"/Users/winston/Code/work": "Working",
|
||||
"/home/winston/Code/freelance": "Freelancing",
|
||||
"/home/winston/Code/work": "Working"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@
|
|||
}: let
|
||||
mkSymlink = path: config.lib.file.mkOutOfStoreSymlink "${flakePath}/home/apps/wezterm/${path}";
|
||||
srcs = pkgs.callPackage ../../_sources/generated.nix {};
|
||||
inherit (pkgs.stdenv) isDarwin;
|
||||
in {
|
||||
# use the GUI version & config when we have a gui, else just get terminfo
|
||||
config = lib.mkMerge [
|
||||
|
|
@ -16,10 +15,7 @@ in {
|
|||
})
|
||||
|
||||
(lib.mkIf config.isGraphical {
|
||||
programs.wezterm = {
|
||||
enable = true;
|
||||
package = lib.mkIf isDarwin pkgs.nur.repos.nekowinston.wezterm-nightly;
|
||||
};
|
||||
programs.wezterm.enable = true;
|
||||
|
||||
xdg.configFile = {
|
||||
"wezterm/wezterm.lua".source = mkSymlink "wezterm.lua";
|
||||
|
|
|
|||
|
|
@ -29,21 +29,6 @@ local openUrl = act.QuickSelectArgs({
|
|||
end),
|
||||
})
|
||||
|
||||
local changeCtpFlavor = act.InputSelector({
|
||||
title = "Change Catppuccin flavor",
|
||||
choices = {
|
||||
{ label = "Mocha" },
|
||||
{ label = "Macchiato" },
|
||||
{ label = "Frappe" },
|
||||
{ label = "Latte" },
|
||||
},
|
||||
action = wezterm.action_callback(function(window, _, _, label)
|
||||
if label then
|
||||
window:set_config_overrides({ color_scheme = "Catppuccin " .. label })
|
||||
end
|
||||
end),
|
||||
})
|
||||
|
||||
-- use 'Backslash' to split horizontally
|
||||
map("\\", "LEADER", act.SplitHorizontal({ domain = "CurrentPaneDomain" }))
|
||||
-- and 'Minus' to split vertically
|
||||
|
|
@ -66,7 +51,6 @@ map("l", "LEADER|SHIFT", act.AdjustPaneSize({ "Right", 5 }))
|
|||
-- spawn & close
|
||||
map("c", "LEADER", act.SpawnTab("CurrentPaneDomain"))
|
||||
map("x", "LEADER", act.CloseCurrentPane({ confirm = true }))
|
||||
map("t", "LEADER", changeCtpFlavor)
|
||||
map("t", { "SHIFT|CTRL", "SUPER" }, act.SpawnTab("CurrentPaneDomain"))
|
||||
map("w", { "SHIFT|CTRL", "SUPER" }, act.CloseCurrentTab({ confirm = true }))
|
||||
map("n", { "SHIFT|CTRL", "SUPER" }, act.SpawnWindow)
|
||||
|
|
|
|||
|
|
@ -29,36 +29,6 @@ if utils.is_darwin() then
|
|||
end
|
||||
|
||||
require("catppuccin.plugin").apply_to_config(c, {
|
||||
color_overrides = {
|
||||
mocha = {
|
||||
rosewater = "#ece3e1",
|
||||
flamingo = "#e1d2d2",
|
||||
pink = "#ddccd8",
|
||||
mauve = "#bbb2c9",
|
||||
red = "#c4a2aa",
|
||||
maroon = "#cbadb1",
|
||||
peach = "#d5beb4",
|
||||
yellow = "#ece3d3",
|
||||
green = "#b9ddb6",
|
||||
teal = "#badad4",
|
||||
sky = "#b8d4db",
|
||||
sapphire = "#a9c0ce",
|
||||
blue = "#aab3c7",
|
||||
lavender = "#bfc1d2",
|
||||
text = "#d3d6e1",
|
||||
subtext1 = "#bec2d2",
|
||||
subtext0 = "#a8adc3",
|
||||
overlay2 = "#9299b4",
|
||||
overlay1 = "#7c84a5",
|
||||
overlay0 = "#686f94",
|
||||
surface2 = "#555a7b",
|
||||
surface1 = "#434664",
|
||||
surface0 = "#30314b",
|
||||
base = "#101010",
|
||||
mantle = "#090909",
|
||||
crust = "#080808",
|
||||
},
|
||||
},
|
||||
sync = true,
|
||||
})
|
||||
|
||||
|
|
|
|||
|
|
@ -10,56 +10,6 @@
|
|||
inherit (plugin) file src;
|
||||
})
|
||||
plugins);
|
||||
overrides = {
|
||||
mocha = {
|
||||
rosewater = "#ece3e1";
|
||||
flamingo = "#e1d2d2";
|
||||
pink = "#ddccd8";
|
||||
mauve = "#bbb2c9";
|
||||
red = "#c4a2aa";
|
||||
maroon = "#cbadb1";
|
||||
peach = "#d5beb4";
|
||||
yellow = "#ece3d3";
|
||||
green = "#b9ddb6";
|
||||
teal = "#badad4";
|
||||
sky = "#b8d4db";
|
||||
sapphire = "#a9c0ce";
|
||||
blue = "#aab3c7";
|
||||
lavender = "#bfc1d2";
|
||||
text = "#d3d6e1";
|
||||
subtext1 = "#bec2d2";
|
||||
subtext0 = "#a8adc3";
|
||||
overlay2 = "#9299b4";
|
||||
overlay1 = "#7c84a5";
|
||||
overlay0 = "#686f94";
|
||||
surface2 = "#555a7b";
|
||||
surface1 = "#434664";
|
||||
surface0 = "#30314b";
|
||||
base = "#101010";
|
||||
mantle = "#090909";
|
||||
crust = "#080808";
|
||||
};
|
||||
};
|
||||
ctpBat = pkgs.denoPlatform.mkDenoDerivation {
|
||||
inherit (srcs.catppuccin-bat) pname version src;
|
||||
buildPhase = ''
|
||||
deno run -A ./src/main.ts --overrides '${builtins.toJSON overrides}'
|
||||
'';
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
cp ./themes/* $out/
|
||||
'';
|
||||
};
|
||||
ctpZshFsh = pkgs.denoPlatform.mkDenoDerivation {
|
||||
inherit (srcs.catppuccin-zsh-fsh) pname version src;
|
||||
buildPhase = ''
|
||||
deno run -A ./build.ts --overrides '${builtins.toJSON overrides}'
|
||||
'';
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
cp ./themes/* $out/
|
||||
'';
|
||||
};
|
||||
in {
|
||||
home.sessionVariables = {
|
||||
LESS = "-R --use-color";
|
||||
|
|
@ -82,19 +32,19 @@ in {
|
|||
enable = true;
|
||||
themes = {
|
||||
"Catppuccin Latte" = {
|
||||
src = ctpBat;
|
||||
src = "${srcs.catppuccin-bat.src}/themes";
|
||||
file = "Catppuccin Latte.tmTheme";
|
||||
};
|
||||
"Catppuccin Frappe" = {
|
||||
src = ctpBat;
|
||||
src = "${srcs.catppuccin-bat.src}/themes";
|
||||
file = "Catppuccin Frappe.tmTheme";
|
||||
};
|
||||
"Catppuccin Macchiato" = {
|
||||
src = ctpBat;
|
||||
src = "${srcs.catppuccin-bat.src}/themes";
|
||||
file = "Catppuccin Macchiato.tmTheme";
|
||||
};
|
||||
"Catppuccin Mocha" = {
|
||||
src = ctpBat;
|
||||
src = "${srcs.catppuccin-bat.src}/themes";
|
||||
file = "Catppuccin Mocha.tmTheme";
|
||||
};
|
||||
};
|
||||
|
|
@ -229,5 +179,5 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
xdg.configFile."fsh".source = "${ctpZshFsh}";
|
||||
xdg.configFile."fsh".source = "${srcs.catppuccin-zsh-fsh.src}/themes";
|
||||
}
|
||||
|
|
|
|||
25
home/xdg.nix
25
home/xdg.nix
|
|
@ -2,11 +2,12 @@
|
|||
# to make apps use XDG directories
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
inherit (pkgs.stdenv.hostPlatform) isLinux;
|
||||
inherit (config.xdg) cacheHome configHome dataHome;
|
||||
inherit (pkgs.stdenv.hostPlatform) isDarwin isLinux;
|
||||
inherit (config.xdg) cacheHome configHome dataHome stateHome;
|
||||
inherit (config.home) homeDirectory;
|
||||
in {
|
||||
home = rec {
|
||||
|
|
@ -29,13 +30,18 @@ in {
|
|||
W3M_DIR = "${dataHome}/w3m";
|
||||
WINEPREFIX = "${dataHome}/wine";
|
||||
};
|
||||
sessionPath = [
|
||||
"$HOME/.local/bin"
|
||||
"${dataHome}/krew/bin"
|
||||
"${sessionVariables.GOPATH}/bin"
|
||||
"${sessionVariables.CARGO_HOME}/bin"
|
||||
"${sessionVariables.DENO_INSTALL_ROOT}/bin"
|
||||
];
|
||||
sessionPath =
|
||||
[
|
||||
"$HOME/.local/bin"
|
||||
"${dataHome}/krew/bin"
|
||||
"${sessionVariables.GOPATH}/bin"
|
||||
"${sessionVariables.CARGO_HOME}/bin"
|
||||
"${sessionVariables.DENO_INSTALL_ROOT}/bin"
|
||||
]
|
||||
++ (lib.optionals isDarwin [
|
||||
# fix `nix profile` not being in PATH on macOS
|
||||
"${stateHome}/nix/profile/bin"
|
||||
]);
|
||||
};
|
||||
|
||||
programs.gpg.homedir = "${configHome}/gnupg";
|
||||
|
|
@ -46,6 +52,7 @@ in {
|
|||
cacheHome = "${homeDirectory}/.cache";
|
||||
configHome = "${homeDirectory}/.config";
|
||||
dataHome = "${homeDirectory}/.local/share";
|
||||
stateHome = "${homeDirectory}/.local/state";
|
||||
mimeApps = {
|
||||
enable = isLinux;
|
||||
defaultApplications = {
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@ in {
|
|||
nixpkgs.config.allowUnfree = true;
|
||||
nix = {
|
||||
gc.automatic = true;
|
||||
package = pkgs.nixVersions.nix_2_18;
|
||||
package = pkgs.nixVersions.nix_2_22;
|
||||
settings =
|
||||
{
|
||||
auto-optimise-store = true;
|
||||
experimental-features = ["auto-allocate-uids" "flakes" "nix-command" "repl-flake"];
|
||||
experimental-features = ["auto-allocate-uids" "flakes" "nix-command"];
|
||||
trusted-users = ["@sudo" "@wheel" "winston"];
|
||||
use-xdg-base-directories = true;
|
||||
warn-dirty = false;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
[catppuccin-bat]
|
||||
src.git = "https://github.com/catppuccin/bat"
|
||||
src.branch = "feat/add-overrides"
|
||||
fetch.git = "https://github.com/catppuccin/bat"
|
||||
|
||||
[catppuccin-wezterm]
|
||||
|
|
@ -9,7 +8,6 @@ fetch.git = "https://github.com/catppuccin/wezterm"
|
|||
|
||||
[catppuccin-zsh-fsh]
|
||||
src.git = "https://github.com/catppuccin/zsh-fsh"
|
||||
src.branch = "build/deno-builder"
|
||||
fetch.git = "https://github.com/catppuccin/zsh-fsh"
|
||||
|
||||
[nekowinston-wezterm-bar]
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{inputs}: [
|
||||
inputs.catppuccin-toolbox.overlays.default
|
||||
inputs.catppuccin-vsc.overlays.default
|
||||
inputs.nix-deno.overlays.default
|
||||
inputs.nix-vscode-extensions.overlays.default
|
||||
(final: prev: let
|
||||
srcs = prev.callPackages ../_sources/generated.nix {};
|
||||
|
|
|
|||
Loading…
Reference in a new issue