Compare commits

..

No commits in common. "09470f429f48613e0a1d775e802ce2d013b206db" and "55e81ed9e4972e6a084735eb98f44dce92c1e9f8" have entirely different histories.

11 changed files with 37 additions and 323 deletions

View file

@ -63,120 +63,6 @@
"type": "github" "type": "github"
} }
}, },
"base16": {
"inputs": {
"fromYaml": "fromYaml"
},
"locked": {
"lastModified": 1708890466,
"narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=",
"owner": "SenchoPens",
"repo": "base16.nix",
"rev": "665b3c6748534eb766c777298721cece9453fdae",
"type": "github"
},
"original": {
"owner": "SenchoPens",
"repo": "base16.nix",
"type": "github"
}
},
"base16-fish": {
"flake": false,
"locked": {
"lastModified": 1622559957,
"narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=",
"owner": "tomyun",
"repo": "base16-fish",
"rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe",
"type": "github"
},
"original": {
"owner": "tomyun",
"repo": "base16-fish",
"type": "github"
}
},
"base16-foot": {
"flake": false,
"locked": {
"lastModified": 1696725948,
"narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=",
"owner": "tinted-theming",
"repo": "base16-foot",
"rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "base16-foot",
"type": "github"
}
},
"base16-helix": {
"flake": false,
"locked": {
"lastModified": 1696727917,
"narHash": "sha256-FVrbPk+NtMra0jtlC5oxyNchbm8FosmvXIatkRbYy1g=",
"owner": "tinted-theming",
"repo": "base16-helix",
"rev": "dbe1480d99fe80f08df7970e471fac24c05f2ddb",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "base16-helix",
"type": "github"
}
},
"base16-kitty": {
"flake": false,
"locked": {
"lastModified": 1665001328,
"narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=",
"owner": "kdrag0n",
"repo": "base16-kitty",
"rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805",
"type": "github"
},
"original": {
"owner": "kdrag0n",
"repo": "base16-kitty",
"type": "github"
}
},
"base16-tmux": {
"flake": false,
"locked": {
"lastModified": 1696725902,
"narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=",
"owner": "tinted-theming",
"repo": "base16-tmux",
"rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "base16-tmux",
"type": "github"
}
},
"base16-vim": {
"flake": false,
"locked": {
"lastModified": 1663659192,
"narHash": "sha256-uJvaYYDMXvoo0fhBZUhN8WBXeJ87SRgof6GEK2efFT0=",
"owner": "chriskempson",
"repo": "base16-vim",
"rev": "3be3cd82cd31acfcab9a41bad853d9c68d30478d",
"type": "github"
},
"original": {
"owner": "chriskempson",
"repo": "base16-vim",
"type": "github"
}
},
"crane": { "crane": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -326,22 +212,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_5": {
"flake": false,
"locked": {
"lastModified": 1673956053,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
@ -539,22 +409,6 @@
"type": "github" "type": "github"
} }
}, },
"fromYaml": {
"flake": false,
"locked": {
"lastModified": 1689549921,
"narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=",
"owner": "SenchoPens",
"repo": "fromYaml",
"rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84",
"type": "github"
},
"original": {
"owner": "SenchoPens",
"repo": "fromYaml",
"type": "github"
}
},
"gitignore": { "gitignore": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -576,23 +430,6 @@
"type": "github" "type": "github"
} }
}, },
"gnome-shell": {
"flake": false,
"locked": {
"lastModified": 1698794309,
"narHash": "sha256-/TIkZ8y5Wv3QHLFp79Poao9fINurKs5pa4z0CRe+F8s=",
"owner": "GNOME",
"repo": "gnome-shell",
"rev": "a7c169c6c29cf02a4c392fa0acbbc5f5072823e7",
"type": "github"
},
"original": {
"owner": "GNOME",
"ref": "45.1",
"repo": "gnome-shell",
"type": "github"
}
},
"harfbuzz": { "harfbuzz": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -651,27 +488,6 @@
"type": "github" "type": "github"
} }
}, },
"home-manager_2": {
"inputs": {
"nixpkgs": [
"stylix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1711915616,
"narHash": "sha256-co6LoFA+j6BZEeJNSR8nZ4oOort5qYPskjrDHBaJgmo=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "820be197ccf3adaad9a8856ef255c13b6cc561a6",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"hyprcursor": { "hyprcursor": {
"inputs": { "inputs": {
"hyprlang": "hyprlang", "hyprlang": "hyprlang",
@ -1305,22 +1121,6 @@
} }
}, },
"nixpkgs_15": { "nixpkgs_15": {
"locked": {
"lastModified": 1713596654,
"narHash": "sha256-LJbHQQ5aX1LVth2ST+Kkse/DRzgxlVhTL1rxthvyhZc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "fd16bb6d3bcca96039b11aa52038fafeb6e4f4be",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_16": {
"locked": { "locked": {
"lastModified": 1705403940, "lastModified": 1705403940,
"narHash": "sha256-bl7E3w35Bleiexg01WsN0RuAQEL23HaQeNBC2zjt+9w=", "narHash": "sha256-bl7E3w35Bleiexg01WsN0RuAQEL23HaQeNBC2zjt+9w=",
@ -1336,7 +1136,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_17": { "nixpkgs_16": {
"locked": { "locked": {
"lastModified": 1712963716, "lastModified": 1712963716,
"narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=",
@ -1352,7 +1152,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_18": { "nixpkgs_17": {
"locked": { "locked": {
"lastModified": 1701174899, "lastModified": 1701174899,
"narHash": "sha256-1W+FMe8mWsJKXoBc+QgKmEeRj33kTFnPq7XCjU+bfnA=", "narHash": "sha256-1W+FMe8mWsJKXoBc+QgKmEeRj33kTFnPq7XCjU+bfnA=",
@ -1556,7 +1356,6 @@
"nur": "nur", "nur": "nur",
"pre-commit-hooks": "pre-commit-hooks", "pre-commit-hooks": "pre-commit-hooks",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"stylix": "stylix",
"wezterm": "wezterm", "wezterm": "wezterm",
"xdg-portal-hyprland": "xdg-portal-hyprland", "xdg-portal-hyprland": "xdg-portal-hyprland",
"yazi": "yazi" "yazi": "yazi"
@ -1680,34 +1479,6 @@
"type": "github" "type": "github"
} }
}, },
"stylix": {
"inputs": {
"base16": "base16",
"base16-fish": "base16-fish",
"base16-foot": "base16-foot",
"base16-helix": "base16-helix",
"base16-kitty": "base16-kitty",
"base16-tmux": "base16-tmux",
"base16-vim": "base16-vim",
"flake-compat": "flake-compat_5",
"gnome-shell": "gnome-shell",
"home-manager": "home-manager_2",
"nixpkgs": "nixpkgs_15"
},
"locked": {
"lastModified": 1713821140,
"narHash": "sha256-/kGc9R01h8mTmZKhrVyGWaK/w9zgettmHIE3GZW8Khs=",
"owner": "danth",
"repo": "stylix",
"rev": "0fe277a3641a849478a94c7900c2d5a90609a306",
"type": "github"
},
"original": {
"owner": "danth",
"repo": "stylix",
"type": "github"
}
},
"systems": { "systems": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
@ -1987,7 +1758,7 @@
"freetype2": "freetype2", "freetype2": "freetype2",
"harfbuzz": "harfbuzz", "harfbuzz": "harfbuzz",
"libpng": "libpng", "libpng": "libpng",
"nixpkgs": "nixpkgs_16", "nixpkgs": "nixpkgs_15",
"rust-overlay": "rust-overlay_3", "rust-overlay": "rust-overlay_3",
"zlib": "zlib" "zlib": "zlib"
}, },
@ -2029,7 +1800,7 @@
"inputs": { "inputs": {
"hyprland-protocols": "hyprland-protocols_2", "hyprland-protocols": "hyprland-protocols_2",
"hyprlang": "hyprlang_6", "hyprlang": "hyprlang_6",
"nixpkgs": "nixpkgs_17", "nixpkgs": "nixpkgs_16",
"systems": "systems_16" "systems": "systems_16"
}, },
"locked": { "locked": {
@ -2082,7 +1853,7 @@
"yazi": { "yazi": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_7", "flake-utils": "flake-utils_7",
"nixpkgs": "nixpkgs_18", "nixpkgs": "nixpkgs_17",
"rust-overlay": "rust-overlay_4" "rust-overlay": "rust-overlay_4"
}, },
"locked": { "locked": {

View file

@ -77,7 +77,6 @@
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
atuin.url = "github:atuinsh/atuin"; atuin.url = "github:atuinsh/atuin";
flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.url = "github:hercules-ci/flake-parts";
stylix.url = "github:danth/stylix";
deploy-rs = { deploy-rs = {
url = "github:serokell/deploy-rs"; url = "github:serokell/deploy-rs";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";

View file

@ -4,15 +4,14 @@
... ...
}: { }: {
imports = [ imports = [
./stylix.nix
../../services ../../services
../../programs/anyrun ../../programs/anyrun
../../programs/ironbar ../../programs/ironbar
../../programs/browsers/firefox ../../programs/browsers/firefox
../../programs/terminal/wezterm ../../programs/terminal/wezterm
../../programs/terminal/zellij ../../programs/terminal/zellij
../../programs/media/cava.nix
../../programs/gtk.nix ../../programs/gtk.nix
../../programs/media/cava.nix
../../programs/mako.nix ../../programs/mako.nix
../../programs/media/spotify-player.nix ../../programs/media/spotify-player.nix
../../programs/media/zathura.nix ../../programs/media/zathura.nix

View file

@ -1,59 +0,0 @@
{
inputs,
pkgs,
...
}: {
imports = [inputs.stylix.homeManagerModules.stylix];
stylix = {
autoEnable = false;
polarity = "dark";
base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-night-dark.yaml";
fonts = {
monospace = {
name = "JetBrainsMono NF Medium";
package = pkgs.nerdfonts;
};
serif = {
name = "Noto Serif";
package = pkgs.noto-fonts;
};
sansSerif = {
name = "Noto Sans";
package = pkgs.noto-fonts;
};
emoji = {
name = "Twitter Color Emoji";
package = pkgs.twitter-color-emoji;
};
sizes = {
applications = 10;
desktop = 10;
popups = 10;
terminal = 12;
};
};
cursor = {
name = "Bibata-Modern-Classic";
package = pkgs.bibata-cursors;
size = 24;
};
opacity = {
terminal = 0.6;
};
targets = {
wezterm.enable = false;
helix.enable = false;
hyprland.enable = false;
firefox.enable = false;
mako.enable = true;
gtk.enable = true;
lazygit.enable = true;
nushell.enable = true;
yazi.enable = true;
zellij.enable = true;
bat.enable = true;
};
};
}

View file

@ -1,6 +1,7 @@
{...}: { {...}: {
imports = [ imports = [
./languages.nix ./languages.nix
./themes/catppuccin_mocha.nix
./themes/tokyonight.nix ./themes/tokyonight.nix
]; ];
programs.helix = { programs.helix = {

View file

@ -1,20 +1,22 @@
{pkgs, ...}: { {pkgs, ...}: {
# home.pointerCursor = { home.pointerCursor = {
# package = pkgs.bibata-cursors; package = pkgs.bibata-cursors;
# name = "Bibata-Modern-Classic"; name = "Bibata-Modern-Classic";
# size = 24; size = 24;
# gtk.enable = true; gtk.enable = true;
# x11.enable = true; x11.enable = true;
# };
dconf.settings = {
"org/gnome/desktop/interface" = {
color-scheme = "prefer-dark";
};
}; };
gtk = { gtk = {
enable = true; enable = true;
font = {
name = "Noto Sans";
size = 10;
};
theme = {
name = "Tokyonight-Dark-BL";
package = pkgs.tokyo-night-gtk;
};
iconTheme = { iconTheme = {
name = "Papirus"; name = "Papirus";
package = pkgs.papirus-icon-theme; package = pkgs.papirus-icon-theme;

View file

@ -8,5 +8,12 @@ _: {
ignoreTimeout = true; ignoreTimeout = true;
anchor = "top-right"; anchor = "top-right";
output = "DP-2"; output = "DP-2";
font = "Monaspace Krypton 10";
padding = "6";
margin = "18,21,0";
backgroundColor = "#1a1b26";
textColor = "#a9b1d6";
borderColor = "#2ac3de";
progressColor = "over #313244";
}; };
} }

View file

@ -1,10 +1,3 @@
_: { _: {
programs.bat = { programs.bat.enable = true;
enable = true;
config = {
theme = "base16-stylix";
pager = "--RAW-CONTROL-CHARS --quit-if-one-screen --mouse";
style = "plain";
};
};
} }

View file

@ -8,13 +8,13 @@ local config = {
device_type = "DiscreteGpu", device_type = "DiscreteGpu",
name = "NVIDIA GeForce GTX 1070 Ti", name = "NVIDIA GeForce GTX 1070 Ti",
}, },
color_scheme = "Tokyo Night",
enable_wayland = false, enable_wayland = false,
font = wezterm.font("JetBrainsMono NF Medium"), font = wezterm.font("JetBrainsMono NF Medium"),
font_size = 12.0, font_size = 12.0,
window_background_opacity = 0.6, window_background_opacity = 0.6,
text_background_opacity = 1.0, text_background_opacity = 1.0,
enable_tab_bar = false, enable_tab_bar = false,
color_scheme = "tokyonight",
window_padding = { top = 20, bottom = 20, left = 20, right = 20 }, window_padding = { top = 20, bottom = 20, left = 20, right = 20 },
} }

View file

@ -10,6 +10,7 @@ _: {
simplified_ui = false; simplified_ui = false;
default_layout = "default"; default_layout = "default";
ui.pane_frames.rounded_corners = true; ui.pane_frames.rounded_corners = true;
theme = "tokyo-night-storm";
}; };
}; };
} }

View file

@ -5,14 +5,14 @@
ipc = true; ipc = true;
splash = false; splash = false;
preloads = [ preloads = [
"~/Pictures/wallpapers/sparkle3.png" "~/Pictures/wallpapers/sparkle.png"
"~/Pictures/wallpapers/sparkle4.png" "~/Pictures/wallpapers/sparkle2.png"
]; ];
wallpapers = [ wallpapers = [
"HDMI-A-1,~/Pictures/wallpapers/sparkle3.png" "HDMI-A-1,~/Pictures/wallpapers/sparkle.png"
"DP-1,~/Pictures/wallpapers/sparkle3.png" "DP-1,~/Pictures/wallpapers/sparkle.png"
"DP-2,~/Pictures/wallpapers/sparkle4.png" "DP-2,~/Pictures/wallpapers/sparkle2.png"
"DP-3,~/Pictures/wallpapers/sparkle4.png" "DP-3,~/Pictures/wallpapers/sparkle2.png"
]; ];
}; };
} }