Compare commits

..

No commits in common. "6443c085d464cd95bef1a7eaf9abf9b59512bed3" and "a45e263617d76e60a289e3a0709d640a217b8844" have entirely different histories.

21 changed files with 148 additions and 24 deletions

View file

@ -45,6 +45,9 @@
src = ./.; # "src" must point to the root of the flake.
snowfall = {
# "root" can be used, to tell Snowfall Lib where to look for Nix files.
# root = ./nix;
# Namespace for this flake's packages, library and overlays.
namespace = "puzzlevision";
@ -55,7 +58,7 @@
};
channels-config = {
allowUnfree = true;
allowUnfree = true; # Allow unfree packages.
};
# Apply some NixOS modules globally.

View file

@ -1,6 +1,7 @@
{
lib,
pkgs,
inputs,
namespace,
...
}: with lib; with lib.${namespace};

View file

@ -1,5 +1,8 @@
{
lib,
pkgs,
inputs,
config,
...
}: {
home.packages = with pkgs.gnomeExtensions; [

View file

@ -1,12 +1,15 @@
{
lib,
pkgs,
inputs,
config,
...
}: {
programs.vscode = {
enable = true;
package = pkgs.vscodium;
extensions = with pkgs.vscode-extensions; [
# wakatime.vscode-wakatime # Wakatime for coding statistics
wakatime.vscode-wakatime # Wakatime for coding statistics
vue.volar # Vue support
svelte.svelte-vscode # Svelte support
pkief.material-icon-theme # Material icons
@ -17,10 +20,5 @@
catppuccin.catppuccin-vsc # Catppuccin theme
jnoortheen.nix-ide # Nix language support
];
userSettings = {
"nix.enableLanguageServer" = true;
"nix.serverPath" = "nil";
"workbench.colorTheme" = "Catppuccin Macchiato";
};
};
}

View file

@ -1,7 +1,22 @@
{
# Snowfall Lib provides a customized `lib` instance with access to your flake's library
# as well as the libraries available from your flake's inputs.
lib,
# Instance of `pkgs` with overlays and custom packages applied.
pkgs,
namespace,
# All flake inputs.
inputs,
# Additional metadata, provided by Snowfall Lib.
namespace, # The flake namespace, set in flake.nix. If not set, defaults to "internal".
home, # The home architecture for this host (eg. `x86_64-linux`).
target, # The Snowfall Lib target for this home (eg. `x86_64-home`).
format, # A normalized name for the home target (eg. `home`).
virtual, # A boolean to determine whether this home is a virtual target using nixos-generators.
host, # The host name for this home.
# All other arguments come from the home home.
config,
...
}: with lib; with lib.${namespace};
{
@ -42,8 +57,6 @@
bun
devenv
python39
nil
zed-editor
### Rust development specific
rustup
@ -60,5 +73,7 @@
sidequest
];
#puzzlevision.apps.zed-editor.enable = true;
home.stateVersion = "24.05";
}

View file

@ -0,0 +1,26 @@
{
lib,
pkgs,
inputs,
namespace,
config,
...
}: with lib; with lib.${namespace};
let
cfg = config.apps.zed-editor;
zed-fhs = pkgs.buildFHSUserEnv {
name = "zed";
targetPkgs = pkgs:
with pkgs; [
zed-editor
];
runScript = "zed";
};
in {
options.apps.zed-editor = { enable = mkEnableOption "zed-editor"; };
config = mkIf cfg.enable {
home.packages = [zed-fhs];
};
}

View file

@ -1,8 +1,41 @@
{
lib,
pkgs,
inputs,
namespace,
config,
...
}: {
}: let
sshDir = "${config.home.homeDirectory}/.ssh";
in {
home.packages = with pkgs; [
openssh
];
programs.ssh = {
enable = true;
extraConfig = ''
AddKeysToAgent yes
'';
matchBlocks = {
"github.com" = {
identityFile = "${sshDir}/id_ed25519";
identitiesOnly = true;
user = "git";
};
"gitlab.com" = {
identityFile = "${sshDir}/id_ed25519";
identitiesOnly = true;
user = "git";
};
"bitbucket.org" = {
identityFile = "${sshDir}/id_ed25519";
identitiesOnly = true;
user = "git";
};
};
};
}

View file

@ -156,8 +156,8 @@ in
};
"org/gnome/desktop/background" = {
picture-uri = lib.snowfall.fs.get-file "resources/wallpapers/catppuccin_blue_cat.png";
picture-uri-dark = lib.snowfall.fs.get-file "resources/wallpapers/catppuccin_blue_cat.png";
picture-uri = lib.snowfall.fs.get-file "resources/wallpapers/blossoms.png";
picture-uri-dark = lib.snowfall.fs.get-file "resources/wallpapers/blossoms.png";
};
"org/gnome/desktop/interface" = {

View file

@ -1,5 +1,6 @@
{
lib,
pkgs,
namespace,
config,
...

View file

@ -1,5 +1,6 @@
{
lib,
pkgs,
namespace,
config,
...

View file

@ -1,5 +1,6 @@
{
lib,
inputs,
namespace,
config,
...

View file

@ -3,6 +3,7 @@
pkgs,
namespace,
config,
options,
...
}: with lib; with lib.${namespace};
let

View file

@ -1,6 +1,15 @@
{
lib,
namespace,
pkgs,
inputs,
namespace, # The flake namespace, set in flake.nix. If not set, defaults to "internal".
system, # The system architecture for this host (eg. `x86_64-linux`).
target, # The Snowfall Lib target for this system (eg. `x86_64-iso`).
format, # A normalized name for the system target (eg. `iso`).
virtual, # A boolean to determine whether this system is a virtual target using nixos-generators.
systems, # An attribute map of your defined hosts.
config,
...
}: with lib; with lib.${namespace};

View file

@ -1,5 +1,6 @@
{
lib,
inputs,
namespace,
config,
...

View file

@ -1,5 +1,6 @@
{
lib,
inputs,
namespace,
config,
...

View file

@ -1,6 +1,14 @@
{
lib,
namespace,
pkgs,
inputs,
namespace, # The flake namespace, set in flake.nix. If not set, defaults to "internal".
system, # The system architecture for this host (eg. `x86_64-linux`).
target, # The Snowfall Lib target for this system (eg. `x86_64-iso`).
format, # A normalized name for the system target (eg. `iso`).
virtual, # A boolean to determine whether this system is a virtual target using nixos-generators.
systems, # An attribute map of your defined hosts.
config,
...

View file

@ -1,6 +1,7 @@
{
lib,
pkgs,
inputs,
namespace,
config,
...
@ -31,11 +32,6 @@ in {
options = "--delete-older-than 3d";
};
extraOptions = ''
extra-substituters = https://devenv.cachix.org
extra-trusted-public-keys = devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw=
'';
package = mkIf cfg.use-lix pkgs.lix; # Enable LIX
};
};

View file

@ -1,8 +1,16 @@
{
lib,
namespace,
config,
pkgs,
inputs,
namespace, # The flake namespace, set in flake.nix. If not set, defaults to "internal".
system, # The system architecture for this host (eg. `x86_64-linux`).
target, # The Snowfall Lib target for this system (eg. `x86_64-iso`).
format, # A normalized name for the system target (eg. `iso`).
virtual, # A boolean to determine whether this system is a virtual target using nixos-generators.
systems, # An attribute map of your defined hosts.
config,
...
}: with lib; with lib.${namespace};
let

View file

@ -1,7 +1,15 @@
{
lib,
pkgs,
namespace,
inputs,
namespace, # The flake namespace, set in flake.nix. If not set, defaults to "internal".
system, # The system architecture for this host (eg. `x86_64-linux`).
target, # The Snowfall Lib target for this system (eg. `x86_64-iso`).
format, # A normalized name for the system target (eg. `iso`).
virtual, # A boolean to determine whether this system is a virtual target using nixos-generators.
systems, # An attribute map of your defined hosts.
config,
...
}: with lib; with lib.${namespace};

View file

@ -1,6 +1,15 @@
{
lib,
namespace,
pkgs,
inputs,
namespace, # The flake namespace, set in flake.nix. If not set, defaults to "internal".
system, # The system architecture for this host (eg. `x86_64-linux`).
target, # The Snowfall Lib target for this system (eg. `x86_64-iso`).
format, # A normalized name for the system target (eg. `iso`).
virtual, # A boolean to determine whether this system is a virtual target using nixos-generators.
systems, # An attribute map of your defined hosts.
config,
...
}: with lib; with lib.${namespace};

View file

@ -3,6 +3,7 @@
pkgs,
inputs,
namespace,
config,
...
}: with lib; with lib.${namespace};
{