From 8006260b7fef7aac0380580ad2885fadef26b60b Mon Sep 17 00:00:00 2001 From: specCon18 Date: Sat, 24 Feb 2024 18:03:11 -0500 Subject: [PATCH] updated to 23.11 --- flake.nix | 2 +- hosts/katana/default.nix | 2 +- hosts/katana/system-pkgs.nix | 4 +-- modules/home-manager/zsh.nix | 2 +- modules/system/services/syncthing.nix | 42 +++++++++++++-------------- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/flake.nix b/flake.nix index af2871f..2c2265c 100644 --- a/flake.nix +++ b/flake.nix @@ -74,7 +74,7 @@ ./hosts/katana/system-pkgs.nix ./modules/system/services/docker.nix ./modules/system/services/openssh.nix - ./modules/system/services/syncthing.nix + # ./modules/system/services/syncthing.nix ./modules/system/services/tailscale.nix ] #extra modules to be loaded by nixos [ diff --git a/hosts/katana/default.nix b/hosts/katana/default.nix index 2889cc3..c7586e1 100644 --- a/hosts/katana/default.nix +++ b/hosts/katana/default.nix @@ -67,7 +67,7 @@ displayManager.tuigreet.enable = false; }; }; - fonts.fonts = with pkgs; [ + fonts.packages = with pkgs; [ (nerdfonts.override { fonts = [ "SourceCodePro" "DroidSansMono" ]; }) ]; } \ No newline at end of file diff --git a/hosts/katana/system-pkgs.nix b/hosts/katana/system-pkgs.nix index a4e2323..5c213f8 100644 --- a/hosts/katana/system-pkgs.nix +++ b/hosts/katana/system-pkgs.nix @@ -9,7 +9,7 @@ ripgrep openssl tree - exa + # exa htop zsh dig #dns lookup @@ -26,6 +26,6 @@ gitui spotify zulip - surrealdb + vscode ]; } \ No newline at end of file diff --git a/modules/home-manager/zsh.nix b/modules/home-manager/zsh.nix index 1a10d62..6e93d39 100644 --- a/modules/home-manager/zsh.nix +++ b/modules/home-manager/zsh.nix @@ -9,7 +9,7 @@ }; enableAutosuggestions = lib.mkDefault true; enableCompletion = lib.mkDefault true; - enableSyntaxHighlighting = lib.mkDefault true; + syntaxHighlighting.enable = lib.mkDefault true; shellAliases = { ls = "exa -l"; lsa = "exa -al"; diff --git a/modules/system/services/syncthing.nix b/modules/system/services/syncthing.nix index a2dfed4..1c87a3b 100644 --- a/modules/system/services/syncthing.nix +++ b/modules/system/services/syncthing.nix @@ -1,21 +1,21 @@ -{config, lib, pkgs, modulesPath, ... }: -{ - services.syncthing = { - enable = true; - dataDir = "/home/speccon18"; - openDefaultPorts = true; - configDir = "/home/speccon18/.config/syncthing"; - user = "speccon18"; - group = "users"; - guiAddress = "0.0.0.0:8384"; - overrideDevices = true; - overrideFolders = true; - devices = { - "syncthing_server" = { id = "N3UGNP6-ZU6JHBX-WNJDEUF-FV5DOWA-VAGFDYN-FIIMFRR-C3HGQHU-WOEIUQ6"; }; - }; - extraOptions.gui = { - user = "admin"; - password = "Strife-Rerun-Lily-Pushover-Alongside-Raider0-Freebase"; - }; - }; -} \ No newline at end of file +# # {config, lib, pkgs, modulesPath, ... }: +# { +# services.syncthing = { +# enable = true; +# dataDir = "/home/speccon18"; +# openDefaultPorts = true; +# configDir = "/home/speccon18/.config/syncthing"; +# user = "speccon18"; +# group = "users"; +# guiAddress = "0.0.0.0:8384"; +# overrideDevices = true; +# overrideFolders = true; +# devices = { +# "syncthing_server" = { id = "N3UGNP6-ZU6JHBX-WNJDEUF-FV5DOWA-VAGFDYN-FIIMFRR-C3HGQHU-WOEIUQ6"; }; +# }; +# extraOptions.gui = { +# user = "admin"; +# password = "Strife-Rerun-Lily-Pushover-Alongside-Raider0-Freebase"; +# }; +# }; +# } \ No newline at end of file