diff --git a/derivations/fish/fish-functions/functions/edit-remote.fish b/derivations/fish/fish-functions/functions/edit-remote.fish index 7b9eb42..c80dc8b 100644 --- a/derivations/fish/fish-functions/functions/edit-remote.fish +++ b/derivations/fish/fish-functions/functions/edit-remote.fish @@ -9,7 +9,8 @@ function edit-remote set initial_checksum (md5sum $local_file | awk '{print $1}') # Open the file in Helix - hx $local_file + # hx $local_file + eval "$EDITOR $local_file" # Calculate the checksum of the file after editing set final_checksum (md5sum $local_file | awk '{print $1}') diff --git a/flake.lock b/flake.lock index a570939..76159f4 100644 --- a/flake.lock +++ b/flake.lock @@ -1,31 +1,12 @@ { "nodes": { - "ags": { - "inputs": { - "nixpkgs": "nixpkgs", - "systems": "systems" - }, - "locked": { - "lastModified": 1721306136, - "narHash": "sha256-VKPsIGf3/a+RONBipx4lEE4LXG2sdMNkWQu22LNQItg=", - "owner": "Aylur", - "repo": "ags", - "rev": "344ea72cd3b8d4911f362fec34bce7d8fb37028c", - "type": "github" - }, - "original": { - "owner": "Aylur", - "repo": "ags", - "type": "github" - } - }, "anyrun": { "inputs": { "flake-parts": "flake-parts", "nixpkgs": [ "nixpkgs" ], - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1721135360, @@ -96,16 +77,16 @@ "flake-schemas": "flake-schemas", "home-manager": "home-manager", "jovian": "jovian", - "nixpkgs": "nixpkgs_2", - "systems": "systems_3", + "nixpkgs": "nixpkgs", + "systems": "systems_2", "yafas": "yafas" }, "locked": { - "lastModified": 1722542796, - "narHash": "sha256-l+XBDAxLXPdEqPASKjyDbgBQys9IijCtHjXcEXN6YeU=", + "lastModified": 1722963859, + "narHash": "sha256-TQ5sQ+PX0OeMZx+nYBA0CL3R9Yv6MupLzFU0iQrGGrc=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "a44b84390425928d2282676e63eed3a1ee528178", + "rev": "f41d02a7ca6433c98fac378569617f2652628624", "type": "github" }, "original": { @@ -140,11 +121,11 @@ ] }, "locked": { - "lastModified": 1722601690, - "narHash": "sha256-0T5UIj683XckcgZYAKauDQjDqQvcZf2b+hQrBxtvIKo=", + "lastModified": 1722953784, + "narHash": "sha256-p8c3s2dDDXhXFjNPQzoQtprE/vR/UwXKlgBkftTaIq8=", "owner": "nix-community", "repo": "flake-firefox-nightly", - "rev": "5783e7f3c40c73bfa2e2501da8d39670cbbd0f98", + "rev": "28dc0a7e43033e88456e5d001889ce2f23c6ffdd", "type": "github" }, "original": { @@ -205,7 +186,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1710146030, @@ -223,7 +204,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1710146030, @@ -241,7 +222,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_7" + "systems": "systems_6" }, "locked": { "lastModified": 1710146030, @@ -265,11 +246,11 @@ ] }, "locked": { - "lastModified": 1722462338, - "narHash": "sha256-ss0G8t8RJVDewA3MyqgAlV951cWRK6EtVhVKEZ7J5LU=", + "lastModified": 1722630065, + "narHash": "sha256-QfM/9BMRkCmgWzrPDK+KbgJOUlSJnfX4OvsUupEUZvA=", "owner": "nix-community", "repo": "home-manager", - "rev": "6e090576c4824b16e8759ebca3958c5b09659ee8", + "rev": "afc892db74d65042031a093adb6010c4c3378422", "type": "github" }, "original": { @@ -285,11 +266,11 @@ ] }, "locked": { - "lastModified": 1722462338, - "narHash": "sha256-ss0G8t8RJVDewA3MyqgAlV951cWRK6EtVhVKEZ7J5LU=", + "lastModified": 1722936497, + "narHash": "sha256-UBst8PkhY0kqTgdKiR8MtTBt4c1XmjJoOV11efjsC/o=", "owner": "nix-community", "repo": "home-manager", - "rev": "6e090576c4824b16e8759ebca3958c5b09659ee8", + "rev": "a6c743980e23f4cef6c2a377f9ffab506568413a", "type": "github" }, "original": { @@ -334,16 +315,16 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_3", - "systems": "systems_5", + "nixpkgs": "nixpkgs_2", + "systems": "systems_4", "xdph": "xdph" }, "locked": { - "lastModified": 1722605151, - "narHash": "sha256-C+nivwWd+wjwJ5An1XKqAhvPYT5lx0XvvrbY4GkT8rU=", + "lastModified": 1722956902, + "narHash": "sha256-g3cAlVmRtnyqMZw88MKqVNM8eU88XzgNAlXdTkym5q8=", "ref": "refs/heads/main", - "rev": "592b4a709c8093273c6051fb7e76ce3c3d82cedf", - "revCount": 5042, + "rev": "b0a70f63e3865eaa77f0b78a04b230aa583bc95c", + "revCount": 5055, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -361,11 +342,11 @@ ] }, "locked": { - "lastModified": 1720709712, - "narHash": "sha256-78j/cY+AXoMIqqiNc1vWx237EPfpERAcYsb57ABUbwQ=", + "lastModified": 1722636442, + "narHash": "sha256-+7IS0n3/F0I5j6ZbrVlLcIIPHY3o+/vLAqg/G48sG+w=", "owner": "hyprwm", "repo": "contrib", - "rev": "65d42dcbfde2229a75ccdb195c318dfe241f9ade", + "rev": "9d67858b437d4a1299be496d371b66fc0d3e01f6", "type": "github" }, "original": { @@ -489,11 +470,11 @@ ] }, "locked": { - "lastModified": 1721993749, - "narHash": "sha256-dGqEQ68GNGmA8+HHzHEqAcW2uGu/AX+sRWcMO99UM8s=", + "lastModified": 1722666143, + "narHash": "sha256-uTr3LiytFHFUYmIrhs5NoGlm5DCJxQlfyaZEKCU/DS8=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "3bd059992912139d6a12e86ba418f933ec368ef2", + "rev": "bcfe9dc708c92590fec676692b3ed79443eda819", "type": "github" }, "original": { @@ -508,11 +489,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1722168631, - "narHash": "sha256-16XBXW86ceQC+jRx7feCREZo696kvIzpKYmN2LnKfaE=", + "lastModified": 1722773431, + "narHash": "sha256-puSEio9yjWojIBDBts4BSGZ43rv1LzIevdYOKmW/Mjg=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "4ce8efe904950cd85bda9624ff1c2ec55fe2ab6f", + "rev": "04a4b4d84e02590715e753da3d35fb03cddc6425", "type": "github" }, "original": { @@ -562,11 +543,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1718714799, - "narHash": "sha256-FUZpz9rg3gL8NVPKbqU8ei1VkPLsTIfAJ2fdAf5qjak=", + "lastModified": 1722813957, + "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c00d587b1a1afbf200b1d8f0b0e4ba9deb1c7f0e", + "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", "type": "github" }, "original": { @@ -578,11 +559,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1722128034, - "narHash": "sha256-L8rwzYPsLo/TYtydPJoQyYOfetuiyQYnTWYcyB8UE/s=", + "lastModified": 1722732880, + "narHash": "sha256-do2Mfm3T6SR7a5A804RhjQ+JTsF5hk4JTPGjCTRM/m8=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "d15f6f6021693898fcd2c6a9bb13707383da9bbc", + "rev": "8bebd4c74f368aacb047f0141db09ec6b339733c", "type": "github" }, "original": { @@ -625,11 +606,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1722421184, - "narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=", + "lastModified": 1722813957, + "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58", + "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", "type": "github" }, "original": { @@ -672,22 +653,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1722421184, - "narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1722185531, "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=", @@ -703,7 +668,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1720539341, "narHash": "sha256-tcj6LedqeXOBYMrCtl65xBJI7lx9f0JK51ZsQE1AM8A=", @@ -719,7 +684,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1712791164, "narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=", @@ -735,7 +700,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1712883908, "narHash": "sha256-icE1IJE9fHcbDfJ0+qWoDdcBXUoZCcIJxME4lMHwvSM=", @@ -751,7 +716,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1714906307, "narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=", @@ -769,11 +734,11 @@ }, "nur": { "locked": { - "lastModified": 1722610226, - "narHash": "sha256-e9sPV2i4N1J0zAxcsZNpdoTRgpHfYva4azi7ZA6jMcc=", + "lastModified": 1722962430, + "narHash": "sha256-cYCTGKF6Fum7PEvXsRcQcBnEmcd4yeM4GQitG0lKLw8=", "owner": "nix-community", "repo": "NUR", - "rev": "0e1e13187bbb07c80b61f057843602af1f1ffd99", + "rev": "a9a00bc38734f053d434ee3797ec637b4429d0d7", "type": "github" }, "original": { @@ -804,14 +769,13 @@ }, "root": { "inputs": { - "ags": "ags", "anyrun": "anyrun", "chaotic": "chaotic", "firefox": "firefox", "home-manager": "home-manager_2", "hyprland": "hyprland", "hyprland-contrib": "hyprland-contrib", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs2105": "nixpkgs2105", @@ -824,7 +788,7 @@ }, "secrets": { "inputs": { - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "sops-nix": "sops-nix" }, "locked": { @@ -868,7 +832,7 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { @@ -916,21 +880,6 @@ } }, "systems_3": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_4": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -945,7 +894,7 @@ "type": "github" } }, - "systems_5": { + "systems_4": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -960,6 +909,21 @@ "type": "github" } }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_6": { "locked": { "lastModified": 1681028828, @@ -975,25 +939,10 @@ "type": "github" } }, - "systems_7": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tdesktop": { "inputs": { "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1715005420, diff --git a/flake.nix b/flake.nix index 190924e..3c431e3 100644 --- a/flake.nix +++ b/flake.nix @@ -86,6 +86,7 @@ dlaptop = makeSystem "dlaptop" unstable; intelnuc = makeSystem "intelnuc" stable; huanan = makeSystem "huanan" pkgs; + prtapc = makeSystem "prtapc" pkgs; }; }; } diff --git a/hosts/dlaptop/hardware.nix b/hosts/dlaptop/hardware.nix index e4cc7fe..3193ee0 100644 --- a/hosts/dlaptop/hardware.nix +++ b/hosts/dlaptop/hardware.nix @@ -97,6 +97,7 @@ "amd_pstate.shared_mem=1" "zfs_arc_min=8589934592" "zfs.zfs_arc_max=25769803776" + "nohibernate" # # Disable all mitigations # "mitigations=off" @@ -106,9 +107,10 @@ # https://www.phoronix.com/news/Linux-Splitlock-Hurts-Gaming "split_lock_detect=off" "acpi_sleep=nonvs" + ]; - boot.zfs.allowHibernation = true; + boot.zfs.allowHibernation = false; boot.zfs.forceImportRoot = false; boot.kernelModules = ["amd-pstate" "acpi_call" "amdgpu" "kvm-amd" "vfat" "nls_cp437" "nls_iso8859-1" "tcp_bbr"]; diff --git a/hosts/dlaptop/system.nix b/hosts/dlaptop/system.nix index 73aeeb9..703df23 100644 --- a/hosts/dlaptop/system.nix +++ b/hosts/dlaptop/system.nix @@ -204,7 +204,7 @@ systemd.services.waydroid-container.wantedBy = lib.mkForce []; environment.systemPackages = with pkgs; [ - # config.nur.repos.ataraxiasjel.waydroid-script + config.nur.repos.ataraxiasjel.waydroid-script multipath-tools #ZFS in LUKS mount openvpn diff --git a/hosts/prtapc/hardware-configuration.nix b/hosts/prtapc/hardware-configuration.nix new file mode 100644 index 0000000..3acb853 --- /dev/null +++ b/hosts/prtapc/hardware-configuration.nix @@ -0,0 +1,43 @@ +# 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. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "usb_storage" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "rpool/root"; + fsType = "zfs"; + }; + + fileSystems."/home" = + { device = "rpool/home"; + fsType = "zfs"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/0385-75D4"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + + swapDevices = [ ]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp2s0.useDHCP = lib.mkDefault true; + networking.hostId = "aabbcc00"; + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/hosts/prtapc/system.nix b/hosts/prtapc/system.nix new file mode 100644 index 0000000..7efd486 --- /dev/null +++ b/hosts/prtapc/system.nix @@ -0,0 +1,143 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page, on +# https://search.nixos.org/options and in the NixOS manual (`nixos-help`). + +{ config, lib, pkgs, ... }: + +{ + imports = + [ # Include the results of the hardware scan. + ./hardware-configuration.nix + ]; + + # Use the GRUB 2 boot loader. + boot.loader.grub.enable = true; + boot.loader.grub.device = "/dev/nvme0n1p1"; + #boot.loader.systemd-boot.enable = true; + # boot.loader.grub.efiSupport = true; + # boot.loader.grub.efiInstallAsRemovable = true; + # boot.loader.efi.efiSysMountPoint = "/boot/efi"; + # Define on which hard drive you want to install Grub. + # boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only + + # networking.hostName = "nixos"; # Define your hostname. + # Pick only one of the below networking options. + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + # networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. + + # Set your time zone. + # time.timeZone = "Europe/Amsterdam"; + + # Configure network proxy if necessary + # networking.proxy.default = "http://user:password@proxy:port/"; + # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + + # Select internationalisation properties. + # i18n.defaultLocale = "en_US.UTF-8"; + # console = { + # font = "Lat2-Terminus16"; + # keyMap = "us"; + # useXkbConfig = true; # use xkb.options in tty. + # }; + + # Enable the X11 windowing system. + # services.xserver.enable = true; + + users.users.root.openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGGL2UD0frl9F2OPBiPlSQqxDsuACbAVgwH24F0KT14L delta@dlaptop" + ]; + users.users.root.hashedPassword = "$6$2XM/w7WzUFYW8nO3$M8mX63YzQSuFGh/WHBrPqL91RC91n0ZFNobSHX1qcEe1GWPsFPcVxrJ9hjyz8M8F1uXKb6d1PS0kv8M1P9Rxo1"; + users.users.delta = { + uid = 1000; + isNormalUser = true; + extraGroups = [ "wheel" ]; + openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGGL2UD0frl9F2OPBiPlSQqxDsuACbAVgwH24F0KT14L delta@dlaptop" ]; + }; + services.openssh.enable = true; + networking = { + firewall.enable = false; + hostName = "prtapc"; + networkmanager.enable = true; + }; + + + # Configure keymap in X11 + # services.xserver.xkb.layout = "us"; + # services.xserver.xkb.options = "eurosign:e,caps:escape"; + + # Enable CUPS to print documents. + # services.printing.enable = true; + + # Enable sound. + # hardware.pulseaudio.enable = true; + # OR + # services.pipewire = { + # enable = true; + # pulse.enable = true; + # }; + + # Enable touchpad support (enabled default in most desktopManager). + # services.libinput.enable = true; + + # Define a user account. Don't forget to set a password with ‘passwd’. + # users.users.alice = { + # isNormalUser = true; + # extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. + # packages = with pkgs; [ + # firefox + # tree + # ]; + # }; + + # List packages installed in system profile. To search, run: + # $ nix search wget + # environment.systemPackages = with pkgs; [ + # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. + # wget + # ]; + + # Some programs need SUID wrappers, can be configured further or are + # started in user sessions. + # programs.mtr.enable = true; + # programs.gnupg.agent = { + # enable = true; + # enableSSHSupport = true; + # }; + + # List services that you want to enable: + + # Enable the OpenSSH daemon. + # services.openssh.enable = true; + + # Open ports in the firewall. + # networking.firewall.allowedTCPPorts = [ ... ]; + # networking.firewall.allowedUDPPorts = [ ... ]; + # Or disable the firewall altogether. + # networking.firewall.enable = false; + + # Copy the NixOS configuration file and link it from the resulting system + # (/run/current-system/configuration.nix). This is useful in case you + # accidentally delete configuration.nix. + # system.copySystemConfiguration = true; + + # This option defines the first version of NixOS you have installed on this particular machine, + # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions. + # + # Most users should NEVER change this value after the initial install, for any reason, + # even if you've upgraded your system to a new NixOS release. + # + # This value does NOT affect the Nixpkgs version your packages and OS are pulled from, + # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how + # to actually do that. + # + # This value being lower than the current NixOS release does NOT mean your system is + # out of date, out of support, or vulnerable. + # + # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration, + # and migrated your data accordingly. + # + # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . + system.stateVersion = "24.11"; # Did you read the comment? + +} + diff --git a/pkgs/ags/config/style.css.backup-hm b/pkgs/ags/config/style.css.backup-hm index dc9296a..c0cdc50 100644 --- a/pkgs/ags/config/style.css.backup-hm +++ b/pkgs/ags/config/style.css.backup-hm @@ -88,7 +88,7 @@ label.time { } label.date { - font-family: "Iosevka Diosevka"; + font-family: "Iosevka Comfy Wide Duo"; color: @lightgray; font-size: 10px; } diff --git a/pkgs/apps.nix b/pkgs/apps.nix index bd0888e..fd55949 100644 --- a/pkgs/apps.nix +++ b/pkgs/apps.nix @@ -151,6 +151,8 @@ in { # flatpak winetricks ffmpeg_7 + stable.qutebrowser + tailwindcss ]); # services.flatpak.enable = true; @@ -371,203 +373,4 @@ in { vi = "nvim"; v = "nvim"; }; - - # programs.nixvim = { - # enable = true; - # enableMan = false; - # colorschemes.tokyonight = { - # enable = true; - # settings = { - # transparent = true - # ; - # }; - # }; - # globals.mapleader = ","; - # keymaps = [ - # { - # key = ";"; - # action = ":"; - # } - # { - # key = "gg"; - # action = "Man"; - # options = { - # silent = true; - # remap = false; - # }; - # } - # { - # key = "f"; - # action.__raw = '' - # function() - # require'hop'.hint_char1({ - # direction = require'hop.hint'.HintDirection.AFTER_CURSOR, - # current_line_only = false - # }) - # end - # ''; - # } - # { - # key = "F"; - # action.__raw = '' - # function() - # require'hop'.hint_char1({ - # direction = require'hop.hint'.HintDirection.BEFORE_CURSOR, - # current_line_only = false - # }) - # end - # ''; - # options.remap = true; - # } - # { - # key = "t"; - # action.__raw = '' - # function() - # require'hop'.hint_char1({ - # direction = require'hop.hint'.HintDirection.AFTER_CURSOR, - # current_line_only = true - # }) - # end - # ''; - # } - # { - # key = "T"; - # action.__raw = '' - # function() - # require'hop'.hint_char1({ - # direction = require'hop.hint'.HintDirection.BEFORE_CURSOR, - # current_line_only = true - # }) - # end - # ''; - # options.remap = true; - # } - # ]; - # plugins = { - # lightline = { - # enable = true; - # active = { - # left = [ - # [ - # "mode" - # "paste" - # ] - # [ - # "readonly" - # "filename" - # "modified" - # ] - # ]; - # }; - # }; - # which-key.enable = true; - # lsp = { - # enable = true; - # servers = { - # # bashls.enable = true; - # nixd.enable = true; - # }; - # keymaps.lspBuf = { - # "gd" = "definition"; - # "gD" = "references"; - # "gt" = "type_definition"; - # "gi" = "implementation"; - # "K" = "hover"; - # }; - # }; - # none-ls = { - # enable = true; - # sources = { - # diagnostics = { - # statix.enable = true; - # }; - # formatting = { - # nixfmt.enable = true; - # markdownlint.enable = true; - # shellharden.enable = true; - # shfmt.enable = true; - # }; - # }; - # }; - # nvim-tree = { - # enable = true; - # openOnSetupFile = true; - # autoReloadOnWrite = true; - # }; - # lsp-lines = { - # enable = true; - # currentLine = true; - # }; - # telescope = { - # enable = true; - # keymaps = { - # "ff" = "find_files"; - # "fg" = "live_grep"; - # "fb" = "buffers"; - # "fh" = "help_tags"; - - # "" = { - # action = "git_files"; - # options = { - # desc = "Telescope Git Files"; - # }; - # }; - # }; - # extensions.fzf-native = { enable = true; }; - # }; - # toggleterm = { - # enable = true; - # settings = { - # open_mapping = "[[]]"; - - # }; - # }; - - # treesitter = { - # enable = true; - # nixGrammars = true; - # indent = true; - # }; - # treesitter-context.enable = true; - # rainbow-delimiters.enable = true; - - # trouble.enable = true; - # wilder = { - # enable = true; - # modes = [ ":" "/" "?" ]; - # renderer = "pumblend"; - # }; - # nvim-autopairs.enable = true; - # hop.enable = true; - # }; - - # options= { - # updatetime = 100; # Faster completion - - # number = true; - # relativenumber = true; - - # autoindent = true; - # # clipboard = "unnamedplus"; - # clipboard = "unnamed,unnamedplus"; - # expandtab = true; - # shiftwidth = 2; - # smartindent = true; - # tabstop = 2; - - # ignorecase = true; - # incsearch = true; - # smartcase = true; - # wildmode = "list:longest"; - - # # swapfile = false; - # undofile = true; # Build-in persistent undo - - # mouse = "a"; - - # }; - - # }; - - } diff --git a/pkgs/nvchad/extraConfig/mycfg/lua/mappings.lua b/pkgs/nvchad/extraConfig/mycfg/lua/mappings.lua index d535856..1b5d204 100644 --- a/pkgs/nvchad/extraConfig/mycfg/lua/mappings.lua +++ b/pkgs/nvchad/extraConfig/mycfg/lua/mappings.lua @@ -19,4 +19,4 @@ vim.api.nvim_set_keymap('n', 'T', ':HopLineStartMW', {noremap = true, silent vim.api.nvim_create_user_command('W', 'SudaWrite', {}) vim.api.nvim_create_user_command('R', 'SudaRead', {}) -vim.api.nvim_create_user_command('wc', 'WhichKey', {}) \ No newline at end of file +vim.api.nvim_create_user_command('K', 'WhichKey', {}) \ No newline at end of file diff --git a/pkgs/socks.nix b/pkgs/socks.nix index 6514c8f..06fa7bf 100644 --- a/pkgs/socks.nix +++ b/pkgs/socks.nix @@ -44,8 +44,8 @@ let { name = "socks-novpn"; script = "gost -L socks5://192.168.150.2:3334"; } # port 3334 { name = "opera-socks"; # script = "sing-box run -c ${opera-singboxcfg} & opera-proxy -bootstrap-dns https://1.1.1.1/dns-query -bind-address 192.168.150.2:18088"; - script = "gost -L=socks5://192.168.150.2:3335 -F=http://192.168.150.2:18088 opera-proxy -bootstrap-dns https://1.1.1.1/dns-query -bind-address 192.168.150.2:18088"; - # script = "opera-proxy -bootstrap-dns https://1.1.1.1/dns-query -bind-address 192.168.150.2:18088"; + # script = "gost -L=socks5://192.168.150.2:3335 -F=http://192.168.150.2:18088 opera-proxy -bootstrap-dns https://1.1.1.1/dns-query -bind-address 192.168.150.2:18088"; + script = "opera-proxy -bootstrap-dns https://1.1.1.1/dns-query -bind-address 192.168.150.2:18088"; autostart = false; } # port 3335 ];