diff options
| -rw-r--r-- | hosts/default.nix | 1 | ||||
| -rw-r--r-- | hosts/navi/default.nix | 48 | ||||
| -rw-r--r-- | hosts/navi/hardware-configuration.nix | 3 | ||||
| -rw-r--r-- | mixins/syncthing.nix | 6 | ||||
| -rw-r--r-- | profiles/impermanence.nix | 2 |
5 files changed, 32 insertions, 28 deletions
diff --git a/hosts/default.nix b/hosts/default.nix index 0b9bd1c..3d181bb 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -6,6 +6,7 @@ inputs: let ../profiles/tzlil.nix ../profiles/security.nix ../profiles/ssh.nix + ../profiles/network.nix ]; } inputs.agenix.nixosModules.age diff --git a/hosts/navi/default.nix b/hosts/navi/default.nix index a8702a8..353b7e1 100644 --- a/hosts/navi/default.nix +++ b/hosts/navi/default.nix @@ -45,22 +45,22 @@ time.timeZone = lib.mkDefault "Israel"; - # fileSystems."/" = { - # device = "none"; - # fsType = "tmpfs"; - # # hyprland doesnt compile with noexec root - # options = ["defaults" "size=8G" "mode=755"]; - # }; + fileSystems."/" = { + device = "none"; + fsType = "tmpfs"; + # hyprland doesnt compile with noexec root + options = ["defaults" "size=8G" "mode=755"]; + }; - # fileSystems."/boot" = { - # device = "/dev/disk/by-uuid/34CB-F158"; - # fsType = "vfat"; - # }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/34CB-F158"; + fsType = "vfat"; + }; - # fileSystems."/nix" = { - # device = "/dev/disk/by-uuid/8a8cc550-034e-4545-a958-564779f51061"; - # fsType = "btrfs"; - # }; + fileSystems."/nix" = { + device = "/dev/disk/by-uuid/8a8cc550-034e-4545-a958-564779f51061"; + fsType = "btrfs"; + }; zramSwap = { enable = true; @@ -119,16 +119,16 @@ programs.steam.enable = true; - # programs.firejail.wrappedBinaries = { - # mullvad-browser = { - # executable = lib.getExe pkgs.mullvad-browser; - # extraArgs = [ - # "--env=MOZ_ENABLE_WAYLAND=1" - # "--env=GTK_THEME=Adwaita:dark" - # ]; - # # profile = "${pkgs.firejail}/etc/firejail/firefox.profile"; - # }; - # }; + programs.firejail.wrappedBinaries = { + mullvad-browser = { + executable = lib.getExe pkgs.mullvad-browser; + extraArgs = [ + "--env=MOZ_ENABLE_WAYLAND=1" + "--env=GTK_THEME=Adwaita:dark" + ]; + # profile = "${pkgs.firejail}/etc/firejail/firefox.profile"; + }; + }; # greeter.initialSession = "${pkgs.fish}/bin/fish"; diff --git a/hosts/navi/hardware-configuration.nix b/hosts/navi/hardware-configuration.nix index 7b24c68..15442df 100644 --- a/hosts/navi/hardware-configuration.nix +++ b/hosts/navi/hardware-configuration.nix @@ -23,6 +23,8 @@ in { hardware.bluetooth.enable = true; + + /* disko.devices = { disk.${baseNameOf device} = { inherit device; @@ -68,4 +70,5 @@ in { ]; }; }; + */ } diff --git a/mixins/syncthing.nix b/mixins/syncthing.nix index 7faf5db..69cdba9 100644 --- a/mixins/syncthing.nix +++ b/mixins/syncthing.nix @@ -5,13 +5,13 @@ }: { config = { services.syncthing = { - enable = true; + enable = false; user = "tzlil"; dataDir = "/home/tzlil/sync"; configDir = "/home/tzlil/.config/syncthing"; overrideDevices = true; overrideFolders = true; - settings = { + #settings = { devices = { "phone" = {id = "UHWVTEZ-BERNFCH-3ZXQHNE-ZRBHLU6-MBAVEHB-TKLQJM7-ZGHLJ4R-6E4SAA7";}; }; @@ -20,7 +20,7 @@ path = "/home/tzlil/sync/passwords"; devices = ["phone"]; }; - }; + #}; }; }; diff --git a/profiles/impermanence.nix b/profiles/impermanence.nix index 5ee9c97..e325405 100644 --- a/profiles/impermanence.nix +++ b/profiles/impermanence.nix @@ -4,7 +4,7 @@ options, ... }: let - sshHostKeys = builtins.catAttrs "path" config.services.openssh.hostKeys; + sshHostKeys = builtins.catAttrs "path" ["/etc/ssh/ssh_host_ed25519_key"]; in { imports = [inputs.impermanence.nixosModules.impermanence]; |