Compare commits
No commits in common. "af26d91fd616c7a3bc2f4f1d6079a4e9e25a94c3" and "47a2fb255d79dc3b540552c1150f388853128582" have entirely different histories.
af26d91fd6
...
47a2fb255d
@ -21,7 +21,7 @@ Places Icons Auto-resize=false
|
||||
Places Icons Static Size=16
|
||||
|
||||
[KPropertiesDialog]
|
||||
1920x1080 screen: Window-Maximized=true
|
||||
2560x1080 screen: Window-Maximized=true
|
||||
|
||||
[MainWindow]
|
||||
MenuBar=Disabled
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
hyprland = {
|
||||
url = "github:hyprwm/Hyprland";
|
||||
};
|
||||
|
||||
|
||||
#hyprland-plugins = {
|
||||
# url = "github:hyprwm/hyprland-plugins";
|
||||
# inputs.hyprland.follows = "hyprland";
|
||||
@ -40,8 +40,10 @@
|
||||
self,
|
||||
nixpkgs,
|
||||
nixpkgs-stable,
|
||||
nix-ld,
|
||||
...
|
||||
} @ inputs: let
|
||||
|
||||
username = "foglar";
|
||||
hostname = "laptop";
|
||||
|
||||
@ -72,7 +74,7 @@
|
||||
modules = [
|
||||
./nixos/configuration.nix
|
||||
inputs.stylix.nixosModules.stylix
|
||||
inputs.nix-ld.nixosModules.nix-ld
|
||||
nix-ld.nixosModules.nix-ld
|
||||
{programs.nix-ld.dev.enable = true;}
|
||||
];
|
||||
};
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
];
|
||||
|
||||
nix.settings.experimental-features = ["nix-command" "flakes"];
|
||||
programs.nix-ld.dev.enable = true;
|
||||
|
||||
# Bootloader.
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
|
||||
|
||||
@ -237,8 +237,9 @@
|
||||
|
||||
# Rofi
|
||||
"$mod, A, exec, pkill -x rofi || rofi -show drun"
|
||||
"$mod, Tab, exec, pkill -x rofi || rofi -show window"
|
||||
"$mod+Shift, E, exec, pkill -x rofi || rofi -show emoji"
|
||||
#"$mod, A, exec, pkill -x rofi || rofilaunch.sh d"
|
||||
#"$mod, Tab, exec, pkill -x rofi || rofilaunch.sh w"
|
||||
#"$mod+Shift, E, exec, pkill -x rofi || rofilaunch.sh f"
|
||||
|
||||
# Grouped Windows
|
||||
"$mod CTRL, H, changegroupactive, b"
|
||||
|
||||
@ -1,10 +1,5 @@
|
||||
{
|
||||
pkgs,
|
||||
pkgs-stable,
|
||||
...
|
||||
}: {
|
||||
home.packages =
|
||||
(with pkgs; [
|
||||
{pkgs, pkgs-stable, ...}: {
|
||||
home.packages = (with pkgs; [
|
||||
hyprlock
|
||||
hyprpicker
|
||||
hypridle
|
||||
@ -25,63 +20,62 @@
|
||||
|
||||
wl-clipboard
|
||||
cliphist
|
||||
|
||||
(writeShellScriptBin "dontkillsteam" ''
|
||||
if [[ $(hyprctl activewindow -j | jq -r ".class") == "Steam" ]]; then
|
||||
xdotool windowunmap $(xdotool getactivewindow)
|
||||
else
|
||||
hyprctl dispatch killactive ""
|
||||
fi
|
||||
'')
|
||||
|
||||
(writeShellScriptBin "dontkillsteam" ''
|
||||
if [[ $(hyprctl activewindow -j | jq -r ".class") == "Steam" ]]; then
|
||||
xdotool windowunmap $(xdotool getactivewindow)
|
||||
else
|
||||
hyprctl dispatch killactive ""
|
||||
fi
|
||||
'')
|
||||
(writeShellScriptBin "screenshot" ''
|
||||
restore_shader() {
|
||||
if [ -n "$shader" ]; then
|
||||
hyprshade on "$shader"
|
||||
fi
|
||||
}
|
||||
|
||||
(writeShellScriptBin "screenshot" ''
|
||||
restore_shader() {
|
||||
if [ -n "$shader" ]; then
|
||||
hyprshade on "$shader"
|
||||
fi
|
||||
}
|
||||
# Saves the current shader and turns it off
|
||||
save_shader() {
|
||||
shader=$(hyprshade current)
|
||||
hyprshade off
|
||||
trap restore_shader EXIT
|
||||
}
|
||||
|
||||
# Saves the current shader and turns it off
|
||||
save_shader() {
|
||||
shader=$(hyprshade current)
|
||||
hyprshade off
|
||||
trap restore_shader EXIT
|
||||
}
|
||||
save_shader
|
||||
|
||||
save_shader
|
||||
save_file=$(date +'%y%m%d_%Hh%Mm%Ss_screenshot.png')
|
||||
temp_screenshot="/tmp/screenshot.png"
|
||||
|
||||
save_file=$(date +'%y%m%d_%Hh%Mm%Ss_screenshot.png')
|
||||
temp_screenshot="/tmp/screenshot.png"
|
||||
case $1 in
|
||||
p) # print all outputs
|
||||
grimblast copysave screen $temp_screenshot && restore_shader && swappy -f $temp_screenshot ;;
|
||||
s) # drag to manually snip an area / click on a window to print it
|
||||
grimblast copysave area $temp_screenshot && restore_shader && swappy -f $temp_screenshot ;;
|
||||
sf) # frozen screen, drag to manually snip an area / click on a window to print it
|
||||
grimblast --freeze copysave area $temp_screenshot && restore_shader && swappy -f $temp_screenshot ;;
|
||||
m) # print focused monitor
|
||||
grimblast copysave output $temp_screenshot && restore_shader && swappy -f $temp_screenshot ;;
|
||||
*) # invalid option
|
||||
print_error ;;
|
||||
esac
|
||||
|
||||
case $1 in
|
||||
p) # print all outputs
|
||||
grimblast copysave screen $temp_screenshot && restore_shader && swappy -f $temp_screenshot ;;
|
||||
s) # drag to manually snip an area / click on a window to print it
|
||||
grimblast copysave area $temp_screenshot && restore_shader && swappy -f $temp_screenshot ;;
|
||||
sf) # frozen screen, drag to manually snip an area / click on a window to print it
|
||||
grimblast --freeze copysave area $temp_screenshot && restore_shader && swappy -f $temp_screenshot ;;
|
||||
m) # print focused monitor
|
||||
grimblast copysave output $temp_screenshot && restore_shader && swappy -f $temp_screenshot ;;
|
||||
*) # invalid option
|
||||
print_error ;;
|
||||
esac
|
||||
rm "$temp_screenshot"
|
||||
'')
|
||||
|
||||
rm "$temp_screenshot"
|
||||
'')
|
||||
(writeShellScriptBin "keyboardswitch" ''
|
||||
hyprctl switchxkblayout all next
|
||||
layMain=$(hyprctl -j devices | jq '.keyboards' | jq '.[] | select (.main == true)' | awk -F '"' '{if ($2=="active_keymap") print $4}')
|
||||
${libnotify}/bin/notify-send -a "t1" -r 91190 -t 800 "$layMain" -i ~/dotfiles/config/keyboard.svg
|
||||
'')
|
||||
|
||||
(writeShellScriptBin "keyboardswitch" ''
|
||||
hyprctl switchxkblayout all next
|
||||
layMain=$(hyprctl -j devices | jq '.keyboards' | jq '.[] | select (.main == true)' | awk -F '"' '{if ($2=="active_keymap") print $4}')
|
||||
${libnotify}/bin/notify-send -a "t1" -r 91190 -t 800 "$layMain" -i ~/dotfiles/config/keyboard.svg
|
||||
'')
|
||||
|
||||
#(writeShellScriptBin "windowpin")
|
||||
#(writeShellScriptBin "logoutlaunch")
|
||||
#(writeShellScriptBin "sysmonlaunch")
|
||||
#(writeShellScriptBin "rofilaunch" '''')
|
||||
])
|
||||
++ (with pkgs-stable; [
|
||||
pavucontrol
|
||||
gnome.nautilus
|
||||
]);
|
||||
#(writeShellScriptBin "windowpin")
|
||||
#(writeShellScriptBin "logoutlaunch")
|
||||
#(writeShellScriptBin "sysmonlaunch")
|
||||
#(writeShellScriptBin "rofilaunch" '''')
|
||||
]) ++ (with pkgs-stable; [
|
||||
pavucontrol
|
||||
gnome.nautilus
|
||||
]);
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{username, ...}: {
|
||||
home.username = "${username}";
|
||||
home.homeDirectory = "/home/${username}";
|
||||
{...}: {
|
||||
home.username = "foglar";
|
||||
home.homeDirectory = "/home/foglar";
|
||||
home.stateVersion = "24.05"; # Please read the comment before changing.
|
||||
|
||||
imports = [
|
||||
@ -9,8 +9,8 @@
|
||||
];
|
||||
|
||||
desktop.hyprland.enable = true;
|
||||
group.programming.enable = true;
|
||||
group.games.enable = true;
|
||||
programming.enable = true;
|
||||
games.enable = true;
|
||||
|
||||
gtk.enable = true;
|
||||
|
||||
|
||||
@ -6,10 +6,14 @@
|
||||
...
|
||||
}: {
|
||||
options = {
|
||||
group.applications.enable = lib.mkEnableOption "Enable graphical applications";
|
||||
applications.enable = lib.mkEnableOption "enable Graphical applications";
|
||||
};
|
||||
|
||||
config = lib.mkIf config.group.applications.enable {
|
||||
imports = [
|
||||
./applications/firefox.nix
|
||||
];
|
||||
|
||||
config = lib.mkIf config.applications.enable {
|
||||
home.packages =
|
||||
(with pkgs; [
|
||||
librewolf
|
||||
@ -26,14 +30,6 @@
|
||||
inkscape
|
||||
gnome-disk-utility
|
||||
qbittorrent
|
||||
|
||||
(writeShellScriptBin "nvidia-offload" ''
|
||||
export __NV_PRIME_RENDER_OFFLOAD=1
|
||||
export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0
|
||||
export __GLX_VENDOR_LIBRARY_NAME=nvidia
|
||||
export __VK_LAYER_NV_optimus=NVIDIA_only
|
||||
exec "$@"
|
||||
'')
|
||||
])
|
||||
++ (with pkgs-stable; [
|
||||
loupe
|
||||
|
||||
@ -5,10 +5,10 @@
|
||||
...
|
||||
}: {
|
||||
options = {
|
||||
program.firefox.enable = lib.mkEnableOption "enable Firefox module";
|
||||
firefox.enable = lib.mkEnableOption "enable Firefox module";
|
||||
};
|
||||
|
||||
config = lib.mkIf config.program.firefox.enable {
|
||||
config = lib.mkIf config.firefox.enable {
|
||||
programs.firefox = {
|
||||
enable = true;
|
||||
|
||||
|
||||
@ -5,10 +5,10 @@
|
||||
...
|
||||
}: {
|
||||
options = {
|
||||
group.games.enable =
|
||||
games.enable =
|
||||
lib.mkEnableOption "enables games";
|
||||
};
|
||||
config = lib.mkIf config.group.games.enable {
|
||||
config = lib.mkIf config.games.enable {
|
||||
home.packages = with pkgs; [
|
||||
vitetris
|
||||
steam
|
||||
@ -16,6 +16,14 @@
|
||||
heroic
|
||||
wine
|
||||
|
||||
(writeShellScriptBin "nvidia-offload" ''
|
||||
export __NV_PRIME_RENDER_OFFLOAD=1
|
||||
export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0
|
||||
export __GLX_VENDOR_LIBRARY_NAME=nvidia
|
||||
export __VK_LAYER_NV_optimus=NVIDIA_only
|
||||
exec "$@"
|
||||
'')
|
||||
|
||||
(writeShellScriptBin "gs" ''
|
||||
set -xeuo pipefail
|
||||
|
||||
|
||||
@ -5,10 +5,10 @@
|
||||
...
|
||||
}: {
|
||||
options = {
|
||||
group.hacking.enable = lib.mkEnableOption "enable Hacking module";
|
||||
hacking.enable = lib.mkEnableOption "enable Hacking module";
|
||||
};
|
||||
|
||||
config = lib.mkIf config.group.hacking.enable {
|
||||
config = lib.mkIf config.hacking.enable {
|
||||
home.packages = with pkgs; [
|
||||
ffuf
|
||||
wireshark
|
||||
|
||||
@ -9,16 +9,15 @@
|
||||
./games.nix
|
||||
./terminal_tools.nix
|
||||
./applications.nix
|
||||
./applications/firefox.nix
|
||||
];
|
||||
|
||||
group.terminal_tools.enable = lib.mkDefault true;
|
||||
group.programming.enable = lib.mkDefault true;
|
||||
group.games.enable = lib.mkDefault false;
|
||||
group.applications.enable = lib.mkDefault true;
|
||||
group.hacking.enable = lib.mkDefault true;
|
||||
|
||||
program.firefox.enable = lib.mkDefault true;
|
||||
terminal_tools.enable = lib.mkDefault true;
|
||||
programming.enable = lib.mkDefault true;
|
||||
games.enable = lib.mkDefault false;
|
||||
firefox.enable = lib.mkDefault true;
|
||||
applications.enable = lib.mkDefault true;
|
||||
hacking.enable = lib.mkDefault true;
|
||||
#programs.neovim.enable = true;
|
||||
|
||||
home.packages = with pkgs; [
|
||||
alejandra
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
{
|
||||
pkgs,
|
||||
pkgs-stable,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
@ -43,7 +42,7 @@
|
||||
"workbench.iconTheme" = "material-icon-theme";
|
||||
"workbench.productIconTheme" = "material-product-icons";
|
||||
"window.menuBarVisibility" = "toggle";
|
||||
"github.copilot.editor.enableAutoCompletions" = false;
|
||||
"github.copilot.editor.enableAutoCompletions" = true;
|
||||
"[json]" = {
|
||||
"editor.defaultFormatter" = "esbenp.prettier-vscode";
|
||||
};
|
||||
@ -78,7 +77,7 @@
|
||||
};
|
||||
};
|
||||
|
||||
extensions = with pkgs-stable.vscode-extensions; [
|
||||
extensions = with pkgs.vscode-extensions; [
|
||||
ms-azuretools.vscode-docker
|
||||
|
||||
# Mardown
|
||||
|
||||
@ -1,6 +0,0 @@
|
||||
{lib}:
|
||||
{
|
||||
options = {
|
||||
neovim = lib.mkEnableOption "neovim";
|
||||
};
|
||||
}
|
||||
@ -6,7 +6,7 @@
|
||||
}: {
|
||||
|
||||
options = {
|
||||
group.programming.enable =
|
||||
programming.enable =
|
||||
lib.mkEnableOption "enable programming toolset";
|
||||
};
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
./git.nix
|
||||
];
|
||||
|
||||
config = lib.mkIf config.group.programming.enable {
|
||||
config = lib.mkIf config.programming.enable {
|
||||
|
||||
program.vscode.enable = lib.mkDefault true;
|
||||
program.git.enable = lib.mkDefault true;
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
...
|
||||
}: {
|
||||
options = {
|
||||
group.terminal_tools.enable =
|
||||
terminal_tools.enable =
|
||||
lib.mkEnableOption "enable terminal tools module";
|
||||
};
|
||||
|
||||
@ -14,10 +14,9 @@
|
||||
./tools/shell.nix
|
||||
./tools/kitty.nix
|
||||
./tools/tmux.nix
|
||||
./tools/zoxide.nix
|
||||
];
|
||||
|
||||
config = lib.mkIf config.group.terminal_tools.enable {
|
||||
config = lib.mkIf config.terminal_tools.enable {
|
||||
|
||||
sh.bash = {
|
||||
enable = lib.mkDefault true;
|
||||
@ -27,7 +26,6 @@
|
||||
program = {
|
||||
kitty.enable = lib.mkDefault true;
|
||||
tmux.enable = lib.mkDefault true;
|
||||
zoxide.enable = lib.mkDefault true;
|
||||
};
|
||||
|
||||
programs = {
|
||||
@ -41,9 +39,15 @@
|
||||
btop.enable = true;
|
||||
fzf.enable = true;
|
||||
neovim.enable = true;
|
||||
tmux.enable = true;
|
||||
spicetify.enable = true;
|
||||
};
|
||||
|
||||
programs.zoxide = {
|
||||
enable = true;
|
||||
enableBashIntegration = true;
|
||||
};
|
||||
|
||||
home.packages = with pkgs; [
|
||||
pfetch
|
||||
zoxide
|
||||
|
||||
@ -9,9 +9,6 @@
|
||||
};
|
||||
|
||||
config = lib.mkIf config.program.tmux.enable {
|
||||
|
||||
stylix.targets.tmux.enable = true;
|
||||
|
||||
programs.tmux = {
|
||||
enable = true;
|
||||
clock24 = true;
|
||||
@ -34,10 +31,10 @@
|
||||
'';
|
||||
}
|
||||
|
||||
#pkgs.tmuxPlugins.tmux-fzf
|
||||
pkgs.tmuxPlugins.sensible
|
||||
pkgs.tmuxPlugins.yank
|
||||
#pkgs.tmuxPlugins.jump
|
||||
#pkgs.tmuxPlugins.tmux-fzf
|
||||
pkgs.tmuxPlugins.jump
|
||||
];
|
||||
|
||||
extraConfig = ''
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
{lib, config, ...}:
|
||||
{
|
||||
options = {
|
||||
program.zoxide.enable = lib.mkEnableOption "zoxide";
|
||||
};
|
||||
|
||||
config = lib.mkIf config.program.zoxide.enable {
|
||||
programs.zoxide = {
|
||||
enable = true;
|
||||
enableBashIntegration = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user