From 474776c9f1c97d0caa23179dd87ce966b14038ec Mon Sep 17 00:00:00 2001 From: OCbwoy3 Date: Wed, 20 Aug 2025 18:10:58 +0300 Subject: [PATCH] part 1 - selfhost: windows -> nix --- config/hypr/config/keybindings/default.conf | 22 ++++++++++----------- config/hypr/config/keybindings/other.conf | 10 ++++++---- flake.lock | 12 +++++------ flake.nix | 11 +++++++++++ hosts/default/configuration.nix | 2 ++ hosts/server/configuration.nix | 2 +- modules/nixos/programs.nix | 5 +---- 7 files changed, 37 insertions(+), 27 deletions(-) diff --git a/config/hypr/config/keybindings/default.conf b/config/hypr/config/keybindings/default.conf index b6f01dd..55270d7 100644 --- a/config/hypr/config/keybindings/default.conf +++ b/config/hypr/config/keybindings/default.conf @@ -62,17 +62,15 @@ bind = $mainMod SHIFT, 9, movetoworkspace, 9 bind = $mainMod SHIFT, 0, movetoworkspace, 10 # Function keys ( FN + F[1-12] ) -bind = , XF86MonBrightnessUp, exec, brightnessctl -q s +10% -bind = , XF86MonBrightnessDown, exec, brightnessctl -q s 10%- -bind = , XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+ -bind = , XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- -bind = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle -bind = , XF86AudioPlay, exec, playerctl -p cider,OCbwoy3_s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone play-pause -bind = , XF86AudioPause, exec, playerctl -p cider,OCbwoy3_s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone pause -bind = , XF86AudioNext, exec, playerctl -p cider,OCbwoy3_s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone next -bind = , XF86AudioPrev, exec, playerctl -p cider,OCbwoy3_s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone previous -bind = , XF86AudioMicMute, exec, pactl set-source-mute @DEFAULT_SOURCE@ toggle -bind = , XF86Calculator, exec, qalculate-gtk +bindl = , XF86MonBrightnessUp, exec, brightnessctl -q s +10% +bindl = , XF86MonBrightnessDown, exec, brightnessctl -q s 10%- +bindl = , XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+ +bindl = , XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- +bindl = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle +bindl = , XF86AudioPlay, exec, playerctl -p cider,OCbwoy3_s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone play-pause +bindl = , XF86AudioPause, exec, playerctl -p cider,OCbwoy3_s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone pause +bindl = , XF86AudioNext, exec, playerctl -p cider,OCbwoy3_s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone next +bindl = , XF86AudioPrev, exec, playerctl -p cider,OCbwoy3_s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone previous +bindl = , XF86AudioMicMute, exec, pactl set-source-mute @DEFAULT_SOURCE@ toggle bind = , XF86Lock, exec, hyprlock -bind = , XF86Tools, exec, flatpak run com.valvesoftware.Steam diff --git a/config/hypr/config/keybindings/other.conf b/config/hypr/config/keybindings/other.conf index fdbd126..1843d8c 100644 --- a/config/hypr/config/keybindings/other.conf +++ b/config/hypr/config/keybindings/other.conf @@ -9,17 +9,19 @@ bind = $mainMod SHIFT, GRAVE, movetoworkspace, special:music bind = $mainMod SHIFT, B, exec, bash ~/config/scripts/hot-reload.sh # Wallpaper -bind = $mainMod SHIFT, RETURN, exec, bash ~/config/scripts/select-wallpaper.sh +bind = $mainMod SHIFT, RETURN, exec, pkill wofi || bash ~/config/scripts/select-wallpaper.sh # Screenshot keybinds bind = $mainMod, PRINT, exec, bash ~/config/scripts/screenshot-selection.sh bind = $mainMod SHIFT, PRINT, exec, bash ~/config/scripts/screenshot-fullscreen.sh bind = $mainMod CTRL SHIFT, PRINT, exec, bash ~/config/scripts/edit-last-screenshot.sh +# Global shit +bind = ALT, F9, pass, class:^(com\.obsproject\.Studio)$ # Music volume control -bind = $mainMod, XF86AudioRaiseVolume, exec, playerctl -p cider,OCbwoy3_s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone volume 0.02+ -bind = $mainMod, XF86AudioLowerVolume, exec, playerctl -p cider,OCbwoy3_s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone volume 0.02- +bindl = $mainMod, XF86AudioRaiseVolume, exec, playerctl -p cider,OCbwoy3_s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone volume 0.02+ +bindl = $mainMod, XF86AudioLowerVolume, exec, playerctl -p cider,OCbwoy3_s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone volume 0.02- # Screen locker and logout keybinds bind = CTRL ALT, DELETE, exec, wlogout @@ -46,7 +48,7 @@ bind = $mainMod, F2, exec, bash -c "xdg-open roblox://" bind = $mainMod, F5, exec, notify-send -u critical "Hyprland" "Enabled debug overlay" && hyprctl keyword debug:overlay 1 # bind = $mainMod SHIFT, F3, exec, bash -c "NIXPKGS_ALLOW_UNFREE=1 nix-shell -p osu-lazer-bin --command osu\!" -bind = $mainMod CTRL SHIFT, F9, exec, bash $HOME/config/scripts/open-roblox-game.sh +bind = $mainMod CTRL SHIFT, F9, exec, pkill wofi || bash $HOME/config/scripts/open-roblox-game.sh bind = $mainMod SHIFT, F, fullscreen, 1 bind = $mainMod, SPACE, exec, bash $HOME/config/scripts/toggle-language.sh diff --git a/flake.lock b/flake.lock index 8ceb230..78d66ac 100644 --- a/flake.lock +++ b/flake.lock @@ -92,11 +92,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1752490162, - "narHash": "sha256-CFOuAHbc9PTt9HhjGQFf07bUCZKOahQ+vLt30J6u5fw=", + "lastModified": 1755511413, + "narHash": "sha256-cBBF+nwGrSroN6ZewHPFaSThyCvwBxSZMdYEH8DxDx8=", "owner": "catppuccin", "repo": "nix", - "rev": "7dc907c010e1612729c5d76cf614b5f7811bfe23", + "rev": "ca11a19d4e1d2ba5e6162f40cb71288551fd51dd", "type": "github" }, "original": { @@ -850,11 +850,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1750776420, - "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=", + "lastModified": 1755027561, + "narHash": "sha256-IVft239Bc8p8Dtvf7UAACMG5P3ZV+3/aO28gXpGtMXI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf", + "rev": "005433b926e16227259a1843015b5b2b7f7d1fc3", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f8d9f47..9db179b 100644 --- a/flake.nix +++ b/flake.nix @@ -62,6 +62,17 @@ ./hosts/default/configuration.nix ]; }; + nixosConfigurations.server = nixpkgs.lib.nixosSystem { + specialArgs = { + inherit inputs; + }; + modules = [ + # lil hack to not use --impure when rebuilding nixos >:3 + "/etc/nixos/hardware-configuration.nix" + + ./hosts/server/configuration.nix + ]; + }; nixosConfigurations.fix_nixpkgs = nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs; diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index b511949..16cfcd8 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -19,6 +19,8 @@ inputs.nvf.nixosModules.default ]; + services.displayManager.gdm.enable = true; + programs.nvf = { enable = true; defaultEditor = true; diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix index 48bc289..4ce45a1 100644 --- a/hosts/server/configuration.nix +++ b/hosts/server/configuration.nix @@ -17,7 +17,7 @@ networking.firewall = { enable = true; - allowedTCPPorts = [ 8080 443 25565 ]; + allowedTCPPorts = [ 22 443 8080 25565 ]; allowedUDPPorts = [ ]; } diff --git a/modules/nixos/programs.nix b/modules/nixos/programs.nix index 14a8f75..f17cf17 100644 --- a/modules/nixos/programs.nix +++ b/modules/nixos/programs.nix @@ -18,8 +18,6 @@ # services.displayManager.defaultSession = "hyprland"; - services.displayManager.gdm.enable = true; - programs.zsh.enable = true; programs.direnv = { @@ -40,8 +38,7 @@ services.openssh = { enable = true; - ports = [ ]; - banner = "bro fuck off"; + ports = [ 22 ]; }; security.sudo.enable = true;