From 77730268b25feb941ada5a63aeca1f609cc3de37 Mon Sep 17 00:00:00 2001 From: foglar Date: Wed, 1 Jan 2025 10:33:54 +0100 Subject: [PATCH] test fixes --- flake.nix | 14 +++--- tsunemori/configuration.nix | 90 ++++++++++++++++++------------------- 2 files changed, 53 insertions(+), 51 deletions(-) diff --git a/flake.nix b/flake.nix index 71a5be1..63d7d78 100644 --- a/flake.nix +++ b/flake.nix @@ -3,14 +3,8 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; - nixpkgs-droid.url = "github:NixOS/nixpkgs/nixos-24.05"; nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11"; - home-manager-droid = { - url = "github:nix-community/home-manager"; - inputs.nixpkgs.follows = "nixpkgs-droid"; - }; - home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; @@ -61,11 +55,19 @@ url = "github:ghostty-org/ghostty"; }; + # Nix on Droid Configuration + nixpkgs-droid.url = "github:NixOS/nixpkgs/nixos-24.05"; + nix-on-droid = { url = "github:nix-community/nix-on-droid/release-24.05"; inputs.nixpkgs.follows = "nixpkgs-droid"; inputs.home-manager.follows = "home-manager-droid"; }; + + home-manager-droid = { + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "nixpkgs-droid"; + }; }; outputs = { diff --git a/tsunemori/configuration.nix b/tsunemori/configuration.nix index 7a4ab89..da87873 100644 --- a/tsunemori/configuration.nix +++ b/tsunemori/configuration.nix @@ -1,8 +1,8 @@ {pkgs, ...}: { - imports = [ - ../nixos/system/packages.nix - ../nixos/system/system.nix - ]; + #imports = [ + # ../nixos/system/packages.nix + # ../nixos/system/system.nix + #]; nix.extraOptions = '' experimental-features = nix-command flakes @@ -14,48 +14,48 @@ useGlobalPkgs = true; }; - sys = { - audio.enable = false; - bootloader.systemd-boot.enable = false; - desktop = { - steamdeck.enable = false; - }; - fonts.packages = false; - locales.enable = true; - network.enable = false; - bluetooth = { - enable = false; - blueman.enable = false; - }; - nvidia = { - enable = false; - mode = "none"; - }; - printing.enable = false; - login = { - sddm.enable = false; - gdm.enable = false; - }; - style.enable = false; - }; + #sys = { + # audio.enable = false; + # bootloader.systemd-boot.enable = false; + # desktop = { + # steamdeck.enable = false; + # }; + # fonts.packages = false; + # locales.enable = true; + # network.enable = false; + # bluetooth = { + # enable = false; + # blueman.enable = false; + # }; + # nvidia = { + # enable = false; + # mode = "none"; + # }; + # printing.enable = false; + # login = { + # sddm.enable = false; + # gdm.enable = false; + # }; + # style.enable = false; + #}; +# + #program = { + # docker.enable = true; + # podman.enable = false; + # steam.enable = false; + # proxychains.enable = false; + # tor.enable = false; + # virt-manager.enable = false; + # virtualbox.enable = false; + # yubikey = { + # enable = false; + # lock-on-remove = false; + # notify = false; + # }; + # ssh.client.enable = false; + #}; - program = { - docker.enable = true; - podman.enable = false; - steam.enable = false; - proxychains.enable = false; - tor.enable = false; - virt-manager.enable = false; - virtualbox.enable = false; - yubikey = { - enable = false; - lock-on-remove = false; - notify = false; - }; - ssh.client.enable = false; - }; - - nixpkgs.config.allowUnfree = true; + #nixpkgs.config.allowUnfree = true; # Simply install just the packages environment.packages = with pkgs; [