Compare commits
No commits in common. "2198ddb21e43b39a3f4c777e03a0311b216a847a" and "37d83dd90fec2961307aea4a08568534e5d2d90a" have entirely different histories.
2198ddb21e
...
37d83dd90f
8 changed files with 33 additions and 161 deletions
|
|
@ -286,7 +286,6 @@ bindl = , XF86AudioPause, exec, playerctl play-pause
|
||||||
bindl = , XF86AudioPlay, exec, playerctl play-pause
|
bindl = , XF86AudioPlay, exec, playerctl play-pause
|
||||||
bindl = , XF86AudioPrev, exec, playerctl previous
|
bindl = , XF86AudioPrev, exec, playerctl previous
|
||||||
|
|
||||||
|
|
||||||
##############################
|
##############################
|
||||||
### WINDOWS AND WORKSPACES ###
|
### WINDOWS AND WORKSPACES ###
|
||||||
##############################
|
##############################
|
||||||
|
|
@ -294,35 +293,11 @@ bindl = , XF86AudioPrev, exec, playerctl previous
|
||||||
# See https://wiki.hypr.land/Configuring/Window-Rules/ for more
|
# See https://wiki.hypr.land/Configuring/Window-Rules/ for more
|
||||||
# See https://wiki.hypr.land/Configuring/Workspace-Rules/ for workspace rules
|
# See https://wiki.hypr.land/Configuring/Workspace-Rules/ for workspace rules
|
||||||
|
|
||||||
# Example windowrules that are useful
|
# Example windowrule
|
||||||
|
# windowrule = float,class:^(kitty)$,title:^(kitty)$
|
||||||
|
|
||||||
windowrule {
|
# Ignore maximize requests from apps. You'll probably like this.
|
||||||
# Ignore maximize requests from all apps. You'll probably like this.
|
windowrule = suppressevent maximize, class:.*
|
||||||
name = suppress-maximize-events
|
|
||||||
match:class = .*
|
|
||||||
|
|
||||||
suppress_event = maximize
|
|
||||||
}
|
|
||||||
|
|
||||||
windowrule {
|
|
||||||
# Fix some dragging issues with XWayland
|
# Fix some dragging issues with XWayland
|
||||||
name = fix-xwayland-drags
|
windowrule = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0
|
||||||
match:class = ^$
|
|
||||||
match:title = ^$
|
|
||||||
match:xwayland = true
|
|
||||||
match:float = true
|
|
||||||
match:fullscreen = false
|
|
||||||
match:pin = false
|
|
||||||
|
|
||||||
no_focus = true
|
|
||||||
}
|
|
||||||
|
|
||||||
# Hyprland-run windowrule
|
|
||||||
windowrule {
|
|
||||||
name = move-hyprland-run
|
|
||||||
|
|
||||||
match:class = hyprland-run
|
|
||||||
|
|
||||||
move = 20 monitor_h-120
|
|
||||||
float = yes
|
|
||||||
}
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,2 @@
|
||||||
preload = /home/xory/wallpaper.png
|
preload = /home/xory/wallpaper.png
|
||||||
wallpaper = ,/home/xory/wallpaper.png
|
wallpaper = ,/home/xory/wallpaper.png
|
||||||
|
|
||||||
wallpaper {
|
|
||||||
monitor = eDP-2
|
|
||||||
path = ~/wallpaper.png
|
|
||||||
}
|
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,12 @@ profile {
|
||||||
gamma = 0.8
|
gamma = 0.8
|
||||||
}
|
}
|
||||||
|
|
||||||
|
profile {
|
||||||
|
time = 24:00
|
||||||
|
temperature = 1500
|
||||||
|
gamma = 0.7
|
||||||
|
}
|
||||||
|
|
||||||
profile {
|
profile {
|
||||||
time = 6:00
|
time = 6:00
|
||||||
identity = true
|
identity = true
|
||||||
|
|
|
||||||
|
|
@ -84,9 +84,10 @@ cmp.setup({
|
||||||
|
|
||||||
local capabilities = require("cmp_nvim_lsp").default_capabilities()
|
local capabilities = require("cmp_nvim_lsp").default_capabilities()
|
||||||
|
|
||||||
vim.lsp.enable("rust_analyzer")
|
local lspconfig = require('lspconfig')
|
||||||
vim.lsp.enable("pylsp")
|
local servers = { "rust_analyzer", "pylsp", "biome", "eslint", "ccls" }
|
||||||
vim.lsp.enable("biome")
|
for _, lsp in ipairs(servers) do
|
||||||
vim.lsp.enable("eslint")
|
lspconfig[lsp].setup({
|
||||||
vim.lsp.enable("ccls")
|
capabilities = capabilities,
|
||||||
|
})
|
||||||
|
end
|
||||||
|
|
|
||||||
|
|
@ -12,16 +12,6 @@
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
boot.supportedFilesystems = [ "zfs "];
|
boot.supportedFilesystems = [ "zfs "];
|
||||||
|
|
||||||
boot.kernelParams = [
|
|
||||||
"quiet"
|
|
||||||
"splash" # plymouth stuff
|
|
||||||
"udev.log_priority=3"
|
|
||||||
"rd.systemd.show_status=auto"
|
|
||||||
"boot.shell_on_fail" # good because we're using quiet mode
|
|
||||||
"net.ifnames=0" # personal opinion
|
|
||||||
];
|
|
||||||
boot.kernel.sysctl."kernel.sysrq" = 1; # mostly for REISUB
|
|
||||||
|
|
||||||
boot.initrd.systemd.services.rollback = {
|
boot.initrd.systemd.services.rollback = {
|
||||||
description = "Rollback ZFS root";
|
description = "Rollback ZFS root";
|
||||||
wantedBy = [ "initrd.target" ];
|
wantedBy = [ "initrd.target" ];
|
||||||
|
|
@ -35,22 +25,6 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
boot.kernelPackages = pkgs.linuxPackages;
|
boot.kernelPackages = pkgs.linuxPackages;
|
||||||
|
|
||||||
# Plymouth
|
|
||||||
boot.plymouth = {
|
|
||||||
enable = true;
|
|
||||||
theme = "square";
|
|
||||||
themePackages = with pkgs; [
|
|
||||||
(adi1090x-plymouth-themes.override {
|
|
||||||
selected_themes = [ "square" ];
|
|
||||||
})
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
# Silent boot for Plymouth
|
|
||||||
boot.consoleLogLevel = 3;
|
|
||||||
boot.initrd.verbose = false;
|
|
||||||
|
|
||||||
environment.persistence."/persist" = {
|
environment.persistence."/persist" = {
|
||||||
enable = true;
|
enable = true;
|
||||||
hideMounts = true;
|
hideMounts = true;
|
||||||
|
|
@ -62,7 +36,6 @@
|
||||||
"/var/lib/ollama-models"
|
"/var/lib/ollama-models"
|
||||||
"/var/lib/flatpak"
|
"/var/lib/flatpak"
|
||||||
"/var/lib/tailscale"
|
"/var/lib/tailscale"
|
||||||
"/var/lib/syncthing"
|
|
||||||
"/etc/NetworkManager/system-connections"
|
"/etc/NetworkManager/system-connections"
|
||||||
"/etc/ssh"
|
"/etc/ssh"
|
||||||
];
|
];
|
||||||
|
|
|
||||||
53
flake.lock
generated
53
flake.lock
generated
|
|
@ -102,22 +102,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1766651565,
|
|
||||||
"narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "nixos-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"disko": "disko",
|
"disko": "disko",
|
||||||
|
|
@ -125,42 +109,7 @@
|
||||||
"impermanence": "impermanence",
|
"impermanence": "impermanence",
|
||||||
"nixos-hardware": "nixos-hardware",
|
"nixos-hardware": "nixos-hardware",
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs",
|
||||||
"nixpkgs-stable": "nixpkgs-stable",
|
"nixpkgs-stable": "nixpkgs-stable"
|
||||||
"spicetify-nix": "spicetify-nix"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"spicetify-nix": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": "nixpkgs_2",
|
|
||||||
"systems": "systems"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1767195736,
|
|
||||||
"narHash": "sha256-0xvPSbhIGeJzsJXNTkgJ3PjwdVItKm85wzYKA9NmSzI=",
|
|
||||||
"owner": "Gerg-L",
|
|
||||||
"repo": "spicetify-nix",
|
|
||||||
"rev": "465adc0ab6ff0c4b9b1db1c6e7fd7eeb553b3261",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "Gerg-L",
|
|
||||||
"repo": "spicetify-nix",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"systems": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1681028828,
|
|
||||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default",
|
|
||||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default",
|
|
||||||
"type": "github"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -14,8 +14,6 @@
|
||||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
|
||||||
impermanence.url = "github:nix-community/impermanence";
|
impermanence.url = "github:nix-community/impermanence";
|
||||||
|
|
||||||
spicetify-nix.url = "github:Gerg-L/spicetify-nix";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs =
|
outputs =
|
||||||
|
|
|
||||||
51
home.nix
51
home.nix
|
|
@ -1,7 +1,5 @@
|
||||||
{ config, pkgs, inputs, ... }:
|
{ config, pkgs, inputs, ... }:
|
||||||
{
|
{
|
||||||
|
|
||||||
imports = [ inputs.spicetify-nix.homeManagerModules.default ];
|
|
||||||
home.username = "xory";
|
home.username = "xory";
|
||||||
home.homeDirectory = "/home/xory";
|
home.homeDirectory = "/home/xory";
|
||||||
|
|
||||||
|
|
@ -91,7 +89,6 @@
|
||||||
enableCompletion = true;
|
enableCompletion = true;
|
||||||
shellAliases = {
|
shellAliases = {
|
||||||
"rebuild" = "sudo nixos-rebuild switch --flake ~/dots";
|
"rebuild" = "sudo nixos-rebuild switch --flake ~/dots";
|
||||||
"spotify" = "${pkgs.firejail}/bin/firejail ${config.programs.spicetify.spicedSpotify}/bin/spotify";
|
|
||||||
};
|
};
|
||||||
syntaxHighlighting.enable = true;
|
syntaxHighlighting.enable = true;
|
||||||
};
|
};
|
||||||
|
|
@ -104,43 +101,21 @@
|
||||||
name = "Inconsolata Nerd Font";
|
name = "Inconsolata Nerd Font";
|
||||||
package = pkgs.nerd-fonts.inconsolata;
|
package = pkgs.nerd-fonts.inconsolata;
|
||||||
};
|
};
|
||||||
settings.background_opacity = 0.95;
|
settings.background_opacity = 0.8;
|
||||||
settings.window_padding_width = 5;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.spicetify =
|
# TODO: Fix up Neovim
|
||||||
let
|
# programs.vscode = {
|
||||||
spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.stdenv.hostPlatform.system};
|
# enable = true;
|
||||||
in
|
# extensions = with pkgs.vscode-extensions; [
|
||||||
{
|
# catppuccin.catppuccin-vsc
|
||||||
enable = true;
|
# catppuccin.catppuccin-vsc-icons
|
||||||
|
# dbaeumer.vscode-eslint
|
||||||
theme = spicePkgs.themes.catppuccin;
|
# rust-lang.rust-analyzer
|
||||||
colorScheme = "mocha";
|
# ms-python.python
|
||||||
|
# biomejs.biome
|
||||||
enabledExtensions = with spicePkgs.extensions; [
|
# ];
|
||||||
hidePodcasts
|
# };
|
||||||
shuffle
|
|
||||||
betterGenres
|
|
||||||
beautifulLyrics
|
|
||||||
];
|
|
||||||
|
|
||||||
enabledCustomApps = with spicePkgs.apps; [
|
|
||||||
newReleases
|
|
||||||
ncsVisualizer
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
# firejail
|
|
||||||
xdg.desktopEntries.spotify = {
|
|
||||||
name = "Spotify";
|
|
||||||
genericName = "Music Player";
|
|
||||||
icon = "spotify-client";
|
|
||||||
exec = "${pkgs.firejail}/bin/firejail ${config.programs.spicetify.spicedSpotify}/bin/spotify %U";
|
|
||||||
terminal = false;
|
|
||||||
categories = [ "Audio" "Music" "Player" "AudioVideo" ];
|
|
||||||
mimeType = [ "x-scheme-handler/spotify" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
wayland.windowManager.hyprland.enable = true;
|
wayland.windowManager.hyprland.enable = true;
|
||||||
programs.waybar.enable = true;
|
programs.waybar.enable = true;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue