diff --git a/nixos/common/desktop/README.md b/nixos/common/desktop/README.md index 0db6d20..3238074 100644 --- a/nixos/common/desktop/README.md +++ b/nixos/common/desktop/README.md @@ -4,6 +4,6 @@ my laptop and desktop ## Files * `./default.nix`: Contains common systemwide configuration - * See also <../modules> + * See also my NixOS [modules](../modules), specifically gnome * `./home.nix`: Contains common user-level configuration - * See also <../hm-modules> + * See also my Home-Manager [modules](../hm-modules) diff --git a/nixos/common/desktop/home.nix b/nixos/common/desktop/home.nix index 17e74f3..6458b8d 100644 --- a/nixos/common/desktop/home.nix +++ b/nixos/common/desktop/home.nix @@ -29,6 +29,7 @@ in { yt-dlp ]; + # Enable my own hm modules themes.v.catppuccin.enable = true; programs.v.nvim.enable = true; programs.v.vscode.enable = true; @@ -37,6 +38,7 @@ in { enable = true; direnv = true; }; + programs.exa = { enable = true; enableAliases = true; diff --git a/nixos/common/modules/gnome/default.nix b/nixos/common/modules/gnome/default.nix index 04d5949..90b95a5 100644 --- a/nixos/common/modules/gnome/default.nix +++ b/nixos/common/modules/gnome/default.nix @@ -1,18 +1,24 @@ -{ config, pkgs, lib, flat_hosts, ... }: +{ config, pkgs, lib, ... }: with lib; let cfg = config.services.v.gnome; - in { - options.services.v.gnome = { enable = mkEnableOption "v.gnome"; }; + options.services.v.gnome = { + enable = mkEnableOption "v.gnome"; + hm = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable home manager integration to set default dconf values + ''; + }; + }; config = mkIf cfg.enable { services.xserver.enable = true; services.xserver.excludePackages = [ pkgs.xterm ]; # Add Home-manager dconf stuff - home-manager.sharedModules = [ - ./hm.nix - ]; + home-manager.sharedModules = mkIf cfg.hm [ ./hm.nix ]; # Configure keymap in X11 services.xserver = { diff --git a/nixos/pkgs/deemix-gui/default.nix b/nixos/pkgs/deemix-gui/default.nix deleted file mode 100644 index cb76d31..0000000 --- a/nixos/pkgs/deemix-gui/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron }: - -stdenv.mkDerivation rec { - pname = "deemix-gui"; - version = "2022-08-20"; - - src = fetchurl { - url = "https://download.deemix.app/gui/linux-x64-latest.AppImage"; - sha256 = "sha256-e2neemsAzGniBpXIPYbKk5LQHoYLvFj5/8QszCcoTYM="; - name = "${pname}-${version}.AppImage"; - }; - - appimageContents = appimageTools.extractType2 { - name = "${pname}-${version}"; - inherit src; - }; - - dontUnpack = true; - dontConfigure = true; - dontBuild = true; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin $out/share/${pname} $out/share/applications - - cp -a ${appimageContents}/{locales,resources} $out/share/${pname} - cp -a ${appimageContents}/usr/share/icons $out/share - - runHook postInstall - ''; - - postFixup = '' - makeWrapper ${electron}/bin/electron $out/bin/${pname} --add-flags $out/share/${pname}/resources/app.asar - ''; - - meta = { platforms = [ "x86_64-linux" ]; }; -} diff --git a/nixos/pkgs/default.nix b/nixos/pkgs/default.nix index 3a5edee..d87e564 100644 --- a/nixos/pkgs/default.nix +++ b/nixos/pkgs/default.nix @@ -3,8 +3,6 @@ final: prev: { v = { glitch-soc = prev.callPackage ./glitch-soc { }; - deemix-gui = prev.callPackage ./deemix-gui { }; - unbound = prev.unbound.override { withSystemd = true; withDoH = true;