szymon/amazing-dotfiles
1
0
Fork 0
mirror of https://github.com/szymon-jozef/amazing-dotfiles.git synced 2026-09-07 20:20:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor

Browse Source
This commit is contained in:
Szymon P
2026-03-24 10:40:31 +01:00
parent 61026947d3
commit 0749c86085
16 changed files with 75 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
flake.nix
View File

@@ -39,98 +39,88 @@
}@inputs:
let
baseUserConfig = {
defaultUserConfig = {
username = "szymon";
# for git
email = "szymon_jozef@proton.me";
fullName = "Szymon P";
# your public ssh key
signingKey = "~/.ssh/github.pub";
mainMonitor = "DP-1"; # only for some applications: you still need to set hyprland monitors yourself!
statusBar = "ashell"; # available: ashell|waybar
mainMonitor = "DP-1";
statusBar = "ashell"; # available: ashell | waybar
pathConfig = {
wallpaper = "Obrazy/tapety/catppuccin";
screenshot = "Obrazy/zrzuty/";
obsidian = "Dokumenty/obsidian";
};
isNixOS = true;
hostName = "default";
};
system = "x86_64-linux";
general_import = import nixpkgs {
pkgs = import nixpkgs {
inherit system;
config.allowUnfree = true;
};
general_module_import = [
./home.nix
catppuccin.homeModules.catppuccin
nixvim.homeModules.nixvim
inputs.hyprcursor-phinger.homeManagerModules.hyprcursor-phinger
(
{ pkgs, ... }:
{
home.packages = [
zut-calendar.packages.${pkgs.system}.default
zutui.packages.${pkgs.system}.default
];
}
)
];
mkHomeConfig =
{
isNixOS,
overrides ? { },
hostName,
}:
mkHome =
customConfig:
let
userConfig = defaultUserConfig // customConfig;
in
home-manager.lib.homeManagerConfiguration {
pkgs = general_import;
inherit pkgs;
extraSpecialArgs = {
inherit inputs isNixOS hostName;
userConfig = baseUserConfig // overrides;
inherit inputs userConfig;
};
modules = general_module_import;
modules = [
./home.nix
catppuccin.homeModules.catppuccin
nixvim.homeModules.nixvim
inputs.hyprcursor-phinger.homeManagerModules.hyprcursor-phinger
(
{ pkgs, ... }:
{
home.packages = [
zut-calendar.packages.${pkgs.system}.default
zutui.packages.${pkgs.system}.default
];
}
)
]
++ (customConfig.extraModules or [ ]);
};
in
{
homeConfigurations = {
"arch" = mkHomeConfig {
# You can overwrite default configuration here
"arch" = mkHome {
isNixOS = false;
hostName = "arch";
};
"nixos" = mkHomeConfig {
"nixos" = mkHome {
isNixOS = true;
hostName = "nixos";
};
"${baseUserConfig.username}@pitagoras" = mkHomeConfig {
isNixOS = true;
overrides = {
mainMonitor = "eDP-1";
};
"${defaultUserConfig.username}@pitagoras" = mkHome {
hostName = "pitagoras";
mainMonitor = "eDP-1";
};
"${baseUserConfig.username}@pilecki" = mkHomeConfig {
isNixOS = true;
overrides = {
mainMonitor = "LVDS-1";
};
"${defaultUserConfig.username}@pilecki" = mkHome {
hostName = "pilecki";
mainMonitor = "LVDS-1";
};
"${baseUserConfig.username}@paderewski" = mkHomeConfig {
isNixOS = true;
overrides = {
mainMonitor = "DP-1";
};
"${defaultUserConfig.username}@paderewski" = mkHome {
hostName = "paderewski";
};
};

3
modules/bars/ashell.nix
View File

@@ -1,6 +1,5 @@
{
lib,
isNixOS,
userConfig,
pkgs,
...
@@ -9,7 +8,7 @@
{
programs.ashell = {
enable = true;
package = lib.mkIf (!isNixOS) null;
package = lib.mkIf (!userConfig.isNixOS) null;
settings = {
outputs = {
Targets = [ userConfig.mainMonitor ];

3
modules/bars/waybar.nix
View File

@@ -1,6 +1,5 @@
{
pkgs,
isNixOS,
userConfig,
...
}:
@@ -9,7 +8,7 @@
programs.waybar = {
enable = true;
package =
if isNixOS then pkgs.waybar else (pkgs.writeShellScriptBin "waybar" "exec /usr/bin/waybar \"$@\"");
if userConfig.isNixOS then pkgs.waybar else (pkgs.writeShellScriptBin "waybar" "exec /usr/bin/waybar \"$@\"");
settings = {
mainBar = {
layer = "top";

4
modules/cli/fish.nix
View File

@@ -1,4 +1,4 @@
{ isNixOS, hostName, ... }:
{ userConfig, hostName, ... }:
{
programs.fish = {
@@ -78,7 +78,7 @@
update = {
body =
if isNixOS then
if userConfig.isNixOS then
# fish
''
echo "=== System packages update ==="

4
modules/gui/browsers.nix
View File

@@ -1,8 +1,8 @@
{ isNixOS, lib, ... }:
{ userConfig, lib, ... }:
{
programs.chromium = {
enable = true;
package = lib.mkIf (!isNixOS) null;
package = lib.mkIf (!userConfig.isNixOS) null;
};
}

4
modules/gui/kitty.nix
View File

@@ -1,9 +1,9 @@
{ lib, isNixOS, ... }:
{ lib, userConfig, ... }:
{
programs.kitty = {
enable = true;
package = lib.mkIf (!isNixOS) null;
package = lib.mkIf (!userConfig.isNixOS) null;
settings = {
confirm_os_window_close = 0;
dynamic_background_opacity = true;

6
modules/gui/mako.nix
View File

@@ -1,4 +1,4 @@
{ isNixOS, pkgs, ... }:
{ userConfig, pkgs, ... }:
{
services.mako = {
@@ -21,7 +21,7 @@
progress-color = "over #313244";
output = "DP-1";
on-notify =
if isNixOS then
if userConfig.isNixOS then
"exec ${pkgs.pulseaudio}/bin/paplay ${pkgs.sound-theme-freedesktop}/share/sounds/freedesktop/stereo/dialog-information.oga"
else
"exec paplay /usr/share/sounds/freedesktop/stereo/dialog-information.oga";
@@ -36,7 +36,7 @@
[urgency=critical]
on-notify=${
if isNixOS then
if userConfig.isNixOS then
"exec ${pkgs.pulseaudio}/bin/paplay ${pkgs.sound-theme-freedesktop}/share/sounds/freedesktop/stereo/dialog-information.oga"
else
"exec paplay /usr/share/sounds/freedesktop/stereo/dialog-information.oga"

4
modules/gui/mangohud.nix
View File

@@ -1,7 +1,7 @@
{
config,
pkgs,
isNixOS,
userConfig,
...
}:
@@ -10,7 +10,7 @@
programs.mangohud = {
enable = true;
package = if isNixOS then pkgs.mangohud else (pkgs.runCommand "dummy-mangohud" { } "mkdir $out");
package = if userConfig.isNixOS then pkgs.mangohud else (pkgs.runCommand "dummy-mangohud" { } "mkdir $out");
};
xdg.configFile."MangoHud/MangoHud.conf".text = ''

2
modules/gui/obsidian-catppuccin.nix
View File

@@ -11,7 +11,7 @@ stdenv.mkDerivation {
owner = "catppuccin";
repo = "obsidian";
rev = "main";
hash = "sha256-IGkP0z8gJj1dbNclpMebZXZvaRby1F8zGNEDPtitfqo=";
hash = "sha256-uB0a2nSZkHHf65xBYXyNh50vaAiqdEpKQVf3eXnCVlE=";
};
installPhase = ''

3
modules/gui/obsidian.nix
View File

@@ -1,5 +1,4 @@
{
isNixOS,
lib,
pkgs,
userConfig,
@@ -9,7 +8,7 @@
{
programs.obsidian = {
enable = true;
package = lib.mkIf (!isNixOS) null;
package = lib.mkIf (!userConfig.isNixOS) null;
defaultSettings = {
app = {

3
modules/gui/satty.nix
View File

@@ -1,6 +1,5 @@
{
lib,
isNixOS,
userConfig,
...
}:
@@ -8,7 +7,7 @@
{
programs.satty = {
enable = true;
package = lib.mkIf (!isNixOS) null;
package = lib.mkIf (!userConfig.isNixOS) null;
settings = {
general = {
fullscreen = true;

4
modules/hypr/hypridle.nix
View File

@@ -1,9 +1,9 @@
{ isNixOS, lib, ... }:
{ userConfig, lib, ... }:
{
services.hypridle = {
enable = true;
package = lib.mkIf (!isNixOS) null;
package = lib.mkIf (!userConfig.isNixOS) null;
settings = {
general = {

20
modules/hypr/hyprland.nix
View File

@@ -1,5 +1,4 @@
{
isNixOS,
lib,
userConfig,
pkgs,
@@ -7,7 +6,7 @@
...
}:
let
exe = pkg: bin: if isNixOS then "${pkg}/bin/${bin}" else "/usr/bin/${bin}";
exe = pkg: bin: if userConfig.isNixOS then "${pkg}/bin/${bin}" else "/usr/bin/${bin}";
jq = exe pkgs.jq "jq";
grim = exe pkgs.grim "grim";
@@ -15,7 +14,7 @@ let
wl_copy = exe pkgs.wl-clipboard "wl-copy";
notify_send = exe pkgs.libnotify "notify-send";
xdg-desktop-portal-hyprland =
if isNixOS then
if userConfig.isNixOS then
"${pkgs.xdg-desktop-portal-hyprland}/libexec/xdg-desktop-portal-hyprland"
else
"/usr/lib/xdg-desktop-portal-hyprland";
@@ -26,9 +25,9 @@ in
wayland.windowManager.hyprland = {
enable = true;
package =
if isNixOS then inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland else null;
if userConfig.isNixOS then inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland else null;
portalPackage = lib.mkIf (
isNixOS
userConfig.isNixOS
) inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
xwayland.enable = true;
@@ -36,9 +35,9 @@ in
"$mainMod" = "SUPER";
"$terminal" = "uwsm app -- kitty";
"$menu" = "hyprlauncher";
"$music_player" = if isNixOS then "spotify" else "flatpak run com.spotify.Client";
"$music_player" = if userConfig.isNixOS then "spotify" else "flatpak run com.spotify.Client";
"$notes" = "obsidian";
"$browser" = if isNixOS then "zen-beta" else "zen-browser"; # beta on nixos
"$browser" = if userConfig.isNixOS then "zen-beta" else "zen-browser"; # beta on nixos
"$openrgb_color" = "09ce30";
env = [
@@ -60,7 +59,7 @@ in
};
animations = {
enabled = true;
enabled = false;
bezier = [
"easeOutQuint,0.23,1,0.32,1"
"easeInOutCubic,0.65,0.05,0.36,1"
@@ -142,6 +141,11 @@ in
};
};
device = {
name = "msft0001:01-06cb:7f28-touchpad";
sensitivity = 0;
};
cursor = {
no_hardware_cursors = true;
inactive_timeout = 5;

4
modules/hypr/hyprlauncher.nix
View File

@@ -1,9 +1,9 @@
{ isNixOS, lib, ... }:
{ userConfig, lib, ... }:
{
services.hyprlauncher = {
enable = true;
package = lib.mkIf (!isNixOS) null;
package = lib.mkIf (!userConfig.isNixOS) null;
settings = {
cache.enabled = true;

4
modules/hypr/hyprlock.nix
View File

@@ -1,9 +1,9 @@
{ isNixOS, lib, ... }:
{ userConfig, lib, ... }:
{
programs.hyprlock = {
enable = true;
package = lib.mkIf (!isNixOS) null;
package = lib.mkIf (!userConfig.isNixOS) null;
settings = {
"$font" = "Monospace";

4
modules/hypr/hyprsunset.nix
View File

@@ -1,5 +1,5 @@
{
isNixOS,
userConfig,
pkgs,
...
}:
@@ -8,7 +8,7 @@
services.hyprsunset = {
enable = true;
package =
if isNixOS then
if userConfig.isNixOS then
pkgs.hyprsunset
else
(pkgs.writeShellScriptBin "hyprsunset" "exec /usr/bin/hyprsunset \"$@\"");