From 36ade1c42d190491c6e7bc1742d16a1f3a26b4f7 Mon Sep 17 00:00:00 2001 From: agryphus Date: Tue, 27 Feb 2024 15:56:42 -0500 Subject: [PATCH] Move nixos to stow module --- .../.config/nixos/configuration.def.nix | 0 {misc => nixos}/.config/nixos/core.nix | 0 nixos/.config/nixos/custom/quickshell.nix | 6 + nixos/.config/nixos/derivations/ags.nix | 103 ++++++++++++++++++ .../.config/nixos/profiles/emacs.nix | 0 .../.config/nixos/profiles/fcitx.nix | 0 nixos/.config/nixos/profiles/java.nix | 14 +++ {misc => nixos}/.config/nixos/profiles/lf.nix | 0 .../.config/nixos/profiles/minimal.nix | 0 nixos/.config/nixos/profiles/neomutt.nix | 13 +++ .../.config/nixos/profiles/nvim.nix | 0 nixos/.config/nixos/profiles/offsec.nix | 8 ++ nixos/.config/nixos/profiles/steam.nix | 10 ++ nixos/.config/nixos/profiles/syncthing.nix | 18 +++ .../.config/nixos/profiles/virtualbox.nix | 0 .../.config/nixos/profiles/wm/dwm.nix | 0 .../.config/nixos/profiles/wm/hyprland.nix | 0 17 files changed, 172 insertions(+) rename {misc => nixos}/.config/nixos/configuration.def.nix (100%) rename {misc => nixos}/.config/nixos/core.nix (100%) create mode 100644 nixos/.config/nixos/custom/quickshell.nix create mode 100644 nixos/.config/nixos/derivations/ags.nix rename {misc => nixos}/.config/nixos/profiles/emacs.nix (100%) rename {misc => nixos}/.config/nixos/profiles/fcitx.nix (100%) create mode 100644 nixos/.config/nixos/profiles/java.nix rename {misc => nixos}/.config/nixos/profiles/lf.nix (100%) rename {misc => nixos}/.config/nixos/profiles/minimal.nix (100%) create mode 100644 nixos/.config/nixos/profiles/neomutt.nix rename {misc => nixos}/.config/nixos/profiles/nvim.nix (100%) create mode 100644 nixos/.config/nixos/profiles/offsec.nix create mode 100644 nixos/.config/nixos/profiles/steam.nix create mode 100644 nixos/.config/nixos/profiles/syncthing.nix rename {misc => nixos}/.config/nixos/profiles/virtualbox.nix (100%) rename {misc => nixos}/.config/nixos/profiles/wm/dwm.nix (100%) rename {misc => nixos}/.config/nixos/profiles/wm/hyprland.nix (100%) diff --git a/misc/.config/nixos/configuration.def.nix b/nixos/.config/nixos/configuration.def.nix similarity index 100% rename from misc/.config/nixos/configuration.def.nix rename to nixos/.config/nixos/configuration.def.nix diff --git a/misc/.config/nixos/core.nix b/nixos/.config/nixos/core.nix similarity index 100% rename from misc/.config/nixos/core.nix rename to nixos/.config/nixos/core.nix diff --git a/nixos/.config/nixos/custom/quickshell.nix b/nixos/.config/nixos/custom/quickshell.nix new file mode 100644 index 0000000..00dc4fc --- /dev/null +++ b/nixos/.config/nixos/custom/quickshell.nix @@ -0,0 +1,6 @@ +{ lib, stdenv }: + +stdenv.mkDerivation { + +} + diff --git a/nixos/.config/nixos/derivations/ags.nix b/nixos/.config/nixos/derivations/ags.nix new file mode 100644 index 0000000..6a9ad53 --- /dev/null +++ b/nixos/.config/nixos/derivations/ags.nix @@ -0,0 +1,103 @@ +{ lib +, stdenv +, buildNpmPackage +, fetchFromGitLab +, nodePackages +, meson +, pkg-config +, ninja +, gobject-introspection +, gtk3 +, libpulseaudio +, gjs +, wrapGAppsHook +, upower +, gnome +, gtk-layer-shell +, glib-networking +, networkmanager +, libdbusmenu-gtk3 +, gvfs +, libsoup_3 +, libnotify +, pam +, extraPackages ? [ ] +, version ? "git" +, buildTypes ? false +}: + +let + gvc-src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = "libgnome-volume-control"; + rev = "8e7a5a4c3e51007ce6579292642517e3d3eb9c50"; + sha256 = "sha256-FosJwgTCp6/EI6WVbJhPisokRBA6oT0eo7d+Ya7fFX8="; + }; +in +stdenv.mkDerivation rec { + pname = "ags"; + inherit version; + + src = buildNpmPackage { + name = pname; + src = ../.; + + dontBuild = true; + + npmDepsHash = "sha256-ucWdADdMqAdLXQYKGOXHNRNM9bhjKX4vkMcQ8q/GZ20="; + + installPhase = '' + mkdir $out + cp -r * $out + ''; + }; + + mesonFlags = builtins.concatLists [ + (lib.optional buildTypes "-Dbuild_types=true") + ]; + + prePatch = '' + mkdir -p ./subprojects/gvc + cp -r ${gvc-src}/* ./subprojects/gvc + ''; + + postPatch = '' + chmod +x post_install.sh + patchShebangs post_install.sh + ''; + + nativeBuildInputs = [ + pkg-config + meson + ninja + nodePackages.typescript + wrapGAppsHook + gobject-introspection + ]; + + buildInputs = [ + gjs + gtk3 + libpulseaudio + upower + gnome.gnome-bluetooth + gtk-layer-shell + glib-networking + networkmanager + libdbusmenu-gtk3 + gvfs + libsoup_3 + libnotify + pam + ] ++ extraPackages; + + meta = with lib; { + description = "A customizable and extensible shell"; + homepage = "https://github.com/Aylur/ags"; + platforms = [ "x86_64-linux" "aarch64-linux" ]; + license = licenses.gpl3; + meta.maintainers = [ lib.maintainers.Aylur ]; + }; +} + diff --git a/misc/.config/nixos/profiles/emacs.nix b/nixos/.config/nixos/profiles/emacs.nix similarity index 100% rename from misc/.config/nixos/profiles/emacs.nix rename to nixos/.config/nixos/profiles/emacs.nix diff --git a/misc/.config/nixos/profiles/fcitx.nix b/nixos/.config/nixos/profiles/fcitx.nix similarity index 100% rename from misc/.config/nixos/profiles/fcitx.nix rename to nixos/.config/nixos/profiles/fcitx.nix diff --git a/nixos/.config/nixos/profiles/java.nix b/nixos/.config/nixos/profiles/java.nix new file mode 100644 index 0000000..cad70d1 --- /dev/null +++ b/nixos/.config/nixos/profiles/java.nix @@ -0,0 +1,14 @@ +{ config, pkgs, ... }: + +{ + programs.java = { + enable = true; + package = pkgs.javaPackages.openjfx17; + }; + + environment.systemPackages = with pkgs; [ + javaPackages.openjfx19 + jdk17 + ]; +} + diff --git a/misc/.config/nixos/profiles/lf.nix b/nixos/.config/nixos/profiles/lf.nix similarity index 100% rename from misc/.config/nixos/profiles/lf.nix rename to nixos/.config/nixos/profiles/lf.nix diff --git a/misc/.config/nixos/profiles/minimal.nix b/nixos/.config/nixos/profiles/minimal.nix similarity index 100% rename from misc/.config/nixos/profiles/minimal.nix rename to nixos/.config/nixos/profiles/minimal.nix diff --git a/nixos/.config/nixos/profiles/neomutt.nix b/nixos/.config/nixos/profiles/neomutt.nix new file mode 100644 index 0000000..496630d --- /dev/null +++ b/nixos/.config/nixos/profiles/neomutt.nix @@ -0,0 +1,13 @@ +{ config, pkgs, ... }: + +{ + environment.systemPackages = with pkgs; [ + neomutt # Mail client + + lynx + isync # Downloads the mail + offlineimap # Downloads the mail + msmtp # Sents the mail + ]; +} + diff --git a/misc/.config/nixos/profiles/nvim.nix b/nixos/.config/nixos/profiles/nvim.nix similarity index 100% rename from misc/.config/nixos/profiles/nvim.nix rename to nixos/.config/nixos/profiles/nvim.nix diff --git a/nixos/.config/nixos/profiles/offsec.nix b/nixos/.config/nixos/profiles/offsec.nix new file mode 100644 index 0000000..841c77d --- /dev/null +++ b/nixos/.config/nixos/profiles/offsec.nix @@ -0,0 +1,8 @@ +{ config, pkgs, ... }: + +{ + environment.systemPackages = with pkgs; [ + nmap + ]; +} + diff --git a/nixos/.config/nixos/profiles/steam.nix b/nixos/.config/nixos/profiles/steam.nix new file mode 100644 index 0000000..7b0065a --- /dev/null +++ b/nixos/.config/nixos/profiles/steam.nix @@ -0,0 +1,10 @@ +{ config, pkgs, ... }: + +{ + nixpkgs.config.allowUnfree = true; + + environment.systemPackages = with pkgs; [ + steam + ]; +} + diff --git a/nixos/.config/nixos/profiles/syncthing.nix b/nixos/.config/nixos/profiles/syncthing.nix new file mode 100644 index 0000000..5ef6d0f --- /dev/null +++ b/nixos/.config/nixos/profiles/syncthing.nix @@ -0,0 +1,18 @@ +{ config, pkgs, ... }: + +{ + services.syncthing = { + enable = true; + dataDir = "/home/vince/.local/share"; + openDefaultPorts = true; + configDir = "/home/vince/.config/syncthing"; + user = "vince"; + group = "users"; + guiAddress = "localhost:8384"; + }; + + environment.systemPackages = with pkgs; [ + syncthing # Syncing files between machines + ]; +} + diff --git a/misc/.config/nixos/profiles/virtualbox.nix b/nixos/.config/nixos/profiles/virtualbox.nix similarity index 100% rename from misc/.config/nixos/profiles/virtualbox.nix rename to nixos/.config/nixos/profiles/virtualbox.nix diff --git a/misc/.config/nixos/profiles/wm/dwm.nix b/nixos/.config/nixos/profiles/wm/dwm.nix similarity index 100% rename from misc/.config/nixos/profiles/wm/dwm.nix rename to nixos/.config/nixos/profiles/wm/dwm.nix diff --git a/misc/.config/nixos/profiles/wm/hyprland.nix b/nixos/.config/nixos/profiles/wm/hyprland.nix similarity index 100% rename from misc/.config/nixos/profiles/wm/hyprland.nix rename to nixos/.config/nixos/profiles/wm/hyprland.nix