:3

common/de/hyprland.nix

@@ -1,3 +1,4 @@
 {
+  # Not working on my hardware for some reason
   programs.hyprland.enable = true;
 }

common/default.nix

@@ -7,15 +7,7 @@
   ...
 }: {
   imports = [
-    # If you want to use modules your own flake exports (from modules/nixos):
+    ./packages/neovim.nix
-    # outputs.nixosModules.example
-
-    # Or modules from other flakes (such as nixos-hardware):
-    # inputs.hardware.nixosModules.common-cpu-amd
-    # inputs.hardware.nixosModules.common-ssd
-
-    # You can also split up your configuration and import pieces of it here:
-    # ./users.nix
   ];
 
   nixpkgs = {
@@ -65,9 +57,20 @@
     auto-optimise-store = true;
   };
 
-  boot = {
+  boot.loader = {
-    loader.systemd-boot.enable = true;
+    systemd-boot = {
-    loader.efi.canTouchEfiVariables = true;
+      enable = true;
+
+      editor = true; # todo
+      # memtest86.enable = true;
+    };
+
+    efi.canTouchEfiVariables = true;
+
+    grub = {
+      #theme = pkgs.sleek-grub-theme;
+      #splashImage = ./boot-logo.png;
+    };
   };
 
   # Set your time zone.
@@ -98,13 +101,11 @@
     shellAliases = {
       ll = "ls -al";
     };
-    # history.size = 10000;
+
-    # history.path = "${config.xdg.dataHome}/zsh/history";
     ohMyZsh = {
       enable = true;
       plugins = [
         "git"
-        # "thefuck"
       ];
       theme = "robbyrussell";
     };
@@ -112,42 +113,6 @@
 
   services.fwupd.enable = true;
 
-  programs.neovim = {
-    enable = true;
-    defaultEditor = true;
-
-    configure = {
-      customRC = ''
-        set number
-        set list
-        if &diff
-          colorscheme blue
-        endif
-      '';
-      packages.myVimPackage = with pkgs.vimPlugins; {
-        start = [
-          ctrlp
-          nvim-tree-lua
-          indent-blankline-nvim
-
-          nvim-lspconfig
-          nvim-treesitter.withAllGrammars
-          plenary-nvim
-          gruvbox-material
-          mini-nvim
-        ];
-      };
-
-      extraLuaConfig =
-        /*
-        lua
-        */
-        ''
-          require("nvim-tree").setup()
-        '';
-    };
-  };
-
   networking = {
     networkmanager.enable = true;
 
@@ -156,15 +121,7 @@
 
   nix.settings.allowed-users = ["@wheel"];
 
-  security = {
+  security.sudo.execWheelOnly = true;
-    #auditd.enable = true;
-    #audit.enable = true;
-    #audit.rules = [
-    #  "-a exit,always -F arch=b64 -S execve"
-    #];
-
-    sudo.execWheelOnly = true;
-  };
 
   services.tailscale.enable = true;
 

common/packages/adguardhome.nix

@@ -2,4 +2,4 @@
   services.adguardhome.enable = true;
 
   networking.nameservers = ["127.0.0.1"];
-}
+}

common/packages/neovim.nix

@@ -0,0 +1,40 @@
+{pkgs, ...}: {
+  # NeoVIm config
+  # Imported by default by ../default.nix
+
+  programs.neovim = {
+    enable = true;
+    defaultEditor = true;
+
+    configure = {
+      customRC = ''
+        set number
+        set list
+        if &diff
+          colorscheme blue
+        endif
+      '';
+      packages.myVimPackage = with pkgs.vimPlugins; {
+        start = [
+          ctrlp
+          nvim-tree-lua
+          indent-blankline-nvim
+
+          nvim-lspconfig
+          nvim-treesitter.withAllGrammars
+          plenary-nvim
+          gruvbox-material
+          mini-nvim
+        ];
+      };
+
+      extraLuaConfig =
+        /*
+        lua
+        */
+        ''
+          require("nvim-tree").setup()
+        '';
+    };
+  };
+}

common/packages/syncthing.nix

@@ -3,7 +3,6 @@
     enable = true;
     user = "user";
     group = "users";
-    dataDir = "/home/user";
 
     openDefaultPorts = true;
     overrideFolders = false;

hosts/phoenix/configuration.nix

@@ -1,4 +1,8 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  lib,
+  ...
+}: {
   imports = [
     ./hardware-configuration.nix
     ../../common/default.nix
@@ -11,8 +15,8 @@
     ../../common/de/plasma6.nix
     ../../common/de/hyprland.nix
 
-    ./syncthing.nix
+    ../../common/packages/syncthing.nix
-    ../../common/adguardhome.nix
+    ../../common/packages/adguardhome.nix
 
     # If you want to use modules your own flake exports (from modules/nixos):
     # outputs.nixosModules.example
@@ -45,7 +49,6 @@
     ];
   };
 
-
   services.btrfs.autoScrub = {
     enable = true;
     interval = "weekly";
@@ -69,6 +72,11 @@
     dedicatedServer.openFirewall = false; # Open ports in the firewall for Source Dedicated Server
   };
 
+  services.syncthing = {
+    dataDir = lib.mkForce "/home/user";
+    configDir = lib.mkForce "/data/sync/configuration/";
+  };
+
   environment.systemPackages = with pkgs; [
     bitwarden
     libreoffice-fresh

hosts/phoenix/hardware-configuration.nix

@@ -1,6 +1,3 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
 {
   config,
   lib,

hosts/phoenix/syncthing.nix

@@ -1,13 +0,0 @@
-{
-  services.syncthing = {
-    enable = true;
-    user = "user";
-    group = "users";
-    dataDir = "/home/user";
-    configDir = "/data/sync/configuration/";
-
-    openDefaultPorts = true;
-    overrideFolders = false;
-    overrideDevices = false;
-  };
-}

hosts/stuff/configuration.nix

@@ -9,8 +9,8 @@
 
     ../../common/de/plasma5.nix
 
-    ./syncthing.nix
+    ../../common/packages/syncthing.nix
-    # ../../common/adguardhome.nix
+    # ../../common/packages/adguardhome.nix
   ];
 
   users.users.user = {

hosts/stuff/hardware-configuration.nix

@@ -1,6 +1,3 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
 {
   config,
   lib,

pkgs/default.nix

@@ -1,6 +1,5 @@
 # Custom packages, that can be defined similarly to ones from nixpkgs
 # You can build them using 'nix build .#example'
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
+  tildefriends = pkgs.callPackage ./tildefriends/default.nix {};
-  tildefriends = pkgs.callPackage ./tildefriends/default.nix { };
 }

pkgs/tildefriends/default.nix

@@ -1,11 +1,11 @@
-{ lib
+{
-, stdenv
+  lib,
-, fetchFromGitea
+  stdenv,
-, gnumake
+  fetchFromGitea,
-, openssl
+  gnumake,
-, which
+  openssl,
+  which,
 }:
-
 stdenv.mkDerivation rec {
   pname = "tildefriends";
   version = "0.0.17";
@@ -37,15 +37,11 @@ stdenv.mkDerivation rec {
   doCheck = false;
 
   meta = {
-    homepage = "https://tildefriends.net/";
+    homepage = "https://tildefriends.net";
     description = "Make apps and friends from the comfort of your web browser.";
-    longDescription = ''
-      TODO
-    '';
-
     mainProgram = "tildefriends";
-    license = with lib.licenses; [ mit ];
+    license = with lib.licenses; [mit];
-    maintainers = with lib.maintainers; [ tasiaiso ];
+    maintainers = with lib.maintainers; [tasiaiso];
     platforms = lib.platforms.all;
   };
 }