servius/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[feat] Add catppuccin theme getter

Browse Source
This commit is contained in:
uttarayan21
2024-03-04 04:01:14 +05:30
parent b590e705b5
commit 1d8361356e
9 changed files with 120 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
config/nix/common/home.nix
View File

@@ -12,6 +12,9 @@ in
] ++ (if device.isLinux then [ ../linux ] else [ ])
++ (if !lazy then [ ./nvim ] else [ ]);
services.swayosd.enable = true;
home.packages = with pkgs;
[
yt-dlp
@@ -46,11 +49,9 @@ in
(nerdfonts.override { fonts = [ "Hasklig" ]; })
mpv
] ++ (if device.isLinux then [
openssl
openssl.dev
polkit-kde-agent
dig
mullvad
kdeconnect
steam-run
(pkgs.catppuccin-gtk.override {
variant = "mocha";
@@ -63,7 +64,6 @@ in
flavor = "mocha";
})
swaynotificationcenter
openocd-rp2040
usbutils
picotool
handlr-regex
@@ -190,17 +190,11 @@ in
enable = true;
config = { theme = "catppuccin"; };
themes = {
catppuccin =
let flavor = "mocha";
in {
src = pkgs.fetchFromGitHub {
owner = "catppuccin";
repo = "bat";
rev = "main";
sha256 = "sha256-6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw";
};
file = "Catppuccin-${flavor}.tmTheme";
};
# catppuccin =
# {
# src = "${pkgs.catppuccinThemes.bat}";
# file = "Catppuccin-mocha.tmTheme";
# };
};
};

2
config/nix/common/wezterm.nix
View File

@@ -12,7 +12,7 @@
}),
color_scheme = "Catppuccin Mocha",
font_size = 16,
initial_cols = 120,
initial_cols = 200,
hide_tab_bar_if_only_one_tab = true,
window_background_opacity = 0.8,
cursor_blink_rate = 8,

47
config/nix/flake.nix
View File

@@ -78,8 +78,16 @@
};
outputs = { nixpkgs, home-manager, nix-darwin, flake-utils, anyrun, nur
, neovim-nightly-overlay, ... }@inputs:
outputs =
{ nixpkgs
, home-manager
, nix-darwin
, flake-utils
, anyrun
, nur
, neovim-nightly-overlay
, ...
}@inputs:
let
config_devices = [
{
@@ -165,7 +173,12 @@
};
};
catppuccinThemes = final: prev: {
catppuccinThemes = ./themes/catppuccin.nix;
};
overlays = [
catppuccinThemes
vimPlugins
tmuxPlugins
inputs.neovim-nightly-overlay.overlay
@@ -174,20 +187,24 @@
inputs.nixneovimplugins.overlays.default
nur.overlay
];
in {
nixosConfigurations = let devices = nixos_devices;
in import ./nixos/device.nix {
inherit devices inputs nixpkgs home-manager overlays nur;
};
in
{
nixosConfigurations =
let devices = nixos_devices;
in import ./nixos/device.nix {
inherit devices inputs nixpkgs home-manager overlays nur;
};
darwinConfigurations = let devices = darwin_devices;
in import ./darwin/device.nix {
inherit devices inputs nixpkgs home-manager overlays nix-darwin;
};
darwinConfigurations =
let devices = darwin_devices;
in import ./darwin/device.nix {
inherit devices inputs nixpkgs home-manager overlays nix-darwin;
};
homeConfigurations = let devices = linux_devices;
in import ./linux/device.nix {
inherit devices inputs nixpkgs home-manager overlays;
};
homeConfigurations =
let devices = linux_devices;
in import ./linux/device.nix {
inherit devices inputs nixpkgs home-manager overlays;
};
};
}

5
config/nix/linux/default.nix
View File

@@ -1,4 +1,4 @@
{ pkgs, device, nur, ... }: {
{ pkgs, device, nur, inputs, ... }: {
imports = [
../common/firefox.nix
../linux/hyprland.nix
@@ -7,6 +7,9 @@
../linux/ironbar
../linux/foot.nix
];
services.kdeconnect.enable = true;
systemd.user.services.spotify-player = {
Install = { WantedBy = [ "graphical-session.target" ]; };
Unit = {

31
config/nix/linux/hyprland.nix
View File

@@ -1,7 +1,18 @@
{ pkgs, ... }: {
wayland.windowManager.hyprland = {
enable = true;
settings = {
source =
let
catppuccin = pkgs.fetchFromGitHub {
owner = "catppuccin";
repo = "hyprland";
rev = "main";
sha256 = "sha256-9BhZq9J1LmHfAPBqOr64chiAEzS+YV6zqe9ma95V3no";
};
in
"${catppuccin}/themes/mocha.conf";
monitor = [
",preferred,auto,auto"
"DP-1, 2560x1440@170, 0x0, 1, transform, 0"
@@ -104,13 +115,11 @@
"QT_QPA_PLATFORM,wayland"
];
exec-once = [
"${pkgs.swayosd}/bin/swayosd"
"${pkgs.swww}/bin/swww init; swww img ~/.local/share/dotfiles/images/wallpaper.jpg"
"${pkgs.swayosd}/bin/swayosd-server"
# "${pkgs.swww}/bin/swww init; swww img ~/.local/share/dotfiles/images/wallpaper.jpg"
"${pkgs.ironbar}/bin/ironbar"
"${pkgs.nextcloud-client}/bin/nextcloud --background"
"/usr/lib/polkit-kde-authentication-agent-1"
"${pkgs.kdeconnect}/libexec/kdeconnectd"
# "aa-notify -p -s 1 -w 60 -f /var/log/audit/audit.log"
];
"$mainMod" = "SUPER";
@@ -127,16 +136,16 @@
"$mainMod, d, exec, ${pkgs.anyrun}/bin/anyrun"
"$mainMod, Space, exec, ${pkgs.anyrun}/bin/anyrun"
"$mainMod, p, pseudo, # dwindle"
"$mainMod, v, togglesplit, # dwindle"
"$mainMod, v, togglesplit,"
"$mainMod, a, exec, swaync-client -t"
"$mainMod, Tab, cyclenext"
# Audio
",xf86audioraisevolume, exec, ${pkgs.swayosd}/bin/swayosd --output-volume raise"
",xf86audiolowervolume, exec, ${pkgs.swayosd}/bin/swayosd --output-volume lower"
",xf86audiomute, exec, ${pkgs.swayosd}/bin/swayosd --output-volume mute-toggle"
",xf86audioprev, exec, /home/fs0c131y/.cargo/bin/mctl prev"
",xf86audionext, exec, /home/fs0c131y/.cargo/bin/mctl next"
",xf86audioplay, exec, /home/fs0c131y/.cargo/bin/mctl toggle"
",xf86audioraisevolume, exec, ${pkgs.swayosd}/bin/swayosd-client --output-volume raise"
",xf86audiolowervolume, exec, ${pkgs.swayosd}/bin/swayosd-client --output-volume lower"
",xf86audiomute, exec, ${pkgs.swayosd}/bin/swayosd-client --output-volume mute-toggle"
# ",xf86audioprev, exec, /home/fs0c131y/.cargo/bin/mctl prev"
# ",xf86audionext, exec, /home/fs0c131y/.cargo/bin/mctl next"
# ",xf86audioplay, exec, /home/fs0c131y/.cargo/bin/mctl toggle"
# Screenshot
# "$mainMod,Print, exec, grim"

2
config/nix/linux/ironbar/default.nix
View File

@@ -36,7 +36,7 @@
type = "sys_info";
format = [
" CPU {cpu_percent}% | {temp_c:coretemp-Package-id-0}°C"
" RAM {memory_used}GB/{memory_total}GB ({memory_percent})%"
" RAM {memory_used}GB/{memory_total}GB"
];
interval = {
cpu = 1;

27
config/nix/nixos/configuration.nix
View File

@@ -7,6 +7,7 @@
./hardware-configuration.nix
];
security.polkit.enable = true;
services.mullvad-vpn.enable = true;
services.resolved.enable = true;
@@ -15,6 +16,32 @@
pkiBundle = "/etc/secureboot";
};
services.greetd =
let
tuigreet = "${pkgs.greetd.tuigreet}/bin/tuigreet";
hyprland-session = "${pkgs.hyprland}/share/wayland-sessions";
in
{
enable = true;
settings = {
default_session = {
command = "${tuigreet} --time --remember --remember-session --sessions ${hyprland-session}";
user = "greeter";
};
};
};
systemd.services.greetd.serviceConfig = {
Type = "idle";
StandardInput = "tty";
StandardOutput = "tty";
StandardError = "journal"; # Without this errors will spam on screen
# Without these bootlogs will spam on screen
TTYReset = true;
TTYVHangup = true;
TTYVTDisallocate = true;
};
# services.wireplumber.configPackages = with pkgs; [ bluez ];
# environment.etc = {

26
config/nix/themes/catppuccin.nix Normal file
View File

@@ -0,0 +1,26 @@
{ pkgs, flavor, ... }:
let
mkCatppuccin = { owner ? "catppuccin", item, rev ? "main", sha256 ? pkgs.lib.fakeSha256 }:
pkgs.stdenv.mkDerivation {
pname = item;
version = "0.0.1";
src = pkgs.fetchFromGitHub {
inherit owner rev sha256;
repo = item;
};
};
in
{
bat = mkCatppuccin {
item = "bat";
};
hyprland = mkCatppuccin {
item = "hyprland";
};
starship = mkCatppuccin {
item = "starship";
};
}