2026-01-28
This commit is contained in:
Weckyy702
@@ -1,16 +1,20 @@
|
||||
# Edit this configuration file to define what should be installed on
|
||||
# your system. Help is available in the configuration.nix(5) man page
|
||||
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
||||
|
||||
{ config, pkgs, inputs, hostname, username, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ # Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
];
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
hostname,
|
||||
username,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
# Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
];
|
||||
|
||||
## Boot
|
||||
## Boot
|
||||
# Bootloader.
|
||||
boot.loader.grub.enable = true;
|
||||
boot.loader.grub.device = "/dev/nvme0n1";
|
||||
@@ -47,8 +51,8 @@
|
||||
|
||||
## Nix
|
||||
nix.settings.experimental-features = [
|
||||
"nix-command"
|
||||
"flakes"
|
||||
"nix-command"
|
||||
"flakes"
|
||||
];
|
||||
# Allow unfree packages
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
@@ -60,30 +64,31 @@
|
||||
git
|
||||
cifs-utils # required for network mounting the NAS
|
||||
inputs.zen-browser.packages.${pkgs.stdenv.hostPlatform.system}.default
|
||||
age
|
||||
];
|
||||
|
||||
fonts = {
|
||||
enableDefaultPackages = true;
|
||||
packages = with pkgs; [
|
||||
jetbrains-mono
|
||||
];
|
||||
fontDir.enable = true;
|
||||
enableDefaultPackages = true;
|
||||
packages = with pkgs; [
|
||||
jetbrains-mono
|
||||
];
|
||||
fontDir.enable = true;
|
||||
};
|
||||
|
||||
programs.hyprland = {
|
||||
enable = true;
|
||||
xwayland.enable = true;
|
||||
enable = true;
|
||||
xwayland.enable = true;
|
||||
};
|
||||
programs.zsh.enable = true;
|
||||
|
||||
programs.steam = {
|
||||
enable = true;
|
||||
extraCompatPackages = [
|
||||
pkgs.proton-ge-bin
|
||||
];
|
||||
protontricks = {
|
||||
enable = true;
|
||||
};
|
||||
enable = true;
|
||||
extraCompatPackages = [
|
||||
pkgs.proton-ge-bin
|
||||
];
|
||||
protontricks = {
|
||||
enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
# Some programs need SUID wrappers, can be configured further or are
|
||||
@@ -99,35 +104,34 @@
|
||||
services.getty.autologinUser = username;
|
||||
|
||||
users.users.${username} = {
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "networkmanager" "wheel"];
|
||||
shell = pkgs.zsh;
|
||||
isNormalUser = true;
|
||||
extraGroups = ["networkmanager" "wheel"];
|
||||
shell = pkgs.zsh;
|
||||
};
|
||||
|
||||
## NAS Mount
|
||||
|
||||
fileSystems."/mnt/nas" = {
|
||||
device = "//duke.veltnet/smb-share";
|
||||
fsType = "cifs";
|
||||
options = [
|
||||
"x-systemd.automount"
|
||||
"noauto"
|
||||
"user,users"
|
||||
"uid=1000"
|
||||
"gid=100"
|
||||
"credentials=/etc/nixos/secrets/nas-share.creds"
|
||||
];
|
||||
device = "//duke.veltnet/smb-share";
|
||||
fsType = "cifs";
|
||||
options = [
|
||||
"x-systemd.automount"
|
||||
"noauto"
|
||||
"user,users"
|
||||
"uid=1000"
|
||||
"gid=100"
|
||||
"credentials=/etc/nixos/secrets/nas-share.creds"
|
||||
];
|
||||
};
|
||||
|
||||
# required for zsh completion
|
||||
environment.pathsToLink = [ "/share/zsh" ];
|
||||
|
||||
environment.pathsToLink = ["/share/zsh"];
|
||||
|
||||
# List services that you want to enable:
|
||||
|
||||
services.kanata = {
|
||||
enable = true;
|
||||
#TODO: kanata config
|
||||
enable = true;
|
||||
#TODO: kanata config
|
||||
};
|
||||
|
||||
services.mullvad-vpn.enable = true;
|
||||
|
||||
37
flake.lock
generated
37
flake.lock
generated
@@ -178,9 +178,31 @@
|
||||
"home-manager": "home-manager",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixvim": "nixvim",
|
||||
"spicetify-nix": "spicetify-nix",
|
||||
"zen-browser": "zen-browser"
|
||||
}
|
||||
},
|
||||
"spicetify-nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"systems": "systems_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1769316930,
|
||||
"narHash": "sha256-4EOGHYLpIscwr+6drHE28Qj7NDjjowp2Vd8QkXjdBBE=",
|
||||
"owner": "Gerg-L",
|
||||
"repo": "spicetify-nix",
|
||||
"rev": "b2ce438f386943ef611e196a178af2d79042903b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "Gerg-L",
|
||||
"repo": "spicetify-nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
@@ -211,6 +233,21 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_3": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"zen-browser": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
||||
50
flake.nix
50
flake.nix
@@ -13,27 +13,39 @@
|
||||
};
|
||||
catppuccin.url = "github:catppuccin/nix/release-25.11";
|
||||
catppuccin.inputs.nixpkgs.follows = "nixpkgs";
|
||||
spicetify-nix.url = "github:Gerg-L/spicetify-nix";
|
||||
spicetify-nix.inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
outputs = { self, nixpkgs, home-manager, nixvim, ... }@inputs: {
|
||||
nixosConfigurations.keith =
|
||||
let
|
||||
hostname = "keith";
|
||||
username = "weckyy702";
|
||||
specialArgs = { inherit inputs; inherit hostname; inherit username; };
|
||||
in
|
||||
nixpkgs.lib.nixosSystem {
|
||||
inherit specialArgs;
|
||||
modules = [
|
||||
./configuration.nix
|
||||
home-manager.nixosModules.home-manager {
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
outputs = {
|
||||
self,
|
||||
nixpkgs,
|
||||
home-manager,
|
||||
nixvim,
|
||||
...
|
||||
} @ inputs: {
|
||||
nixosConfigurations.keith = let
|
||||
hostname = "keith";
|
||||
username = "weckyy702";
|
||||
specialArgs = {
|
||||
inherit inputs;
|
||||
inherit hostname;
|
||||
inherit username;
|
||||
};
|
||||
in
|
||||
nixpkgs.lib.nixosSystem {
|
||||
inherit specialArgs;
|
||||
modules = [
|
||||
./configuration.nix
|
||||
home-manager.nixosModules.home-manager
|
||||
{
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
|
||||
home-manager.extraSpecialArgs = specialArgs;
|
||||
home-manager.users.${username} = import ./home/home.nix;
|
||||
}
|
||||
];
|
||||
};
|
||||
home-manager.extraSpecialArgs = specialArgs;
|
||||
home-manager.users.${username} = import ./home/home.nix;
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,60 +1,65 @@
|
||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ config, lib, pkgs, modulesPath, username, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
modulesPath,
|
||||
username,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ "amdgpu" ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"];
|
||||
boot.initrd.kernelModules = ["amdgpu"];
|
||||
boot.kernelModules = ["kvm-amd"];
|
||||
boot.extraModulePackages = [];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/0869e843-348d-47e3-b6a1-79ad814ff62b";
|
||||
fsType = "ext4";
|
||||
};
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/0869e843-348d-47e3-b6a1-79ad814ff62b";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/home/${username}/Documents" = {
|
||||
device = "/dev/disk/by-uuid/2d6f2255-eca4-489b-9f0f-6c455cd394fc";
|
||||
fsType = "ext4";
|
||||
device = "/dev/disk/by-uuid/2d6f2255-eca4-489b-9f0f-6c455cd394fc";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
#TODO: add external hdd, nas, and ssd
|
||||
|
||||
swapDevices =
|
||||
[ { device = "/dev/disk/by-uuid/40b22e5b-839d-4189-93e7-246407cc76c7"; }
|
||||
];
|
||||
swapDevices = [
|
||||
{device = "/dev/disk/by-uuid/40b22e5b-839d-4189-93e7-246407cc76c7";}
|
||||
];
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
|
||||
hardware.graphics.enable = true;
|
||||
hardware.graphics.extraPackages = [ pkgs.rocmPackages.clr.icd ];
|
||||
hardware.graphics.extraPackages = [pkgs.rocmPackages.clr.icd];
|
||||
|
||||
networking.networkmanager = {
|
||||
enable = true;
|
||||
ensureProfiles.profiles = {
|
||||
p2p-nas = {
|
||||
connection = {
|
||||
id="p2p-nas";
|
||||
type = "ethernet";
|
||||
interface-name = "enp1s0";
|
||||
autoconnect = true;
|
||||
};
|
||||
ipv6 = {
|
||||
method = "manual";
|
||||
addresses = "fd00:fa57::1/64";
|
||||
};
|
||||
ipv4.method = "disabled";
|
||||
ethernet.mtu = 9000;
|
||||
};
|
||||
};
|
||||
enable = true;
|
||||
ensureProfiles.profiles = {
|
||||
p2p-nas = {
|
||||
connection = {
|
||||
id = "p2p-nas";
|
||||
type = "ethernet";
|
||||
interface-name = "enp1s0";
|
||||
autoconnect = true;
|
||||
};
|
||||
ipv6 = {
|
||||
method = "manual";
|
||||
addresses = "fd00:fa57::1/64";
|
||||
};
|
||||
ipv4.method = "disabled";
|
||||
ethernet.mtu = 9000;
|
||||
};
|
||||
};
|
||||
};
|
||||
networking.extraHosts = ''
|
||||
fd00:fa57::2 duke.veltnet
|
||||
fd00:fa57::2 duke.veltnet
|
||||
'';
|
||||
}
|
||||
|
||||
297
home/home.nix
297
home/home.nix
@@ -1,162 +1,175 @@
|
||||
{ config, pkgs, username, inputs, ...}: {
|
||||
imports = [
|
||||
inputs.nixvim.homeModules.nixvim
|
||||
inputs.catppuccin.homeModules.catppuccin
|
||||
];
|
||||
top @ {
|
||||
config,
|
||||
pkgs,
|
||||
username,
|
||||
inputs,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
inputs.nixvim.homeModules.nixvim
|
||||
inputs.catppuccin.homeModules.catppuccin
|
||||
inputs.spicetify-nix.homeManagerModules.default
|
||||
./nixvim
|
||||
];
|
||||
|
||||
#NOTE: MUST be kept up to date with nixpkgs!
|
||||
home.stateVersion = "25.11";
|
||||
#NOTE: MUST be kept up to date with nixpkgs!
|
||||
home.stateVersion = "25.11";
|
||||
|
||||
home.username = username;
|
||||
home.homeDirectory = "/home/${username}";
|
||||
home.username = username;
|
||||
home.homeDirectory = "/home/${username}";
|
||||
|
||||
home.packages = with pkgs; [
|
||||
mpv
|
||||
bitwarden-desktop
|
||||
feh
|
||||
grim
|
||||
slurp
|
||||
xdg-user-dirs
|
||||
libqalculate
|
||||
];
|
||||
home.packages = with pkgs; [
|
||||
mpv
|
||||
bitwarden-desktop
|
||||
feh
|
||||
grim
|
||||
slurp
|
||||
xdg-user-dirs
|
||||
libqalculate
|
||||
xfce.thunar
|
||||
prismlauncher
|
||||
playerctl
|
||||
];
|
||||
|
||||
programs.wofi.enable = true;
|
||||
catppuccin.enable = true;
|
||||
|
||||
catppuccin.enable = true;
|
||||
gtk = {
|
||||
enable = true;
|
||||
colorScheme = "dark";
|
||||
font.name = "JetBrainsMono";
|
||||
};
|
||||
|
||||
wayland.windowManager.hyprland = {
|
||||
enable = true;
|
||||
settings = import ./hyprland/settings.nix;
|
||||
};
|
||||
wayland.windowManager.hyprland = {
|
||||
enable = true;
|
||||
settings = (import ./hyprland/settings.nix) top;
|
||||
};
|
||||
|
||||
#TODO: decide on waybar
|
||||
#TODO: decide on waybar
|
||||
|
||||
programs.nixvim = {
|
||||
enable = true;
|
||||
programs.direnv = {
|
||||
enable = true;
|
||||
enableZshIntegration = true;
|
||||
nix-direnv.enable = true;
|
||||
};
|
||||
|
||||
clipboard.register = "unnamedplus";
|
||||
colorschemes.catppuccin = {
|
||||
enable = true;
|
||||
settings.flavour = "mocha";
|
||||
};
|
||||
plugins.lualine.enable = true;
|
||||
plugins.telescope = {
|
||||
enable = true;
|
||||
extensions.file-browser = {
|
||||
enable = true;
|
||||
settings = {
|
||||
git_status = true;
|
||||
hijack_netrw = true;
|
||||
respect_gitignore = true;
|
||||
fzf-native.enable = true;
|
||||
fzf-native.settings.case_mode = "ignore_case";
|
||||
};
|
||||
};
|
||||
};
|
||||
plugins.web-devicons.enable = true;
|
||||
plugins.treesitter = {
|
||||
enable = true;
|
||||
folding = true;
|
||||
programs.zoxide = {
|
||||
enable = true;
|
||||
enableZshIntegration = true;
|
||||
options = [
|
||||
"--cmd cd"
|
||||
];
|
||||
};
|
||||
|
||||
};
|
||||
lsp = {
|
||||
inlayHints.enable = true;
|
||||
#TODO: keymaps
|
||||
servers = {
|
||||
"*" = {
|
||||
config.capabilities.textDocument.semanticTokens.multilineTokenSupport = true;
|
||||
config.root_markers = [
|
||||
".git"
|
||||
];
|
||||
};
|
||||
clangd. enable = true;
|
||||
rust-analzyer.enable = true;
|
||||
rnix.enable = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
programs.spicetify = let
|
||||
spkgs = inputs.spicetify-nix.legacyPackages.${pkgs.stdenv.hostPlatform.system};
|
||||
in {
|
||||
enable = true;
|
||||
enabledExtensions = with spkgs.extensions; [
|
||||
fullAppDisplay
|
||||
shuffle
|
||||
aiBandBlocker
|
||||
];
|
||||
enabledCustomApps = with spkgs.apps; [
|
||||
newReleases
|
||||
];
|
||||
theme = spkgs.themes.catppuccin;
|
||||
colorScheme = "mocha";
|
||||
};
|
||||
|
||||
programs.zsh = {
|
||||
enable = true;
|
||||
# For automatic login
|
||||
profileExtra = ''
|
||||
if [ -z "$WAYLAND_DISPLAY" ] && [ "$XDG_VTNR" = 1 ]; then
|
||||
exec hyprland > /var/log/hypr.log
|
||||
fi
|
||||
'';
|
||||
programs.vesktop = {
|
||||
enable = true;
|
||||
vencord.useSystem = true;
|
||||
};
|
||||
|
||||
autocd = true;
|
||||
enableCompletion = true;
|
||||
autosuggestion.enable = true;
|
||||
syntaxHighlighting.enable = true;
|
||||
initContent = pkgs.lib.mkBefore ''
|
||||
# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
|
||||
# Initialization code that may require console input (password prompts, [y/n]
|
||||
# confirmations, etc.) must go above this block; everything else may go below.
|
||||
if [[ -r "''${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-''${(%):-%n}.zsh" ]]; then
|
||||
source "''${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-''${(%):-%n}.zsh"
|
||||
fi
|
||||
'';
|
||||
plugins = [
|
||||
{
|
||||
name = "powerlevel10k";
|
||||
src = "${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/";
|
||||
file = "powerlevel10k.zsh-theme";
|
||||
}
|
||||
{
|
||||
name = "p10k-config";
|
||||
src = ./p10k;
|
||||
file = "p10k.zsh";
|
||||
}
|
||||
];
|
||||
programs.wofi.enable = true;
|
||||
programs.zsh = {
|
||||
enable = true;
|
||||
# For automatic login
|
||||
profileExtra = ''
|
||||
if [ -z "$WAYLAND_DISPLAY" ] && [ "$XDG_VTNR" = 1 ]; then
|
||||
exec hyprland
|
||||
fi
|
||||
'';
|
||||
|
||||
oh-my-zsh = {
|
||||
enable = true;
|
||||
plugins = [
|
||||
"git"
|
||||
];
|
||||
theme = "robbyrussell";
|
||||
};
|
||||
};
|
||||
autocd = true;
|
||||
enableCompletion = true;
|
||||
autosuggestion.enable = true;
|
||||
syntaxHighlighting.enable = true;
|
||||
initContent = pkgs.lib.mkBefore ''
|
||||
date
|
||||
# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
|
||||
# Initialization code that may require console input (password prompts, [y/n]
|
||||
# confirmations, etc.) must go above this block; everything else may go below.
|
||||
if [[ -r "''${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-''${(%):-%n}.zsh" ]]; then
|
||||
source "''${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-''${(%):-%n}.zsh"
|
||||
fi
|
||||
'';
|
||||
plugins = [
|
||||
{
|
||||
name = "powerlevel10k";
|
||||
src = "${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/";
|
||||
file = "powerlevel10k.zsh-theme";
|
||||
}
|
||||
{
|
||||
name = "p10k-config";
|
||||
src = ./p10k;
|
||||
file = "p10k.zsh";
|
||||
}
|
||||
];
|
||||
|
||||
programs.fzf = {
|
||||
enable = true;
|
||||
enableZshIntegration = true;
|
||||
};
|
||||
oh-my-zsh = {
|
||||
enable = true;
|
||||
plugins = [
|
||||
"git"
|
||||
];
|
||||
theme = "robbyrussell";
|
||||
};
|
||||
};
|
||||
|
||||
programs.kitty = {
|
||||
enable = true;
|
||||
enableGitIntegration = true;
|
||||
#TODO: kitty config
|
||||
};
|
||||
programs.fzf = {
|
||||
enable = true;
|
||||
enableZshIntegration = true;
|
||||
};
|
||||
|
||||
programs.git = {
|
||||
enable = true;
|
||||
settings.user = {
|
||||
email = "weckyy702@gmail.com";
|
||||
name = "Weckyy702";
|
||||
};
|
||||
#TODO: signing
|
||||
};
|
||||
programs.kitty = {
|
||||
enable = true;
|
||||
enableGitIntegration = true;
|
||||
font = {
|
||||
name = "JetBrains Mono";
|
||||
size = 10;
|
||||
};
|
||||
shellIntegration.enableZshIntegration = true;
|
||||
#TODO: kitty config
|
||||
};
|
||||
|
||||
services.hyprpaper = {
|
||||
enable = true;
|
||||
settings =
|
||||
let
|
||||
# TODO: this should be done more cleanly
|
||||
wallpaper_path = "/home/weckyy702/Pictures/wallpapers/horizontal_16x9.png";
|
||||
in
|
||||
{
|
||||
preload = wallpaper_path;
|
||||
wallpaper = [
|
||||
#TODO: this should be dynamic
|
||||
"DP-1,${wallpaper_path}"
|
||||
"HDMI-A-1,${wallpaper_path}"
|
||||
];
|
||||
};
|
||||
};
|
||||
programs.git = {
|
||||
enable = true;
|
||||
settings.user = {
|
||||
email = "weckyy702@gmail.com";
|
||||
name = "Weckyy702";
|
||||
};
|
||||
#TODO: signing
|
||||
};
|
||||
|
||||
services.hyprpolkitagent.enable = true;
|
||||
services.hyprpaper = {
|
||||
enable = true;
|
||||
settings = let
|
||||
# TODO: this should be done more cleanly
|
||||
wallpaper_path = ./hyprland/horizontal_16x9.png;
|
||||
in {
|
||||
preload = toString wallpaper_path;
|
||||
wallpaper = [
|
||||
#TODO: this should be dynamic
|
||||
"DP-1,${wallpaper_path}"
|
||||
"HDMI-A-1,${wallpaper_path}"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
#TODO: hyprsunset?
|
||||
services.hyprpolkitagent.enable = true;
|
||||
|
||||
services.ssh-agent = {
|
||||
enable = true;
|
||||
enableZshIntegration = true;
|
||||
};
|
||||
}
|
||||
|
||||
BIN
home/hyprland/horizontal_16x9.png
Normal file
BIN
home/hyprland/horizontal_16x9.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 8.5 MiB |
@@ -1,5 +0,0 @@
|
||||
let
|
||||
#TODO: this needs to be modular!
|
||||
wallpaper = "/home/weckyy702/Pictures/wallpapers/horizontal_16x9.png";
|
||||
in
|
||||
{}
|
||||
@@ -1,68 +1,82 @@
|
||||
{
|
||||
"$mod" = "SUPER";
|
||||
"$browser" = "zen";
|
||||
"$term" = "kitty";
|
||||
{...}: {
|
||||
"$mod" = "SUPER";
|
||||
"$browser" = "zen";
|
||||
"$term" = "kitty";
|
||||
|
||||
general = {
|
||||
border_size = 2;
|
||||
gaps_in = 5;
|
||||
gaps_out = 10;
|
||||
layout = "dwindle";
|
||||
allow_tearing = false;
|
||||
resize_on_border = true;
|
||||
};
|
||||
general = {
|
||||
border_size = 2;
|
||||
gaps_in = 5;
|
||||
gaps_out = 10;
|
||||
layout = "dwindle";
|
||||
allow_tearing = false;
|
||||
resize_on_border = true;
|
||||
};
|
||||
|
||||
snap = {
|
||||
snap = {
|
||||
};
|
||||
|
||||
};
|
||||
input = {
|
||||
kb_layout = "de";
|
||||
follow_mouse = 1;
|
||||
};
|
||||
|
||||
input = {
|
||||
kb_layout = "de";
|
||||
follow_mouse = 1;
|
||||
};
|
||||
bind =
|
||||
[
|
||||
"$mod, Q, exit"
|
||||
"$mod, Return, exec, $term"
|
||||
"$mod, D, exec, wofi --show drun"
|
||||
"$mod, F2, exec, $browser"
|
||||
"$mod, c, killactive"
|
||||
"$mod, f, fullscreen"
|
||||
"$mod, h, movefocus, l"
|
||||
"$mod, j, movefocus, d"
|
||||
"$mod, k, movefocus, u"
|
||||
"$mod, l, movefocus, r"
|
||||
"$mod+SHIFT, h, movewindow, l"
|
||||
"$mod+SHIFT, j, movewindow, d"
|
||||
"$mod+SHIFT, k, movewindow, u"
|
||||
"$mod+SHIFT, l, movewindow, r"
|
||||
", Print, exec, grim -g \"$(slurp)\" \"/home/weckyy702/Pictures/screenshots/$(date -Iseconds).png\""
|
||||
"$mod+SHIFT, s, exec, hyprlock"
|
||||
]
|
||||
++
|
||||
# Switch workspaces
|
||||
(map (i: "$mod, ${builtins.toString i}, workspace, ${builtins.toString i}") [1 2 3 4 5 6 7 8 9])
|
||||
++ (map (i: "$mod+SHIFT, ${builtins.toString i}, movetoworkspacesilent, ${builtins.toString i}") [1 2 3 4 5 6 7 8 9]);
|
||||
|
||||
bind = [
|
||||
"$mod, Q, exit"
|
||||
"$mod, Return, exec, $term"
|
||||
"$mod, D, exec, wofi --show drun"
|
||||
"$mod, F2, exec, $browser"
|
||||
"$mod, c, killactive"
|
||||
"$mod, f, fullscreen"
|
||||
"$mod, h, movefocus, l"
|
||||
"$mod, j, movefocus, d"
|
||||
"$mod, k, movefocus, u"
|
||||
"$mod, l, movefocus, r"
|
||||
"$mod+SHIFT, h, movewindow, l"
|
||||
"$mod+SHIFT, j, movewindow, d"
|
||||
"$mod+SHIFT, k, movewindow, u"
|
||||
"$mod+SHIFT, l, movewindow, r"
|
||||
", Print, exec, grim -g \"$(slurp)\" \"/home/weckyy702/Pictures/screenshots/$(date -Iseconds).png\""
|
||||
"$mod+SHIFT, s, exec, hyprlock"
|
||||
]
|
||||
++
|
||||
# Switch workspaces
|
||||
(map (i: "$mod, ${builtins.toString i}, workspace, ${builtins.toString i}") [1 2 3 4 5 6 7 8 9])
|
||||
++
|
||||
(map (i: "$mod+SHIFT, ${builtins.toString i}, movetoworkspacesilent, ${builtins.toString i}") [1 2 3 4 5 6 7 8 9]);
|
||||
bindm = [
|
||||
"$mod, mouse:272, movewindow"
|
||||
];
|
||||
|
||||
bindm = [
|
||||
"$mod, mouse:272, movewindow"
|
||||
];
|
||||
bindel = [
|
||||
", XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+"
|
||||
", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
|
||||
];
|
||||
|
||||
decoration = {
|
||||
shadow.enabled = false;
|
||||
blur.enabled = true;
|
||||
active_opacity = 0.8;
|
||||
inactive_opacity = 0.8;
|
||||
};
|
||||
bindl = [
|
||||
", XF86AudioNext, exec, playerctl position 5+"
|
||||
", XF86AudioPrev, exec, playerctl position 5-"
|
||||
", XF86AudioPlay, exec, playerctl play-pause"
|
||||
];
|
||||
|
||||
animations.enabled = false;
|
||||
bindo = [
|
||||
", XF86AudioNext, exec, playerctl next"
|
||||
", XF86AudioPrev, exec, playerctl previous"
|
||||
];
|
||||
|
||||
misc.disable_hyprland_logo = true;
|
||||
decoration = {
|
||||
shadow.enabled = false;
|
||||
blur.enabled = true;
|
||||
active_opacity = 0.8;
|
||||
inactive_opacity = 0.8;
|
||||
};
|
||||
|
||||
cursor.inactive_timeout = 5;
|
||||
animations.enabled = false;
|
||||
|
||||
ecosystem.no_update_news = true;
|
||||
ecosystem.no_donation_nag = true;
|
||||
misc.disable_hyprland_logo = true;
|
||||
|
||||
cursor.inactive_timeout = 3;
|
||||
|
||||
ecosystem.no_update_news = true;
|
||||
ecosystem.no_donation_nag = true;
|
||||
}
|
||||
|
||||
23
home/nixvim/default.nix
Normal file
23
home/nixvim/default.nix
Normal file
@@ -0,0 +1,23 @@
|
||||
{...}: {
|
||||
imports = [
|
||||
./keymaps.nix
|
||||
./options.nix
|
||||
./plugins
|
||||
];
|
||||
|
||||
programs.nixvim = {
|
||||
enable = true;
|
||||
|
||||
clipboard.register = "unnamedplus";
|
||||
|
||||
colorschemes.catppuccin = {
|
||||
enable = true;
|
||||
settings.flavour = "mocha";
|
||||
settings.integrations = {
|
||||
gitsigns = true;
|
||||
treesitter = true;
|
||||
cmp = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
25
home/nixvim/keymaps.nix
Normal file
25
home/nixvim/keymaps.nix
Normal file
@@ -0,0 +1,25 @@
|
||||
{...}: {
|
||||
programs.nixvim.globals.mapleader = " ";
|
||||
|
||||
programs.nixvim.keymaps = [
|
||||
{
|
||||
key = "<esc>";
|
||||
action = ":noh<CR>";
|
||||
mode = "n";
|
||||
options = {
|
||||
silent = true;
|
||||
desc = "Clear search highlight";
|
||||
};
|
||||
}
|
||||
{
|
||||
key = "j";
|
||||
action = "gj";
|
||||
mode = "n";
|
||||
}
|
||||
{
|
||||
key = "k";
|
||||
action = "gk";
|
||||
mode = "n";
|
||||
}
|
||||
];
|
||||
}
|
||||
50
home/nixvim/options.nix
Normal file
50
home/nixvim/options.nix
Normal file
@@ -0,0 +1,50 @@
|
||||
{...}: {
|
||||
programs.nixvim.opts = {
|
||||
# Expand tabs to 4 spaces
|
||||
shiftwidth = 4;
|
||||
softtabstop = 4;
|
||||
expandtab = true;
|
||||
|
||||
signcolumn = "yes:3";
|
||||
|
||||
# automatically indent and try to be smart about it
|
||||
autoindent = true;
|
||||
smartindent = true;
|
||||
|
||||
# Relative line numbers
|
||||
number = true;
|
||||
relativenumber = true;
|
||||
|
||||
# See search result as you type
|
||||
inccommand = "split";
|
||||
|
||||
# Visualize whitespace
|
||||
list = true;
|
||||
listchars = {
|
||||
tab = "» ";
|
||||
trail = "·";
|
||||
nbsp = "␣";
|
||||
};
|
||||
|
||||
# Show which line the cursor is on
|
||||
cursorline = true;
|
||||
|
||||
# Keep the cursor somewhat centered on the screen
|
||||
scrolloff = 25;
|
||||
|
||||
# Ask if operations would fail due to unsaved buffers
|
||||
confirm = true;
|
||||
|
||||
# ignore case in search unless multiple capital case letter have been typed
|
||||
smartcase = true;
|
||||
ignorecase = true;
|
||||
|
||||
completeopt = "menu,menuone,noselect";
|
||||
|
||||
# Persistent undos :)
|
||||
undofile = true;
|
||||
|
||||
# enable resize by mouse
|
||||
mouse = "n";
|
||||
};
|
||||
}
|
||||
40
home/nixvim/plugins/cmp/default.nix
Normal file
40
home/nixvim/plugins/cmp/default.nix
Normal file
@@ -0,0 +1,40 @@
|
||||
{...}: {
|
||||
programs.nixvim.plugins = {
|
||||
lspkind.enable = true;
|
||||
|
||||
blink-cmp.enable = true;
|
||||
|
||||
# cmp-nvim-lsp-signature-help.enable = true;
|
||||
#
|
||||
# cmp = {
|
||||
# enable = true;
|
||||
# autoEnableSources = true;
|
||||
# autoLoad = true;
|
||||
#
|
||||
# settings.sources = [
|
||||
# { name = "nvim_lsp"; }
|
||||
# { name = "nvim_lsp_signature_help"; }
|
||||
# { name = "path"; }
|
||||
# ];
|
||||
#
|
||||
# settings.mapping = {
|
||||
# "<Tab>" = "cmp.mapping.select_next_item()";
|
||||
# "<S-Tab>" = "cmp.mapping.select_prev_item()";
|
||||
# "<C-Space>" = "cmp.mapping.complete()";
|
||||
# "<C-S-Space>" = "cmp.mapping.close()";
|
||||
# "<CR>" = "cmp.mapping.confirm({ behavior = cmp.ConfirmBehavior.Insert, select = true })";
|
||||
# };
|
||||
# };
|
||||
#
|
||||
# lsp-format.enable = true;
|
||||
#
|
||||
# none-ls = {
|
||||
# enable = true;
|
||||
# enableLspFormat = true;
|
||||
# sources.formatting = {
|
||||
# alejandra.enable = true;
|
||||
# nixpkgs_fmt.enable = true;
|
||||
# };
|
||||
# };
|
||||
};
|
||||
}
|
||||
25
home/nixvim/plugins/default.nix
Normal file
25
home/nixvim/plugins/default.nix
Normal file
@@ -0,0 +1,25 @@
|
||||
{...}: {
|
||||
imports = [
|
||||
./lsp.nix
|
||||
./telescope
|
||||
./cmp
|
||||
];
|
||||
|
||||
programs.nixvim.plugins = {
|
||||
lualine.enable = true;
|
||||
|
||||
web-devicons.enable = true;
|
||||
|
||||
treesitter = {
|
||||
enable = true;
|
||||
folding = true;
|
||||
autoLoad = true;
|
||||
};
|
||||
|
||||
gitsigns.enable = true;
|
||||
|
||||
which-key.enable = true;
|
||||
|
||||
glow.enable = true;
|
||||
};
|
||||
}
|
||||
30
home/nixvim/plugins/lsp.nix
Normal file
30
home/nixvim/plugins/lsp.nix
Normal file
@@ -0,0 +1,30 @@
|
||||
{...}: {
|
||||
programs.nixvim = {
|
||||
dependencies.rust-analyzer.enable = true;
|
||||
|
||||
lsp = {
|
||||
inlayHints.enable = true;
|
||||
servers = {
|
||||
"*" = {
|
||||
config.capabilities.textDocument.semanticTokens.multilineTokenSupport = true;
|
||||
config.root_markers = [
|
||||
".git"
|
||||
];
|
||||
};
|
||||
clangd = {
|
||||
enable = true;
|
||||
config.root_markers = [
|
||||
"compile_commands.json"
|
||||
];
|
||||
};
|
||||
rust_analyzer = {
|
||||
enable = true;
|
||||
};
|
||||
rnix.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
plugins.lspconfig.enable = true;
|
||||
plugins.clangd-extensions.enable = true;
|
||||
};
|
||||
}
|
||||
20
home/nixvim/plugins/telescope/default.nix
Normal file
20
home/nixvim/plugins/telescope/default.nix
Normal file
@@ -0,0 +1,20 @@
|
||||
{...}: {
|
||||
imports = [
|
||||
./keymaps.nix
|
||||
];
|
||||
programs.nixvim.dependencies.ripgrep.enable = true;
|
||||
|
||||
programs.nixvim.plugins.telescope = {
|
||||
enable = true;
|
||||
extensions.file-browser = {
|
||||
enable = true;
|
||||
settings = {
|
||||
git_status = true;
|
||||
hijack_netrw = true;
|
||||
respect_gitignore = true;
|
||||
fzf-native.enable = true;
|
||||
fzf-native.settings.case_mode = "ignore_case";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
19
home/nixvim/plugins/telescope/keymaps.nix
Normal file
19
home/nixvim/plugins/telescope/keymaps.nix
Normal file
@@ -0,0 +1,19 @@
|
||||
{...}: {
|
||||
programs.nixvim.keymaps = [
|
||||
{
|
||||
key = "<leader>sf";
|
||||
action = "<cmd>Telescope find_files<CR>";
|
||||
options.desc = "[S]earch [F]iles";
|
||||
}
|
||||
{
|
||||
key = "<leader>sg";
|
||||
action = "<cmd>Telescope live_grep<CR>";
|
||||
options.desc = "[S]earch by [G]rep";
|
||||
}
|
||||
{
|
||||
key = "<leader>sw";
|
||||
action = "<cmd>Telescope grep_string<CR>";
|
||||
options.desc = "[S]earch current [W]ord";
|
||||
}
|
||||
];
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
{inputs, pkgs, }: {
|
||||
inputs.nixvim = {
|
||||
url = "github:nix-community/nixvim/nixos-25.11";
|
||||
# If you are not running an unstable channel of nixpkgs, select the corresponding branch of Nixvim.
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user