update config
This commit is contained in:
parent
376adaf654
commit
42f4e1a69a
38
flake.lock
38
flake.lock
@ -714,7 +714,9 @@
|
||||
"hyprpanel": {
|
||||
"inputs": {
|
||||
"ags": "ags",
|
||||
"nixpkgs": "nixpkgs_3"
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1735494539,
|
||||
@ -733,7 +735,7 @@
|
||||
"hyprpolkitagent": {
|
||||
"inputs": {
|
||||
"hyprutils": "hyprutils_2",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
@ -755,7 +757,7 @@
|
||||
"hyprland-protocols": "hyprland-protocols_2",
|
||||
"hyprutils": "hyprutils_3",
|
||||
"hyprwayland-scanner": "hyprwayland-scanner_2",
|
||||
"nixpkgs": "nixpkgs_5",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"systems": "systems_3"
|
||||
},
|
||||
"locked": {
|
||||
@ -1011,22 +1013,6 @@
|
||||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1735291276,
|
||||
"narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "634fd46801442d760e09493a794c4f15db2d0cbb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1732014248,
|
||||
"narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
|
||||
@ -1042,7 +1028,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_5": {
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1728241625,
|
||||
"narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=",
|
||||
@ -1058,7 +1044,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_6": {
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1735471104,
|
||||
"narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=",
|
||||
@ -1074,7 +1060,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_7": {
|
||||
"nixpkgs_6": {
|
||||
"locked": {
|
||||
"lastModified": 1732238832,
|
||||
"narHash": "sha256-sQxuJm8rHY20xq6Ah+GwIUkF95tWjGRd1X8xF+Pkk38=",
|
||||
@ -1090,7 +1076,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_8": {
|
||||
"nixpkgs_7": {
|
||||
"locked": {
|
||||
"lastModified": 1734649271,
|
||||
"narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=",
|
||||
@ -1219,7 +1205,7 @@
|
||||
"hyprpolkitagent": "hyprpolkitagent",
|
||||
"hyprsunset": "hyprsunset",
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
"nixpkgs": "nixpkgs_6",
|
||||
"nixpkgs": "nixpkgs_5",
|
||||
"nixvim": "nixvim",
|
||||
"nixy-wallpapers": "nixy-wallpapers",
|
||||
"sops-nix": "sops-nix",
|
||||
@ -1327,7 +1313,7 @@
|
||||
"flake-utils": "flake-utils_3",
|
||||
"gnome-shell": "gnome-shell",
|
||||
"home-manager": "home-manager_3",
|
||||
"nixpkgs": "nixpkgs_7",
|
||||
"nixpkgs": "nixpkgs_6",
|
||||
"systems": "systems_5",
|
||||
"tinted-foot": "tinted-foot",
|
||||
"tinted-kitty": "tinted-kitty",
|
||||
@ -1536,7 +1522,7 @@
|
||||
},
|
||||
"zen-browser": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_8"
|
||||
"nixpkgs": "nixpkgs_7"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1735092772,
|
||||
|
11
flake.nix
11
flake.nix
@ -23,18 +23,17 @@
|
||||
url = "github:Mic92/sops-nix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
# hyprspace = {
|
||||
# url = "github:KZDKM/Hyprspace";
|
||||
# inputs.hyprland.follows = "hyprland";
|
||||
# };
|
||||
nixy-wallpapers = {
|
||||
url = "github:anotherhadi/nixy-wallpapers";
|
||||
flake = false;
|
||||
};
|
||||
hyprland.url = "github:/hyprwm/Hyprland";
|
||||
hyprland.url = "github:/hyprwm/Hyprland?submodules=1";
|
||||
hyprpolkitagent.url = "github:hyprwm/hyprpolkitagent";
|
||||
hyprsunset.url = "github:hyprwm/hyprsunset";
|
||||
hyprpanel.url = "github:Jas-SinghFSU/HyprPanel";
|
||||
hyprpanel = {
|
||||
url = "github:Jas-SinghFSU/HyprPanel";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
stylix.url = "github:danth/stylix";
|
||||
apple-fonts.url = "github:Lyndeno/apple-fonts.nix";
|
||||
firefox-addons = {
|
||||
|
@ -13,6 +13,7 @@
|
||||
./plugins/telescope.nix
|
||||
./plugins/zenmode.nix
|
||||
./plugins/project.nix
|
||||
./plugins/treesitter.nix
|
||||
|
||||
./options.nix
|
||||
./keymaps.nix
|
||||
|
48
home/programs/nvim/plugins/treesitter.nix
Normal file
48
home/programs/nvim/plugins/treesitter.nix
Normal file
@ -0,0 +1,48 @@
|
||||
{ pkgs, ... }:
|
||||
let
|
||||
treesitter-blade-grammar = pkgs.tree-sitter.buildGrammar {
|
||||
language = "blade";
|
||||
version = "v0.11.0";
|
||||
src = (pkgs.fetchFromGitHub {
|
||||
owner = "EmranMR";
|
||||
repo = "tree-sitter-blade";
|
||||
rev = "a9997ceb8d2e0cd902fe649a33b476d37a0d6042";
|
||||
hash = "sha256-hash=";
|
||||
}).overrideAttrs (drv: {
|
||||
fixupPhase = ''
|
||||
mkdir -p $out/queries/blade
|
||||
mv $out/queries/*.scm $out/queries/blade/
|
||||
'';
|
||||
});
|
||||
meta.homepage = "https://github.com/EmranMR/tree-sitter-blade/";
|
||||
};
|
||||
in {
|
||||
programs.nixvim.treesitter = {
|
||||
enable = true;
|
||||
nixGrammars = true;
|
||||
settings = {
|
||||
indent.enable = true;
|
||||
highlight.enable = true;
|
||||
};
|
||||
grammarPackages = pkgs.vimPlugins.nvim-treesitter.passthru.allGrammars
|
||||
++ [ treesitter-blade-grammar ];
|
||||
luaConfig.post = ''
|
||||
do
|
||||
local parser_config = require("nvim-treesitter.parsers").get_parser_configs()
|
||||
-- change the following as needed
|
||||
parser_config.blade = {
|
||||
install_info = {
|
||||
url = "${treesitter-blade-grammar}", -- local path or git repo
|
||||
files = {"src/parser.c"}, -- note that some parsers also require src/scanner.c or src/scanner.cc
|
||||
-- optional entries:
|
||||
-- branch = "main", -- default branch in case of git repo if different from master
|
||||
-- generate_requires_npm = false, -- if stand-alone parser without npm dependencies
|
||||
-- requires_generate_from_grammar = false, -- if folder contains pre-generated src/parser.c
|
||||
},
|
||||
filetype = "blade.php", -- if filetype does not match the parser name
|
||||
}
|
||||
end
|
||||
'';
|
||||
extraPlugins = [ treesitter-blade-grammar ];
|
||||
};
|
||||
}
|
@ -18,14 +18,6 @@
|
||||
nvim-autopairs.enable = true;
|
||||
friendly-snippets.enable = true;
|
||||
todo-comments.enable = true;
|
||||
treesitter = {
|
||||
enable = true;
|
||||
nixGrammars = true;
|
||||
settings = {
|
||||
indent.enable = true;
|
||||
highlight.enable = true;
|
||||
};
|
||||
};
|
||||
harpoon = {
|
||||
enable = true;
|
||||
enableTelescope = true;
|
||||
|
@ -8,7 +8,7 @@
|
||||
log = { enabled = false; };
|
||||
manager = {
|
||||
show_hidden = false;
|
||||
sort_by = "modified";
|
||||
sort_by = "mtime";
|
||||
sort_dir_first = true;
|
||||
sort_reverse = true;
|
||||
};
|
||||
|
@ -16,11 +16,6 @@ let
|
||||
else
|
||||
wofi -p " Apps" --show drun
|
||||
fi
|
||||
# if pgrep tofi; then
|
||||
# pkill tofi
|
||||
# else
|
||||
# tofi-drun --drun-launch=true
|
||||
# fi
|
||||
'';
|
||||
|
||||
powermenu = pkgs.writeShellScriptBin "powermenu"
|
||||
@ -28,8 +23,6 @@ let
|
||||
''
|
||||
if pgrep wofi; then
|
||||
pkill wofi
|
||||
# if pgrep tofi; then
|
||||
# pkill tofi
|
||||
else
|
||||
options=(
|
||||
" Lock"
|
||||
@ -68,8 +61,6 @@ let
|
||||
''
|
||||
if pgrep wofi; then
|
||||
pkill wofi
|
||||
# if pgrep tofi; then
|
||||
# pkill tofi
|
||||
else
|
||||
options=(
|
||||
" Caffeine"
|
||||
@ -79,7 +70,6 @@ let
|
||||
)
|
||||
|
||||
selected=$(printf '%s\n' "''${options[@]}" | wofi -p " Quickmenu" --dmenu)
|
||||
# selected=$(printf '%s\n' "''${options[@]}" | tofi --prompt-text "> ")
|
||||
selected=''${selected:2}
|
||||
|
||||
case $selected in
|
||||
|
@ -1,142 +0,0 @@
|
||||
# GTK & QT theme configuration
|
||||
{ config, pkgs, lib, ... }:
|
||||
let
|
||||
accent = "#${config.lib.stylix.colors.base0D}";
|
||||
foreground = "#${config.lib.stylix.colors.base05}";
|
||||
background = "#${config.lib.stylix.colors.base00}";
|
||||
background-alt = "#${config.lib.stylix.colors.base01}";
|
||||
|
||||
c0 = "#${config.lib.stylix.colors.base00}";
|
||||
c1 = "#${config.lib.stylix.colors.base08}";
|
||||
c2 = "#${config.lib.stylix.colors.base0B}";
|
||||
c3 = "#${config.lib.stylix.colors.base0A}";
|
||||
c4 = "#${config.lib.stylix.colors.base0D}";
|
||||
c5 = "#${config.lib.stylix.colors.base0E}";
|
||||
c6 = "#${config.lib.stylix.colors.base0C}";
|
||||
c7 = "#${config.lib.stylix.colors.base05}";
|
||||
c8 = "#${config.lib.stylix.colors.base03}";
|
||||
c9 = "#${config.lib.stylix.colors.base08}";
|
||||
c10 = "#${config.lib.stylix.colors.base0B}";
|
||||
c11 = "#${config.lib.stylix.colors.base0A}";
|
||||
c12 = "#${config.lib.stylix.colors.base0D}";
|
||||
c13 = "#${config.lib.stylix.colors.base0E}";
|
||||
c14 = "#${config.lib.stylix.colors.base0C}";
|
||||
c15 = "#${config.lib.stylix.colors.base07}";
|
||||
|
||||
in {
|
||||
|
||||
qt = {
|
||||
enable = true;
|
||||
platformTheme.name = "gtk2";
|
||||
style.name = "gtk2";
|
||||
};
|
||||
|
||||
gtk = {
|
||||
enable = true;
|
||||
|
||||
theme = lib.mkForce { name = "FlatColor"; };
|
||||
|
||||
iconTheme = {
|
||||
package = pkgs.tela-icon-theme;
|
||||
name = "Tela-dark";
|
||||
};
|
||||
|
||||
font = { name = config.stylix.fonts.serif.name; };
|
||||
|
||||
gtk3.extraConfig = { gtk-application-prefer-dark-theme = 1; };
|
||||
|
||||
gtk4.extraConfig = { gtk-application-prefer-dark-theme = 1; };
|
||||
};
|
||||
|
||||
home.file = {
|
||||
".local/share/themes/FlatColor" = {
|
||||
recursive = true;
|
||||
source = pkgs.stdenv.mkDerivation {
|
||||
name = "FlatColor";
|
||||
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "jasperro";
|
||||
repo = "FlatColor";
|
||||
rev = "0a56c50e8c5e2ad35f6174c19a00e01b30874074";
|
||||
hash = "sha256-P8RnYTk9Z1rCBEEMLTVRrNr5tUM/Pc9dsdMtpHd1Y18=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
mkdir -p $out
|
||||
# delete the default gtk-color-scheme:
|
||||
file="./gtk-2.0/gtkrc"
|
||||
sed -i '3,29d' $file
|
||||
sed -i '3i include "../colors2"' $file
|
||||
|
||||
file="./gtk-3.0/gtk.css"
|
||||
sed -i '2,10d' $file
|
||||
sed -i '2i @import url("../colors3");' $file
|
||||
|
||||
file="./gtk-3.20/gtk.css"
|
||||
sed -i '2,26d' $file
|
||||
sed -i '2i @import url("../colors3");' $file
|
||||
|
||||
cp -r . $out
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
".local/share/themes/FlatColor/colors2".text = ''
|
||||
bg_color:${background}
|
||||
color0:${c0}
|
||||
color1:${c1}
|
||||
color2:${c2}
|
||||
color3:${c3}
|
||||
color4:${c4}
|
||||
color5:${c5}
|
||||
color6:${c6}
|
||||
color7:${c7}
|
||||
color8:${c8}
|
||||
color9:${c9}
|
||||
color10:${c10}
|
||||
color11:${c11}
|
||||
color12:${c12}
|
||||
color13:${c13}
|
||||
color14:${c14}
|
||||
color15:${c15}
|
||||
text_color:${foreground}
|
||||
selected_bg_color:${accent}
|
||||
selected_fg_color:${foreground}
|
||||
tooltip_bg_color:${background-alt}
|
||||
tooltip_fg_color:${foreground}
|
||||
titlebar_bg_color:${background}
|
||||
titlebar_fg_color:${foreground}
|
||||
menu_bg_color:${background-alt}
|
||||
menu_fg_color:${foreground}
|
||||
link_color:${accent}
|
||||
'';
|
||||
|
||||
".local/share/themes/FlatColor/colors3".text = ''
|
||||
@define-color color0 ${c0};
|
||||
@define-color color1 ${c1};
|
||||
@define-color color2 ${c2};
|
||||
@define-color color3 ${c3};
|
||||
@define-color color4 ${c4};
|
||||
@define-color color5 ${c5};
|
||||
@define-color color6 ${c6};
|
||||
@define-color color7 ${c7};
|
||||
@define-color color8 ${c8};
|
||||
@define-color color9 ${c9};
|
||||
@define-color color10 ${c10};
|
||||
@define-color color11 ${c11};
|
||||
@define-color color12 ${c12};
|
||||
@define-color color13 ${c13};
|
||||
@define-color color14 ${c14};
|
||||
@define-color color15 ${c15};
|
||||
@define-color selected_bg_color ${accent};
|
||||
@define-color selected_fg_color ${foreground};
|
||||
@define-color bg_color ${background};
|
||||
@define-color fg_color ${foreground};
|
||||
@define-color base_color @bg_color;
|
||||
@define-color text_color @fg_color;
|
||||
@define-color text_color_disabled mix(@text_color, @base_color, 0.4);
|
||||
@define-color tooltip_bg_color ${background-alt};
|
||||
@define-color tooltip_fg_color ${foreground};
|
||||
'';
|
||||
};
|
||||
}
|
@ -49,15 +49,12 @@ in {
|
||||
};
|
||||
package = inputs.hyprland.packages."${pkgs.system}".hyprland;
|
||||
|
||||
# plugins = [ inputs.hyprspace.packages."${pkgs.system}".Hyprspace ];
|
||||
|
||||
settings = {
|
||||
"$mod" = "SUPER";
|
||||
"$shiftMod" = "SUPER_SHIFT";
|
||||
"$ctrlMod" = "SUPER_CTRL";
|
||||
|
||||
exec-once = [
|
||||
# "${pkgs.bitwarden}/bin/bitwarden"
|
||||
"dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
|
||||
];
|
||||
|
||||
@ -90,8 +87,8 @@ in {
|
||||
"QT_QPA_PLATFORM=wayland,xcb"
|
||||
"QT_WAYLAND_DISABLE_WINDOWDECORATION,1"
|
||||
"ELECTRON_OZONE_PLATFORM_HINT,auto"
|
||||
"GTK_THEME,FlatColor:dark"
|
||||
"GTK2_RC_FILES,/home/dim/.local/share/themes/FlatColor/gtk-2.0/gtkrc"
|
||||
# "GTK_THEME,FlatColor:dark"
|
||||
# "GTK2_RC_FILES,/home/dim/.local/share/themes/FlatColor/gtk-2.0/gtkrc"
|
||||
"__GL_GSYNC_ALLOWED,0"
|
||||
"__GL_VRR_ALLOWED,0"
|
||||
"DISABLE_QT5_COMPAT,0"
|
||||
|
@ -1,6 +1,6 @@
|
||||
# Hyprpanel is the bar on top of the screen
|
||||
# Display informations like workspaces, battery, wifi, ...
|
||||
{ pkgs, config, ... }:
|
||||
{ pkgs, config, inputs, ... }:
|
||||
let
|
||||
transparentButtons = config.var.theme.bar.transparentButtons;
|
||||
|
||||
@ -10,7 +10,7 @@ let
|
||||
background-alt = "#${config.lib.stylix.colors.base01}";
|
||||
foreground = "#${config.lib.stylix.colors.base05}";
|
||||
font = "${config.stylix.fonts.serif.name}";
|
||||
fontSize = "${toString config.stylix.fonts.sizes.desktop}";
|
||||
fontSize = "${toString config.stylix.fonts.sizes.desktop}px";
|
||||
|
||||
rounding = config.var.theme.rounding;
|
||||
border-size = config.var.theme.border-size;
|
||||
@ -26,222 +26,161 @@ let
|
||||
username = config.var.username;
|
||||
weatherapikey = config.var.weatherapikey;
|
||||
in {
|
||||
wayland.windowManager.hyprland.settings.exec-once =
|
||||
[ "${pkgs.hyprpanel}/bin/hyprpanel" ];
|
||||
imports = [ inputs.hyprpanel.homeManagerModules.hyprpanel ];
|
||||
|
||||
home.packages = with pkgs; [ hyprpanel libnotify ];
|
||||
programs.hyprpanel = {
|
||||
enable = true;
|
||||
systemd.enable = true;
|
||||
hyprland.enable = true;
|
||||
overwrite.enable = true;
|
||||
layout = {
|
||||
"bar.layouts" = {
|
||||
"0" = {
|
||||
left = [ "dashboard" "workspaces" ];
|
||||
middle = [ "media" ];
|
||||
right = [
|
||||
"volume"
|
||||
"network"
|
||||
"bluetooth"
|
||||
"battery"
|
||||
"cputemp"
|
||||
"systray"
|
||||
"clock"
|
||||
"notifications"
|
||||
];
|
||||
};
|
||||
"*" = {
|
||||
left = [ "dashboard" "workspaces" ];
|
||||
middle = [ "clock" ];
|
||||
right = [ "volume" "notifications" ];
|
||||
};
|
||||
};
|
||||
};
|
||||
override = {
|
||||
theme.bar.buttons.workspaces.hover = accent-alt;
|
||||
theme.bar.buttons.workspaces.active = accent;
|
||||
theme.bar.buttons.workspaces.available = accent-alt;
|
||||
theme.bar.buttons.workspaces.occupied = accent;
|
||||
theme.bar.menus.background = background;
|
||||
theme.bar.menus.card = background-alt;
|
||||
theme.bar.menus.label = foreground;
|
||||
theme.bar.menus.text = foreground;
|
||||
theme.bar.menus.popover.text = foreground;
|
||||
theme.bar.menus.popover.background = background-alt;
|
||||
theme.bar.menus.card_radius = "${toString rounding}px";
|
||||
theme.bar.menus.border.size = "${toString border-size}px";
|
||||
theme.bar.menus.border.color = "${accent}";
|
||||
theme.bar.menus.border.radius = "${toString rounding}px";
|
||||
theme.bar.menus.listitems.active = "${accent}";
|
||||
theme.bar.menus.icons.active = "${accent}";
|
||||
theme.bar.menus.switch.enabled = "${accent}";
|
||||
theme.bar.menus.check_radio_button.active = "${accent}";
|
||||
theme.bar.menus.buttons.default = "${accent}";
|
||||
theme.bar.menus.buttons.active = "${accent}";
|
||||
theme.bar.menus.iconbuttons.active = "${accent}";
|
||||
theme.bar.menus.progressbar.foreground = "${accent}";
|
||||
theme.bar.menus.slider.primary = "${accent}";
|
||||
theme.bar.menus.tooltip.background = "${background-alt}";
|
||||
theme.bar.menus.tooltip.text = "${foreground}";
|
||||
theme.bar.menus.dropdownmenu.background = "${background-alt}";
|
||||
theme.bar.menus.dropdownmenu.text = "${foreground}";
|
||||
theme.bar.margin_top =
|
||||
"${if position == "top" then toString (gaps-in * 2) else "0"}px";
|
||||
theme.bar.margin_bottom =
|
||||
"${if position == "top" then "0" else toString (gaps-in * 2)}px";
|
||||
theme.bar.margin_sides = "${toString gaps-out}px";
|
||||
theme.bar.border_radius = "${toString rounding}px";
|
||||
theme.bar.menus.monochrome = true;
|
||||
theme.bar.buttons.monochrome = true;
|
||||
theme.bar.outer_spacing = if floating && transparent then "0" else "8";
|
||||
theme.bar.buttons.y_margins =
|
||||
if floating && transparent then "0" else "8";
|
||||
theme.bar.background =
|
||||
"${background + (if transparentButtons then "00" else "")}";
|
||||
theme.bar.buttons.background =
|
||||
"${(if transparent then background else background-alt)
|
||||
+ (if transparentButtons then "00" else "")}";
|
||||
|
||||
home.file.".config/hyprpanel/config.json" = {
|
||||
text = # json
|
||||
''
|
||||
{
|
||||
"bar.layouts": {
|
||||
"0": {
|
||||
"left": [
|
||||
"dashboard",
|
||||
"workspaces",
|
||||
"windowtitle"
|
||||
],
|
||||
"middle": [
|
||||
"media"
|
||||
],
|
||||
"right": [
|
||||
"systray",
|
||||
"volume",
|
||||
"bluetooth",
|
||||
"battery",
|
||||
"network",
|
||||
"clock",
|
||||
"notifications"
|
||||
]
|
||||
},
|
||||
"1": {
|
||||
"left": [
|
||||
"dashboard",
|
||||
"workspaces",
|
||||
"windowtitle"
|
||||
],
|
||||
"middle": [
|
||||
"media"
|
||||
],
|
||||
"right": [
|
||||
"systray",
|
||||
"volume",
|
||||
"bluetooth",
|
||||
"battery",
|
||||
"network",
|
||||
"clock",
|
||||
"notifications"
|
||||
]
|
||||
},
|
||||
"2": {
|
||||
"left": [
|
||||
"dashboard",
|
||||
"workspaces",
|
||||
"windowtitle"
|
||||
],
|
||||
"middle": [
|
||||
"media"
|
||||
],
|
||||
"right": [
|
||||
"systray",
|
||||
"volume",
|
||||
"bluetooth",
|
||||
"battery",
|
||||
"network",
|
||||
"clock",
|
||||
"notifications"
|
||||
]
|
||||
}
|
||||
},
|
||||
"theme.font.name": "${font}",
|
||||
"theme.font.size": "${fontSize}px",
|
||||
"theme.bar.outer_spacing": "${
|
||||
if floating && transparent then "0" else "8"
|
||||
}px",
|
||||
"theme.bar.buttons.y_margins": "${
|
||||
if floating && transparent then "0" else "8"
|
||||
}px",
|
||||
"theme.bar.buttons.spacing": "0.2em",
|
||||
"theme.bar.buttons.radius": "${
|
||||
if transparent then toString rounding else toString (rounding - 8)
|
||||
}px",
|
||||
"theme.bar.floating": ${if floating then "true" else "false"},
|
||||
"theme.bar.buttons.padding_x": "0.4rem",
|
||||
"theme.bar.buttons.padding_y": "0.2rem",
|
||||
|
||||
"theme.bar.buttons.workspaces.hover": "${accent-alt}",
|
||||
"theme.bar.buttons.workspaces.active": "${accent}",
|
||||
"theme.bar.buttons.workspaces.available": "${accent-alt}",
|
||||
|
||||
|
||||
"theme.bar.margin_top": "${
|
||||
if position == "top" then toString (gaps-in * 2) else "0"
|
||||
}px",
|
||||
"theme.bar.margin_bottom": "${
|
||||
if position == "top" then "0" else toString (gaps-in * 2)
|
||||
}px",
|
||||
"theme.bar.margin_sides": "${toString gaps-out}px",
|
||||
"theme.bar.border_radius": "${toString rounding}px",
|
||||
|
||||
"bar.launcher.icon": "",
|
||||
"theme.bar.transparent": ${if transparent then "true" else "false"},
|
||||
"bar.workspaces.show_numbered": false,
|
||||
"bar.workspaces.show_icons": false,
|
||||
"bar.workspaces.workspaces": 9,
|
||||
"bar.workspaces.hideUnoccupied": false,
|
||||
"bar.windowtitle.label": true,
|
||||
"bar.volume.label": false,
|
||||
"bar.network.truncation_size": 12,
|
||||
"bar.bluetooth.label": false,
|
||||
"bar.clock.format": "%a %b %d %H:%M",
|
||||
"bar.notifications.show_total": true,
|
||||
"theme.notification.border_radius": "${toString rounding}px",
|
||||
"theme.osd.enable": true,
|
||||
"theme.osd.orientation": "vertical",
|
||||
"theme.osd.location": "left",
|
||||
"theme.osd.radius": "${toString rounding}px",
|
||||
"theme.osd.margins": "0px 0px 0px 10px",
|
||||
"theme.osd.muted_zero": true,
|
||||
"menus.clock.weather.location": "${location}",
|
||||
"menus.clock.weather.key": "${weatherapikey}",
|
||||
"menus.clock.weather.unit": "metric",
|
||||
"menus.dashboard.powermenu.avatar.image": "/home/${username}/.profile_picture.png",
|
||||
"menus.dashboard.powermenu.confirmation": false,
|
||||
|
||||
"menus.dashboard.shortcuts.left.shortcut1.icon": "",
|
||||
"menus.dashboard.shortcuts.left.shortcut1.command": "firefox",
|
||||
"menus.dashboard.shortcuts.left.shortcut1.tooltip": "firefox",
|
||||
"menus.dashboard.shortcuts.left.shortcut2.icon": "",
|
||||
"menus.dashboard.shortcuts.left.shortcut2.command": "caffeine",
|
||||
"menus.dashboard.shortcuts.left.shortcut2.tooltip": "Caffeine",
|
||||
"menus.dashboard.shortcuts.left.shortcut3.icon": "",
|
||||
"menus.dashboard.shortcuts.left.shortcut3.command": "night-shift",
|
||||
"menus.dashboard.shortcuts.left.shortcut3.tooltip": "Night-shift",
|
||||
"menus.dashboard.shortcuts.left.shortcut4.icon": "",
|
||||
"menus.dashboard.shortcuts.left.shortcut4.command": "menu",
|
||||
"menus.dashboard.shortcuts.left.shortcut4.tooltip": "Search Apps",
|
||||
"menus.dashboard.shortcuts.right.shortcut1.icon": "",
|
||||
"menus.dashboard.shortcuts.right.shortcut1.command": "hyprpicker -a",
|
||||
"menus.dashboard.shortcuts.right.shortcut1.tooltip": "Color Picker",
|
||||
"menus.dashboard.shortcuts.right.shortcut3.icon": "",
|
||||
"menus.dashboard.shortcuts.right.shortcut3.command": "screenshot region swappy",
|
||||
"menus.dashboard.shortcuts.right.shortcut3.tooltip": "Screenshot",
|
||||
|
||||
"menus.dashboard.directories.left.directory1.label": " Downloads",
|
||||
"menus.dashboard.directories.left.directory1.command": "bash -c \"thunar $HOME/Downloads/\"",
|
||||
"menus.dashboard.directories.left.directory2.label": " Pictures",
|
||||
"menus.dashboard.directories.left.directory2.command": "bash -c \"thunar $HOME/Pictures/\"",
|
||||
"menus.dashboard.directories.left.directory3.label": " Documents",
|
||||
"menus.dashboard.directories.left.directory3.command": "bash -c \"thunar $HOME/Documents/\"",
|
||||
"menus.dashboard.directories.right.directory1.label": " Home",
|
||||
"menus.dashboard.directories.right.directory1.command": "bash -c \"thunar $HOME/\"",
|
||||
"menus.dashboard.directories.right.directory2.label": " Projects",
|
||||
"menus.dashboard.directories.right.directory2.command": "bash -c \"thunar $HOME/dev/\"",
|
||||
"menus.dashboard.directories.right.directory3.label": " Config",
|
||||
"menus.dashboard.directories.right.directory3.command": "bash -c \"thunar $HOME/.config/\"",
|
||||
|
||||
"theme.bar.menus.monochrome": true,
|
||||
"wallpaper.enable": false,
|
||||
"theme.bar.menus.background": "${background}",
|
||||
"theme.bar.menus.cards": "${background-alt}",
|
||||
"theme.bar.menus.card_radius": "${toString rounding}px",
|
||||
"theme.bar.menus.label": "${foreground}",
|
||||
"theme.bar.menus.text": "${foreground}",
|
||||
"theme.bar.menus.border.size": "${toString border-size}px",
|
||||
"theme.bar.menus.border.color": "${accent}",
|
||||
"theme.bar.menus.border.radius": "${toString rounding}px",
|
||||
"theme.bar.menus.popover.text": "${foreground}",
|
||||
"theme.bar.menus.popover.background": "${background-alt}",
|
||||
"theme.bar.menus.listitems.active": "${accent}",
|
||||
"theme.bar.menus.icons.active": "${accent}",
|
||||
"theme.bar.menus.switch.enabled":"${accent}",
|
||||
"theme.bar.menus.check_radio_button.active": "${accent}",
|
||||
"theme.bar.menus.buttons.default": "${accent}",
|
||||
"theme.bar.menus.buttons.active": "${accent}",
|
||||
"theme.bar.menus.iconbuttons.active": "${accent}",
|
||||
"theme.bar.menus.progressbar.foreground": "${accent}",
|
||||
"theme.bar.menus.slider.primary": "${accent}",
|
||||
"theme.bar.menus.tooltip.background": "${background-alt}",
|
||||
"theme.bar.menus.tooltip.text": "${foreground}",
|
||||
"theme.bar.menus.dropdownmenu.background":"${background-alt}",
|
||||
"theme.bar.menus.dropdownmenu.text": "${foreground}",
|
||||
"theme.bar.background": "${
|
||||
background + (if transparentButtons then "00" else "")
|
||||
}",
|
||||
"theme.bar.buttons.style": "default",
|
||||
"theme.bar.buttons.monochrome": true,
|
||||
"theme.bar.buttons.text": "${foreground}",
|
||||
"theme.bar.buttons.background": "${
|
||||
(if transparent then background else background-alt)
|
||||
+ (if transparentButtons then "00" else "")
|
||||
}",
|
||||
"theme.bar.buttons.icon": "${accent}",
|
||||
"theme.bar.buttons.notifications.background": "${background-alt}",
|
||||
"theme.bar.buttons.hover": "${background}",
|
||||
"theme.bar.buttons.notifications.hover": "${background}",
|
||||
"theme.bar.buttons.notifications.total": "${accent}",
|
||||
"theme.bar.buttons.notifications.icon": "${accent}",
|
||||
"theme.notification.background": "${background-alt}",
|
||||
"theme.notification.actions.background": "${accent}",
|
||||
"theme.notification.actions.text": "${foreground}",
|
||||
"theme.notification.label": "${accent}",
|
||||
"theme.notification.border": "${background-alt}",
|
||||
"theme.notification.text": "${foreground}",
|
||||
"theme.notification.labelicon": "${accent}",
|
||||
"theme.osd.bar_color": "${accent}",
|
||||
"theme.osd.bar_overflow_color": "${accent-alt}",
|
||||
"theme.osd.icon": "${background}",
|
||||
"theme.osd.icon_container": "${accent}",
|
||||
"theme.osd.label": "${accent}",
|
||||
"theme.osd.bar_container": "${background-alt}",
|
||||
"theme.bar.menus.menu.media.background.color": "${background-alt}",
|
||||
"theme.bar.menus.menu.media.card.color": "${background-alt}",
|
||||
"theme.bar.menus.menu.media.card.tint": 90,
|
||||
"bar.customModules.updates.pollingInterval": 1440000,
|
||||
"bar.media.show_active_only": true,
|
||||
"theme.bar.location": "${position}"
|
||||
}
|
||||
'';
|
||||
theme.bar.buttons.icon = "${accent}";
|
||||
theme.bar.buttons.notifications.background = "${background-alt}";
|
||||
theme.bar.buttons.hover = "${background}";
|
||||
theme.bar.buttons.notifications.hover = "${background}";
|
||||
theme.bar.buttons.notifications.total = "${accent}";
|
||||
theme.bar.buttons.notifications.icon = "${accent}";
|
||||
theme.notification.background = "${background-alt}";
|
||||
theme.notification.actions.background = "${accent}";
|
||||
theme.notification.actions.text = "${foreground}";
|
||||
theme.notification.label = "${accent}";
|
||||
theme.notification.border = "${background-alt}";
|
||||
theme.notification.text = "${foreground}";
|
||||
theme.notification.labelicon = "${accent}";
|
||||
theme.osd.bar_color = "${accent}";
|
||||
theme.osd.bar_overflow_color = "${accent-alt}";
|
||||
theme.osd.icon = "${background}";
|
||||
theme.osd.icon_container = "${accent}";
|
||||
theme.osd.label = "${accent}";
|
||||
theme.osd.bar_container = "${background-alt}";
|
||||
theme.bar.menus.menu.media.background.color = "${background-alt}";
|
||||
theme.bar.menus.menu.media.card.color = "${background-alt}";
|
||||
theme.bar.menus.menu.media.card.tint = 90;
|
||||
theme.bar.floating = if floating then "true" else "false";
|
||||
theme.bar.buttons.padding_x = "0.6rem";
|
||||
theme.bar.buttons.padding_y = "0.3rem";
|
||||
theme.bar.buttons.spacing = "0.1em";
|
||||
theme.bar.buttons.text = foreground;
|
||||
theme.bar.location = position;
|
||||
theme.bar.transparent = transparent;
|
||||
theme.font.name = font;
|
||||
theme.font.size = fontSize;
|
||||
theme.bar.buttons.dashboard.spacing = "0.2em";
|
||||
};
|
||||
settings = {
|
||||
bar.battery.hideLabelWhenFull = true;
|
||||
bar.launcher.icon = "";
|
||||
bar.clock.format = "%a, %d %b %H:%M";
|
||||
menus.clock.time.military = true;
|
||||
menus.clock.time.hideSeconds = true;
|
||||
menus.clock.weather.unit = "metric";
|
||||
menus.clock.weather.key = weatherapikey;
|
||||
menus.clock.weather.location = location;
|
||||
theme.osd.orientation = "vertical";
|
||||
theme.osd.location = "left";
|
||||
theme.osd.radius = "${toString rounding}px";
|
||||
theme.osd.margins = "0px 0px 0px 10px";
|
||||
theme.osd.muted_zero = true;
|
||||
wallpaper.enable = false;
|
||||
bar.media.show_active_only = true;
|
||||
bar.workspaces.monitorSpecific = true;
|
||||
bar.workspaces.hideUnoccupied = false;
|
||||
bar.windowtitle.label = true;
|
||||
bar.volume.label = false;
|
||||
bar.network.truncation_size = 12;
|
||||
bar.bluetooth.label = false;
|
||||
menus.dashboard.powermenu.avatar.image =
|
||||
"/home/${username}/.profile_picture.png";
|
||||
menus.dashboard.powermenu.confirmation = false;
|
||||
menus.dashboard.shortcuts.left.shortcut1.icon = "";
|
||||
menus.dashboard.shortcuts.left.shortcut1.command = "firefox";
|
||||
menus.dashboard.shortcuts.left.shortcut1.tooltip = "Firefox";
|
||||
menus.dashboard.shortcuts.left.shortcut2.icon = "";
|
||||
menus.dashboard.shortcuts.left.shortcut2.command = "caffeine";
|
||||
menus.dashboard.shortcuts.left.shortcut2.tooltip = "Caffeine";
|
||||
menus.dashboard.shortcuts.left.shortcut3.icon = "";
|
||||
menus.dashboard.shortcuts.left.shortcut3.command = "night-shift";
|
||||
menus.dashboard.shortcuts.left.shortcut3.tooltip = "Night-shift";
|
||||
menus.dashboard.shortcuts.left.shortcut4.icon = "";
|
||||
menus.dashboard.shortcuts.left.shortcut4.command = "menu";
|
||||
menus.dashboard.shortcuts.left.shortcut4.tooltip = "Search Apps";
|
||||
menus.dashboard.shortcuts.right.shortcut1.icon = "";
|
||||
menus.dashboard.shortcuts.right.shortcut1.command = "hyprpicker -a";
|
||||
menus.dashboard.shortcuts.right.shortcut1.tooltip = "Color Picker";
|
||||
menus.dashboard.shortcuts.right.shortcut3.icon = "";
|
||||
menus.dashboard.shortcuts.right.shortcut3.command =
|
||||
"screenshot region swappy";
|
||||
menus.dashboard.shortcuts.right.shortcut3.tooltip = "Screenshot";
|
||||
menus.dashboard.stats.enabled = false;
|
||||
bar.customModules.cpuTemp.sensor =
|
||||
"/sys/devices/platform/thinkpad_hwmon/hwmon/hwmon5/temp1_input";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
@ -29,6 +29,7 @@
|
||||
"text/html" = "firefox.desktop";
|
||||
"text/csv" = "neovide.desktop";
|
||||
"application/pdf" = "org.pwmt.zathura.desktop";
|
||||
"inode/directory" = "Thunar.desktop";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
@ -93,7 +93,7 @@ in {
|
||||
|
||||
#entry:selected {
|
||||
background-color: ${accent};
|
||||
color: ${foreground};
|
||||
color: ${background-alt};
|
||||
}
|
||||
|
||||
#unselected {}
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ config, ... }: {
|
||||
{ config, pkgs, ... }: {
|
||||
imports = [
|
||||
# ../../nixos/nvidia.nix # CHANGEME: Remove this line if you don't have an Nvidia GPU
|
||||
# ../../nixos/prime.nix # CHANGEME: Remove this line if you don't have an Nvidia GPU
|
||||
@ -28,9 +28,6 @@
|
||||
|
||||
home-manager.users."${config.var.username}" = import ./home.nix;
|
||||
|
||||
home-manager.sharedModules =
|
||||
[{ stylix.targets.gtk.flatpakSupport.enable = false; }];
|
||||
|
||||
# users.users."${config.var.username}".extraGroups = [ "scanner" "lp" ];
|
||||
# hardware.sane.enable = true;
|
||||
|
||||
|
@ -6,7 +6,6 @@
|
||||
# Programs
|
||||
../../home/programs/kitty
|
||||
../../home/programs/nvim
|
||||
# ../../home/programs/qutebrowser
|
||||
../../home/programs/shell
|
||||
../../home/programs/pass
|
||||
../../home/programs/fetch
|
||||
@ -29,18 +28,26 @@
|
||||
../../home/system/hyprlock
|
||||
../../home/system/hyprpanel
|
||||
../../home/system/hyprpaper
|
||||
../../home/system/gtk
|
||||
../../home/system/wofi
|
||||
../../home/system/batsignal
|
||||
../../home/system/zathura
|
||||
../../home/system/mime
|
||||
../../home/system/udiskie
|
||||
../../home/system/clipman
|
||||
../../home/system/tofi
|
||||
|
||||
# ./secrets # CHANGEME: You should probably remove this line, this is where I store my secrets
|
||||
];
|
||||
|
||||
stylix = {
|
||||
targets.gtk.flatpakSupport.enable = false;
|
||||
iconTheme = {
|
||||
enable = true;
|
||||
package = pkgs.tela-icon-theme;
|
||||
dark = "Tela-dark";
|
||||
light = "Tela-light";
|
||||
};
|
||||
};
|
||||
|
||||
home = {
|
||||
inherit (config.var) username;
|
||||
homeDirectory = "/home/" + config.var.username;
|
||||
|
@ -6,7 +6,7 @@
|
||||
systemd-boot = {
|
||||
enable = true;
|
||||
consoleMode = "auto";
|
||||
configurationLimit = 6;
|
||||
configurationLimit = 4;
|
||||
};
|
||||
};
|
||||
tmp.cleanOnBoot = true;
|
||||
|
@ -1,34 +1,34 @@
|
||||
{ pkgs, inputs, ... }: {
|
||||
stylix = {
|
||||
enable = true;
|
||||
# targets.hyprlock.enable = false;
|
||||
|
||||
base16Scheme = "${pkgs.base16-schemes}/share/themes/rose-pine.yaml";
|
||||
# Edited catppuccin
|
||||
base16Scheme = {
|
||||
base00 = "0b0b0b"; # Default Background
|
||||
base01 =
|
||||
"1b1b1b"; # Lighter Background (Used for status bars, line number and folding marks)
|
||||
base02 = "2b2b2b"; # Selection Background
|
||||
base03 = "45475a"; # Comments, Invisibles, Line Highlighting
|
||||
base04 = "585b70"; # Dark Foreground (Used for status bars)
|
||||
base05 = "fcfcfc"; # Default Foreground, Caret, Delimiters, Operators
|
||||
base06 = "f5e0dc"; # Light Foreground (Not often used)
|
||||
base07 = "b4befe"; # Light Background (Not often used)
|
||||
base08 =
|
||||
"f38ba8"; # Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted
|
||||
base09 =
|
||||
"fab387"; # Integers, Boolean, Constants, XML Attributes, Markup Link Url
|
||||
base0A = "f9e2af"; # Classes, Markup Bold, Search Text Background
|
||||
base0B = "a6e3a1"; # Strings, Inherited Class, Markup Code, Diff Inserted
|
||||
base0C =
|
||||
"94e2d5"; # Support, Regular Expressions, Escape Characters, Markup Quotes
|
||||
base0D =
|
||||
"A594FD"; # Functions, Methods, Attribute IDs, Headings, Accent color
|
||||
base0E =
|
||||
"cba6f7"; # Keywords, Storage, Selector, Markup Italic, Diff Changed
|
||||
base0F =
|
||||
"f2cdcd"; # Deprecated, Opening/Closing Embedded Language Tags, e.g. <?php ?>
|
||||
};
|
||||
# base16Scheme = {
|
||||
# base00 = "0b0b0b"; # Default Background
|
||||
# base01 =
|
||||
# "1b1b1b"; # Lighter Background (Used for status bars, line number and folding marks)
|
||||
# base02 = "2b2b2b"; # Selection Background
|
||||
# base03 = "45475a"; # Comments, Invisibles, Line Highlighting
|
||||
# base04 = "585b70"; # Dark Foreground (Used for status bars)
|
||||
# base05 = "fcfcfc"; # Default Foreground, Caret, Delimiters, Operators
|
||||
# base06 = "f5e0dc"; # Light Foreground (Not often used)
|
||||
# base07 = "b4befe"; # Light Background (Not often used)
|
||||
# base08 =
|
||||
# "f38ba8"; # Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted
|
||||
# base09 =
|
||||
# "fab387"; # Integers, Boolean, Constants, XML Attributes, Markup Link Url
|
||||
# base0A = "f9e2af"; # Classes, Markup Bold, Search Text Background
|
||||
# base0B = "a6e3a1"; # Strings, Inherited Class, Markup Code, Diff Inserted
|
||||
# base0C =
|
||||
# "94e2d5"; # Support, Regular Expressions, Escape Characters, Markup Quotes
|
||||
# base0D =
|
||||
# "A594FD"; # Functions, Methods, Attribute IDs, Headings, Accent color
|
||||
# base0E =
|
||||
# "cba6f7"; # Keywords, Storage, Selector, Markup Italic, Diff Changed
|
||||
# base0F =
|
||||
# "f2cdcd"; # Deprecated, Opening/Closing Embedded Language Tags, e.g. <?php ?>
|
||||
# };
|
||||
|
||||
cursor = {
|
||||
package = pkgs.phinger-cursors;
|
||||
|
Loading…
Reference in New Issue
Block a user