Compare commits

..

No commits in common. "fc7e3decc65c266c2f52dbbaf45876c2258f53f7" and "74b7feb0431c8de81cc152e3680b765d3a1f0725" have entirely different histories.

3 changed files with 21 additions and 35 deletions

View File

@ -14,6 +14,7 @@
pwgen pwgen
sshfs sshfs
sshuttle sshuttle
tmux
]; ];
sessionVariables = { sessionVariables = {
@ -55,15 +56,4 @@
]; ];
}; };
programs.tmux = {
enable = true;
sensibleOnTop = true;
baseIndex = 1;
clock24 = true;
keyMode = "vi";
mouse = true;
terminal = "screen-256color";
};
} }

View File

@ -11,39 +11,28 @@
networking = { networking = {
networkmanager.enable = true; networkmanager.enable = true;
wireguard.enable = true;
tempAddresses = "disabled"; tempAddresses = "disabled";
hostName = "fa-t14-2025"; hostName = "fa-t14-2025";
nameservers = [ "9.9.9.9" ]; nameservers = [ "1.1.1.1" "1.0.0.1" ];
domain = "it.hime.no"; domain = "mktv.local";
hostId = "f458d6aa"; hostId = "f458d6aa";
search = [ search = [
"mktv.no" "mktv.no"
"mktv.local" "mktv.local"
]; ];
};
services.openssh.openFirewall = false; # firewall.extraCommands = ''
# # IT VPN
# iptables -I nixos-fw -p tcp -m tcp --dport 22 --source 129.241.117.0/24 -j nixos-fw-accept
# ip6tables -I nixos-fw -p tcp -m tcp --dport 22 --source 2001:700:301:12::/63 -j nixos-fw-accept
# '';
environment.systemPackages = with pkgs; [ # firewall.extraStopCommands = ''
inetutils # iptables -F nixos-fw
wireguard-tools # ip6tables -F nixos-fw
]; # '';
virtualisation.docker = {
enable = true;
rootless = {
enable = true;
setSocketVariable = true;
};
};
users.users.felixalb = {
uid = 1000;
openssh.authorizedKeys.keys = [ ];
extraGroups = [ "networkmanager" ];
}; };
console.keyMap = "no"; console.keyMap = "no";
@ -56,5 +45,13 @@
]; ];
}; };
services.openssh.openFirewall = false;
users.users.felixalb = {
uid = 1000;
openssh.authorizedKeys.keys = [ ];
extraGroups = [ "networkmanager" ];
};
system.stateVersion = "25.05"; system.stateVersion = "25.05";
} }

View File

@ -15,7 +15,6 @@ in {
element-desktop element-desktop
hunspellDicts.en_US hunspellDicts.en_US
hunspellDicts.nb_NO hunspellDicts.nb_NO
iperf3
jq jq
libreoffice libreoffice
mpv mpv
@ -24,10 +23,10 @@ in {
openvpn openvpn
pavucontrol pavucontrol
pwgen pwgen
# securecrt
traceroute traceroute
virt-manager virt-manager
w3m w3m
nixpkgs-2211.remmina
(unstable.microsoft-edge.overrideAttrs ({ installPhase ? "", ... }: { (unstable.microsoft-edge.overrideAttrs ({ installPhase ? "", ... }: {
installPhase = installPhase + '' installPhase = installPhase + ''