mirror of
https://github.com/Jokiller230/puzzlevision.git
synced 2024-12-04 20:05:00 +01:00
Compare commits
3 commits
a45e263617
...
6443c085d4
Author | SHA1 | Date | |
---|---|---|---|
6443c085d4 | |||
e1bbf4856e | |||
4966b26ec4 |
21 changed files with 24 additions and 148 deletions
|
@ -45,9 +45,6 @@
|
||||||
src = ./.; # "src" must point to the root of the flake.
|
src = ./.; # "src" must point to the root of the flake.
|
||||||
|
|
||||||
snowfall = {
|
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 for this flake's packages, library and overlays.
|
||||||
namespace = "puzzlevision";
|
namespace = "puzzlevision";
|
||||||
|
|
||||||
|
@ -58,7 +55,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
channels-config = {
|
channels-config = {
|
||||||
allowUnfree = true; # Allow unfree packages.
|
allowUnfree = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
# Apply some NixOS modules globally.
|
# Apply some NixOS modules globally.
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
pkgs,
|
pkgs,
|
||||||
inputs,
|
|
||||||
namespace,
|
namespace,
|
||||||
...
|
...
|
||||||
}: with lib; with lib.${namespace};
|
}: with lib; with lib.${namespace};
|
||||||
|
|
|
@ -1,8 +1,5 @@
|
||||||
{
|
{
|
||||||
lib,
|
|
||||||
pkgs,
|
pkgs,
|
||||||
inputs,
|
|
||||||
config,
|
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
home.packages = with pkgs.gnomeExtensions; [
|
home.packages = with pkgs.gnomeExtensions; [
|
||||||
|
|
|
@ -1,15 +1,12 @@
|
||||||
{
|
{
|
||||||
lib,
|
|
||||||
pkgs,
|
pkgs,
|
||||||
inputs,
|
|
||||||
config,
|
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
programs.vscode = {
|
programs.vscode = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.vscodium;
|
package = pkgs.vscodium;
|
||||||
extensions = with pkgs.vscode-extensions; [
|
extensions = with pkgs.vscode-extensions; [
|
||||||
wakatime.vscode-wakatime # Wakatime for coding statistics
|
# wakatime.vscode-wakatime # Wakatime for coding statistics
|
||||||
vue.volar # Vue support
|
vue.volar # Vue support
|
||||||
svelte.svelte-vscode # Svelte support
|
svelte.svelte-vscode # Svelte support
|
||||||
pkief.material-icon-theme # Material icons
|
pkief.material-icon-theme # Material icons
|
||||||
|
@ -20,5 +17,10 @@
|
||||||
catppuccin.catppuccin-vsc # Catppuccin theme
|
catppuccin.catppuccin-vsc # Catppuccin theme
|
||||||
jnoortheen.nix-ide # Nix language support
|
jnoortheen.nix-ide # Nix language support
|
||||||
];
|
];
|
||||||
|
userSettings = {
|
||||||
|
"nix.enableLanguageServer" = true;
|
||||||
|
"nix.serverPath" = "nil";
|
||||||
|
"workbench.colorTheme" = "Catppuccin Macchiato";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
|
@ -1,22 +1,7 @@
|
||||||
{
|
{
|
||||||
# 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,
|
lib,
|
||||||
# Instance of `pkgs` with overlays and custom packages applied.
|
|
||||||
pkgs,
|
pkgs,
|
||||||
# All flake inputs.
|
namespace,
|
||||||
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};
|
}: with lib; with lib.${namespace};
|
||||||
{
|
{
|
||||||
|
@ -57,6 +42,8 @@
|
||||||
bun
|
bun
|
||||||
devenv
|
devenv
|
||||||
python39
|
python39
|
||||||
|
nil
|
||||||
|
zed-editor
|
||||||
|
|
||||||
### Rust development specific
|
### Rust development specific
|
||||||
rustup
|
rustup
|
||||||
|
@ -73,7 +60,5 @@
|
||||||
sidequest
|
sidequest
|
||||||
];
|
];
|
||||||
|
|
||||||
#puzzlevision.apps.zed-editor.enable = true;
|
|
||||||
|
|
||||||
home.stateVersion = "24.05";
|
home.stateVersion = "24.05";
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,26 +0,0 @@
|
||||||
{
|
|
||||||
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];
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -1,41 +1,8 @@
|
||||||
{
|
{
|
||||||
lib,
|
|
||||||
pkgs,
|
pkgs,
|
||||||
inputs,
|
|
||||||
namespace,
|
|
||||||
config,
|
|
||||||
...
|
...
|
||||||
}: let
|
}: {
|
||||||
sshDir = "${config.home.homeDirectory}/.ssh";
|
|
||||||
in {
|
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
openssh
|
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";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -156,8 +156,8 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
"org/gnome/desktop/background" = {
|
"org/gnome/desktop/background" = {
|
||||||
picture-uri = lib.snowfall.fs.get-file "resources/wallpapers/blossoms.png";
|
picture-uri = lib.snowfall.fs.get-file "resources/wallpapers/catppuccin_blue_cat.png";
|
||||||
picture-uri-dark = lib.snowfall.fs.get-file "resources/wallpapers/blossoms.png";
|
picture-uri-dark = lib.snowfall.fs.get-file "resources/wallpapers/catppuccin_blue_cat.png";
|
||||||
};
|
};
|
||||||
|
|
||||||
"org/gnome/desktop/interface" = {
|
"org/gnome/desktop/interface" = {
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
pkgs,
|
|
||||||
namespace,
|
namespace,
|
||||||
config,
|
config,
|
||||||
...
|
...
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
pkgs,
|
|
||||||
namespace,
|
namespace,
|
||||||
config,
|
config,
|
||||||
...
|
...
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
inputs,
|
|
||||||
namespace,
|
namespace,
|
||||||
config,
|
config,
|
||||||
...
|
...
|
||||||
|
|
|
@ -3,7 +3,6 @@
|
||||||
pkgs,
|
pkgs,
|
||||||
namespace,
|
namespace,
|
||||||
config,
|
config,
|
||||||
options,
|
|
||||||
...
|
...
|
||||||
}: with lib; with lib.${namespace};
|
}: with lib; with lib.${namespace};
|
||||||
let
|
let
|
||||||
|
|
|
@ -1,15 +1,6 @@
|
||||||
{
|
{
|
||||||
lib,
|
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,
|
config,
|
||||||
...
|
...
|
||||||
}: with lib; with lib.${namespace};
|
}: with lib; with lib.${namespace};
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
inputs,
|
|
||||||
namespace,
|
namespace,
|
||||||
config,
|
config,
|
||||||
...
|
...
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
inputs,
|
|
||||||
namespace,
|
namespace,
|
||||||
config,
|
config,
|
||||||
...
|
...
|
||||||
|
|
|
@ -1,14 +1,6 @@
|
||||||
{
|
{
|
||||||
lib,
|
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,
|
config,
|
||||||
...
|
...
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
pkgs,
|
pkgs,
|
||||||
inputs,
|
|
||||||
namespace,
|
namespace,
|
||||||
config,
|
config,
|
||||||
...
|
...
|
||||||
|
@ -32,6 +31,11 @@ in {
|
||||||
options = "--delete-older-than 3d";
|
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
|
package = mkIf cfg.use-lix pkgs.lix; # Enable LIX
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,16 +1,8 @@
|
||||||
{
|
{
|
||||||
lib,
|
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,
|
config,
|
||||||
|
pkgs,
|
||||||
...
|
...
|
||||||
}: with lib; with lib.${namespace};
|
}: with lib; with lib.${namespace};
|
||||||
let
|
let
|
||||||
|
|
|
@ -1,15 +1,7 @@
|
||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
pkgs,
|
pkgs,
|
||||||
inputs,
|
namespace,
|
||||||
|
|
||||||
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,
|
config,
|
||||||
...
|
...
|
||||||
}: with lib; with lib.${namespace};
|
}: with lib; with lib.${namespace};
|
||||||
|
|
|
@ -1,15 +1,6 @@
|
||||||
{
|
{
|
||||||
lib,
|
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,
|
config,
|
||||||
...
|
...
|
||||||
}: with lib; with lib.${namespace};
|
}: with lib; with lib.${namespace};
|
||||||
|
|
|
@ -3,7 +3,6 @@
|
||||||
pkgs,
|
pkgs,
|
||||||
inputs,
|
inputs,
|
||||||
namespace,
|
namespace,
|
||||||
config,
|
|
||||||
...
|
...
|
||||||
}: with lib; with lib.${namespace};
|
}: with lib; with lib.${namespace};
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue