Some changes

flake.lock

@@ -267,24 +267,6 @@
       }
     },
     "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_4"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_3": {
       "inputs": {
         "systems": [
           "stylix",
@@ -305,21 +287,6 @@
         "type": "github"
       }
     },
-    "flakey-profile": {
-      "locked": {
-        "lastModified": 1712898590,
-        "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
-        "owner": "lf-",
-        "repo": "flakey-profile",
-        "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lf-",
-        "repo": "flakey-profile",
-        "type": "github"
-      }
-    },
     "fromYaml": {
       "flake": false,
       "locked": {
@@ -778,41 +745,6 @@
         "type": "github"
       }
     },
-    "lix": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1737234286,
-        "narHash": "sha256-CCKIAE84dzkrnlxJCKFyffAxP3yfsOAbdvydUGqq24g=",
-        "rev": "2837da71ec1588c1187d2e554719b15904a46c8b",
-        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2837da71ec1588c1187d2e554719b15904a46c8b.tar.gz?rev=2837da71ec1588c1187d2e554719b15904a46c8b"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/lix/archive/2.92.0.tar.gz"
-      }
-    },
-    "lix-module": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "flakey-profile": "flakey-profile",
-        "lix": "lix",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1737237494,
-        "narHash": "sha256-YMLrcBpf0TR5r/eaqm8lxzFPap2TxCor0ZGcK3a7+b8=",
-        "rev": "b90bf629bbd835e61f1317b99e12f8c831017006",
-        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/b90bf629bbd835e61f1317b99e12f8c831017006.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz"
-      }
-    },
     "mnw": {
       "locked": {
         "lastModified": 1735150973,
@@ -987,7 +919,7 @@
     "nvf": {
       "inputs": {
         "flake-parts": "flake-parts_4",
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils",
         "mnw": "mnw",
         "nil": "nil",
         "nixpkgs": [
@@ -1160,7 +1092,7 @@
         "plugin-vim-startify": "plugin-vim-startify",
         "plugin-which-key": "plugin-which-key",
         "plugin-yanky-nvim": "plugin-yanky-nvim",
-        "systems": "systems_5"
+        "systems": "systems_4"
       },
       "locked": {
         "lastModified": 1738936845,
@@ -3904,7 +3836,6 @@
         "flake-parts": "flake-parts_2",
         "home-manager": "home-manager",
         "hyprland": "hyprland",
-        "lix-module": "lix-module",
         "nix-index-database": "nix-index-database",
         "nixpkgs": "nixpkgs",
         "nixpkgs-master": "nixpkgs-master",
@@ -3968,14 +3899,14 @@
         "base16-vim": "base16-vim",
         "firefox-gnome-theme": "firefox-gnome-theme",
         "flake-compat": "flake-compat_2",
-        "flake-utils": "flake-utils_3",
+        "flake-utils": "flake-utils_2",
         "git-hooks": "git-hooks",
         "gnome-shell": "gnome-shell",
         "home-manager": "home-manager_2",
         "nixpkgs": [
           "nixpkgs"
         ],
-        "systems": "systems_6",
+        "systems": "systems_5",
         "tinted-foot": "tinted-foot",
         "tinted-kitty": "tinted-kitty",
         "tinted-tmux": "tinted-tmux",
@@ -4070,21 +4001,6 @@
         "type": "github"
       }
     },
-    "systems_6": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "tinted-foot": {
       "flake": false,
       "locked": {

flake.nix

@@ -14,7 +14,6 @@
   '';
 
   outputs = {self, ...} @ inputs: let
-    universe = import ./universe.nix;
     system = "x86_64-linux";
   in
     inputs.flake-parts.lib.mkFlake {inherit inputs;} {
@@ -24,11 +23,9 @@
         nixosConfigurations."earth" = inputs.nixpkgs.lib.nixosSystem {
           specialArgs = {inherit system inputs u;};
           modules = [
-            inputs.stylix.nixosModules.stylix
-            inputs.lix-module.nixosModules.default
             ./hosts/common
             ./hosts/earth
-            universe
+            # universe
           ];
         };
 
@@ -38,11 +35,8 @@
           };
           extraSpecialArgs = {inherit system inputs u;};
           modules = [
-            inputs.stylix.homeManagerModules.stylix
-            inputs.nix-index-database.hmModules.nix-index
-            inputs.nvf.homeManagerModules.default
             ./home
-            universe
+            ./universe.nix
           ];
         };
       };
@@ -106,11 +100,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    lix-module = {
-      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     sops-nix = {
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";

home/programs/terminal/nvf.nix

@@ -2,10 +2,14 @@
   pkgs,
   config,
   lib,
+  inputs,
   ...
 }: let
   inherit (config.lib.stylix) colors;
 in {
+  imports = [
+    inputs.nvf.homeManagerModules.default
+  ];
   programs.nvf = {
     enable = true;
     settings.vim = {

home/system/nix.nix

@@ -1,11 +1,11 @@
 {
   inputs,
-  pkgs,
   config,
+  pkgs,
   ...
 }: {
   nix = {
-    package = pkgs.lix;
+    package = pkgs.nix;
     nixPath = ["nixpkgs=${inputs.nixpkgs}"];
     settings = {
       extra-substituters = [

home/system/packages/default.nix

@@ -6,43 +6,43 @@
   home.packages = with pkgs; [
     # flakes
     inputs.zen-browser.packages.${system}.beta
+
+    # derivations
     (callPackage ./derivations/bunnyfetch {})
 
     #fonts
     (google-fonts.override {fonts = ["Poppins" "Inter" "Roboto Mono"];})
     material-symbols
-    nerd-fonts.jetbrains-mono
     nerd-fonts.caskaydia-cove
     dejavu_fonts
-    font-awesome
     cantarell-fonts
 
     # code
     git
     go
     poetry
-    # vscode
     python313
 
     # utilites
     wl-clipboard
     xclip
-    ufetch
+
-    eza
+    # cli
-    bat
+    sops
-    distrobox
     android-tools
     zip
     unzip
+    p7zip
     nix-output-monitor
-    sops
+    eza
+    bat
+    distrobox
 
     #net
     amneziawg-go
     amneziawg-tools
 
     # other
-    playerctl
     gtk3
     gtk4
     adwaita-qt
@@ -51,31 +51,31 @@
     qadwaitadecorations-qt6
     libsForQt5.qt5ct
     kdePackages.qt6ct
-    hicolor-icon-theme
-    rpm
-    p7zip
-    #ueberzugpp
 
     # gui
     deluge-gtk
     bottles
-    hyprpaper
     virt-viewer
     libreoffice
     font-manager
-    networkmanagerapplet
-    nautilus
-    waybar
-    mako
-    hyprpicker
-    hyprshot
     playerctl
     pwvucontrol
     viewnior
     mate.engrampa
-    telegram-desktop
-    inputs.nixpkgs-stable.legacyPackages.${system}.vesktop
     prismlauncher
     inkscape
+
+    # de
+    hyprpaper
+    hyprpicker
+    hyprshot
+    waybar
+    mako
+    networkmanagerapplet
+    nautilus
+
+    # social
+    telegram-desktop
+    inputs.nixpkgs-stable.legacyPackages.${system}.vesktop
   ];
 }

home/theming/gtk.nix

@@ -7,4 +7,8 @@
       name = "Papirus-Dark";
     };
   };
+
+  home.pointerCursor = {
+    gtk.enable = true;
+  };
 }

home/theming/stylix.nix

@@ -13,33 +13,30 @@ in {
   ];
 
   options.universe.theme.stylix = {
-    enable = mkEnableOption "stylix";
+    useLutgen = mkEnableOption "lutgen";
-    settings = {
-      useLutgen = mkEnableOption "lutgen";
 
-      wallpapers = mkOption {
+    wallpapers = mkOption {
-        type = types.path;
+      type = types.path;
-      };
+    };
 
-      base16Scheme = mkOption {
+    base16Scheme = mkOption {
-        type = types.str;
+      type = types.str;
-      };
     };
   };
 
-  config = mkIf cfg.enable {
+  config = {
     stylix = {
       enable = true;
-      base16Scheme = cfg.settings.base16Scheme;
+      base16Scheme = cfg.base16Scheme;
       image =
-        if cfg.settings.useLutgen
+        if cfg.useLutgen
         then let
           level = 10;
           lum = 1.0;
           preserve = false;
         in
           pkgs.runCommand "output.png" {} ''
-            ${pkgs.lutgen}/bin/lutgen apply ${cfg.settings.wallpapers} -l ${builtins.toString level} -L ${builtins.toString lum} ${
+            ${pkgs.lutgen}/bin/lutgen apply ${cfg.wallpapers} -l ${builtins.toString level} -L ${builtins.toString lum} ${
               if preserve == true
               then "-P"
               else ""
@@ -64,7 +61,7 @@ in {
               ])
             }
           ''
-        else cfg.settings.wallpapers;
+        else cfg.wallpapers;
 
       polarity = "dark";
 

home/theming/stylix/default.nix

@@ -1,88 +0,0 @@
-{
-  pkgs,
-  config,
-  ...
-}: let
-  enableLutgen = false;
-in {
-  home.pointerCursor = {
-    gtk.enable = true;
-    x11.enable = true;
-  };
-
-  stylix = {
-    enable = true;
-    base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-material-dark-medium.yaml";
-    image =
-      if enableLutgen
-      then let
-        input = ./wallpapers.jpg;
-        level = 10;
-        lum = 1.0;
-        preserve = false;
-      in
-        pkgs.runCommand "output.png" {} ''
-          ${pkgs.lutgen}/bin/lutgen apply ${input} -l ${builtins.toString level} -L ${builtins.toString lum} ${
-            if preserve == true
-            then "-P"
-            else ""
-          } -o $out -- ${
-            builtins.concatStringsSep " " (with config.lib.stylix.colors; [
-              base00
-              base01
-              base02
-              base03
-              base04
-              base05
-              base06
-              base07
-              base08
-              base09
-              base0A
-              base0B
-              base0C
-              base0D
-              base0E
-              base0F
-            ])
-          }
-        ''
-      else ./wallpapers.jpg;
-
-    polarity = "dark";
-
-    cursor = {
-      package = pkgs.bibata-cursors;
-      name = "Bibata-Modern-Classic";
-      size = 24;
-    };
-
-    fonts = {
-      serif = {
-        name = "Cantarell";
-        package = pkgs.cantarell-fonts;
-      };
-      monospace = {
-        name = "CaskaydiaCove Nerd Font Mono";
-        package = pkgs.nerd-fonts.jetbrains-mono;
-      };
-      sansSerif = config.stylix.fonts.serif;
-      emoji = config.stylix.fonts.serif;
-
-      sizes = {
-        desktop = 12;
-        applications = 12;
-        popups = 12;
-        terminal = 16;
-      };
-    };
-
-    opacity = {terminal = 0.65;};
-
-    targets = {
-      kde.enable = false;
-      waybar.enable = false;
-      vesktop.enable = true;
-    };
-  };
-}

hosts/common/secrets/default.nix

@@ -1,5 +0,0 @@
-{inputs, ...}: {
-  imports = [
-    inputs.sops-nix.nixosModules.sops
-  ];
-}

hosts/common/secrets/secrets.yaml

@@ -1,30 +0,0 @@
-hello: ENC[AES256_GCM,data:s3MSqxa6QhZUxpUI3SiwwboUlMEw3lgnkbtT2iUuJlY5Fm1xGNgkVCz7pN9rxw==,iv:qdte/usQyvDISCm4WfaaDt/9F4CFdwxAyColJ22Y7O0=,tag:3lgWdE8HfFZfYMb5UtkEuA==,type:str]
-example_key: ENC[AES256_GCM,data:QfpmpB/cipG/JpioDQ==,iv:ZQ1mrFYk4QwU4R2ubOEiQp5VMFiT3ZhgIkgNeEmZvGI=,tag:w4A0d+EF2fvEhqtUcDpXYg==,type:str]
-#ENC[AES256_GCM,data:mZebWGKkb7XFFWnO06FiRA==,iv:OtP8AwQvI/rsTLhFvJkuVKuMav9PL2f1yG7had+ABWI=,tag:AXTyOa62PZeF+3ndekGmcw==,type:comment]
-example_array:
-    - ENC[AES256_GCM,data:4sNGqJIHIwflJXc6KJo=,iv:Sd1dJ2Y0XLYWZpVCTYDUXvfC2tsWEDVsSmgBEYdMp+E=,tag:iQ2XKLMmCdWf30YTi1Yf5g==,type:str]
-    - ENC[AES256_GCM,data:ceFkMb2Ew07WPhncdDI=,iv:++H39hsNAoJfAO5mtcXl0k7IjX/8X4/9FM/dZjCr3JM=,tag:vymaspCobCyty7d+vk5jMQ==,type:str]
-example_number: ENC[AES256_GCM,data:HvsewMuhZcCorw==,iv:ZRx4Iu2MVJoqMOHIpCIHLtAzt7y/xvyN6bcxcTsAB3w=,tag:pNY429ei1DPbITgDlqrv8Q==,type:float]
-example_booleans:
-    - ENC[AES256_GCM,data:NRUkIg==,iv:Ya1WGCYu0ivjNw26KZy30kR3zQtOrb8V23qqBfG1ANE=,tag:sWnXwH2IK7+Jij2+kT8zAA==,type:bool]
-    - ENC[AES256_GCM,data:CMqKVBA=,iv:uO367cgd/m22PjCxWCmIRUja9Bq0+OcoxVwzoVjpfjQ=,tag:g5KiutD+l+5yG4WU1wOHaw==,type:bool]
-sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
-    age:
-        - recipient: age1wkmgn0m8ln5huvqfcxzwprlpvge82hg572vfuclv7natr7hmp5qs672vt9
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBVmhFcHNlckhpZlpaUWE1
-            a296ay9oT05BKzFrZWNPbThaZUszaVpNQ3prCms0ZkVEY09zSWt4aGJ4Z1JHMDlC
-            a3BDYjY1cHFIcENwYWhUNFphamNZSWsKLS0tIEpnSmxyaGE5dW9xdGljdUdSQnhS
-            cmVlV3hDS2Q3YS9BOWJuMnJ2VVFreE0KORY7ACyeGjmtmkEHRVgCr/S1m2MQOOKn
-            Ki0po0z8U464LH9IE2qcaVCcSZO/Ane19/NYsEc6fvZKBttRdF6zTQ==
-            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-03-02T18:27:48Z"
-    mac: ENC[AES256_GCM,data:ZdrLNhC+BUe7thdF7bc30Y18rcZJC/4XITJWGhJ2lZJH06zYMUnUaoTGu8PZz69wodCf9nwNFjFMUP63fCJMU8lU+5wygfqptJNtgfqD2av8l1WoaN3l2kMhQm6LpjudiYsSa+t4qXeSdMVBlxSE0Ie752UnX3or5rVXYNB+z20=,iv:BEAjK0Rflfu7ITCLVTahIaNS7bWSkvXmEWwoS34w+Wg=,tag:TxsS428UWsl+oEiFnxPunw==,type:str]
-    pgp: []
-    unencrypted_suffix: _unencrypted
-    version: 3.9.4

hosts/common/system/nix.nix

@@ -4,7 +4,7 @@
   ...
 }: {
   nix = {
-    package = pkgs.lix;
+    package = pkgs.nix;
     nixPath = [
       "nixpkgs=${inputs.nixpkgs}"
       "home-manager=${inputs.home-manager}"

hosts/earth/secrets/default.nix

@@ -0,0 +1,16 @@
+{inputs, ...}: {
+  imports = [
+    inputs.sops-nix.nixosModules.sops
+  ];
+  sops = {
+    # defaultSopsFile = ./secrets.yaml;
+    age.keyFile = "/home/tx0/.age-key.txt";
+
+    secrets."awg0.conf" = {
+      format = "binary";
+      sopsFile = ./awg0.conf;
+      path = "/run/secrets.d/awg0.conf";
+      restartUnits = ["awg0.service"];
+    };
+  };
+}

hosts/earth/vpn.nix

@@ -4,6 +4,11 @@
     description = "AmneziaWG Interface awg0";
     after = ["network.target"];
     wantedBy = ["multi-user.target"];
+
+    unitConfig = {
+      ConditionPathExists = "/run/secrets.d/awg0.conf";
+    };
+
     serviceConfig = {
       Type = "oneshot";
       RemainAfterExit = true;

universe.nix

@@ -1,4 +1,4 @@
-{
+{pkgs, ...}: {
   universe = {
     programs = {
       alacritty.enable = true;
@@ -7,5 +7,10 @@
       hyprland.enable = true;
       waybar.enable = true;
     };
+    theme.stylix = {
+      base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-material-dark-medium.yaml";
+      wallpapers = ./wallpapers.jpg;
+      useLutgen = false;
+    };
   };
 }