fixes and cleanup

.gitignore

@@ -7,3 +7,7 @@ docs/masaoka.jpg
 docs/tsunemori.jpg
 
 ginoza/hardware-configuration.nix
+
+docs/image.txt
+
+docs/logo.png

README.md

@@ -10,7 +10,7 @@
 - best NixOS starter dotfiles in the **flake** setup
 
 - [Mirror Github](https://github.com/foglar/nixos-config)
-- [Mirror Gitea](https://github.com/foglar/dotfiles)
+- [Mirror Gitea](https://git.foglar.tech/foglar/dotfiles)
 
 ## Showcase
 
@@ -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"
+nix-shell -p git --command "nix run --experimental-features 'nix-command flakes' git+https://git.foglar.tech/foglar/psychonix-install.git"
-```
-
-```bash
-nix-shell -p git --command "nix run --experimental-features 'nix-command flakes' github:foglar/nixos-config"
 ```
 
 > [!IMPORTANT]

flake.lock

@@ -20,11 +20,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1734906446,
+        "lastModified": 1736102453,
-        "narHash": "sha256-6OWluVE2A8xi+8V3jN9KA72RCgJjYdyyuLBUjxZ2q2U=",
+        "narHash": "sha256-5qb4kb7Xbt8jJFL/oDqOor9Z2+E+A+ql3PiyDvsfWZ0=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "eecb74dc79bb6752a2a507e6edee3042390a6091",
+        "rev": "4846091641f3be0ad7542086d52769bb7932bde6",
         "type": "github"
       },
       "original": {
@@ -40,11 +40,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733175750,
+        "lastModified": 1736492828,
-        "narHash": "sha256-tczSI0dnsitstia/uVt7FyGQbtuW8lMhhMYj0TRSAT4=",
+        "narHash": "sha256-iDvgL5dQerQnu2ERKAWGvWppG7cQ/0uKEfVY93ItvO4=",
         "owner": "AdnanHodzic",
         "repo": "auto-cpufreq",
-        "rev": "4dae1d4b59bedc1d57118a9eb704c2e1cde5f83c",
+        "rev": "c0d9ec565a4c78247a4f70beb1c1ae74279673e2",
         "type": "github"
       },
       "original": {
@@ -128,11 +128,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1735979945,
+        "lastModified": 1736568198,
-        "narHash": "sha256-qT25PnbcQ30ypnI8fNazRDsq3WmBXC8Lo+OvPr+Ct+o=",
+        "narHash": "sha256-RBTk5KavYsPZ56m9C2evS4pDkEu3+NdxY6mFNbo8DH8=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "b93d8cdf12139da45146a6c3cf53141a437c41ec",
+        "rev": "7f8746a7ef2d15b8fb4acc63cb0d7e3a407739bf",
         "type": "gitlab"
       },
       "original": {
@@ -142,6 +142,22 @@
         "type": "gitlab"
       }
     },
+    "firefox-gnome-theme": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1734969791,
+        "narHash": "sha256-A9PxLienMYJ/WUvqFie9qXrNC2MeRRYw7TG/q7DRjZg=",
+        "owner": "rafaelmardojai",
+        "repo": "firefox-gnome-theme",
+        "rev": "92f4890bd150fc9d97b61b3583680c0524a8cafe",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rafaelmardojai",
+        "repo": "firefox-gnome-theme",
+        "type": "github"
+      }
+    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -284,11 +300,11 @@
         "zig": "zig"
       },
       "locked": {
-        "lastModified": 1735943291,
+        "lastModified": 1736566108,
-        "narHash": "sha256-igXLrO0AtN7+k7VaR5zaHaPhDcS3go5NZr4liVqW9g4=",
+        "narHash": "sha256-r+FXWU/hfgO3lAHYs9Q03iCShnC42mZd1pnmIIp8Z9k=",
         "owner": "ghostty-org",
         "repo": "ghostty",
-        "rev": "1baf8928a0bd6ccc2f49e1e9478baab71d49a018",
+        "rev": "918ccdba5cc65ccd1fb48a54c71306d869299441",
         "type": "github"
       },
       "original": {
@@ -297,6 +313,37 @@
         "type": "github"
       }
     },
+    "git-hooks": {
+      "inputs": {
+        "flake-compat": [
+          "stylix",
+          "flake-compat"
+        ],
+        "gitignore": "gitignore_2",
+        "nixpkgs": [
+          "stylix",
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": [
+          "stylix",
+          "git-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1731363552,
+        "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
     "gitignore": {
       "inputs": {
         "nixpkgs": [
@@ -319,6 +366,28 @@
         "type": "github"
       }
     },
+    "gitignore_2": {
+      "inputs": {
+        "nixpkgs": [
+          "stylix",
+          "git-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1709087332,
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
     "gnome-shell": {
       "flake": false,
       "locked": {
@@ -343,11 +412,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735979091,
+        "lastModified": 1736508663,
-        "narHash": "sha256-WpFjt6+8UD81EP386c269ZTqpEmlGJgcPw+OB4b7EBs=",
+        "narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "11ab08541e61ac3bbf2ab27229f68622629401df",
+        "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc",
         "type": "github"
       },
       "original": {
@@ -443,11 +512,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1734906236,
+        "lastModified": 1736115290,
-        "narHash": "sha256-vH/ysV2ONGQgYZPtcJKwc8jJivzyVxru2aaOxC20ZOE=",
+        "narHash": "sha256-Jcn6yAzfUMcxy3tN/iZRbi/QgrYm7XLyVRl9g/nbUl4=",
         "owner": "hyprwm",
         "repo": "hyprgraphics",
-        "rev": "6dea3fba08fd704dd624b6d4b261638fb4003c9c",
+        "rev": "52202272d89da32a9f866c0d10305a5e3d954c50",
         "type": "github"
       },
       "original": {
@@ -474,11 +543,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1735946701,
+        "lastModified": 1736542519,
-        "narHash": "sha256-jCIIiEjgIs02N36fJCd+aU7QiqqdMWokfpFWO+sTdn0=",
+        "narHash": "sha256-gGxZNtLLqDPtXB5OZbEltfLW5ZzB6zXGobcuKPt02lg=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "60f069d54015fec66e63f1ff7e6ff26ddb349976",
+        "rev": "cef09fbfe6624d2133d81be863bd48bcfc5939d3",
         "type": "github"
       },
       "original": {
@@ -499,11 +568,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735734474,
+        "lastModified": 1735774328,
-        "narHash": "sha256-9OV4lOqrEJVLdOrpNN/9msNwAhI6FQTu4N7fufilG08=",
+        "narHash": "sha256-vIRwLS9w+N99EU1aJ+XNOU6mJTxrUBa31i1r82l0V7s=",
         "owner": "hyprwm",
         "repo": "hyprland-protocols",
-        "rev": "271df559dd30e4bc5ec6af02d017ac0aaabd63a7",
+        "rev": "e3b6af97ddcfaafbda8e2828c719a5af84f662cb",
         "type": "github"
       },
       "original": {
@@ -528,11 +597,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1734906472,
+        "lastModified": 1736114838,
-        "narHash": "sha256-pWPRv/GA/X/iAwoE6gMNUqn/ZeJX1IeLPRpZI0tTPK0=",
+        "narHash": "sha256-FxbuGQExtN37ToWYnGmO6weOYN6WPHN/RAqbr7gNPek=",
         "owner": "hyprwm",
         "repo": "hyprland-qtutils",
-        "rev": "c77109d7e1ddbcdb87cafd32ce411f76328ae152",
+        "rev": "6997fe382dcf396704227d2b98ffdd5066da6959",
         "type": "github"
       },
       "original": {
@@ -557,11 +626,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1734906259,
+        "lastModified": 1735393019,
-        "narHash": "sha256-P79t/7HbACO4/PuJBroGpTptvCWJtXTv+gWsF+sM6MI=",
+        "narHash": "sha256-NPpqA8rtmDLsEmZOmz+qR67zsB6Y503Jnv+nSFLKJZ8=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "0404833ea18d543df44df935ebf1b497310eb046",
+        "rev": "55608efdaa387af7bfdc0eddb404c409958efa43",
         "type": "github"
       },
       "original": {
@@ -582,11 +651,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735316583,
+        "lastModified": 1736164519,
-        "narHash": "sha256-AiiUwHWHfEdpFzXy7l1x3zInCUa1xcRMrbZ1XRSkzwU=",
+        "narHash": "sha256-1LimBKvDpBbeX+qW7T240WEyw+DBVpDotZB4JYm8Aps=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "8f15d45b120b33712f6db477fe5ffb18034d0ea8",
+        "rev": "3c895da64b0eb19870142196fa48c07090b441c4",
         "type": "github"
       },
       "original": {
@@ -607,11 +676,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1734793513,
+        "lastModified": 1735493474,
-        "narHash": "sha256-rrrHcXapXJvGFqX+L/Bb0182L25jofAZ0fm1FInvrTQ=",
+        "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=",
         "owner": "hyprwm",
         "repo": "hyprwayland-scanner",
-        "rev": "4d7367b6eee87397e2dbca2e78078dd0a4ef4c61",
+        "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b",
         "type": "github"
       },
       "original": {
@@ -627,11 +696,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735984946,
+        "lastModified": 1736415517,
-        "narHash": "sha256-j6ZDTw9w64yC7sf9T2uwNbJjNNno1PiVUb3eQUgv1X8=",
+        "narHash": "sha256-qZlj9JUQIQErvifjOxjDdAUE66Je3qyH/yQiCOucZlc=",
         "ref": "refs/heads/master",
-        "rev": "f75baa0990fce4fb51281e01b4a1ec2326231a47",
+        "rev": "aa440d766064b7097140062b39e41df4a1af4251",
-        "revCount": 3,
+        "revCount": 4,
         "type": "git",
         "url": "https://git.foglar.tech/foglar/nix-flake-install-script"
       },
@@ -670,11 +739,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735774660,
+        "lastModified": 1736154240,
-        "narHash": "sha256-g/9+jzWvu73YPHw9AB/yVCDSld7GdovliAUkfVP7YU0=",
+        "narHash": "sha256-I8Ot6/CInJFphhK9L3T1558q4OOOXwl3f2d0SuKjYcE=",
         "owner": "Mic92",
         "repo": "nix-ld",
-        "rev": "5f12c696cae384350f95f2af9dffe39ee0e445e5",
+        "rev": "8741cadfa29d9c7beeeb9b1308ef58c62c54e129",
         "type": "github"
       },
       "original": {
@@ -713,11 +782,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1735834308,
+        "lastModified": 1736344531,
-        "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=",
+        "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "6df24922a1400241dae323af55f30e4318a6ca65",
+        "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912",
         "type": "github"
       },
       "original": {
@@ -793,27 +862,11 @@
     },
     "nixpkgs-stable_2": {
       "locked": {
-        "lastModified": 1730741070,
+        "lastModified": 1736200483,
-        "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
+        "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-24.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-stable_3": {
-      "locked": {
-        "lastModified": 1735669367,
-        "narHash": "sha256-tfYRbFhMOnYaM4ippqqid3BaLOXoFNdImrfBfCp4zn0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "edf04b75c13c2ac0e54df5ec5c543e300f76f1c9",
+        "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751",
         "type": "github"
       },
       "original": {
@@ -903,11 +956,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735049224,
+        "lastModified": 1736549395,
-        "narHash": "sha256-fWUd9kyXdepphJ7cCzOsuSo7l0kbFCkUqfgKqZyFZzE=",
+        "narHash": "sha256-XzwkB62Tt5UYoL1jXiHzgk/qz2fUpGHExcSIbyGTtI0=",
         "owner": "nix-community",
         "repo": "plasma-manager",
-        "rev": "d16bbded0ae452bc088489e7dca3ef58d8d1830b",
+        "rev": "a53af7f1514ef4cce8620a9d6a50f238cdedec8b",
         "type": "github"
       },
       "original": {
@@ -923,15 +976,14 @@
         "nixpkgs": [
           "hyprland",
           "nixpkgs"
-        ],
+        ]
-        "nixpkgs-stable": "nixpkgs-stable_2"
       },
       "locked": {
-        "lastModified": 1734797603,
+        "lastModified": 1735882644,
-        "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=",
+        "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498",
+        "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656",
         "type": "github"
       },
       "original": {
@@ -953,7 +1005,7 @@
         "nix-on-droid": "nix-on-droid",
         "nixpkgs": "nixpkgs",
         "nixpkgs-droid": "nixpkgs-droid",
-        "nixpkgs-stable": "nixpkgs-stable_3",
+        "nixpkgs-stable": "nixpkgs-stable_2",
         "plasma-manager": "plasma-manager",
         "sops-nix": "sops-nix",
         "spicetify-nix": "spicetify-nix",
@@ -983,11 +1035,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735844895,
+        "lastModified": 1736515725,
-        "narHash": "sha256-CIRlqX9tBK2awJkmVu2cKuap/0QziDXStQZ/u/+e8Z4=",
+        "narHash": "sha256-4P99yL8vGehwzytkpP87eklBePt6aqeEC5JFsIzhfUs=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "24d89184adf76d7ccc99e659dc5f3838efb5ee32",
+        "rev": "f214c1b76c347a4e9c8fb68c73d4293a6820d125",
         "type": "github"
       },
       "original": {
@@ -1004,11 +1056,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735964101,
+        "lastModified": 1736568948,
-        "narHash": "sha256-FUKeipaDxAFf+0jun6CKk37g7UALIeisSz6L19KL+WM=",
+        "narHash": "sha256-nnaMeMQPDg1GLQPBejn4nBtvQKSRVv64IIPZ7XmX5u0=",
         "owner": "Gerg-L",
         "repo": "spicetify-nix",
-        "rev": "5b2bbc7a627ea983cef34f4a8ec81cd597529943",
+        "rev": "3da50a44c6c47b3361e56231123797101892c565",
         "type": "github"
       },
       "original": {
@@ -1023,8 +1075,10 @@
         "base16-fish": "base16-fish",
         "base16-helix": "base16-helix",
         "base16-vim": "base16-vim",
+        "firefox-gnome-theme": "firefox-gnome-theme",
         "flake-compat": "flake-compat_4",
         "flake-utils": "flake-utils_3",
+        "git-hooks": "git-hooks",
         "gnome-shell": "gnome-shell",
         "home-manager": "home-manager_2",
         "nixpkgs": [
@@ -1033,14 +1087,15 @@
         "systems": "systems_3",
         "tinted-foot": "tinted-foot",
         "tinted-kitty": "tinted-kitty",
-        "tinted-tmux": "tinted-tmux"
+        "tinted-tmux": "tinted-tmux",
+        "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1735933801,
+        "lastModified": 1736530113,
-        "narHash": "sha256-SbkFaIYzfoasvu6GN5fdlaltrcEtUcoPsTRulWNkH7E=",
+        "narHash": "sha256-a+IUtGdzESNSQEZkW99TXf5js8o4Oy9M4H2am+2ECp4=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "e0a41d3a2562ce1b43cad8560333673d04b111b8",
+        "rev": "f1e003194cb528bbd4eda50b781d1f703611782d",
         "type": "github"
       },
       "original": {
@@ -1144,6 +1199,22 @@
         "type": "github"
       }
     },
+    "tinted-zed": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1725758778,
+        "narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=",
+        "owner": "tinted-theming",
+        "repo": "base16-zed",
+        "rev": "122c9e5c0e6f27211361a04fae92df97940eccf9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "base16-zed",
+        "type": "github"
+      }
+    },
     "xdph": {
       "inputs": {
         "hyprland-protocols": [

justfile

@@ -1,5 +1,31 @@
-default:
+set positional-arguments
 
-run:
+@default:
-    git clone https://git.foglar.tech/foglar/dotfiles.git --depth 1 ~/.dotfiles
+    just update
 
+@deploy profile:
+    just clone
+    just hardware-generation ~/.dotfiles/kogami
+    just hardware-generation ~/.dotfiles/ginoza
+    just build $1
+
+@clone:
+    git clone https://git.foglar.tech/foglar/dotfiles.git ~/.dotfiles
+@quick-clone:
+    git clone https://git.foglar.tech/foglar/dotfiles.git ~/.dotfiles --depth 1
+@update:
+    cd ~/.dotfiles && git pull && nix flake update
+@remove:
+    gum confirm && rm -rf ~/.dotfiles || echo "File ~/.dotfiles not removed"
+
+@install rebuild-argument entrypoint:
+    sudo nixos-rebuild $1 --flake ~/.dotfiles#$2
+
+@switch flake-entrypoint:
+    just install switch $1
+
+@build flake-entrypoint:
+    just install build $1
+
+@hardware-generation path:
+    sudo nixos-generate-config --dir $1

kogami/configuration.nix

@@ -72,10 +72,12 @@
   };
 
   # Basic programs to enable
-  programs.kdeconnect.enable = true;
+  programs = {
-  programs.wireshark.enable = true;
+    kdeconnect.enable = true;
-  programs.auto-cpufreq.enable = true;
+    wireshark.enable = true;
-  programs.nix-ld.dev.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/apps/cli_tools.nix

@@ -25,13 +25,13 @@
         ranger
         unzip
         fd
-        imagemagick
+        imagemagick # convert images from formats like jpg, png, etc.
-        toybox # convert images from formats like jpg, png, etc.
       ]
       ++ (
         if pkgs.system == "x86_64-linux"
         then [
-          #nvtopPackages.full
+          nvtopPackages.full
+          toybox
         ]
         else []
       );

nixos/home/desktop/hyprland/hyprland.nix

@@ -127,6 +127,7 @@
           "${pkgs.wl-clipboard}/bin/wl-paste --type text --watch cliphist store # clipboard store text data"
           "${pkgs.wl-clipboard}/bin/wl-paste --type image --watch cliphist store # clipboard store image data"
           "${pkgs.swayosd}/bin/swayosd-server"
+          "${pkgs.bitwarden}/bin/bitwarden"
 
           "systemctl --user start hyprpolkitagent"
 

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,8 +19,7 @@
   terminal.font = "${pkgs.terminus-nerdfont}share/fonts/truetype/NerdFonts/Terminess/TerminessNerdFont-Regular.ttf";
 
   # Simply install just the packages
-  environment.packages = with pkgs; [
+  #environment.packages = with pkgs; [
-    nano
   # Some common stuff that people expect to have
   #procps
   #killall
@@ -39,7 +38,7 @@
   #xz
   #zip
   #unzip
-  ];
+  #];
 
   environment.etcBackupExtension = ".bak";
   system.stateVersion = "24.05";