kekl

flake.lock

@@ -56,26 +56,6 @@
         "type": "github"
       }
     },
-    "home-manager": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1754527677,
-        "narHash": "sha256-qAzCtmKkMz40xFgP9KN+TCKjVieK4u04EWwl2KvVk0E=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "475d35797d9537354d825260cf583114537affc2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
     "mnw": {
       "locked": {
         "lastModified": 1748710831,
@@ -233,7 +213,6 @@
     "root": {
       "inputs": {
         "dwm-nix": "dwm-nix",
-        "home-manager": "home-manager",
         "nix-sdr": "nix-sdr",
         "nixpkgs": "nixpkgs_3",
         "nvf-config": "nvf-config"

flake.nix

@@ -31,7 +31,24 @@
           home-manager = {
             useGlobalPkgs = true;
             useUserPackages = true;
-            users.fabian = import ./hosts/default/home/home.nix;
+            users.fabian = import ./modules/home.nix;
+          };
+        }
+      ];
+    };
+    nixosConfigurations.meteor = nixpkgs.lib.nixosSystem {
+      system = "x86_64-linux";
+      modules = [
+        ./hosts/meteor/configuration.nix
+        home-manager.nixosModules.home-manager
+        nix-sdr.nixosModules.default
+        dwm-nix.nixosModules.default
+        nvf-config.nixosModules.default
+        {
+          home-manager = {
+            useGlobalPkgs = true;
+            useUserPackages = true;
+            users.fabian = import ./modules/home.nix;
           };
         }
       ];

hosts/meteor/configuration.nix

@@ -0,0 +1,61 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+{
+  networking.hostName = "meteor";
+
+  imports = [
+    ./hardware-configuration.nix
+    ../../modules/default.nix
+  ];
+  
+  boot = {
+    loader = {
+      systemd-boot = {
+        enable = true;
+      };
+    };
+    supportedFilesystems = [ "ntfs" ];
+  };
+  
+  nixpkgs = {
+    config = {
+      allowUnfree = true;
+      permittedInsecurePackages = [
+        "freeimage-unstable-2021-11-01"
+      ];
+    };
+  };
+  nix.settings.experimental-features = [
+    "nix-command"
+    "flakes"
+  ];
+
+  systemd = {
+    services = {
+      modem-manager.enable = false;
+      mpd.environment = {
+        XDG_RUNTIME_DIR = "/run/user/1000";
+      };
+    };
+  };
+  
+  time.timeZone = "Europe/Berlin";
+  console = {
+    font = "Lat2-Terminus16";
+    useXkbConfig = true;
+  };
+
+  programs = {
+    nix-ld.enable = true;
+    dconf = {
+      enable = true;
+    };
+  };
+  
+  system.stateVersion = "25.05";
+
+}

hosts/meteor/hardware-configuration.nix

@@ -0,0 +1,39 @@
+# 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, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" "sdhci_pci" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/04b38f31-ff39-4bd9-9958-1ab012bdbd37";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/EA73-5CEC";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
+    };
+
+  swapDevices = [ ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

modules/default.nix

@@ -1,10 +1,13 @@
 { config, pkgs, ... }:
 {
   imports = [
-    ./system/pkgs.nix
+    ./pkgs.nix
-    ./system/services.nix
+    ./services.nix
-    ./system/users.nix
+    ./users.nix
-    ./system/firefox.nix
+    ./firefox.nix
+    ./git.nix
+    ./tmux.nix
+    #./alacritty.nix
   ];
 
   hardware = {

modules/git.nix

@@ -0,0 +1,12 @@
+{ config, ... }:
+{
+  programs.git = {
+    enable = true;
+    config = {
+      user.name = "Sojus07";
+      user.email = "Sojus07@0xcc01.de";
+      init.defaultBranch = "master";
+      core.editor = "nvim";
+    };
+  };
+}

modules/home.nix

@@ -1,5 +1,19 @@
 { config, pkgs, ... }:
 {
+  imports = [
+    ./git.nix
+    ./tmux.nix
+    ./alacritty.nix
+  ];
+  home = {
+    enableNixpkgsReleaseCheck = false;
+    stateVersion = "24.11";
+    file = {
+      ".wp/galaxy.png".source = ./raw/wp/galaxy.png;
+      ".wp/eye.png".source = ./raw/wp/eye.png;
+    };
+  };
+
   programs.alacritty = {
     enable = true;
     settings = {

modules/home/git.nix

@@ -1,10 +0,0 @@
-{ config, pkgs, ... }:
-{
-  programs = {
-    git = {
-      enable = true;
-      userName = "Sojus07";
-      userEmail = "Sojus07";
-    };
-  };
-}

modules/home/home.nix

@@ -1,19 +0,0 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
-  imports = [
-    ./git.nix
-    ./tmux.nix
-    ./alacritty.nix
-  ];
-  home = {
-    enableNixpkgsReleaseCheck = false;
-    stateVersion = "24.11";
-    file = {
-      ".wp/galaxy.png".source = ./raw/wp/galaxy.png;
-      ".wp/eye.png".source = ./raw/wp/eye.png;
-    };
-  };
-}

modules/tmux.nix

@@ -3,8 +3,6 @@
   programs = {
     tmux = {
       enable = true;
-      disableConfirmationPrompt = true;
-      mouse = true;
       keyMode = "vi";
       extraConfig = ''
         unbind C-b