Fixed Hyprland config errors for installation
This commit is contained in:
@@ -12,7 +12,7 @@ echo ""
|
|||||||
# Configuration variables
|
# Configuration variables
|
||||||
GIT_REPO="https://git.cribdev.com/crib/nixos-config.git"
|
GIT_REPO="https://git.cribdev.com/crib/nixos-config.git"
|
||||||
CONFIG_DIR="$HOME/.config/nixos"
|
CONFIG_DIR="$HOME/.config/nixos"
|
||||||
HOSTNAME=$(hostname)
|
HOSTNAME=$(cribnix)
|
||||||
|
|
||||||
# Colors
|
# Colors
|
||||||
RED='\033[0;31m'
|
RED='\033[0;31m'
|
||||||
|
|||||||
@@ -7,12 +7,16 @@
|
|||||||
./modules/hyprland.nix
|
./modules/hyprland.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
# Bootloader
|
# Bootloader - BIOS/Legacy (for Proxmox with legacy BIOS)
|
||||||
boot.loader.systemd-boot.enable = true;
|
boot.loader.grub.enable = true;
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
boot.loader.grub.device = "/dev/sda";
|
||||||
|
|
||||||
|
# If you're using UEFI instead, comment out above and use:
|
||||||
|
# boot.loader.systemd-boot.enable = true;
|
||||||
|
# boot.loader.efi.canTouchEfiVariables = true;
|
||||||
|
|
||||||
# Networking
|
# Networking
|
||||||
networking.hostName = "myhost"; # Change this to your hostname
|
networking.hostName = "cribnix"; # Change this to your hostname
|
||||||
networking.networkmanager.enable = true;
|
networking.networkmanager.enable = true;
|
||||||
|
|
||||||
# Time zone
|
# Time zone
|
||||||
@@ -38,7 +42,7 @@
|
|||||||
# User account
|
# User account
|
||||||
users.users.crib = {
|
users.users.crib = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
description = "Your Name";
|
description = "crib";
|
||||||
extraGroups = [ "networkmanager" "wheel" "video" "audio" ];
|
extraGroups = [ "networkmanager" "wheel" "video" "audio" ];
|
||||||
shell = pkgs.zsh;
|
shell = pkgs.zsh;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
outputs = { self, nixpkgs, home-manager, hyprland, ... }@inputs: {
|
outputs = { self, nixpkgs, home-manager, hyprland, ... }@inputs: {
|
||||||
nixosConfigurations = {
|
nixosConfigurations = {
|
||||||
# Replace 'myhost' with your hostname
|
# Replace 'myhost' with your hostname
|
||||||
cribnix = nixpkgs.lib.nixosSystem {
|
myhost = nixpkgs.lib.nixosSystem {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
specialArgs = { inherit inputs; };
|
specialArgs = { inherit inputs; };
|
||||||
modules = [
|
modules = [
|
||||||
@@ -32,4 +32,4 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,13 +29,6 @@
|
|||||||
|
|
||||||
swapDevices = [ ];
|
swapDevices = [ ];
|
||||||
|
|
||||||
# Enable GPU support (uncomment what matches your hardware)
|
|
||||||
# hardware.opengl.extraPackages = with pkgs; [
|
|
||||||
# intel-media-driver # For Intel GPUs
|
|
||||||
# vaapiIntel # For Intel GPUs
|
|
||||||
# vaapiVdpau # For AMD/NVIDIA
|
|
||||||
# ];
|
|
||||||
|
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
{
|
{
|
||||||
# Home Manager needs a bit of information about you and the paths it should manage
|
# Home Manager needs a bit of information about you and the paths it should manage
|
||||||
home.username = "yourusername";
|
home.username = "crib";
|
||||||
home.homeDirectory = "/home/yourusername";
|
home.homeDirectory = "/home/crib";
|
||||||
|
|
||||||
# Packages to install for this user
|
# Packages to install for this user
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
@@ -34,11 +34,15 @@
|
|||||||
./waybar.nix
|
./waybar.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
# Git configuration
|
# Git configuration (updated API)
|
||||||
programs.git = {
|
programs.git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
userName = "crib";
|
settings = {
|
||||||
userEmail = "haugseth.martin@gmail.com";
|
user = {
|
||||||
|
name = "Your Name";
|
||||||
|
email = "your.email@example.com";
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# ZSH configuration
|
# ZSH configuration
|
||||||
@@ -63,10 +67,10 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# Kitty terminal configuration
|
# Kitty terminal configuration (updated API)
|
||||||
programs.kitty = {
|
programs.kitty = {
|
||||||
enable = true;
|
enable = true;
|
||||||
theme = "Tokyo Night";
|
themeFile = "tokyo_night_night";
|
||||||
font.name = "JetBrainsMono Nerd Font";
|
font.name = "JetBrainsMono Nerd Font";
|
||||||
font.size = 12;
|
font.size = 12;
|
||||||
settings = {
|
settings = {
|
||||||
|
|||||||
@@ -41,11 +41,8 @@
|
|||||||
gaps_in = 5;
|
gaps_in = 5;
|
||||||
gaps_out = 10;
|
gaps_out = 10;
|
||||||
border_size = 2;
|
border_size = 2;
|
||||||
"col.active_border" = "rgba(33ccffee) rgba(00ff99ee) 45deg";
|
|
||||||
"col.inactive_border" = "rgba(595959aa)";
|
|
||||||
|
|
||||||
layout = "dwindle";
|
layout = "dwindle";
|
||||||
|
|
||||||
allow_tearing = false;
|
allow_tearing = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -57,13 +54,11 @@
|
|||||||
enabled = true;
|
enabled = true;
|
||||||
size = 3;
|
size = 3;
|
||||||
passes = 1;
|
passes = 1;
|
||||||
vibrancy = 0.1696;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
drop_shadow = true;
|
drop_shadow = true;
|
||||||
shadow_range = 4;
|
shadow_range = 4;
|
||||||
shadow_render_power = 3;
|
shadow_render_power = 3;
|
||||||
"col.shadow" = "rgba(1a1a1aee)";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# Animations
|
# Animations
|
||||||
@@ -89,7 +84,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
master = {
|
master = {
|
||||||
new_status = "master";
|
new_is_master = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
# Gestures
|
# Gestures
|
||||||
|
|||||||
@@ -30,7 +30,7 @@
|
|||||||
wl-clipboard # Clipboard utilities
|
wl-clipboard # Clipboard utilities
|
||||||
|
|
||||||
# File manager
|
# File manager
|
||||||
thunar
|
xfce.thunar
|
||||||
|
|
||||||
# Image viewer
|
# Image viewer
|
||||||
imv
|
imv
|
||||||
@@ -52,18 +52,12 @@
|
|||||||
socat # Socket tools
|
socat # Socket tools
|
||||||
wlogout # Logout menu
|
wlogout # Logout menu
|
||||||
nwg-look # GTK theme config
|
nwg-look # GTK theme config
|
||||||
qt5ct # Qt5 config
|
libsForQt5.qt5ct # Qt5 config
|
||||||
qt6ct # Qt6 config
|
kdePackages.qt6ct # Qt6 config
|
||||||
];
|
];
|
||||||
|
|
||||||
# Enable XDG Desktop Portal for Hyprland
|
# XDG Desktop Portal is configured by Hyprland module
|
||||||
xdg.portal = {
|
# No need to configure it again here
|
||||||
enable = true;
|
|
||||||
extraPortals = with pkgs; [
|
|
||||||
xdg-desktop-portal-hyprland
|
|
||||||
xdg-desktop-portal-gtk
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
# Security - for screen locking
|
# Security - for screen locking
|
||||||
security.pam.services.hyprlock = {};
|
security.pam.services.hyprlock = {};
|
||||||
@@ -71,9 +65,11 @@
|
|||||||
# Fonts for better UI
|
# Fonts for better UI
|
||||||
fonts.packages = with pkgs; [
|
fonts.packages = with pkgs; [
|
||||||
noto-fonts
|
noto-fonts
|
||||||
noto-fonts-cjk
|
noto-fonts-cjk-sans
|
||||||
noto-fonts-emoji
|
noto-fonts-emoji
|
||||||
font-awesome
|
font-awesome
|
||||||
(nerdfonts.override { fonts = [ "JetBrainsMono" "FiraCode" "DroidSansMono" ]; })
|
nerd-fonts.jetbrains-mono
|
||||||
|
nerd-fonts.fira-code
|
||||||
|
nerd-fonts.droid-sans-mono
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -46,9 +46,8 @@
|
|||||||
tree
|
tree
|
||||||
];
|
];
|
||||||
|
|
||||||
# Enable sound
|
# Enable sound with PipeWire (removed deprecated sound.enable)
|
||||||
sound.enable = true;
|
services.pulseaudio.enable = false;
|
||||||
hardware.pulseaudio.enable = false;
|
|
||||||
security.rtkit.enable = true;
|
security.rtkit.enable = true;
|
||||||
services.pipewire = {
|
services.pipewire = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@@ -61,11 +60,10 @@
|
|||||||
# Enable CUPS for printing
|
# Enable CUPS for printing
|
||||||
services.printing.enable = true;
|
services.printing.enable = true;
|
||||||
|
|
||||||
# Enable OpenGL
|
# Enable graphics (updated from hardware.opengl)
|
||||||
hardware.opengl = {
|
hardware.graphics = {
|
||||||
enable = true;
|
enable = true;
|
||||||
driSupport = true;
|
enable32Bit = true;
|
||||||
driSupport32Bit = true;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# Enable Bluetooth
|
# Enable Bluetooth
|
||||||
|
|||||||
Reference in New Issue
Block a user