From e7f323f9bf311d98b01b67309818d131c06d2abf Mon Sep 17 00:00:00 2001 From: randomuser Date: Thu, 28 Dec 2023 15:27:31 -0600 Subject: [PATCH] changes --- boxes/iso.nix | 10 --- boxes/{mlg.nix => mlg/default.nix} | 11 ++- {common => boxes/mlg}/nvidia.nix | 0 boxes/{virtbox.nix => virtbox/default.nix} | 9 ++- .../virtbox/hardware-configuration.nix | 0 boxes/virtbox/home.nix | 9 +++ boxes/xps.nix | 48 ----------- builds/flake.lock | 27 +++++++ builds/flake.nix | 1 - common/desktop.nix | 7 -- common/gaming.nix | 9 --- common/main.nix | 5 -- common/testing.nix | 5 -- flake.lock | 10 +-- flake.nix | 8 +- home/tty.nix | 2 - bootstrap.nix => modules/bootstrap.nix | 0 modules/common.nix | 9 +-- modules/discord.nix | 4 + common/steam.nix => modules/gaming.nix | 4 +- modules/x11.nix | 5 ++ nonpure/install.sh | 79 ------------------- nonpure/privdata.sh | 10 --- nonpure/traditional_bootstrap.sh | 1 - 24 files changed, 72 insertions(+), 201 deletions(-) delete mode 100644 boxes/iso.nix rename boxes/{mlg.nix => mlg/default.nix} (81%) rename {common => boxes/mlg}/nvidia.nix (100%) rename boxes/{virtbox.nix => virtbox/default.nix} (56%) rename hardware-configuration.nix => boxes/virtbox/hardware-configuration.nix (100%) create mode 100644 boxes/virtbox/home.nix delete mode 100644 boxes/xps.nix create mode 100644 builds/flake.lock delete mode 100644 common/desktop.nix delete mode 100644 common/gaming.nix delete mode 100644 common/main.nix delete mode 100644 common/testing.nix rename bootstrap.nix => modules/bootstrap.nix (100%) rename common/steam.nix => modules/gaming.nix (87%) delete mode 100644 nonpure/install.sh delete mode 100644 nonpure/privdata.sh delete mode 100644 nonpure/traditional_bootstrap.sh diff --git a/boxes/iso.nix b/boxes/iso.nix deleted file mode 100644 index 27de3cb..0000000 --- a/boxes/iso.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ config, pkgs, ... }: -{ - imports = [ - - - # Provide an initial copy of the NixOS channel so that the user - # doesn't need to run "nix-channel --update" first. - - ]; -} diff --git a/boxes/mlg.nix b/boxes/mlg/default.nix similarity index 81% rename from boxes/mlg.nix rename to boxes/mlg/default.nix index 2b25dc5..aa29802 100644 --- a/boxes/mlg.nix +++ b/boxes/mlg/default.nix @@ -2,10 +2,13 @@ { imports = [ - ../common/desktop.nix - ../common/nvidia.nix - ../common/gaming.nix - ../common/steam.nix + ./hardware-configuration.nix + ./nvidia.nix + ../../modules/bootstrap.nix + ../../modules/common.nix + ../../modules/x11.nix + ../../modules/discord.nix + ../../modules/gaming.nix ]; environment.systemPackages = with pkgs; [ diff --git a/common/nvidia.nix b/boxes/mlg/nvidia.nix similarity index 100% rename from common/nvidia.nix rename to boxes/mlg/nvidia.nix diff --git a/boxes/virtbox.nix b/boxes/virtbox/default.nix similarity index 56% rename from boxes/virtbox.nix rename to boxes/virtbox/default.nix index 9dd9134..81e64ab 100644 --- a/boxes/virtbox.nix +++ b/boxes/virtbox/default.nix @@ -2,10 +2,11 @@ { imports = [ - ../bootstrap.nix - ../modules/common.nix - ../modules/x11.nix - ../modules/discord.nix + ./hardware-configuration.nix + ../../modules/bootstrap.nix + ../../modules/common.nix + ../../modules/x11.nix + ../../modules/discord.nix ]; boot.loader.grub.enable = true; diff --git a/hardware-configuration.nix b/boxes/virtbox/hardware-configuration.nix similarity index 100% rename from hardware-configuration.nix rename to boxes/virtbox/hardware-configuration.nix diff --git a/boxes/virtbox/home.nix b/boxes/virtbox/home.nix new file mode 100644 index 0000000..144dd0e --- /dev/null +++ b/boxes/virtbox/home.nix @@ -0,0 +1,9 @@ +{ lib, inputs, config, pkgs, home, ... }: + +{ + imports = [ + ../../home/x11.nix + ]; + + home.stateVersion = "23.11"; +} diff --git a/boxes/xps.nix b/boxes/xps.nix deleted file mode 100644 index d0e10cc..0000000 --- a/boxes/xps.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib, config, pkgs, ...}: - -{ - imports = [ - ../common/desktop.nix - ../common/steam.nix - ]; - - environment.systemPackages = with pkgs; [ - gnome.cheese - musescore - libsForQt5.kdenlive - xdotool - texlive.combined.scheme-full - lilypond - virt-manager -# virtualbox - xsane - android-studio - mpc-cli - emacs - nyxt - cmus - ]; - -# users.extraGroups.vboxusers.members = [ "usr" ]; -# virtualisation.virtualbox.host.enable = true; -# virtualisation.virtualbox.host.enableExtensionPack = true; - - services.tlp.enable = true; - - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - - services.printing.enable = true; - services.avahi.enable = true; - services.avahi.nssmdns = true; - # for a WiFi printer - services.avahi.openFirewall = true; - - networking.nameservers = [ "1.1.1.1" "9.9.9.9" ]; - - networking.hostName = "xps"; - - virtualisation.libvirtd.enable = true; - programs.dconf.enable = true; - users.users.usr.extraGroups = [ "libvirtd" ]; -} diff --git a/builds/flake.lock b/builds/flake.lock new file mode 100644 index 0000000..c5ee110 --- /dev/null +++ b/builds/flake.lock @@ -0,0 +1,27 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1703467016, + "narHash": "sha256-/5A/dNPhbQx/Oa2d+Get174eNI3LERQ7u6WTWOlR1eQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d02d818f22c777aa4e854efc3242ec451e5d462a", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/builds/flake.nix b/builds/flake.nix index 12ff458..da05e7d 100644 --- a/builds/flake.nix +++ b/builds/flake.nix @@ -19,7 +19,6 @@ st = pkgs.callPackage ./st.nix { }; rebuild = pkgs.callPackage ./rebuild.nix { }; utils = pkgs.callPackage ./utils.nix { }; - pash = pkgs.callPackage ./pash.nix { }; }; in withSystem ( diff --git a/common/desktop.nix b/common/desktop.nix deleted file mode 100644 index 65506e4..0000000 --- a/common/desktop.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ lib, config, pkgs, ...}: - -{ - imports = [ - ./main.nix - ]; -} diff --git a/common/gaming.nix b/common/gaming.nix deleted file mode 100644 index a8c25bb..0000000 --- a/common/gaming.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ config, lib, pkgs, ... }: -{ - environment.systemPackages = with pkgs; [ - steam-run - prismlauncher - xonotic - minetest - ]; -} diff --git a/common/main.nix b/common/main.nix deleted file mode 100644 index f500090..0000000 --- a/common/main.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ lib, config, pkgs, ... }: - -{ - system.stateVersion = "23.11"; # don't change this, lol -} diff --git a/common/testing.nix b/common/testing.nix deleted file mode 100644 index 9be1353..0000000 --- a/common/testing.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ lib, config, pkgs, home-manager, ...}: - -{ - home - diff --git a/flake.lock b/flake.lock index 091d1e1..a265653 100644 --- a/flake.lock +++ b/flake.lock @@ -80,10 +80,10 @@ "firefox-addons": "firefox-addons", "home-manager": "home-manager", "nixpkgs": "nixpkgs", - "utils": "utils" + "utilpkg": "utilpkg" } }, - "utils": { + "utilpkg": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -91,12 +91,12 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-WtyNlVS46B3e7GlJY0S5p9lKfp++kVudfkzinGtTP+8=", - "path": "/nix/store/4910sx6j7s74xb9ywmp0piqfgkr2v3lx-source/builds", + "narHash": "sha256-xCQE9SSKWjmoYOaIkzdlGULeGbEF9Gau5TPgYJxalmw=", + "path": "/nix/store/khgahixmjd7zvvv541crbibjwg3wbshv-source/builds", "type": "path" }, "original": { - "path": "/nix/store/4910sx6j7s74xb9ywmp0piqfgkr2v3lx-source/builds", + "path": "/nix/store/khgahixmjd7zvvv541crbibjwg3wbshv-source/builds", "type": "path" } } diff --git a/flake.nix b/flake.nix index 65f3a9c..a2c7fb3 100644 --- a/flake.nix +++ b/flake.nix @@ -11,25 +11,25 @@ url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; inputs.nixpkgs.follows = "nixpkgs"; }; - utils = { + utilpkg = { url = "./builds"; inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = { self, nixpkgs, home-manager, firefox-addons, utils, ... }@inputs: { + outputs = { self, nixpkgs, home-manager, firefox-addons, utilpkg, ... }@inputs: { nixosConfigurations = { virtbox = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit inputs; }; modules = [ - ./boxes/virtbox.nix + ./boxes/virtbox home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.extraSpecialArgs = { inherit inputs; }; - home-manager.users.usr = import ./home/x11.nix; + home-manager.users.usr = import ./boxes/virtbox/home.nix; } ]; }; diff --git a/home/tty.nix b/home/tty.nix index 1d3b784..475edab 100644 --- a/home/tty.nix +++ b/home/tty.nix @@ -11,6 +11,4 @@ ./tty-progs.nix ]; - - home.stateVersion = "23.11"; } diff --git a/bootstrap.nix b/modules/bootstrap.nix similarity index 100% rename from bootstrap.nix rename to modules/bootstrap.nix diff --git a/modules/common.nix b/modules/common.nix index 1ea8518..784ebf0 100644 --- a/modules/common.nix +++ b/modules/common.nix @@ -7,12 +7,9 @@ environment.systemPackages = [ # is it this? this throws a similar error; no attr st, etc. -# inputs.utilpkg.packages.st -# inputs.utilpkg.packages.rebuild -# inputs.utilpkg.packages.utils - inputs.utilpkg.st - inputs.utilpkg.rebuild - inputs.utilpkg.utils + inputs.utilpkg.packages.x86_64-linux.st + inputs.utilpkg.packages.x86_64-linux.rebuild + inputs.utilpkg.packages.x86_64-linux.utils pkgs.man-pages ]; diff --git a/modules/discord.nix b/modules/discord.nix index a319095..bf4cfdd 100644 --- a/modules/discord.nix +++ b/modules/discord.nix @@ -4,4 +4,8 @@ environment.systemPackages = with pkgs; [ discord ]; + + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ + "discord" + ]; } diff --git a/common/steam.nix b/modules/gaming.nix similarity index 87% rename from common/steam.nix rename to modules/gaming.nix index 2fd013f..9c5dd7c 100644 --- a/common/steam.nix +++ b/modules/gaming.nix @@ -7,6 +7,8 @@ }; environment.systemPackages = with pkgs; [ - steam-run + prismlauncher + xonotic + minetest ]; } diff --git a/modules/x11.nix b/modules/x11.nix index d6e3d52..4d46867 100644 --- a/modules/x11.nix +++ b/modules/x11.nix @@ -8,6 +8,11 @@ ./pulse.nix ]; + environment.systemPackages = [ + pkgs.bspwm + pkgs.sxhkd + ]; + services.xserver = { enable = true; libinput.enable = true; diff --git a/nonpure/install.sh b/nonpure/install.sh deleted file mode 100644 index 4242227..0000000 --- a/nonpure/install.sh +++ /dev/null @@ -1,79 +0,0 @@ -if [ "$(id -u)" -eq 1000 ]; then - printf "switch to the root user, and try again.\n" - exit 1 -fi - -lsblk -read -p "Drive name? (/dev/vda): " DRIVE - -ls ../boxes -read -p "NixOS configuration? (virtbox): " NIXOS_CONFIG - -read -p "Reboot? (yes/no, default 'yes'): " REBOOT - -umount -f /mnt/boot -umount -f /mnt -swapoff -a - -nix-env -iA nixos.git - -if [ -z "$DRIVE" ]; then - DRIVE="/dev/vda" -fi - -if [ -z "$NIXOS_CONFIG" ]; then - NIXOS_CONFIG="virtbox" -fi - -if [ -z "$REBOOT" ]; then - REBOOT="yes" -fi - -fdisk "$DRIVE" <