varris
/
nixos-dotfiles
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

This commit is contained in:
Varris 2023-08-13 21:24:57 +02:00
parent f2cb1dcef2
commit 772f9e8a0d
10 changed files with 84 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
configuration.nix
View File

@ -68,8 +68,6 @@
keyMap = "us-acentos"; keyMap = "us-acentos";
}; };
# chaotic.mesa-git.enable = true;
hardware.opengl = { hardware.opengl = {
enable = true; enable = true;
extraPackages = [ pkgs.libvdpau-va-gl ]; extraPackages = [ pkgs.libvdpau-va-gl ];
@ -97,13 +95,6 @@
rtkit.enable = true; rtkit.enable = true;
sudo.enable = false; sudo.enable = false;
pam.loginLimits = [{
domain = "*";
type = "soft";
item = "nofile";
value = "262144";
}];
doas = { doas = {
enable = true; enable = true;
extraRules = [{ extraRules = [{
@ -116,13 +107,14 @@
users.users.manuel = { users.users.manuel = {
isNormalUser = true; isNormalUser = true;
extraGroups = [ "audio" "games" "input" "scanner" "lp" "users" "video" "vboxusers" "wheel" "networkmanager" ]; extraGroups = [ "audio" "games" "input" "lp" "networkmanager" "scanner" "users" "vboxusers" "video" "wheel" ];
shell = pkgs.fish; shell = pkgs.fish;
}; };
environment = { environment = {
systemPackages = with pkgs; [ systemPackages = with pkgs; [
bc bc
cached-nix-shell
compsize compsize
distrobox distrobox
fd fd
@ -189,7 +181,6 @@
pulse.enable = true; pulse.enable = true;
}; };
locate = { locate = {
enable = true; enable = true;
locate = pkgs.plocate; locate = pkgs.plocate;
@ -202,6 +193,16 @@
enable = true; enable = true;
interval = "weekly"; interval = "weekly";
}; };
greetd = {
enable = true;
settings = {
default_session = {
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd Hyprland";
user = "greeter";
};
};
};
}; };
virtualisation = { virtualisation = {
@ -234,14 +235,17 @@
experimental-features = nix-command flakes experimental-features = nix-command flakes
warn-dirty = false warn-dirty = false
''; '';
registry = lib.mapAttrs (_: value: { flake = value; }) inputs; registry = lib.mapAttrs (_: value: { flake = value; }) inputs;
nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry; nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry;
gc = { gc = {
persistent = true; persistent = true;
automatic = true; automatic = true;
dates = "weekly"; dates = "weekly";
options = "--delete-older-than 7d"; options = "--delete-older-than 7d";
}; };
settings = { settings = {
auto-optimise-store = true; auto-optimise-store = true;
@ -258,6 +262,6 @@
}; };
}; };
system.stateVersion = "22.05"; system.stateVersion = "23.05";
} }

21
flake.nix
View File

@ -16,8 +16,20 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
hyprland-contrib.url = "github:hyprwm/contrib"; hyprland-contrib = {
hyprpicker.url = "github:hyprwm/hyprpicker"; url = "github:hyprwm/contrib";
inputs.nixpkgs.follows = "nixpkgs";
};
hyprpicker = {
url = "github:hyprwm/hyprpicker";
inputs.nixpkgs.follows = "nixpkgs";
};
aitrack = {
url = "github:AIRLegend/aitrack";
flake = false;
};
gruvbox-kvantum = { gruvbox-kvantum = {
url = "github:thefallnn/Gruvbox-Kvantum"; url = "github:thefallnn/Gruvbox-Kvantum";
@ -54,10 +66,11 @@
flake = false; flake = false;
}; };
xorg-git = { nvim-hmts = {
url = "gitlab:xorg/xserver?host=gitlab.freedesktop.org"; url = "github:calops/hmts.nvim";
flake = false; flake = false;
}; };
}; };
outputs = { self, nixpkgs, home-manager, ... }@inputs: outputs = { self, nixpkgs, home-manager, ... }@inputs:

7
hardware-configuration.nix
View File

@ -16,9 +16,8 @@
fileSystems."/" = fileSystems."/" =
{ {
device = "/dev/disk/by-uuid/33112a66-7f9a-482c-b14c-91490f2212c2"; device = "/dev/disk/by-uuid/2949cfe9-f064-47b4-9621-3941b8ea1a42";
fsType = "btrfs"; fsType = "xfs";
options = [ "subvol=@nixos" "compress=zstd" ];
}; };
fileSystems."/mnt/hdd" = fileSystems."/mnt/hdd" =
@ -35,7 +34,7 @@
fileSystems."/boot/efi" = fileSystems."/boot/efi" =
{ {
device = "/dev/disk/by-uuid/D56E-61DC"; device = "/dev/disk/by-uuid/2128-03CA";
fsType = "vfat"; fsType = "vfat";
}; };

12
overlay.nix
View File

@ -2,13 +2,11 @@
{ {
default = final: prev: { default = final: prev: {
arrpc = inputs.arrpc.packages.${prev.system}.arrpc;
eww = prev.eww.override { eww = prev.eww.override {
withWayland = true; withWayland = true;
}; };
gruvbox-plus-icon-pack = prev.callPackage ./pkgs/gruvbox-plus-icon-pack { }; gruvbox-plus-icon-pack = final.callPackage ./pkgs/gruvbox-plus-icon-pack { };
ncmpcpp = prev.ncmpcpp.override { ncmpcpp = prev.ncmpcpp.override {
visualizerSupport = true; visualizerSupport = true;
@ -30,6 +28,8 @@
steam = prev.steam.override { steam = prev.steam.override {
extraPkgs = prev: [ extraPkgs = prev: [
prev.libkrb5
prev.keyutils
prev.gnome.zenity prev.gnome.zenity
prev.xdg-user-dirs prev.xdg-user-dirs
]; ];
@ -50,5 +50,11 @@
"-Dcava=disabled" "-Dcava=disabled"
]; ];
}); });
nvim-hmts = prev.vimUtils.buildVimPluginFrom2Nix {
pname = "nvim-hmts";
version = "1";
src = inputs.nvim-hmts;
};
}; };
} }

2
user/configs/neovim/config/lua/remaps.lua
View File

@ -12,7 +12,7 @@ map( "n", "<Leader>fp", telescope_builtin.git_files, { desc = "Find Files
map( "n", "<Leader>fc", function() map( "n", "<Leader>fc", function()
telescope_builtin.git_files({ cwd = "~/.dotfiles"}) telescope_builtin.git_files({ cwd = "~/.dotfiles"})
end, { desc = "Edit Dotfiles" }) end, { desc = "Edit Dotfiles" })
map( "n", "<C-n>", "<cmd>NeoTreeFocusToggle<CR>", { desc = "Open NeoTree" }) map( "n", "<C-n>", "<cmd>Neotree toggle<CR>", { desc = "Open NeoTree" })
map( {"n", "x"}, "ga", ":EasyAlign", { desc = "Align text" }) map( {"n", "x"}, "ga", ":EasyAlign", { desc = "Align text" })
-- resizing splits -- resizing splits

2
user/configs/neovim/default.nix
View File

@ -55,6 +55,8 @@
stylua stylua
nodePackages.vscode-css-languageserver-bin nodePackages.vscode-css-languageserver-bin
zls zls
] ++ [
pkgs.nvim-hmts
]; ];
}; };

2
user/configs/wayland/foot/default.nix
View File

@ -4,7 +4,7 @@
enable = true; enable = true;
settings = { settings = {
main = { main = {
font = "JetBrainsMono Nerd Font:pixelsize=12"; font = "JetBrainsMono Nerd Font:pixelsize=14";
pad = "16x16 center"; pad = "16x16 center";
underline-offset = "4px"; underline-offset = "4px";
}; };

45
user/configs/wayland/hyprland/default.nix
View File

@ -1,11 +1,11 @@
{ config, pkgs, inputs, ... }: { config, pkgs, inputs, ... }:
let let
wobsock = "/tmp/wob-vol.fifo"; leftMonitor = "DP-2";
rightMonitor = "DP-1";
modKey = "SUPER"; modKey = "SUPER";
leftMonitor = "DP-2"; wobsock = "/tmp/wob-vol.fifo";
rightMonitor = "DP-1";
wob-voldaemon = pkgs.writeShellScriptBin "wob-volumeindicator.sh" '' wob-voldaemon = pkgs.writeShellScriptBin "wob-volumeindicator.sh" ''
if pgrep "wob"; then if pgrep "wob"; then
@ -21,17 +21,7 @@ let
echo "wob: started" echo "wob: started"
''; '';
xwaylandSetPrimary = pkgs.writeShellScriptBin "xwayland-setprimary.sh" '' killprocess = pkgs.writeShellScriptBin "killprocess.sh" ''
while true; do
DSP=$(${pkgs.xorg.xrandr}/bin/xrandr | awk '/2560x1440/ {print $1}' | head -n 1)
if [[ ! -z DSP ]]; then
${pkgs.xorg.xrandr}/bin/xrandr --output "$DSP" --primary
fi
sleep 10
done
'';
killprocess = pkgs.writeShellScriptBin "killprocess.sh" ''hypr
ps -x -o pid=,comm= | column -t -o " " | ${pkgs.rofi-wayland}/bin/rofi -dmenu -p "kill process: " | awk '{print $1}' | uniq | xargs -r kill -9 ps -x -o pid=,comm= | column -t -o " " | ${pkgs.rofi-wayland}/bin/rofi -dmenu -p "kill process: " | awk '{print $1}' | uniq | xargs -r kill -9
''; '';
@ -101,6 +91,8 @@ in
} }
misc { misc {
disable_hyprland_logo = true
disable_splash_rendering = true
vfr = true vfr = true
vrr = 2 vrr = 2
# enable_swallow = true # enable_swallow = true
@ -109,10 +101,13 @@ in
decoration { decoration {
rounding = 10 rounding = 10
blur = yes
blur_size = 3 blur {
blur_passes = 2 enabled = yes
blur_new_optimizations = on size = 3
passes = 2
new_optimizations = on
}
drop_shadow = yes drop_shadow = yes
shadow_range = 8 shadow_range = 8
@ -133,13 +128,15 @@ in
exec-once = ${pkgs.openrgb}/bin/openrgb --startminimized --profile autorun.orp exec-once = ${pkgs.openrgb}/bin/openrgb --startminimized --profile autorun.orp
exec-once = ${pkgs.blueman}/bin/blueman-applet exec-once = ${pkgs.blueman}/bin/blueman-applet
exec-once = ${pkgs.networkmanagerapplet}/bin/nm-applet --indicator exec-once = ${pkgs.networkmanagerapplet}/bin/nm-applet --indicator
# exec-once = ${xwaylandSetPrimary}/bin/xwayland-setprimary.sh # exec-once = ${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1
exec-once = ${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1 exec-once = ${pkgs.mullvad-vpn}/bin/mullvad-gui
exec-once = ${pkgs.swww}/bin/swww-daemon exec-once = ${pkgs.ydotool}/bin/ydotoold
exec-once = $pkgs.arrpc}/bin/arRPC
exec = ${pkgs.xorg.xrandr}/bin/xrandr --output ${rightMonitor} --primary
exec = ${wob-voldaemon}/bin/wob-volumeindicator.sh; exec = ${wob-voldaemon}/bin/wob-volumeindicator.sh;
exec = pkill waybar; ${pkgs.waybar_hyprland}/bin/waybar exec = pkill waybar; ${pkgs.waybar_hyprland}/bin/waybar
exec = pkill swww; ${pkgs.swww}/bin/swww init && ${pkgs.swww}/bin/swww img $(cat ~/.cache/swww/wallpaper.txt)
#Set cursor #Set cursor
exec = ${pkgs.hyprland}/bin/hyprctl setcursor "${config.gtk.cursorTheme.name}" ${builtins.toString config.gtk.cursorTheme.size} &> /dev/null exec = ${pkgs.hyprland}/bin/hyprctl setcursor "${config.gtk.cursorTheme.name}" ${builtins.toString config.gtk.cursorTheme.size} &> /dev/null
@ -198,6 +195,8 @@ in
layerrule = blur, waybar layerrule = blur, waybar
layerrule = blur, notifications layerrule = blur, notifications
layerrule = blur, gtk-layer-shell
windowrulev2 = fullscreen, class:^(hl2_linux)$ windowrulev2 = fullscreen, class:^(hl2_linux)$
windowrulev2 = float, class:^(org.kde.dolphin)$ windowrulev2 = float, class:^(org.kde.dolphin)$
@ -214,7 +213,7 @@ in
[Desktop Action setSWWWWallpaper] [Desktop Action setSWWWWallpaper]
Name=Set Image as Wallpaper Name=Set Image as Wallpaper
Exec=swww img "%f" Exec=swww img "%f" && echo "%f" > ~/.cache/swww/wallpaper.txt
''; '';
home.packages = [ pkgs.wl-clipboard pkgs.wl-clipboard-x11 pkgs.hyprpicker pkgs.swww pkgs.hyprprop ]; home.packages = [ pkgs.wl-clipboard pkgs.wl-clipboard-x11 pkgs.hyprpicker pkgs.swww pkgs.hyprprop ];

6
user/configs/wayland/waybar/default.nix
View File

@ -40,12 +40,6 @@ in
"custom/blank" "custom/blank"
]; ];
"sway/mode" = { format = " {}"; };
"sway/window" = {
icon = false;
icon-size = 16;
};
"wlr/workspaces" = { "wlr/workspaces" = {
on-click = "activate"; on-click = "activate";
on-scroll-up = "hyprctl dispatch workspace e+1"; on-scroll-up = "hyprctl dispatch workspace e+1";

18
user/home.nix
View File

@ -1,4 +1,4 @@
{ pkgs, inputs, ... }: { config, pkgs, inputs, ... }:
{ {
imports = [ imports = [
./configs/beets ./configs/beets
@ -22,16 +22,19 @@
home.packages = with pkgs; [ home.packages = with pkgs; [
appimage-run appimage-run
bc bc
bottles
bottom bottom
calcurse calcurse
eww eww
gamescope_git
gimp gimp
gnome.file-roller
gnome.gnome-boxes gnome.gnome-boxes
gnome.gvfs gnome.gvfs
gnome.seahorse gnome.seahorse
gnome.gnome-settings-daemon
gnome.simple-scan gnome.simple-scan
heroic heroic
libsForQt5.ark
libsForQt5.dolphin libsForQt5.dolphin
libsForQt5.dolphin-plugins libsForQt5.dolphin-plugins
lutris lutris
@ -43,10 +46,12 @@
obs-studio obs-studio
openmw openmw
pavucontrol pavucontrol
playerctl
protontricks protontricks
qbittorrent qbittorrent
qt5ct qt5ct
sc-im sc-im
samba
signal-desktop signal-desktop
sshfs sshfs
steam-run steam-run
@ -57,13 +62,14 @@
vimv vimv
vulkan-tools vulkan-tools
vulkan-validation-layers vulkan-validation-layers
webcord discord
wineWowPackages.stagingFull wineWowPackages.stagingFull
xdg-utils xdg-utils
]; ];
home.sessionVariables = { home.sessionVariables = {
EDITOR = "nvim"; EDITOR = "nvim";
GTK_THEME = "${builtins.toString config.gtk.theme.name}";
MESA_DISK_CACHE_SINGLE_FILE = "1"; MESA_DISK_CACHE_SINGLE_FILE = "1";
NIXOS_OZONE_WL = "1"; NIXOS_OZONE_WL = "1";
NIXPKGS_ALLOW_UNFREE = "1"; NIXPKGS_ALLOW_UNFREE = "1";
@ -104,8 +110,8 @@
gtk = { gtk = {
enable = true; enable = true;
theme = { theme = {
package = pkgs.gruvbox-dark-gtk; package = pkgs.gruvbox-gtk-theme;
name = "gruvbox-dark"; name = "Gruvbox-Dark-B";
}; };
font = { font = {
@ -165,6 +171,6 @@
download = "/mnt/hdd/Downloads"; download = "/mnt/hdd/Downloads";
}; };
home.stateVersion = "22.05"; home.stateVersion = "23.05";
} }