diff --git a/alien-hardware-configuration.nix b/alien-hardware-configuration.nix
index 3c8f541..cd4a797 100644
--- a/alien-hardware-configuration.nix
+++ b/alien-hardware-configuration.nix
@@ -25,9 +25,6 @@
networking.wireless.enable = false;
# nixpkgs.config.allowUnfree = true;
hardware.enableAllFirmware = true;
- services.gnome.gnome-keyring.enable = true;
- security.pam.services.login.enableGnomeKeyring = true;
- security.polkit.enable = true;
boot.kernelPackages = pkgs.linuxPackages_latest;
boot.extraModprobeConfig = ''
diff --git a/client-configuration.nix b/client-configuration.nix
index 42f8f96..e4effcb 100644
--- a/client-configuration.nix
+++ b/client-configuration.nix
@@ -5,7 +5,20 @@
nixpkgs.config.allowUnfree = true;
nix.settings.experimental-features = [ "nix-command" "flakes" ];
- # programs.hyprland.enable = true;
+ programs.hyprland.enable = true;
+ xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; # GNOME-style file pickers
+ programs.dconf.profiles.user.databases = [{
+ settings."org/gnome/desktop/interface" = {
+ color-scheme = "prefer-dark";
+ gtk-theme = "Adwaita-dark";
+ icon-theme = "Adwaita";
+ cursor-theme = "Adwaita";
+ font-name = "Cantarell 11";
+ };
+ }];
+ qt = { enable = true; platformTheme = "gnome"; style = "adwaita-dark"; };
+
+
programs.steam = {
enable = true;
remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
@@ -16,7 +29,7 @@
programs.neovim = {
enable = true;
defaultEditor = true;
- };
+ };
@@ -71,88 +84,167 @@
home.stateVersion = "25.11";
- programs.waybar = {
- enable = false;
+
+ wayland.windowManager.hyprland = {
+ enable = true;
+ package = null; # use the one from programs.hyprland
+ portalPackage = null; # same, avoids version conflicts
+
settings = {
- mainBar = {
- layer = "top";
- position = "top";
- height = 24;
- margin-top = 0;
- margin-left = 0;
- margin-right = 0;
- spacing = 4;
-
- modules-left = [ "niri/workspaces" "niri/window" ];
- modules-center = [];
- modules-right = [ "cpu" "memory" "tray" "battery" "pulseaudio" "clock" ];
-
- "niri/workspaces" = {
- format = "{index}";
- active-only = true;
- };
-
- "clock" = {
- format = "{:%H:%M | %a %d}";
- tooltip-format = "{:%Y %B}\n{calendar}";
- };
-
- "pulseaudio" = {
- format = "{icon} {volume}%";
- format-muted = "";
- format-icons = {
- default = [ "" "" "" ];
- };
- on-click = "pavucontrol";
- };
-
- "cpu" = { format = " {usage}%"; };
- "memory" = { format = " {percentage}%"; };
-
- "battery" = {
- states = { critical = 15; };
- format = "{icon} {capacity}%";
- format-icons = [ "" "" "" "" "" ];
- };
+ exec-once = [ "waybar" "mako" "nm-applet" "hypridle" ];
+
+ env = [ "XCURSOR_THEME,Adwaita" "XCURSOR_SIZE,24" ];
+
+ misc = {
+ force_default_wallpaper = 0;
+ background_color = "rgb(1e1e1e)";
};
+
+ general = {
+ gaps_in = 4;
+ gaps_out = 8;
+ border_size = 1;
+ "col.active_border" = "rgba(ffffff22)";
+ "col.inactive_border" = "rgba(ffffff0a)";
+ };
+
+ decoration = {
+ rounding = 12;
+ shadow = {
+ enabled = true;
+ range = 20;
+ render_power = 3;
+ color = "rgba(00000066)";
+ };
+ blur.enabled = false;
+ };
+
+ animations = {
+ enabled = true;
+ bezier = [ "gnome, 0.25, 1, 0.5, 1" ];
+ animation = [
+ "windows, 1, 4, gnome, popin 90%"
+ "workspaces, 1, 4, gnome, slide"
+ "fade, 1, 3, gnome"
+ ];
+ };
+
+ "$mod" = "SUPER";
+
+ bind = [
+ "$mod, Return, exec, ghostty"
+ "$mod, D, exec, fuzzel"
+ "$mod, Q, killactive"
+ "$mod SHIFT, E, exit"
+ "$mod, F, fullscreen"
+ "$mod, V, togglefloating"
+
+ # focus
+ "$mod, H, movefocus, l"
+ "$mod, L, movefocus, r"
+ "$mod, K, movefocus, u"
+ "$mod, J, movefocus, d"
+
+ # workspaces
+ "$mod, 1, workspace, 1"
+ "$mod, 2, workspace, 2"
+ "$mod, 3, workspace, 3"
+ "$mod SHIFT, 1, movetoworkspace, 1"
+ "$mod SHIFT, 2, movetoworkspace, 2"
+ "$mod SHIFT, 3, movetoworkspace, 3"
+ ];
+
+ # drag/resize windows with Super + mouse
+ bindm = [
+ "$mod, mouse:272, movewindow"
+ "$mod, mouse:273, resizewindow"
+ ];
+
};
-
- style = ''
- * {
- font-family: "JetBrainsMono Nerd Font";
- font-size: 15px;
- border: none;
- border-radius: 0;
- }
-
- window#waybar {
- background: #000;
- color: #cdd6f4;
- }
-
- #workspaces button {
- padding: 0 8px;
- color: #bac2de;
- }
-
- #workspaces button.focused {
- color: #7fc8ff;
- background: rgba(127, 200, 255, 0.1);
- border-bottom: 2px solid #7fc8ff;
- }
-
- #clock, #cpu, #memory, #pulseaudio, #battery {
- padding: 0 10px;
- margin: 4px 2px;
- }
-
- #clock {
- font-weight: bold;
- color: #89b4fa;
- }
- '';
};
+# programs.waybar = {
+# enable = false;
+# settings = {
+# mainBar = {
+# layer = "top";
+# position = "top";
+# height = 24;
+# margin-top = 0;
+# margin-left = 0;
+# margin-right = 0;
+# spacing = 4;
+#
+# modules-left = [ "niri/workspaces" "niri/window" ];
+# modules-center = [];
+# modules-right = [ "cpu" "memory" "tray" "battery" "pulseaudio" "clock" ];
+#
+# "niri/workspaces" = {
+# format = "{index}";
+# active-only = true;
+# };
+#
+# "clock" = {
+# format = "{:%H:%M | %a %d}";
+# tooltip-format = "{:%Y %B}\n{calendar}";
+# };
+#
+# "pulseaudio" = {
+# format = "{icon} {volume}%";
+# format-muted = "";
+# format-icons = {
+# default = [ "" "" "" ];
+# };
+# on-click = "pavucontrol";
+# };
+#
+# "cpu" = { format = " {usage}%"; };
+# "memory" = { format = " {percentage}%"; };
+#
+# "battery" = {
+# states = { critical = 15; };
+# format = "{icon} {capacity}%";
+# format-icons = [ "" "" "" "" "" ];
+# };
+# };
+# };
+#
+# style = ''
+# * {
+# font-family: "JetBrainsMono Nerd Font";
+# font-size: 15px;
+# border: none;
+# border-radius: 0;
+# }
+#
+# window#waybar {
+# background: #000;
+# color: #cdd6f4;
+# }
+#
+# #workspaces button {
+# padding: 0 8px;
+# color: #bac2de;
+# }
+#
+# #workspaces button.focused {
+# color: #7fc8ff;
+# background: rgba(127, 200, 255, 0.1);
+# border-bottom: 2px solid #7fc8ff;
+# }
+#
+# #clock, #cpu, #memory, #pulseaudio, #battery {
+# padding: 0 10px;
+# margin: 4px 2px;
+# }
+#
+# #clock {
+# font-weight: bold;
+# color: #89b4fa;
+# }
+# '';
+# };
+
programs.neovim = { # Configure nvim
enable = true;
extraConfig = ''
@@ -216,26 +308,24 @@
nixfmt # nix file formatting
openrgb # RGB editor
furmark # Room heater
- obsidian # note taking
gcc
xauth
- burpsuite
python3
direnv # develop projects in custom environments
# hyprshot # screenshots
- binaryninja-free # broke ahh cracker
patchelf # make programs understand nix. good for downloaded executables such as crackmes
- starsector # support indie games!
htop
ripgrep
+ obsidian # note taking
mullvad-vpn # arrr
qbittorrent # arrr
+ binaryninja-free # broke ahh cracker
mpv # arrr
+ starsector
+ burpsuite
wireshark
obs-studio
slack
- scrcpy # phone rdp
- android-tools # phone rdp
wireguard-tools
blender # drone
gnumake # make & makefile
@@ -253,10 +343,9 @@
dunst
libnotify
rofi
- alacritty
+ ghostty
ncdu
nmap
- kitty
git
unzip
pavucontrol # PulseAudio Volume Control
@@ -271,7 +360,10 @@
tmux
ripgrep
thunderbird
- gnomeExtensions.pop-shell
+ waybar fuzzel mako hyprlock hypridle
+ adwaita-icon-theme gnome-themes-extra
+ networkmanagerapplet pavucontrol brightnessctl
+ wl-clipboard grim slurp nautilus
];
@@ -291,12 +383,16 @@
};
services.ollama = {
- enable = true;
+ enable = false;
package = pkgs.ollama;
acceleration = "rocm";
host = "0.0.0.0";
};
+ services.gnome.gnome-keyring.enable = true;
+ security.pam.services.login.enableGnomeKeyring = true;
+ security.polkit.enable = true;
+
services.pulseaudio.enable = false; # Use Pipewire
services.pipewire = {
enable = true;
@@ -305,29 +401,6 @@
jack.enable = false;
};
- # networking = {
- # interfaces.eno1 = {
- # ipv4.addresses = [{
- # address = "192.168.2.100";
- # prefixLength = 24;
- # }];
- # };
- # defaultGateway = {
- # address = "192.168.2.1";
- # interface = "eno1";
- # };
- # # interfaces.ens3 = {
- # # ipv4.addresses = [{
- # # address = "10.40.0.132";
- # # prefixLength = 24;
- # # }];
- # # };
- # # defaultGateway = {
- # # address = "10.40.0.1";
- # # interface = "wlp10s0";
- # # };
- # };
-
security.rtkit.enable = true; # Enable RealtimeKit for audio purposes
@@ -372,11 +445,9 @@
# Enable OpenSSH daemon
services.openssh = {
enable = true;
- ports = [2121];
settings.X11Forwarding = true;
};
- networking.firewall.allowedTCPPorts = [2121];
networking.networkmanager.enable = true;
networking.extraHosts = ''
10.0.1.51 freeipa.bsidestoctf.com
@@ -410,7 +481,8 @@
services.displayManager.gdm.enable = true;
- services.desktopManager.gnome.enable = true;
+ #services.desktopManager.gnome.enable = true;
+ #services.desktopManager.cosmic.enable = true;
services.gnome.core-apps.enable = true;
services.gnome.core-developer-tools.enable = false;
services.gnome.games.enable = false;
diff --git a/shared-configuration.nix b/shared-configuration.nix
index cfa4fb2..2555257 100644
--- a/shared-configuration.nix
+++ b/shared-configuration.nix
@@ -44,6 +44,7 @@
};
virtualisation.memorySize = 4096; # MB
virtualisation.cores = 4;
+ security.sudo.wheelNeedsPassword = false;
};
}