From 3416502f73dbcedbc2b8b738b8cb8ee81ddd11a1 Mon Sep 17 00:00:00 2001 From: fwastring Date: Fri, 19 Sep 2025 16:57:04 +0200 Subject: [PATCH] Changed how nix is configured --- maskiner/core/configuration.nix | 1 + moduler/git.nix | 11 ++++++++--- moduler/home.nix | 1 - moduler/hyprland.nix | 20 ++++++++++---------- moduler/users.nix | 4 +--- 5 files changed, 20 insertions(+), 17 deletions(-) diff --git a/maskiner/core/configuration.nix b/maskiner/core/configuration.nix index 50b43a5..ea0110d 100644 --- a/maskiner/core/configuration.nix +++ b/maskiner/core/configuration.nix @@ -19,6 +19,7 @@ in ../../moduler/base.nix ../../moduler/users.nix + ../../moduler/git.nix ../../moduler/network.nix ../../moduler/programs.nix ../../moduler/system.nix diff --git a/moduler/git.nix b/moduler/git.nix index e260d68..2bbf0ff 100644 --- a/moduler/git.nix +++ b/moduler/git.nix @@ -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/"; }; }; diff --git a/moduler/home.nix b/moduler/home.nix index f97513e..968f69e 100644 --- a/moduler/home.nix +++ b/moduler/home.nix @@ -10,7 +10,6 @@ imports = [ ../moduler/tmux.nix ../moduler/fish.nix - ../moduler/git.nix ../moduler/kitty.nix ../moduler/dunst.nix ../moduler/nixpkgs.nix diff --git a/moduler/hyprland.nix b/moduler/hyprland.nix index c6e89ac..18cc157 100644 --- a/moduler/hyprland.nix +++ b/moduler/hyprland.nix @@ -54,7 +54,7 @@ in }; rofi = { enable = true; - font = lib.mkForce "ComicShannsMono Nerd Font 18"; + font = lib.mkForce "ComicShannsMono Nerd Font 18"; }; waybar = { enable = true; @@ -315,17 +315,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" ]; }; diff --git a/moduler/users.nix b/moduler/users.nix index 97b308e..3307570 100644 --- a/moduler/users.nix +++ b/moduler/users.nix @@ -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" ]; }; };