Compare commits
2 Commits
914c25808f
...
0df9d996c6
Author | SHA1 | Date | |
---|---|---|---|
0df9d996c6 | |||
e80f492b4e |
40
flake.lock
generated
40
flake.lock
generated
@ -146,6 +146,22 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-compat_2": {
|
"flake-compat_2": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1733328505,
|
||||||
|
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
|
||||||
|
"owner": "edolstra",
|
||||||
|
"repo": "flake-compat",
|
||||||
|
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "edolstra",
|
||||||
|
"repo": "flake-compat",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"flake-compat_3": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1696426674,
|
"lastModified": 1696426674,
|
||||||
@ -579,16 +595,38 @@
|
|||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs",
|
||||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||||
"nixvim": "nixvim",
|
"nixvim": "nixvim",
|
||||||
|
"spicetify-nix": "spicetify-nix",
|
||||||
"stylix": "stylix"
|
"stylix": "stylix"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"spicetify-nix": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-compat": "flake-compat_2",
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1736396171,
|
||||||
|
"narHash": "sha256-1Pr1csD6wVTI2M+Dld77cc+PY83eKoO7ItIrvySWcmU=",
|
||||||
|
"owner": "Gerg-L",
|
||||||
|
"repo": "spicetify-nix",
|
||||||
|
"rev": "511074b9bed99e5cd4ef84999518970fd21af243",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "Gerg-L",
|
||||||
|
"repo": "spicetify-nix",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"stylix": {
|
"stylix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"base16": "base16",
|
"base16": "base16",
|
||||||
"base16-fish": "base16-fish",
|
"base16-fish": "base16-fish",
|
||||||
"base16-helix": "base16-helix",
|
"base16-helix": "base16-helix",
|
||||||
"base16-vim": "base16-vim",
|
"base16-vim": "base16-vim",
|
||||||
"flake-compat": "flake-compat_2",
|
"flake-compat": "flake-compat_3",
|
||||||
"flake-utils": "flake-utils_2",
|
"flake-utils": "flake-utils_2",
|
||||||
"git-hooks": "git-hooks_2",
|
"git-hooks": "git-hooks_2",
|
||||||
"gnome-shell": "gnome-shell",
|
"gnome-shell": "gnome-shell",
|
||||||
|
@ -17,6 +17,10 @@
|
|||||||
url = "github:nix-community/nixvim";
|
url = "github:nix-community/nixvim";
|
||||||
inputs.nixpkgs.follows = "nixpkgs-unstable";
|
inputs.nixpkgs.follows = "nixpkgs-unstable";
|
||||||
};
|
};
|
||||||
|
spicetify-nix = {
|
||||||
|
url = "github:Gerg-L/spicetify-nix";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
stylix = {
|
stylix = {
|
||||||
url = "github:danth/stylix/release-24.11";
|
url = "github:danth/stylix/release-24.11";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
@ -30,6 +34,7 @@
|
|||||||
nixpkgs-unstable,
|
nixpkgs-unstable,
|
||||||
home-manager,
|
home-manager,
|
||||||
hyprpanel,
|
hyprpanel,
|
||||||
|
spicetify-nix,
|
||||||
stylix,
|
stylix,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
|
@ -17,6 +17,7 @@ in
|
|||||||
./rofi
|
./rofi
|
||||||
./wlogout
|
./wlogout
|
||||||
./hyprland
|
./hyprland
|
||||||
|
./spicetify.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
# Home Manager needs a bit of information about you and the
|
# Home Manager needs a bit of information about you and the
|
||||||
|
BIN
home-manager/face.png
Normal file
BIN
home-manager/face.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 282 KiB |
@ -5,7 +5,7 @@ let
|
|||||||
if current == from then to else current;
|
if current == from then to else current;
|
||||||
toSingleLine =
|
toSingleLine =
|
||||||
with lib.strings;
|
with lib.strings;
|
||||||
s: concatMapStrings (stringAsChars (replace "\n" "")) (splitString "n" s);
|
s: concatMapStrings (stringAsChars (replace "\n" "")) (splitString "\n" s);
|
||||||
theme = import ../theme.nix;
|
theme = import ../theme.nix;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
@ -46,6 +46,17 @@ in
|
|||||||
valign = "top";
|
valign = "top";
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
|
# USER AVATAR
|
||||||
|
image = {
|
||||||
|
path = "${../../face.png}";
|
||||||
|
size = 100;
|
||||||
|
border_color = "${theme.mauveRgb}";
|
||||||
|
position = "0, 75";
|
||||||
|
halign = "center";
|
||||||
|
valign = "center";
|
||||||
|
};
|
||||||
|
|
||||||
# INPUT FIELD
|
# INPUT FIELD
|
||||||
input-field = {
|
input-field = {
|
||||||
size = "300, 60";
|
size = "300, 60";
|
||||||
@ -53,17 +64,17 @@ in
|
|||||||
dots_size = 0.2;
|
dots_size = 0.2;
|
||||||
dots_spacing = 0.2;
|
dots_spacing = 0.2;
|
||||||
dots_center = true;
|
dots_center = true;
|
||||||
outer_color = lib.mkDefault "${theme.mauve}";
|
outer_color = lib.mkDefault "${theme.mauveRgb}";
|
||||||
inner_color = lib.mkDefault "${theme.surface0Rgb}";
|
inner_color = lib.mkDefault "${theme.surface0Rgb}";
|
||||||
font_color = lib.mkDefault "${theme.textRgb}";
|
font_color = lib.mkDefault "${theme.textRgb}";
|
||||||
fade_on_empty = false;
|
fade_on_empty = false;
|
||||||
placeholder_text = "<span foreground=\"##${theme.textAlpha}\"><i> Logged in as </i><span foreground=\"##${theme.mauveAlpha}\">$USER</span></span>";
|
placeholder_text = "<span foreground=\"##${theme.textAlpha}\"><i> Logged in as </i><span foreground=\"##${theme.mauveAlpha}\">$USER</span></span>";
|
||||||
hide_input = false;
|
hide_input = false;
|
||||||
check_color = lib.mkDefault "${theme.mauve}";
|
check_color = lib.mkDefault "${theme.mauveRgb}";
|
||||||
fail_color = lib.mkDefault "${theme.redRgb}";
|
fail_color = lib.mkDefault "${theme.redRgb}";
|
||||||
fail_text = "<i>$FAIL <b>($ATTEMPTS)</b></i>";
|
fail_text = "<i>$FAIL <b>($ATTEMPTS)</b></i>";
|
||||||
capslock_color = lib.mkDefault "${theme.yellowRgb}";
|
capslock_color = lib.mkDefault "${theme.yellowRgb}";
|
||||||
position = "0, -200"; # TODO change -200 to -20% at 25.05
|
position = "0, -47"; # TODO change to use % at 25.05
|
||||||
halign = "center";
|
halign = "center";
|
||||||
valign = "center";
|
valign = "center";
|
||||||
};
|
};
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ inputs, ... }:
|
{ pkgs, inputs, ... }:
|
||||||
let
|
let
|
||||||
common = import ../../../common.nix;
|
common = import ../../../common.nix;
|
||||||
theme = import ../../../theme.nix;
|
theme = import ../../../theme.nix;
|
||||||
@ -58,13 +58,18 @@ in
|
|||||||
customModules.kbLayout.leftClick = "hyprctl switchxkblayout keychron-keychron-k8-pro next";
|
customModules.kbLayout.leftClick = "hyprctl switchxkblayout keychron-keychron-k8-pro next";
|
||||||
launcher.autoDetectIcon = true;
|
launcher.autoDetectIcon = true;
|
||||||
network.label = false;
|
network.label = false;
|
||||||
|
volume = {
|
||||||
|
scrollDown = "${pkgs.hyprpanel}/bin/hyprpanel 'vol -1'";
|
||||||
|
scrollUp = "${pkgs.hyprpanel}/bin/hyprpanel 'vol +1'";
|
||||||
|
};
|
||||||
workspaces = {
|
workspaces = {
|
||||||
show_icons = false;
|
show_icons = false;
|
||||||
show_numbered = true;
|
show_numbered = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
menus.clock = {
|
menus = {
|
||||||
|
clock = {
|
||||||
time = {
|
time = {
|
||||||
military = true;
|
military = true;
|
||||||
hideSeconds = true;
|
hideSeconds = true;
|
||||||
@ -75,8 +80,9 @@ in
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
menus.dashboard = {
|
dashboard = {
|
||||||
directories.enabled = false;
|
directories.enabled = false;
|
||||||
|
powermenu.avatar.image = "${../../face.png}";
|
||||||
shortcuts.left = {
|
shortcuts.left = {
|
||||||
shortcut1 = {
|
shortcut1 = {
|
||||||
command = common.default.browser;
|
command = common.default.browser;
|
||||||
@ -93,6 +99,7 @@ in
|
|||||||
};
|
};
|
||||||
stats.enable_gpu = true;
|
stats.enable_gpu = true;
|
||||||
};
|
};
|
||||||
|
};
|
||||||
|
|
||||||
scalingPriority = "hyprland";
|
scalingPriority = "hyprland";
|
||||||
|
|
||||||
|
@ -8,7 +8,7 @@ in
|
|||||||
wayland.windowManager.hyprland.settings = {
|
wayland.windowManager.hyprland.settings = {
|
||||||
monitor = [
|
monitor = [
|
||||||
"DP-1, 1920x1080@144, 0x0, 1"
|
"DP-1, 1920x1080@144, 0x0, 1"
|
||||||
"DP-3, 2560x1440@59.95, 1920x0, 1"
|
"DP-3, 3840x2160@60, 1920x0, 1.5"
|
||||||
];
|
];
|
||||||
|
|
||||||
# Autostart
|
# Autostart
|
||||||
@ -96,9 +96,7 @@ in
|
|||||||
preserve_split = true; # You probably want this
|
preserve_split = true; # You probably want this
|
||||||
};
|
};
|
||||||
|
|
||||||
master = {
|
master.new_status = "master";
|
||||||
new_status = "master";
|
|
||||||
};
|
|
||||||
|
|
||||||
misc = {
|
misc = {
|
||||||
force_default_wallpaper = 0;
|
force_default_wallpaper = 0;
|
||||||
|
34
home-manager/spicetify.nix
Normal file
34
home-manager/spicetify.nix
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
inputs,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
|
{
|
||||||
|
imports = [ inputs.spicetify-nix.homeManagerModules.default ];
|
||||||
|
programs.spicetify =
|
||||||
|
let
|
||||||
|
spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system};
|
||||||
|
theme = import ../theme.nix;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
enable = true;
|
||||||
|
|
||||||
|
enabledExtensions = with spicePkgs.extensions; [
|
||||||
|
adblock
|
||||||
|
hidePodcasts
|
||||||
|
shuffle # shuffle+ (special characters are sanitized out of extension names)
|
||||||
|
];
|
||||||
|
enabledCustomApps = with spicePkgs.apps; [
|
||||||
|
newReleases
|
||||||
|
ncsVisualizer
|
||||||
|
];
|
||||||
|
enabledSnippets = with spicePkgs.snippets; [
|
||||||
|
pointer
|
||||||
|
];
|
||||||
|
|
||||||
|
theme = lib.mkForce spicePkgs.themes.catppuccin;
|
||||||
|
colorScheme = lib.mkForce theme.flavor;
|
||||||
|
};
|
||||||
|
}
|
@ -5,7 +5,7 @@ in
|
|||||||
{
|
{
|
||||||
stylix = {
|
stylix = {
|
||||||
enable = true;
|
enable = true;
|
||||||
image = ../catppuccin.png;
|
image = ../tropic_island_night.jpg; # TODO overrides swww
|
||||||
base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-${theme.flavor}.yaml";
|
base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-${theme.flavor}.yaml";
|
||||||
polarity = "dark";
|
polarity = "dark";
|
||||||
opacity.terminal = 0.8;
|
opacity.terminal = 0.8;
|
||||||
|
BIN
tropic_island_night.jpg
Normal file
BIN
tropic_island_night.jpg
Normal file
Binary file not shown.
After Width: | Height: | Size: 4.0 MiB |
Loading…
x
Reference in New Issue
Block a user