From 016a347d5ed69e158a40a1d9541daf7b11891445 Mon Sep 17 00:00:00 2001 From: Gerg-L Date: Sat, 22 Apr 2023 01:57:28 -0400 Subject: [PATCH] a bunch of code cleanup --- flake.nix | 2 +- installer/default.nix | 2 +- modules/DE/dwm.nix | 9 ++--- modules/DE/gnome.nix | 63 ++++++++++++++---------------- modules/DE/xfce.nix | 7 ++-- modules/DM/autoLogin.nix | 7 ++-- modules/DM/lightDM.nix | 7 ++-- modules/DM/misc.nix | 7 ++-- modules/X11.nix | 9 ++--- modules/boot/misc.nix | 2 +- modules/git.nix | 9 ++--- modules/hardware.nix | 17 ++++---- modules/nix.nix | 2 +- modules/shell.nix | 8 +++- modules/sops.nix | 2 +- modules/theming.nix | 13 +++--- pkgs/t-rex/t-rex.nix | 5 ++- systems/gerg-desktop/spicetify.nix | 14 +++---- systems/gerg-desktop/vfio.nix | 7 ++-- 19 files changed, 92 insertions(+), 100 deletions(-) diff --git a/flake.nix b/flake.nix index e2c36f7..c005abf 100644 --- a/flake.nix +++ b/flake.nix @@ -63,7 +63,7 @@ specialArgs = {inherit self;}; modules = importAll ./modules - ++ importAll "${self}/systems/${name}"; + ++ importAll (self + "/systems/" + name); } ); in diff --git a/installer/default.nix b/installer/default.nix index 379e3b7..4650fba 100644 --- a/installer/default.nix +++ b/installer/default.nix @@ -12,7 +12,7 @@ _: { environment = { noXlibs = lib.mkOverride 500 false; defaultPackages = []; - systemPackages = with pkgs; [gitMinimal neovim]; + systemPackages = [pkgs.gitMinimal pkgs.neovim]; variables = { EDITOR = "nvim"; }; diff --git a/modules/DE/dwm.nix b/modules/DE/dwm.nix index 51bb7b3..a10f62b 100644 --- a/modules/DE/dwm.nix +++ b/modules/DE/dwm.nix @@ -5,16 +5,15 @@ lib, self, ... -}: -with lib; let +}: let cfg = config.localModules.DE.dwm; sp = suckless.packages.${pkgs.system}; in { options.localModules.DE.dwm = { - enable = mkEnableOption ""; + enable = lib.mkEnableOption ""; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { services.gvfs.enable = true; services.xserver = { enable = true; @@ -27,7 +26,7 @@ in { defaultSession = "none+dwm"; }; windowManager.session = - singleton + lib.singleton { name = "dwm"; start = '' diff --git a/modules/DE/gnome.nix b/modules/DE/gnome.nix index 95bbce3..c357001 100644 --- a/modules/DE/gnome.nix +++ b/modules/DE/gnome.nix @@ -4,43 +4,40 @@ _: { options, pkgs, ... -}: -with lib; let +}: let cfg = config.localModules.DE.gnome; in { options.localModules.DE.gnome = { - enable = mkEnableOption ""; + enable = lib.mkEnableOption ""; }; - config = mkIf cfg.enable { - environment.gnome.excludePackages = - (with pkgs; [ - gnome-photos - gnome-tour - gnome-text-editor - gnome-online-accounts - ]) - ++ (with pkgs.gnome; [ - gnome-weather - gnome-shell - gnome-disk-utility - gnome-maps - gnome-clocks - gnome-remote-desktop - gnome-calendar - gnome-music - simple-scan - cheese # webcam tool - gedit # text editor - epiphany # web browser - geary # email reader - evince # document viewer - gnome-characters - totem # video player - tali # poker game - iagno # go game - hitori # sudoku game - atomix # puzzle game - ]); + config = lib.mkIf cfg.enable { + environment.gnome.excludePackages = [ + pkgs.gnome-photos + pkgs.gnome-tour + pkgs.gnome-text-editor + pkgs.gnome-online-accounts + + pkgs.gnome.gnome-weather + pkgs.gnome.gnome-shell + pkgs.gnome.gnome-disk-utility + pkgs.gnome.gnome-maps + pkgs.gnome.gnome-clocks + pkgs.gnome.gnome-remote-desktop + pkgs.gnome.gnome-calendar + pkgs.gnome.gnome-music + pkgs.gnome.simple-scan + pkgs.gnome.cheese # webcam tool + pkgs.gnome.gedit # text editor + pkgs.gnome.epiphany # web browser + pkgs.gnome.geary # email reader + pkgs.gnome.evince # document viewer + pkgs.gnome.gnome-characters + pkgs.gnome.totem # video player + pkgs.gnome.tali # poker game + pkgs.gnome.iagno # go game + pkgs.gnome.hitori # sudoku game + pkgs.gnome.atomix # puzzle game + ]; services.xserver = { enable = true; desktopManager.gnome.enable = true; diff --git a/modules/DE/xfce.nix b/modules/DE/xfce.nix index 53258d4..33155cb 100644 --- a/modules/DE/xfce.nix +++ b/modules/DE/xfce.nix @@ -3,14 +3,13 @@ _: { lib, options, ... -}: -with lib; let +}: let cfg = config.localModules.DE.xfce; in { options.localModules.DE.xfce = { - enable = mkEnableOption ""; + enable = lib.mkEnableOption ""; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { services.xserver = { enable = true; desktopManager.xfce = { diff --git a/modules/DM/autoLogin.nix b/modules/DM/autoLogin.nix index 8c88978..79401b3 100644 --- a/modules/DM/autoLogin.nix +++ b/modules/DM/autoLogin.nix @@ -3,12 +3,11 @@ _: { lib, options, ... -}: -with lib; let +}: let cfg = config.localModules.DM.autoLogin; in { - options.localModules.DM.autoLogin = mkEnableOption ""; - config = mkIf cfg { + options.localModules.DM.autoLogin = lib.mkEnableOption ""; + config = lib.mkIf cfg { services.xserver.displayManager = { autoLogin = { enable = true; diff --git a/modules/DM/lightDM.nix b/modules/DM/lightDM.nix index 554106f..f4cc44f 100644 --- a/modules/DM/lightDM.nix +++ b/modules/DM/lightDM.nix @@ -4,14 +4,13 @@ _: { options, self, ... -}: -with lib; let +}: let cfg = config.localModules.DM.lightdm; in { options.localModules.DM.lightdm = { - enable = mkEnableOption ""; + enable = lib.mkEnableOption ""; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { services.xserver = { displayManager = { lightdm = { diff --git a/modules/DM/misc.nix b/modules/DM/misc.nix index 68f14a1..9a09139 100644 --- a/modules/DM/misc.nix +++ b/modules/DM/misc.nix @@ -2,10 +2,9 @@ _: { options, lib, ... -}: -with lib; { - options.localModules.DM.loginUser = mkOption { - type = types.nullOr types.str; +}: { + options.localModules.DM.loginUser = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; }; } diff --git a/modules/X11.nix b/modules/X11.nix index dd66805..fc96e04 100644 --- a/modules/X11.nix +++ b/modules/X11.nix @@ -4,14 +4,13 @@ _: { options, lib, ... -}: -with lib; let +}: let cfg = config.localModules.X11Programs; in { options.localModules.X11Programs = { - sxhkd.enable = mkEnableOption ""; + sxhkd.enable = lib.mkEnableOption ""; }; - config = mkMerge [ + config = lib.mkMerge [ { services.xserver = { tty = lib.mkDefault 1; @@ -56,7 +55,7 @@ in { maim -s | xclip -selection clipboard -t image/png ''; in - mkIf cfg.sxhkd.enable + lib.mkIf cfg.sxhkd.enable { environment.systemPackages = [ pkgs.maim #screenshooter diff --git a/modules/boot/misc.nix b/modules/boot/misc.nix index 0c4d68d..9c8ef2e 100644 --- a/modules/boot/misc.nix +++ b/modules/boot/misc.nix @@ -7,7 +7,7 @@ _: { plymouth = { enable = lib.mkDefault true; theme = "breeze"; - logo = "${self}/misc/nixos.png"; + logo = self + /misc/nixos.png; }; loader = { systemd-boot = { diff --git a/modules/git.nix b/modules/git.nix index 14f6fdf..111b232 100644 --- a/modules/git.nix +++ b/modules/git.nix @@ -4,17 +4,16 @@ _: { config, lib, ... -}: -with lib; let +}: let cfg = config.localModules.git; in { options.localModules.git = { - disable = mkOption { - type = types.bool; + disable = lib.mkOption { + type = lib.types.bool; default = false; }; }; - config = mkIf (! cfg.disable) { + config = lib.mkIf (! cfg.disable) { programs.git = { enable = true; package = pkgs.gitMinimal; diff --git a/modules/hardware.nix b/modules/hardware.nix index c0652a5..ac73bc4 100644 --- a/modules/hardware.nix +++ b/modules/hardware.nix @@ -3,27 +3,26 @@ _: { options, lib, ... -}: -with lib; let +}: let cfg = config.localModules.hardware; in { options.localModules.hardware = { gpuAcceleration = { - disable = mkOption { - type = types.bool; + disable = lib.mkOption { + type = lib.types.bool; default = false; }; }; sound = { - disable = mkOption { - type = types.bool; + disable = lib.mkOption { + type = lib.types.bool; default = false; }; }; }; - config = mkMerge [ + config = lib.mkMerge [ ( - mkIf (! cfg.gpuAcceleration.disable) { + lib.mkIf (! cfg.gpuAcceleration.disable) { hardware.opengl = { enable = true; driSupport = true; @@ -31,7 +30,7 @@ in { }; } ) - (mkIf (! cfg.sound.disable) { + (lib.mkIf (! cfg.sound.disable) { security.rtkit.enable = true; sound.enable = lib.mkForce false; #disable alsa hardware.pulseaudio.enable = lib.mkForce false; #disable pulseAudio diff --git a/modules/nix.nix b/modules/nix.nix index 13bf61a..e62d2b0 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -26,7 +26,7 @@ in { #add all inputs to etc environment.etc = lib.mapAttrs' (name: value: lib.nameValuePair "/nixpath/${name}" {source = value;}) combined_flakes; #source the etc paths to nixPath - nix.nixPath = lib.mapAttrsToList (name: _: name + "=" + "/etc/nixpath/${name}") combined_flakes; + nix.nixPath = lib.mapAttrsToList (name: _: name + "=/etc/nixpath/${name}") combined_flakes; #other nix settings nix = { diff --git a/modules/shell.nix b/modules/shell.nix index 84d87b9..897cb0b 100644 --- a/modules/shell.nix +++ b/modules/shell.nix @@ -1,4 +1,8 @@ -{fetch-rs, ...}: {pkgs, ...}: rec { +{fetch-rs, ...}: { + pkgs, + config, + ... +}: { #put: #source /run/current-system/sw/share/nix-direnv/direnvrc #in ~/.direnvrc @@ -55,7 +59,7 @@ enable = true; execWheelOnly = true; extraConfig = '' - Defaults env_keep += "${builtins.concatStringsSep " " (builtins.attrNames environment.variables)}" + Defaults env_keep += "${builtins.concatStringsSep " " (builtins.attrNames config.environment.variables)}" Defaults lecture = never ''; }; diff --git a/modules/sops.nix b/modules/sops.nix index 8219f67..309a4f1 100644 --- a/modules/sops.nix +++ b/modules/sops.nix @@ -11,7 +11,7 @@ pkgs.sops ]; sops = { - defaultSopsFile = "${self}/systems/${config.networking.hostName}/secrets.yaml"; + defaultSopsFile = self + "/systems/" + config.networking.hostName + "/secrets.yaml"; age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"]; }; } diff --git a/modules/theming.nix b/modules/theming.nix index a79aa85..4c95c42 100644 --- a/modules/theming.nix +++ b/modules/theming.nix @@ -4,17 +4,16 @@ _: { config, lib, ... -}: -with lib; let +}: let cfg = config.localModules.theming; in { options.localModules.theming = { - enable = mkEnableOption ""; - kmscon.enable = mkEnableOption ""; + enable = lib.mkEnableOption ""; + kmscon.enable = lib.mkEnableOption ""; }; - config = mkMerge [ + config = lib.mkMerge [ ( - mkIf cfg.enable { + lib.mkIf cfg.enable { environment = { systemPackages = [ pkgs.flat-remix-gtk @@ -81,7 +80,7 @@ in { }; } ) - (mkIf cfg.kmscon.enable { + (lib.mkIf cfg.kmscon.enable { services.kmscon = { enable = true; hwRender = false; diff --git a/pkgs/t-rex/t-rex.nix b/pkgs/t-rex/t-rex.nix index dc9f01e..ebc28fb 100644 --- a/pkgs/t-rex/t-rex.nix +++ b/pkgs/t-rex/t-rex.nix @@ -9,10 +9,11 @@ exec ${glibc}/lib64/ld-linux-x86-64.so.2 \ $out/t-rex --no-watchdog \$@ ''; + version = "0.26.5"; in - stdenv.mkDerivation rec { + stdenv.mkDerivation { + inherit version; pname = "t-rex-miner"; - version = "0.26.5"; src = fetchzip { url = "https://github.com/trexminer/T-Rex/releases/download/${version}/t-rex-${version}-linux.tar.gz"; sha256 = "sha256-eGOTfb03R2ck/6GMY6tPmTifYT9aVv3dNDQ5jRVlz58="; diff --git a/systems/gerg-desktop/spicetify.nix b/systems/gerg-desktop/spicetify.nix index a70a153..1da19f3 100644 --- a/systems/gerg-desktop/spicetify.nix +++ b/systems/gerg-desktop/spicetify.nix @@ -1,17 +1,17 @@ {spicetify-nix, ...}: {pkgs, ...}: let - sp-nix = spicetify-nix; - spicePkgs = sp-nix.packages.${pkgs.system}.default; + spicePkgs = spicetify-nix.packages.${pkgs.system}.default; + ex = spicePkgs.extensions; in { nixpkgs.allowedUnfree = ["spotify"]; - imports = [sp-nix.nixosModule]; + imports = [spicetify-nix.nixosModule]; programs.spicetify = { spotifyPackage = pkgs.spotify-unwrapped; spicetifyPackage = pkgs.spicetify-cli; enable = true; - enabledExtensions = with spicePkgs.extensions; [ - adblock - hidePodcasts - shuffle + enabledExtensions = [ + ex.adblock + ex.hidePodcasts + ex.shuffle ]; theme = spicePkgs.themes.Dribbblish; colorScheme = "custom"; diff --git a/systems/gerg-desktop/vfio.nix b/systems/gerg-desktop/vfio.nix index ef521af..0f5291d 100644 --- a/systems/gerg-desktop/vfio.nix +++ b/systems/gerg-desktop/vfio.nix @@ -42,8 +42,8 @@ _: { echo 'EndSection' >> $out echo >> $out ''; - oneMonitor = pkgs.writeText "1-monitor.conf" (lib.strings.concatStrings [(builtins.readFile xserverbase) (builtins.readFile "${self}/misc/1-monitor.conf")]); - twoMonitor = pkgs.writeText "2-monitor.conf" (lib.strings.concatStrings [(builtins.readFile xserverbase) (builtins.readFile "${self}/misc/2-monitor.conf")]); + oneMonitor = pkgs.writeText "1-monitor.conf" (lib.strings.concatStrings [(builtins.readFile xserverbase) (builtins.readFile (self + /misc/1-monitor.conf))]); + twoMonitor = pkgs.writeText "2-monitor.conf" (lib.strings.concatStrings [(builtins.readFile xserverbase) (builtins.readFile (self + /misc/2-monitor.conf))]); in { boot = { kernelParams = ["amd_iommu=on" "iommu=pt" "vfio_iommu_type1.allow_unsafe_interrupts=1" "kvm.ignore_msrs=1"]; @@ -57,7 +57,6 @@ in { patches = old.patches ++ [ - # "${self}/misc/qemu.diff" (pkgs.writeText "qemu.diff" '' diff --git a/ui/input-linux.c b/ui/input-linux.c index e572a2e..a9d76ba 100644 @@ -111,7 +110,7 @@ in { ''; systemd.tmpfiles.rules = let - xml = pkgs.writeText "Windows.xml" (builtins.readFile "${self}/misc/Windows.xml"); + xml = pkgs.writeText "Windows.xml" (builtins.readFile (self + /misc/Windows.xml)); qemuHook = pkgs.writeShellScript "qemu-hook" '' GUEST_NAME="$1" OPERATION="$2"