From 5c33edb1a634e3571a66e853873153b2021a7b92 Mon Sep 17 00:00:00 2001 From: Brian Ketelsen Date: Fri, 15 Sep 2023 12:51:54 -0400 Subject: [PATCH] fix: clean up examples (#276) --- Justfile | 2 +- examples/default/.fleek.yml | 21 ++++++++++--------- examples/default/.gitignore | 1 - examples/default/README.md | 4 +--- examples/default/aliases.nix | 4 +--- .../{fleekdev => coder-bjk-fleek}/custom.nix | 0 .../coder-bjk-fleek}/ubuntu.nix | 8 +++---- examples/default/flake.nix | 9 +++----- examples/default/home.nix | 4 ++++ examples/default/shell.nix | 5 ++++- examples/high/.fleek.yml | 21 ++++++++++--------- examples/high/.gitignore | 1 - examples/high/README.md | 4 +--- examples/high/aliases.nix | 4 +--- .../{fleekdev => coder-bjk-fleek}/custom.nix | 0 .../coder-bjk-fleek}/ubuntu.nix | 8 +++---- examples/high/flake.nix | 9 +++----- examples/high/home.nix | 4 ++++ examples/high/programs.nix | 2 +- examples/high/shell.nix | 9 +++++--- examples/low/.fleek.yml | 21 ++++++++++--------- examples/low/.gitignore | 1 - examples/low/README.md | 4 +--- examples/low/aliases.nix | 4 +--- .../{fleekdev => coder-bjk-fleek}/custom.nix | 0 .../coder-bjk-fleek}/ubuntu.nix | 8 +++---- examples/low/flake.nix | 9 +++----- examples/low/home.nix | 3 +++ examples/low/shell.nix | 5 ++++- examples/none/.fleek.yml | 21 ++++++++++--------- examples/none/.gitignore | 1 - examples/none/README.md | 4 +--- examples/none/aliases.nix | 4 +--- .../{fleekdev => coder-bjk-fleek}/custom.nix | 0 .../coder-bjk-fleek}/ubuntu.nix | 8 +++---- examples/none/flake.nix | 9 +++----- examples/none/home.nix | 3 +++ examples/none/shell.nix | 5 ++++- 38 files changed, 114 insertions(+), 116 deletions(-) delete mode 100644 examples/default/.gitignore rename examples/default/{fleekdev => coder-bjk-fleek}/custom.nix (100%) rename examples/{low/fleekdev => default/coder-bjk-fleek}/ubuntu.nix (80%) delete mode 100644 examples/high/.gitignore rename examples/high/{fleekdev => coder-bjk-fleek}/custom.nix (100%) rename examples/{default/fleekdev => high/coder-bjk-fleek}/ubuntu.nix (80%) delete mode 100644 examples/low/.gitignore rename examples/low/{fleekdev => coder-bjk-fleek}/custom.nix (100%) rename examples/{none/fleekdev => low/coder-bjk-fleek}/ubuntu.nix (80%) delete mode 100644 examples/none/.gitignore rename examples/none/{fleekdev => coder-bjk-fleek}/custom.nix (100%) rename examples/{high/fleekdev => none/coder-bjk-fleek}/ubuntu.nix (80%) diff --git a/Justfile b/Justfile index 2b9ee0f0..2391a156 100644 --- a/Justfile +++ b/Justfile @@ -8,7 +8,7 @@ example NAME: [ -e "./fleek" ] || just build @rm -rf examples/{{NAME}} @mkdir -p examples/{{NAME}} - @./fleek generate --level {{NAME}} -l projects/ublue/fleek/examples/{{NAME}} + @./fleek generate --level {{NAME}} -l workspace/fleek/examples/{{NAME}} default-env: cp .env.template .env diff --git a/examples/default/.fleek.yml b/examples/default/.fleek.yml index 6ae00beb..b9dcf192 100644 --- a/examples/default/.fleek.yml +++ b/examples/default/.fleek.yml @@ -1,12 +1,12 @@ aliases: - apply-fleekdev: nix run --impure home-manager/master -- -b bak switch --flake .#ubuntu@fleekdev - fleeks: cd ~/projects/ublue/fleek/examples/default + apply-coder-bjk-fleek: nix run --impure home-manager/master -- -b bak switch --flake .#ubuntu@coder-bjk-fleek + fleeks: cd ~/workspace/fleek/examples/default +allow_broken: false bling: default -blocklist: - - vscode +blocklist: [] byo_git: false ejected: true -flakedir: projects/ublue/fleek/examples/default +flakedir: workspace/fleek/examples/default git: autocommit: false autopull: false @@ -25,14 +25,15 @@ programs: shell: zsh systems: - arch: x86_64 - hostname: fleekdev + home: "" + hostname: coder-bjk-fleek os: linux username: ubuntu track: nixos-unstable unfree: true users: - - email: bketelsen@gmail.com - name: Brian Ketelsen - ssh_private_key_file: ~/.ssh/id_rsa - ssh_public_key_file: ~/.ssh/id_rsa.pub + - email: fleek@fleek.dev + name: Ubuntu + ssh_private_key_file: "" + ssh_public_key_file: "" username: ubuntu diff --git a/examples/default/.gitignore b/examples/default/.gitignore deleted file mode 100644 index e2f5dd2e..00000000 --- a/examples/default/.gitignore +++ /dev/null @@ -1 +0,0 @@ -result \ No newline at end of file diff --git a/examples/default/README.md b/examples/default/README.md index eec0b191..4d28acb1 100644 --- a/examples/default/README.md +++ b/examples/default/README.md @@ -19,6 +19,4 @@ $ apply-$(hostname) ``` Your actual aliases are listed below: - apply-fleekdev = "nix run --impure home-manager/master -- -b bak switch --flake .#ubuntu@fleekdev"; - - fleeks = "cd ~/projects/ublue/fleek/examples/default"; + fleeks = "cd ~/workspace/fleek/examples/default"; diff --git a/examples/default/aliases.nix b/examples/default/aliases.nix index 7831c5bd..05d3ddcc 100644 --- a/examples/default/aliases.nix +++ b/examples/default/aliases.nix @@ -1,8 +1,6 @@ { pkgs, misc, ... }: { # DO NOT EDIT: This file is managed by fleek. Manual changes will be overwritten. home.shellAliases = { - "apply-fleekdev" = "nix run --impure home-manager/master -- -b bak switch --flake .#ubuntu@fleekdev"; - - "fleeks" = "cd ~/projects/ublue/fleek/examples/default"; + "fleeks" = "cd ~/workspace/fleek/examples/default"; }; } diff --git a/examples/default/fleekdev/custom.nix b/examples/default/coder-bjk-fleek/custom.nix similarity index 100% rename from examples/default/fleekdev/custom.nix rename to examples/default/coder-bjk-fleek/custom.nix diff --git a/examples/low/fleekdev/ubuntu.nix b/examples/default/coder-bjk-fleek/ubuntu.nix similarity index 80% rename from examples/low/fleekdev/ubuntu.nix rename to examples/default/coder-bjk-fleek/ubuntu.nix index 42e3122e..a074a29f 100644 --- a/examples/low/fleekdev/ubuntu.nix +++ b/examples/default/coder-bjk-fleek/ubuntu.nix @@ -9,8 +9,8 @@ graph = "log --decorate --oneline --graph"; add-nowhitespace = "!git diff -U0 -w --no-color | git apply --cached --ignore-whitespace --unidiff-zero -"; }; - userName = "Brian Ketelsen"; - userEmail = "bketelsen@gmail.com"; + userName = "Ubuntu"; + userEmail = "fleek@fleek.dev"; extraConfig = { feature.manyFiles = true; init.defaultBranch = "main"; @@ -18,8 +18,8 @@ }; signing = { - key = "~/.ssh/id_rsa"; - signByDefault = builtins.stringLength "~/.ssh/id_rsa" > 0; + key = ""; + signByDefault = builtins.stringLength "" > 0; }; lfs.enable = true; diff --git a/examples/default/flake.nix b/examples/default/flake.nix index a04f5551..e160348e 100644 --- a/examples/default/flake.nix +++ b/examples/default/flake.nix @@ -24,7 +24,7 @@ homeConfigurations = { - "ubuntu@fleekdev" = home-manager.lib.homeManagerConfiguration { + "ubuntu@coder-bjk-fleek" = home-manager.lib.homeManagerConfiguration { pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance extraSpecialArgs = { inherit inputs; }; # Pass flake inputs to our config modules = [ @@ -35,14 +35,11 @@ ./aliases.nix ./programs.nix # Host Specific configs - ./fleekdev/ubuntu.nix - ./fleekdev/host.nix + ./coder-bjk-fleek/ubuntu.nix + ./coder-bjk-fleek/custom.nix # self-manage fleek ({ nixpkgs.overlays = []; - home.packages = [ - fleek.packages.x86_64-linux.default - ]; }) ]; diff --git a/examples/default/home.nix b/examples/default/home.nix index 67924b7e..51c14240 100644 --- a/examples/default/home.nix +++ b/examples/default/home.nix @@ -9,10 +9,13 @@ # Workaround for https://github.com/nix-community/home-manager/issues/2942 allowUnfreePredicate = (_: true); + }; }; + # managed by fleek, modify ~/.fleek.yml to change installed packages + # packages are just installed (no configuration applied) # programs are installed and configuration applied to dotfiles home.packages = [ @@ -25,6 +28,7 @@ pkgs.glab pkgs.fzf pkgs.ripgrep + pkgs.vscode (pkgs.nerdfonts.override { fonts = [ "FiraCode" ]; }) ]; fonts.fontconfig.enable = true; diff --git a/examples/default/shell.nix b/examples/default/shell.nix index 3892e2f5..b5c0c0a5 100644 --- a/examples/default/shell.nix +++ b/examples/default/shell.nix @@ -1,6 +1,9 @@ { pkgs, misc, ... }: { # DO NOT EDIT: This file is managed by fleek. Manual changes will be overwritten.# zsh - programs.zsh.profileExtra = "[ -r ~/.nix-profile/etc/profile.d/nix.sh ] && source ~/.nix-profile/etc/profile.d/nix.sh"; + programs.zsh.profileExtra = '' + [ -r ~/.nix-profile/etc/profile.d/nix.sh ] && source ~/.nix-profile/etc/profile.d/nix.sh + export XCURSOR_PATH=$XCURSOR_PATH:/usr/share/icons:~/.local/share/icons:~/.icons:~/.nix-profile/share/icons + ''; programs.zsh.enableCompletion = true; programs.zsh.enable = true; } diff --git a/examples/high/.fleek.yml b/examples/high/.fleek.yml index 1b4e806f..f5c05484 100644 --- a/examples/high/.fleek.yml +++ b/examples/high/.fleek.yml @@ -1,12 +1,12 @@ aliases: - apply-fleekdev: nix run --impure home-manager/master -- -b bak switch --flake .#ubuntu@fleekdev - fleeks: cd ~/projects/ublue/fleek/examples/high + apply-coder-bjk-fleek: nix run --impure home-manager/master -- -b bak switch --flake .#ubuntu@coder-bjk-fleek + fleeks: cd ~/workspace/fleek/examples/high +allow_broken: false bling: high -blocklist: - - vscode +blocklist: [] byo_git: false ejected: true -flakedir: projects/ublue/fleek/examples/high +flakedir: workspace/fleek/examples/high git: autocommit: false autopull: false @@ -25,14 +25,15 @@ programs: shell: zsh systems: - arch: x86_64 - hostname: fleekdev + home: "" + hostname: coder-bjk-fleek os: linux username: ubuntu track: nixos-unstable unfree: true users: - - email: bketelsen@gmail.com - name: Brian Ketelsen - ssh_private_key_file: ~/.ssh/id_rsa - ssh_public_key_file: ~/.ssh/id_rsa.pub + - email: fleek@fleek.dev + name: Ubuntu + ssh_private_key_file: "" + ssh_public_key_file: "" username: ubuntu diff --git a/examples/high/.gitignore b/examples/high/.gitignore deleted file mode 100644 index e2f5dd2e..00000000 --- a/examples/high/.gitignore +++ /dev/null @@ -1 +0,0 @@ -result \ No newline at end of file diff --git a/examples/high/README.md b/examples/high/README.md index 5245261b..5528d636 100644 --- a/examples/high/README.md +++ b/examples/high/README.md @@ -19,6 +19,4 @@ $ apply-$(hostname) ``` Your actual aliases are listed below: - apply-fleekdev = "nix run --impure home-manager/master -- -b bak switch --flake .#ubuntu@fleekdev"; - - fleeks = "cd ~/projects/ublue/fleek/examples/high"; + fleeks = "cd ~/workspace/fleek/examples/high"; diff --git a/examples/high/aliases.nix b/examples/high/aliases.nix index e820c137..9252a400 100644 --- a/examples/high/aliases.nix +++ b/examples/high/aliases.nix @@ -1,9 +1,7 @@ { pkgs, misc, ... }: { # DO NOT EDIT: This file is managed by fleek. Manual changes will be overwritten. home.shellAliases = { - "apply-fleekdev" = "nix run --impure home-manager/master -- -b bak switch --flake .#ubuntu@fleekdev"; - - "fleeks" = "cd ~/projects/ublue/fleek/examples/high"; + "fleeks" = "cd ~/workspace/fleek/examples/high"; # bat --plain for unformatted cat catp = "bat -P"; diff --git a/examples/high/fleekdev/custom.nix b/examples/high/coder-bjk-fleek/custom.nix similarity index 100% rename from examples/high/fleekdev/custom.nix rename to examples/high/coder-bjk-fleek/custom.nix diff --git a/examples/default/fleekdev/ubuntu.nix b/examples/high/coder-bjk-fleek/ubuntu.nix similarity index 80% rename from examples/default/fleekdev/ubuntu.nix rename to examples/high/coder-bjk-fleek/ubuntu.nix index 42e3122e..a074a29f 100644 --- a/examples/default/fleekdev/ubuntu.nix +++ b/examples/high/coder-bjk-fleek/ubuntu.nix @@ -9,8 +9,8 @@ graph = "log --decorate --oneline --graph"; add-nowhitespace = "!git diff -U0 -w --no-color | git apply --cached --ignore-whitespace --unidiff-zero -"; }; - userName = "Brian Ketelsen"; - userEmail = "bketelsen@gmail.com"; + userName = "Ubuntu"; + userEmail = "fleek@fleek.dev"; extraConfig = { feature.manyFiles = true; init.defaultBranch = "main"; @@ -18,8 +18,8 @@ }; signing = { - key = "~/.ssh/id_rsa"; - signByDefault = builtins.stringLength "~/.ssh/id_rsa" > 0; + key = ""; + signByDefault = builtins.stringLength "" > 0; }; lfs.enable = true; diff --git a/examples/high/flake.nix b/examples/high/flake.nix index a04f5551..e160348e 100644 --- a/examples/high/flake.nix +++ b/examples/high/flake.nix @@ -24,7 +24,7 @@ homeConfigurations = { - "ubuntu@fleekdev" = home-manager.lib.homeManagerConfiguration { + "ubuntu@coder-bjk-fleek" = home-manager.lib.homeManagerConfiguration { pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance extraSpecialArgs = { inherit inputs; }; # Pass flake inputs to our config modules = [ @@ -35,14 +35,11 @@ ./aliases.nix ./programs.nix # Host Specific configs - ./fleekdev/ubuntu.nix - ./fleekdev/host.nix + ./coder-bjk-fleek/ubuntu.nix + ./coder-bjk-fleek/custom.nix # self-manage fleek ({ nixpkgs.overlays = []; - home.packages = [ - fleek.packages.x86_64-linux.default - ]; }) ]; diff --git a/examples/high/home.nix b/examples/high/home.nix index d118bf3c..83a84083 100644 --- a/examples/high/home.nix +++ b/examples/high/home.nix @@ -9,10 +9,13 @@ # Workaround for https://github.com/nix-community/home-manager/issues/2942 allowUnfreePredicate = (_: true); + }; }; + # managed by fleek, modify ~/.fleek.yml to change installed packages + # packages are just installed (no configuration applied) # programs are installed and configuration applied to dotfiles home.packages = [ @@ -25,6 +28,7 @@ pkgs.glab pkgs.fzf pkgs.ripgrep + pkgs.vscode pkgs.lazygit pkgs.jq pkgs.yq diff --git a/examples/high/programs.nix b/examples/high/programs.nix index 76efa2ba..507a0958 100644 --- a/examples/high/programs.nix +++ b/examples/high/programs.nix @@ -5,7 +5,7 @@ # add your personalized program configuration in ./user.nix # Bling supplied programs - programs.exa.enable = true; + programs.eza.enable = true; programs.bat.enable = true; programs.atuin.enable = true; programs.zoxide.enable = true; diff --git a/examples/high/shell.nix b/examples/high/shell.nix index af393a22..e0506f00 100644 --- a/examples/high/shell.nix +++ b/examples/high/shell.nix @@ -1,8 +1,8 @@ { pkgs, misc, ... }: { # DO NOT EDIT: This file is managed by fleek. Manual changes will be overwritten. - programs.exa.enableAliases = true; + programs.eza.enableAliases = true; - programs.exa.extraOptions = [ + programs.eza.extraOptions = [ "--group-directories-first" "--header" ]; @@ -11,7 +11,10 @@ theme = "TwoDark"; }; # zsh - programs.zsh.profileExtra = "[ -r ~/.nix-profile/etc/profile.d/nix.sh ] && source ~/.nix-profile/etc/profile.d/nix.sh"; + programs.zsh.profileExtra = '' + [ -r ~/.nix-profile/etc/profile.d/nix.sh ] && source ~/.nix-profile/etc/profile.d/nix.sh + export XCURSOR_PATH=$XCURSOR_PATH:/usr/share/icons:~/.local/share/icons:~/.icons:~/.nix-profile/share/icons + ''; programs.zsh.enableCompletion = true; programs.zsh.enable = true; } diff --git a/examples/low/.fleek.yml b/examples/low/.fleek.yml index 686ed6ed..8e52df49 100644 --- a/examples/low/.fleek.yml +++ b/examples/low/.fleek.yml @@ -1,12 +1,12 @@ aliases: - apply-fleekdev: nix run --impure home-manager/master -- -b bak switch --flake .#ubuntu@fleekdev - fleeks: cd ~/projects/ublue/fleek/examples/low + apply-coder-bjk-fleek: nix run --impure home-manager/master -- -b bak switch --flake .#ubuntu@coder-bjk-fleek + fleeks: cd ~/workspace/fleek/examples/low +allow_broken: false bling: low -blocklist: - - vscode +blocklist: [] byo_git: false ejected: true -flakedir: projects/ublue/fleek/examples/low +flakedir: workspace/fleek/examples/low git: autocommit: false autopull: false @@ -25,14 +25,15 @@ programs: shell: zsh systems: - arch: x86_64 - hostname: fleekdev + home: "" + hostname: coder-bjk-fleek os: linux username: ubuntu track: nixos-unstable unfree: true users: - - email: bketelsen@gmail.com - name: Brian Ketelsen - ssh_private_key_file: ~/.ssh/id_rsa - ssh_public_key_file: ~/.ssh/id_rsa.pub + - email: fleek@fleek.dev + name: Ubuntu + ssh_private_key_file: "" + ssh_public_key_file: "" username: ubuntu diff --git a/examples/low/.gitignore b/examples/low/.gitignore deleted file mode 100644 index e2f5dd2e..00000000 --- a/examples/low/.gitignore +++ /dev/null @@ -1 +0,0 @@ -result \ No newline at end of file diff --git a/examples/low/README.md b/examples/low/README.md index 9c7f297f..54670874 100644 --- a/examples/low/README.md +++ b/examples/low/README.md @@ -19,6 +19,4 @@ $ apply-$(hostname) ``` Your actual aliases are listed below: - apply-fleekdev = "nix run --impure home-manager/master -- -b bak switch --flake .#ubuntu@fleekdev"; - - fleeks = "cd ~/projects/ublue/fleek/examples/low"; + fleeks = "cd ~/workspace/fleek/examples/low"; diff --git a/examples/low/aliases.nix b/examples/low/aliases.nix index ff523b53..bd109db9 100644 --- a/examples/low/aliases.nix +++ b/examples/low/aliases.nix @@ -1,8 +1,6 @@ { pkgs, misc, ... }: { # DO NOT EDIT: This file is managed by fleek. Manual changes will be overwritten. home.shellAliases = { - "apply-fleekdev" = "nix run --impure home-manager/master -- -b bak switch --flake .#ubuntu@fleekdev"; - - "fleeks" = "cd ~/projects/ublue/fleek/examples/low"; + "fleeks" = "cd ~/workspace/fleek/examples/low"; }; } diff --git a/examples/low/fleekdev/custom.nix b/examples/low/coder-bjk-fleek/custom.nix similarity index 100% rename from examples/low/fleekdev/custom.nix rename to examples/low/coder-bjk-fleek/custom.nix diff --git a/examples/none/fleekdev/ubuntu.nix b/examples/low/coder-bjk-fleek/ubuntu.nix similarity index 80% rename from examples/none/fleekdev/ubuntu.nix rename to examples/low/coder-bjk-fleek/ubuntu.nix index 42e3122e..a074a29f 100644 --- a/examples/none/fleekdev/ubuntu.nix +++ b/examples/low/coder-bjk-fleek/ubuntu.nix @@ -9,8 +9,8 @@ graph = "log --decorate --oneline --graph"; add-nowhitespace = "!git diff -U0 -w --no-color | git apply --cached --ignore-whitespace --unidiff-zero -"; }; - userName = "Brian Ketelsen"; - userEmail = "bketelsen@gmail.com"; + userName = "Ubuntu"; + userEmail = "fleek@fleek.dev"; extraConfig = { feature.manyFiles = true; init.defaultBranch = "main"; @@ -18,8 +18,8 @@ }; signing = { - key = "~/.ssh/id_rsa"; - signByDefault = builtins.stringLength "~/.ssh/id_rsa" > 0; + key = ""; + signByDefault = builtins.stringLength "" > 0; }; lfs.enable = true; diff --git a/examples/low/flake.nix b/examples/low/flake.nix index a04f5551..e160348e 100644 --- a/examples/low/flake.nix +++ b/examples/low/flake.nix @@ -24,7 +24,7 @@ homeConfigurations = { - "ubuntu@fleekdev" = home-manager.lib.homeManagerConfiguration { + "ubuntu@coder-bjk-fleek" = home-manager.lib.homeManagerConfiguration { pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance extraSpecialArgs = { inherit inputs; }; # Pass flake inputs to our config modules = [ @@ -35,14 +35,11 @@ ./aliases.nix ./programs.nix # Host Specific configs - ./fleekdev/ubuntu.nix - ./fleekdev/host.nix + ./coder-bjk-fleek/ubuntu.nix + ./coder-bjk-fleek/custom.nix # self-manage fleek ({ nixpkgs.overlays = []; - home.packages = [ - fleek.packages.x86_64-linux.default - ]; }) ]; diff --git a/examples/low/home.nix b/examples/low/home.nix index da0ff021..4eda47cf 100644 --- a/examples/low/home.nix +++ b/examples/low/home.nix @@ -9,10 +9,13 @@ # Workaround for https://github.com/nix-community/home-manager/issues/2942 allowUnfreePredicate = (_: true); + }; }; + # managed by fleek, modify ~/.fleek.yml to change installed packages + # packages are just installed (no configuration applied) # programs are installed and configuration applied to dotfiles home.packages = [ diff --git a/examples/low/shell.nix b/examples/low/shell.nix index 3892e2f5..b5c0c0a5 100644 --- a/examples/low/shell.nix +++ b/examples/low/shell.nix @@ -1,6 +1,9 @@ { pkgs, misc, ... }: { # DO NOT EDIT: This file is managed by fleek. Manual changes will be overwritten.# zsh - programs.zsh.profileExtra = "[ -r ~/.nix-profile/etc/profile.d/nix.sh ] && source ~/.nix-profile/etc/profile.d/nix.sh"; + programs.zsh.profileExtra = '' + [ -r ~/.nix-profile/etc/profile.d/nix.sh ] && source ~/.nix-profile/etc/profile.d/nix.sh + export XCURSOR_PATH=$XCURSOR_PATH:/usr/share/icons:~/.local/share/icons:~/.icons:~/.nix-profile/share/icons + ''; programs.zsh.enableCompletion = true; programs.zsh.enable = true; } diff --git a/examples/none/.fleek.yml b/examples/none/.fleek.yml index 0f7f585a..055de6cf 100644 --- a/examples/none/.fleek.yml +++ b/examples/none/.fleek.yml @@ -1,12 +1,12 @@ aliases: - apply-fleekdev: nix run --impure home-manager/master -- -b bak switch --flake .#ubuntu@fleekdev - fleeks: cd ~/projects/ublue/fleek/examples/none + apply-coder-bjk-fleek: nix run --impure home-manager/master -- -b bak switch --flake .#ubuntu@coder-bjk-fleek + fleeks: cd ~/workspace/fleek/examples/none +allow_broken: false bling: none -blocklist: - - vscode +blocklist: [] byo_git: false ejected: true -flakedir: projects/ublue/fleek/examples/none +flakedir: workspace/fleek/examples/none git: autocommit: false autopull: false @@ -25,14 +25,15 @@ programs: shell: zsh systems: - arch: x86_64 - hostname: fleekdev + home: "" + hostname: coder-bjk-fleek os: linux username: ubuntu track: nixos-unstable unfree: true users: - - email: bketelsen@gmail.com - name: Brian Ketelsen - ssh_private_key_file: ~/.ssh/id_rsa - ssh_public_key_file: ~/.ssh/id_rsa.pub + - email: fleek@fleek.dev + name: Ubuntu + ssh_private_key_file: "" + ssh_public_key_file: "" username: ubuntu diff --git a/examples/none/.gitignore b/examples/none/.gitignore deleted file mode 100644 index e2f5dd2e..00000000 --- a/examples/none/.gitignore +++ /dev/null @@ -1 +0,0 @@ -result \ No newline at end of file diff --git a/examples/none/README.md b/examples/none/README.md index 28907cf2..639e5f2e 100644 --- a/examples/none/README.md +++ b/examples/none/README.md @@ -19,6 +19,4 @@ $ apply-$(hostname) ``` Your actual aliases are listed below: - apply-fleekdev = "nix run --impure home-manager/master -- -b bak switch --flake .#ubuntu@fleekdev"; - - fleeks = "cd ~/projects/ublue/fleek/examples/none"; + fleeks = "cd ~/workspace/fleek/examples/none"; diff --git a/examples/none/aliases.nix b/examples/none/aliases.nix index 553c3569..8b7c4725 100644 --- a/examples/none/aliases.nix +++ b/examples/none/aliases.nix @@ -1,8 +1,6 @@ { pkgs, misc, ... }: { # DO NOT EDIT: This file is managed by fleek. Manual changes will be overwritten. home.shellAliases = { - "apply-fleekdev" = "nix run --impure home-manager/master -- -b bak switch --flake .#ubuntu@fleekdev"; - - "fleeks" = "cd ~/projects/ublue/fleek/examples/none"; + "fleeks" = "cd ~/workspace/fleek/examples/none"; }; } diff --git a/examples/none/fleekdev/custom.nix b/examples/none/coder-bjk-fleek/custom.nix similarity index 100% rename from examples/none/fleekdev/custom.nix rename to examples/none/coder-bjk-fleek/custom.nix diff --git a/examples/high/fleekdev/ubuntu.nix b/examples/none/coder-bjk-fleek/ubuntu.nix similarity index 80% rename from examples/high/fleekdev/ubuntu.nix rename to examples/none/coder-bjk-fleek/ubuntu.nix index 42e3122e..a074a29f 100644 --- a/examples/high/fleekdev/ubuntu.nix +++ b/examples/none/coder-bjk-fleek/ubuntu.nix @@ -9,8 +9,8 @@ graph = "log --decorate --oneline --graph"; add-nowhitespace = "!git diff -U0 -w --no-color | git apply --cached --ignore-whitespace --unidiff-zero -"; }; - userName = "Brian Ketelsen"; - userEmail = "bketelsen@gmail.com"; + userName = "Ubuntu"; + userEmail = "fleek@fleek.dev"; extraConfig = { feature.manyFiles = true; init.defaultBranch = "main"; @@ -18,8 +18,8 @@ }; signing = { - key = "~/.ssh/id_rsa"; - signByDefault = builtins.stringLength "~/.ssh/id_rsa" > 0; + key = ""; + signByDefault = builtins.stringLength "" > 0; }; lfs.enable = true; diff --git a/examples/none/flake.nix b/examples/none/flake.nix index a04f5551..e160348e 100644 --- a/examples/none/flake.nix +++ b/examples/none/flake.nix @@ -24,7 +24,7 @@ homeConfigurations = { - "ubuntu@fleekdev" = home-manager.lib.homeManagerConfiguration { + "ubuntu@coder-bjk-fleek" = home-manager.lib.homeManagerConfiguration { pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance extraSpecialArgs = { inherit inputs; }; # Pass flake inputs to our config modules = [ @@ -35,14 +35,11 @@ ./aliases.nix ./programs.nix # Host Specific configs - ./fleekdev/ubuntu.nix - ./fleekdev/host.nix + ./coder-bjk-fleek/ubuntu.nix + ./coder-bjk-fleek/custom.nix # self-manage fleek ({ nixpkgs.overlays = []; - home.packages = [ - fleek.packages.x86_64-linux.default - ]; }) ]; diff --git a/examples/none/home.nix b/examples/none/home.nix index 0c643329..d640bf4c 100644 --- a/examples/none/home.nix +++ b/examples/none/home.nix @@ -9,10 +9,13 @@ # Workaround for https://github.com/nix-community/home-manager/issues/2942 allowUnfreePredicate = (_: true); + }; }; + # managed by fleek, modify ~/.fleek.yml to change installed packages + # packages are just installed (no configuration applied) # programs are installed and configuration applied to dotfiles home.packages = [ diff --git a/examples/none/shell.nix b/examples/none/shell.nix index 3892e2f5..b5c0c0a5 100644 --- a/examples/none/shell.nix +++ b/examples/none/shell.nix @@ -1,6 +1,9 @@ { pkgs, misc, ... }: { # DO NOT EDIT: This file is managed by fleek. Manual changes will be overwritten.# zsh - programs.zsh.profileExtra = "[ -r ~/.nix-profile/etc/profile.d/nix.sh ] && source ~/.nix-profile/etc/profile.d/nix.sh"; + programs.zsh.profileExtra = '' + [ -r ~/.nix-profile/etc/profile.d/nix.sh ] && source ~/.nix-profile/etc/profile.d/nix.sh + export XCURSOR_PATH=$XCURSOR_PATH:/usr/share/icons:~/.local/share/icons:~/.icons:~/.nix-profile/share/icons + ''; programs.zsh.enableCompletion = true; programs.zsh.enable = true; }