diff --git a/flake.nix b/flake.nix index c3b3eed..f3b26c7 100644 --- a/flake.nix +++ b/flake.nix @@ -48,7 +48,7 @@ ]; }; - popka = nixpkgs.lib.nixosSystem { + Eclipse = nixpkgs.lib.nixosSystem { specialArgs = { pkgs-stable = import nixpkgs-stable { inherit system; @@ -57,7 +57,7 @@ inherit inputs system; }; modules = [ - ./nixos/hosts/popka/configuration.nix + ./nixos/hosts/Eclipse/configuration.nix ]; }; }; diff --git a/home-manager/users/chest/home.nix b/home-manager/users/chest/home.nix index 33417d1..771ebb5 100644 --- a/home-manager/users/chest/home.nix +++ b/home-manager/users/chest/home.nix @@ -6,8 +6,8 @@ ]; home = { - username = "sweetbread"; - homeDirectory = "/home/sweetbread"; + username = "chest"; + homeDirectory = "/home/chest"; stateVersion = "23.11"; }; } diff --git a/home-manager/users/chest/modules/aagl.nix b/home-manager/users/chest/modules/aagl.nix new file mode 100644 index 0000000..da4f5eb --- /dev/null +++ b/home-manager/users/chest/modules/aagl.nix @@ -0,0 +1,10 @@ +let + aagl-gtk-on-nix = import ( + builtins.fetchTarball { + url = "https://github.com/ezKEa/aagl-gtk-on-nix/archive/main.tar.gz"; + sha256 = "023yqdxs83cxx39kl7cawwyr39c1qnnv4n99igpsm2a5yay3wmsa"; + } + ); +in { + home.packages = [ aagl-gtk-on-nix.the-honkers-railway-launcher ]; +} diff --git a/home-manager/users/chest/modules/bundle.nix b/home-manager/users/chest/modules/bundle.nix index 185a00e..a391ca6 100644 --- a/home-manager/users/chest/modules/bundle.nix +++ b/home-manager/users/chest/modules/bundle.nix @@ -1,11 +1,11 @@ { imports = [ ./git.nix - ./htop.nix ./alacritty.nix ./qt.nix - ./sops.nix + # ./sops.nix ./style.nix + ./aagl.nix ./wms/hyprland.nix ./wms/waybar.nix diff --git a/home-manager/users/chest/modules/style.nix b/home-manager/users/chest/modules/style.nix index 94ba86e..3604d3c 100644 --- a/home-manager/users/chest/modules/style.nix +++ b/home-manager/users/chest/modules/style.nix @@ -6,7 +6,7 @@ waybar.enable = false; }; - base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml"; + base16Scheme = "${pkgs.base16-schemes}/share/themes/eris.yaml"; polarity = "dark"; image = pkgs.fetchurl { diff --git a/home-manager/users/chest/modules/wms/hyprland.nix b/home-manager/users/chest/modules/wms/hyprland.nix index 87c1ff6..32fce92 100644 --- a/home-manager/users/chest/modules/wms/hyprland.nix +++ b/home-manager/users/chest/modules/wms/hyprland.nix @@ -13,9 +13,8 @@ notify = lambda s: system(f"notify-desktop Wallpaper '{s}'") folder = "/home/chest/Wallpapers" - url = "https://wallhaven.cc/api/v1/collections/sweetbread/1764377" - with open("${config.sops.secrets."tokens/apis/wallhaven".path}") as f: - token = f.read() + url = "https://wallhaven.cc/api/v1/collections/cheeeest/1767552" + token = "8KkNcm3jS0hbjt0MPQXCi9EW0rMsqw5r" notify("Updating wallpaper!") @@ -46,7 +45,7 @@ filename = choice(listdir(folder)) finally: - system(f"swww img {folder}/{filename} --transition-type center") + system(f"swww img {folder}/{filename}") ''; in { enable = true; @@ -165,6 +164,10 @@ "float, title:^(Список друзей)" ]; + windowrulev2 = [ + "opacity 0.75, class:vesktop" + ]; + exec-once = [ "systemctl --user start plasma-polkit-agent" "swww init" @@ -253,7 +256,7 @@ ''$mainMod ALT, C, exec, alacritty -e sh -c "conf"'' ''$mainMod ALT, H, exec, alacritty -e sh -c "$EDITOR ~/nix/home-manager/modules/wms/hyprland.nix"'' ''$mainMod ALT, W, exec, alacritty -e sh -c "$EDITOR ~/nix/home-manager/modules/wms/waybar.nix"'' - '', Print, exec, grim -g "$(slurp)" - | swappy -f -'' + ''$mainMod Shift, S, exec, grim -g "$(slurp)" - | swappy -f -'' # Waybar "$mainMod, B, exec, pkill -SIGUSR1 waybar" diff --git a/home-manager/users/chest/modules/wms/waybar.nix b/home-manager/users/chest/modules/wms/waybar.nix index fe78cb6..41fab82 100644 --- a/home-manager/users/chest/modules/wms/waybar.nix +++ b/home-manager/users/chest/modules/wms/waybar.nix @@ -248,7 +248,7 @@ window#waybar.hidden { } #taskbar button.active { - background: #${colors.base0B}; + background: #d197d9; } #language { diff --git a/home-manager/users/chest/secrets.yaml b/home-manager/users/chest/secrets.yaml deleted file mode 100644 index 77c7123..0000000 --- a/home-manager/users/chest/secrets.yaml +++ /dev/null @@ -1,23 +0,0 @@ -tokens: - apis: - wallhaven: ENC[AES256_GCM,data:mawmbX0FQkhQHruABPc34mm+QtyEv6SulAXOGL6tMoQ=,iv:P+LtVoGzhc9kv4XUXOIJCosg52JXBAyWTQ+os9clibg=,tag:TQ0dLVKDkAo20p4w9HKn2g==,type:str] -sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] - age: - - recipient: age1j3uuyax673fvl5x4dveupq3dylngnrq0e5uy7fmclsexkfd25vysk646wk - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnbDl6ZWZpc2U2SnNYQVpJ - cmtBRzVOZTdOaXd6MFFnTGFLbzBhNldlN25RCisyNnAwY21udlZCWEc4U2hPa2di - WXN5cEduMXUwNXpmU0hBQzdkamtSd28KLS0tIHUzd3RTbUM4VnFYZkRYbXJCUDZl - UkZPZUlLQVNUZ1ZGV3BZM3hib3JHMXcKqyQUcRMhoVHK78lAYl2vSJUCxBL6atLb - VXT5DV67KKnUKyKUAQ+gjEP9EpvR16PBCZ+EcSFfx/azHONCtV3mZg== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-08-26T18:55:20Z" - mac: ENC[AES256_GCM,data:x9TX4OfDmw8qySadz/l5BUTyQLsOnROKASMn34Ps5Sb0LzYKrlQoHPQhiJ6YVNfYE+7WtNMqoQvUEjg9FQfEVcH5PFeXZjAaeLKDvEhgXjklhrSfbWCn7a+1yIbwutKb63cIuMh9ZcDUCmtAZlt+FssI/TjB0k5QqV4a358hjQE=,iv:GJWGCINdJr3HLX33YFEqTE+TlmfCpZBCLBUUHGSvvG8=,tag:6sKlM2/3r3os1h0U5ToqiA==,type:str] - pgp: [] - unencrypted_suffix: _unencrypted - version: 3.9.0 diff --git a/nixos/hosts/popka/configuration.nix b/nixos/hosts/Eclipse/configuration.nix similarity index 53% rename from nixos/hosts/popka/configuration.nix rename to nixos/hosts/Eclipse/configuration.nix index 39e72e5..6a54598 100644 --- a/nixos/hosts/popka/configuration.nix +++ b/nixos/hosts/Eclipse/configuration.nix @@ -7,7 +7,7 @@ ../../modules/users/chest.nix ]; - networking.hostName = "popka"; + networking.hostName = "Eclipse"; time.timeZone = "Europe/Moscow"; @@ -34,4 +34,32 @@ nvidiaSettings = true; package = config.boot.kernelPackages.nvidiaPackages.stable; }; + + networking.hosts = { + "0.0.0.0" = [ + "overseauspider.yuanshen.com" + "log-upload-os.hoyoverse.com" + "log-upload-os.mihoyo.com" + "dump.gamesafe.qq.com" + + "apm-log-upload-os.hoyoverse.com" + "zzz-log-upload-os.hoyoverse.com" + + "log-upload.mihoyo.com" + "devlog-upload.mihoyo.com" + "uspider.yuanshen.com" + "sg-public-data-api.hoyoverse.com" + "hkrpg-log-upload-os.hoyoverse.com" + "public-data-api.mihoyo.com" + + "prd-lender.cdp.internal.unity3d.com" + "thind-prd-knob.data.ie.unity3d.com" + "thind-gke-usc.prd.data.corp.unity3d.com" + "cdp.cloud.unity3d.com" + "remote-config-proxy-prd.uca.cloud.unity3d.com" + + "pc.crashsight.wetest.net" + ]; + }; } + diff --git a/nixos/hosts/Eclipse/hardware-configuration.nix b/nixos/hosts/Eclipse/hardware-configuration.nix new file mode 100644 index 0000000..ddba6d8 --- /dev/null +++ b/nixos/hosts/Eclipse/hardware-configuration.nix @@ -0,0 +1,44 @@ +# 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" "ahci" "nvme" "usbhid" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/34e32809-6876-4361-95d8-70a479ea8e19"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/2B65-0D2E"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; + + fileSystems."/mnt/D" = { + device = "/dev/disk/by-uuid/E030A4DF30A4BDC2"; + fsType = "ntfs"; + options = ["umask=0022" "gid=100" "uid=1002"]; + }; + + 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.eno1.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/nixos/modules/users/chest.nix b/nixos/modules/users/chest.nix index 3261c65..7fb750a 100644 --- a/nixos/modules/users/chest.nix +++ b/nixos/modules/users/chest.nix @@ -4,7 +4,7 @@ users = { defaultUserShell = pkgs.zsh; - users.sweetbread = { + users.chest = { isNormalUser = true; description = "Chest"; extraGroups = [ "networkmanager" "wheel" "input" "libvirtd" ];