From 9c0cb5a53d68c19d0013263af16e8ab98d8b70e3 Mon Sep 17 00:00:00 2001 From: xqtc161 Date: Sun, 24 Mar 2024 14:17:13 +0100 Subject: [PATCH] idk readded some stuff removed some stuff who even cares at this point --- common/default.nix | 4 ++ flake.lock | 66 +++++++++++++-------------- home/config-files/hyprland.conf | 2 +- home/modules/home-pkgs.nix | 10 ++-- hosts/x86_64-linux/lilith/default.nix | 8 ++-- 5 files changed, 48 insertions(+), 42 deletions(-) diff --git a/common/default.nix b/common/default.nix index a616df6..790ed7f 100644 --- a/common/default.nix +++ b/common/default.nix @@ -6,6 +6,10 @@ ... }: { #nixpkgs.config.permittedInsecurePackages = ["electron-25.9.0" "electron-24.8.6"]; + environment.systemPackages = with pkgs; [ + xdg-desktop-portal-hyprland + xdg-desktop-portal + ]; nix.settings = { trusted-users = ["xqtc"]; substituters = [ diff --git a/flake.lock b/flake.lock index 8e78b5a..8d0685a 100644 --- a/flake.lock +++ b/flake.lock @@ -29,11 +29,11 @@ ] }, "locked": { - "lastModified": 1710156081, - "narHash": "sha256-4PMY6aumJi5dLFjBzF5O4flKXmadMNq3AGUHKYfchh0=", + "lastModified": 1711099426, + "narHash": "sha256-HzpgM/wc3aqpnHJJ2oDqPBkNsqWbW0WfWUO8lKu8nGk=", "owner": "numtide", "repo": "devshell", - "rev": "bc68b058dc7e6d4d6befc4ec6c60082b6e844b7d", + "rev": "2d45b54ca4a183f2fdcf4b19c895b64fbf620ee8", "type": "github" }, "original": { @@ -49,11 +49,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1710715192, - "narHash": "sha256-w6dpqrZ5eCObzvxL+3QqGoYC/iR4TCYwGBlpX3D+ITQ=", + "lastModified": 1711124527, + "narHash": "sha256-nCTtAShwdthp+scvmLevc06gtY9gglXq2vCdsszTqIA=", "owner": "rycee", "repo": "nur-expressions", - "rev": "114486c3f75cc20196bd59836b7efd41826c2c08", + "rev": "d1f6bbea177a3542d9ad3ecead77089b65e09963", "type": "gitlab" }, "original": { @@ -185,11 +185,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -207,11 +207,11 @@ ] }, "locked": { - "lastModified": 1703887061, - "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", "type": "github" }, "original": { @@ -227,11 +227,11 @@ ] }, "locked": { - "lastModified": 1710796387, - "narHash": "sha256-ve/vpbby+4LPJrlNGqGyuzZMLL7zHUZhvvKu1StsaC8=", + "lastModified": 1711133180, + "narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=", "owner": "nix-community", "repo": "home-manager", - "rev": "baf7659448ffa6ab6870dba1ca681a4868c3068a", + "rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb", "type": "github" }, "original": { @@ -249,11 +249,11 @@ ] }, "locked": { - "lastModified": 1710714957, - "narHash": "sha256-eZCxuF58YWgaJMMRrn8oRkwRhxooe5kBS/s2wRVr9PA=", + "lastModified": 1711133180, + "narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=", "owner": "nix-community", "repo": "home-manager", - "rev": "7b3fca5adcf6c709874a8f2e0c364fe9c58db989", + "rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb", "type": "github" }, "original": { @@ -285,11 +285,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1710783728, - "narHash": "sha256-eIsfu3c9JUBgm3cURSKTXLEI9Dlk1azo+MWKZVqrmkc=", + "lastModified": 1711274671, + "narHash": "sha256-19KQXya5VERUXOdeEJJN+zOqtvuE6MV3qTk9Gr4J9Uo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "1e679b9a9970780cd5d4dfe755a74a8f96d33388", + "rev": "7559df1e4af972d5f1de87975b5ef6a8d7559db2", "type": "github" }, "original": { @@ -317,11 +317,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1710797693, - "narHash": "sha256-TvIMBhgfDlYDC7CAmO8oLU4OLqVTGf1ePv50HFoKWTY=", + "lastModified": 1711283748, + "narHash": "sha256-k/odu9SNTrQ2dntKMZmaaPQbz0rw4PSh5FaAFUGtzgM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cf0327ca4ddb15907d25f7dc5b9e6663ff8df4cb", + "rev": "bb13987023c3dec3ccc8d7500cc068e89327df6d", "type": "github" }, "original": { @@ -349,11 +349,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1710631334, - "narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=", + "lastModified": 1711163522, + "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a", + "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", "type": "github" }, "original": { @@ -376,11 +376,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1710790872, - "narHash": "sha256-Y461cP8iiWycPCREOGb5zhz3bj57PNb0Uc4cwygOMKM=", + "lastModified": 1711199922, + "narHash": "sha256-Oz5WNOPp95K4JLyoNQKyEdaUM5JzliC62jwTpGPqYNE=", "owner": "nix-community", "repo": "nixvim", - "rev": "303b9ca2c0c043ccd0e33aae0960d26f24cf5088", + "rev": "7170aad28139cd3629b2b6ce4c9272bf41c2ad45", "type": "github" }, "original": { @@ -404,11 +404,11 @@ ] }, "locked": { - "lastModified": 1708018599, - "narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=", + "lastModified": 1710923068, + "narHash": "sha256-6hOpUiuxuwpXXc/xfJsBUJeqqgGI+JMJuLo45aG3cKc=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431", + "rev": "e611897ddfdde3ed3eaac4758635d7177ff78673", "type": "github" }, "original": { diff --git a/home/config-files/hyprland.conf b/home/config-files/hyprland.conf index aaa9277..f32638d 100644 --- a/home/config-files/hyprland.conf +++ b/home/config-files/hyprland.conf @@ -117,7 +117,7 @@ $mainMod = SUPER bind = $mainMod SHIFT, return, exec, wezterm bind = $mainMod SHIFT, Q, killactive, bind = $mainMod SHIFT, X, exit, -bind = $mainMod, L, exec, swaylock --indicator --clock --effect-blur 7x5 -e -f -i "~/dotfiles_new/walls/walls/Bangqiao Yan - Letter.jpg" +bind = $mainMod, L, exec, swaylock --indicator --clock --effect-blur 7x5 -e -f -i "~/dotfiles_new/walls/walls/1543142967600.jpg" bind = $mainMod SHIFT, SPACE, togglefloating, bind = $mainMod, P, exec, tofi-drun --drun-launch=true diff --git a/home/modules/home-pkgs.nix b/home/modules/home-pkgs.nix index 2e6bd80..66100aa 100644 --- a/home/modules/home-pkgs.nix +++ b/home/modules/home-pkgs.nix @@ -43,16 +43,17 @@ in { pkgs.nerdfonts pkgs.ipafont - #pkgs.signal-desktop - #pkgs.vesktop - #pkgs.telegram-desktop - #pkgs.element-desktop + pkgs.signal-desktop + pkgs.vesktop + pkgs.telegram-desktop + pkgs.element-desktop pkgs.qbittorrent pkgs.nicotine-plus pkgs.qmk pkgs.qmk-udev-rules + pkgs.via pkgs.neovide @@ -62,6 +63,7 @@ in { pkgs.sayonara pkgs.mpv + pkgs.jellyfin-media-player #pkgs.feishin pkgs.nixos-icons diff --git a/hosts/x86_64-linux/lilith/default.nix b/hosts/x86_64-linux/lilith/default.nix index 9310132..e16a56f 100644 --- a/hosts/x86_64-linux/lilith/default.nix +++ b/hosts/x86_64-linux/lilith/default.nix @@ -75,12 +75,12 @@ # }; # Enable the X11 windowing system. - services.xserver.enable = true; - services.xserver.displayManager.gdm.enable = true; + # services.xserver.enable = true; + # services.xserver.displayManager.gdm.enable = true; #services.xserver.displayManager.ly.enable = true; - services.xserver.desktopManager.gnome.enable = true; + # services.xserver.desktopManager.gnome.enable = true; #services.xserver.displayManager.defaultSession = "plasmawayland"; - services.xserver.videoDrivers = ["intel"]; + # services.xserver.videoDrivers = ["intel"]; services.blueman.enable = true;