lotsa updates

This commit is contained in:
Your Name 2024-05-15 21:57:19 +03:00
parent 839f77d455
commit 95f6fa652b
20 changed files with 233 additions and 140 deletions

6
.vscode/settings.json vendored Normal file
View file

@ -0,0 +1,6 @@
{
"errorLens.enabledDiagnosticLevels": [
"error",
"info"
]
}

View file

@ -30,7 +30,7 @@ in {
spotdl
# xfce.thunar
(pkgs.xfce.thunar.override { thunarPlugins = [pkgs.xfce.thunar-archive-plugin]; })
rustdesk-flutter
#rustdesk-flutter
autossh
scrcpy
nixfmt
@ -96,10 +96,13 @@ in {
element-desktop
qrtool
appimage-run
trayscale
(pkgs.writeScriptBin "reboot" ''read -p "Do you REALLY want to reboot? (y/N) " answer; [[ $answer == [Yy]* ]] && ${pkgs.systemd}/bin/reboot'')
]);
programs.firefox = {
enable = true;
package = stable.firefox;
policies = {
DisableTelemetry = true;
DisableFirefoxStudies = true;
@ -190,6 +193,7 @@ in {
programs.virt-manager.enable = true;
programs.steam.enable = true;
programs.steam.gamescopeSession.enable = true;
programs.noisetorch.enable = true;
programs.gamemode.enable = true;
programs.thunar.enable = true;
# programs.thunar.plugins = with pkgs.xfce; [
@ -224,6 +228,8 @@ in {
abbr -a --position anywhere CC --function copy_clipboard
abbr -a --position command ttlfix TTLfix
abbr -a --position command syspend systemctl suspend
abbr -a --position command suspend systemctl suspend
'';
};

View file

@ -1,4 +1,4 @@
{ pkgs, lib, inputs, stable, ... }: with lib.gvariant;
{ pkgs, stable, lib, ... }: with lib.gvariant;
let
# wallpaper = pkgs.stdenv.mkDerivation {
@ -15,26 +15,26 @@ in
# inputs.home-manager.nixosModules.home-manager
#];
nixpkgs.overlays = [
(final: prev: {
gnome = prev.gnome.overrideScope' (gnomeFinal: gnomePrev: {
mutter = gnomePrev.mutter.overrideAttrs (old: {
src = pkgs.fetchgit {
url = "https://gitlab.gnome.org/vanvugt/mutter.git";
# GNOME 45: triple-buffering-v4-45
rev = "0b896518b2028d9c4d6ea44806d093fd33793689";
sha256 = "sha256-mzNy5GPlB2qkI2KEAErJQzO//uo8yO0kPQUwvGDwR4w=";
};
});
});
})
];
# nixpkgs.overlays = [
# (final: prev: {
# gnome = prev.gnome.overrideScope' (gnomeFinal: gnomePrev: {
# mutter = gnomePrev.mutter.overrideAttrs (old: {
# src = pkgs.fetchgit {
# url = "https://gitlab.gnome.org/vanvugt/mutter.git";
# # GNOME 45: triple-buffering-v4-45
# rev = "0b896518b2028d9c4d6ea44806d093fd33793689";
# sha256 = "sha256-mzNy5GPlB2qkI2KEAErJQzO//uo8yO0kPQUwvGDwR4w=";
# };
# });
# });
# })
# ];
system.activationScripts."gnome_setup_misc".text = ''
rm -f /home/delta/.config/gtk-4.0/gtk.css
rm -f /home/delta/.config/gtk-3.0/gtk.css
# ${pkgs.glib}/bin/gsettings set org.gnome.desktop.interface cursor-size 16
'';
#system.activationScripts."gnome_setup_misc".text = ''
# rm -f /home/delta/.config/gtk-4.0/gtk.css
# rm -f /home/delta/.config/gtk-3.0/gtk.css
# # ${pkgs.glib}/bin/gsettings set org.gnome.desktop.interface cursor-size 16
#'';
programs.dconf.enable = true;
programs.dconf.profiles.user.databases = [

View file

@ -5,6 +5,8 @@
inputs.home-manager.nixosModules.home-manager
];
home-manager.backupFileExtension = "backup-hm";
programs.hyprland.enable = true;
programs.hyprland.package = inputs.hyprland.packages.${pkgs.system}.hyprland;
users.users.delta.packages = with pkgs; [

View file

@ -1,20 +1,27 @@
general {
lock_cmd = /home/delta/scripts/swaylock # dbus/sysd lock command (loginctl lock-session)
lock_cmd = /home/delta/scripts/swaylock
before_sleep_cmd = /home/delta/scripts/swaylock # dbus/sysd lock command (loginctl lock-session)
ignore_dbus_inhibit = false # whether to ignore dbus-sent idle-inhibit requests (used by e.g. firefox or steam)
}
listener {
timeout = 200
before_sleep_cmd = notify-send -h string:x-canonical-private-synchronous:sys-notify -t 2400 -i face-yawn-symbolic 'Sleep' 'will inhibit soon'
on-timeout = notify-send -h string:x-canonical-private-synchronous:sys-notify -t 2400 -i face-yawn-symbolic 'Sleep' 'will inhibit soon'
}
`
listener {
timeout = 230 # in seconds
on-timeout = /home/delta/Documents/dotfiles/apps/hyprland/scripts/DM/brightness-kbd.sh on-timeout && /home/delta/Documents/dotfiles/apps/hyprland/scripts/DM/brightness.sh on-timeout # command to run when timeout has passed
on-resume = /home/delta/Documents/dotfiles/apps/hyprland/scripts/DM/brightness-kbd.sh on-resume && /home/delta/Documents/dotfiles/apps/hyprland/scripts/DM/brightness.sh on-resume # command to run when activity is detected after timeout has fired.
timeout = 200 # in seconds
on-timeout = /home/delta/Documents/dotfiles/apps/hyprland/scripts/DM/brightness-kbd.sh on-timeout && brightnessctl -s set 10 # command to run when timeout has passed
on-resume = /home/delta/Documents/dotfiles/apps/hyprland/scripts/DM/brightness-kbd.sh on-resume && brightnessctl -r # command to run when activity is detected after timeout has fired.
}
listener {
timeout = 260 # in seconds
on-timeout = ~/scripts/swaylock # command to run when timeout has passed
}
listener {
timeout = 300 # in seconds
on-timeout = systemctl suspend # command to run when timeout has passed
}

View file

@ -20,7 +20,7 @@ monitor=eDP-1,preferred,auto,1.333333
# See https://wiki.hyprland.org/Configuring/Keywords/ for more
# Execute your favorite apps at launch
# Execute your favorite apps at launchtt
exec-once = ~/.config/hypr/xdg-portal-hyprland
exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
@ -31,7 +31,7 @@ exec-once = sh -c "sleep 1 && swww clear"
#exec-once = mpvpaper '*' -o "video-scale-y=1.1 --gpu-context=wayland --vo=gpu --hwdec=vaapi-copy" videowork/bgloop.webm
# exec-once = gtk-launch autostart
exec-once =
exec-once = waybar -c ~/.config/waybar/config-online.jsonc
exec-once = waybar -c ~/.config/waybar/config-offline.jsonc
#exec-once = ags
exec-once = nm-applet
@ -48,6 +48,9 @@ exec-once = foot -s
exec-once = thunar --daemon
exec-once = hypridle
exec-once = hyprctl setcursor Bibata-Modern-Classic 16
exec-once = trayscale --hide-window
# exec-once = hyprctl dispatch -- exec [workspace special:hdrop silent] "QT_QPA_PLATFORM=xcb telegram-desktop"
exec-once = /home/delta/.config/hypr/hdrop -b -g '30' -h '60' -f 'keepassxc_lite' --class org.keepassxc.KeePassXC
exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
exec-once=systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
@ -57,7 +60,7 @@ exec-once = export XDG_DATA_DIRS=$HOME/.nix-profile/share:$XDG_DATA_DIRS
#env = QT_QPA_PLATFORMTHEME,qt5ct
env = QT_AUTO_SCREEN_SCALE_FACTOR,1
env = QT_QPA_PLATFORM,wayland;xcb
# env = QT_QPA_PLATFORM,wayland;xcb
env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
#env = GTK_THEME,Catppuccin-Macchiato-Rosewater-dark:dark
@ -146,6 +149,7 @@ decoration {
# See https://wiki.hyprland.org/Configuring/Variables/ for more
rounding = 5
fullscreen_opacity = 0.20
blur {
enabled = true
@ -293,10 +297,26 @@ windowrule = noblur,^(TelegramDesktop)$
windowrule = noblur,^(kitty_drop)$
windowrulev2 = float,class:^(kitty_drop)$
# windowrulev2 = float,class:^(kitty_drop)$
windowrulev2 = noanim,class:^(kitty_drop)$
windowrulev2 = stayfocused,class:^(kitty_drop)$
windowrulev2 = center 1,class:^(kitty_drop)$
# windowrulev2 = stayfocused,class:^(kitty_drop)$
# windowrulev2 = center 1,class:^(kitty_drop)$
# windowrulev2 = pin,class:^(kitty_drop)$
# windowrulev2 = center 1,initialclass:^(kitty_drop)$
windowrulev2 = float,initialclass:^(zenity)$
#telegram media viewer fixes
windowrulev2 = float,class:^(org.telegram.desktop|telegramdesktop)$,title:^(Media viewer)$
windowrulev2 = fakefullscreen,class:^(org.telegram.desktop|telegramdesktop)$,title:^(Media viewer)$
# windowrulev2 = float,initialTitle:^(Media viewer)$
# windowrulev2 = noanim,initialTitle:^(Media viewer)$
# windowrulev2 = center,initialTitle:^(Media viewer)$
# windowrulev2 = fakefullscreen,initialTitle:^(Media viewer)$
# windowrulev2 = noshadow,initialTitle:^(Media viewer)$
#layerrules
layerrule = noanim, swaync-notification-window
@ -325,7 +345,7 @@ bind = $mainMod, RETURN, exec, footclient
bind = $mainMod, Q, exec, footclient
bind = ALT, RETURN, exec, sh -c "/home/delta/.config/hypr/hdrop -g '30' -h '98' -p t -f kitty --class kitty_drop"
bind = ALT, X, exec, sh -c "/home/delta/.config/hypr/hdrop -g '30' -h '60' -f 'keepassxc_lite' --class org.keepassxc.KeePassXC"
bind = ALT, T, exec, sh -c "QT_QPA_PLATFORM=xcb /home/delta/.config/hypr/hdrop -h '60' -g '30' -f 'telegram-desktop' --class TelegramDesktop"
# bind = ALT, T, exec, sh -c "QT_QPA_PLATFORM=xcb /home/delta/.config/hypr/hdrop -h '60' -g '30' -f 'telegram-desktop' --class TelegramDesktop"
#bind = $mainMod SHIFT, RETURN, exec, alacritty #open the terminal
# bind = $mainMod, Q, exec, wezterm #open the terminal
#bind = $mainMod, Q, exec, alacritty #open the terminal

View file

@ -1,4 +1,4 @@
{ inputs, home, config, lib, pkgs, specialArgs, ... }:
{ config, pkgs, ... }:
let
ephemeralbrowser = pkgs.writeScriptBin "ephemeralbrowser" ''

View file

@ -1,4 +1,4 @@
{ pkgs, lib, config, inputs, ... }:
{ pkgs, lib, inputs, ... }:
let
socksBuilder = attrs:
{

View file

@ -1,4 +1,4 @@
{ pkgs, lib, inputs, ... }:
{ pkgs, inputs, ... }:
let
nginxConfig = pkgs.writeText "nginx_config" ''
pid /tmp/.nginx-work.pid;
@ -267,6 +267,24 @@ let
wait
'';
namespacedWork2 = pkgs.writeScriptBin "namespaced_work2" ''
${inputs.shwewo.packages.${pkgs.system}.namespaced}/bin/namespaced \
--veth0-ip 192.168.120.1 \
--veth1-ip 192.168.120.2 \
--dns ${inputs.secrets.work.dns1},${inputs.secrets.work.dns2} \
--hosts-file ${hostsNoRemote} \
--country RU \
--fwmark 0x6e736432 \
--table 28107 \
--name novpn
'';
kitty_work2 = pkgs.writeScriptBin "kitty_work2" ''
sudo ${namespacedWork2}/bin/namespaced_work2
sleep 1 & sudo ip netns exec novpn_nsd sudo /home/delta/scripts/vpn-connect-WB
sudo ip netns exec novpn_nsd sudo -u delta -g users ${pkgs.firefox}/bin/firefox -P work -no-remote --class firefoxwork --name firefoxwork
'';
hostsNoRemote = pkgs.writeText "hosts_no_remote" ''
127.0.0.1 graf1.local graf2.local kibana.local
${inputs.secrets.work.zabbix} ${inputs.secrets.work.zabbix-url} zabbix.local
@ -317,5 +335,6 @@ in
kittyWorkDesktopItem
firefoxWork
firefoxWorkDesktopItem
kitty_work2
];
}

View file

@ -1,4 +1,4 @@
{ stdenv, lib, buildFishPlugin }:
{ stdenv, buildFishPlugin }:
buildFishPlugin rec {
pname = "my-fish-functions";

View file

@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
# Add .zip parameter so that zip unpackCmd can match it.
# url = "https://input.djr.com/build/?fontSelection=fourStyleFamily&regular=InputSansNarrow-Light&italic=InputSansNarrow-LightItalic&bold=InputSansNarrow-Medium&boldItalic=InputSansNarrow-MediumItalic&a=0&g=0&i=topserif&l=0&zero=slash&asterisk=height&braces=straight&preset=default&line-height=1.1&accept=I+do&email=";
url = "${url}"; #i had to shorten link bc otherwise got errors that it's too long
sha256 = "sha256-tYC/yDaHz2AD5PpikTHewneZNaF3O0fClhhJvjeKdAY=";
sha256 = "sha256-7fIpQgRhc0HZ9vvPlFq63G8GjJVlz+Xon0ePAiqtbbA=";
stripRoot = false;
postFetch = ''

View file

@ -100,11 +100,11 @@
]
},
"locked": {
"lastModified": 1712014858,
"narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
"lastModified": 1714641030,
"narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
"rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e",
"type": "github"
},
"original": {
@ -113,6 +113,21 @@
"type": "github"
}
},
"flake-root": {
"locked": {
"lastModified": 1713493429,
"narHash": "sha256-ztz8JQkI08tjKnsTpfLqzWoKFQF4JGu2LRz8bkdnYUk=",
"owner": "srid",
"repo": "flake-root",
"rev": "bc748b93b86ee76e2032eecda33440ceb2532fcd",
"type": "github"
},
"original": {
"owner": "srid",
"repo": "flake-root",
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems_2"
@ -214,11 +229,11 @@
]
},
"locked": {
"lastModified": 1713894582,
"narHash": "sha256-pHJYZIVFmzPAwyTfcMGJwlfz18nOsS4p0CuDnI1EDL4=",
"lastModified": 1715486357,
"narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "33a20182e3164f451b6a4ac2ecadcab5c2c36703",
"rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1",
"type": "github"
},
"original": {
@ -235,11 +250,11 @@
]
},
"locked": {
"lastModified": 1713732794,
"narHash": "sha256-AYCofb8Zu4Mbc1lHDtju/uxeARawRijmOueAqEMEfMU=",
"lastModified": 1715486357,
"narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "670d9ecc3e46a6e3265c203c2d136031a3d3548e",
"rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1",
"type": "github"
},
"original": {
@ -280,26 +295,26 @@
"hyprland": {
"inputs": {
"hyprcursor": "hyprcursor",
"hyprland-protocols": "hyprland-protocols",
"hyprlang": "hyprlang",
"hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": "nixpkgs_2",
"systems": "systems",
"wlroots": "wlroots",
"xdph": "xdph"
},
"locked": {
"lastModified": 1714431929,
"narHash": "sha256-v9bzl7abnOacN/mW1x6nrP0hnCTWVUzETGq8HG6couI=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "5e6f7b1cdb72b394ad8556bb232ac8a406d851b4",
"type": "github"
"lastModified": 1715526061,
"narHash": "sha256-cVhbpdH8ln4ybFAG3yJFDTbKYTATok8cEkOM94IM0cU=",
"ref": "refs/heads/main",
"rev": "fd35b35000fa11ce540d944966ff17c71c31fd27",
"revCount": 4678,
"submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland"
},
"original": {
"owner": "hyprwm",
"repo": "Hyprland",
"type": "github"
"submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland"
}
},
"hyprland-contrib": {
@ -326,10 +341,12 @@
"inputs": {
"nixpkgs": [
"hyprland",
"xdph",
"nixpkgs"
],
"systems": [
"hyprland",
"xdph",
"systems"
]
},
@ -384,11 +401,11 @@
]
},
"locked": {
"lastModified": 1714171579,
"narHash": "sha256-eaWDIvt8ufUKKz3Lc2a3PyemLJG1m9RYlF+HP3hWbaw=",
"lastModified": 1715287423,
"narHash": "sha256-B7AJIjOyWgVMKhu7DlOnWa0VprdhywUVHuB/j+EwSxM=",
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
"rev": "126dad854f22fe30e6b82cd21808e76903d90ac5",
"rev": "e2fc1c0eb8b392110588f478cce644348ead7271",
"type": "github"
},
"original": {
@ -405,11 +422,11 @@
]
},
"locked": {
"lastModified": 1713543876,
"narHash": "sha256-olEWxacm1xZhAtpq+ZkEyQgR4zgfE7ddpNtZNvubi3g=",
"lastModified": 1713946171,
"narHash": "sha256-lc75rgRQLdp4Dzogv5cfqOg6qYc5Rp83oedF2t0kDp8=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "9e7c20ffd056e406ddd0276ee9d89f09c5e5f4ed",
"rev": "230a197063de9287128e2c68a7a4b0cd7d0b50a7",
"type": "github"
},
"original": {
@ -420,11 +437,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1713895582,
"narHash": "sha256-cfh1hi+6muQMbi9acOlju3V1gl8BEaZBXBR9jQfQi4U=",
"lastModified": 1696193975,
"narHash": "sha256-mnQjUcYgp9Guu3RNVAB2Srr1TqKcPpRXmJf4LJk6KRY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "572af610f6151fd41c212f897c71f7056e3fb518",
"rev": "fdd898f8f79e8d2f99ed2ab6b3751811ef683242",
"type": "github"
},
"original": {
@ -436,11 +453,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1713725259,
"narHash": "sha256-9ZR/Rbx5/Z/JZf5ehVNMoz/s5xjpP0a22tL6qNvLt5E=",
"lastModified": 1715395895,
"narHash": "sha256-DreMqi6+qa21ffLQqhMQL2XRUkAGt3N7iVB5FhJKie4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a5e4bbcb4780c63c79c87d29ea409abf097de3f7",
"rev": "71bae31b7dbc335528ca7e96f479ec93462323ff",
"type": "github"
},
"original": {
@ -468,11 +485,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1713714899,
"narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=",
"lastModified": 1715447595,
"narHash": "sha256-VsVAUQOj/cS1LCOmMjAGeRksXIAdPnFIjCQ0XLkCsT0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "6143fc5eeb9c4f00163267708e26191d1e918932",
"rev": "062ca2a9370a27a35c524dc82d540e6e9824b652",
"type": "github"
},
"original": {
@ -500,11 +517,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1713714899,
"narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=",
"lastModified": 1715087517,
"narHash": "sha256-CLU5Tsg24Ke4+7sH8azHWXKd0CFd4mhLWfhYgUiDBpQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "6143fc5eeb9c4f00163267708e26191d1e918932",
"rev": "b211b392b8486ee79df6cdfb1157ad2133427a29",
"type": "github"
},
"original": {
@ -516,11 +533,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1713714899,
"narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=",
"lastModified": 1715447595,
"narHash": "sha256-VsVAUQOj/cS1LCOmMjAGeRksXIAdPnFIjCQ0XLkCsT0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "6143fc5eeb9c4f00163267708e26191d1e918932",
"rev": "062ca2a9370a27a35c524dc82d540e6e9824b652",
"type": "github"
},
"original": {
@ -532,11 +549,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1713714899,
"narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=",
"lastModified": 1715447595,
"narHash": "sha256-VsVAUQOj/cS1LCOmMjAGeRksXIAdPnFIjCQ0XLkCsT0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "6143fc5eeb9c4f00163267708e26191d1e918932",
"rev": "062ca2a9370a27a35c524dc82d540e6e9824b652",
"type": "github"
},
"original": {
@ -580,11 +597,11 @@
},
"nixpkgs_7": {
"locked": {
"lastModified": 1713714899,
"narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=",
"lastModified": 1714906307,
"narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "6143fc5eeb9c4f00163267708e26191d1e918932",
"rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588",
"type": "github"
},
"original": {
@ -599,17 +616,19 @@
"devshell": "devshell",
"flake-compat": "flake-compat",
"flake-parts": "flake-parts_2",
"flake-root": "flake-root",
"home-manager": "home-manager_2",
"nix-darwin": "nix-darwin",
"nixpkgs": "nixpkgs_4",
"pre-commit-hooks": "pre-commit-hooks"
"pre-commit-hooks": "pre-commit-hooks",
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1713856119,
"narHash": "sha256-TfNc8vxF7IaRhTlMgOeUN01y7QoBx50MYmGU1sSU6Vw=",
"lastModified": 1715545653,
"narHash": "sha256-VKuHTHhi4fQ87Hd4yZWU38yYj4f8dsfR5PfCUSZqcd8=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "c826d146c65bfa8164f31931cf54278b99f5a3a0",
"rev": "a2a558d15ee85ea07291d172310e54ebadd6b221",
"type": "github"
},
"original": {
@ -633,11 +652,11 @@
]
},
"locked": {
"lastModified": 1713775815,
"narHash": "sha256-Wu9cdYTnGQQwtT20QQMg7jzkANKQjwBD9iccfGKkfls=",
"lastModified": 1714478972,
"narHash": "sha256-q//cgb52vv81uOuwz1LaXElp3XAe1TqrABXODAEF6Sk=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "2ac4dcbf55ed43f3be0bae15e181f08a57af24a4",
"rev": "2849da033884f54822af194400f8dff435ada242",
"type": "github"
},
"original": {
@ -692,11 +711,11 @@
"tdesktop": "tdesktop"
},
"locked": {
"lastModified": 1714028061,
"narHash": "sha256-ahYGiDoOscpTjRBOcUZhEvi5DbH1V+YyZiXOJ5s/x2M=",
"lastModified": 1715005960,
"narHash": "sha256-X6qV++Paxy6x5qGk5e+8HCaBE5UiQuHNgaPQz6uhOws=",
"owner": "shwewo",
"repo": "flake",
"rev": "a683aaee76926b4b23d81c5ed5da1ddffa097120",
"rev": "7fef88d30bc9ea194f7057d373aa2b45c517082d",
"type": "github"
},
"original": {
@ -805,11 +824,11 @@
"nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1714027575,
"narHash": "sha256-Fdq1OGJqJUPgTODVeoDGoKeHae4VvBPzkvINMExHKKU=",
"lastModified": 1715005420,
"narHash": "sha256-yHyDqkwFILw4ri0Ap9kIxhLVS8dQJbbpkgZaKNDBvsg=",
"owner": "shwewo",
"repo": "telegram-desktop-patched",
"rev": "93ac3b50d21ce0680639cb4c919389ed7d94315f",
"rev": "a89dc5009ee9965d4469ee2548dd9d51a3ef4142",
"type": "github"
},
"original": {
@ -818,29 +837,30 @@
"type": "github"
}
},
"wlroots": {
"flake": false,
"treefmt-nix": {
"inputs": {
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1713731601,
"narHash": "sha256-bdcKdtLkusvv85DNuJsajZLFeq7bXp+x5AGP1Sd4wD8=",
"owner": "hyprwm",
"repo": "wlroots-hyprland",
"rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea",
"lastModified": 1714058656,
"narHash": "sha256-Qv4RBm4LKuO4fNOfx9wl40W2rBbv5u5m+whxRYUMiaA=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "c6aaf729f34a36c445618580a9f95a48f5e4e03f",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "wlroots-hyprland",
"rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea",
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"xdph": {
"inputs": {
"hyprland-protocols": [
"hyprland",
"hyprland-protocols"
],
"hyprland-protocols": "hyprland-protocols",
"hyprlang": [
"hyprland",
"hyprlang"
@ -855,11 +875,11 @@
]
},
"locked": {
"lastModified": 1713724432,
"narHash": "sha256-dtU1y4oj/0Y42oauzm93ucFg1AoqETnQ21bmXTIUng0=",
"lastModified": 1714662532,
"narHash": "sha256-Pj2xGSYhapYbXL7sk7TTlOtCZcTfPQoL3fPbZeg7L4Y=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "9ace6f969ce495185df34cc6254fb9d297765478",
"rev": "1f228ba2f1f254195c0b571302b37482861abee3",
"type": "github"
},
"original": {

View file

@ -1,6 +1,7 @@
{
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
# nixpkgs.url = "github:nixos/nixpkgs?rev=ebce8ace41c8ca0d1776de4c5be5c815fb2fb5f7";
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-23.11";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs2105.url = "github:NixOS/nixpkgs/nixos-21.05";
@ -15,14 +16,14 @@
inputs.nixpkgs.follows = "nixpkgs";
inputs.nixpkgs-stable.follows = "nixpkgs-stable";
};
hyprland.url = "github:hyprwm/Hyprland";
hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
hyprland-contrib = {
url = "github:hyprwm/contrib";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = inputs@{ self, nixpkgs, home-manager, anyrun, ... }:
outputs = inputs@{ self, nixpkgs, home-manager, ... }:
let
pkgs = nixpkgs.legacyPackages."x86_64-linux";
stable = import inputs.nixpkgs-stable {

View file

@ -1,4 +1,4 @@
{ stable, unstable, inputs, home, config, lib, pkgs, specialArgs, ... }:
{ lib, pkgs, ... }:
{
home.username = "delta";
home.stateVersion = "23.11";
@ -26,11 +26,17 @@
version = "0.47.2";
sha256 = "1hp6gjh4xp2m1xlm1jsdzxw9d8frkiidhph6nvl24d0h8z34w49g";
}
#{
# name = "popping-and-locking-vscode";
# publisher = "hedinne";
# version = "2.0.11";
# sha256 = "7ZH9l4jySPo1jMZnylTPK6o+XZnxUtrpYIiY9xVPuRw=";
#}
{
name = "popping-and-locking-vscode";
publisher = "hedinne";
version = "2.0.11";
sha256 = "7ZH9l4jySPo1jMZnylTPK6o+XZnxUtrpYIiY9xVPuRw=";
name = "tokyo-night";
publisher = "enkia";
version = "1.0.6";
sha256 = "sha256-VWdUAU6SC7/dNDIOJmSGuIeffbwmcfeGhuSDmUE7Dig=";
}
{
name = "bracket-select";
@ -67,13 +73,17 @@
#create RW vscode settings so all hotkeys work (wrap_lines and etc)
home.activation = {
copy_unlink = lib.hm.dag.entryAfter ["onFilesChange"] (''
cp /home/delta/.config/Code/User/settings.json /home/delta/.config/Code/User/settings.json.rw
copy_unlink = lib.hm.dag.entryAfter ["onFilesChange"] ''
rm -f /home/delta/.config/Code/User/settings.json.rw
cp -f /home/delta/.config/Code/User/settings.json /home/delta/.config/Code/User/settings.json.rw
chmod +rw /home/delta/.config/Code/User/settings.json.rw
# unlink /home/delta/.config/Code/User/settings.json
'');
link_copy = lib.hm.dag.entryAfter ["setupLaunchAgents"] (''
'';
link_copy = lib.hm.dag.entryAfter ["setupLaunchAgents"] ''
unlink /home/delta/.config/Code/User/settings.json
ln -sf /home/delta/.config/Code/User/settings.json.rw /home/delta/.config/Code/User/settings.json
'');
chmod +rw /home/delta/.config/Code/User/settings.json
'';
};
programs.git = {
@ -125,7 +135,7 @@
programs.kitty = {
enable = true;
shellIntegration.enableFishIntegration = false;
# shellIntegration.enableFishIntegration = false;
settings = {
background = "#171717";
foreground = "#DCDCCC";

View file

@ -1,4 +1,4 @@
{ pkgs, lib, inputs, unstable, ... }:
{ pkgs, lib, stable, unstable, ... }:
let
gtk-theme = "adw-gtk3-dark";
cursor-package = pkgs.bibata-cursors;
@ -71,7 +71,8 @@ in {
iconTheme = {
name = "Papirus-Dark";
package = lib.mkForce unstable.papirus-icon-theme;
# name = "Papirus";
package = lib.mkForce stable.papirus-icon-theme;
};
# gtk3.extraCss = ''
# headerbar, .titlebar,

View file

@ -1,7 +1,7 @@
# 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.
{ stable, unstable, config, lib, pkgs, modulesPath, self, ... }:
{ stable, unstable, config, lib, pkgs, modulesPath, ... }:
{
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
@ -106,6 +106,9 @@
driSupport32Bit = true;
extraPackages = [ pkgs.amdvlk ];
extraPackages32 = [ pkgs.driversi686Linux.amdvlk ];
# package = inputs.hyprland.inputs.nixpkgs.legacyPackages."x86_64-linux".mesa.drivers;
# package32 = inputs.hyprland.inputs.nixpkgs.legacyPackages."x86_64-linux".pkgsi686Linux.mesa.drivers;
};
networking.useDHCP = lib.mkDefault true;

View file

@ -184,7 +184,7 @@
age
rage
lua5_4
nodejs_21
nodePackages_latest.nodejs
rocmPackages.rocm-smi #gpu support in btop
];

View file

@ -8,7 +8,7 @@
environment.sessionVariables = {
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
QT_QPA_PLATFORM = "wayland";
QT_QPA_PLATFORM = lib.mkDefault "wayland";
STEAM_FORCE_DESKTOPUI_SCALING = "1";
NIXOS_OZONE_WL = "1";
MOZ_ENABLE_WAYLAND = "1";

View file

@ -72,7 +72,7 @@ in {
# "nyx.chaotic.cx-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8=" "chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8="
];
};
package = unstable.nixUnstable;
package = unstable.nixVersions.latest;
};
nixpkgs.config.allowUnfree = true;
@ -100,8 +100,7 @@ in {
inetutils
killall
tree
lsd # better ls, will check what's better
eza # better ls, will check what's better
eza # it's faster then lsd
htop
btop
nix-search-cli
@ -120,10 +119,9 @@ in {
rebuild = "nh os switch";
rollback = "sudo nixos-rebuild switch --rollback --flake ~/Documents/dotfiles/";
haste = "HASTE_SERVER='https://haste.schizoposting.online' ${pkgs.haste-client}/bin/haste";
# ls = "${pkgs.lsd}/bin/lsd";
ls = "${pkgs.eza}/bin/exa --icons";
ltree = "${pkgs.eza}/bin/exa --icons --tree";
# ltree = "${pkgs.lsd}/bin/lsd --tree";
tre = "${pkgs.eza}/bin/exa --tree";
itree = "${pkgs.eza}/bin/exa --icons --tree";
search = "nix-search -d -m 5 -p";
unpack = "aunpack";
where = "which";

View file

@ -36,7 +36,7 @@
wget
htop
zenith
pkgs.xorg.xauth
xorg.xauth
docker docker-compose traefik
lazydocker
android-tools