kat/nixfiles
1
0
Fork 0
mirror of https://github.com/kittywitch/nixfiles.git synced 2026-02-09 04:19:19 -08:00
Code Issues Projects Releases Packages Wiki Activity

feat: further fixups

Browse source
This commit is contained in:
Kat Inskip 2023-01-29 10:02:24 -08:00
parent 97a26b38ba
commit 1ca6189cfd
Signed by: kat
GPG key ID: 465E64DECEA8CF0F
10 changed files with 46 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kat/gui/gtk.nix
View file

@ -6,7 +6,7 @@
gtk = {
enable = true;
font = {
name = "Iosevka Comfy";
name = "Iosevka";
size = 9;
};
iconTheme = {

2
kat/gui/mako.nix
View file

@ -18,7 +18,7 @@ in {
programs.mako = {
enable = true;
font = "Iosevka Comfy 10";
font = "Iosevka 10";
defaultTimeout = 3000;
borderColor = palette.base08;
backgroundColor = "${palette.base00}BF";

4
kat/gui/sway.nix
View file

@ -117,9 +117,9 @@ in {
};
fonts = {
names = [ "Iosevka Comfy"];
names = [ "Iosevka"];
style = "Regular";
size = 10.0;
size = 12.0;
};
terminal = "${pkgs.wezterm}/bin/wezterm";

2
kat/gui/swaylock.nix
View file

@ -9,7 +9,7 @@
indicator = true;
indicator-radius = 110;
indicator-thickness = 8;
font = "Iosevka Comfy";
font = "Iosevka";
font-size = "12px";
clock = true;
datestr = "%F";

2
kat/gui/waybar.sass
View file

@ -7,7 +7,7 @@
border: none
border-radius: 0
background: none
font-family: "Iosevka Comfy", "Font Awesome 6 Free", "Font Awesome 6 Brands"
font-family: "Iosevka", "Font Awesome 6 Free", "Font Awesome 6 Brands"
font-size: $font_size
min-height: 8px
text-shadow: none

4
modules/home/base16.nix
View file

@ -14,8 +14,8 @@ in with lib; {
variables = mkOption {
type = attrsOf str;
default = (cfg.palette // cfg.palette' // {
term_font = "Iosevka Comfy";
font = "Iosevka Comfy";
term_font = "Iosevka";
font = "Iosevka";
font_size = "12px";
});
};

41
nixos/common/access.nix
View file

@ -2,17 +2,34 @@
# TODO: solve lib usage
inherit (lib.lists) concatLists elem;
inherit (lib.attrsets) mapAttrsToList;
commonUser = {
shell = pkgs.zsh;
openssh.authorizedKeys.keys = concatLists (mapAttrsToList
(name: user:
if elem "wheel" user.extraGroups then
user.openssh.authorizedKeys.keys
else
[ ])
config.users.users);
};
in {
users.users.root = {
shell = pkgs.zsh;
hashedPassword =
"$6$i28yOXoo$/WokLdKds5ZHtJHcuyGrH2WaDQQk/2Pj0xRGLgS8UcmY2oMv3fw2j/85PRpsJJwCB2GBRYRK5LlvdTleHd3mB.";
openssh.authorizedKeys.keys = concatLists (mapAttrsToList
(name: user:
if elem "wheel" user.extraGroups then
user.openssh.authorizedKeys.keys
else
[ ])
config.users.users);
security.sudo.extraRules = [{
users = [ "deploy" ];
commands = [ {
command = "ALL";
options = [
"NOPASSWD"
"SETENV"
];
} ];
}];
users.users = {
root = commonUser // {
hashedPassword =
"$6$i28yOXoo$/WokLdKds5ZHtJHcuyGrH2WaDQQk/2Pj0xRGLgS8UcmY2oMv3fw2j/85PRpsJJwCB2GBRYRK5LlvdTleHd3mB.";
};
deploy = commonUser // {
isNormalUser = true;
};
};
}
}

8
nixos/common/network.nix
View file

@ -1,5 +1,7 @@
_: {
networking.nftables.enable = true;
{ machine, ... }: {
networking = {
hostName = machine;
nftables.enable = true;
};
services.tailscale.enable = true;
}

9
nixos/gui/fonts.nix
View file

@ -1,12 +1,9 @@
{ pkgs, ... }: {
fonts = {
fonts = (with pkgs; [
fonts = with pkgs; [
twitter-color-emoji
]) ++ (with pkgs.iosevka-comfy; [
comfy
comfy-motion
comfy-wide
]);
iosevka-bin
];
enableDefaultFonts = true;
fontDir.enable = true;
fontconfig = {

2
systems/default.nix
View file

@ -123,7 +123,7 @@
};
hostname = "${name}.inskip.me";
sshOpts = ["-p" "${builtins.toString (builtins.head inputs.self.nixosConfigurations.${name}.config.services.openssh.ports)}"];
sshUser = "root";
sshUser = "deploy";
user = "root";
autoRollback = true;
magicRollback = true;