From 7f29f372d0039d01ead0e966e6303932acbd9d21 Mon Sep 17 00:00:00 2001 From: fqbn207 Date: Wed, 15 Jan 2025 23:13:43 +0100 Subject: [PATCH] kekl --- configuration.nix | 11 ++++++----- flake.lock | 21 --------------------- flake.nix | 11 ----------- modules/home/home.nix | 3 +-- 4 files changed, 7 insertions(+), 39 deletions(-) diff --git a/configuration.nix b/configuration.nix index aaa596e..0a96479 100644 --- a/configuration.nix +++ b/configuration.nix @@ -3,8 +3,9 @@ lib, pkgs, ... -}: -{ +}: let + home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/master.tar.gz"; +in { imports = [ ./hardware-configuration.nix ./modules/system/nix/default.nix @@ -42,7 +43,7 @@ useOSProber = true; }; }; - supportedFilesystems = [ "ntfs" ]; + supportedFilesystems = ["ntfs"]; }; networking = { @@ -230,7 +231,6 @@ vesktop pacman wf-recorder - ]; security = { @@ -238,7 +238,7 @@ enable = true; extraRules = [ { - users = [ "fabian" ]; + users = ["fabian"]; noPass = true; keepEnv = true; } @@ -270,4 +270,5 @@ system.stateVersion = "unstable"; + home-manager.users.fabian = ./modules/home/home.nix; } diff --git a/flake.lock b/flake.lock index d7b528a..1f0c124 100644 --- a/flake.lock +++ b/flake.lock @@ -36,26 +36,6 @@ "type": "github" } }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1736785676, - "narHash": "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "fc52a210b60f2f52c74eac41a8647c1573d2071d", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, "mnw": { "locked": { "lastModified": 1735150973, @@ -2259,7 +2239,6 @@ }, "root": { "inputs": { - "home-manager": "home-manager", "nixpkgs": "nixpkgs", "nvf": "nvf" } diff --git a/flake.nix b/flake.nix index 61b05b6..4966a5a 100644 --- a/flake.nix +++ b/flake.nix @@ -3,15 +3,12 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - home-manager.url = "github:nix-community/home-manager"; - home-manager.inputs.nixpkgs.follows = "nixpkgs"; nvf.url = "github:notashelf/nvf"; }; outputs = { self, nixpkgs, - home-manager, nvf, }: { packages."x86_64-linux".default = @@ -25,14 +22,6 @@ modules = [ ./configuration.nix nvf.homeManagerModules.default - home-manager.nixosModules.home-manager - { - home-manager = { - useGlobalPkgs = true; - useUserPackages = true; - users.fabian = import ./modules/home/home.nix; - }; - } ]; }; }; diff --git a/modules/home/home.nix b/modules/home/home.nix index ccc5f11..309fc61 100644 --- a/modules/home/home.nix +++ b/modules/home/home.nix @@ -2,8 +2,7 @@ config, pkgs, ... -}: -{ +}: { imports = [ ./nix ];