Compare commits
No commits in common. "ec339ff0da81260423955342faf4627e31f95e96" and "5243670d89a787b454b971a787c7a040150f9a1e" have entirely different histories.
ec339ff0da
...
5243670d89
Binary file not shown.
Before Width: | Height: | Size: 2.8 MiB |
271
flake.lock
generated
271
flake.lock
generated
@ -1,55 +1,5 @@
|
|||||||
{
|
{
|
||||||
"nodes": {
|
"nodes": {
|
||||||
"base16": {
|
|
||||||
"inputs": {
|
|
||||||
"fromYaml": "fromYaml"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1732200724,
|
|
||||||
"narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=",
|
|
||||||
"owner": "SenchoPens",
|
|
||||||
"repo": "base16.nix",
|
|
||||||
"rev": "153d52373b0fb2d343592871009a286ec8837aec",
|
|
||||||
"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-schemes": {
|
"base16-schemes": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
@ -66,22 +16,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"base16-vim": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1731949548,
|
|
||||||
"narHash": "sha256-XIDexXM66sSh5j/x70e054BnUsviibUShW7XhbDGhYo=",
|
|
||||||
"owner": "tinted-theming",
|
|
||||||
"repo": "base16-vim",
|
|
||||||
"rev": "61165b1632409bd55e530f3dbdd4477f011cadc6",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "tinted-theming",
|
|
||||||
"repo": "base16-vim",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-compat": {
|
"flake-compat": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
@ -98,76 +32,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-compat_2": {
|
|
||||||
"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-utils": {
|
|
||||||
"inputs": {
|
|
||||||
"systems": [
|
|
||||||
"stylix",
|
|
||||||
"systems"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1731533236,
|
|
||||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"fromYaml": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1731966426,
|
|
||||||
"narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=",
|
|
||||||
"owner": "SenchoPens",
|
|
||||||
"repo": "fromYaml",
|
|
||||||
"rev": "106af9e2f715e2d828df706c386a685698f3223b",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "SenchoPens",
|
|
||||||
"repo": "fromYaml",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"gnome-shell": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1732369855,
|
|
||||||
"narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=",
|
|
||||||
"owner": "GNOME",
|
|
||||||
"repo": "gnome-shell",
|
|
||||||
"rev": "dadd58f630eeea41d645ee225a63f719390829dc",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "GNOME",
|
|
||||||
"ref": "47.2",
|
|
||||||
"repo": "gnome-shell",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"home-manager": {
|
"home-manager": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
@ -189,27 +53,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"home-manager_2": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"stylix",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1733085484,
|
|
||||||
"narHash": "sha256-dVmNuUajnU18oHzBQWZm1BQtANCHaqNuxTHZQ+GN0r8=",
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "home-manager",
|
|
||||||
"rev": "c1fee8d4a60b89cae12b288ba9dbc608ff298163",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "home-manager",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nix-colors": {
|
"nix-colors": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"base16-schemes": "base16-schemes",
|
"base16-schemes": "base16-schemes",
|
||||||
@ -328,22 +171,6 @@
|
|||||||
"type": "indirect"
|
"type": "indirect"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1732238832,
|
|
||||||
"narHash": "sha256-sQxuJm8rHY20xq6Ah+GwIUkF95tWjGRd1X8xF+Pkk38=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "8edf06bea5bcbee082df1b7369ff973b91618b8d",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "nixpkgs-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
@ -354,8 +181,7 @@
|
|||||||
"nixos-cosmic",
|
"nixos-cosmic",
|
||||||
"nixpkgs-stable"
|
"nixpkgs-stable"
|
||||||
],
|
],
|
||||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
"nixpkgs-unstable": "nixpkgs-unstable"
|
||||||
"stylix": "stylix"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"rust-overlay": {
|
"rust-overlay": {
|
||||||
@ -378,101 +204,6 @@
|
|||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"stylix": {
|
|
||||||
"inputs": {
|
|
||||||
"base16": "base16",
|
|
||||||
"base16-fish": "base16-fish",
|
|
||||||
"base16-helix": "base16-helix",
|
|
||||||
"base16-vim": "base16-vim",
|
|
||||||
"flake-compat": "flake-compat_2",
|
|
||||||
"flake-utils": "flake-utils",
|
|
||||||
"gnome-shell": "gnome-shell",
|
|
||||||
"home-manager": "home-manager_2",
|
|
||||||
"nixpkgs": "nixpkgs_2",
|
|
||||||
"systems": "systems",
|
|
||||||
"tinted-foot": "tinted-foot",
|
|
||||||
"tinted-kitty": "tinted-kitty",
|
|
||||||
"tinted-tmux": "tinted-tmux"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1735151068,
|
|
||||||
"narHash": "sha256-sJ1/y4aXAZ22trJjY+nH/bJ+pydaDKf3wZtafM+Yjcs=",
|
|
||||||
"owner": "danth",
|
|
||||||
"repo": "stylix",
|
|
||||||
"rev": "079fecebad5f616561726359c89cedd811c8a722",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "danth",
|
|
||||||
"repo": "stylix",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"systems": {
|
|
||||||
"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": 1726913040,
|
|
||||||
"narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=",
|
|
||||||
"owner": "tinted-theming",
|
|
||||||
"repo": "tinted-foot",
|
|
||||||
"rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "tinted-theming",
|
|
||||||
"repo": "tinted-foot",
|
|
||||||
"rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"tinted-kitty": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1716423189,
|
|
||||||
"narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=",
|
|
||||||
"owner": "tinted-theming",
|
|
||||||
"repo": "tinted-kitty",
|
|
||||||
"rev": "eb39e141db14baef052893285df9f266df041ff8",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "tinted-theming",
|
|
||||||
"repo": "tinted-kitty",
|
|
||||||
"rev": "eb39e141db14baef052893285df9f266df041ff8",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"tinted-tmux": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1729501581,
|
|
||||||
"narHash": "sha256-1ohEFMC23elnl39kxWnjzH1l2DFWWx4DhFNNYDTYt54=",
|
|
||||||
"owner": "tinted-theming",
|
|
||||||
"repo": "tinted-tmux",
|
|
||||||
"rev": "f0e7f7974a6441033eb0a172a0342e96722b4f14",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "tinted-theming",
|
|
||||||
"repo": "tinted-tmux",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": "root",
|
"root": "root",
|
||||||
|
@ -15,8 +15,6 @@
|
|||||||
|
|
||||||
nix-colors.url = "github:misterio77/nix-colors";
|
nix-colors.url = "github:misterio77/nix-colors";
|
||||||
|
|
||||||
stylix.url = "github:danth/stylix";
|
|
||||||
|
|
||||||
nixpkgs.follows = "nixos-cosmic/nixpkgs-stable";
|
nixpkgs.follows = "nixos-cosmic/nixpkgs-stable";
|
||||||
|
|
||||||
nixos-cosmic = {
|
nixos-cosmic = {
|
||||||
@ -24,7 +22,7 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, home-manager, nix-colors, stylix, nixos-cosmic, ... }:
|
outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, home-manager, nix-colors, nixos-cosmic, ... }:
|
||||||
let
|
let
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
overlay-unstable = final: prev: {
|
overlay-unstable = final: prev: {
|
||||||
@ -57,7 +55,7 @@
|
|||||||
extraSpecialArgs = { inherit inputs nix-colors; };
|
extraSpecialArgs = { inherit inputs nix-colors; };
|
||||||
modules = [
|
modules = [
|
||||||
({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
|
({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
|
||||||
|
|
||||||
./hosts/laptop/home.nix
|
./hosts/laptop/home.nix
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
@ -47,8 +47,7 @@
|
|||||||
services.nextcloud-sync.enable = true;
|
services.nextcloud-sync.enable = true;
|
||||||
|
|
||||||
theming.fonts.enable = true;
|
theming.fonts.enable = true;
|
||||||
theming.nix-colors.enable = false;
|
theming.nix-colors.enable = true;
|
||||||
theming.stylix.enable = true;
|
|
||||||
|
|
||||||
desktop-environments.hyprland.enable = false;
|
desktop-environments.hyprland.enable = false;
|
||||||
};
|
};
|
||||||
|
@ -18,44 +18,44 @@ in {
|
|||||||
programs.alacritty = {
|
programs.alacritty = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
# font = {
|
font = {
|
||||||
# normal = { family = "DejaVuSansM Nerd Font"; style = "Regular"; };
|
normal = { family = "DejaVuSansM Nerd Font"; style = "Regular"; };
|
||||||
# };
|
};
|
||||||
# window = {
|
window = {
|
||||||
# opacity = 0.8;
|
opacity = 0.8;
|
||||||
# padding = { x = 10; y = 10; };
|
padding = { x = 10; y = 10; };
|
||||||
# };
|
};
|
||||||
# colors = {
|
colors = {
|
||||||
# draw_bold_text_with_bright_colors = false;
|
draw_bold_text_with_bright_colors = false;
|
||||||
# primary = {
|
primary = {
|
||||||
# background = "0x${config.colorScheme.palette.base00}";
|
background = "0x${config.colorScheme.palette.base00}";
|
||||||
# foreground = "0x${config.colorScheme.palette.base05}";
|
foreground = "0x${config.colorScheme.palette.base05}";
|
||||||
# };
|
};
|
||||||
# cursor = {
|
cursor = {
|
||||||
# text = "0x${config.colorScheme.palette.base00}";
|
text = "0x${config.colorScheme.palette.base00}";
|
||||||
# cursor = "0x${config.colorScheme.palette.base05}";
|
cursor = "0x${config.colorScheme.palette.base05}";
|
||||||
# };
|
};
|
||||||
# normal = {
|
normal = {
|
||||||
# black = "0x${config.colorScheme.palette.base00}";
|
black = "0x${config.colorScheme.palette.base00}";
|
||||||
# red = "0x${config.colorScheme.palette.base08}";
|
red = "0x${config.colorScheme.palette.base08}";
|
||||||
# green = "0x${config.colorScheme.palette.base0B}";
|
green = "0x${config.colorScheme.palette.base0B}";
|
||||||
# yellow = "0x${config.colorScheme.palette.base0A}";
|
yellow = "0x${config.colorScheme.palette.base0A}";
|
||||||
# blue = "0x${config.colorScheme.palette.base0D}";
|
blue = "0x${config.colorScheme.palette.base0D}";
|
||||||
# magenta = "0x${config.colorScheme.palette.base0E}";
|
magenta = "0x${config.colorScheme.palette.base0E}";
|
||||||
# cyan = "0x${config.colorScheme.palette.base0C}";
|
cyan = "0x${config.colorScheme.palette.base0C}";
|
||||||
# white = "0x${config.colorScheme.palette.base05}";
|
white = "0x${config.colorScheme.palette.base05}";
|
||||||
# };
|
};
|
||||||
# bright = {
|
bright = {
|
||||||
# black = "0x${config.colorScheme.palette.base03}";
|
black = "0x${config.colorScheme.palette.base03}";
|
||||||
# red = "0x${config.colorScheme.palette.base09}";
|
red = "0x${config.colorScheme.palette.base09}";
|
||||||
# green = "0x${config.colorScheme.palette.base01}";
|
green = "0x${config.colorScheme.palette.base01}";
|
||||||
# yellow = "0x${config.colorScheme.palette.base02}";
|
yellow = "0x${config.colorScheme.palette.base02}";
|
||||||
# blue = "0x${config.colorScheme.palette.base04}";
|
blue = "0x${config.colorScheme.palette.base04}";
|
||||||
# magenta = "0x${config.colorScheme.palette.base06}";
|
magenta = "0x${config.colorScheme.palette.base06}";
|
||||||
# cyan = "0x${config.colorScheme.palette.base0F}";
|
cyan = "0x${config.colorScheme.palette.base0F}";
|
||||||
# white = "0x${config.colorScheme.palette.base07}";
|
white = "0x${config.colorScheme.palette.base07}";
|
||||||
# };
|
};
|
||||||
# };
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -43,7 +43,7 @@ in {
|
|||||||
package = pkgs.unstable.helix;
|
package = pkgs.unstable.helix;
|
||||||
defaultEditor = true;
|
defaultEditor = true;
|
||||||
settings = {
|
settings = {
|
||||||
# theme = "base16";
|
theme = "base16";
|
||||||
editor.cursor-shape = {
|
editor.cursor-shape = {
|
||||||
insert = "bar";
|
insert = "bar";
|
||||||
};
|
};
|
||||||
@ -122,97 +122,97 @@ in {
|
|||||||
}
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
# themes = {
|
themes = {
|
||||||
# base16 = let
|
base16 = let
|
||||||
# base00 = "#${config.colorScheme.palette.base00}";
|
base00 = "#${config.colorScheme.palette.base00}";
|
||||||
# base01 = "#${config.colorScheme.palette.base01}";
|
base01 = "#${config.colorScheme.palette.base01}";
|
||||||
# base02 = "#${config.colorScheme.palette.base02}";
|
base02 = "#${config.colorScheme.palette.base02}";
|
||||||
# base03 = "#${config.colorScheme.palette.base03}";
|
base03 = "#${config.colorScheme.palette.base03}";
|
||||||
# base04 = "#${config.colorScheme.palette.base04}";
|
base04 = "#${config.colorScheme.palette.base04}";
|
||||||
# base05 = "#${config.colorScheme.palette.base05}";
|
base05 = "#${config.colorScheme.palette.base05}";
|
||||||
# base06 = "#${config.colorScheme.palette.base06}";
|
base06 = "#${config.colorScheme.palette.base06}";
|
||||||
# base07 = "#${config.colorScheme.palette.base07}";
|
base07 = "#${config.colorScheme.palette.base07}";
|
||||||
# base08 = "#${config.colorScheme.palette.base08}";
|
base08 = "#${config.colorScheme.palette.base08}";
|
||||||
# base09 = "#${config.colorScheme.palette.base09}";
|
base09 = "#${config.colorScheme.palette.base09}";
|
||||||
# base0A = "#${config.colorScheme.palette.base0A}";
|
base0A = "#${config.colorScheme.palette.base0A}";
|
||||||
# base0B = "#${config.colorScheme.palette.base0B}";
|
base0B = "#${config.colorScheme.palette.base0B}";
|
||||||
# base0C = "#${config.colorScheme.palette.base0C}";
|
base0C = "#${config.colorScheme.palette.base0C}";
|
||||||
# base0D = "#${config.colorScheme.palette.base0D}";
|
base0D = "#${config.colorScheme.palette.base0D}";
|
||||||
# base0E = "#${config.colorScheme.palette.base0E}";
|
base0E = "#${config.colorScheme.palette.base0E}";
|
||||||
# base0F = "#${config.colorScheme.palette.base0F}";
|
base0F = "#${config.colorScheme.palette.base0F}";
|
||||||
# in {
|
in {
|
||||||
# "attributes" = base09;
|
"attributes" = base09;
|
||||||
# "comment" = { fg = base03; modifiers = ["italic"]; };
|
"comment" = { fg = base03; modifiers = ["italic"]; };
|
||||||
# "constant" = base09;
|
"constant" = base09;
|
||||||
# "constant.character.escape" = base0C;
|
"constant.character.escape" = base0C;
|
||||||
# "constant.numeric" = base09;
|
"constant.numeric" = base09;
|
||||||
# "constructor" = base0D;
|
"constructor" = base0D;
|
||||||
# "debug" = base03;
|
"debug" = base03;
|
||||||
# "diagnostic" = { modifiers = ["underlined"]; };
|
"diagnostic" = { modifiers = ["underlined"]; };
|
||||||
# "diff.delta" = base09;
|
"diff.delta" = base09;
|
||||||
# "diff.minus" = base08;
|
"diff.minus" = base08;
|
||||||
# "diff.plus" = base0B;
|
"diff.plus" = base0B;
|
||||||
# "error" = base08;
|
"error" = base08;
|
||||||
# "function" = base0D;
|
"function" = base0D;
|
||||||
# "hint" = base03;
|
"hint" = base03;
|
||||||
# "info" = base0D;
|
"info" = base0D;
|
||||||
# "keyword" = base0E;
|
"keyword" = base0E;
|
||||||
# "label" = base0E;
|
"label" = base0E;
|
||||||
# "namespace" = base0E;
|
"namespace" = base0E;
|
||||||
# "operator" = base05;
|
"operator" = base05;
|
||||||
# "special" = base0D;
|
"special" = base0D;
|
||||||
# "string" = base0B;
|
"string" = base0B;
|
||||||
# "type" = base0A;
|
"type" = base0A;
|
||||||
# "variable" = base08;
|
"variable" = base08;
|
||||||
# "variable.other.member" = base0B;
|
"variable.other.member" = base0B;
|
||||||
# "warning" = base09;
|
"warning" = base09;
|
||||||
|
|
||||||
# "markup.bold" = { fg = base0A; modifiers = ["bold"]; };
|
"markup.bold" = { fg = base0A; modifiers = ["bold"]; };
|
||||||
# "markup.heading" = base0D;
|
"markup.heading" = base0D;
|
||||||
# "markup.italic" = { fg = base0E; modifiers = ["italic"]; };
|
"markup.italic" = { fg = base0E; modifiers = ["italic"]; };
|
||||||
# "markup.link.text" = base08;
|
"markup.link.text" = base08;
|
||||||
# "markup.link.url" = { fg = base09; modifiers = ["underlined"]; };
|
"markup.link.url" = { fg = base09; modifiers = ["underlined"]; };
|
||||||
# "markup.list" = base08;
|
"markup.list" = base08;
|
||||||
# "markup.quote" = base0C;
|
"markup.quote" = base0C;
|
||||||
# "markup.raw" = base0B;
|
"markup.raw" = base0B;
|
||||||
# "markup.strikethrough" = { modifiers = ["crossed_out"]; };
|
"markup.strikethrough" = { modifiers = ["crossed_out"]; };
|
||||||
|
|
||||||
# "diagnostic.hint" = { underline = { style = "curl"; }; };
|
"diagnostic.hint" = { underline = { style = "curl"; }; };
|
||||||
# "diagnostic.info" = { underline = { style = "curl"; }; };
|
"diagnostic.info" = { underline = { style = "curl"; }; };
|
||||||
# "diagnostic.warning" = { underline = { style = "curl"; }; };
|
"diagnostic.warning" = { underline = { style = "curl"; }; };
|
||||||
# "diagnostic.error" = { underline = { style = "curl"; }; };
|
"diagnostic.error" = { underline = { style = "curl"; }; };
|
||||||
|
|
||||||
# # "ui.background" = { bg = base00; };
|
# "ui.background" = { bg = base00; };
|
||||||
# "ui.bufferline.active" = { fg = base00; bg = base03; modifiers = ["bold"]; };
|
"ui.bufferline.active" = { fg = base00; bg = base03; modifiers = ["bold"]; };
|
||||||
# "ui.bufferline" = { fg = base04; bg = base00; };
|
"ui.bufferline" = { fg = base04; bg = base00; };
|
||||||
# "ui.cursor" = { fg = base0A; modifiers = ["reversed"]; };
|
"ui.cursor" = { fg = base0A; modifiers = ["reversed"]; };
|
||||||
# "ui.cursor.insert" = { fg = base0A; modifiers = ["reversed"]; };
|
"ui.cursor.insert" = { fg = base0A; modifiers = ["reversed"]; };
|
||||||
# "ui.cursorline.primary" = { fg = base05; bg = base01; };
|
"ui.cursorline.primary" = { fg = base05; bg = base01; };
|
||||||
# "ui.cursor.match" = { fg = base0A; modifiers = ["reversed"]; };
|
"ui.cursor.match" = { fg = base0A; modifiers = ["reversed"]; };
|
||||||
# "ui.cursor.select" = { fg = base0A; modifiers = ["reversed"]; };
|
"ui.cursor.select" = { fg = base0A; modifiers = ["reversed"]; };
|
||||||
# "ui.gutter" = { bg = base00; };
|
"ui.gutter" = { bg = base00; };
|
||||||
# "ui.help" = { fg = base06; bg = base01; };
|
"ui.help" = { fg = base06; bg = base01; };
|
||||||
# "ui.linenr" = { fg = base03; bg = base00; };
|
"ui.linenr" = { fg = base03; bg = base00; };
|
||||||
# "ui.linenr.selected" = { fg = base04; bg = base01; modifiers = ["bold"]; };
|
"ui.linenr.selected" = { fg = base04; bg = base01; modifiers = ["bold"]; };
|
||||||
# "ui.menu" = { fg = base05; bg = base01; };
|
"ui.menu" = { fg = base05; bg = base01; };
|
||||||
# "ui.menu.scroll" = { fg = base03; bg = base01; };
|
"ui.menu.scroll" = { fg = base03; bg = base01; };
|
||||||
# "ui.menu.selected" = { fg = base01; bg = base04; };
|
"ui.menu.selected" = { fg = base01; bg = base04; };
|
||||||
# "ui.popup" = { bg = base01; };
|
"ui.popup" = { bg = base01; };
|
||||||
# "ui.selection" = { bg = base02; };
|
"ui.selection" = { bg = base02; };
|
||||||
# "ui.selection.primary" = { bg = base02; };
|
"ui.selection.primary" = { bg = base02; };
|
||||||
# "ui.statusline" = { fg = base04; bg = base01; };
|
"ui.statusline" = { fg = base04; bg = base01; };
|
||||||
# "ui.statusline.inactive" = { bg = base01; fg = base03; };
|
"ui.statusline.inactive" = { bg = base01; fg = base03; };
|
||||||
# "ui.statusline.insert" = { fg = base00; bg = base0B; };
|
"ui.statusline.insert" = { fg = base00; bg = base0B; };
|
||||||
# "ui.statusline.normal" = { fg = base00; bg = base03; };
|
"ui.statusline.normal" = { fg = base00; bg = base03; };
|
||||||
# "ui.statusline.select" = { fg = base00; bg = base0F; };
|
"ui.statusline.select" = { fg = base00; bg = base0F; };
|
||||||
# "ui.text" = base05;
|
"ui.text" = base05;
|
||||||
# "ui.text.focus" = base05;
|
"ui.text.focus" = base05;
|
||||||
# "ui.virtual.indent-guide" = { fg = base03; };
|
"ui.virtual.indent-guide" = { fg = base03; };
|
||||||
# "ui.virtual.inlay-hint" = { fg = base01; };
|
"ui.virtual.inlay-hint" = { fg = base01; };
|
||||||
# "ui.virtual.ruler" = { bg = base01; };
|
"ui.virtual.ruler" = { bg = base01; };
|
||||||
# "ui.window" = { bg = base01; };
|
"ui.window" = { bg = base01; };
|
||||||
# };
|
};
|
||||||
# };
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -18,7 +18,6 @@
|
|||||||
|
|
||||||
./theming/fonts.nix
|
./theming/fonts.nix
|
||||||
./theming/nix-colors.nix
|
./theming/nix-colors.nix
|
||||||
./theming/stylix.nix
|
|
||||||
|
|
||||||
./desktop-environments/hyprland/default.nix
|
./desktop-environments/hyprland/default.nix
|
||||||
];
|
];
|
||||||
|
@ -3,115 +3,115 @@
|
|||||||
programs.rofi = {
|
programs.rofi = {
|
||||||
enable = config.settings.desktop-environments.hyprland.enable;
|
enable = config.settings.desktop-environments.hyprland.enable;
|
||||||
package = pkgs.rofi-wayland;
|
package = pkgs.rofi-wayland;
|
||||||
# theme = let
|
theme = let
|
||||||
# inherit (config.lib.formats.rasi) mkLiteral;
|
inherit (config.lib.formats.rasi) mkLiteral;
|
||||||
# in {
|
in {
|
||||||
# "*" = {
|
"*" = {
|
||||||
# background-color = mkLiteral "#${config.colorScheme.palette.base00}";
|
background-color = mkLiteral "#${config.colorScheme.palette.base00}";
|
||||||
# foreground-color = mkLiteral "#${config.colorScheme.palette.base05}";
|
foreground-color = mkLiteral "#${config.colorScheme.palette.base05}";
|
||||||
# text-color = mkLiteral "#${config.colorScheme.palette.base07}";
|
text-color = mkLiteral "#${config.colorScheme.palette.base07}";
|
||||||
# border-color = mkLiteral "#${config.colorScheme.palette.base04}";
|
border-color = mkLiteral "#${config.colorScheme.palette.base04}";
|
||||||
# };
|
};
|
||||||
# # Holds the entire window
|
# Holds the entire window
|
||||||
# "#window" = {
|
"#window" = {
|
||||||
# transparency = "real";
|
transparency = "real";
|
||||||
# background-color = mkLiteral "#${config.colorScheme.palette.base00}";
|
background-color = mkLiteral "#${config.colorScheme.palette.base00}";
|
||||||
# text-color = mkLiteral "#${config.colorScheme.palette.base07}";
|
text-color = mkLiteral "#${config.colorScheme.palette.base07}";
|
||||||
# border = mkLiteral "0px";
|
border = mkLiteral "0px";
|
||||||
# border-color = mkLiteral "#${config.colorScheme.palette.base04}";
|
border-color = mkLiteral "#${config.colorScheme.palette.base04}";
|
||||||
# border-radius = mkLiteral "4px";
|
border-radius = mkLiteral "4px";
|
||||||
# width = mkLiteral "850px";
|
width = mkLiteral "850px";
|
||||||
# padding = mkLiteral "8px";
|
padding = mkLiteral "8px";
|
||||||
# };
|
};
|
||||||
|
|
||||||
# # Wrapper around bar and results
|
# Wrapper around bar and results
|
||||||
# "#mainbox" = {
|
"#mainbox" = {
|
||||||
# background-color = mkLiteral "#${config.colorScheme.palette.base00}";
|
background-color = mkLiteral "#${config.colorScheme.palette.base00}";
|
||||||
# border = mkLiteral "0px";
|
border = mkLiteral "0px";
|
||||||
# border-radius = mkLiteral "0px";
|
border-radius = mkLiteral "0px";
|
||||||
# border-color = mkLiteral "#${config.colorScheme.palette.base04}";
|
border-color = mkLiteral "#${config.colorScheme.palette.base04}";
|
||||||
# children = map mkLiteral [ "inputbar" "message" "listview" ];
|
children = map mkLiteral [ "inputbar" "message" "listview" ];
|
||||||
# spacing = mkLiteral "10px";
|
spacing = mkLiteral "10px";
|
||||||
# padding = mkLiteral "10px";
|
padding = mkLiteral "10px";
|
||||||
# };
|
};
|
||||||
|
|
||||||
# # Unknown
|
# Unknown
|
||||||
# "#textbox-prompt-colon" = {
|
"#textbox-prompt-colon" = {
|
||||||
# expand = false;
|
expand = false;
|
||||||
# str = ":";
|
str = ":";
|
||||||
# margin = mkLiteral "0px 0.3em 0em 0em";
|
margin = mkLiteral "0px 0.3em 0em 0em";
|
||||||
# text-color = mkLiteral "#${config.colorScheme.palette.base07}";
|
text-color = mkLiteral "#${config.colorScheme.palette.base07}";
|
||||||
# };
|
};
|
||||||
|
|
||||||
# # Command prompt left of the input
|
# Command prompt left of the input
|
||||||
# "#prompt" = { enabled = false; };
|
"#prompt" = { enabled = false; };
|
||||||
|
|
||||||
# # Actual text box
|
# Actual text box
|
||||||
# "#entry" = {
|
"#entry" = {
|
||||||
# placeholder-color = mkLiteral "#${config.colorScheme.palette.base03}";
|
placeholder-color = mkLiteral "#${config.colorScheme.palette.base03}";
|
||||||
# expand = true;
|
expand = true;
|
||||||
# horizontal-align = "0";
|
horizontal-align = "0";
|
||||||
# placeholder = "";
|
placeholder = "";
|
||||||
# padding = mkLiteral "0px 0px 0px 5px";
|
padding = mkLiteral "0px 0px 0px 5px";
|
||||||
# blink = true;
|
blink = true;
|
||||||
# };
|
};
|
||||||
|
|
||||||
# # Top bar
|
# Top bar
|
||||||
# "#inputbar" = {
|
"#inputbar" = {
|
||||||
# children = map mkLiteral [ "prompt" "entry" ];
|
children = map mkLiteral [ "prompt" "entry" ];
|
||||||
# border = mkLiteral "1px";
|
border = mkLiteral "1px";
|
||||||
# border-radius = mkLiteral "4px";
|
border-radius = mkLiteral "4px";
|
||||||
# padding = mkLiteral "6px";
|
padding = mkLiteral "6px";
|
||||||
# };
|
};
|
||||||
|
|
||||||
# # Results
|
# Results
|
||||||
# "#listview" = {
|
"#listview" = {
|
||||||
# background-color = mkLiteral "#${config.colorScheme.palette.base00}";
|
background-color = mkLiteral "#${config.colorScheme.palette.base00}";
|
||||||
# padding = mkLiteral "0px";
|
padding = mkLiteral "0px";
|
||||||
# columns = 1;
|
columns = 1;
|
||||||
# lines = 12;
|
lines = 12;
|
||||||
# spacing = "5px";
|
spacing = "5px";
|
||||||
# cycle = true;
|
cycle = true;
|
||||||
# dynamic = true;
|
dynamic = true;
|
||||||
# layout = "vertical";
|
layout = "vertical";
|
||||||
# };
|
};
|
||||||
|
|
||||||
# # Each result
|
# Each result
|
||||||
# "#element" = {
|
"#element" = {
|
||||||
# orientation = "vertical";
|
orientation = "vertical";
|
||||||
# border-radius = mkLiteral "0px";
|
border-radius = mkLiteral "0px";
|
||||||
# padding = mkLiteral "5px 0px 5px 5px";
|
padding = mkLiteral "5px 0px 5px 5px";
|
||||||
# };
|
};
|
||||||
# "#element.selected" = {
|
"#element.selected" = {
|
||||||
# border = mkLiteral "1px";
|
border = mkLiteral "1px";
|
||||||
# border-radius = mkLiteral "4px";
|
border-radius = mkLiteral "4px";
|
||||||
# border-color = mkLiteral "#${config.colorScheme.palette.base07}";
|
border-color = mkLiteral "#${config.colorScheme.palette.base07}";
|
||||||
# background-color = mkLiteral "#${config.colorScheme.palette.base04}";
|
background-color = mkLiteral "#${config.colorScheme.palette.base04}";
|
||||||
# text-color = mkLiteral "#${config.colorScheme.palette.base00}";
|
text-color = mkLiteral "#${config.colorScheme.palette.base00}";
|
||||||
# };
|
};
|
||||||
|
|
||||||
# "#element-text" = {
|
"#element-text" = {
|
||||||
# expand = true;
|
expand = true;
|
||||||
# # horizontal-align = mkLiteral "0.5";
|
# horizontal-align = mkLiteral "0.5";
|
||||||
# vertical-align = mkLiteral "0.5";
|
vertical-align = mkLiteral "0.5";
|
||||||
# margin = mkLiteral "0px 2.5px 0px 2.5px";
|
margin = mkLiteral "0px 2.5px 0px 2.5px";
|
||||||
# };
|
};
|
||||||
# "#element-text.selected" = {
|
"#element-text.selected" = {
|
||||||
# background-color = mkLiteral "#${config.colorScheme.palette.base04}";
|
background-color = mkLiteral "#${config.colorScheme.palette.base04}";
|
||||||
# text-color = mkLiteral "#${config.colorScheme.palette.base00}";
|
text-color = mkLiteral "#${config.colorScheme.palette.base00}";
|
||||||
# };
|
};
|
||||||
|
|
||||||
# # Not sure how to get icons
|
# Not sure how to get icons
|
||||||
# "#element-icon" = {
|
"#element-icon" = {
|
||||||
# size = mkLiteral "18px";
|
size = mkLiteral "18px";
|
||||||
# border = mkLiteral "0px";
|
border = mkLiteral "0px";
|
||||||
# padding = mkLiteral "2px 5px 2px 2px";
|
padding = mkLiteral "2px 5px 2px 2px";
|
||||||
# background-color = mkLiteral "#${config.colorScheme.palette.base00}";
|
background-color = mkLiteral "#${config.colorScheme.palette.base00}";
|
||||||
# };
|
};
|
||||||
# "#element-icon.selected" = {
|
"#element-icon.selected" = {
|
||||||
# background-color = mkLiteral "#${config.colorScheme.palette.base04}";
|
background-color = mkLiteral "#${config.colorScheme.palette.base04}";
|
||||||
# text-color = mkLiteral "#${config.colorScheme.palette.base00}";
|
text-color = mkLiteral "#${config.colorScheme.palette.base00}";
|
||||||
# };
|
};
|
||||||
# };
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -1,38 +0,0 @@
|
|||||||
{ config, lib, inputs, pkgs, ... }:
|
|
||||||
|
|
||||||
with lib;
|
|
||||||
|
|
||||||
let
|
|
||||||
cfg = config.settings.theming.stylix;
|
|
||||||
in {
|
|
||||||
options = {
|
|
||||||
settings.theming.stylix.enable = lib.mkOption {
|
|
||||||
type = lib.types.bool;
|
|
||||||
description = ''
|
|
||||||
Enable stylix configuration
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
imports = [
|
|
||||||
inputs.stylix.homeManagerModules.stylix
|
|
||||||
];
|
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
|
||||||
stylix.enable = true;
|
|
||||||
|
|
||||||
stylix.image = ../../../assets/wallpaper-2.png;
|
|
||||||
stylix.polarity = "dark";
|
|
||||||
stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/da-one-ocean.yaml";
|
|
||||||
|
|
||||||
stylix.autoEnable = true;
|
|
||||||
|
|
||||||
stylix.cursor = {
|
|
||||||
package = pkgs.phinger-cursors;
|
|
||||||
name = "phinger-cursors-dark";
|
|
||||||
size = 24;
|
|
||||||
};
|
|
||||||
|
|
||||||
stylix.fonts.sizes.applications = 10;
|
|
||||||
};
|
|
||||||
}
|
|
Loading…
x
Reference in New Issue
Block a user