This commit is contained in:
Hadi 2024-10-05 11:48:16 +02:00
parent 270c1b959e
commit 23dcfd5290
14 changed files with 531 additions and 298 deletions

View File

@ -94,6 +94,72 @@
"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-helix": {
"flake": false,
"locked": {
"lastModified": 1725860795,
"narHash": "sha256-Z2o8VBPW3I+KKTSfe25kskz0EUj7MpUh8u355Z1nVsU=",
"owner": "tinted-theming",
"repo": "base16-helix",
"rev": "7f795bf75d38e0eea9fed287264067ca187b88a9",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "base16-helix",
"type": "github"
}
},
"base16-vim": {
"flake": false,
"locked": {
"lastModified": 1716150083,
"narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=",
"owner": "tinted-theming",
"repo": "base16-vim",
"rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "base16-vim",
"type": "github"
}
},
"devshell": { "devshell": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -145,6 +211,22 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_3": {
"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": [
@ -202,6 +284,43 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_3": {
"inputs": {
"systems": [
"stylix",
"systems"
]
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"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"
}
},
"git-hooks": { "git-hooks": {
"inputs": { "inputs": {
"flake-compat": [ "flake-compat": [
@ -254,6 +373,23 @@
"type": "github" "type": "github"
} }
}, },
"gnome-shell": {
"flake": false,
"locked": {
"lastModified": 1713702291,
"narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=",
"owner": "GNOME",
"repo": "gnome-shell",
"rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934",
"type": "github"
},
"original": {
"owner": "GNOME",
"ref": "46.1",
"repo": "gnome-shell",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -261,11 +397,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1727817100, "lastModified": 1728041527,
"narHash": "sha256-dlyV9/eiWkm/Y/t2+k4CFZ29tBvCANmJogEYaHeAOTw=", "narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "437ec62009fa8ceb684eb447d455ffba25911cf9", "rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -295,6 +431,27 @@
"type": "github" "type": "github"
} }
}, },
"home-manager_3": {
"inputs": {
"nixpkgs": [
"stylix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1724435763,
"narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"hyprcursor": { "hyprcursor": {
"inputs": { "inputs": {
"hyprlang": [ "hyprlang": [
@ -337,11 +494,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1727900725, "lastModified": 1728086481,
"narHash": "sha256-yS4oC5G/FKrsrRjk03cGzTEXHAwfjP7azFHoKvlFfD8=", "narHash": "sha256-+gip/MU9xo/0HzYotsJ28LvCBTsoWlr3h4+vZR3Uycw=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "de68e065fe861d7ca01eca267df4c305bc6e73c2", "rev": "595eb89f6e16df0e19916e3c02bf5ceac5a61c57",
"revCount": 5287, "revCount": 5293,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland" "url": "https://github.com/hyprwm/Hyprland"
@ -469,11 +626,11 @@
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1727926924, "lastModified": 1728101408,
"narHash": "sha256-gU95rYV2ulL1T+UcdPb3uljFcmjbwE7aevLqaL3sec4=", "narHash": "sha256-kOZc6KwXs0AzMVAFEst4pIItXqKQs4SI4zoZaMdvXo0=",
"owner": "Jas-SinghFSU", "owner": "Jas-SinghFSU",
"repo": "HyprPanel", "repo": "HyprPanel",
"rev": "fe53b3ebf1767faafbc02016969b0b5da233572d", "rev": "8a727a080e6917011211fb8616144be44763982a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -555,11 +712,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1727665282, "lastModified": 1728056216,
"narHash": "sha256-oKtfbQB1MBypqIyzkC8QCQcVGOa1soaXaGgcBIoh14o=", "narHash": "sha256-IrO06gFUDTrTlIP3Sz+mRB6WUoO2YsgMtOD3zi0VEt0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "11c43c830e533dad1be527ecce379fcf994fbbb5", "rev": "b7ca02c7565fbf6d27ff20dd6dbd49c5b82eef28",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -667,11 +824,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1727802920, "lastModified": 1728018373,
"narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", "rev": "bc947f541ae55e999ffdb4013441347d83b00feb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -681,6 +838,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_7": {
"locked": {
"lastModified": 1725194671,
"narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixvim": { "nixvim": {
"inputs": { "inputs": {
"devshell": "devshell", "devshell": "devshell",
@ -746,11 +919,11 @@
"plugin-markdown": { "plugin-markdown": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1727720711, "lastModified": 1728046164,
"narHash": "sha256-GxlW7/pLaXoh7faAB9bXNG7xONc9L08UzCbkeCuCgfY=", "narHash": "sha256-n/sMiz6ztfzAwidL7CaRaUW5m07i9i6cemthE1L4Pes=",
"owner": "MeanderingProgrammer", "owner": "MeanderingProgrammer",
"repo": "markdown.nvim", "repo": "markdown.nvim",
"rev": "e91b042b3865d2d040a0e21e0a3b13fb57f24094", "rev": "fe1002fddc61207e4ef4325d4bc0ca33697bbc7a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -772,7 +945,8 @@
"nixvim": "nixvim", "nixvim": "nixvim",
"plugin-markdown": "plugin-markdown", "plugin-markdown": "plugin-markdown",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"spicetify-nix": "spicetify-nix" "spicetify-nix": "spicetify-nix",
"stylix": "stylix"
} }
}, },
"sf-arabic": { "sf-arabic": {
@ -852,11 +1026,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1727929035, "lastModified": 1728101832,
"narHash": "sha256-buGueZsmGX/TKzSIO8alIK4QWcm0ciZ6j6veO1nxVKM=", "narHash": "sha256-0cRtOtkcQvhcKq0vx2C/2uOVUlOmJNZQzcZiK581wto=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "spicetify-nix", "repo": "spicetify-nix",
"rev": "829a81049fb019d12be8daf867c03de2ee52d49f", "rev": "277107c2bc07582899d53e7fc901e93126d944bd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -865,6 +1039,36 @@
"type": "github" "type": "github"
} }
}, },
"stylix": {
"inputs": {
"base16": "base16",
"base16-fish": "base16-fish",
"base16-helix": "base16-helix",
"base16-vim": "base16-vim",
"flake-compat": "flake-compat_3",
"flake-utils": "flake-utils_3",
"gnome-shell": "gnome-shell",
"home-manager": "home-manager_3",
"nixpkgs": "nixpkgs_7",
"systems": "systems_5",
"tinted-foot": "tinted-foot",
"tinted-kitty": "tinted-kitty",
"tinted-tmux": "tinted-tmux"
},
"locked": {
"lastModified": 1727723275,
"narHash": "sha256-k4HrG8TJQ0RqDS1tlDz71kvWFBNQ7qZI9T5Z0qLR85Y=",
"owner": "danth",
"repo": "stylix",
"rev": "e7e97059776da7e34b739415a7bc8f80f606b803",
"type": "github"
},
"original": {
"owner": "danth",
"repo": "stylix",
"type": "github"
}
},
"systems": { "systems": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
@ -925,6 +1129,69 @@
"type": "github" "type": "github"
} }
}, },
"systems_5": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"tinted-foot": {
"flake": false,
"locked": {
"lastModified": 1696725948,
"narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=",
"owner": "tinted-theming",
"repo": "tinted-foot",
"rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "tinted-foot",
"type": "github"
}
},
"tinted-kitty": {
"flake": false,
"locked": {
"lastModified": 1665001328,
"narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=",
"owner": "tinted-theming",
"repo": "tinted-kitty",
"rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "tinted-kitty",
"type": "github"
}
},
"tinted-tmux": {
"flake": false,
"locked": {
"lastModified": 1696725902,
"narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=",
"owner": "tinted-theming",
"repo": "tinted-tmux",
"rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "tinted-tmux",
"type": "github"
}
},
"treefmt-nix": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [

View File

@ -36,6 +36,7 @@
url = "github:MeanderingProgrammer/markdown.nvim"; url = "github:MeanderingProgrammer/markdown.nvim";
flake = false; flake = false;
}; };
stylix.url = "github:danth/stylix";
}; };
outputs = inputs@{ nixpkgs, ... }: { outputs = inputs@{ nixpkgs, ... }: {
@ -49,6 +50,7 @@
} }
inputs.nixos-hardware.nixosModules.omen-16-n0005ne # CHANGEME inputs.nixos-hardware.nixosModules.omen-16-n0005ne # CHANGEME
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
inputs.stylix.nixosModules.stylix
./hosts/laptop/configuration.nix # CHANGEME ./hosts/laptop/configuration.nix # CHANGEME
]; ];
}; };

View File

@ -1,9 +0,0 @@
{
programs.btop = {
enable = true;
settings = {
color_theme = "Default";
theme_background = false;
};
};
}

View File

@ -1,13 +0,0 @@
{ config, ... }: {
programs.cava = {
enable = true;
settings = {
general.framerate = 60;
smoothing.noise_reduction = 88;
color = {
background = "'#${config.var.theme.colors.bg}'";
foreground = "'#${config.var.theme.colors.accent}'";
};
};
};
}

View File

@ -24,34 +24,6 @@
cursor_shape = "Underline"; cursor_shape = "Underline";
cursor_underline_thickness = config.var.theme.border-size; cursor_underline_thickness = config.var.theme.border-size;
window_padding_width = config.var.theme.gaps-in; window_padding_width = config.var.theme.gaps-in;
# Font
font_family = config.var.theme.font-mono;
font_size = config.var.theme.font-size;
# Colors
background = "#" + config.var.theme.colors.bg;
url_color = "#" + config.var.theme.colors.accent;
color0 = "#" + config.var.theme.colors.c0;
color8 = "#" + config.var.theme.colors.c8;
color1 = "#" + config.var.theme.colors.c1;
color9 = "#" + config.var.theme.colors.c9;
color2 = "#" + config.var.theme.colors.c2;
color10 = "#" + config.var.theme.colors.c10;
color3 = "#" + config.var.theme.colors.c3;
color11 = "#" + config.var.theme.colors.c11;
color4 = "#" + config.var.theme.colors.c4;
color12 = "#" + config.var.theme.colors.c12;
color5 = "#" + config.var.theme.colors.c5;
color13 = "#" + config.var.theme.colors.c13;
color6 = "#" + config.var.theme.colors.c6;
color14 = "#" + config.var.theme.colors.c14;
color7 = "#" + config.var.theme.colors.c7;
color15 = "#" + config.var.theme.colors.c15;
cursor = "#" + config.var.theme.colors.fg;
cursor_text_color = "#" + config.var.theme.colors.bg;
selection_foreground = "#" + config.var.theme.colors.accentFg;
selection_background = "#" + config.var.theme.colors.accent;
}; };
}; };
} }

View File

@ -1,47 +1,47 @@
{ {
programs.nixvim = { programs.nixvim = {
colorschemes = { # colorschemes = {
catppuccin = { # catppuccin = {
enable = true; # enable = true;
settings = { # settings = {
background = { # background = {
light = "macchiato"; # light = "macchiato";
dark = "mocha"; # dark = "mocha";
}; # };
flavour = # flavour =
"mocha"; # "latte", "mocha", "frappe", "macchiato" or raw lua code # "mocha"; # "latte", "mocha", "frappe", "macchiato" or raw lua code
disable_bold = false; # disable_bold = false;
disable_italic = false; # disable_italic = false;
disable_underline = false; # disable_underline = false;
transparent_background = true; # transparent_background = true;
term_colors = true; # term_colors = true;
integrations = { # integrations = {
cmp = true; # cmp = true;
noice = true; # noice = true;
notify = true; # notify = true;
neotree = true; # neotree = true;
harpoon = true; # harpoon = true;
gitsigns = true; # gitsigns = true;
which_key = true; # which_key = true;
illuminate = { enabled = true; }; # illuminate = { enabled = true; };
treesitter = true; # treesitter = true;
treesitter_context = true; # treesitter_context = true;
telescope.enabled = true; # telescope.enabled = true;
indent_blankline.enabled = true; # indent_blankline.enabled = true;
mini.enabled = true; # mini.enabled = true;
native_lsp = { # native_lsp = {
enabled = true; # enabled = true;
inlay_hints = { background = true; }; # inlay_hints = { background = true; };
underlines = { # underlines = {
errors = [ "underline" ]; # errors = [ "underline" ];
hints = [ "underline" ]; # hints = [ "underline" ];
information = [ "underline" ]; # information = [ "underline" ];
warnings = [ "underline" ]; # warnings = [ "underline" ];
}; # };
}; # };
}; # };
}; # };
}; # };
}; # };
}; };
} }

View File

@ -117,88 +117,88 @@ in {
}; };
colors = { colors = {
tabs = { # tabs = {
odd.bg = "#${config.var.theme.colors.bg}"; # odd.bg = "#${config.var.theme.colors.bg}";
odd.fg = "#${config.var.theme.colors.fg}"; # odd.fg = "#${config.var.theme.colors.fg}";
even.bg = "#${config.var.theme.colors.bg}"; # even.bg = "#${config.var.theme.colors.bg}";
even.fg = "#${config.var.theme.colors.fg}"; # even.fg = "#${config.var.theme.colors.fg}";
selected = { # selected = {
odd = { # odd = {
bg = "#${config.var.theme.colors.accent}"; # bg = "#${config.var.theme.colors.accent}";
fg = "#${config.var.theme.colors.accentFg}"; # fg = "#${config.var.theme.colors.accentFg}";
}; # };
even = { # even = {
bg = "#${config.var.theme.colors.accent}"; # bg = "#${config.var.theme.colors.accent}";
fg = "#${config.var.theme.colors.accentFg}"; # fg = "#${config.var.theme.colors.accentFg}";
}; # };
}; # };
indicator = { # indicator = {
error = "#${config.var.theme.colors.c1}"; # error = "#${config.var.theme.colors.c1}";
start = "#${config.var.theme.colors.bgalt}"; # start = "#${config.var.theme.colors.bgalt}";
stop = "#${config.var.theme.colors.bgalt}"; # stop = "#${config.var.theme.colors.bgalt}";
}; # };
}; # };
#
hints = { # hints = {
bg = "#${config.var.theme.colors.bgalt}"; # bg = "#${config.var.theme.colors.bgalt}";
fg = "#${config.var.theme.colors.fgalt}"; # fg = "#${config.var.theme.colors.fgalt}";
match.fg = "#${config.var.theme.colors.bg}"; # match.fg = "#${config.var.theme.colors.bg}";
}; # };
#
completion = { # completion = {
category = { # category = {
bg = "#${config.var.theme.colors.bg}"; # bg = "#${config.var.theme.colors.bg}";
fg = "#${config.var.theme.colors.fg}"; # fg = "#${config.var.theme.colors.fg}";
border = { # border = {
top = "#${config.var.theme.colors.bg}"; # top = "#${config.var.theme.colors.bg}";
bottom = "#${config.var.theme.colors.bg}"; # bottom = "#${config.var.theme.colors.bg}";
}; # };
}; # };
#
odd.bg = "#${config.var.theme.colors.bg}"; # odd.bg = "#${config.var.theme.colors.bg}";
even.bg = "#${config.var.theme.colors.bg}"; # even.bg = "#${config.var.theme.colors.bg}";
#
fg = [ "#FFFFFF" "#FFFFFF" "#FFFFFF" ]; # fg = [ "#FFFFFF" "#FFFFFF" "#FFFFFF" ];
#
match.fg = "#${config.var.theme.colors.accent}"; # match.fg = "#${config.var.theme.colors.accent}";
#
item.selected = { # item.selected = {
bg = "#${config.var.theme.colors.accent}"; # bg = "#${config.var.theme.colors.accent}";
border.top = "#${config.var.theme.colors.accent}"; # border.top = "#${config.var.theme.colors.accent}";
border.bottom = "#${config.var.theme.colors.accent}"; # border.bottom = "#${config.var.theme.colors.accent}";
fg = "#${config.var.theme.colors.accentFg}"; # fg = "#${config.var.theme.colors.accentFg}";
match.fg = "#${config.var.theme.colors.accentFg}"; # match.fg = "#${config.var.theme.colors.accentFg}";
}; # };
}; # };
#
statusbar = { # statusbar = {
normal.bg = "#${config.var.theme.colors.bg}"; # normal.bg = "#${config.var.theme.colors.bg}";
normal.fg = "#${config.var.theme.colors.fg}"; # normal.fg = "#${config.var.theme.colors.fg}";
private.bg = "#${config.var.theme.colors.bg}"; # private.bg = "#${config.var.theme.colors.bg}";
private.fg = "#${config.var.theme.colors.fg}"; # private.fg = "#${config.var.theme.colors.fg}";
insert.bg = "#${config.var.theme.colors.accent}"; # insert.bg = "#${config.var.theme.colors.accent}";
insert.fg = "#${config.var.theme.colors.accentFg}"; # insert.fg = "#${config.var.theme.colors.accentFg}";
command = { # command = {
bg = "#${config.var.theme.colors.bgalt}"; # bg = "#${config.var.theme.colors.bgalt}";
fg = "#${config.var.theme.colors.fgalt}"; # fg = "#${config.var.theme.colors.fgalt}";
private.bg = "#${config.var.theme.colors.bgalt}"; # private.bg = "#${config.var.theme.colors.bgalt}";
private.fg = "#${config.var.theme.colors.fgalt}"; # private.fg = "#${config.var.theme.colors.fgalt}";
}; # };
}; # };
#
messages = { # messages = {
info = { # info = {
bg = "#${config.var.theme.colors.bgalt}"; # bg = "#${config.var.theme.colors.bgalt}";
fg = "#${config.var.theme.colors.fgalt}"; # fg = "#${config.var.theme.colors.fgalt}";
border = "#${config.var.theme.colors.bgalt}"; # border = "#${config.var.theme.colors.bgalt}";
}; # };
#
error = { # error = {
bg = "#${config.var.theme.colors.c1}"; # bg = "#${config.var.theme.colors.c1}";
fg = "#${config.var.theme.colors.fgalt}"; # fg = "#${config.var.theme.colors.fgalt}";
border = "#${config.var.theme.colors.c1}"; # border = "#${config.var.theme.colors.c1}";
}; # };
}; # };
#webpage.darkmode.enabled = true; # Enable dark mode for all websites (Weird on images) #webpage.darkmode.enabled = true; # Enable dark mode for all websites (Weird on images)
webpage.preferred_color_scheme = webpage.preferred_color_scheme =
@ -207,7 +207,7 @@ in {
statusbar.show = "in-mode"; statusbar.show = "in-mode";
fonts = { default_family = "${config.var.theme.font}"; }; # fonts = { default_family = "${config.var.theme.font}"; };
completion = { completion = {
height = "30%"; height = "30%";
@ -236,7 +236,7 @@ in {
}; };
hints = { hints = {
border = "none"; # border = "none";
radius = 1; radius = 1;
}; };

View File

@ -2,14 +2,14 @@
programs.fzf = { programs.fzf = {
enable = true; enable = true;
enableZshIntegration = true; enableZshIntegration = true;
colors = { # colors = {
"fg+" = config.var.theme.colors.accentName; # "fg+" = config.var.theme.colors.accentName;
"bg+" = "-1"; # "bg+" = "-1";
"fg" = "white"; # "fg" = "white";
"bg" = "-1"; # "bg" = "-1";
"prompt" = "grey"; # "prompt" = "grey";
"pointer" = config.var.theme.colors.accentName; # "pointer" = config.var.theme.colors.accentName;
}; # };
defaultOptions = [ defaultOptions = [
"--margin=1" "--margin=1"
"--layout=reverse" "--layout=reverse"

View File

@ -7,26 +7,7 @@ in {
builtins.elem (lib.getName pkg) [ "spotify" ]; builtins.elem (lib.getName pkg) [ "spotify" ];
programs.spicetify = { programs.spicetify = {
enable = true; enable = true;
theme = spicePkgs.themes.text; theme = lib.mkForce spicePkgs.themes.text;
colorScheme = "custom";
customColorScheme = {
text = "${config.var.theme.colors.fg}";
subtext = "${config.var.theme.colors.fgalt}";
sidebar-text = "${config.var.theme.colors.fgalt}";
main = "${config.var.theme.colors.bg}";
sidebar = "${config.var.theme.colors.bg}";
background = "${config.var.theme.colors.bg}";
player = "${config.var.theme.colors.bg}";
card = "${config.var.theme.colors.bg}";
shadow = "000000";
selected-row = "${config.var.theme.colors.bgalt}";
button = "${config.var.theme.colors.accent}";
button-active = "${config.var.theme.colors.accent}";
button-disabled = "${config.var.theme.colors.bgalt}";
tab-active = "${config.var.theme.colors.accent}";
misc = "${config.var.theme.colors.fgalt}";
};
enabledExtensions = with spicePkgs.extensions; [ enabledExtensions = with spicePkgs.extensions; [
playlistIcons playlistIcons

View File

@ -147,8 +147,8 @@
gaps_in = config.var.theme.gaps-in; gaps_in = config.var.theme.gaps-in;
gaps_out = config.var.theme.gaps-out; gaps_out = config.var.theme.gaps-out;
border_size = config.var.theme.border-size; border_size = config.var.theme.border-size;
"col.active_border" = "rgba(${config.var.theme.colors.accent}ff)"; # "col.active_border" = "rgba(${config.var.theme.colors.accent}ff)";
"col.inactive_border" = "rgba(00000055)"; # "col.inactive_border" = "rgba(00000055)";
border_part_of_window = true; border_part_of_window = true;
layout = "master"; layout = "master";
}; };
@ -160,7 +160,7 @@
drop_shadow = true; drop_shadow = true;
shadow_range = 20; shadow_range = 20;
shadow_render_power = 3; shadow_render_power = 3;
"col.shadow" = "rgba(00000055)"; # "col.shadow" = "rgba(00000055)";
blur = { enabled = if config.var.theme.blur then "true" else "false"; }; blur = { enabled = if config.var.theme.blur then "true" else "false"; };
}; };

View File

@ -33,66 +33,66 @@
key_exit = "Escape"; key_exit = "Escape";
}; };
style = '' # style = ''
/** ********** Fonts ********** **/ # /** ********** Fonts ********** **/
#
* { # * {
font-family: "${config.var.theme.font}"; # font-family: "${config.var.theme.font}";
font-weight: 500; # font-weight: 500;
font-size: ${toString config.var.theme.font-size}px; # font-size: ${toString config.var.theme.font-size}px;
} # }
#
#window { # #window {
background-color: #${config.var.theme.colors.bgalt}; # background-color: #${config.var.theme.colors.bgalt};
color: #${config.var.theme.colors.fgalt}; # color: #${config.var.theme.colors.fgalt};
border-radius: ${toString config.var.theme.rounding}px; # border-radius: ${toString config.var.theme.rounding}px;
} # }
#
#outer-box { # #outer-box {
padding: 20px; # padding: 20px;
} # }
#
#input { # #input {
background-color: #${config.var.theme.colors.bg}; # background-color: #${config.var.theme.colors.bg};
border: 0px solid #${config.var.theme.colors.accent}; # border: 0px solid #${config.var.theme.colors.accent};
padding: 8px 12px; # padding: 8px 12px;
} # }
#
#scroll { # #scroll {
margin-top: 20px; # margin-top: 20px;
} # }
#
#inner-box {} # #inner-box {}
#
#img { # #img {
padding-right: 8px; # padding-right: 8px;
} # }
#
#text { # #text {
color: #${config.var.theme.colors.c7}; # color: #${config.var.theme.colors.c7};
} # }
#
#text:selected { # #text:selected {
color: #${config.var.theme.colors.fg}; # color: #${config.var.theme.colors.fg};
} # }
#
#entry { # #entry {
padding: 6px; # padding: 6px;
} # }
#
#entry:selected { # #entry:selected {
background-color: #${config.var.theme.colors.accent}; # background-color: #${config.var.theme.colors.accent};
color: #${config.var.theme.colors.accentFg}; # color: #${config.var.theme.colors.accentFg};
} # }
#
#unselected {} # #unselected {}
#
#selected {} # #selected {}
#
#input, # #input,
#entry:selected { # #entry:selected {
border-radius: ${toString config.var.theme.rounding}px; # border-radius: ${toString config.var.theme.rounding}px;
} # }
''; # '';
}; };
} }

View File

@ -1,4 +1,4 @@
{ config, ... }: { { config, pkgs, ... }: {
imports = [ imports = [
../modules/fonts.nix ../modules/fonts.nix
../modules/nvidia.nix ../modules/nvidia.nix
@ -9,7 +9,8 @@
../modules/auto-upgrade.nix ../modules/auto-upgrade.nix
../modules/timezone.nix ../modules/timezone.nix
../modules/usb.nix ../modules/usb.nix
../modules/systemd-boot.nix # ../modules/systemd-boot.nix
../modules/grub.nix
../modules/users.nix ../modules/users.nix
../modules/audio.nix ../modules/audio.nix
../modules/bluetooth.nix ../modules/bluetooth.nix
@ -28,6 +29,36 @@
home-manager.users."${config.var.username}" = import ./home.nix; home-manager.users."${config.var.username}" = import ./home.nix;
stylix = {
enable = true;
base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
cursor = {
package = pkgs.bibata-cursors;
name = "Bibata-Modern-Ice";
size = 24;
};
fonts = {
monospace = {
package = pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; };
name = "JetBrains Mono Nerd Font";
};
sansSerif = {
package = pkgs.dejavu_fonts;
name = "DejaVu Sans";
};
serif = {
package = pkgs.dejavu_fonts;
name = "DejaVu Serif";
};
};
targets.nixvim.transparentBackground = {
main = true;
signColumn = true;
};
polarity = "dark";
image = ../../home/wallpapers/nix.png;
};
# Don't touch this # Don't touch this
system.stateVersion = "24.05"; system.stateVersion = "24.05";
} }

View File

@ -11,8 +11,6 @@
../../home/programs/fetch ../../home/programs/fetch
../../home/programs/git ../../home/programs/git
../../home/programs/spicetify ../../home/programs/spicetify
../../home/programs/btop
../../home/programs/cava
../../home/programs/nextcloud ../../home/programs/nextcloud
# Scripts # Scripts
@ -20,7 +18,7 @@
# System (Desktop environment like stuff) # System (Desktop environment like stuff)
../../home/system/hyprland ../../home/system/hyprland
../../home/system/gtk # ../../home/system/gtk
../../home/system/wlogout ../../home/system/wlogout
../../home/system/wofi ../../home/system/wofi
../../home/system/batsignal ../../home/system/batsignal
@ -60,6 +58,8 @@
pfetch pfetch
pandoc pandoc
tailscale tailscale
btop
cava
# Just cool # Just cool
peaclock peaclock

View File

@ -1,8 +1,10 @@
{ pkgs, ... }: { { pkgs, ... }: {
boot = { boot = {
loader.grub.enable = true; loader.grub.enable = true;
loader.grub.device = "/dev/sda"; loader.grub.device = "nodev";
loader.grub.useOSProber = true; loader.grub.useOSProber = true;
loader.grub.efiSupport = true;
loader.efi.canTouchEfiVariables = true;
tmp.cleanOnBoot = true; tmp.cleanOnBoot = true;
kernelPackages = kernelPackages =
pkgs.linuxPackages_latest; # _zen, _hardened, _rt, _rt_latest, etc. pkgs.linuxPackages_latest; # _zen, _hardened, _rt, _rt_latest, etc.