From 0442a88d080bb68c3a6874ceda816e76591cd106 Mon Sep 17 00:00:00 2001 From: atagen Date: Mon, 29 May 2023 14:47:09 +1000 Subject: [PATCH] disable mullvad, add thunar --- flake.lock | 36 ++++++++++++++++---------------- home/dots/hyprland/hyprland.conf | 4 +++- home/dots/zsh | 1 + home/home.nix | 1 + system/configuration.nix | 30 +++++++++++++------------- 5 files changed, 38 insertions(+), 34 deletions(-) diff --git a/flake.lock b/flake.lock index e89031e..c77f698 100644 --- a/flake.lock +++ b/flake.lock @@ -319,11 +319,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1684543135, - "narHash": "sha256-MQCw6PDfUO5s9z6i2QvPZ7ePXsycQFBjISUsT+leThY=", + "lastModified": 1685289082, + "narHash": "sha256-fryIaVSDYZAZWxlBQwldxGjINJnHh27DQRabOIx/oYI=", "owner": "helix-editor", "repo": "helix", - "rev": "d3cca0f3571fd30f4d7067a82c02753686297a67", + "rev": "3334e7e4b2181590ddfa9aa72a19429b9b2381ea", "type": "github" }, "original": { @@ -339,11 +339,11 @@ ] }, "locked": { - "lastModified": 1684484967, - "narHash": "sha256-P3ftCqeJmDYS9LSr2gGC4XGGcp5vv8TOasJX6fVHWsw=", + "lastModified": 1685189510, + "narHash": "sha256-Hq5WF7zIixojPgvhgcd6MBvywwycVZ9wpK/8ogOyoaA=", "owner": "nix-community", "repo": "home-manager", - "rev": "b9a52ad20e58ebd003444915e35e3dd2c18fc715", + "rev": "2d963854ae2499193c0c72fd67435fee34d3e4fd", "type": "github" }, "original": { @@ -360,11 +360,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1684332077, - "narHash": "sha256-briamwodIZsYolceEjX41mqw/VkKiHuIEprw0u5wioY=", + "lastModified": 1685307013, + "narHash": "sha256-sin6htYT96qZSJKrhgBNuiBnMgem7IL/Mg9A51bqGPg=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "79b8576df9630ea1c0fb1c6e399a424c3dcdcd47", + "rev": "438d063ec684c2194563678ace5a625e6fb56517", "type": "github" }, "original": { @@ -556,11 +556,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1684570954, - "narHash": "sha256-FX5y4Sm87RWwfu9PI71XFvuRpZLowh00FQpIJ1WfXqE=", + "lastModified": 1685168767, + "narHash": "sha256-wQgnxz0PdqbyKKpsWl/RU8T8QhJQcHfeC6lh1xRUTfk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3005f20ce0aaa58169cdee57c8aa12e5f1b6e1b3", + "rev": "e10802309bf9ae351eb27002c85cfdeb1be3b262", "type": "github" }, "original": { @@ -572,11 +572,11 @@ }, "nur": { "locked": { - "lastModified": 1684585623, - "narHash": "sha256-28XEOYjrpzlVDt11Elz7db8R3HwY/4B6EspFscSRsfk=", + "lastModified": 1685320818, + "narHash": "sha256-QRLfYOJuL/1lwPHmelTbvCK6EDQeWcKZfGF0QSbsJ5c=", "owner": "nix-community", "repo": "NUR", - "rev": "4e959da0346280293e4008150d48b82fe055a311", + "rev": "e7bf6b743fc8b1aea39b926a5b4ca657270d393b", "type": "github" }, "original": { @@ -678,11 +678,11 @@ ] }, "locked": { - "lastModified": 1684549120, - "narHash": "sha256-YlsvaWQtRui3OI9EAm4upXIxI4f0TYiv08TBN+WeFm8=", + "lastModified": 1685327024, + "narHash": "sha256-mSFu5QI7St1Wj4BIKJkO8mEKZHJ6PosHoG6fEco16jg=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "f7c0c7f4b0780f977808de0bc0475ab044d3fd08", + "rev": "d6ac24aa7ff658552ce57913df4b0cb823cf15ab", "type": "github" }, "original": { diff --git a/home/dots/hyprland/hyprland.conf b/home/dots/hyprland/hyprland.conf index a9a1ae8..b409ede 100644 --- a/home/dots/hyprland/hyprland.conf +++ b/home/dots/hyprland/hyprland.conf @@ -16,6 +16,8 @@ input { kb_options=caps:escape,escape:caps sensitivity=0.0 accel_profile=flat + force_no_accel=true + numlock_by_default=true } general { @@ -74,7 +76,7 @@ windowrulev2 = workspace special silent, title:(KeePassXC)$ bindm=SUPER,mouse:272,movewindow bindm=SUPER,mouse:273,resizewindow bind=SUPER,Return,exec,kitty -bind=SUPER,E,exec,kitty xplr +bind=SUPER,E,exec,thunar bind=SUPER,F,exec,firefox bind=SUPER,D,exec,fuzzel bind=SUPER,N,exec,swaync-client -t diff --git a/home/dots/zsh b/home/dots/zsh index 8fc08d3..beb43d7 100644 --- a/home/dots/zsh +++ b/home/dots/zsh @@ -38,6 +38,7 @@ alias l='ls_culr' alias la='la_culr' alias p='ps_culr' alias mnt='mount | column -t | culr -t 80 -o roygbiv-split' +alias zz='z $(xplr)' # alias kaboom='printf "type any input if you wish to update\n\npress enter to continue\n"; read upgrade; if [ -n "$upgrade" ]; then echo upgrading..; sudo nix-channel --update; else echo no upgrade!; fi; sudo nixos-rebuild switch -j9 && rm ~/.gtkrc-2.0; home-manager switch && sudo nix-collect-garbage && nix-store --optimise' eval "$(zoxide init zsh)" fresh diff --git a/home/home.nix b/home/home.nix index 4e0b7ef..b38fc85 100644 --- a/home/home.nix +++ b/home/home.nix @@ -21,6 +21,7 @@ in { thunderbird clementine inkscape + xfce.thunar btop bat diff --git a/system/configuration.nix b/system/configuration.nix index 6eeb637..473d8ca 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -145,21 +145,21 @@ # services.mullvad-vpn.enable = true; - networking.wg-quick.interfaces = { - mullvad = { - address = ["10.67.227.64/32"]; - dns = ["10.64.0.1"]; - privateKey = "OOPAlePjy7x2DVpg6d7BoBqpST3lDJSYght185tSUl8="; - peers = [ - { - publicKey = "LXuRwa9JRTt2/UtldklKGlj/IVLORITqgET4II4DRkU="; - allowedIPs = ["0.0.0.0/0"]; - endpoint = "146.70.200.194:51820"; - persistentKeepalive = 25; - } - ]; - }; - }; + # networking.wg-quick.interfaces = { + # mullvad = { + # address = ["10.67.227.64/32"]; + # dns = ["10.64.0.1"]; + # privateKey = "OOPAlePjy7x2DVpg6d7BoBqpST3lDJSYght185tSUl8="; + # peers = [ + # { + # publicKey = "LXuRwa9JRTt2/UtldklKGlj/IVLORITqgET4II4DRkU="; + # allowedIPs = ["0.0.0.0/0"]; + # endpoint = "146.70.200.194:51820"; + # persistentKeepalive = 25; + # } + # ]; + # }; + # }; networking.firewall.enable = true; networking.firewall = {