Compare commits
No commits in common. "0c1476ce83e34fae0543f7155239fc1a7705151c" and "3f767068d2e5c4aa09519342970ad548b7053561" have entirely different histories.
0c1476ce83
...
3f767068d2
16 changed files with 126 additions and 92 deletions
|
@ -2,6 +2,14 @@
|
||||||
lib,
|
lib,
|
||||||
pkgs,
|
pkgs,
|
||||||
inputs,
|
inputs,
|
||||||
|
|
||||||
|
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.
|
||||||
|
|
||||||
config,
|
config,
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
|
@ -12,11 +20,15 @@
|
||||||
appindicator
|
appindicator
|
||||||
unite
|
unite
|
||||||
color-picker
|
color-picker
|
||||||
clipboard-history
|
|
||||||
];
|
];
|
||||||
|
|
||||||
# Use `dconf watch /` to track stateful changes you are doing, then set them here.
|
# Use `dconf watch /` to track stateful changes you are doing, then set them here.
|
||||||
dconf.settings = {
|
dconf.settings = {
|
||||||
|
"org/gnome/desktop/background" = {
|
||||||
|
picture-uri = lib.snowfall.fs.get-file "resources/wallpapers/maid_in_forest_with_lantern.jpg";
|
||||||
|
picture-uri-dark = lib.snowfall.fs.get-file "resources/wallpapers/maid_in_forest_with_lantern.jpg";
|
||||||
|
};
|
||||||
|
|
||||||
"org/gnome/shell" = {
|
"org/gnome/shell" = {
|
||||||
favorite-apps = [
|
favorite-apps = [
|
||||||
"org.gnome.Nautilus.desktop"
|
"org.gnome.Nautilus.desktop"
|
||||||
|
@ -32,7 +44,6 @@
|
||||||
"appindicatorsupport@rgcjonas.gmail.com"
|
"appindicatorsupport@rgcjonas.gmail.com"
|
||||||
"unite@hardpixel.eu"
|
"unite@hardpixel.eu"
|
||||||
"color-picker@tuberry"
|
"color-picker@tuberry"
|
||||||
"clipboard-history@alexsaveau.dev"
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -69,7 +69,7 @@ in
|
||||||
|
|
||||||
### Rust development specific
|
### Rust development specific
|
||||||
rustup
|
rustup
|
||||||
gcc
|
jetbrains.rust-rover
|
||||||
|
|
||||||
### Work
|
### Work
|
||||||
teams-for-linux
|
teams-for-linux
|
||||||
|
@ -82,7 +82,7 @@ in
|
||||||
sidequest
|
sidequest
|
||||||
];
|
];
|
||||||
|
|
||||||
#puzzlevision.apps.zed-editor.enable = true;
|
#lib.puzzlevision.apps.zed-editor.enable = true;
|
||||||
|
|
||||||
home.stateVersion = "24.05";
|
home.stateVersion = "24.05";
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,25 +2,32 @@
|
||||||
lib,
|
lib,
|
||||||
pkgs,
|
pkgs,
|
||||||
inputs,
|
inputs,
|
||||||
namespace,
|
|
||||||
|
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.
|
||||||
|
|
||||||
config,
|
config,
|
||||||
...
|
...
|
||||||
}: with lib; with lib.${namespace};
|
}: with lib; with lib.${namespace};
|
||||||
let
|
let
|
||||||
cfg = config.${namespace}.apps.zed-editor;
|
cfg = config.${namespace}.apps.zed-editor;
|
||||||
|
|
||||||
zed-fhs = pkgs.buildFHSUserEnv {
|
zed-fhs = pkgs.buildFHSUserEnv {
|
||||||
name = "zed";
|
name = "zed";
|
||||||
targetPkgs = pkgs:
|
targetPkgs = pkgs:
|
||||||
with pkgs; [
|
with pkgs; [
|
||||||
zed-editor
|
zed-editor
|
||||||
];
|
];
|
||||||
runScript = "zed";
|
runScript = "zed";
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
options.${namespace}.apps.zed-editor = { enable = mkEnableOption "zed-editor"; };
|
options.${namespace}.apps.zed-editor = { enable = mkEnableOption "zed-editor"; };
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
home.packages = [zed-fhs];
|
home.packages = [zed-fhs];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,14 @@
|
||||||
lib,
|
lib,
|
||||||
pkgs,
|
pkgs,
|
||||||
inputs,
|
inputs,
|
||||||
namespace,
|
|
||||||
|
namespace, # The flake namespace, set in flake.nix. If not set, defaults to "internal".
|
||||||
|
system, # 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.
|
||||||
|
|
||||||
config,
|
config,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
|
@ -38,4 +45,4 @@ in {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
|
@ -2,5 +2,5 @@
|
||||||
lib,
|
lib,
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
home.file.".config/fish/themes/Catppuccin\ Macchiato.theme".source = lib.snowfall.fs.get-file "resources/apps/fish/Catppuccin\ Macchiato.theme";
|
home.file.".config/fish/themes/Catppuccin\ Frappe.theme".source = lib.snowfall.fs.get-file "resources/apps/fish/Catppuccin\ Frappe.theme";
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,4 +22,4 @@
|
||||||
pointerCursor.accent = "blue";
|
pointerCursor.accent = "blue";
|
||||||
pointerCursor.flavor = "macchiato";
|
pointerCursor.flavor = "macchiato";
|
||||||
};
|
};
|
||||||
}
|
}
|
|
@ -31,24 +31,29 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
theme = {
|
theme = {
|
||||||
name = "Colloid-Dark-Catppuccin";
|
#name = "Colloid-Dark-Catppuccin";
|
||||||
package = pkgs.colloid-gtk-theme.override {
|
#package = pkgs.colloid-gtk-theme.override {
|
||||||
themeVariants = ["default"];
|
#themeVariants = ["default"];
|
||||||
colorVariants = ["dark"];
|
#colorVariants = ["dark"];
|
||||||
sizeVariants = ["standard"];
|
#sizeVariants = ["standard"];
|
||||||
tweaks = ["catppuccin"];
|
#tweaks = ["catppuccin"];
|
||||||
|
#};
|
||||||
|
|
||||||
|
name = "Graphite-teal-Dark-nord";
|
||||||
|
package = pkgs.graphite-gtk-theme.override {
|
||||||
|
themeVariants = ["blue" "teal"];
|
||||||
|
colorVariants = ["dark"];
|
||||||
|
sizeVariants = ["standard"];
|
||||||
|
tweaks = ["nord"];
|
||||||
|
withGrub = true;
|
||||||
|
grubScreens = ["1080p"];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
dconf.settings = {
|
dconf.settings = {
|
||||||
"org/gnome/shell/extensions/user-theme" = {
|
"org/gnome/shell/extensions/user-theme" = {
|
||||||
name = "Colloid-Dark-Catppuccin";
|
name = "Graphite-teal-Dark-nord";
|
||||||
};
|
|
||||||
|
|
||||||
"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";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
"org/gnome/desktop/interface" = {
|
"org/gnome/desktop/interface" = {
|
||||||
|
|
|
@ -19,10 +19,7 @@ in {
|
||||||
# Enable modules
|
# Enable modules
|
||||||
puzzlevision = {
|
puzzlevision = {
|
||||||
common = {
|
common = {
|
||||||
nix = {
|
nix.enable = true; # Standard Nix configuration
|
||||||
enable = true; # Standard Nix configuration
|
|
||||||
use-lix = true;
|
|
||||||
};
|
|
||||||
grub.enable = true; # Bootloader grub
|
grub.enable = true; # Bootloader grub
|
||||||
networking.enable = true; # Networkmanager configuration
|
networking.enable = true; # Networkmanager configuration
|
||||||
kernel.enable = true; # Kernel modifications
|
kernel.enable = true; # Kernel modifications
|
||||||
|
|
|
@ -11,7 +11,7 @@ in {
|
||||||
options.${namespace}.common.bluetooth = { enable = mkEnableOption "Enable bluetooth support on your current system"; };
|
options.${namespace}.common.bluetooth = { enable = mkEnableOption "Enable bluetooth support on your current system"; };
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
environment.systemPackages = with pkgs; [ bluez blueman ];
|
environment.systemPackages = with pkgs; [ bluez ];
|
||||||
|
|
||||||
hardware.bluetooth = {
|
hardware.bluetooth = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
@ -24,7 +24,6 @@ in {
|
||||||
FastConnectable = "true";
|
FastConnectable = "true";
|
||||||
Experimental = "true";
|
Experimental = "true";
|
||||||
KernelExperimental = "true";
|
KernelExperimental = "true";
|
||||||
Disable= "Handsfree";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -7,16 +7,16 @@
|
||||||
...
|
...
|
||||||
}: with lib; with lib.${namespace};
|
}: with lib; with lib.${namespace};
|
||||||
let
|
let
|
||||||
cfg = config.${namespace}.common.fonts;
|
cfg = config.${namespace}.system.fonts;
|
||||||
in {
|
in {
|
||||||
options.${namespace}.common.fonts = {
|
options.${namespace}.system.fonts = {
|
||||||
enable = mkEnableOption "Enable system font management";
|
enable = mkEnableOption "Enable system font management";
|
||||||
#fonts = mkOption {
|
fonts = mkOption {
|
||||||
# type = types.package;
|
type = types.package;
|
||||||
# default = noto-fonts;
|
default = [ ];
|
||||||
# example = [ noto-fonts noto-fonts-emoji ];
|
example = [ noto-fonts noto-fonts-emoji ];
|
||||||
# description = "Install additional font packages";
|
description = "Install additional font packages";
|
||||||
#};
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
|
@ -31,7 +31,7 @@ in {
|
||||||
noto-fonts-cjk-sans
|
noto-fonts-cjk-sans
|
||||||
noto-fonts-cjk-serif
|
noto-fonts-cjk-serif
|
||||||
noto-fonts-emoji
|
noto-fonts-emoji
|
||||||
nerdfonts
|
(nerdfonts.override { fonts = [ "Hack" ]; })
|
||||||
]; # ++ cfg.fonts;
|
] ++ cfg.fonts;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -49,9 +49,9 @@ in {
|
||||||
};
|
};
|
||||||
|
|
||||||
# Set console keymap.
|
# Set console keymap.
|
||||||
console.keyMap = cfg.keymap;
|
console.keyMap = ${cfg.keymap};
|
||||||
services.xserver = {
|
services.xserver = {
|
||||||
xkb.layout = cfg.keymap;
|
xkb.layout = ${cfg.keymap};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,17 +2,21 @@
|
||||||
lib,
|
lib,
|
||||||
pkgs,
|
pkgs,
|
||||||
inputs,
|
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};
|
||||||
let
|
let
|
||||||
cfg = config.${namespace}.common.nix;
|
cfg = config.${namespace}.common.nix;
|
||||||
in {
|
in {
|
||||||
options.${namespace}.common.nix = {
|
options.${namespace}.common.nix = { enable = mkEnableOption "nix"; };
|
||||||
enable = mkEnableOption "Overwrite the default Nix configuration.";
|
|
||||||
use-lix = mkEnableOption "Enable Lix as an alternative to CppNix.";
|
|
||||||
};
|
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
nix = {
|
nix = {
|
||||||
|
@ -31,8 +35,6 @@ in {
|
||||||
dates = "daily";
|
dates = "daily";
|
||||||
options = "--delete-older-than 3d";
|
options = "--delete-older-than 3d";
|
||||||
};
|
};
|
||||||
|
|
||||||
package = mkIf cfg.use-lix pkgs.lix; # Enable LIX
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,11 +18,17 @@ let
|
||||||
in {
|
in {
|
||||||
options.${namespace}.common.shell = {
|
options.${namespace}.common.shell = {
|
||||||
enable = mkEnableOption "Modify the standard shell options";
|
enable = mkEnableOption "Modify the standard shell options";
|
||||||
|
package = mkOption {
|
||||||
|
type = types.str;
|
||||||
|
default = "fish";
|
||||||
|
example = "fish";
|
||||||
|
description = "Select an appropriate shell environment (bash, fish, zsh...)";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
environment.shells = with pkgs; [ fish ];
|
environment.shells = with pkgs; [ ${cfg.package} ];
|
||||||
users.defaultUserShell = pkgs.fish;
|
users.defaultUserShell = pkgs.${cfg.package};
|
||||||
programs.fish.enable = true;
|
programs.${cfg.package}.enable = true;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
30
resources/apps/fish/Catppuccin Frappe.theme
Normal file
30
resources/apps/fish/Catppuccin Frappe.theme
Normal file
|
@ -0,0 +1,30 @@
|
||||||
|
# name: 'Catppuccin Frappé'
|
||||||
|
# url: 'https://github.com/catppuccin/fish'
|
||||||
|
# preferred_background: 303446
|
||||||
|
|
||||||
|
fish_color_normal c6d0f5
|
||||||
|
fish_color_command 8caaee
|
||||||
|
fish_color_param eebebe
|
||||||
|
fish_color_keyword e78284
|
||||||
|
fish_color_quote a6d189
|
||||||
|
fish_color_redirection f4b8e4
|
||||||
|
fish_color_end ef9f76
|
||||||
|
fish_color_comment 838ba7
|
||||||
|
fish_color_error e78284
|
||||||
|
fish_color_gray 737994
|
||||||
|
fish_color_selection --background=414559
|
||||||
|
fish_color_search_match --background=414559
|
||||||
|
fish_color_option a6d189
|
||||||
|
fish_color_operator f4b8e4
|
||||||
|
fish_color_escape ea999c
|
||||||
|
fish_color_autosuggestion 737994
|
||||||
|
fish_color_cancel e78284
|
||||||
|
fish_color_cwd e5c890
|
||||||
|
fish_color_user 81c8be
|
||||||
|
fish_color_host 8caaee
|
||||||
|
fish_color_host_remote a6d189
|
||||||
|
fish_color_status e78284
|
||||||
|
fish_pager_color_progress 737994
|
||||||
|
fish_pager_color_prefix f4b8e4
|
||||||
|
fish_pager_color_completion c6d0f5
|
||||||
|
fish_pager_color_description 737994
|
|
@ -1,30 +0,0 @@
|
||||||
# name: 'Catppuccin Macchiato'
|
|
||||||
# url: 'https://github.com/catppuccin/fish'
|
|
||||||
# preferred_background: 24273a
|
|
||||||
|
|
||||||
fish_color_normal cad3f5
|
|
||||||
fish_color_command 8aadf4
|
|
||||||
fish_color_param f0c6c6
|
|
||||||
fish_color_keyword ed8796
|
|
||||||
fish_color_quote a6da95
|
|
||||||
fish_color_redirection f5bde6
|
|
||||||
fish_color_end f5a97f
|
|
||||||
fish_color_comment 8087a2
|
|
||||||
fish_color_error ed8796
|
|
||||||
fish_color_gray 6e738d
|
|
||||||
fish_color_selection --background=363a4f
|
|
||||||
fish_color_search_match --background=363a4f
|
|
||||||
fish_color_option a6da95
|
|
||||||
fish_color_operator f5bde6
|
|
||||||
fish_color_escape ee99a0
|
|
||||||
fish_color_autosuggestion 6e738d
|
|
||||||
fish_color_cancel ed8796
|
|
||||||
fish_color_cwd eed49f
|
|
||||||
fish_color_user 8bd5ca
|
|
||||||
fish_color_host 8aadf4
|
|
||||||
fish_color_host_remote a6da95
|
|
||||||
fish_color_status ed8796
|
|
||||||
fish_pager_color_progress 6e738d
|
|
||||||
fish_pager_color_prefix f5bde6
|
|
||||||
fish_pager_color_completion cad3f5
|
|
||||||
fish_pager_color_description 6e738d
|
|
Binary file not shown.
Before Width: | Height: | Size: 188 KiB |
Loading…
Reference in a new issue