Jan
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Jan:a65c4914b715b9cdebe1758bfe4ab57ccd7a8c59
Branches Tags
Jan:main
..
compare: Jan:3f11f6413508010f8a5f635a1c952472da119f0c
Branches Tags
Jan:main

No commits in common. "a65c4914b715b9cdebe1758bfe4ab57ccd7a8c59" and "3f11f6413508010f8a5f635a1c952472da119f0c" have entirely different histories.
a65c4914b7 ... 3f11f64135

7 changed files with 40 additions and 62 deletions
Show Stats Expand all files Collapse all files

19
flake.nix
View File

@ -25,15 +25,9 @@
... ...
}: }:
let let
makeConfig = baseModules = [
machineConfig: userConfig:
(nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
machineConfig
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {
machine.users = userConfig;
home-manager.sharedModules = [ home-manager.sharedModules = [
stylix.homeManagerModules.stylix stylix.homeManagerModules.stylix
nixvim.homeManagerModules.nixvim nixvim.homeManagerModules.nixvim
@ -41,15 +35,14 @@
]; ];
} }
]; ];
});
in in
{ {
nixosConfigurations = { nixosConfigurations = {
"20212060" = makeConfig ./machines/laptop.nix { "20212060" = nixpkgs.lib.nixosSystem {
jan = { system = "x86_64-linux";
sudo = true; modules = [
configuration = ./users/jan.nix; ./machines/laptop.nix
}; ] ++ baseModules;
}; };
}; };
}; };

6
machines/laptop.nix
View File

@ -22,6 +22,12 @@
wpa_supplicant.enable = true; wpa_supplicant.enable = true;
}; };
# User accounts
machine.users.jan = {
sudo = true;
configuration = ../users/jan.nix;
};
# Hardware configuration # Hardware configuration
hardware.enableRedistributableFirmware = true; hardware.enableRedistributableFirmware = true;
boot.initrd.availableKernelModules = [ boot.initrd.availableKernelModules = [

4
user-modules/browser/qutebrowser/default.nix
View File

@ -43,8 +43,8 @@ in
# config.set("completion.web_history.max_items", 30) # config.set("completion.web_history.max_items", 30)
config.set("colors.webpage.darkmode.enabled", False) config.set("colors.webpage.darkmode.enabled", False)
config.set("colors.webpage.preferred_color_scheme", "${if theme.darkMode then "dark" else "light"}") config.set("colors.webpage.preferred_color_scheme", "${if theme.darkMode then "dark" else "light"}")
config.set("fonts.default_family", "${theme.fonts.interface.name}") config.set("fonts.default_family", "${theme.fonts.monospace.name}")
config.set("fonts.default_size", "${toString theme.fonts.interface.recommendedSize}pt") config.set("fonts.default_size", "${toString theme.fonts.monospace.recommendedSize}pt")
''; '';
}; };
}; };

2
user-modules/rofi/default.nix
View File

@ -19,7 +19,7 @@ in
enable = true; enable = true;
terminal = config.default.terminal; terminal = config.default.terminal;
package = pkgs.rofi-wayland; package = pkgs.rofi-wayland;
font = "${theme.fonts.interface.name} ${toString (theme.fonts.interface.recommendedSize)}"; font = "${theme.fonts.monospace.name} ${toString theme.fonts.monospace.recommendedSize}";
theme = theme =
let let
inherit (config.lib.formats.rasi) mkLiteral; inherit (config.lib.formats.rasi) mkLiteral;

5
user-modules/theming/default.nix
View File

@ -243,11 +243,6 @@ in
description = "Default emoji font."; description = "Default emoji font.";
}; };
interface = mkOption {
type = fontModule;
description = "Default emoji font.";
};
extraFonts = mkOption { extraFonts = mkOption {
type = types.listOf fontModule; type = types.listOf fontModule;
default = [ ]; default = [ ];

27
user-modules/vscode/default.nix
View File

@ -49,29 +49,14 @@ in
ms-vsliveshare.vsliveshare ms-vsliveshare.vsliveshare
]; ];
userSettings = userSettings = {
let
font-family = mkForce "'${cfg.codeFont.name}', '${cfg.fallbackFont.name}'";
# TODO: Move the conversion factor to theme settings
font-size = mkForce cfg.codeFont.recommendedSize; # Convert pt to px
in
{
# Font setup # Font setup
"editor.fontFamily" = font-family; # TODO: Move the conversion factor to theme settings
"editor.inlayHints.fontFamily" = font-family; "editor.fontFamily" = mkForce "'${cfg.codeFont.name}', '${cfg.fallbackFont.name}'";
"editor.inlineSuggest.fontFamily" = font-family; "editor.fontSize" = mkForce (cfg.codeFont.recommendedSize); # Convert pt to px
"editor.fontSize" = font-size;
"editor.fontLigatures" = true; "editor.fontLigatures" = true;
"terminal.integrated.fontFamily" = font-family; "terminal.integrated.fontFamily" = mkForce "'${cfg.codeFont.name}', '${cfg.fallbackFont.name}'";
"terminal.integrated.fontSize" = font-size; "terminal.integrated.fontSize" = mkForce (cfg.codeFont.recommendedSize); # Convert pt to px
"chat.editor.fontFamily" = font-family; # TODO: Change this font to the standard UI font
"chat.editor.fontSize" = font-size;
"debug.console.fontFamily" = font-family;
"debug.console.fontSize" = font-size;
"scm.inputFontFamily" = font-family; # TODO: Change this font to the standard UI font
"scm.inputFontSize" = font-size;
"markdown.preview.fontFamily" = mkForce theme.fonts.sansSerif.name; # TODO: Change this font to the standard UI font
"markdown.preview.fontSize" = mkForce theme.fonts.sansSerif.recommendedSize;
# Formatting # Formatting
"editor.formatOnSave" = true; "editor.formatOnSave" = true;

1
users/jan.nix
View File

@ -114,7 +114,6 @@
fonts.sansSerif = fontpkgs."DejaVu Sans"; fonts.sansSerif = fontpkgs."DejaVu Sans";
fonts.monospace = fontpkgs."Dina"; fonts.monospace = fontpkgs."Dina";
fonts.emoji = fontpkgs."Noto Color Emoji"; fonts.emoji = fontpkgs."Noto Color Emoji";
fonts.interface = fontpkgs."Dina";
fonts.extraFonts = [ ]; fonts.extraFonts = [ ];
# Color scheme # Color scheme