Compare commits

...

4 Commits

Author SHA1 Message Date
4b2d5a48be moar themes 2025-03-18 22:24:57 -04:00
072c398f18 i fix 2025-03-18 22:13:36 -04:00
1318259220 fix quirks 2025-03-18 21:34:58 -04:00
80b3ce324d changes 2025-03-18 21:33:20 -04:00
11 changed files with 111 additions and 358 deletions

View File

@ -1,274 +0,0 @@
################
### MONITORS ###
################
# See https://wiki.hyprland.org/Configuring/Monitors/
monitor = DP-2, 2560x1440@144, 0x0, 1
monitor = HDMI-A-2, 2560x1440@60, auto-left, 1
###################
### MY PROGRAMS ###
###################
# See https://wiki.hyprland.org/Configuring/Keywords/
# Set programs that you use
$terminal = kitty
$fileManager = dolphin
$menu = rofi -show run
#################
### AUTOSTART ###
#################
# Autostart necessary processes (like notifications daemons, status bars, etc.)
# Or execute your favorite apps at launch like this:
exec-once = $terminal
# exec-once = nm-applet &
exec-once = waybar & brave & equibop
#############################
### ENVIRONMENT VARIABLES ###
#############################
# See https://wiki.hyprland.org/Configuring/Environment-variables/
env = XCURSOR_SIZE,24
env = HYPRCURSOR_SIZE,24
#####################
### LOOK AND FEEL ###
#####################
# Refer to https://wiki.hyprland.org/Configuring/Variables/
# https://wiki.hyprland.org/Configuring/Variables/#general
general {
gaps_in = 5
gaps_out = 20
border_size = 2
# https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors
col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
col.inactive_border = rgba(595959aa)
# Set to true enable resizing windows by clicking and dragging on borders and gaps
resize_on_border = false
# Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on
allow_tearing = false
layout = dwindle
}
# https://wiki.hyprland.org/Configuring/Variables/#decoration
decoration {
rounding = 10
# Change transparency of focused and unfocused windows
active_opacity = 1.0
inactive_opacity = 1.0
shadow {
enabled = true
range = 4
render_power = 3
color = rgba(1a1a1aee)
}
# https://wiki.hyprland.org/Configuring/Variables/#blur
blur {
enabled = true
size = 3
passes = 1
vibrancy = 0.1696
}
}
# https://wiki.hyprland.org/Configuring/Variables/#animations
animations {
enabled = yes, please :)
# Default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more
bezier = easeOutQuint,0.23,1,0.32,1
bezier = easeInOutCubic,0.65,0.05,0.36,1
bezier = linear,0,0,1,1
bezier = almostLinear,0.5,0.5,0.75,1.0
bezier = quick,0.15,0,0.1,1
animation = global, 1, 10, default
animation = border, 1, 5.39, easeOutQuint
animation = windows, 1, 4.79, easeOutQuint
animation = windowsIn, 1, 4.1, easeOutQuint, popin 87%
animation = windowsOut, 1, 1.49, linear, popin 87%
animation = fadeIn, 1, 1.73, almostLinear
animation = fadeOut, 1, 1.46, almostLinear
animation = fade, 1, 3.03, quick
animation = layers, 1, 3.81, easeOutQuint
animation = layersIn, 1, 4, easeOutQuint, fade
animation = layersOut, 1, 1.5, linear, fade
animation = fadeLayersIn, 1, 1.79, almostLinear
animation = fadeLayersOut, 1, 1.39, almostLinear
animation = workspaces, 1, 1.94, almostLinear, fade
animation = workspacesIn, 1, 1.21, almostLinear, fade
animation = workspacesOut, 1, 1.94, almostLinear, fade
}
# Ref https://wiki.hyprland.org/Configuring/Workspace-Rules/
# "Smart gaps" / "No gaps when only"
# uncomment all if you wish to use that.
# workspace = w[tv1], gapsout:0, gapsin:0
# workspace = f[1], gapsout:0, gapsin:0
# windowrulev2 = bordersize 0, floating:0, onworkspace:w[tv1]
# windowrulev2 = rounding 0, floating:0, onworkspace:w[tv1]
# windowrulev2 = bordersize 0, floating:0, onworkspace:f[1]
# windowrulev2 = rounding 0, floating:0, onworkspace:f[1]
# See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
dwindle {
pseudotile = true # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
preserve_split = true # You probably want this
}
# See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
master {
new_status = master
}
# https://wiki.hyprland.org/Configuring/Variables/#misc
misc {
force_default_wallpaper = -1 # Set to 0 or 1 to disable the anime mascot wallpapers
disable_hyprland_logo = false # If true disables the random hyprland logo / anime girl background. :(
}
#############
### INPUT ###
#############
# https://wiki.hyprland.org/Configuring/Variables/#input
input {
kb_layout = us
kb_variant =
kb_model =
kb_options =
kb_rules =
follow_mouse = 1
sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
touchpad {
natural_scroll = false
}
}
# https://wiki.hyprland.org/Configuring/Variables/#gestures
gestures {
workspace_swipe = false
}
# Example per-device config
# See https://wiki.hyprland.org/Configuring/Keywords/#per-device-input-configs for more
device {
name = epic-mouse-v1
sensitivity = -0.5
}
###################
### KEYBINDINGS ###
###################
# See https://wiki.hyprland.org/Configuring/Keywords/
$mainMod = SUPER # Sets "Windows" key as main modifier
# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
bind = $mainMod, Q, exec, $terminal
bind = $mainMod, C, killactive,
bind = $mainMod, M, exit,
bind = $mainMod, E, exec, $fileManager
bind = $mainMod, V, togglefloating,
bind = $mainMod, R, exec, $menu
bind = $mainMod, P, pseudo, # dwindle
bind = $mainMod, J, togglesplit, # dwindle
# Move focus with mainMod + arrow keys
bind = $mainMod, left, movefocus, l
bind = $mainMod, right, movefocus, r
bind = $mainMod, up, movefocus, u
bind = $mainMod, down, movefocus, d
plugin {
hyprsplit {
num_workspaces = 6
}
}
bind = SUPER, 1, split:workspace, 1
bind = SUPER, 2, split:workspace, 2
bind = SUPER, 3, split:workspace, 3
bind = SUPER, 4, split:workspace, 4
bind = SUPER, 5, split:workspace, 5
bind = SUPER, 6, split:workspace, 6
bind = SUPER SHIFT, 1, split:movetoworkspacesilent, 1
bind = SUPER SHIFT, 2, split:movetoworkspacesilent, 2
bind = SUPER SHIFT, 3, split:movetoworkspacesilent, 3
bind = SUPER SHIFT, 4, split:movetoworkspacesilent, 4
bind = SUPER SHIFT, 5, split:movetoworkspacesilent, 5
bind = SUPER SHIFT, 6, split:movetoworkspacesilent, 6
# Example special workspace (scratchpad)
bind = $mainMod, S, togglespecialworkspace, magic
bind = $mainMod SHIFT, S, movetoworkspace, special:magic
# Scroll through existing workspaces with mainMod + scroll
bind = $mainMod, mouse_down, workspace, e+1
bind = $mainMod, mouse_up, workspace, e-1
# Move/resize windows with mainMod + LMB/RMB and dragging
bindm = $mainMod, mouse:272, movewindow
bindm = $mainMod, mouse:273, resizewindow
# Laptop multimedia keys for volume and LCD brightness
bindel = ,XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+
bindel = ,XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
bindel = ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
bindel = ,XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle
bindel = ,XF86MonBrightnessUp, exec, brightnessctl s 10%+
bindel = ,XF86MonBrightnessDown, exec, brightnessctl s 10%-
# Requires playerctl
bindl = , XF86AudioNext, exec, playerctl next
bindl = , XF86AudioPause, exec, playerctl play-pause
bindl = , XF86AudioPlay, exec, playerctl play-pause
bindl = , XF86AudioPrev, exec, playerctl previous
##############################
### WINDOWS AND WORKSPACES ###
##############################
# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
# See https://wiki.hyprland.org/Configuring/Workspace-Rules/ for workspace rules
# Example windowrule v1
# windowrule = float, ^(kitty)$
# Example windowrule v2
# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
# Ignore maximize requests from apps. You'll probably like this.
windowrulev2 = suppressevent maximize, class:.*
# Fix some dragging issues with XWayland
windowrulev2 = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0

View File

@ -1,6 +1,6 @@
#!/bin/sh
sudo cp nixos/* /etc/nixos/
sudo nix flake update --flake /etc/nixos
sudo nixos-rebuild switch --flake /etc/nixos#nixos --commit-lock-file --upgrade
home-manager switch --flake /etc/nixos#srp@nixos
#nix flake update --flake /etc/nixos
sudo nixos-rebuild switch --flake /etc/nixos#nixos --commit-lock-file --upgrade --show-trace
home-manager switch --flake /etc/nixos#srp@nixos --show-trace

View File

@ -19,6 +19,7 @@
environment.sessionVariables = {
NIXOS_OZONE_WL = "1";
WLR_NO_HARDWARE_CURSORS = "1";
AQ_NO_ATOMIC="0";
};
environment.systemPackages = with pkgs; [
@ -30,6 +31,9 @@
hyprlock
hypridle
hyprpaper
hyprpolkitagent
xdg-desktop-portal-gtk
brave
zathura

36
nixos/flake.lock generated
View File

@ -73,11 +73,11 @@
]
},
"locked": {
"lastModified": 1738453229,
"narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
"lastModified": 1741352980,
"narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
"rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9",
"type": "github"
},
"original": {
@ -133,11 +133,11 @@
]
},
"locked": {
"lastModified": 1742305478,
"narHash": "sha256-iYCinzZnnUeCkZ031qGRwPdwRsqW6o9Y0MgGpA7Zva4=",
"lastModified": 1742326330,
"narHash": "sha256-Tumt3tcMXJniSh7tw2gW+WAnVLeB3WWm+E+yYFnLBXo=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "fb74bb76d94a6c55632376c931fc108131260ee9",
"rev": "22a36aa709de7dd42b562a433b9cefecf104a6ee",
"type": "github"
},
"original": {
@ -220,11 +220,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1742297408,
"narHash": "sha256-Xn3vzG7dhQlK26B0vUeModxYC8UD/6OhOi+5vqYV6Y4=",
"lastModified": 1742341588,
"narHash": "sha256-IlkAyfErpnTEUpjGhECfGp3t3HgF8KHBrJquOCdjp3M=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "cca0f48b74e87f86244f5773c42d9ade84683f3b",
"rev": "c8d80a292012f036e1a1d3eb3b0501e3e3917872",
"type": "github"
},
"original": {
@ -250,11 +250,11 @@
]
},
"locked": {
"lastModified": 1742164373,
"narHash": "sha256-O0SmKvUf5rnDczzVZbhImDzSvrsPwONI3GcWgLdsdzg=",
"lastModified": 1742314758,
"narHash": "sha256-18VcHcqkRBsJjBU6173BK+YVytXrS8kzKXY08auQq8Y=",
"owner": "hyprwm",
"repo": "hyprland-plugins",
"rev": "0eb996c3ed89eeed3d493a310acd8eccb62838d9",
"rev": "4e85fb4fbfc0ffa4b29c61ecd19cfde93ecebaed",
"type": "github"
},
"original": {
@ -558,11 +558,11 @@
"nuschtosSearch": "nuschtosSearch"
},
"locked": {
"lastModified": 1742255305,
"narHash": "sha256-XxygfriVXQt+5Iqh6AOjZL5Aes5dH2xzVKpHpL8pDQg=",
"lastModified": 1742341882,
"narHash": "sha256-ftbTPOg53Ez5smPgQhj4aut4c2QBKuNqlqyr1k2iFpM=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "78f6166c23f80bdfbcc8c44b20f7f4132299a33f",
"rev": "1ca0ec3d798ddc5b37d68bca86119d258a02a17b",
"type": "github"
},
"original": {
@ -581,11 +581,11 @@
]
},
"locked": {
"lastModified": 1738508923,
"narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=",
"lastModified": 1741886583,
"narHash": "sha256-sScfYKtxp3CYv5fJcHQDvQjqBL+tPNQqS9yf9Putd+s=",
"owner": "NuschtOS",
"repo": "search",
"rev": "86e2038290859006e05ca7201425ea5b5de4aecb",
"rev": "2974bc5fa3441a319fba943f3ca41f7dcd1a1467",
"type": "github"
},
"original": {

View File

@ -9,14 +9,16 @@
hyprsplit = { url = "github:shezdy/hyprsplit"; inputs.hyprland.follows = "hyprland"; };
nix-colors.url = "github:misterio77/nix-colors";
nixvim = { url = "github:nix-community/nixvim"; inputs.nixpkgs.follows = "nixpkgs"; };
nixvim = { url = "github:nix-community/nixvim"; inputs.nixpkgs.follows = "nixpkgs"; };
mcmojave-hyprcursor.url = "github:libadoxon/mcmojave-hyprcursor";
home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; };
};
outputs = { nixpkgs, home-manager, hyprland, nix-colors, nixvim, ... } @ inputs: {
outputs = { nixpkgs, home-manager, nix-colors, nixvim, ... } @ inputs: {
nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs; };
specialArgs = { inherit inputs nixvim; };
modules = [
./configuration.nix
./hardware-configuration.nix
@ -49,7 +51,9 @@
homeConfigurations."srp@nixos" = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.x86_64-linux;
extraSpecialArgs = { inherit inputs nix-colors nixvim; };
modules = [ ./home.nix ];
modules = [
./home.nix
];
};
};
}

View File

@ -14,6 +14,9 @@
enable = true;
enableCompletion = true;
syntaxHighlighting.enable = true;
initExtra = ''
eval "$(starship init zsh)"
'';
shellAliases = {
vim = "nvim";
@ -24,9 +27,10 @@
};
programs.nixvim = {
enable = true;
enable = true;
plugins.lualine.enable = true;
#colorschemes.nord.enable = true;
colorschemes.nord.enable = true;
};
programs.git = {
@ -36,14 +40,34 @@
extraConfig = { credential.helper = "store"; };
};
programs.kitty.settings = {
foreground = "#${config.colorScheme.palette.base05}";
background = "#${config.colorScheme.palette.base00}";
home.sessionVariables = {
EDITOR="nvim";
XDG_CACHE_HOME="$HOME/.cache";
XDG_CONFIG_HOME="$HOME/.config";
XDG_DATA_HOME="$HOME/.local/share";
XDG_BIN_HOME="$HOME/.local/bin";
XDG_MUSIC_DIR="$HOME/music";
XDG_DESKTOP_DIR="$HOME";
XDG_DOCUMENTS_DIR="$HOME/doc";
XDG_DOWNLOAD_DIR="$HOME/dl";
XDG_PICTURES_DIR="$HOME/img";
XDG_PUBLICSHARE_DIR="$HOME/pub";
XDG_TEMPLATES_DIR="$HOME/tmpl";
XDG_VIDEOS_DIR="$HOME/vid";
};
programs.kitty = with pkgs; {
enable = true;
font.name = "JetBrains Mono";
themeFile = "Nord";
};
programs.starship.enable = true;
wayland.windowManager.hyprland = {
enable = true;
package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
extraConfig = ''${builtins.readFile ./hyprland.conf}'';
plugins = [
inputs.hyprsplit.packages.${pkgs.system}.hyprsplit

View File

@ -19,6 +19,10 @@ $terminal = kitty
$fileManager = dolphin
$menu = rofi -show run
env = XCURSOR_SIZE,28;
env = XCURSOR_THEME,"McMojave Cursors";
env = HYPRCURSOR_SIZE,28;
env = HYPRCURSOR_THEME,"McMojave";
#################
### AUTOSTART ###
@ -29,18 +33,8 @@ $menu = rofi -show run
exec-once = $terminal
# exec-once = nm-applet &
exec-once = waybar & brave & equibop
#############################
### ENVIRONMENT VARIABLES ###
#############################
# See https://wiki.hyprland.org/Configuring/Environment-variables/
env = XCURSOR_SIZE,24
env = HYPRCURSOR_SIZE,24
exec-once = waybar & brave & equibop & plexamp
exec-once = systemctl --user start hyprpolkitagent
#####################
### LOOK AND FEEL ###
@ -70,7 +64,7 @@ general {
# https://wiki.hyprland.org/Configuring/Variables/#decoration
decoration {
rounding = 10
rounding = 5
# Change transparency of focused and unfocused windows
active_opacity = 1.0
@ -165,25 +159,14 @@ input {
follow_mouse = 1
sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
sensitivity = 0.0 # -1.0 - 1.0, 0 means no modification.
force_no_accel = false
touchpad {
natural_scroll = false
}
}
# https://wiki.hyprland.org/Configuring/Variables/#gestures
gestures {
workspace_swipe = false
}
# Example per-device config
# See https://wiki.hyprland.org/Configuring/Keywords/#per-device-input-configs for more
device {
name = epic-mouse-v1
sensitivity = -0.5
}
###################
### KEYBINDINGS ###
@ -193,12 +176,11 @@ device {
$mainMod = SUPER # Sets "Windows" key as main modifier
# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
bind = $mainMod, Q, exec, $terminal
bind = $mainMod, C, killactive,
bind = $mainMod, M, exit,
bind = $mainMod, E, exec, $fileManager
bind = $mainMod, E, exec, $terminal
bind = $mainMod, Q, killactive,
bind = $mainMod SHIFT, Q, exit,
bind = $mainMod, V, togglefloating,
bind = $mainMod, R, exec, $menu
bind = $mainMod, space, exec, $menu
bind = $mainMod, P, pseudo, # dwindle
bind = $mainMod, J, togglesplit, # dwindle
@ -272,3 +254,5 @@ windowrulev2 = suppressevent maximize, class:.*
# Fix some dragging issues with XWayland
windowrulev2 = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0
debug:disable_logs = false

View File

@ -19,5 +19,6 @@
openrgb-with-all-plugins
i2c-tools
solaar
ntfs3g
];
}

View File

@ -2,10 +2,10 @@
{
programs.mtr.enable = true;
programs.gnupg.agent = {
enable = true;
enableSSHSupport = true;
};
services.gnome.gnome-keyring.enable = true;
security.pam.services.greetd.enableGnomeKeyring = true;
security.pam.services.tuigreet.enableGnomeKeyring = true;
users.users.root.hashedPassword = "!";
@ -24,7 +24,7 @@
};
security.pam.services.hyprlock = {};
# security.polkit.enable = true;
security.polkit.enable = true;
services.clamav = {
daemon.enable = true;
@ -47,22 +47,18 @@
executable = "${lib.getBin pkgs.zathura}/bin/zathura";
profile = "${pkgs.firejail}/etc/firejail/zathura.profile";
};
discord = {
executable = "${lib.getBin pkgs.discord}/bin/discord";
profile = "${pkgs.firejail}/etc/firejail/discord.profile";
};
telegram-desktop = {
executable = "${lib.getBin pkgs.tdesktop}/bin/telegram-desktop";
profile = "${pkgs.firejail}/etc/firejail/telegram-desktop.profile";
};
brave = {
executable = "${lib.getBin pkgs.brave}/bin/brave";
profile = "${pkgs.firejail}/etc/firejail/brave.profile";
};
vscode = {
executable = "${lib.getBin pkgs.vscode}/bin/code";
profile = "${pkgs.firejail}/etc/firejail/vscode.profile";
};
#discord = {
# executable = "${lib.getBin pkgs.discord}/bin/discord";
# profile = "${pkgs.firejail}/etc/firejail/discord.profile";
#};
#telegram-desktop = {
# executable = "${lib.getBin pkgs.tdesktop}/bin/telegram-desktop";
# profile = "${pkgs.firejail}/etc/firejail/telegram-desktop.profile";
#};
#brave = {
# executable = "${lib.getBin pkgs.brave}/bin/brave";
# profile = "${pkgs.firejail}/etc/firejail/brave.profile";
#};
};
};

View File

@ -1,6 +1,9 @@
{ pkgs, ... }:
{ pkgs, nixvim, ... }:
{
imports = [ nixvim.nixosModules.nixvim ];
programs.nixvim.enable = true;
services.envfs.enable = true;
environment.systemPackages = with pkgs; [

View File

@ -1,4 +1,4 @@
{ pkgs, ... }:
{ inputs, pkgs, ... }:
{
console = {
@ -13,4 +13,15 @@
];
# lots to do here, compare to https://github.com/XNM1/linux-nixos-hyprland-config-dotfiles/blob/main/nixos/theme.nix
environment.systemPackages = with pkgs; [
papirus-nord
nordzy-icon-theme
nordzy-cursor-theme
nordic
inputs.mcmojave-hyprcursor.packages.${pkgs.stdenv.hostPlatform.system}.default
glib
gsettings-desktop-schemas
nwg-look # we do all the configuration in here
kitty-themes
];
}