diff options
Diffstat (limited to 'users/glittershark/system/home/modules')
9 files changed, 18 insertions, 22 deletions
diff --git a/users/glittershark/system/home/modules/alsi.nix b/users/glittershark/system/home/modules/alsi.nix index e42524bb8884..19ec68efd289 100644 --- a/users/glittershark/system/home/modules/alsi.nix +++ b/users/glittershark/system/home/modules/alsi.nix @@ -1,5 +1,5 @@ { config, lib, pkgs, ... }: -let alsi = pkgs.callPackage ~/code/system/pkgs/alsi {}; +let alsi = pkgs.callPackage ../../pkgs/alsi {}; in { home.packages = [ alsi ]; diff --git a/users/glittershark/system/home/modules/common.nix b/users/glittershark/system/home/modules/common.nix index ed7a729a7975..891e1c290e20 100644 --- a/users/glittershark/system/home/modules/common.nix +++ b/users/glittershark/system/home/modules/common.nix @@ -22,8 +22,6 @@ path = ".local/share/password-store"; }; - urbint.projectPath = "code/urb"; - home.packages = with pkgs; [ # System utilities bat diff --git a/users/glittershark/system/home/modules/development.nix b/users/glittershark/system/home/modules/development.nix index d786154f6d00..d60fb7be5d23 100644 --- a/users/glittershark/system/home/modules/development.nix +++ b/users/glittershark/system/home/modules/development.nix @@ -46,14 +46,14 @@ with lib; gnumake inetutils loc - (import <nixpkgs-unstable> {}).jsonnet + jsonnet clj2nix pg-dump-upsert - (import ../pkgs/clang-tools { inherit pkgs; }) - ] ++ optional (stdenv.isLinux) julia; + config.lib.depot.third_party.clang-tools + ]; # ++ optional (stdenv.isLinux) julia; programs.git = { enable = true; diff --git a/users/glittershark/system/home/modules/development/agda.nix b/users/glittershark/system/home/modules/development/agda.nix index 7a197e907f3c..bed05693aa40 100644 --- a/users/glittershark/system/home/modules/development/agda.nix +++ b/users/glittershark/system/home/modules/development/agda.nix @@ -1,10 +1,7 @@ { config, lib, pkgs, ... }: let - - nixpkgs-unstable = import <nixpkgs-unstable> {}; - - agda-categories = with nixpkgs-unstable.agdaPackages; mkDerivation rec { + agda-categories = with pkgs.agdaPackages; mkDerivation rec { pname = "agda-categories"; version = "2128fab"; src = pkgs.fetchFromGitHub { @@ -25,7 +22,7 @@ in ]; home.packages = with pkgs; [ - (nixpkgs-unstable.agda.withPackages + (pkgs.agda.withPackages (p: with p; [ p.standard-library diff --git a/users/glittershark/system/home/modules/development/kube.nix b/users/glittershark/system/home/modules/development/kube.nix index 346dd57dee7e..97ae4760d43b 100644 --- a/users/glittershark/system/home/modules/development/kube.nix +++ b/users/glittershark/system/home/modules/development/kube.nix @@ -1,13 +1,10 @@ { config, lib, pkgs, ... }: -let - pkgs-unstable = import <nixpkgs-unstable> {}; -in { home.packages = with pkgs; [ kubectl kubetail sops - pkgs-unstable.kubie + kubie # pkgs-unstable.argocd # provided by urbos ]; diff --git a/users/glittershark/system/home/modules/emacs.nix b/users/glittershark/system/home/modules/emacs.nix index f4322b61151c..935e7b7c3f33 100644 --- a/users/glittershark/system/home/modules/emacs.nix +++ b/users/glittershark/system/home/modules/emacs.nix @@ -10,12 +10,11 @@ let # # and packages.el files # }; - depot = config.lib.depot; + in { imports = [ ./lib/cloneRepo.nix - ./lib/depot.nix ]; # home.packages = [ doom-emacs ]; diff --git a/users/glittershark/system/home/modules/i3.nix b/users/glittershark/system/home/modules/i3.nix index 07f9fc08caa2..821c1e5d25aa 100644 --- a/users/glittershark/system/home/modules/i3.nix +++ b/users/glittershark/system/home/modules/i3.nix @@ -40,6 +40,7 @@ in { rofi-pass python38Packages.py3status i3lock + i3status dconf # for gtk # Screenshots diff --git a/users/glittershark/system/home/modules/lib/depot.nix b/users/glittershark/system/home/modules/lib/depot.nix deleted file mode 100644 index b0bc40acce95..000000000000 --- a/users/glittershark/system/home/modules/lib/depot.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - lib.depot = import ~/code/depot {}; -} diff --git a/users/glittershark/system/home/modules/urbint.nix b/users/glittershark/system/home/modules/urbint.nix new file mode 100644 index 000000000000..013735f0de74 --- /dev/null +++ b/users/glittershark/system/home/modules/urbint.nix @@ -0,0 +1,9 @@ +{ config, lib, pkgs, ... }: + +if lib.pathExists (~/code/urb/urbos) +then { + imports = + [ ~/code/urb/urbos/home ]; + + urbint.projectPath = "code/urb"; +} else {} |