From b9184d06b8da692201396af7b996f1f3dc612a8b Mon Sep 17 00:00:00 2001 From: joy Date: Sat, 14 Sep 2024 19:27:42 +0200 Subject: [PATCH] cleaning --- modules/apps/newsboat/default.nix | 76 +++++++++++++-------------- modules/hypr/hyprland/scripts/vm.sh | 4 +- modules/system/default.nix | 1 + modules/system/homemanger/default.nix | 34 ++++-------- modules/system/xdg/default.nix | 12 +++++ 5 files changed, 63 insertions(+), 64 deletions(-) create mode 100644 modules/system/xdg/default.nix diff --git a/modules/apps/newsboat/default.nix b/modules/apps/newsboat/default.nix index 89dba29..6410196 100644 --- a/modules/apps/newsboat/default.nix +++ b/modules/apps/newsboat/default.nix @@ -4,118 +4,118 @@ browser = "firefox"; urls = [ { - url = "https://invidious.reallyaweso.me/feed/channel/UCOSqzSTg4QZXdi7jvV-9rUg"; + url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCOSqzSTg4QZXdi7jvV-9rUg"; } { - url = "https://invidious.reallyaweso.me/feed/channel/UCg6gPGh8HU2U01vaFCAsvmQ"; + url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCg6gPGh8HU2U01vaFCAsvmQ"; } { - url = "https://invidious.reallyaweso.me/feed/channel/UCYAg4bYdyqENxEyHUX7t1FA"; + url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCYAg4bYdyqENxEyHUX7t1FA"; } { - url = "https://invidious.reallyaweso.me/feed/channel/UCVls1GmFKf6WlTraIb_IaJg"; + url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCVls1GmFKf6WlTraIb_IaJg"; } { - url = "https://invidious.reallyaweso.me/feed/channel/UC5KDiSAFxrDWhmysBcNqtMA"; + url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UC5KDiSAFxrDWhmysBcNqtMA"; } { - url = "https://invidious.reallyaweso.me/feed/channel/UCcBhwZNKqmPaw3Zk7mh6eBg"; + url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCcBhwZNKqmPaw3Zk7mh6eBg"; } { - url = "https://invidious.reallyaweso.me/feed/channel/UCwnqDLYzLGPbghL9uIOwMnQ"; + url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCwnqDLYzLGPbghL9uIOwMnQ"; } { - url = "https://invidious.reallyaweso.me/feed/channel/UCRSxdcWjoye7ohD_ibxzYhg"; + url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCRSxdcWjoye7ohD_ibxzYhg"; } { - url = "https://invidious.reallyaweso.me/feed/channel/UChIs72whgZI9w6d6FhwGGHA"; + url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UChIs72whgZI9w6d6FhwGGHA"; } { - url = "https://invidious.reallyaweso.me/feed/channel/UCxdZ7XCQVMRMipj3gGemQfw"; + url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCxdZ7XCQVMRMipj3gGemQfw"; } { - url = "https://invidious.reallyaweso.me/feed/channel/UCE_K_gW6ReBi4H3Gp0gi-hg"; + url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCE_K_gW6ReBi4H3Gp0gi-hg"; } { - url = "https://invidious.reallyaweso.me/feed/channel/UCWRHrWUsjdF86dt7NKK2Ixw"; + url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCWRHrWUsjdF86dt7NKK2Ixw"; } { - url = "https://invidious.reallyaweso.me/feed/channel/UCfeNmPbGRF6dkPt04HIl25A"; + url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCfeNmPbGRF6dkPt04HIl25A"; } { - url = "https://invidious.reallyaweso.me/feed/channel/UCFzUEe9XUlkDLp6AmtNzmOA"; + url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCFzUEe9XUlkDLp6AmtNzmOA"; } { - url = "https://invidious.reallyaweso.me/feed/channel/UCxBfQGaMuiMyw1dgW-tpZbg"; + url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCxBfQGaMuiMyw1dgW-tpZbg"; } { - url = "https://invidious.reallyaweso.me/feed/channel/UCpes6DXY4XCSA8s9Q1G9ocg"; + url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCpes6DXY4XCSA8s9Q1G9ocg"; } { - url = "https://invidious.reallyaweso.me/feed/channel/UCR42P1Uub9py2H5RkdcTnWA"; + url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCR42P1Uub9py2H5RkdcTnWA"; } { - url = "https://invidious.reallyaweso.me/feed/channel/UCtwjD3551TskyUxnfaUw7Rg"; + url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCtwjD3551TskyUxnfaUw7Rg"; } { - url = "https://invidious.reallyaweso.me/feed/channel/UCZpKTYOk5WAdCyMal3J1KHg"; + url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCZpKTYOk5WAdCyMal3J1KHg"; } { - url = "https://invidious.reallyaweso.me/feed/channel/UCl2mFZoRqjw_ELax4Yisf6w"; + url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCl2mFZoRqjw_ELax4Yisf6w"; } { - url = "https://invidious.reallyaweso.me/feed/channel/UC2eYFnH61tmytImy1mTYvhA"; + url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UC2eYFnH61tmytImy1mTYvhA"; } { - url = "https://invidious.reallyaweso.me/feed/channel/UC7YOGHUfC1Tb6E4pudI9STA"; + url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UC7YOGHUfC1Tb6E4pudI9STA"; } { - url = "https://invidious.reallyaweso.me/feed/channel/UC0sUzmZ0CHvVCVrpRfGKZfw"; + url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UC0sUzmZ0CHvVCVrpRfGKZfw"; } { - url = "https://invidious.reallyaweso.me/feed/channel/UCFFfGA991VRR4U8FNNs72Qg"; + url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCFFfGA991VRR4U8FNNs72Qg"; } { - url = "https://invidious.reallyaweso.me/feed/channel/UCIS-e4W5wK2xG6NbI5Tdm_g"; + url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCIS-e4W5wK2xG6NbI5Tdm_g"; } { - url = "https://invidious.reallyaweso.me/feed/channel/UCKmEAsezQ0kUQ6EC-BtBNbg"; + url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCKmEAsezQ0kUQ6EC-BtBNbg"; } { - url = "https://invidious.reallyaweso.me/feed/channel/UCgj6MvuVmp0JVanAZkFQM5A"; + url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCgj6MvuVmp0JVanAZkFQM5A"; } { - url = "https://invidious.reallyaweso.me/feed/channel/UCXQZRyhGN-1F8zwD0a8QuWA"; + url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCXQZRyhGN-1F8zwD0a8QuWA"; } { - url = "https://invidious.reallyaweso.me/feed/channel/UCohllq0Pk5lQuuNANabHKcg"; + url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCohllq0Pk5lQuuNANabHKcg"; } { - url = "https://invidious.reallyaweso.me/feed/channel/UCUKU3fl8z2rcK7GBdocd7Ww"; + url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCUKU3fl8z2rcK7GBdocd7Ww"; } { - url = "https://invidious.reallyaweso.me/feed/channel/UCO57urWt8_T63SPFCA_QmNw"; + url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCO57urWt8_T63SPFCA_QmNw"; } { - url = "https://invidious.reallyaweso.me/feed/channel/UCtMVHI3AJD4Qk4hcbZnI9ZQ"; + url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCtMVHI3AJD4Qk4hcbZnI9ZQ"; } { - url = "https://invidious.reallyaweso.me/feed/channel/UC8ENHE5xdFSwx71u3fDH5Xw"; + url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UC8ENHE5xdFSwx71u3fDH5Xw"; } { - url = "https://invidious.reallyaweso.me/feed/channel/UCMXLdjrQi4JzY0NNvCdUEUQ"; + url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCMXLdjrQi4JzY0NNvCdUEUQ"; } { - url = "https://invidious.reallyaweso.me/feed/channel/UCEKtvLc3EIS0T7shmgPbVrw"; + url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UCEKtvLc3EIS0T7shmgPbVrw"; } { - url = "https://invidious.reallyaweso.me/feed/channel/UC_zBdZ0_H_jn41FDRG7q4Tw"; + url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UC_zBdZ0_H_jn41FDRG7q4Tw"; } { - url = "https://invidious.reallyaweso.me/feed/channel/UChuDUAo3Hfr_0dn54GpwdUQ"; + url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UChuDUAo3Hfr_0dn54GpwdUQ"; } { - url = "https://invidious.reallyaweso.me/feed/channel/UClonyx8pReBvkjropmrS6jQ"; + url = "https://blueberry.invidious.reallyaweso.me/feed/channel/UClonyx8pReBvkjropmrS6jQ"; } ]; extraConfig = '' diff --git a/modules/hypr/hyprland/scripts/vm.sh b/modules/hypr/hyprland/scripts/vm.sh index e1a6e71..f52367d 100755 --- a/modules/hypr/hyprland/scripts/vm.sh +++ b/modules/hypr/hyprland/scripts/vm.sh @@ -6,14 +6,12 @@ vm_state=$(virsh --connect qemu:///system domstate "$VM_NAME") if [ "$vm_state" != "running" ]; then virsh --connect qemu:///system start "$VM_NAME" - sleep 20 + sleep 5 fi -# Get the IP address of the VM VM_IP=$(virsh --connect qemu:///system domifaddr "$VM_NAME" | grep -oP '(\d+\.){3}\d+' | head -1) if [ -z "$VM_IP" ]; then - echo "Failed to retrieve IP address for VM: $VM_NAME" exit 1 fi diff --git a/modules/system/default.nix b/modules/system/default.nix index d5ea2c4..2533123 100644 --- a/modules/system/default.nix +++ b/modules/system/default.nix @@ -3,5 +3,6 @@ ./user ./homemanger ./misc + ./xdg ]; } diff --git a/modules/system/homemanger/default.nix b/modules/system/homemanger/default.nix index ade1bf7..029d85c 100644 --- a/modules/system/homemanger/default.nix +++ b/modules/system/homemanger/default.nix @@ -1,26 +1,14 @@ -{...}: { - home-manager.users.joy.programs.home-manager.enable = true; - home-manager.users.joy.xresources.path = ".config/.Xresources"; - home-manager.users.joy.gtk.gtk2.configLocation = "/home/joy/.config/gtk-2.0/gtkrc"; - # home-manager.users.joy.xdg = { - # mimeApps = { - # enable = true; - # defaultApplications = { - # "text/plain" = ["hx.desktop"]; - # "image/*" = ["imv.desktop"]; - # "video/png" = ["mpv.desktop"]; - # "video/jpg" = ["mpv.desktop"]; - # "video/*" = ["mpv.desktop"]; - # }; - # }; - # }; - - home-manager.backupFileExtension = "backup"; - home-manager.users.joy.home = { - username = "joy"; - homeDirectory = "/home/joy"; - stateVersion = "23.11"; - sessionVariables = { +{...}: { home-manager = { + backupFileExtension = "bkp"; + users.joy = { + programs.home-manager.enable = true; + xresources.path = ".config/.Xresources"; + gtk.gtk2.configLocation = "/home/joy/.config/gtk-2.0/gtkrc"; + home = { + username = "joy"; + homeDirectory = "/home/joy"; + stateVersion = "23.11"; + }; }; }; } diff --git a/modules/system/xdg/default.nix b/modules/system/xdg/default.nix new file mode 100644 index 0000000..96c3a83 --- /dev/null +++ b/modules/system/xdg/default.nix @@ -0,0 +1,12 @@ +{...}: { + home-manager.users.joy.xdg = { + mimeApps = { + enable = true; + defaultApplications = { + "text/plain" = ["hx.desktop"]; + "image/*" = ["imv.desktop"]; + "video/*" = ["mpv.desktop"]; + }; + }; + }; +}