flake.lock

@@ -846,13 +846,29 @@
         "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz"
       }
     },
-    "nixpkgs-stable": {
+    "nixpkgs-master": {
       "locked": {
-        "lastModified": 1741951773,
-        "narHash": "sha256-OGEqTkGdx9MUENEPwU3NSKHECKt0ObW3GaD8L9zgMSw=",
+        "lastModified": 1738943717,
+        "narHash": "sha256-KabzClxx6dREJyxZ+gffuBL1us/ZOcFJ8ZjgNtlM6yU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b5a00ebfb32ff0480ad90a213cfed6938ef04920",
+        "rev": "a503a26038e1f3e868bb67269c1e96d169de1374",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "master",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1738940519,
+        "narHash": "sha256-WXGiqZn8u+ynRzIywjwF6eVR38DSVvQCVqjZ6sHQMe8=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "b30cff4b9ac9dcf891534791fc92f2f425a80454",
         "type": "github"
       },
       "original": {
@@ -3822,6 +3838,7 @@
         "hyprland": "hyprland",
         "nix-index-database": "nix-index-database",
         "nixpkgs": "nixpkgs",
+        "nixpkgs-master": "nixpkgs-master",
         "nixpkgs-stable": "nixpkgs-stable",
         "nur": "nur",
         "nvf": "nvf",

flake.nix

@@ -26,30 +26,27 @@
             ./hosts/common
             ./hosts/earth
             # universe
-            inputs.home-manager.nixosModules.home-manager
-            {
-              home-manager = {
-                useGlobalPkgs = true;
-                useUserPackages = true;
-                backupFileExtension = "hm-old";
-                users.tx0 = import ./home;
-                extraSpecialArgs = {inherit system inputs u;};
-              };
+          ];
+        };
 
-              nixpkgs.overlays = [(import ./overlays/spotx.nix)];
-            }
+        homeConfigurations.tx0 = inputs.home-manager.lib.homeManagerConfiguration {
+          pkgs = import inputs.nixpkgs {
+            inherit system;
+          };
+          extraSpecialArgs = {inherit system inputs u;};
+          modules = [
+            ./home
+            ./universe.nix
           ];
         };
       };
-      systems = [
-        "x86_64-linux"
-        "aarch64-linux"
-      ];
+      systems = [system];
     };
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     nixpkgs-stable.url = "github:nixos/nixpkgs/release-24.11";
+    nixpkgs-master.url = "github:nixos/nixpkgs/master";
 
     nur = {
       url = "github:nix-community/NUR";

home/profile.nix

@@ -1,10 +1,14 @@
-{config, ...}: {
+{
+  pkgs,
+  config,
+  ...
+}: {
   home = {
     username = "tx0";
     homeDirectory = "/home/tx0";
     stateVersion = "24.11";
     sessionVariables = {
-      EDITOR = "nvim";
+      EDITOR = "${config.home.homeDirectory}/.nix-profile/bin/nvim";
       HYPRSHOT_DIR = "${config.home.homeDirectory}/Pictures/Screenshots/";
       FLAKE = "${config.home.homeDirectory}/universe/";
       NIXOS_OZONE_WL = 1;

home/programs/terminal/nvf.nix

@@ -75,14 +75,6 @@ in {
       };
 
       binds.whichKey.enable = true;
-      keymaps = [
-        {
-          key = "<leader>e";
-          mode = "n";
-          silent = true;
-          action = "<cmd>Neotree filesystem toggle left<CR>";
-        }
-      ];
 
       treesitter.context.enable = false;
 
@@ -105,20 +97,6 @@ in {
         css.enable = true;
         html.enable = true;
         lua.enable = true;
-        ts = {
-          enable = true;
-          format.enable = true;
-        };
-      };
-
-      filetree.neo-tree = {
-        enable = true;
-        setupOpts = {
-          enableCursorhijack = true;
-          enable_git_status = true;
-          git_status_async = true;
-          open_files_in_last_window = true;
-        };
       };
 
       lazy.plugins = {

home/services/udiskie.nix

@@ -1,6 +1,6 @@
 {pkgs, ...}: {
   services.udiskie = {
-    enable = true;
+    enable = false;
     settings = {
       program_options = {
         file_manager = "${pkgs.nautilus}/bin/nautilus";

home/system/nix.nix

@@ -0,0 +1,34 @@
+{
+  inputs,
+  config,
+  pkgs,
+  ...
+}: {
+  nix = {
+    package = pkgs.nix;
+    nixPath = ["nixpkgs=${inputs.nixpkgs}"];
+    settings = {
+      extra-substituters = [
+        "https://cache.garnix.io"
+        "https://nix-community.cachix.org"
+        "https://cache.nixos.org/"
+        "https://hyprland.cachix.org"
+      ];
+      extra-trusted-public-keys = [
+        "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
+        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+        "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
+        "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
+      ];
+      builders-use-substitutes = true;
+      auto-optimise-store = true;
+      trusted-users = [
+        config.home.username
+        "root"
+        "@wheel"
+      ];
+      warn-dirty = false;
+      extra-experimental-features = ["nix-command" "flakes"];
+    };
+  };
+}

home/system/nixpkgs.nix

@@ -0,0 +1,9 @@
+{...}: {
+  nixpkgs.config = {
+    allowUnfree = true;
+    allowBroken = true;
+    allowAliases = true;
+    allowInsecure = true;
+    allowUnfreePredicate = _: true;
+  };
+}

home/system/packages/default.nix

@@ -9,7 +9,6 @@
 
     # derivations
     (callPackage ./derivations/bunnyfetch {})
-    (callPackage ./derivations/ubports-installer {})
 
     #fonts
     (google-fonts.override {fonts = ["Poppins" "Inter" "Roboto Mono"];})
@@ -27,7 +26,6 @@
     # utilites
     wl-clipboard
     xclip
-    waypipe
 
     # cli
     sops
@@ -38,7 +36,6 @@
     nix-output-monitor
     eza
     bat
-    quickemu
     distrobox
 
     #net
@@ -67,10 +64,6 @@
     mate.engrampa
     prismlauncher
     inkscape
-    pinta
-    hoppscotch
-    jetbrains.pycharm-community-bin
-    spotify
 
     # de
     hyprpaper
@@ -82,7 +75,7 @@
     nautilus
 
     # social
-    _64gram
+    telegram-desktop
     inputs.nixpkgs-stable.legacyPackages.${system}.vesktop
   ];
 }

home/system/packages/derivations/ubports-installer/default.nix

@@ -1,52 +0,0 @@
-{
-  lib,
-  appimageTools,
-  fetchurl,
-  makeDesktopItem,
-}: let
-  pname = "ubports-installer";
-
-  icon = ./ubports-mascot.png;
-
-  desktopItems = [
-    (makeDesktopItem {
-      name = pname;
-      inherit icon;
-      desktopName = "Ubuntu Touch Installer";
-      genericName = "GUI for installing Ubuntu Touch";
-      exec = "@out@/bin/ubports-installer";
-      comment = "GUI for installing Ubuntu Touch";
-      categories = ["System"];
-      startupNotify = false;
-      keywords = ["system" "os" "network" "ubuntu" "touch" "mobile"];
-    })
-  ];
-in
-  appimageTools.wrapType2 rec {
-    inherit pname;
-    version = "0.10.0";
-
-    src = fetchurl {
-      url = "https://github.com/ubports/ubports-installer/releases/download/${version}/ubports-installer_${version}_linux_x86_64.AppImage";
-      hash = "sha256-RmSim4dJMCQsw+lFN17dhuL5AqfHNLyiDYQtzO5gymU=";
-    };
-
-    extraInstallCommands =
-      lib.concatMapStringsSep "\n "
-      (e: ''
-        install -Dm444 -t $out/share/applications ${e}/share/applications/*.desktop
-      '')
-      desktopItems
-      + ''
-        install -Dm444 ${icon} $out/share/icons/apps/${pname}.jpg;
-
-        for f in $out/share/applications/*.desktop; do
-          substituteInPlace $f --subst-var out
-        done
-      '';
-
-    meta = with lib; {
-      description = "Ubuntu Touch installer";
-      license = licenses.free;
-    };
-  }

home/theming/stylix.nix

@@ -20,14 +20,7 @@ in {
     };
 
     base16Scheme = mkOption {
-      type = with lib.types;
-        oneOf [
-          path
-          lines
-          attrs
-        ];
-
-      default = config.stylix.generated.palette;
+      type = types.str;
     };
   };
 

hosts/common/system/boot.nix

@@ -6,7 +6,7 @@
 }: {
   boot = {
     kernelPackages = pkgs.linuxPackages_zen;
-    kernelModules = ["i2c-dev" "ddcci_backlight"];
+    kernelModules = [];
     extraModulePackages = with config.boot.kernelPackages; [
       amneziawg
     ];
@@ -17,6 +17,5 @@
     loader.efi.canTouchEfiVariables = true;
 
     binfmt.emulatedSystems = ["aarch64-linux"];
-    tmp.useTmpfs = true;
   };
 }

hosts/common/system/udev.nix

@@ -1,5 +0,0 @@
-{...}: {
-  services.udev.extraRules = ''
-    KERNEL=="i2c-[0-9]*", GROUP="i2c", MODE="0660"
-  '';
-}

hosts/common/system/users.nix

@@ -12,9 +12,7 @@
         "podman"
         "adbusers"
         "kvm"
-        "i2c"
       ];
-      uid = 1000;
       subGidRanges = [
         {
           count = 65536;
@@ -27,6 +25,7 @@
           startUid = 100000;
         }
       ];
+      packages = [];
       useDefaultShell = true;
       openssh.authorizedKeys = {
         keys = [
@@ -36,9 +35,5 @@
       };
       shell = pkgs.fish;
     };
-    groups = {
-      adbusers = {};
-      i2c = {};
-    };
   };
 }

hosts/earth/services/libvirtd.nix

@@ -1,3 +0,0 @@
-{...}: {
-  virtualisation.libvirtd.enable = true;
-}

hosts/earth/system/hardware.nix

@@ -41,11 +41,6 @@
     options = ["compress=zstd" "subvol=@Home"];
   };
 
-  fileSystems."/mnt/nfs_share" = {
-    device = "192.168.48.41:/data/nfs_share";
-    fsType = "nfs";
-  };
-
   swapDevices = [];
 
   networking.useDHCP = lib.mkDefault true;

overlays/spotx.nix

@@ -1,36 +0,0 @@
-final: prev: let
-  spotx = prev.fetchurl {
-    url = "https://raw.githubusercontent.com/SpotX-Official/SpotX-Bash/21481cea97bac720590c2aad8b1fc2c58c9ec8f9/spotx.sh";
-    hash = "sha256-1k1sEEnT1SE6RAWrfd1qFY1gFrUVNh7zUQJLu3DODlU=";
-  };
-in {
-  spotify = prev.spotify.overrideAttrs (old: {
-    nativeBuildInputs =
-      old.nativeBuildInputs
-      ++ (with prev; [
-        util-linux
-        perl
-        unzip
-        zip
-        curl
-      ]);
-
-    unpackPhase =
-      builtins.replaceStrings ["runHook postUnpack"] [
-        ''
-          patchShebangs --build ${spotx}
-          runHook postUnpack
-        ''
-      ]
-      old.unpackPhase;
-
-    installPhase =
-      builtins.replaceStrings ["runHook postInstall"] [
-        ''
-          bash ${spotx} -f -P "$out/share/spotify"
-          runHook postInstall
-        ''
-      ]
-      old.installPhase;
-  });
-}

universe.nix

@@ -6,9 +6,8 @@
     };
     theme.stylix = {
       base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-material-dark-medium.yaml";
-      # base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
-      wallpapers = ../wallpaper.png;
-      useLutgen = true;
+      wallpapers = ./wallpapers.jpg;
+      useLutgen = false;
     };
   };
 }