dhimas/nixos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update

Browse Source
This commit is contained in:
Hadi 2024-06-27 19:42:08 +02:00
parent ae6818ed65
commit 84f87f9833
13 changed files with 138 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/APPS.md
View File

@ -8,7 +8,7 @@ The laptop configuration is used by an Omen 16 laptop w/ nvidia and an amd gpu r
The configurations files can be found in the `hosts/laptop` directory.
| Category | Name |
|----------------|---------------|
|-----------------------------------------|----------------|
| WM | Hyprland |
| | hyprlock |
| | hyprpaper |

18
docs/KEYBINDINGS.md
View File

@ -3,15 +3,15 @@
The list of the keybindings working on Hyprland:
| Description | Keybinding | Command |
| -- | -- | -- |
|-----------------------------|------------------------|--------------------------------------------------------------------|
| Switch Workspace | SUPER + {Number} | workspace {Number} |
| Move app to Workspace | SUPER SHIFT + {Number} | movetoworkspace {Number} |
| Kitty | SUPER + RETURN | exec ${pkgs.kitty}/bin/kitty |
| Thunar | SUPER + E | exec ${pkgs.xfce.thunar}/bin/thunar |
| Qutebrowser | SUPER + B | exec ${pkgs.qutebrowser}/bin/qutebrowser |
| Bitwarden | SUPER + K | exec ${pkgs.bitwarden}/bin/bitwarden |
| Peaclock | SUPER + C | exec ${pkgs.kitty}/bin/kitty --class peaclock peaclock |
| Lock | SUPER + L | exec ${pkgs.hyprlock}/bin/hyprlock |
| Kitty | SUPER + RETURN | exec \${pkgs.kitty}/bin/kitty |
| Thunar | SUPER + E | exec \${pkgs.xfce.thunar}/bin/thunar |
| Qutebrowser | SUPER + B | exec \${pkgs.qutebrowser}/bin/qutebrowser |
| Bitwarden | SUPER + K | exec \${pkgs.bitwarden}/bin/bitwarden |
| Peaclock | SUPER + C | exec \${pkgs.kitty}/bin/kitty --class peaclock peaclock |
| Lock | SUPER + L | exec \${pkgs.hyprlock}/bin/hyprlock |
| Powermenu | SUPER + X | exec powermenu |
| Launcher | SUPER + SPACE | exec menu |
| Close window | SUPER + Q | killactive |
@ -27,11 +27,11 @@ The list of the keybindings working on Hyprland:
| Screenshot region then edit | ALT PRINT | exec screenshot region swappy |
| Turn off night shift | SUPER + F2 | exec night-shift-off |
| Turn on night shift | SUPER + F3 | exec night-shift-on |
| Choose sound output | SUPER + F5 | exec ${pkgs.kitty}/bin/kitty --class floating zsh -c sound-output |
| Choose sound output | SUPER + F5 | exec \${pkgs.kitty}/bin/kitty --class floating zsh -c sound-output |
| Move Window (mouse) | SUPER + mouse:272 | movewindow |
| Resize Window (mouse) | SUPER + R | resizewindow |
| Toggle Mute | XF86AudioMute | exec sound-toggle |
| Lock when closing Lid | switch:Lid Switch | exec ${pkgs.hyprlock}/bin/hyprlock |
| Lock when closing Lid | switch:Lid Switch | exec \${pkgs.hyprlock}/bin/hyprlock |
| Sound Up | XF86AudioRaiseVolume | exec sound-up |
| Sound Down | XF86AudioLowerVolume | exec sound-down |
| Brightness Up | XF86MonBrightnessUp | exec brightness-up |

5
docs/TODO.md
View File

@ -10,13 +10,14 @@ feel free to contribute <3 ([CONTRIBUTING.md](CONTRIBUTING.md))
- [ ] macOS theme
- [~] Tofi (Wofi, but terminal based)
- [ ] Add Vim Keybindings to KEYBINDINGS.md
- [ ] Keybindings with Icons
- [ ] Qutebrowser
- [~] Bitwarden integration (I need this.)
- [ ] Waybar
- [~] Caffeine status
- [ ] Night-shift status
- [ ] Caffeine status on click
- [ ] Night-shift status on click
- [ ] Hyprland
- [ ] Implement Hyprcursor (see home/system/hyprland/hyprcursor.nix: Not working, small cursor on some apps, big one on others)

3
docs/scripts/keybindings_to_markdown.sh
View File

@ -59,3 +59,6 @@ echo "$keybindings" | while read line; do
echo "| $comment | $mod$key | $dispatcher $params |" >>"$KEYBINDINGS_FILE"
done
pandoc -t commonmark_x "$KEYBINDINGS_FILE" -o "/tmp/keybindings.md"
mv "/tmp/keybindings.md" "$KEYBINDINGS_FILE"

2
home/programs/nvim/default.nix
View File

@ -24,7 +24,7 @@
./plugins/noice.nix
./plugins/obsidian.nix
./plugins/image.nix
./plugins/ltex.nix
# ./plugins/ltex.nix
./plugins/flash.nix
./plugins/zen-mode.nix
./options.nix

6
home/programs/nvim/keymaps.nix
View File

@ -10,7 +10,11 @@
action = "<CMD>lua vim.lsp.buf.format()<CR>";
options.desc = "LSP Format";
}
{
key = "<leader>ox";
action = "vip:!pandoc -t commonmark_x<cr>";
options.desc = "Format Markdown Tables";
}
{
key = "<leader>ot";
action = "<cmd>lua require('obsidian').util.toggle_checkbox()<cr>";

4
home/programs/nvim/plugins/lsp.nix
View File

@ -13,9 +13,9 @@
svelte.enable = true;
marksman.enable = true;
ltex = {
enable = true;
enable = false;
settings = {
enabled = true;
enabled = false;
language = "en";
};
};

11
home/scripts/caffeine/default.nix
View File

@ -17,4 +17,13 @@ let
notif "caffeine" "$message"
'';
in { home.packages = [ caffeine-status caffeine ]; }
caffeine-status-icon = pkgs.writeShellScriptBin "caffeine-status-icon" ''
status=$(caffeine-status)
if [[ $status == "active" ]]; then
echo "󰅶"
else
echo "󰾪"
fi
'';
in { home.packages = [ caffeine-status caffeine caffeine-status-icon ]; }

20
home/scripts/night-shift/default.nix
View File

@ -24,11 +24,27 @@ let
'';
night-shift-status = pkgs.writeShellScriptBin "night-shift-status" ''
if pgrep wlsunset; then
if [[ $(pgrep wlsunset) ]]; then
echo "1"
else
echo "0"
fi
'';
in { home.packages = [ night-shift-on night-shift-off night-shift-toggle night-shift-status ]; }
night-shift-status-icon =
pkgs.writeShellScriptBin "night-shift-status-icon" ''
if [[ $(pgrep wlsunset) ]]; then
echo "󰖔"
else
echo "󰖕"
fi
'';
in {
home.packages = [
night-shift-on
night-shift-off
night-shift-toggle
night-shift-status
night-shift-status-icon
];
}

1
home/system/udiskie/default.nix
View File

@ -1,7 +1,6 @@
{
services.udiskie = {
enable = true;
tray = "always";
notify = true;
automount = true;
};

36
home/system/waybar/default.nix
View File

@ -33,8 +33,16 @@
height = 44;
modules-left = [ "custom/logo" "hyprland/window" ];
modules-center = [ "hyprland/workspaces" ];
modules-right =
[ "tray" "backlight" "pulseaudio" "battery" "clock" "custom/power" ];
modules-right = [
"tray"
"backlight"
"pulseaudio"
"custom/caffeine"
"custom/night-shift"
"battery"
"clock"
"custom/power"
];
"wlr/taskbar" = {
format = "{icon}";
@ -124,14 +132,20 @@
tooltip = false;
on-click = "powermenu";
};
# "custom/caffeine": {
# "format": "{}",
# "max-length": 5,
# "interval": 10,
# "exec": "caffeine-status-icon",
# "exec-if": "pgrep spotify",
# "return-type": ""
#}
"custom/caffeine" = {
format = "{}";
max-length = 5;
interval = 10;
exec = "caffeine-status-icon";
# exec-if = "pgrep spotify";
# return-type = "";
};
"custom/night-shift" = {
format = "{}";
max-length = 5;
interval = 10;
exec = "night-shift-status-icon";
};
backlight = {
device = "nvidia_0";
format = "{icon}";
@ -218,6 +232,8 @@
#memory,
#custom-power,
#custom-caffeine,
#custom-night-shift,
#battery,
#backlight,
#pulseaudio,

1
hosts/laptop/home.nix
View File

@ -78,6 +78,7 @@
optipng
pfetch
usbutils
pandoc
# Just cool
peaclock

14
hosts/modules/variables-configtest.nix
View File

@ -1,13 +1,6 @@
{ lib, ... }: {
options = {
var = {
hostname = lib.mkOption {
type = lib.types.string;
default = "";
description = "";
};
hostname = lib.mkOption {
type = lib.types.string;
default = "nixy";
@ -26,7 +19,6 @@
description = "Home directory (/home/user)";
};
configDirectory = lib.mkOption {
type = lib.types.string;
default = "/home/user/.config/nixos";
@ -78,13 +70,15 @@
sops = lib.mkOption {
type = lib.types.bool;
default = false;
description = "Enable sops (You should set up sops for your own config)";
description =
"Enable sops (You should set up sops for your own config)";
};
obsidian = lib.mkOption {
type = lib.types.bool;
default = false;
description = "Enable obsidian.nvim (You should set up obsidian.nvim for your own config)";
description =
"Enable obsidian.nvim (You should set up obsidian.nvim for your own config)";
};
tailscale = lib.mkOption {