From 801b9d7b9f002d85596737eabec9277cdad671f2 Mon Sep 17 00:00:00 2001 From: foglar Date: Sat, 11 Jan 2025 09:25:20 +0100 Subject: [PATCH] cleanup and fixes --- README.md | 6 +-- kogami/configuration.nix | 10 +++-- kogami/home.nix | 1 - nixos/home/apps/applications.nix | 3 ++ nixos/home/packages/applications/firefox.nix | 7 ++++ nixos/system/packages/syncthing.nix | 39 +++++++++++++++++++ nixos/system/settings/network.nix | 1 + tsunemori/configuration.nix | 41 ++++++++++---------- 8 files changed, 77 insertions(+), 31 deletions(-) create mode 100644 nixos/system/packages/syncthing.nix diff --git a/README.md b/README.md index 93ef7a2..bbce562 100644 --- a/README.md +++ b/README.md @@ -31,11 +31,7 @@ - This will download script with installation commands ```bash -nix-shell -p git --command "nix run --experimental-features 'nix-command flakes' git+https://git.foglar.tech/foglar/dotfiles.git" -``` - -```bash -nix-shell -p git --command "nix run --experimental-features 'nix-command flakes' github:foglar/nixos-config" +nix-shell -p git --command "nix run --experimental-features 'nix-command flakes' git+https://git.foglar.tech/foglar/psychonix-install.git" ``` > [!IMPORTANT] diff --git a/kogami/configuration.nix b/kogami/configuration.nix index 4bd7b60..1fb58e7 100644 --- a/kogami/configuration.nix +++ b/kogami/configuration.nix @@ -72,10 +72,12 @@ }; # Basic programs to enable - programs.kdeconnect.enable = true; - programs.wireshark.enable = true; - programs.auto-cpufreq.enable = true; - programs.nix-ld.dev.enable = true; + programs = { + kdeconnect.enable = true; + wireshark.enable = true; + auto-cpufreq.enable = true; + nix-ld.dev.enable = true; + }; environment.systemPackages = [inputs.install-script.packages.x86_64-linux.default]; diff --git a/kogami/home.nix b/kogami/home.nix index f68b19d..1cc80ad 100644 --- a/kogami/home.nix +++ b/kogami/home.nix @@ -1,6 +1,5 @@ { userSettings, - pkgs, ... }: { # Home manager configuration diff --git a/nixos/home/apps/applications.nix b/nixos/home/apps/applications.nix index 2d0d8be..66cf743 100644 --- a/nixos/home/apps/applications.nix +++ b/nixos/home/apps/applications.nix @@ -16,6 +16,9 @@ qutebrowser ferdium + bitwarden + bitwarden-cli + file-roller stellarium libreoffice diff --git a/nixos/home/packages/applications/firefox.nix b/nixos/home/packages/applications/firefox.nix index 2a2564f..2f90dcb 100644 --- a/nixos/home/packages/applications/firefox.nix +++ b/nixos/home/packages/applications/firefox.nix @@ -127,6 +127,12 @@ keyword = "git"; url = "https://git.foglar.tech"; } + { + name = "Vaultwarden"; + tags = ["vaultwarden"]; + keyword = "vault"; + url = "https://vault.foglar.duckdns.org"; + } ]; } ]; @@ -147,6 +153,7 @@ duckduckgo-privacy-essentials return-youtube-dislikes user-agent-string-switcher + privacy-badger ] else [] ); diff --git a/nixos/system/packages/syncthing.nix b/nixos/system/packages/syncthing.nix new file mode 100644 index 0000000..9761c23 --- /dev/null +++ b/nixos/system/packages/syncthing.nix @@ -0,0 +1,39 @@ +{ + lib, + config, + userSettings, + ... +}: { + options = { + program.syncthing.enable = lib.mkEnableOption "syncthing"; + }; + + config = lib.mkIf config.program.syncthing.enable { + services.syncthing = { + enable = true; + openDefaultPorts = true; + settings.gui = { + user = "${userSettings.username}"; + #! password = "test"; + #! User Hashed password is stored in SOPS + #! and is set in the module configuration + #! file ./sops/sops.nix + }; + + settings = { + devices = { + "Masaoka" = {id = "LGQUK6E-YEPVYKC-5MNXXHO-FZRD6SE-BBPHNGE-RKRGSSW-WIIWNVA-ZO3DKQO";}; + "Tsunemori" = {id = "JPOXL54-KPM6LBK-52B6NDP-3PC76WS-VNMSQLK-2S4HWDZ-6ORFJ55-7KDO3QG";}; + }; + #folders = { + # "Documents" = { + # path = "/home/${userSettings.username}/Documents"; + # devices = ["Masaoka"]; + # }; + #}; + }; + }; + + systemd.services.syncthing.environment.STNODEFAULTFOLDER = "true"; + }; +} diff --git a/nixos/system/settings/network.nix b/nixos/system/settings/network.nix index 294a6ab..b70431e 100644 --- a/nixos/system/settings/network.nix +++ b/nixos/system/settings/network.nix @@ -22,6 +22,7 @@ # Enable networking networking.networkmanager.enable = true; users.users.${userSettings.username}.extraGroups = ["networkmanager"]; + networking.nameservers = ["192.168.8.140" "1.1.1.1"]; }) ( lib.mkIf config.sys.bluetooth.enable { diff --git a/tsunemori/configuration.nix b/tsunemori/configuration.nix index 5344182..80bb49d 100644 --- a/tsunemori/configuration.nix +++ b/tsunemori/configuration.nix @@ -19,27 +19,26 @@ terminal.font = "${pkgs.terminus-nerdfont}share/fonts/truetype/NerdFonts/Terminess/TerminessNerdFont-Regular.ttf"; # Simply install just the packages - environment.packages = with pkgs; [ - nano - # Some common stuff that people expect to have - #procps - #killall - #diffutils - #findutils - #utillinux - #tzdata - #hostname - #man - #gnugrep - #gnupg - #gnused - #gnutar - #bzip2 - #gzip - #xz - #zip - #unzip - ]; + #environment.packages = with pkgs; [ + # Some common stuff that people expect to have + #procps + #killall + #diffutils + #findutils + #utillinux + #tzdata + #hostname + #man + #gnugrep + #gnupg + #gnused + #gnutar + #bzip2 + #gzip + #xz + #zip + #unzip + #]; environment.etcBackupExtension = ".bak"; system.stateVersion = "24.05";