diff --git a/justfile b/justfile deleted file mode 100644 index 43bea23..0000000 --- a/justfile +++ /dev/null @@ -1,31 +0,0 @@ -set positional-arguments - -@default: - just update - -@deploy profile: - just clone - just hardware-generation ~/.dotfiles/kogami - just hardware-generation ~/.dotfiles/ginoza - just build $1 - -@clone: - git clone https://git.foglar.tech/foglar/dotfiles.git ~/.dotfiles -@quick-clone: - git clone https://git.foglar.tech/foglar/dotfiles.git ~/.dotfiles --depth 1 -@update: - cd ~/.dotfiles && git pull && nix flake update -@remove: - gum confirm && rm -rf ~/.dotfiles || echo "File ~/.dotfiles not removed" - -@install rebuild-argument entrypoint: - sudo nixos-rebuild $1 --flake ~/.dotfiles#$2 - -@switch flake-entrypoint: - just install switch $1 - -@build flake-entrypoint: - just install build $1 - -@hardware-generation path: - sudo nixos-generate-config --dir $1 diff --git a/kogami/configuration.nix b/kogami/configuration.nix index b461e20..edf99b6 100644 --- a/kogami/configuration.nix +++ b/kogami/configuration.nix @@ -13,7 +13,6 @@ ../nixos/system/system.nix inputs.home-manager.nixosModules.home-manager inputs.sops-nix.nixosModules.sops - "${inputs.nix-mineral}/nix-mineral.nix" ]; # Home manager diff --git a/kogami/home.nix b/kogami/home.nix index 3b586fb..ffba049 100644 --- a/kogami/home.nix +++ b/kogami/home.nix @@ -1,8 +1,10 @@ {userSettings, ...}: { # Home manager configuration - home.username = "${userSettings.username}"; - home.homeDirectory = "/home/${userSettings.username}"; - home.stateVersion = "24.05"; # Please read the comment before changing. + home = { + username = "${userSettings.username}"; + homeDirectory = "/home/${userSettings.username}"; + stateVersion = "24.05"; # Please read the comment before changing. + }; imports = [ ../nixos/home/packages/packages.nix @@ -73,6 +75,7 @@ bat.enable = true; btop.enable = true; fzf.enable = true; + yazi.enable = true; direnv = { enable = true; enableZshIntegration = true; diff --git a/nixos/home/apps/applications.nix b/nixos/home/apps/applications.nix index 09f630a..9a690fc 100644 --- a/nixos/home/apps/applications.nix +++ b/nixos/home/apps/applications.nix @@ -17,12 +17,11 @@ ferdium bitwarden - proton-pass #bitwarden-cli + proton-pass file-roller marp-cli - stellarium libreoffice localsend kdePackages.kdeconnect-kde @@ -49,6 +48,7 @@ gnome-font-viewer gnome-characters evince + #stellarium ]); }; } diff --git a/nixos/home/apps/programming.nix b/nixos/home/apps/programming.nix index 925561a..e08ebb3 100644 --- a/nixos/home/apps/programming.nix +++ b/nixos/home/apps/programming.nix @@ -24,7 +24,7 @@ ghostty cargo ciscoPacketTracer8 - godot_4_4-mono + #godot_4_4-mono ] ); diff --git a/nixos/home/desktop/hyprland/hyprland.nix b/nixos/home/desktop/hyprland/hyprland.nix index bd3cf22..9b0c8ce 100644 --- a/nixos/home/desktop/hyprland/hyprland.nix +++ b/nixos/home/desktop/hyprland/hyprland.nix @@ -19,6 +19,7 @@ ./hyprlock.nix ./hypridle.nix ./eww.nix + ./hyprpanel/default.nix ]; config = lib.mkIf config.desktop.hyprland.enable { @@ -51,14 +52,14 @@ services.network-manager-applet.enable = true; services.playerctld.enable = true; #services.dunst.enable = true; - services.swaync = { - enable = true; - settings = { - fit-to-screen = false; - control-center-height = 500; - control-center-width = 250; - }; - }; + #services.swaync = { + # enable = true; + # settings = { + # fit-to-screen = false; + # control-center-height = 500; + # control-center-width = 250; + # }; + #}; # Home session variables home.sessionVariables = { @@ -115,7 +116,7 @@ misc = { "vrr" = "0"; - "disable_hyprland_logo" = "true"; + #"disable_hyprland_logo" = "true"; "disable_splash_rendering" = "true"; "force_default_wallpaper" = "0"; }; diff --git a/nixos/home/desktop/hyprland/hyprpanel/default.nix b/nixos/home/desktop/hyprland/hyprpanel/default.nix index 08ac2c8..900e4bc 100644 --- a/nixos/home/desktop/hyprland/hyprpanel/default.nix +++ b/nixos/home/desktop/hyprland/hyprpanel/default.nix @@ -1,14 +1,20 @@ { - pkgs, inputs, + pkgs, ... -}: -{ - imports = [ - inputs.hyprpanel.nixosModules.hyprpanel - ]; +}: { + imports = [inputs.hyprpanel.homeManagerModules.hyprpanel]; + + programs.hyprpanel = { + enable = true; + systemd.enable = true; + #overwrite.enable = true; + hyprland.enable = true; + settings = { + }; + }; home.packages = with pkgs; [ hyprpanel ]; -} \ No newline at end of file +} diff --git a/nixos/home/packages/tools/shell.nix b/nixos/home/packages/tools/shell.nix index 1d7a2e6..634c346 100644 --- a/nixos/home/packages/tools/shell.nix +++ b/nixos/home/packages/tools/shell.nix @@ -66,6 +66,7 @@ in { set -o emacs bindkey "^[[3~" delete-char TERM=xterm-256color + PKG_CONFIG_PATH="${pkgs.openssl.dev}/lib/pkgconfig" ''; }; })