Merge
This commit is contained in:
commit
8a3c9f593b
11 changed files with 109 additions and 205 deletions
|
@ -22,7 +22,7 @@
|
|||
nix.nixPath = ["/etc/nix/path"];
|
||||
users.defaultUserShell = pkgs.bash;
|
||||
documentation.man.generateCaches = false;
|
||||
systemd.services.NetworkManager-wait-online.enable = lib.mkForce false;
|
||||
# systemd.services.NetworkManager-wait-online.enable = lib.mkForce false;
|
||||
programs.fish.enable = true;
|
||||
programs.bash = {
|
||||
interactiveShellInit = ''
|
||||
|
@ -76,10 +76,9 @@
|
|||
fonts.packages = with pkgs; [
|
||||
(nerdfonts.override {
|
||||
fonts = [
|
||||
"ComicShannsMono"
|
||||
"FiraCode"
|
||||
"Agave"
|
||||
"VictorMono"
|
||||
"DroidSansMono"
|
||||
"Iosevka"
|
||||
];
|
||||
})
|
||||
];
|
||||
|
@ -98,8 +97,18 @@
|
|||
LC_TIME = "sv_SE.UTF-8";
|
||||
};
|
||||
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
# boot.loader.systemd-boot.enable = true;
|
||||
# boot.loader.efi.canTouchEfiVariables = true;
|
||||
boot.loader = {
|
||||
efi = {
|
||||
canTouchEfiVariables = false;
|
||||
};
|
||||
grub = {
|
||||
efiSupport = true;
|
||||
efiInstallAsRemovable = true;
|
||||
device = "nodev";
|
||||
};
|
||||
};
|
||||
console.keyMap = "sv-latin1";
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
|
@ -110,15 +119,15 @@
|
|||
nano
|
||||
git
|
||||
openssh
|
||||
(
|
||||
catppuccin-sddm.override {
|
||||
flavor = "mocha";
|
||||
font = "FiraCode Nerd Font Bold";
|
||||
fontSize = "17";
|
||||
background = "${../wallpapers/inverted.png}";
|
||||
loginBackground = true;
|
||||
}
|
||||
)
|
||||
# (
|
||||
# catppuccin-sddm.override {
|
||||
# flavor = "mocha";
|
||||
# font = "ComicShannsMono Nerd Font Bold";
|
||||
# fontSize = "17";
|
||||
# background = "${../wallpapers/inverted.png}";
|
||||
# loginBackground = true;
|
||||
# }
|
||||
# )
|
||||
];
|
||||
|
||||
|
||||
|
@ -139,14 +148,10 @@
|
|||
"ipsec.d/ipsec.nm-l2tp.secrets"
|
||||
];
|
||||
};
|
||||
displayManager = {
|
||||
sddm = {
|
||||
enable = true;
|
||||
theme = "catppuccin-mocha";
|
||||
package = pkgs.kdePackages.sddm;
|
||||
};
|
||||
};
|
||||
xserver = {
|
||||
displayManager = {
|
||||
startx.enable = true;
|
||||
};
|
||||
enable = true;
|
||||
xkb = {
|
||||
layout = "se";
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue