chore: format

This commit is contained in:
DashieTM 2024-04-18 21:10:51 +02:00
parent 84da634f57
commit 57cacdb1c9
18 changed files with 360 additions and 359 deletions

View file

@ -17,6 +17,8 @@
bibata-cursors bibata-cursors
xorg.xkbutils xorg.xkbutils
libxkbcommon libxkbcommon
gnome-icon-theme
icon-library
]; ];
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [
@ -44,12 +46,12 @@
nssmdns4 = true; nssmdns4 = true;
openFirewall = true; openFirewall = true;
}; };
# services.xserver.desktopManager.gnome.extraGSettingsOverrides = '' # services.xserver.desktopManager.gnome.extraGSettingsOverrides = ''
# [org.gnome.desktop.interface] # [org.gnome.desktop.interface]
# gtk-theme='adw-gtk3' # gtk-theme='adw-gtk3'
# cursor-theme='Bibata-Modern-Classsic' # cursor-theme='Bibata-Modern-Classsic'
# cursor-size=24 # cursor-size=24
# ''; # '';
programs.direnv = { programs.direnv = {
package = pkgs.direnv; package = pkgs.direnv;

View file

@ -1 +1 @@
{} { }

View file

@ -1 +1 @@
{} { }

View file

@ -1,6 +1,6 @@
{ {
imports = [ imports = [
./marmo.nix ./marmo.nix
./configuration.nix ./configuration.nix
]; ];
} }

View file

@ -1 +1 @@
{} { }

View file

@ -1,4 +1,4 @@
{ lib, config, ... }: { {
imports = [ imports = [
../../modules ../../modules
]; ];

View file

@ -1,6 +1,6 @@
{ {
imports = [ imports = [
./spaceship.nix ./spaceship.nix
./configuration.nix ./configuration.nix
]; ];
} }

View file

@ -3,7 +3,7 @@
hyprpaper = lib.mkOption { hyprpaper = lib.mkOption {
default = ''''; default = '''';
example = '' example = ''
hyprpaper stuff hyprpaper stuff
''; '';
type = lib.types.lines; type = lib.types.lines;
description = '' description = ''

View file

@ -1,4 +1,4 @@
#{pkgs, ...}:{ #{pkgs, ...}:{
# hello = pkgs.callPackage ./ncspot.nix; # hello = pkgs.callPackage ./ncspot.nix;
#} #}
{} { }

View file

@ -5,7 +5,7 @@
let let
toolchain = pkgs.rust-bin.selectLatestNightlyWith (toolchain: toolchain.minimal); toolchain = pkgs.rust-bin.selectLatestNightlyWith (toolchain: toolchain.minimal);
rustPlatform = pkgs.makeRustPlatform { rustPlatform = pkgs.makeRustPlatform {
cargo = toolchain; cargo = toolchain;
rustc = toolchain; rustc = toolchain;
}; };
in in

View file

@ -5,7 +5,7 @@
let let
toolchain = pkgs.rust-bin.selectLatestNightlyWith (toolchain: toolchain.minimal); toolchain = pkgs.rust-bin.selectLatestNightlyWith (toolchain: toolchain.minimal);
rustPlatform = pkgs.makeRustPlatform { rustPlatform = pkgs.makeRustPlatform {
cargo = toolchain; cargo = toolchain;
rustc = toolchain; rustc = toolchain;
}; };
in in

View file

@ -43,6 +43,7 @@ in
zenith zenith
nh nh
amberol amberol
satty
(callPackage (callPackage
../override/ncspot.nix ../override/ncspot.nix
{ }) { })

View file

@ -1,4 +1,4 @@
{ lib, pkgs, ... }: { { lib, ... }: {
services.flatpak.remotes = lib.mkOptionDefault [{ services.flatpak.remotes = lib.mkOptionDefault [{
name = "flathub-stable"; name = "flathub-stable";

View file

@ -1,5 +1,4 @@
{ { pkgs
pkgs
, ... , ...
}: { }: {
imports = [ imports = [

View file

@ -1,257 +1,257 @@
{config, ...}:{ { config, ... }: {
programs.ironbar = programs.ironbar =
{ {
enable = true; enable = true;
style = '' style = ''
@import url("/home/dashie/.config/gtk-3.0/gtk.css"); @import url("/home/dashie/.config/gtk-3.0/gtk.css");
* { * {
color: #71bbe6; color: #71bbe6;
padding: 0px; padding: 0px;
margin: 0px; margin: 0px;
} }
.background { .background {
background-color: rgba(0, 0, 0, 0); background-color: rgba(0, 0, 0, 0);
} }
.workspaces { .workspaces {
margin: 2px 0px 0px 5px; margin: 2px 0px 0px 5px;
border-radius: 10px; border-radius: 10px;
/* background-color: #2b2c3b; */ /* background-color: #2b2c3b; */
background-color: #1E1E2E; background-color: #1E1E2E;
padding: 2px 5px 2px 5px; padding: 2px 5px 2px 5px;
} }
.workspaces .item { .workspaces .item {
margin: 0px 3px 0px 3px; margin: 0px 3px 0px 3px;
font-size: 13px; font-size: 13px;
border-radius: 100%; border-radius: 100%;
padding: 0px 2px 0px 3px; padding: 0px 2px 0px 3px;
background-color: rgba(0, 0, 0, 0); background-color: rgba(0, 0, 0, 0);
} }
.workspaces .item:hover { .workspaces .item:hover {
background-color: #3e4152; background-color: #3e4152;
} }
.workspaces .item.focused { .workspaces .item.focused {
background-color: #3e4152; background-color: #3e4152;
} }
.audio-box { .audio-box {
padding: 2em; padding: 2em;
background-color: #1E1E2E; background-color: #1E1E2E;
border-radius: 5px; border-radius: 5px;
} }
.audio-slider { .audio-slider {
padding: 5px; padding: 5px;
margin: 5px; margin: 5px;
} }
.audio-button { .audio-button {
padding: 5px 10px 5px 10px; padding: 5px 10px 5px 10px;
margin: 0px 1em 20px 1em; margin: 0px 1em 20px 1em;
border-radius: 100%; border-radius: 100%;
font-size: 17px; font-size: 17px;
} }
.audio-button-box { .audio-button-box {
padding: 0px 2.5em 0px 2.5em; padding: 0px 2.5em 0px 2.5em;
} }
.focused { .focused {
/* margin: 2px 0px 0px 0px; */ /* margin: 2px 0px 0px 0px; */
padding: 0px 5px 0px 5px; padding: 0px 5px 0px 5px;
/* background-color: 1a1b26; */ /* background-color: 1a1b26; */
background-color: #1E1E2E; background-color: #1E1E2E;
font-size: 17px; font-size: 17px;
border-radius: 10px; border-radius: 10px;
} }
#bar #end { #bar #end {
margin: 0px 5px 0px 0px; margin: 0px 5px 0px 0px;
padding: 0px 5px 0px 5px; padding: 0px 5px 0px 5px;
background-color: #1E1E2E; background-color: #1E1E2E;
border-radius: 10px; border-radius: 10px;
} }
.popup-button { .popup-button {
padding: 0px 5px 0px 3px; padding: 0px 5px 0px 3px;
margin: 0em 3px; margin: 0em 3px;
border-radius: 100%; border-radius: 100%;
font-size: 13px; font-size: 13px;
background-color: #1E1E2E; background-color: #1E1E2E;
} }
.popup-button-box { .popup-button-box {
padding: 2px 0px 2px 0px; padding: 2px 0px 2px 0px;
} }
.clock { .clock {
padding: 0px 5px 0px 5px; padding: 0px 5px 0px 5px;
font-size: 17px; font-size: 17px;
background-color: #1E1E2E; background-color: #1E1E2E;
} }
.clock:hover { .clock:hover {
background-color: #3e4152; background-color: #3e4152;
} }
.custom button { .custom button {
background-color: #1E1E2E; background-color: #1E1E2E;
} }
.custom button:hover { .custom button:hover {
background-color: #3e4152; background-color: #3e4152;
} }
.memory-usage { .memory-usage {
font-size: 15px; font-size: 15px;
margin: 0px 5px 0px 0px; margin: 0px 5px 0px 0px;
} }
.memory-usage:hover { .memory-usage:hover {
background-color: #3e4152; background-color: #3e4152;
} }
.popup-clock { .popup-clock {
background-color: #1E1E2E; background-color: #1E1E2E;
border-radius: 5px; border-radius: 5px;
padding: 2px 8px 10px 8px; padding: 2px 8px 10px 8px;
} }
.popup-clock .calendar-clock { .popup-clock .calendar-clock {
font-size: 2.5em; font-size: 2.5em;
padding-bottom: 0.1em; padding-bottom: 0.1em;
} }
.popup-clock .calendar { .popup-clock .calendar {
border-radius: 5px; border-radius: 5px;
font-size: 1.05em; font-size: 1.05em;
} }
.popup-clock .calendar:selected { .popup-clock .calendar:selected {
background-color: #3e4152; background-color: #3e4152;
} }
''; '';
features = [ features = [
#"another_feature" #"another_feature"
]; ];
config = { config = {
monitors."${config.programs.ironbar.monitor}" = { monitors."${config.programs.ironbar.monitor}" = {
end = [ end = [
{ {
type = "sys_info"; type = "sys_info";
format = [ format = [
" {memory_percent}" " {memory_percent}"
]; ];
interval.memory = 30; interval.memory = 30;
class = "memory-usage"; class = "memory-usage";
} }
{ {
type = "custom"; type = "custom";
bar = [ bar = [
{ {
type = "button"; type = "button";
class = "popup-button"; class = "popup-button";
label = ""; label = "";
on_click = "popup:toggle"; on_click = "popup:toggle";
} }
]; ];
class = "popup-button-box"; class = "popup-button-box";
popup = [ popup = [
{ {
type = "box"; type = "box";
orientation = "vertical"; orientation = "vertical";
class = "audio-box"; class = "audio-box";
widgets = [ widgets = [
{ {
type = "box"; type = "box";
orientation = "horizontal"; orientation = "horizontal";
widgets = [ widgets = [
{ {
type = "button"; type = "button";
class = "audio-button"; class = "audio-button";
label = ""; label = "";
on_click = "!/home/dashie/.config/eww/scripts/audio_control.sh bluetooth"; on_click = "!/home/dashie/.config/eww/scripts/audio_control.sh bluetooth";
} }
{ {
type = "button"; type = "button";
class = "audio-button"; class = "audio-button";
label = "󰋋"; label = "󰋋";
on_click = "!/home/dashie/.config/eww/scripts/audio_control.sh internal"; on_click = "!/home/dashie/.config/eww/scripts/audio_control.sh internal";
} }
]; ];
class = "audio-button-box"; class = "audio-button-box";
} }
{ {
type = "label"; type = "label";
label = "Output"; label = "Output";
} }
{ {
type = "slider"; type = "slider";
class = "audio-slider"; class = "audio-slider";
step = 1.0; step = 1.0;
length = 200; length = 200;
value = "pactl get-sink-volume @DEFAULT_SINK@ | awk -F'/' '{ print $2 }' | tr -d ' %'"; value = "pactl get-sink-volume @DEFAULT_SINK@ | awk -F'/' '{ print $2 }' | tr -d ' %'";
on_change = "!pactl set-sink-volume @DEFAULT_SINK@ $0%"; on_change = "!pactl set-sink-volume @DEFAULT_SINK@ $0%";
} }
{ {
type = "label"; type = "label";
label = "Input"; label = "Input";
} }
{ {
type = "slider"; type = "slider";
class = "audio-slider"; class = "audio-slider";
step = 1.0; step = 1.0;
length = 200; length = 200;
value = "pactl get-source-volume @DEFAULT_SOURCE@ | awk -F'/' '{ print $2 }' | tr -d ' %'"; value = "pactl get-source-volume @DEFAULT_SOURCE@ | awk -F'/' '{ print $2 }' | tr -d ' %'";
on_change = "!pactl set-source-volume @DEFAULT_SOURCE@ $0%"; on_change = "!pactl set-source-volume @DEFAULT_SOURCE@ $0%";
} }
]; ];
} }
]; ];
} }
{ {
type = "custom"; type = "custom";
bar = [ bar = [
{ {
type = "button"; type = "button";
class = "popup-button"; class = "popup-button";
label = ""; label = "";
on_click = "!oxidash --css /home/dashie/gits/oxidash/style.css"; on_click = "!oxidash --css /home/dashie/gits/oxidash/style.css";
} }
]; ];
class = "popup-button-box"; class = "popup-button-box";
} }
{ {
type = "clock"; type = "clock";
format = "%I:%M"; format = "%I:%M";
format_popup = "%I:%M:%S"; format_popup = "%I:%M:%S";
locale = "en_US"; locale = "en_US";
} }
{ type = "tray"; } { type = "tray"; }
]; ];
position = "top"; position = "top";
height = 10; height = 10;
anchor_to_edges = true; anchor_to_edges = true;
start = [{ start = [{
type = "workspaces"; type = "workspaces";
all_monitors = true; all_monitors = true;
}]; }];
center = [ center = [
{ {
type = "focused"; type = "focused";
show_icon = true; show_icon = true;
show_title = true; show_title = true;
icon_size = 20; icon_size = 20;
truncate = "end"; truncate = "end";
} }
]; ];
};
}; };
}; };
};
} }

View file

@ -1,4 +1,4 @@
{ pkgs, ...}: { pkgs, ... }:
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
# base audio # base audio

View file

@ -1,109 +1,109 @@
{ {
# TODO: reenable this again # TODO: reenable this again
# right now its broken because flatpak... # right now its broken because flatpak...
# xdg.configFile."gtk-4.0/gtk.css" = { # xdg.configFile."gtk-4.0/gtk.css" = {
# text = # text =
# '' # ''
# /* # /*
# Generated with Gradience # Generated with Gradience
# #
# Issues caused by theming should be reported to Gradience repository, and not to upstream # Issues caused by theming should be reported to Gradience repository, and not to upstream
# #
# https://github.com/GradienceTeam/Gradience # https://github.com/GradienceTeam/Gradience
# */ # */
# #
# @define-color accent_color #a9b1d6; # @define-color accent_color #a9b1d6;
# @define-color accent_bg_color #a9b1d6; # @define-color accent_bg_color #a9b1d6;
# @define-color accent_fg_color rgba(0, 0, 0, 0.87); # @define-color accent_fg_color rgba(0, 0, 0, 0.87);
# @define-color destructive_color #F28B82; # @define-color destructive_color #F28B82;
# @define-color destructive_bg_color #F28B82; # @define-color destructive_bg_color #F28B82;
# @define-color destructive_fg_color rgba(0, 0, 0, 0.87); # @define-color destructive_fg_color rgba(0, 0, 0, 0.87);
# @define-color success_color #81C995; # @define-color success_color #81C995;
# @define-color success_bg_color #81C995; # @define-color success_bg_color #81C995;
# @define-color success_fg_color rgba(0, 0, 0, 0.87); # @define-color success_fg_color rgba(0, 0, 0, 0.87);
# @define-color warning_color #FDD633; # @define-color warning_color #FDD633;
# @define-color warning_bg_color #FDD633; # @define-color warning_bg_color #FDD633;
# @define-color warning_fg_color rgba(0, 0, 0, 0.87); # @define-color warning_fg_color rgba(0, 0, 0, 0.87);
# @define-color error_color #F28B82; # @define-color error_color #F28B82;
# @define-color error_bg_color #F28B82; # @define-color error_bg_color #F28B82;
# @define-color error_fg_color rgba(0, 0, 0, 0.87); # @define-color error_fg_color rgba(0, 0, 0, 0.87);
# @define-color window_bg_color #1a1b26; # @define-color window_bg_color #1a1b26;
# @define-color window_fg_color #c0caf5; # @define-color window_fg_color #c0caf5;
# @define-color view_bg_color #1a1b26; # @define-color view_bg_color #1a1b26;
# @define-color view_fg_color #c0caf5; # @define-color view_fg_color #c0caf5;
# @define-color headerbar_bg_color #1a1b26; # @define-color headerbar_bg_color #1a1b26;
# @define-color headerbar_fg_color #c0caf5; # @define-color headerbar_fg_color #c0caf5;
# @define-color headerbar_border_color rgba(192, 202, 245, 0.12); # @define-color headerbar_border_color rgba(192, 202, 245, 0.12);
# @define-color headerbar_backdrop_color @window_bg_color; # @define-color headerbar_backdrop_color @window_bg_color;
# @define-color headerbar_shade_color rgba(0, 0, 0, 0.36); # @define-color headerbar_shade_color rgba(0, 0, 0, 0.36);
# @define-color card_bg_color #1a1b26; # @define-color card_bg_color #1a1b26;
# @define-color card_fg_color #c0caf5; # @define-color card_fg_color #c0caf5;
# @define-color card_shade_color rgba(0, 0, 0, 0.36); # @define-color card_shade_color rgba(0, 0, 0, 0.36);
# @define-color dialog_bg_color #1a1b26; # @define-color dialog_bg_color #1a1b26;
# @define-color dialog_fg_color #c0caf5; # @define-color dialog_fg_color #c0caf5;
# @define-color popover_bg_color #1a1b26; # @define-color popover_bg_color #1a1b26;
# @define-color popover_fg_color #c0caf5; # @define-color popover_fg_color #c0caf5;
# @define-color shade_color rgba(0, 0, 0, 0.36); # @define-color shade_color rgba(0, 0, 0, 0.36);
# @define-color scrollbar_outline_color rgba(0, 0, 0, 0.5); # @define-color scrollbar_outline_color rgba(0, 0, 0, 0.5);
# @define-color sidebar_bg_color #1a1b26; # @define-color sidebar_bg_color #1a1b26;
# @define-color sidebar_fg_color #c0caf5; # @define-color sidebar_fg_color #c0caf5;
# @define-color secondary_sidebar_bg_color #1a1b26; # @define-color secondary_sidebar_bg_color #1a1b26;
# @define-color secondary_sidebar_fg_color #c0caf5; # @define-color secondary_sidebar_fg_color #c0caf5;
# @define-color sidebar_shade_color rgba(0, 0, 0, 0.36); # @define-color sidebar_shade_color rgba(0, 0, 0, 0.36);
# @define-color secondary_sidebar_shade_color rgba(0, 0, 0, 0.36); # @define-color secondary_sidebar_shade_color rgba(0, 0, 0, 0.36);
# @define-color thumbnail_bg_color #1a1b26; # @define-color thumbnail_bg_color #1a1b26;
# @define-color thumbnail_fg_color #c0caf5; # @define-color thumbnail_fg_color #c0caf5;
# @define-color sidebar_backdrop_color @sidebar_bg_color; # @define-color sidebar_backdrop_color @sidebar_bg_color;
# @define-color secondary_sidebar_backdrop_color @sidebar_bg_color; # @define-color secondary_sidebar_backdrop_color @sidebar_bg_color;
# @define-color blue_1 #99c1f1; # @define-color blue_1 #99c1f1;
# @define-color blue_2 #62a0ea; # @define-color blue_2 #62a0ea;
# @define-color blue_3 #3584e4; # @define-color blue_3 #3584e4;
# @define-color blue_4 #1c71d8; # @define-color blue_4 #1c71d8;
# @define-color blue_5 #1a5fb4; # @define-color blue_5 #1a5fb4;
# @define-color green_1 #8ff0a4; # @define-color green_1 #8ff0a4;
# @define-color green_2 #57e389; # @define-color green_2 #57e389;
# @define-color green_3 #33d17a; # @define-color green_3 #33d17a;
# @define-color green_4 #2ec27e; # @define-color green_4 #2ec27e;
# @define-color green_5 #26a269; # @define-color green_5 #26a269;
# @define-color yellow_1 #f9f06b; # @define-color yellow_1 #f9f06b;
# @define-color yellow_2 #f8e45c; # @define-color yellow_2 #f8e45c;
# @define-color yellow_3 #f6d32d; # @define-color yellow_3 #f6d32d;
# @define-color yellow_4 #f5c211; # @define-color yellow_4 #f5c211;
# @define-color yellow_5 #e5a50a; # @define-color yellow_5 #e5a50a;
# @define-color orange_1 #ffbe6f; # @define-color orange_1 #ffbe6f;
# @define-color orange_2 #ffa348; # @define-color orange_2 #ffa348;
# @define-color orange_3 #ff7800; # @define-color orange_3 #ff7800;
# @define-color orange_4 #e66100; # @define-color orange_4 #e66100;
# @define-color orange_5 #c64600; # @define-color orange_5 #c64600;
# @define-color red_1 #f66151; # @define-color red_1 #f66151;
# @define-color red_2 #ed333b; # @define-color red_2 #ed333b;
# @define-color red_3 #e01b24; # @define-color red_3 #e01b24;
# @define-color red_4 #c01c28; # @define-color red_4 #c01c28;
# @define-color red_5 #a51d2d; # @define-color red_5 #a51d2d;
# @define-color purple_1 #dc8add; # @define-color purple_1 #dc8add;
# @define-color purple_2 #c061cb; # @define-color purple_2 #c061cb;
# @define-color purple_3 #9141ac; # @define-color purple_3 #9141ac;
# @define-color purple_4 #813d9c; # @define-color purple_4 #813d9c;
# @define-color purple_5 #613583; # @define-color purple_5 #613583;
# @define-color brown_1 #cdab8f; # @define-color brown_1 #cdab8f;
# @define-color brown_2 #b5835a; # @define-color brown_2 #b5835a;
# @define-color brown_3 #986a44; # @define-color brown_3 #986a44;
# @define-color brown_4 #865e3c; # @define-color brown_4 #865e3c;
# @define-color brown_5 #63452c; # @define-color brown_5 #63452c;
# @define-color light_1 #ffffff; # @define-color light_1 #ffffff;
# @define-color light_2 #f6f5f4; # @define-color light_2 #f6f5f4;
# @define-color light_3 #deddda; # @define-color light_3 #deddda;
# @define-color light_4 #c0bfbc; # @define-color light_4 #c0bfbc;
# @define-color light_5 #9a9996; # @define-color light_5 #9a9996;
# @define-color dark_1 #77767b; # @define-color dark_1 #77767b;
# @define-color dark_2 #5e5c64; # @define-color dark_2 #5e5c64;
# @define-color dark_3 #3d3846; # @define-color dark_3 #3d3846;
# @define-color dark_4 #241f31; # @define-color dark_4 #241f31;
# @define-color dark_5 #000000; # @define-color dark_5 #000000;
# #
# .navigation-sidebar { # .navigation-sidebar {
# background-color: #1a1b26; # background-color: #1a1b26;
# } # }
# ''; # '';
# }; # };
} }

View file

@ -1,7 +1,6 @@
# Copyright (c) 2020-2021 Mihai Fufezan # Copyright (c) 2020-2021 Mihai Fufezan
# credits to fufexan https://github.com/fufexan/dotfiles/blob/main/home/terminal/programs/xdg.nix # credits to fufexan https://github.com/fufexan/dotfiles/blob/main/home/terminal/programs/xdg.nix
{ config { config
, pkgs
, ... , ...
}: }:
let let