diff options
| -rw-r--r-- | flake.lock | 21 | ||||
| -rw-r--r-- | flake.nix | 91 | ||||
| -rw-r--r-- | machines/betsy/default.nix | 6 | ||||
| -rw-r--r-- | machines/biski/default.nix | 8 | ||||
| -rw-r--r-- | machines/bosco/default.nix | 6 | ||||
| -rw-r--r-- | machines/doretta/default.nix | 7 | ||||
| -rw-r--r-- | machines/khad/default.nix | 7 | ||||
| -rw-r--r-- | machines/picast/default.nix | 31 | ||||
| -rw-r--r-- | machines/vm/foolcreek/default.nix | 11 | ||||
| -rw-r--r-- | machines/zenbook/default.nix | 7 |
10 files changed, 83 insertions, 112 deletions
@@ -686,6 +686,26 @@ "type": "github" } }, + "nix-index-database": { + "inputs": { + "nixpkgs": [ + "nixpkgs-unstable" + ] + }, + "locked": { + "lastModified": 1772945408, + "narHash": "sha256-PMt48sEQ8cgCeljQ9I/32uoBq/8t8y+7W/nAZhf72TQ=", + "owner": "nix-community", + "repo": "nix-index-database", + "rev": "1c1d8ea87b047788fd7567adf531418c5da321ec", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-index-database", + "type": "github" + } + }, "nixlib": { "locked": { "lastModified": 1736643958, @@ -887,6 +907,7 @@ "microvm": "microvm", "modded-minecraft-servers": "modded-minecraft-servers", "nix-colors": "nix-colors", + "nix-index-database": "nix-index-database", "nixos-generators": "nixos-generators", "nixpkgs": "nixpkgs_3", "nixpkgs-old": "nixpkgs-old", @@ -6,6 +6,9 @@ nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-old.url = "github:nixos/nixpkgs/nixos-25.05"; + nix-index-database.url = "github:nix-community/nix-index-database"; + nix-index-database.inputs.nixpkgs.follows = "nixpkgs-unstable"; + home-manager = { url = "github:nix-community/home-manager/release-25.11"; # The `follows` keyword in inputs is used for inheritance. @@ -201,19 +204,23 @@ home-manager.useUserPackages = true; home-manager.extraSpecialArgs = { inherit inputs; }; } - # lib.nixosSystem { - # modules = [ - # ./modules/nixos/nix-common.nix - # ./modules/nixos/environment.nix - # ./modules/nixos/system-packages.nix - - # ./modules/users/defin.nix - # ./modules/users/root.nix - # ]; - # # # Let 'nixos-version --json' know the Git revision of this flake. (for containers?) - # # system.configurationRevision = nixpkgs.lib.mkIf (self ? rev) self.rev; - # # nix.registry.nixpkgs.flake = nixpkgs; - # } + ]; + nixIndex = [ + nix-index-database.nixosModules.nix-index { + programs.nix-index-database.comma.enable = true; + } + ]; + minimalModuleConfig = minimalHomeManagerSettings ++ nixIndex ++ [ + ./modules/nixos/nix-common.nix + ./modules/nixos/environment.nix + ./modules/nixos/system-packages.nix + ./modules/nixos/tailscale.nix + + ./modules/users/defin.nix + ./modules/users/root.nix + # # Let 'nixos-version --json' know the Git revision of this flake. (for containers?) + # system.configurationRevision = nixpkgs.lib.mkIf (self ? rev) self.rev; + # nix.registry.nixpkgs.flake = nixpkgs; ]; # vm = lib.nixosSystem { # system = "x86_64-linux"; @@ -242,7 +249,7 @@ nixosConfigurations = { khad = lib.nixosSystem { # Main desktop - modules = minimalHomeManagerSettings ++ [ ./machines/khad + modules = minimalModuleConfig ++ [ ./machines/khad # lix-module.nixosModules.default sops-nix.nixosModules.sops home-manager.nixosModules.home-manager { home-manager.users.defin = import ./home-manager/tiling-wm.nix; } @@ -250,7 +257,7 @@ }; zenbook = lib.nixosSystem { # Personal laptop # specialArgs = { inherit inputs; }; - modules = minimalHomeManagerSettings ++ [ ./machines/zenbook + modules = minimalModuleConfig ++ [ ./machines/zenbook # lix-module.nixosModules.default # hyprland.homeManagerModules.default {wayland.windowManager.hyprland.enable = true;} home-manager.nixosModules.home-manager { home-manager.users.defin = import ./home-manager/tiling-wm.nix; } @@ -258,7 +265,7 @@ }; betsy = lib.nixosSystem { # work laptop - modules = minimalHomeManagerSettings ++ [ ./machines/betsy + modules = minimalModuleConfig ++ [ ./machines/betsy # lix-module.nixosModules.default home-manager.nixosModules.home-manager { home-manager.users.defin = import ./home-manager/home.nix; } @@ -266,10 +273,10 @@ }; doretta = lib.nixosSystem { # build server specialArgs = { inherit inputs; }; - modules = minimalHomeManagerSettings ++ [ ./machines/doretta + modules = minimalModuleConfig ++ [ ./machines/doretta + home-manager.nixosModules.home-manager { home-manager.users.defin = import ./home-manager/doretta.nix; } # lix-module.nixosModules.default microvm.nixosModules.host - home-manager.nixosModules.home-manager { home-manager.users.defin = import ./home-manager/doretta.nix; } { microvm.autostart = [ "foolcreek" @@ -280,13 +287,13 @@ ]; }; bosco = lib.nixosSystem { # networking server - modules = minimalHomeManagerSettings ++ [ ./machines/bosco + modules = minimalModuleConfig ++ [ ./machines/bosco # lix-module.nixosModules.default home-manager.nixosModules.home-manager { home-manager.users.defin = import ./home-manager/default.nix; } ]; }; biski = lib.nixosSystem { # another networking server, physical instead of cloud - modules = minimalHomeManagerSettings ++ [ ./machines/biski + modules = minimalModuleConfig ++ [ ./machines/biski disko.nixosModules.disko home-manager.nixosModules.home-manager { home-manager.users.defin = import ./home-manager/default.nix; } ]; @@ -298,13 +305,13 @@ config.allowUnfree = true; }; }; - modules = minimalHomeManagerSettings ++ [ ./machines/picast + modules = minimalModuleConfig ++ [ ./machines/picast home-manager.nixosModules.home-manager { home-manager.users.defin = import ./home-manager/default.nix; } ]; }; microvm-test = lib.nixosSystem { # test system = "x86_64-linux"; - modules = minimalHomeManagerSettings ++ [ + modules = minimalModuleConfig ++ [ microvm.nixosModules.microvm # home-manager.nixosModules.home-manager { home-manager.users.defin = import ./home-manager/default.nix; } { @@ -314,19 +321,17 @@ ]; }; foolcreek = lib.nixosSystem { # vm for website - specialArgs = { inherit inputs home-manager; }; - modules = minimalHomeManagerSettings ++ [ ./machines/vm/foolcreek + specialArgs = { inherit inputs; }; + modules = minimalModuleConfig ++ [ ./machines/vm/foolcreek microvm.nixosModules.microvm # home-manager.nixosModules.home-manager { home-manager.users.defin = import ./home-manager/default.nix; } ]; }; live = lib.nixosSystem { - modules = minimalHomeManagerSettings ++ [ + modules = minimalModuleConfig ++ [ (nixpkgs + "/nixos/modules/installer/sd-card/sd-image-aarch64-installer.nix") ./machines/iso/configuration.nix - ./modules/users/defin.nix - ./modules/nixos/system-packages.nix home-manager.nixosModules.home-manager { home-manager.users.defin = import ./home-manager/default.nix; } { nixpkgs.hostPlatform = "aarch64-linux"; } @@ -344,20 +349,20 @@ # vms = { # expose the build attribute directly # foolcreekwireless = foolcreekwireless.config.system.build.vm; # }; - homeConfigurations = { #NOTE: no worky yet - # Standalone HM only - # # Desktop - # "defin@khad" = lib.homeManagerConfiguration { - # modules = [ ./home-manager/home.nix ]; - # pkgs = pkgsFor.x86_64-linux; - # extraSpecialArgs = { inherit inputs outputs; }; - # }; - # Laptop - "defin@nixos-zenbook" = lib.homeManagerConfiguration { - modules = [ ./home-manager/home.nix ]; - pkgs = pkgsFor.x86_64-linux; - extraSpecialArgs = { inherit inputs outputs; }; - }; - }; - }; + # homeConfigurations = { #NOTE: no worky yet + # # Standalone HM only + # # # Desktop + # # "defin@khad" = lib.homeManagerConfiguration { + # # modules = [ ./home-manager/home.nix ]; + # # pkgs = pkgsFor.x86_64-linux; + # # extraSpecialArgs = { inherit inputs outputs; }; + # # }; + # # Laptop -- example + # # "defin@nixos-zenbook" = lib.homeManagerConfiguration { + # # modules = [ ./home-manager/home.nix ]; + # # pkgs = pkgsFor.x86_64-linux; + # # extraSpecialArgs = { inherit inputs outputs; }; + # # }; + # }; + }; } diff --git a/machines/betsy/default.nix b/machines/betsy/default.nix index f56d4ba..5627b72 100644 --- a/machines/betsy/default.nix +++ b/machines/betsy/default.nix @@ -10,15 +10,9 @@ ./hardware-configuration.nix ../../modules/nixos/bluetooth.nix - ../../modules/nixos/nix-common.nix - ../../modules/nixos/environment.nix - ../../modules/nixos/tailscale.nix - ../../modules/nixos/system-packages.nix ../../modules/nixos/services.nix ../../modules/nixos/kde-connect.nix - ../../modules/users/defin.nix - ../../modules/users/root.nix ../../modules/users/jerry.nix ]; boot = { diff --git a/machines/biski/default.nix b/machines/biski/default.nix index b999aaa..594957a 100644 --- a/machines/biski/default.nix +++ b/machines/biski/default.nix @@ -7,19 +7,11 @@ { imports = [ # Include the results of the hardware scan. - # /home/defin/hardware-configuration.nix ./hardware-configuration.nix # /tmp/etc/nixos/hardware-configuartion.nix ./disko.nix - ../../modules/nixos/nix-common.nix - ../../modules/nixos/environment.nix - ../../modules/nixos/tailscale.nix - ../../modules/nixos/system-packages.nix - - ../../modules/users/defin.nix ../../modules/users/git.nix - ../../modules/users/root.nix ]; # Use the systemd-boot EFI boot loader. diff --git a/machines/bosco/default.nix b/machines/bosco/default.nix index bb2867f..621710f 100644 --- a/machines/bosco/default.nix +++ b/machines/bosco/default.nix @@ -10,14 +10,8 @@ ./hardware-configuration.nix ./reverse-proxy.nix - ../../modules/nixos/nix-common.nix - ../../modules/nixos/environment.nix - ../../modules/nixos/tailscale.nix ../../modules/nixos/headscale.nix ../../modules/nixos/cgit.nix - ../../modules/nixos/system-packages.nix - ../../modules/users/defin.nix - ../../modules/users/root.nix ]; # Use the GRUB 2 boot loader. diff --git a/machines/doretta/default.nix b/machines/doretta/default.nix index 7b08338..59422b3 100644 --- a/machines/doretta/default.nix +++ b/machines/doretta/default.nix @@ -12,19 +12,12 @@ # ./website.nix ../../modules/nixos/binary-cache.nix - ../../modules/nixos/nix-common.nix - ../../modules/nixos/environment.nix - ../../modules/nixos/tailscale.nix - ../../modules/nixos/system-packages.nix - # microvm host ../vm/foolcreek/default.nix ../../modules/nixos/minecraft-server.nix - ../../modules/users/defin.nix ../../modules/users/git.nix - ../../modules/users/root.nix ]; # Use the systemd-boot EFI boot loader. diff --git a/machines/khad/default.nix b/machines/khad/default.nix index 67a6f26..b2ab71e 100644 --- a/machines/khad/default.nix +++ b/machines/khad/default.nix @@ -9,20 +9,13 @@ # Include the results of the hardware scan. ./hardware-configuration.nix - ../../modules/users/defin.nix - ../../modules/users/root.nix - ../../modules/nixos/hyprland.nix ../../modules/nixos/bluetooth.nix - ../../modules/nixos/environment.nix ../../modules/nixos/kde-connect.nix - ../../modules/nixos/nix-common.nix ../../modules/nixos/services.nix - ../../modules/nixos/tailscale.nix ../../modules/nixos/steam.nix # ../../modules/nixos/sway.nix - ../../modules/nixos/system-packages.nix ]; # Use the systemd-boot EFI boot loader. diff --git a/machines/picast/default.nix b/machines/picast/default.nix index 305a70d..2576769 100644 --- a/machines/picast/default.nix +++ b/machines/picast/default.nix @@ -8,13 +8,6 @@ imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix - - ../../modules/nixos/nix-common.nix - ../../modules/nixos/environment.nix - ../../modules/nixos/tailscale.nix - ../../modules/nixos/system-packages.nix - ../../modules/users/defin.nix - ../../modules/users/root.nix ]; # Use the extlinux boot loader. (NixOS wants to enable GRUB by default) @@ -30,6 +23,18 @@ # Set your time zone. time.timeZone = "America/Denver"; + users.extraUsers.kodi = { + isNormalUser = true; + extraGroups = [ "video" "cdrom" "audio" "render" "plugdev" "users" "dialout" "dip" "input" ]; + }; + services.cage = { + package = pkgs-old.cage; + enable = true; + user = "kodi"; + program = "${pkgs.kodi-wayland.withPackages (kodiPkgs: with kodiPkgs; + [ sponsorblock sendtokodi ])}/bin/kodi-standalone"; + }; + # Configure network proxy if necessary # networking.proxy.default = "http://user:password@proxy:port/"; # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; @@ -45,18 +50,6 @@ # Enable the X11 windowing system. # services.xserver.enable = true; - users.extraUsers.kodi = { - isNormalUser = true; - extraGroups = [ "video" "cdrom" "audio" "render" "plugdev" "users" "dialout" "dip" "input" ]; - }; - services.cage = { - package = pkgs-old.cage; - enable = true; - user = "kodi"; - program = "${pkgs.kodi-wayland.withPackages (kodiPkgs: with kodiPkgs; - [ sponsorblock sendtokodi ])}/bin/kodi-standalone"; - }; - # Configure keymap in X11 # services.xserver.xkb.layout = "us"; # services.xserver.xkb.options = "eurosign:e,caps:escape"; diff --git a/machines/vm/foolcreek/default.nix b/machines/vm/foolcreek/default.nix index 72dc7f8..6c8b5d9 100644 --- a/machines/vm/foolcreek/default.nix +++ b/machines/vm/foolcreek/default.nix @@ -1,4 +1,4 @@ -{ microvm, config, pkgs, inputs, ... }: +{ microvm, config, pkgs, lib, ... }: # let # language ; # in @@ -13,14 +13,6 @@ # home-manager.users imports = [ # ./hardware-configuration.nix - # inputs.home-manager.nixosModules.home-manager { home-manager.users.defin = import ../../../home-manager/default.nix; } - - ../../../modules/nixos/nix-common.nix - ../../../modules/nixos/environment.nix - # ../../../modules/nixos/system-packages.nix - - ../../../modules/users/defin.nix - ../../../modules/users/root.nix ]; networking.hostName = "foolcreek"; @@ -82,6 +74,7 @@ enable = true; ports = [22]; }; + services.tailscale.enable = lib.mkForce false; environment.systemPackages = with pkgs; [ cowsay lolcat diff --git a/machines/zenbook/default.nix b/machines/zenbook/default.nix index 8352802..1276105 100644 --- a/machines/zenbook/default.nix +++ b/machines/zenbook/default.nix @@ -8,21 +8,14 @@ imports = [ ./hardware-configuration.nix - ../../modules/users/defin.nix - ../../modules/users/root.nix - ../../modules/nixos/hyprland.nix ../../modules/nixos/asus-numpad-touchpad.nix ../../modules/nixos/bluetooth.nix - ../../modules/nixos/environment.nix ../../modules/nixos/kde-connect.nix - ../../modules/nixos/nix-common.nix ../../modules/nixos/services.nix - ../../modules/nixos/tailscale.nix ../../modules/nixos/steam.nix # ../..modules/nixos/sway.nix - ../../modules/nixos/system-packages.nix ]; # Use the systemd-boot EFI boot loader. |