Fix
This commit is contained in:
parent
a37de9940f
commit
637accfc1c
54
flake.lock
54
flake.lock
@ -76,22 +76,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat_3": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1696426674,
|
||||
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
@ -468,22 +452,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1711163522,
|
||||
"narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixvim": {
|
||||
"inputs": {
|
||||
"devshell": "devshell",
|
||||
@ -559,8 +527,7 @@
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"nixvim": "nixvim",
|
||||
"sops-nix": "sops-nix",
|
||||
"spicetify-nix": "spicetify-nix",
|
||||
"waybar": "waybar"
|
||||
"spicetify-nix": "spicetify-nix"
|
||||
}
|
||||
},
|
||||
"sf-arabic": {
|
||||
@ -726,25 +693,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"waybar": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_3",
|
||||
"nixpkgs": "nixpkgs_5"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1713083602,
|
||||
"narHash": "sha256-anyId+jvF/uBFQ3VwpFU5S640rLSM9/FPT3X54OYcgo=",
|
||||
"owner": "Alexays",
|
||||
"repo": "Waybar",
|
||||
"rev": "ddacb111a9953332f7cbf0b9812b67731c827a38",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "Alexays",
|
||||
"repo": "Waybar",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"wlroots": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
@ -18,12 +18,10 @@
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
||||
waybar.url =
|
||||
"github:Alexays/Waybar"; # Fix broken waybar on current nixpkgs-unstable
|
||||
hyprland.url = "github:hyprwm/Hyprland";
|
||||
};
|
||||
|
||||
outputs = inputs@{ nixpkgs, waybar, home-manager, sops-nix, nixvim, hyprland
|
||||
outputs = inputs@{ nixpkgs, home-manager, sops-nix, nixvim, hyprland
|
||||
, spicetify-nix, nixos-hardware, ... }: {
|
||||
nixosConfigurations = {
|
||||
nixy = nixpkgs.lib.nixosSystem {
|
||||
@ -43,7 +41,6 @@
|
||||
inherit inputs;
|
||||
inherit spicetify-nix;
|
||||
inherit sops-nix;
|
||||
inherit waybar;
|
||||
inherit hyprland;
|
||||
};
|
||||
};
|
||||
|
@ -105,7 +105,7 @@
|
||||
"QT_AUTO_SCREEN_SCALE_FACTOR,1"
|
||||
"QT_QPA_PLATFORM=wayland,xcb"
|
||||
"QT_WAYLAND_DISABLE_WINDOWDECORATION,1"
|
||||
"GTK_THEME,Flat-Remix-GTK-White-Darkest-Solid:dark"
|
||||
"GTK_THEME,Flat-Remix-GTK-Violet-Darkest-Solid:dark"
|
||||
# "HYPRCURSOR_THEME,rose-pine"
|
||||
# "HYPRCURSOR_SIZE,16"
|
||||
];
|
||||
@ -212,7 +212,7 @@
|
||||
enable = true;
|
||||
theme = {
|
||||
package = pkgs.flat-remix-gtk;
|
||||
name = "Flat-Remix-GTK-White-Darkest-Solid";
|
||||
name = "Flat-Remix-GTK-Violet-Darkest-Solid";
|
||||
};
|
||||
|
||||
iconTheme = {
|
||||
|
@ -25,7 +25,7 @@
|
||||
enable = true;
|
||||
colorschemes.catppuccin = {
|
||||
enable = true;
|
||||
settings = { transparentBackground = true; };
|
||||
settings = { transparent_background = true; };
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -48,6 +48,7 @@ let
|
||||
|
||||
nextcloud-watch &
|
||||
battery-notif &
|
||||
waybar &
|
||||
'';
|
||||
|
||||
in {
|
||||
|
@ -9,9 +9,13 @@
|
||||
syntaxHighlighting.enable = true;
|
||||
historySubstringSearch.enable = true;
|
||||
|
||||
# If the variable config.theme.print-neofetch is set to true, neofetch will be printed
|
||||
initExtraFirst = ''
|
||||
bindkey -e
|
||||
${pkgs.neofetch}/bin/neofetch
|
||||
${if config.theme.print-neofetch then
|
||||
pkgs.neofetch + "/bin/neofetch"
|
||||
else
|
||||
""}
|
||||
'';
|
||||
|
||||
history = {
|
||||
|
@ -10,6 +10,11 @@ with lib;
|
||||
description = "Does waybar have a transparent background?";
|
||||
};
|
||||
|
||||
print-neofetch = mkOption {
|
||||
type = types.bool;
|
||||
description = "Does kitty launch neofetch?";
|
||||
};
|
||||
|
||||
wallpaper = mkOption {
|
||||
type = types.str;
|
||||
description = "Name of the wallpaper (from the wallpapers directory)";
|
||||
|
@ -4,6 +4,7 @@
|
||||
theme = {
|
||||
wallpaper = "default.png";
|
||||
waybar-transparent = true;
|
||||
print-neofetch = true;
|
||||
font-mono = "FiraCode Nerd Font Mono";
|
||||
font = "SFProDisplay Nerd Font";
|
||||
rounding = 12;
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ pkgs, config, lib, waybar, ... }: {
|
||||
{ pkgs, config, lib, ... }: {
|
||||
services = {
|
||||
blueman-applet.enable = true;
|
||||
network-manager-applet.enable = true;
|
||||
@ -6,8 +6,6 @@
|
||||
|
||||
programs.waybar = {
|
||||
enable = true;
|
||||
package = waybar.packages."${pkgs.system}".waybar;
|
||||
systemd.enable = true;
|
||||
settings = {
|
||||
mainBar = {
|
||||
layer = "top";
|
||||
|
@ -60,7 +60,7 @@
|
||||
background-position: center;
|
||||
background-size: 25%;
|
||||
|
||||
border-style: solid;
|
||||
border: 3px solid #${config.theme.colors.bg};
|
||||
background-color: #${config.theme.colors.bg};
|
||||
box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user