Compare commits

...

2 commits

Author SHA1 Message Date
Jo
0c1476ce83 refactor(module): apply gnome wallpaper in catppuccin theme config 2024-09-10 10:50:23 +02:00
Jo
fde4abd59d refactor(module): clean up some module inputs
feat(module): add use-lix option to nix module

feat(module): update fish config for catppuccin
2024-09-10 10:46:16 +02:00
16 changed files with 92 additions and 126 deletions

View file

@ -2,14 +2,6 @@
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,
... ...
}: { }: {
@ -20,15 +12,11 @@
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"
@ -44,6 +32,7 @@
"appindicatorsupport@rgcjonas.gmail.com" "appindicatorsupport@rgcjonas.gmail.com"
"unite@hardpixel.eu" "unite@hardpixel.eu"
"color-picker@tuberry" "color-picker@tuberry"
"clipboard-history@alexsaveau.dev"
]; ];
}; };

View file

@ -69,7 +69,7 @@ in
### Rust development specific ### Rust development specific
rustup rustup
jetbrains.rust-rover gcc
### Work ### Work
teams-for-linux teams-for-linux
@ -82,7 +82,7 @@ in
sidequest sidequest
]; ];
#lib.puzzlevision.apps.zed-editor.enable = true; #puzzlevision.apps.zed-editor.enable = true;
home.stateVersion = "24.05"; home.stateVersion = "24.05";
} }

View file

@ -2,32 +2,25 @@
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];
}; };
} }

View file

@ -2,14 +2,7 @@
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
@ -45,4 +38,4 @@ in {
}; };
}; };
}; };
} }

View file

@ -2,5 +2,5 @@
lib, lib,
... ...
}: { }: {
home.file.".config/fish/themes/Catppuccin\ Frappe.theme".source = lib.snowfall.fs.get-file "resources/apps/fish/Catppuccin\ Frappe.theme"; home.file.".config/fish/themes/Catppuccin\ Macchiato.theme".source = lib.snowfall.fs.get-file "resources/apps/fish/Catppuccin\ Macchiato.theme";
} }

View file

@ -22,4 +22,4 @@
pointerCursor.accent = "blue"; pointerCursor.accent = "blue";
pointerCursor.flavor = "macchiato"; pointerCursor.flavor = "macchiato";
}; };
} }

View file

@ -31,29 +31,24 @@
}; };
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 = "Graphite-teal-Dark-nord"; name = "Colloid-Dark-Catppuccin";
};
"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" = {

View file

@ -19,7 +19,10 @@ in {
# Enable modules # Enable modules
puzzlevision = { puzzlevision = {
common = { common = {
nix.enable = true; # Standard Nix configuration nix = {
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

View file

@ -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 ]; environment.systemPackages = with pkgs; [ bluez blueman ];
hardware.bluetooth = { hardware.bluetooth = {
enable = true; enable = true;
@ -24,6 +24,7 @@ in {
FastConnectable = "true"; FastConnectable = "true";
Experimental = "true"; Experimental = "true";
KernelExperimental = "true"; KernelExperimental = "true";
Disable= "Handsfree";
}; };
}; };
}; };

View file

@ -7,16 +7,16 @@
... ...
}: with lib; with lib.${namespace}; }: with lib; with lib.${namespace};
let let
cfg = config.${namespace}.system.fonts; cfg = config.${namespace}.common.fonts;
in { in {
options.${namespace}.system.fonts = { options.${namespace}.common.fonts = {
enable = mkEnableOption "Enable system font management"; enable = mkEnableOption "Enable system font management";
fonts = mkOption { #fonts = mkOption {
type = types.package; # type = types.package;
default = [ ]; # default = noto-fonts;
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.override { fonts = [ "Hack" ]; }) nerdfonts
] ++ cfg.fonts; ]; # ++ cfg.fonts;
}; };
} }

View file

@ -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;
}; };
}; };
} }

View file

@ -2,21 +2,17 @@
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 = { enable = mkEnableOption "nix"; }; options.${namespace}.common.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 = {
@ -35,6 +31,8 @@ in {
dates = "daily"; dates = "daily";
options = "--delete-older-than 3d"; options = "--delete-older-than 3d";
}; };
package = mkIf cfg.use-lix pkgs.lix; # Enable LIX
}; };
}; };
} }

View file

@ -18,17 +18,11 @@ 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; [ ${cfg.package} ]; environment.shells = with pkgs; [ fish ];
users.defaultUserShell = pkgs.${cfg.package}; users.defaultUserShell = pkgs.fish;
programs.${cfg.package}.enable = true; programs.fish.enable = true;
}; };
} }

View file

@ -1,30 +0,0 @@
# 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

View file

@ -0,0 +1,30 @@
# 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.

After

Width:  |  Height:  |  Size: 188 KiB