ugehgrhegh
This commit is contained in:
parent
00ef021927
commit
18d09c7d7c
GPG key ID:
0FF5B8826803F895
|
|
@ -1,8 +1,6 @@
|
|||
# This file was generated by nvfetcher, please do not modify it manually.
|
||||
{ fetchgit, fetchurl, fetchFromGitHub, dockerTools }:
|
||||
{
|
||||
fetchurl,
|
||||
fetchFromGitHub,
|
||||
}: {
|
||||
bang-bang = {
|
||||
pname = "bang-bang";
|
||||
version = "ec991b80ba7d4dda7a962167b036efc5c2d79419";
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@
|
|||
emacs = mkCustomUrl "git+https://git.pupbrained.xyz/pupbrained/nixmacs.git";
|
||||
hyprland = mkWithSubmodules "https://github.com/hyprwm/Hyprland";
|
||||
hyprland-plugins = mkFollowing "hyprwm/hyprland-plugins" "hyprland";
|
||||
hyprpanel = mkInput "Jas-SinghFSU/HyprPanel";
|
||||
impermanence = mkInput "nix-community/impermanence";
|
||||
nix-colors = mkInput "Misterio77/nix-colors";
|
||||
nixos-facter-modules = mkInput "numtide/nixos-facter-modules";
|
||||
|
|
@ -34,8 +35,10 @@
|
|||
nixvim = mkInput "pupbrained/nvim-config";
|
||||
treefmt-nix = mkInput "numtide/treefmt-nix";
|
||||
xmonad-contrib = mkInput "xmonad/xmonad-contrib";
|
||||
zen-browser = mkInput "fufexan/zen-browser-flake";
|
||||
wezterm = mkInput "wez/wezterm?dir=nix";
|
||||
zen-browser = mkInput "qlexqndru/zen-browser-flake";
|
||||
|
||||
niri = mkFollowingNixpkgs "sodiboo/niri-flake";
|
||||
cosmic = mkFollowingNixpkgs "lilyinstarlight/nixos-cosmic";
|
||||
darwin = mkFollowingNixpkgs "LnL7/nix-darwin/master";
|
||||
home-manager = mkFollowingNixpkgs "nix-community/home-manager";
|
||||
|
|
@ -51,6 +54,7 @@
|
|||
src = ./.;
|
||||
|
||||
overlays = [
|
||||
hyprpanel.overlay
|
||||
snowfall-flake.overlays.default
|
||||
];
|
||||
|
||||
|
|
|
|||
919
flake.lock
919
flake.lock
File diff suppressed because it is too large
Load diff
|
|
@ -28,7 +28,12 @@
|
|||
inputs.hyprland.follows = "hyprland";
|
||||
url = "github:hyprwm/hyprland-plugins";
|
||||
};
|
||||
hyprpanel.url = "github:Jas-SinghFSU/HyprPanel";
|
||||
impermanence.url = "github:nix-community/impermanence";
|
||||
niri = {
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
url = "github:sodiboo/niri-flake";
|
||||
};
|
||||
nix-colors.url = "github:Misterio77/nix-colors";
|
||||
nix-index-database = {
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
|
@ -46,8 +51,9 @@
|
|||
url = "github:snowfallorg/lib/dev";
|
||||
};
|
||||
treefmt-nix.url = "github:numtide/treefmt-nix";
|
||||
wezterm.url = "github:wez/wezterm?dir=nix";
|
||||
xmonad-contrib.url = "github:xmonad/xmonad-contrib";
|
||||
zen-browser.url = "github:fufexan/zen-browser-flake";
|
||||
zen-browser.url = "github:qlexqndru/zen-browser-flake";
|
||||
};
|
||||
outputs = inputs: inputs.flakegen ./flake.in.nix inputs;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@
|
|||
};
|
||||
|
||||
colorScheme = inputs.nix-colors.colorSchemes.catppuccin-mocha;
|
||||
|
||||
wayland.windowManager.river = {
|
||||
enable = true;
|
||||
systemd.enable = true;
|
||||
|
|
@ -30,8 +31,12 @@
|
|||
home = {
|
||||
packages = with pkgs;
|
||||
[
|
||||
alacritty
|
||||
fuzzel
|
||||
alejandra
|
||||
beeper
|
||||
bitwarden-cli
|
||||
bitwarden-desktop
|
||||
duf
|
||||
eternal-terminal
|
||||
((pkgs.emacsPackagesFor pkgs.emacs30-pgtk).emacsWithPackages (epkgs:
|
||||
|
|
@ -72,6 +77,7 @@
|
|||
libnotify
|
||||
lm_sensors
|
||||
loupe
|
||||
mullvad-vpn
|
||||
nodejs
|
||||
playerctl
|
||||
prismlauncher
|
||||
|
|
@ -136,6 +142,7 @@
|
|||
|
||||
catppuccin = {
|
||||
enable = true;
|
||||
pointerCursor.enable = true;
|
||||
flavor = "mocha";
|
||||
accent = "green";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@ with pkgs; {
|
|||
];
|
||||
|
||||
home.packages = [
|
||||
hyprpanel
|
||||
swww
|
||||
wl-clipboard
|
||||
];
|
||||
|
||||
|
|
@ -15,7 +17,7 @@ with pkgs; {
|
|||
systemd.variables = ["--all"];
|
||||
|
||||
settings = let
|
||||
rofi-clipboard = pkgs.writeScriptBin "rofi-clipboard" ''
|
||||
rofi-clipboard = pkgs.writeScript "rofi-clipboard" ''
|
||||
tmp_dir="/tmp/cliphist"
|
||||
rm -rf "$tmp_dir"
|
||||
|
||||
|
|
@ -39,7 +41,7 @@ with pkgs; {
|
|||
cliphist list | gawk "$prog"
|
||||
'';
|
||||
|
||||
scratchpad = pkgs.writeScriptBin "hyprscratchpad" ''
|
||||
scratchpad = pkgs.writeScript "hyprscratchpad" ''
|
||||
COMMAND=$1
|
||||
CLASS=$2
|
||||
WORKSPACE=$3
|
||||
|
|
@ -55,19 +57,20 @@ with pkgs; {
|
|||
modC = "SUPER CTRL";
|
||||
modS = "SUPER SHIFT";
|
||||
|
||||
browser = "firefox-nightly";
|
||||
colorPicker = "notify-send -i gtk-color-picker $(${hyprpicker}/bin/hyprpicker -a) 'Copied to clipboard.'";
|
||||
browser = "zen-bin";
|
||||
colorPicker = "notify-send -i gtk-color-picker $(${lib.getExe hyprpicker} -a) 'Copied to clipboard.'";
|
||||
fileManager = "nautilus";
|
||||
launcher = "rofi -show drun";
|
||||
clipboard = "rofi -modi ' ':${rofi-clipboard}/bin/rofi-clipboard -show ' ' -show-icons";
|
||||
clipboard = "rofi -modi ' ':${rofi-clipboard} -show ' ' -show-icons";
|
||||
terminal = "wezterm";
|
||||
|
||||
screenshot = mode: "${hyprshot}/bin/hyprshot --clipboard-only -m ${mode}";
|
||||
screenshot = mode: "${lib.getExe hyprshot} --clipboard-only -m ${mode}";
|
||||
in {
|
||||
cursor.no_hardware_cursors = true;
|
||||
decoration.rounding = 10;
|
||||
decoration.rounding = 5;
|
||||
dwindle.preserve_split = true;
|
||||
gestures.workspace_swipe = true;
|
||||
|
||||
input.touchpad = {
|
||||
clickfinger_behavior = true;
|
||||
natural_scroll = true;
|
||||
|
|
@ -75,13 +78,13 @@ with pkgs; {
|
|||
|
||||
device = [
|
||||
{
|
||||
name = "logitech-g502-x-plus";
|
||||
name = "logitech-usb-receiver";
|
||||
sensitivity = -0.5;
|
||||
}
|
||||
];
|
||||
|
||||
windowrule = [
|
||||
"float, ^(vesktop)$"
|
||||
"float, ^(equibop)$"
|
||||
"float, ^(org.telegram.desktop)$"
|
||||
];
|
||||
|
||||
|
|
@ -110,21 +113,21 @@ with pkgs; {
|
|||
gaps_in = 10;
|
||||
resize_on_border = true;
|
||||
|
||||
"col.active_border" = "rgba(33ccffee) rgba(00ff99ee) 45deg";
|
||||
"col.active_border" = "rgba(a6e3a1ee) rgba(cba6f7ee) 45deg";
|
||||
"col.inactive_border" = "rgba(595959aa)";
|
||||
};
|
||||
|
||||
exec-once = [
|
||||
"${mpvpaper.overrideAttrs {
|
||||
version = "unstable-2024-07-05";
|
||||
src = fetchFromGitHub {
|
||||
owner = "GhostNaN";
|
||||
repo = "mpvpaper";
|
||||
rev = "a445391ff7491053fef78e3645eeed934f0c8fae";
|
||||
sha256 = "sha256-3wHsUtIkh765EiMnx3BPzztvffIDf1NCqF0I/OATTZ4=";
|
||||
};
|
||||
}}/bin/mpvpaper -vp -o 'no-audio loop' DP-1 ${builtins.toString ./wall.mp4}"
|
||||
"waybar"
|
||||
"hyprpanel"
|
||||
"swww-daemon"
|
||||
"${writeScript "wallpaper" ''
|
||||
while : ; do
|
||||
for file in $(${uutils-coreutils}/bin/uutils-ls ${./walls}/*.jpg | sort -R | tail -1); do
|
||||
swww img "$file" --transition-fps 165
|
||||
sleep 5m
|
||||
done
|
||||
done
|
||||
''}"
|
||||
];
|
||||
|
||||
misc = {
|
||||
|
|
@ -133,8 +136,6 @@ with pkgs; {
|
|||
};
|
||||
|
||||
monitor = [
|
||||
"eDP-1, disable"
|
||||
"Unknown-1, disable"
|
||||
"DP-1, 2560x1440@165, auto, auto"
|
||||
];
|
||||
|
||||
|
|
@ -165,8 +166,8 @@ with pkgs; {
|
|||
"${mod}, Return, exec, ${terminal}"
|
||||
|
||||
# Scratchpads
|
||||
"${mod}, d, exec, ${scratchpad}/bin/hyprscratchpad vesktop vesktop vesktop"
|
||||
"${mod}, t, exec, ${scratchpad}/bin/hyprscratchpad telegram-desktop org.telegram.desktop telegram"
|
||||
"${mod}, d, exec, ${scratchpad} equibop equibop equibop"
|
||||
"${mod}, t, exec, ${scratchpad} telegram-desktop org.telegram.desktop telegram"
|
||||
|
||||
# Screenshots
|
||||
"${modS}, s, exec, ${screenshot "window"}"
|
||||
|
|
|
|||
Binary file not shown.
BIN
homes/x86_64-linux/marshall@navis/hyprland/walls/car.jpg
Normal file
BIN
homes/x86_64-linux/marshall@navis/hyprland/walls/car.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.9 MiB |
BIN
homes/x86_64-linux/marshall@navis/hyprland/walls/clouds.jpg
Normal file
BIN
homes/x86_64-linux/marshall@navis/hyprland/walls/clouds.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.3 MiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.4 MiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.8 MiB |
Binary file not shown.
|
After Width: | Height: | Size: 8 MiB |
Binary file not shown.
|
After Width: | Height: | Size: 864 KiB |
|
|
@ -115,15 +115,15 @@ local config = {
|
|||
enable_kitty_graphics = true,
|
||||
enable_scroll_bar = false,
|
||||
enable_wayland = true,
|
||||
font_size = 12,
|
||||
font = wezterm.font('Iosevka Comfy Motion'),
|
||||
font_size = 10,
|
||||
font = wezterm.font('Maple Mono NF'),
|
||||
front_end = 'WebGpu',
|
||||
keys = keybinds,
|
||||
underline_position = -4,
|
||||
use_fancy_tab_bar = false,
|
||||
window_background_opacity = 0.8,
|
||||
window_decorations = 'NONE',
|
||||
warn_about_missing_glyphs = false,
|
||||
window_background_opacity = 0.8,
|
||||
window_padding = { left = 0, right = 0, top = 0, bottom = 0 },
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,10 @@
|
|||
{...}: {
|
||||
programs.wezterm.enable = true;
|
||||
{
|
||||
inputs,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
programs.wezterm = {
|
||||
enable = true;
|
||||
package = inputs.wezterm.packages.${pkgs.system}.default;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -184,34 +184,6 @@
|
|||
systemd = {
|
||||
tpm2.enable = true;
|
||||
|
||||
network.networks = {
|
||||
"10-lan1" = {
|
||||
DHCP = "yes";
|
||||
matchConfig.MACAddress = "04:42:1a:02:fe:f5";
|
||||
|
||||
dhcpV4Config.RouteMetric = 10;
|
||||
dhcpV6Config.RouteMetric = 10;
|
||||
|
||||
networkConfig = {
|
||||
IPv6PrivacyExtensions = "yes";
|
||||
MulticastDNS = true;
|
||||
};
|
||||
};
|
||||
|
||||
"10-wlan1" = {
|
||||
DHCP = "yes";
|
||||
matchConfig.MACAddress = "64:49:7d:c1:01:10";
|
||||
|
||||
dhcpV4Config.RouteMetric = 40;
|
||||
dhcpV6Config.RouteMetric = 40;
|
||||
|
||||
networkConfig = {
|
||||
IPv6PrivacyExtensions = "yes";
|
||||
MulticastDNS = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
user.extraConfig = let
|
||||
path = lib.concatStringsSep ":" [
|
||||
"/run/wrappers/bin"
|
||||
|
|
@ -243,7 +215,7 @@
|
|||
environment = {
|
||||
sessionVariables = {
|
||||
COSMIC_DATA_CONTROL_ENABLED = 1;
|
||||
BROWSER = "zen";
|
||||
BROWSER = "zen-bin";
|
||||
DIRENV_WARN_TIMEOUT = "100s";
|
||||
EDITOR = "nvim";
|
||||
NIXOS_OZONE_WL = 1;
|
||||
|
|
@ -284,7 +256,7 @@
|
|||
|
||||
boot = {
|
||||
blacklistedKernelModules = ["nouveau" "i915"];
|
||||
kernelPackages = pkgs.linuxPackages_xanmod_latest;
|
||||
kernelPackages = pkgs.linuxPackages_cachyos;
|
||||
supportedFilesystems = ["btrfs" "ntfs"];
|
||||
tmp.useTmpfs = true;
|
||||
|
||||
|
|
@ -297,13 +269,6 @@
|
|||
emergencyAccess = true;
|
||||
dbus.enable = true;
|
||||
|
||||
network = {
|
||||
enable = true;
|
||||
networks = {
|
||||
inherit (config.systemd.network.networks) "10-lan1" "10-wlan1";
|
||||
};
|
||||
};
|
||||
|
||||
initrdBin = with pkgs; [
|
||||
iwd
|
||||
nix
|
||||
|
|
@ -441,8 +406,6 @@
|
|||
gnupg.agent.enable = true;
|
||||
virt-manager.enable = true;
|
||||
|
||||
river.enable = true;
|
||||
|
||||
appimage = {
|
||||
enable = true;
|
||||
binfmt = true;
|
||||
|
|
@ -466,12 +429,10 @@
|
|||
|
||||
networking = {
|
||||
firewall.enable = false;
|
||||
networkmanager.enable = false;
|
||||
networkmanager.enable = true;
|
||||
hostName = "navis";
|
||||
nameservers = ["1.1.1.1" "1.0.0.1"];
|
||||
useDHCP = lib.mkForce true;
|
||||
useNetworkd = true;
|
||||
wireless.iwd.enable = true;
|
||||
};
|
||||
|
||||
time = {
|
||||
|
|
@ -484,6 +445,7 @@
|
|||
flatpak.enable = true;
|
||||
getty.autologinUser = "marshall";
|
||||
gnome.gnome-keyring.enable = true;
|
||||
mullvad-vpn.enable = true;
|
||||
openssh.enable = true;
|
||||
spice-vdagentd.enable = true;
|
||||
udisks2.enable = true;
|
||||
|
|
@ -541,6 +503,7 @@
|
|||
"disk"
|
||||
"gamemode"
|
||||
"libvirtd"
|
||||
"networkmanager"
|
||||
"qemu-libvirtd"
|
||||
"tss"
|
||||
"wheel"
|
||||
|
|
@ -582,13 +545,11 @@
|
|||
enable = true;
|
||||
xdgOpenUsePortal = true;
|
||||
|
||||
config.common.default = [
|
||||
"cosmic"
|
||||
"gtk"
|
||||
];
|
||||
config.common.default = "*";
|
||||
|
||||
extraPortals = [
|
||||
pkgs.xdg-desktop-portal-cosmic
|
||||
pkgs.xdg-desktop-portal-gnome
|
||||
pkgs.xdg-desktop-portal-gtk
|
||||
];
|
||||
};
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue