From af66ff8692074871a8a3fc1ad0788196134bd960 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Thu, 9 Apr 2020 11:38:36 +0200 Subject: [PATCH] fix: move prog/git to projects --- configs/default.nix | 2 +- configs/git.nix | 2 +- configs/hledger.nix | 2 +- configs/packages/default.nix | 1 - configs/zsh.nix | 2 +- niveum-deploy | 2 +- niveum-status | 2 +- 7 files changed, 6 insertions(+), 7 deletions(-) diff --git a/configs/default.nix b/configs/default.nix index ccb5e71..4e813df 100644 --- a/configs/default.nix +++ b/configs/default.nix @@ -173,7 +173,7 @@ in environment.systemPackages = [ pkgs.pavucontrol pkgs.pamixer ]; } { - environment.interactiveShellInit = "export PATH=$PATH:$HOME/prog/git/niveum"; + environment.interactiveShellInit = "export PATH=$PATH:$HOME/projects/niveum"; environment.shellAliases = let wcd = pkgs.writers.writeDash "wcd" '' diff --git a/configs/git.nix b/configs/git.nix index 779f4ff..9d0de9f 100644 --- a/configs/git.nix +++ b/configs/git.nix @@ -25,7 +25,7 @@ DEFAULT = { git_gc = "git gc \"$@\""; }; - } // prependPath "prog/git" { + } // prependPath "projects" { "menstruation.rs" = github "kmein" "menstruation.rs"; brockman = github "kmein" "brockman"; challenges = github "kmein" "challenges"; diff --git a/configs/hledger.nix b/configs/hledger.nix index fde6d95..f9f0a34 100644 --- a/configs/hledger.nix +++ b/configs/hledger.nix @@ -4,7 +4,7 @@ niveum.hledger = { enable = true; - ledgerFile = "$HOME/prog/git/ledger/all.journal"; + ledgerFile = "$HOME/projects/ledger/all.journal"; server = { enable = false; user = config.users.users.me; diff --git a/configs/packages/default.nix b/configs/packages/default.nix index 51ea15b..59db60f 100644 --- a/configs/packages/default.nix +++ b/configs/packages/default.nix @@ -17,7 +17,6 @@ }; mahlzeit = pkgs.haskellPackages.callPackage package {}; in { - variables.RECIPE_HOME = "/home/kfm/prog/git/wissen/recipes"; systemPackages = [ mahlzeit ]; }; } diff --git a/configs/zsh.nix b/configs/zsh.nix index aa508f9..9fa40f3 100644 --- a/configs/zsh.nix +++ b/configs/zsh.nix @@ -45,7 +45,7 @@ export KEYTIMEOUT=1 - hash -d nixos=/etc/nixos niveum=${config.users.users.me.home}/prog/git/niveum + hash -d nixos=/etc/nixos niveum=${config.users.users.me.home}/projects/niveum autoload -U zmv run-help diff --git a/niveum-deploy b/niveum-deploy index a1810c7..2a4b833 100755 --- a/niveum-deploy +++ b/niveum-deploy @@ -1,5 +1,5 @@ #!/bin/sh -niveum_dir="$HOME/prog/git/niveum" +niveum_dir="$HOME/projects/niveum" [ $# -eq 1 ] || echo >&2 "Usage: niveum-deploy SYSTEM" diff --git a/niveum-status b/niveum-status index 1f5fc9a..87af4a8 100755 --- a/niveum-status +++ b/niveum-status @@ -1,6 +1,6 @@ #!/bin/sh version_file=/etc/niveum/version -niveum_dir="$HOME/prog/git/niveum" +niveum_dir="$HOME/projects/niveum" machine_status () { hostname="$1"