fw/nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed how nix is configured

Browse source
This commit is contained in:
fwastring 2025-09-19 16:57:04 +02:00
parent 562970f62a
commit 3416502f73
5 changed files with 20 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

1
maskiner/core/configuration.nix
View file

@ -19,6 +19,7 @@ in
../../moduler/base.nix ../../moduler/base.nix
../../moduler/users.nix ../../moduler/users.nix
../../moduler/git.nix
../../moduler/network.nix ../../moduler/network.nix
../../moduler/programs.nix ../../moduler/programs.nix
../../moduler/system.nix ../../moduler/system.nix

11
moduler/git.nix
View file

@ -2,9 +2,14 @@
{ {
programs.git = { programs.git = {
enable = true; enable = true;
userName = "fwastring"; config = {
userEmail = "fredrik@wastring.com"; user = {
extraConfig = { name = "fwastring";
email = "fredrik@wastring.com";
};
pull = {
rebase = false;
};
url."git@github.com:".insteadOf = "https://github.com/"; url."git@github.com:".insteadOf = "https://github.com/";
}; };
}; };

1
moduler/home.nix
View file

@ -10,7 +10,6 @@
imports = [ imports = [
../moduler/tmux.nix ../moduler/tmux.nix
../moduler/fish.nix ../moduler/fish.nix
../moduler/git.nix
../moduler/kitty.nix ../moduler/kitty.nix
../moduler/dunst.nix ../moduler/dunst.nix
../moduler/nixpkgs.nix ../moduler/nixpkgs.nix

20
moduler/hyprland.nix
View file

@ -54,7 +54,7 @@ in
}; };
rofi = { rofi = {
enable = true; enable = true;
font = lib.mkForce "ComicShannsMono Nerd Font 18"; font = lib.mkForce "ComicShannsMono Nerd Font 18";
}; };
waybar = { waybar = {
enable = true; enable = true;
@ -315,17 +315,17 @@ in
"md2, 0.4, 0, 0.2, 1" "md2, 0.4, 0, 0.2, 1"
]; ];
animation = [ animation = [
"windows, 1, 1, md3_decel, popin 60%" "windows, 1, 1.2, md3_decel, popin 60%"
"windowsIn, 1, 1, md3_decel, popin 60%" "windowsIn, 1, 1.2, md3_decel, popin 60%"
"windowsOut, 1, 1, md3_accel, popin 60%" "windowsOut, 1, 1.2, md3_accel, popin 60%"
"border, 1, 2, default" "border, 1, 2, default"
"fade, 1, 1, md3_decel" "fade, 1, 1.2, md3_decel"
"layersIn, 1, 1, menu_decel, slide" "layersIn, 1, 1.2, menu_decel, slide"
"layersOut, 1, 1, menu_accel" "layersOut, 1, 1.2, menu_accel"
"fadeLayersIn, 1, 1, menu_decel" "fadeLayersIn, 1, 1.2, menu_decel"
"fadeLayersOut, 1, 1, menu_accel" "fadeLayersOut, 1, 1.2, menu_accel"
"workspaces, 1, 2, menu_decel, slide" "workspaces, 1, 2, menu_decel, slide"
"specialWorkspace, 1, 1, md3_decel, slidevert" "specialWorkspace, 1, 1.2, md3_decel, slidevert"
]; ];
}; };

4
moduler/users.nix
View file

@ -20,9 +20,7 @@
]; ];
openssh.authorizedKeys = { openssh.authorizedKeys = {
keys = [ keys = [
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDALsdpwvC0w/Aj+1fWtzJyyWoUrGkdh8o2thVHeQQBNo0D7cmVberYmi4Cv9gWGX6PaElrnOl0KRdGyro2wxOYokSxgk2VgWW67BFITAQAbKyG2NhXXPbhb4jccDo7WH7TtOG8IofuJTPRu1Duda6k4RN0I0CkyAN6LGX+zy49cq0qKf9ijXYhCDYNih3+Fu/ig0aW/SYmsVoUl2VFTWdI5x5/wLvIjTEZhmAtYIeYADaLnom356cFrUysZa++FUujQAz3Ow236BvP95XZdTsqvfWNZFNIpC9VYF72JeIDCs5wDIr0GFmanF2On1nar+jJpoOE8SdHt357p5g/PqXV5TisN2xQRkqVwO9tWtMl4sF84jA4ULnY2gQWv9jErMxymUQ1IwuPUzDDlbRHCtfexAtkBy7wv6xslKAzG1QahvF/btNs5Caj3LN31rgAuxyooCbKGKTeBP3kHPKcz1iupgidfbO/QqVXBRQJTEdGyAKa8hVmLQZZPC/XUhxESAk= fw@fw-nix" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFpJBGPIfPB1BwSG7aoKqwfccyZSaU7J3xpJ8behMp9N fw@core"
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8ku8iCb7tXd/tfxYDW+Tj8K9kpfrYZciYUZ6tBpO80inm4EImtfyEeJTuqDWMKov2BftUKs8brNeTBCXUEvU1P0+cpOP9RtYA5tfBXf3su+iVSswJJStIxNboXHrEGKdJJRNsTv/9agshDSUBy6G5TI1cXhv/updornfA4fwOMqOmtlYEn6XCRnsrO6NBLc/uLckdbF75HOsoLvezRvuqTLjpapjaUKGVPrgNXiclIKHmuOx71kgD4FX3rSz9FgKjnfu3a7DBbrHsf/g+N9PjNF1muN9UOV6nK3WwiO9BMWi7NpAWfzJOeZg9chqzI+U6CcsqYVeESgL41so+dnv3 fw@laptop"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP34dnsZSnWdDvd+3BXDwcw7wP0PjPEx2eCdBQJyGD6O fw@laptop"
]; ];
}; };
}; };