diff --git a/flake.lock b/flake.lock index 66035d9..76d5963 100755 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ ] }, "locked": { - "lastModified": 1698697308, - "narHash": "sha256-5p8U1NvmBm5kabJLrhBnckdXk4EehuplZ+64lRG1kZI=", + "lastModified": 1700669930, + "narHash": "sha256-2nERtfA6ZanlnhS68v+wxQovpfUR10F40bIq/qzcRMQ=", "owner": "berberman", "repo": "flakes", - "rev": "571f6d5174e31351fd10a68cfd966b7fc2d10e0d", + "rev": "769732590fe25bd5dccb2c619f8ac6bb77ae8f13", "type": "github" }, "original": { @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1699548976, - "narHash": "sha256-xnpxms0koM8mQpxIup9JnT0F7GrKdvv0QvtxvRuOYR4=", + "lastModified": 1700327093, + "narHash": "sha256-OgYvlBABxJYWhZ/HBd0bPVcIEkT+xDhDCpRYqtVhYWY=", "owner": "ipetkov", "repo": "crane", - "rev": "6849911446e18e520970cc6b7a691e64ee90d649", + "rev": "ae7cd510e508ee03d792005c2f1c0a3ff25ecb80", "type": "github" }, "original": { @@ -169,11 +169,11 @@ ] }, "locked": { - "lastModified": 1699783872, - "narHash": "sha256-4zTwLT2LL45Nmo6iwKB3ls3hWodVP9DiSWxki/oewWE=", + "lastModified": 1700695018, + "narHash": "sha256-MAiPLgBF4GLzSOlhnPCDWkWW5CDx4i7ApIYaR+TwTVg=", "owner": "nix-community", "repo": "home-manager", - "rev": "280721186ab75a76537713ec310306f0eba3e407", + "rev": "134deb46abd5d0889d913b8509413f6f38b0811e", "type": "github" }, "original": { @@ -201,11 +201,11 @@ ] }, "locked": { - "lastModified": 1699893778, - "narHash": "sha256-Sq/l7BPoeCMtTFQ/B0qdAmNgrykDMAz8Vv2neZqGJbU=", + "lastModified": 1700739112, + "narHash": "sha256-lsJWWR8JjIWku1AcMrHa7wO4UILytsFRgkFY7T9yRGQ=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "5edb4e4a304bbef1de30a36f7b921ea328d7efc6", + "rev": "e40e486f61f2643578b9977b86f408799dbc75fd", "type": "github" }, "original": { @@ -297,11 +297,11 @@ ] }, "locked": { - "lastModified": 1699854300, - "narHash": "sha256-+vtwI57MvMKoPuLe1yxi9abkA3EbhK+NodVxxkrv3rg=", + "lastModified": 1699973284, + "narHash": "sha256-eqic6t1+yd3JXqByexLdZiuyLBzy9KSAOvDBet6yr5Q=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "f8d26384363b3b1ed17de4f2d87aaa553e70b466", + "rev": "2123d3a0e1ae16d0a9d1858464edfd34db653653", "type": "github" }, "original": { @@ -334,11 +334,11 @@ ] }, "locked": { - "lastModified": 1699867978, - "narHash": "sha256-+arl45HUOcBdKiRGrKXZYXDyBQ6MQGkYPZa/28f6Yzo=", + "lastModified": 1700795494, + "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "e67f2bf515343da378c3f82f098df8ca01bccc5f", + "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1699560481, - "narHash": "sha256-JwmozcjXfwo8HaAR5LBKS6+MJbfzHHE+phtFMJRmyik=", + "lastModified": 1700707848, + "narHash": "sha256-25D16AZq4VLV3psWPLusHn1ksj2vpff++1za1p2EG+E=", "owner": "nixpak", "repo": "nixpak", - "rev": "755ea83c7835d17975d151e326bf21987dd2ce57", + "rev": "857de989621eb62a6c180eaff6ed92a6b5e47d82", "type": "github" }, "original": { @@ -386,11 +386,11 @@ ] }, "locked": { - "lastModified": 1699788515, - "narHash": "sha256-X/dKcCKN5KwW5j6kc7jpX6Sa5UE3DTe1LAMB9Bp0RwE=", + "lastModified": 1700725286, + "narHash": "sha256-pyWRR6ASJs3wNIj0AVMjAABOL5IWbLYAWZEY9VJSPVA=", "owner": "nixpak", "repo": "pkgs", - "rev": "8c3ac0fc5d94441b5ba4448c984438882e1124a5", + "rev": "bb6dce0cc0d9f08e5b1077e3bc1626d29e4dbfa2", "type": "github" }, "original": { @@ -401,11 +401,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1699781429, - "narHash": "sha256-UYefjidASiLORAjIvVsUHG6WBtRhM67kTjEY4XfZOFs=", + "lastModified": 1700612854, + "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e44462d6021bfe23dfb24b775cc7c390844f773d", + "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614", "type": "github" }, "original": { @@ -417,11 +417,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1699596684, - "narHash": "sha256-XSXP8zjBZJBVvpNb2WmY0eW8O2ce+sVyj1T0/iBRIvg=", + "lastModified": 1700678569, + "narHash": "sha256-2Ki+2UvOidxEb3xB4ADqlbPQ2BZOF4uZMR094O8or2I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "da4024d0ead5d7820f6bd15147d3fe2a0c0cec73", + "rev": "8f1180704ac35baded1a74164365ac7cdfba6f38", "type": "github" }, "original": { @@ -476,11 +476,11 @@ ] }, "locked": { - "lastModified": 1699271226, - "narHash": "sha256-8Jt1KW3xTjolD6c6OjJm9USx/jmL+VVmbooADCkdDfU=", + "lastModified": 1700064067, + "narHash": "sha256-1ZWNDzhu8UlVCK7+DUN9dVQfiHX1bv6OQP9VxstY/gs=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "ea758da1a6dcde6dc36db348ed690d09b9864128", + "rev": "e558068cba67b23b4fbc5537173dbb43748a17e8", "type": "github" }, "original": { @@ -531,11 +531,11 @@ ] }, "locked": { - "lastModified": 1699928012, - "narHash": "sha256-7WfRTTBdkRJgjiJRsSShMXlfmOG1X0FqNdHaLATAL+w=", + "lastModified": 1700792047, + "narHash": "sha256-wVqEc4HuBEVeJAzLF7PUxuOUzTKpF9s3vuLUy4xGbIo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "e485313fc485700a9f1f9b8b272ddc0621d08357", + "rev": "fbe3f99f47bdb85fe2b9a2387d20c75d57e8632f", "type": "github" }, "original": { @@ -554,11 +554,11 @@ ] }, "locked": { - "lastModified": 1699951338, - "narHash": "sha256-1GeczM7XfgHcYGYiYNcdwSFu3E62vmh4d7mffWZvyzE=", + "lastModified": 1700362823, + "narHash": "sha256-/H7XgvrYM0IbkpWkcdfkOH0XyBM5ewSWT1UtaLvOgKY=", "owner": "Mic92", "repo": "sops-nix", - "rev": "0e3a94167dcd10a47b89141f35b2ff9e04b34c46", + "rev": "49a87c6c827ccd21c225531e30745a9a6464775c", "type": "github" }, "original": { @@ -577,11 +577,11 @@ ] }, "locked": { - "lastModified": 1699901025, - "narHash": "sha256-iE2LG6GfIKidDWmUovXgzQ/MpkxJLNxsBSUj6x2zHfU=", + "lastModified": 1699986787, + "narHash": "sha256-eYlLWibKtHN/uWJQLzOMRXpoTbO6VcFTfVY4dpgdJcQ=", "owner": "the-argus", "repo": "spicetify-nix", - "rev": "fe3f9e5d3bb5438d6a363f5a0c728ea836217b8f", + "rev": "3c702af1f717b7876fac08809201b1368d0d956c", "type": "github" }, "original": { @@ -609,11 +609,11 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1699867923, - "narHash": "sha256-T/+sDbNyRx/YJh43AGBADnL0jcg3WrnKBOM9mWGtaOY=", + "lastModified": 1700775178, + "narHash": "sha256-BiGn+zK4HA73B9rK8RW3aaAwGM6zJNBDqM87CCBEqik=", "owner": "wlroots", "repo": "wlroots", - "rev": "9e5d0f95f88b6774c81dfa4c8775bf7d0f09bf19", + "rev": "26158d0718e239b4d2423a3dc22365cc4c749ffd", "type": "gitlab" }, "original": { @@ -636,11 +636,11 @@ ] }, "locked": { - "lastModified": 1699146051, - "narHash": "sha256-L29h9vE6t97Vx/5FsRmDb+RnKcbnyJtilflJtb4++Vs=", + "lastModified": 1700508250, + "narHash": "sha256-X4o/mifI7Nhu0UKYlxx53wIC+gYDo3pVM9L2u3PE2bE=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "b2fc1110963fa583ad5348a9dc0101bd58ceac7a", + "rev": "eb120ff25265ecacd0fc13d7dab12131b60d0f47", "type": "github" }, "original": { diff --git a/nixos/profiles/core/packages/anti-feature.nix b/nixos/profiles/core/packages/anti-feature.nix index d8cc33d..15c95bb 100644 --- a/nixos/profiles/core/packages/anti-feature.nix +++ b/nixos/profiles/core/packages/anti-feature.nix @@ -9,7 +9,7 @@ "vscodium" "spotify" "adoptopenjdk-hotspot-bin" - "osu-lazer-bin-2023.1026.0" + "osu-lazer-bin-2023.1114.1" "protonup-qt-2.8.2" "cef-binary" "virtualbox" @@ -27,7 +27,7 @@ #"nvidia-persistenced" "xow_dongle-firmware" #"facetimehd-firmware" - "osu-lazer-bin-2023.1026.0" + "osu-lazer-bin-2023.1114.1" "spotify" "steam" "steam-original" diff --git a/nixos/profiles/core/packages/overlays/nautilus.nix b/nixos/profiles/core/packages/overlays/nautilus.nix index 5206a57..7acf8e3 100644 --- a/nixos/profiles/core/packages/overlays/nautilus.nix +++ b/nixos/profiles/core/packages/overlays/nautilus.nix @@ -10,12 +10,8 @@ final: prev: { ++ [ (prev.fetchgit { url = "https://aur.archlinux.org/nautilus-typeahead.git"; - ### 44.2 - rev = "dc295b3191818d16550400e645e108d9e265baa3"; - hash = "sha256-jCZcmPvmEodDzv+HHp7s+azLKVIno1ue72dQO+WbENU="; - ### 45.0 - #rev = "26776193230b0d56f714d31d79c5e716ac413a26"; - #hash = "sha256-hVWZCQwHzL4j+FcgsEhuumhBkl6d8IIbcYddh08QMJM="; + rev = "26776193230b0d56f714d31d79c5e716ac413a26"; + hash = "sha256-hVWZCQwHzL4j+FcgsEhuumhBkl6d8IIbcYddh08QMJM="; sparseCheckout = [ "nautilus-restore-typeahead.patch" ]; diff --git a/users/guanranwang/home-manager/profiles/graphical-stuff/nixos/xdg-mime.nix b/users/guanranwang/home-manager/profiles/graphical-stuff/nixos/xdg-mime.nix index 8331541..e2dcb65 100644 --- a/users/guanranwang/home-manager/profiles/graphical-stuff/nixos/xdg-mime.nix +++ b/users/guanranwang/home-manager/profiles/graphical-stuff/nixos/xdg-mime.nix @@ -5,8 +5,8 @@ defaultApplications = { "audio/mpeg" = "io.bassi.Amberol.desktop"; "audio/flac" = "io.bassi.Amberol.desktop"; - "image/jpeg" = "org.gnome.eog.desktop"; - "image/png" = "org.gnome.eog.desktop"; + "image/jpeg" = "org.gnome.Loupe.desktop"; + "image/png" = "org.gnome.Loupe.desktop"; "inode/directory" = "org.gnome.Nautilus.desktop"; "text/html" = "librewolf.desktop"; "x-scheme-handler/http" = "librewolf.desktop"; diff --git a/users/guanranwang/home-manager/profiles/media/darwin/default.nix b/users/guanranwang/home-manager/profiles/media/darwin/default.nix index c03ff85..add8067 100644 --- a/users/guanranwang/home-manager/profiles/media/darwin/default.nix +++ b/users/guanranwang/home-manager/profiles/media/darwin/default.nix @@ -1,6 +1,8 @@ -{...}: { - imports = [ - ./music.nix - ./video.nix +{pkgs, ...}: { + programs.mpv.enable = true; + home.packages = with pkgs; [ + ### Streaming + spotify + yesplaymusic ]; } diff --git a/users/guanranwang/home-manager/profiles/media/darwin/music.nix b/users/guanranwang/home-manager/profiles/media/darwin/music.nix deleted file mode 100644 index d6481f8..0000000 --- a/users/guanranwang/home-manager/profiles/media/darwin/music.nix +++ /dev/null @@ -1,9 +0,0 @@ -{pkgs, ...}: { - imports = [./spicetify.nix]; - programs.mpv.enable = true; - home.packages = with pkgs; [ - ### Streaming - spotify - yesplaymusic - ]; -} diff --git a/users/guanranwang/home-manager/profiles/media/darwin/video.nix b/users/guanranwang/home-manager/profiles/media/darwin/video.nix deleted file mode 100644 index fc16fb4..0000000 --- a/users/guanranwang/home-manager/profiles/media/darwin/video.nix +++ /dev/null @@ -1,3 +0,0 @@ -{...}: { - programs.mpv.enable = true; -} diff --git a/users/guanranwang/home-manager/profiles/media/nixos/default.nix b/users/guanranwang/home-manager/profiles/media/nixos/default.nix index cce827f..3ddb693 100644 --- a/users/guanranwang/home-manager/profiles/media/nixos/default.nix +++ b/users/guanranwang/home-manager/profiles/media/nixos/default.nix @@ -1,7 +1,21 @@ -{...}: { - imports = [ - ./music.nix - ./photo.nix - ./video.nix +{pkgs, ...}: { + imports = [./spicetify.nix]; + programs.mpv.enable = true; + home.packages = with pkgs; [ + # Music & Video + ### Local + amberol + + ### Streaming + yesplaymusic + netease-cloud-music-gtk + + ### Misc + mousai + cava + easyeffects + + # Photos + loupe ]; } diff --git a/users/guanranwang/home-manager/profiles/media/nixos/music.nix b/users/guanranwang/home-manager/profiles/media/nixos/music.nix deleted file mode 100644 index 82e0733..0000000 --- a/users/guanranwang/home-manager/profiles/media/nixos/music.nix +++ /dev/null @@ -1,17 +0,0 @@ -{pkgs, ...}: { - imports = [./spicetify.nix]; - programs.mpv.enable = true; - home.packages = with pkgs; [ - ### Local - amberol - - ### Streaming - yesplaymusic - netease-cloud-music-gtk - - ### Misc - mousai - cava - easyeffects - ]; -} diff --git a/users/guanranwang/home-manager/profiles/media/nixos/photo.nix b/users/guanranwang/home-manager/profiles/media/nixos/photo.nix deleted file mode 100644 index a54d1a0..0000000 --- a/users/guanranwang/home-manager/profiles/media/nixos/photo.nix +++ /dev/null @@ -1,5 +0,0 @@ -{pkgs, ...}: { - home.packages = with pkgs; [ - gnome.eog - ]; -} diff --git a/users/guanranwang/home-manager/profiles/media/nixos/video.nix b/users/guanranwang/home-manager/profiles/media/nixos/video.nix deleted file mode 100644 index fc16fb4..0000000 --- a/users/guanranwang/home-manager/profiles/media/nixos/video.nix +++ /dev/null @@ -1,3 +0,0 @@ -{...}: { - programs.mpv.enable = true; -} diff --git a/users/guanranwang/nixos/profiles/device-type/desktop/default.nix b/users/guanranwang/nixos/profiles/device-type/desktop/default.nix index 46dc7bf..18a23be 100644 --- a/users/guanranwang/nixos/profiles/device-type/desktop/default.nix +++ b/users/guanranwang/nixos/profiles/device-type/desktop/default.nix @@ -41,6 +41,15 @@ enable = true; wlr.enable = true; extraPortals = with pkgs; [xdg-desktop-portal-gtk]; + config = { + common.default = [ + "gtk" + ]; + sway.default = [ + "wlr" + "gtk" + ]; + }; }; services = { gvfs.enable = true; @@ -51,7 +60,7 @@ }; programs = { kdeconnect = { - enable = true; + #enable = true; #package = pkgs.gnomeExtensions.gsconnect; package = pkgs.valent; };