cleanup and fixes

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]

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];
 

kogami/home.nix

@@ -1,6 +1,5 @@
 {
   userSettings,
-  pkgs,
   ...
 }: {
   # Home manager configuration

nixos/home/apps/applications.nix

@@ -16,6 +16,9 @@
         qutebrowser
         ferdium
 
+        bitwarden
+        bitwarden-cli
+
         file-roller
         stellarium
         libreoffice

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 []
           );

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";
+  };
+}

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 {

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";