summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2022-06-20 10:27:25 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2022-06-20 10:27:25 +0200
commit7f3bbba059828a8cb7962177ed737f4db2eb7209 (patch)
tree34d14a118a00d15a4283824a8b8dc843af20becd
parent0e495ea05daee74d3f608eeeebcadcf139adf76c (diff)
downloadnixos-7f3bbba059828a8cb7962177ed737f4db2eb7209.tar
nixos-7f3bbba059828a8cb7962177ed737f4db2eb7209.tar.gz
nixos-7f3bbba059828a8cb7962177ed737f4db2eb7209.tar.bz2
nixos-7f3bbba059828a8cb7962177ed737f4db2eb7209.tar.xz
nixos-7f3bbba059828a8cb7962177ed737f4db2eb7209.zip
...
-rw-r--r--accounts/gkleen@sif/zshrc6
-rw-r--r--flake.nix4
-rw-r--r--overlays/spm/default.nix2
3 files changed, 9 insertions, 3 deletions
diff --git a/accounts/gkleen@sif/zshrc b/accounts/gkleen@sif/zshrc
index 712ec690..2d71f5a3 100644
--- a/accounts/gkleen@sif/zshrc
+++ b/accounts/gkleen@sif/zshrc
@@ -416,6 +416,12 @@ dichotomic_search() {
416 echo $min 416 echo $min
417} 417}
418 418
419while read -r -d $'\0' d _ s; do
420 hash -d ${s}=${d}
421done < <(find ~/projects ~/uni -regextype posix-extended -maxdepth 2 -type d -regex '\S+/[0-9]{2}[ws]/\S+' -print0 2>/dev/null | \
422 sed -zr 's|(.*/([0-9]{2}[ws])/(.+))|\1 \2 \3|' | \
423 sort -z -r -k2 | sort -z -s -k3 | uniq -z -f 2)
424
419alias '..'='cd ..' 425alias '..'='cd ..'
420alias -g L='| less' 426alias -g L='| less'
421alias -g S='&> /dev/null' 427alias -g S='&> /dev/null'
diff --git a/flake.nix b/flake.nix
index f173c560..da73fa6e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -148,8 +148,8 @@
148 forAllSystems = f: mapAttrs f (genAttrs systems nixpkgsPackages); 148 forAllSystems = f: mapAttrs f (genAttrs systems nixpkgsPackages);
149 forAllUsers = genAttrs (unique (map accountUserName (attrNames self.nixosModules.accounts))); 149 forAllUsers = genAttrs (unique (map accountUserName (attrNames self.nixosModules.accounts)));
150 150
151 activateNixosConfigurations = forAllSystems (system: _pkgs: mapAttrs' (hostName: nixosConfig: nameValuePair "${hostName}-activate" { type = "app"; program = "${nixosConfig.config.system.build.toplevel}/bin/switch-to-configuration"; }) self.nixosConfigurations); 151 activateNixosConfigurations = forAllSystems (system: _pkgs: filterAttrs (_n: v: v != null) (mapAttrs' (hostName: nixosConfig: nameValuePair "${hostName}-activate" (if system == nixosConfig.config.nixpkgs.system then { type = "app"; program = "${nixosConfig.config.system.build.toplevel}/bin/switch-to-configuration"; } else null)) self.nixosConfigurations));
152 activateHomeManagerConfigurations = forAllSystems (system: _pkgs: listToAttrs (concatLists (mapAttrsToList (hostName: nixosConfig: mapAttrsToList (userName: userCfg: nameValuePair "${userName}@${hostName}-activate" { type = "app"; program = "${userCfg.home.activationPackage}/activate"; }) nixosConfig.config.home-manager.users) self.nixosConfigurations))); 152 activateHomeManagerConfigurations = forAllSystems (system: _pkgs: filterAttrs (_n: v: v != null) (listToAttrs (concatLists (mapAttrsToList (hostName: nixosConfig: mapAttrsToList (userName: userCfg: nameValuePair "${userName}@${hostName}-activate" (if system == nixosConfig.config.nixpkgs.system then { type = "app"; program = "${userCfg.home.activationPackage}/activate"; } else null)) nixosConfig.config.home-manager.users) self.nixosConfigurations))));
153 153
154 overlayPaths = nixImport rec { dir = ./overlays; _import = (path: _name: dir + "/${path}"); }; 154 overlayPaths = nixImport rec { dir = ./overlays; _import = (path: _name: dir + "/${path}"); };
155 155
diff --git a/overlays/spm/default.nix b/overlays/spm/default.nix
index 6593fca8..5c820d9c 100644
--- a/overlays/spm/default.nix
+++ b/overlays/spm/default.nix
@@ -4,7 +4,7 @@ let
4 # defaultPackages = (import ./stackage.nix {}); 4 # defaultPackages = (import ./stackage.nix {});
5 # haskellPackages = defaultPackages // argumentPackages; 5 # haskellPackages = defaultPackages // argumentPackages;
6 # haskellPackages = argumentPackages; 6 # haskellPackages = argumentPackages;
7 haskellPackages = final.haskell.packages.ghc922.override { 7 haskellPackages = final.haskell.packages.ghc923.override {
8 overrides = self: super: { 8 overrides = self: super: {
9 warp-systemd = final.haskell.lib.doJailbreak (super.warp-systemd.overrideAttrs (oldAttrs: { meta = oldAttrs.meta // { broken = false; }; })); 9 warp-systemd = final.haskell.lib.doJailbreak (super.warp-systemd.overrideAttrs (oldAttrs: { meta = oldAttrs.meta // { broken = false; }; }));
10 servant-server = super.servant-server.overrideAttrs (oldAttrs: { 10 servant-server = super.servant-server.overrideAttrs (oldAttrs: {