diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 1cd791b..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -result/ diff --git a/features/client/sway.nix b/features/client/sway.nix deleted file mode 100644 index e69de29..0000000 diff --git a/features/isos/goober.nix b/features/isos/goober.nix deleted file mode 100644 index 9168072..0000000 --- a/features/isos/goober.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ - config, - pkgs, - modulesPath, - lib, - ... -}: -{ - imports = [ - "${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix" - - # Provide an initial copy of the NixOS channel so that the user - # doesn't need to run "nix-channel --update" first. - "${modulesPath}/installer/cd-dvd/channel.nix" - ]; - - # use the latest Linux kernel - boot.kernelPackages = pkgs.linuxPackages_latest; - - # Needed for https://github.com/NixOS/nixpkgs/issues/58959 - boot.supportedFilesystems = lib.mkForce [ - "btrfs" - "reiserfs" - "vfat" - "f2fs" - "xfs" - "ntfs" - "cifs" - ]; - - boot.blacklistedKernelModules = [ - "b43" - "b43legacy" - "ssb" - "bcma" - "bcm43xx" - "brcm80211" - "brcmfmac" - "brcmsmac" - "bcma" - ]; - - boot.extraModprobeConfig = '' - options cfg80211 cfg80211_disable_40mhz_24ghz=Y - ''; - - nixpkgs.config.allowUnfreePredicate = - pkg: - builtins.elem (lib.getName pkg) [ - "nvidia" - "broadcom-sta" - ]; - - boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ]; - environment.systemPackages = with pkgs; [ - # Add your own packages here - neovim - git - ]; - boot.kernelModules = [ "wl" ]; - - hardware.nvidia = { - # Modesetting is required. - modesetting.enable = true; - - # Nvidia power management. Experimental, and can cause sleep/suspend to fail. - # Enable this if you have graphical corruption issues or application crashes after waking - # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead - # of just the bare essentials. - powerManagement.enable = false; - - # Fine-grained power management. Turns off GPU when not in use. - # Experimental and only works on modern Nvidia GPUs (Turing or newer). - powerManagement.finegrained = false; - - # Use the NVidia open source kernel module (not to be confused with the - # independent third-party "nouveau" open source driver). - # Support is limited to the Turing and later architectures. Full list of - # supported GPUs is at: - # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus - # Only available from driver 515.43.04+ - # Currently "beta quality", so false is currently the recommended setting. - open = false; - - # Enable the Nvidia settings menu, - # accessible via `nvidia-settings`. - nvidiaSettings = true; - - # Optionally, you may need to select the appropriate driver version for your specific GPU. - package = config.boot.kernelPackages.nvidiaPackages.stable; - }; -} diff --git a/flake.lock b/flake.lock index e5ce253..e872fff 100644 --- a/flake.lock +++ b/flake.lock @@ -61,22 +61,6 @@ "type": "github" } }, - "nix-secrets": { - "flake": false, - "locked": { - "lastModified": 1724661327, - "narHash": "sha256-NQ+PmZwUJdDh0d1WiP7ibqw7aFd2Xn+2Xu6wOZV3E8E=", - "ref": "refs/heads/main", - "rev": "750285c41d23803be0b66571296e1f1685939511", - "revCount": 8, - "type": "git", - "url": "https://git.hypervirtual.world/harry123/nix-secrets.git" - }, - "original": { - "type": "git", - "url": "https://git.hypervirtual.world/harry123/nix-secrets.git" - } - }, "nixpkgs": { "locked": { "lastModified": 1723688146, @@ -128,7 +112,6 @@ "root": { "inputs": { "alejandra": "alejandra", - "nix-secrets": "nix-secrets", "nixpkgs": "nixpkgs", "sops-nix": "sops-nix" } diff --git a/flake.nix b/flake.nix index ecc7c95..817e05f 100644 --- a/flake.nix +++ b/flake.nix @@ -9,14 +9,9 @@ alejandra.inputs.nixpkgs.follows = "nixpkgs"; nix-secrets = { - url = "git+https://git.hypervirtual.world/harry123/nix-secrets.git"; # replace with your own repo + url = "git+https://git.hypervirtual.world/harry123/nix-secrets.git"; flake = false; }; - - nixos-generators = { - url = "github:nix-community/nixos-generators"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; outputs = @@ -46,47 +41,12 @@ ]; }; - # athena = nixpkgs.lib.nixosSystem {}: - labouse = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ ./hosts/labouse/configuration.nix ]; }; - - goober = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = specialArgs; - modules = [ - ./hosts/goober/configuration.nix - ]; - }; - - }; - - isos = { - goober = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - modules = [ - ./features/isos/goober.nix - ]; - }; - }; - - proxmox = { - sisyphe = nixos-generators.nixosGenerate { - system = "x86_64-linux"; - specialArgs = { - diskSize = 600 * 1024; - inherit specialArgs; - }; - modules = [ - ./hosts/sisyphe/configuration.nix - sops-nix.nixosModules.sops - ]; - format = "proxmox"; - }; }; }; } diff --git a/hosts/goober/configuration.nix b/hosts/goober/configuration.nix deleted file mode 100644 index 805f340..0000000 --- a/hosts/goober/configuration.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ config, ... }: -{ - services.flatpak.enable = true; - -}