diff --git a/README.md b/README.md index 942ab82..34b9269 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,8 @@ Build and switch to new system config with: ```sh -sudo nixos-rebuild switch --flake .# +sudo nixos-rebuild switch --flake ".?submodules=1" ``` + +Build remote: + diff --git a/dotfiles b/dotfiles index f91ac0b..0ef5669 160000 --- a/dotfiles +++ b/dotfiles @@ -1 +1 @@ -Subproject commit f91ac0b0ac7dd84ef20c8becc9b9690a3d882018 +Subproject commit 0ef5669a6560b19dce05cfb1c10382aa59b313f0 diff --git a/flake.lock b/flake.lock index 04b3c6e..68e5342 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1710888565, - "narHash": "sha256-s9Hi4RHhc6yut4EcYD50sZWRDKsugBJHSbON8KFwoTw=", + "lastModified": 1712386041, + "narHash": "sha256-dA82pOMQNnCJMAsPG7AXG35VmCSMZsJHTFlTHizpKWQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "f33900124c23c4eca5831b9b5eb32ea5894375ce", + "rev": "d6bb9f934f2870e5cbc5b94c79e9db22246141ff", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1711460390, - "narHash": "sha256-akSgjDZL6pVHEfSE6sz1DNSXuYX6hq+P/1Z5IoYWs7E=", + "lastModified": 1713013257, + "narHash": "sha256-ZEfGB3YCBVggvk0BQIqVY7J8XF/9jxQ68fCca6nib+8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "44733514b72e732bd49f5511bd0203dea9b9a434", + "rev": "90055d5e616bd943795d38808c94dbf0dd35abe8", "type": "github" }, "original": { diff --git a/hosts/dmeiburg/configuration.nix b/hosts/dmeiburg/configuration.nix index 05c6644..d6d6c61 100644 --- a/hosts/dmeiburg/configuration.nix +++ b/hosts/dmeiburg/configuration.nix @@ -7,8 +7,8 @@ { imports = [ # Include the results of the hardware scan. - ./hardware-configuration.nix - ../common.nix + ./hardware-configuration.nix + ../common.nix ]; networking.hostName = "dmeiburg"; # Define your hostname. @@ -25,7 +25,7 @@ programs = { gnupg.agent = { - enable = true; + enable = true; }; }; diff --git a/hosts/home-common.nix b/hosts/home-common.nix index f72ddd7..f063767 100644 --- a/hosts/home-common.nix +++ b/hosts/home-common.nix @@ -4,6 +4,7 @@ home.packages = with pkgs; [ fd # find alternative git + git-lfs htop neovim nmap diff --git a/hosts/home-workstations.nix b/hosts/home-workstations.nix index 071bfa3..2dbaf71 100644 --- a/hosts/home-workstations.nix +++ b/hosts/home-workstations.nix @@ -2,11 +2,9 @@ { home.packages = with pkgs; [ - anytype calc conda dig - direnv ffmpeg firefox-wayland fuzzel @@ -73,8 +71,14 @@ enable = true; wrapperFeatures.gtk = true; }; - programs.browserpass = { - enable = true; + programs = { + browserpass = { + enable = true; + }; + direnv = { + enable = true; + nix-direnv.enable = true; + }; }; services.mako = { enable = true; diff --git a/hosts/workstation.nix b/hosts/workstation.nix index fa291ca..37daaca 100644 --- a/hosts/workstation.nix +++ b/hosts/workstation.nix @@ -60,20 +60,10 @@ user = "dm"; dataDir = "/home/dm/Documents"; configDir = "/home/dm/Documents/.config/syncthing"; - overrideDevices = true; # overrides any devices added or deleted through the WebUI - overrideFolders = true; # overrides any folders added or deleted through the WebUI - settings = { - devices = { - "phone" = { id = "P6ZJ5WK-SBKAYYS-IYBBA37-ARCGHFA-3JJVOLH-2B3PO57-GA3EQKZ-ULWDQAV"; }; - }; - folders = { - "notes" = { # Name of folder in Syncthing, also the folder ID - path = "/home/dm/Documents/notes"; # Which folder to add to Syncthing - devices = [ "phone" ]; # Which devices to share the folder with - }; - }; - }; }; + # syncthing ports + networking.firewall.allowedTCPPorts = [ 22000 ]; + networking.firewall.allowedUDPPorts = [ 22000 21027 ]; # automount usb services.gvfs.enable = true;