Merge branch 'main' of github.com:fwastring/nix
This commit is contained in:
commit
e2aef74b7d
5 changed files with 20 additions and 17 deletions
|
@ -2,9 +2,14 @@
|
|||
{
|
||||
programs.git = {
|
||||
enable = true;
|
||||
userName = "fwastring";
|
||||
userEmail = "fredrik@wastring.com";
|
||||
extraConfig = {
|
||||
config = {
|
||||
user = {
|
||||
name = "fwastring";
|
||||
email = "fredrik@wastring.com";
|
||||
};
|
||||
pull = {
|
||||
rebase = false;
|
||||
};
|
||||
url."git@github.com:".insteadOf = "https://github.com/";
|
||||
};
|
||||
};
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
imports = [
|
||||
../moduler/tmux.nix
|
||||
../moduler/fish.nix
|
||||
../moduler/git.nix
|
||||
../moduler/kitty.nix
|
||||
../moduler/dunst.nix
|
||||
../moduler/nixpkgs.nix
|
||||
|
|
|
@ -55,7 +55,7 @@ in
|
|||
};
|
||||
rofi = {
|
||||
enable = true;
|
||||
font = lib.mkForce "ComicShannsMono Nerd Font 18";
|
||||
font = lib.mkForce "ComicShannsMono Nerd Font 18";
|
||||
};
|
||||
waybar = {
|
||||
enable = true;
|
||||
|
@ -317,17 +317,17 @@ in
|
|||
"md2, 0.4, 0, 0.2, 1"
|
||||
];
|
||||
animation = [
|
||||
"windows, 1, 1, md3_decel, popin 60%"
|
||||
"windowsIn, 1, 1, md3_decel, popin 60%"
|
||||
"windowsOut, 1, 1, md3_accel, popin 60%"
|
||||
"windows, 1, 1.2, md3_decel, popin 60%"
|
||||
"windowsIn, 1, 1.2, md3_decel, popin 60%"
|
||||
"windowsOut, 1, 1.2, md3_accel, popin 60%"
|
||||
"border, 1, 2, default"
|
||||
"fade, 1, 1, md3_decel"
|
||||
"layersIn, 1, 1, menu_decel, slide"
|
||||
"layersOut, 1, 1, menu_accel"
|
||||
"fadeLayersIn, 1, 1, menu_decel"
|
||||
"fadeLayersOut, 1, 1, menu_accel"
|
||||
"fade, 1, 1.2, md3_decel"
|
||||
"layersIn, 1, 1.2, menu_decel, slide"
|
||||
"layersOut, 1, 1.2, menu_accel"
|
||||
"fadeLayersIn, 1, 1.2, menu_decel"
|
||||
"fadeLayersOut, 1, 1.2, menu_accel"
|
||||
"workspaces, 1, 2, menu_decel, slide"
|
||||
"specialWorkspace, 1, 1, md3_decel, slidevert"
|
||||
"specialWorkspace, 1, 1.2, md3_decel, slidevert"
|
||||
];
|
||||
};
|
||||
|
||||
|
|
|
@ -20,9 +20,7 @@
|
|||
];
|
||||
openssh.authorizedKeys = {
|
||||
keys = [
|
||||
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDALsdpwvC0w/Aj+1fWtzJyyWoUrGkdh8o2thVHeQQBNo0D7cmVberYmi4Cv9gWGX6PaElrnOl0KRdGyro2wxOYokSxgk2VgWW67BFITAQAbKyG2NhXXPbhb4jccDo7WH7TtOG8IofuJTPRu1Duda6k4RN0I0CkyAN6LGX+zy49cq0qKf9ijXYhCDYNih3+Fu/ig0aW/SYmsVoUl2VFTWdI5x5/wLvIjTEZhmAtYIeYADaLnom356cFrUysZa++FUujQAz3Ow236BvP95XZdTsqvfWNZFNIpC9VYF72JeIDCs5wDIr0GFmanF2On1nar+jJpoOE8SdHt357p5g/PqXV5TisN2xQRkqVwO9tWtMl4sF84jA4ULnY2gQWv9jErMxymUQ1IwuPUzDDlbRHCtfexAtkBy7wv6xslKAzG1QahvF/btNs5Caj3LN31rgAuxyooCbKGKTeBP3kHPKcz1iupgidfbO/QqVXBRQJTEdGyAKa8hVmLQZZPC/XUhxESAk= fw@fw-nix"
|
||||
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8ku8iCb7tXd/tfxYDW+Tj8K9kpfrYZciYUZ6tBpO80inm4EImtfyEeJTuqDWMKov2BftUKs8brNeTBCXUEvU1P0+cpOP9RtYA5tfBXf3su+iVSswJJStIxNboXHrEGKdJJRNsTv/9agshDSUBy6G5TI1cXhv/updornfA4fwOMqOmtlYEn6XCRnsrO6NBLc/uLckdbF75HOsoLvezRvuqTLjpapjaUKGVPrgNXiclIKHmuOx71kgD4FX3rSz9FgKjnfu3a7DBbrHsf/g+N9PjNF1muN9UOV6nK3WwiO9BMWi7NpAWfzJOeZg9chqzI+U6CcsqYVeESgL41so+dnv3 fw@laptop"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP34dnsZSnWdDvd+3BXDwcw7wP0PjPEx2eCdBQJyGD6O fw@laptop"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFpJBGPIfPB1BwSG7aoKqwfccyZSaU7J3xpJ8behMp9N fw@core"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue