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

Fixed booloader and more

Browse source
This commit is contained in:
FredzyW 2024-11-15 09:23:13 +01:00
parent 6c1838ede0
commit 5190de97d6
6 changed files with 47 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

44
config/base.nix
View file

@ -22,7 +22,7 @@
nix.nixPath = ["/etc/nix/path"]; nix.nixPath = ["/etc/nix/path"];
users.defaultUserShell = pkgs.bash; users.defaultUserShell = pkgs.bash;
documentation.man.generateCaches = false; 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.fish.enable = true;
programs.bash = { programs.bash = {
interactiveShellInit = '' interactiveShellInit = ''
@ -97,21 +97,31 @@
LC_TIME = "sv_SE.UTF-8"; LC_TIME = "sv_SE.UTF-8";
}; };
boot.loader.systemd-boot.enable = true; # boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; # boot.loader.efi.canTouchEfiVariables = true;
boot.loader = {
efi = {
canTouchEfiVariables = false;
};
grub = {
efiSupport = true;
efiInstallAsRemovable = true;
device = "nodev";
};
};
console.keyMap = "sv-latin1"; console.keyMap = "sv-latin1";
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
openssh openssh
( # (
catppuccin-sddm.override { # catppuccin-sddm.override {
flavor = "mocha"; # flavor = "mocha";
font = "ComicShannsMono Nerd Font Bold"; # font = "ComicShannsMono Nerd Font Bold";
fontSize = "17"; # fontSize = "17";
background = "${../wallpapers/inverted.png}"; # background = "${../wallpapers/inverted.png}";
loginBackground = true; # loginBackground = true;
} # }
) # )
]; ];
@ -132,14 +142,10 @@
"ipsec.d/ipsec.nm-l2tp.secrets" "ipsec.d/ipsec.nm-l2tp.secrets"
]; ];
}; };
displayManager = {
sddm = {
enable = true;
theme = "catppuccin-mocha";
package = pkgs.kdePackages.sddm;
};
};
xserver = { xserver = {
displayManager = {
startx.enable = true;
};
enable = true; enable = true;
xkb = { xkb = {
layout = "se"; layout = "se";

2
config/home.nix
View file

@ -79,6 +79,8 @@
openssl openssl
# Dev # Dev
kaggle
vscode
unstable.cargo unstable.cargo
unstable.rustc unstable.rustc
cargo-generate cargo-generate

11
maskiner/laptop/configuration.nix
View file

@ -21,6 +21,17 @@
dotnet-sdk_8 dotnet-sdk_8
]; ];
# boot.loader = {
# efi = {
# canTouchEfiVariables = true;
# };
# grub = {
# enable = true;
# efiSupport = true;
# useOSProber = true;
# };
# };
services.xserver.dpi = 140; services.xserver.dpi = 140;

10
maskiner/server/configuration.nix
View file

@ -87,11 +87,11 @@
LC_TIME = "sv_SE.UTF-8"; LC_TIME = "sv_SE.UTF-8";
}; };
boot.loader.grub = { # boot.loader.grub = {
enable = true; # enable = true;
device = "/dev/sdc"; # device = "/dev/sdc";
useOSProber = true; # useOSProber = true;
}; # };
console.keyMap = "sv-latin1"; console.keyMap = "sv-latin1";
programs.zsh.enable = true; programs.zsh.enable = true;

2
shared/fish.nix
View file

@ -49,6 +49,8 @@
reb="sudo nixos-rebuild switch --flake $SYSTEM_DIR"; reb="sudo nixos-rebuild switch --flake $SYSTEM_DIR";
cam="jira issue create && jira issue assign && jira issue move"; cam="jira issue create && jira issue assign && jira issue move";
latest="git log | head -1 | awk '{print $2;}' | xsel -ib"; latest="git log | head -1 | awk '{print $2;}' | xsel -ib";
vpnup="nmcli con up 'iFacts VPN'";
vpndown="nmcli con down 'iFacts VPN'";
}; };
interactiveShellInit = '' interactiveShellInit = ''
fish_vi_key_bindings fish_vi_key_bindings

3
shared/ssh.nix
View file

@ -19,6 +19,7 @@
hostname = "login.student.lth.se"; hostname = "login.student.lth.se";
port = 22; port = 22;
user = "fr7658wa-s"; user = "fr7658wa-s";
identityFile = "/home/fw/.ssh/id_rsa";
}; };
"dm2" = { "dm2" = {
hostname = "192.168.0.190"; hostname = "192.168.0.190";
@ -27,7 +28,7 @@
identityFile = "/home/fw/.ssh/fw-ssh-key"; identityFile = "/home/fw/.ssh/fw-ssh-key";
}; };
"ha1" = { "ha1" = {
hostname = "hosted-agent-1"; hostname = "192.168.0.180";
port = 22; port = 22;
user = "fw"; user = "fw";
identityFile = "/home/fw/.ssh/fw-ssh-key"; identityFile = "/home/fw/.ssh/fw-ssh-key";