From 64ce0762b23e2de008f6c6d5681d2ae96b62d1fd Mon Sep 17 00:00:00 2001 From: Filip Hoffmann Date: Sat, 14 Jun 2025 17:29:59 +0200 Subject: [PATCH] switching distros --- flake.lock | 167 +++++++++++++--------------------------------- flake.nix | 8 --- system/themes.nix | 5 -- user/hyprland.nix | 2 +- user/themes.nix | 10 +-- 5 files changed, 54 insertions(+), 138 deletions(-) diff --git a/flake.lock b/flake.lock index a2f3f10..5f62a97 100644 --- a/flake.lock +++ b/flake.lock @@ -1,27 +1,5 @@ { "nodes": { - "apple-emoji": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1748462723, - "narHash": "sha256-IyzSEe62OXMydR8pk5cxxjVim7mQi+PXwD1FzxF18kE=", - "owner": "typedrat", - "repo": "apple-emoji-linux", - "rev": "419b5b4ed32b8088214823dc5b79442a505ffceb", - "type": "github" - }, - "original": { - "owner": "typedrat", - "ref": "fix-flake-on-unstable", - "repo": "apple-emoji-linux", - "type": "github" - } - }, "base16": { "inputs": { "fromYaml": "fromYaml" @@ -120,11 +98,11 @@ "yaml": "yaml" }, "locked": { - "lastModified": 1748353237, - "narHash": "sha256-aZYqDC6LrCmE+BzkNNdN4BEmnudVW34vZKFGkJBeMzk=", + "lastModified": 1749329095, + "narHash": "sha256-Mc+/7WOxEb0HkqbZq1O8ijQy0nnxIXheeK3cRR/e2pg=", "ref": "dev", - "rev": "dfe7ce5366437196b4f4c8f5c593a4a957bf2ed1", - "revCount": 246, + "rev": "d8631ea74a7cea5af8b2ddbef06535d510a2e58c", + "revCount": 247, "type": "git", "url": "ssh://git@github.com/RobloxUSArmyCID/CIDBot" }, @@ -173,11 +151,11 @@ ] }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", "type": "github" }, "original": { @@ -191,11 +169,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", "type": "github" }, "original": { @@ -367,11 +345,11 @@ ] }, "locked": { - "lastModified": 1749131129, - "narHash": "sha256-tJ+93i7N4QttM75bE8T09LlSU3Mv6Dfi9WaVBvlWilo=", + "lastModified": 1749821119, + "narHash": "sha256-X3WAS322EsebI4ohJcXhKpiyG1v+7wE4VOiXy1pxM/c=", "owner": "nix-community", "repo": "home-manager", - "rev": "13a45ede6c17b5e923dfc18a40a3f646436f4809", + "rev": "79dfd9aa295e53773aad45480b44c131da29f35b", "type": "github" }, "original": { @@ -431,11 +409,11 @@ }, "mnw": { "locked": { - "lastModified": 1748278309, - "narHash": "sha256-JCeiMrUhFku44kfKsgiD9Ibzho4MblBD2WmOQYsQyTY=", + "lastModified": 1748710831, + "narHash": "sha256-eZu2yH3Y2eA9DD3naKWy/sTxYS5rPK2hO7vj8tvUCSU=", "owner": "Gerg-L", "repo": "mnw", - "rev": "486a17ba1279ab2357cae8ff66b309db622f8831", + "rev": "cff958a4e050f8d917a6ff3a5624bc4681c6187d", "type": "github" }, "original": { @@ -446,22 +424,17 @@ }, "nil": { "inputs": { - "flake-utils": [ - "nvf", - "flake-utils" - ], "nixpkgs": [ "nvf", "nixpkgs" - ], - "rust-overlay": "rust-overlay" + ] }, "locked": { - "lastModified": 1741118843, - "narHash": "sha256-ggXU3RHv6NgWw+vc+HO4/9n0GPufhTIUjVuLci8Za8c=", + "lastModified": 1749796250, + "narHash": "sha256-oxvVAFUO9husnRk6XZcLFLjLWL9z0pW25Fk6kVKwt1c=", "owner": "oxalica", "repo": "nil", - "rev": "577d160da311cc7f5042038456a0713e9863d09e", + "rev": "9e4cccb088440c20703d62db9de8d5ae06d4a449", "type": "github" }, "original": { @@ -472,11 +445,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1744659587, - "narHash": "sha256-xJnbmRVte13akgn+Prg06IaRHJ5OX3uVltwsCP/mxoc=", + "lastModified": 1749394952, + "narHash": "sha256-WbWkzIvB0gqAdBLghdmUpGveY7MlAS2iMj3VEJnJ9yE=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "928d868a9141b48f152d3b2b00c433e688d4b106", + "rev": "64c6e53a3999957c19ab95cda78bde466d8374cc", "type": "github" }, "original": { @@ -487,11 +460,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748929857, - "narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=", + "lastModified": 1749794982, + "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4", + "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", "type": "github" }, "original": { @@ -502,11 +475,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1743296961, - "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=", + "lastModified": 1748740939, + "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa", + "rev": "656a64127e9d791a334452c6b6606d17539476e2", "type": "github" }, "original": { @@ -517,11 +490,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1749139393, - "narHash": "sha256-afZUDvG2Mang9aSJVv68h+QnQmrrkv9X/9K3leRejkU=", + "lastModified": 1749907520, + "narHash": "sha256-vwkSb02EKFVDDPGo4JTNXQp/S7tDM9/wQmy7NbcEVS8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3ba41fcb4a4a5e5150001b093ce872f6d34320f7", + "rev": "dcf029069195422df637d2138eb08a0976539a29", "type": "github" }, "original": { @@ -540,11 +513,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1749107808, - "narHash": "sha256-ohLHvWmAuH4aHOCAGP1UlwRRxX21/eW+N2e7eB0kQeo=", + "lastModified": 1749761870, + "narHash": "sha256-y+rCuxTylur4k2MbL8cJwOR3pHIamCxp8xG9Vuhwvgw=", "owner": "nix-community", "repo": "nixvim", - "rev": "635a9e770f77a7c586c60f84b1debf054318034a", + "rev": "18d838e88945b554d059db5f1fff1daed4b7bf8f", "type": "github" }, "original": { @@ -563,7 +536,7 @@ "stylix", "nixpkgs" ], - "treefmt-nix": "treefmt-nix_2" + "treefmt-nix": "treefmt-nix" }, "locked": { "lastModified": 1748730660, @@ -589,11 +562,11 @@ ] }, "locked": { - "lastModified": 1748298102, - "narHash": "sha256-PP11GVwUt7F4ZZi5A5+99isuq39C59CKc5u5yVisU/U=", + "lastModified": 1749531675, + "narHash": "sha256-UB8Mc88rW9frjpJ1Fj2ro7f07Gg8dX3uVXvMXnFR4CE=", "owner": "NuschtOS", "repo": "search", - "rev": "f8a1c221afb8b4c642ed11ac5ee6746b0fe1d32f", + "rev": "4029d450d0266909ee52775849b7da54e79b328e", "type": "github" }, "original": { @@ -614,11 +587,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1749033605, - "narHash": "sha256-OkrBJNnD9/Qe2tn3/21rjbiVLlRvaNMdqzfFqUkpbHo=", + "lastModified": 1749895904, + "narHash": "sha256-D7ZLf2ApiHMLlS6Imu7yHaB4Nbf9Hi8a8/64xOt6qOo=", "owner": "NotAShelf", "repo": "nvf", - "rev": "cb4d8340a172e95069b05f8e62f1c93e9ded859b", + "rev": "77a32f0961edbeda82e80c1bcd465cad21004fc7", "type": "github" }, "original": { @@ -629,7 +602,6 @@ }, "root": { "inputs": { - "apple-emoji": "apple-emoji", "cidbot": "cidbot", "home-manager": "home-manager", "nix-flatpak": "nix-flatpak", @@ -641,28 +613,6 @@ "stylix": "stylix" } }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "nvf", - "nil", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1741055476, - "narHash": "sha256-52vwEV0oS2lCnx3c/alOFGglujZTLmObit7K8VblnS8=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "aefb7017d710f150970299685e8d8b549d653649", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "spicetify-nix": { "inputs": { "nixpkgs": [ @@ -671,11 +621,11 @@ "systems": "systems_6" }, "locked": { - "lastModified": 1748752728, - "narHash": "sha256-en008ncPUQjVx2i3PbM4RWeZkD9DNbJwIy0epppXe2o=", + "lastModified": 1749357231, + "narHash": "sha256-AbrPgGFVYR45TlYLHYTppayG0xzOG9XXhi+1j3Klbw8=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "0e03de40d5128eb2ad600c98f57cf5db2cdf3240", + "rev": "03783416f7416715c52166d4e8ba0492a7149397", "type": "github" }, "original": { @@ -708,11 +658,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1749053445, - "narHash": "sha256-tf4MNRwJ5ikyg4+UfGuC1+GwMBQYh4dK4sdow1MEGVk=", + "lastModified": 1749905587, + "narHash": "sha256-sZpQM+InPCYwJQiTxs/PCCupwbYNaSCFi2Hvpl1/pOo=", "owner": "nix-community", "repo": "stylix", - "rev": "a057acc112856352e77d42ac4685134b2213a810", + "rev": "77a8b26520f48305f3b1bacffaa8740dde8afa2a", "type": "github" }, "original": { @@ -908,27 +858,6 @@ } }, "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "apple-emoji", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1739829690, - "narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "3d0579f5cc93436052d94b73925b48973a104204", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt-nix_2": { "inputs": { "nixpkgs": [ "stylix", diff --git a/flake.nix b/flake.nix index ffb1bd7..e3a6408 100644 --- a/flake.nix +++ b/flake.nix @@ -29,10 +29,6 @@ url = "github:nix-community/nixvim"; inputs.nixpkgs.follows = "nixpkgs"; }; - apple-emoji = { - url = "github:typedrat/apple-emoji-linux/fix-flake-on-unstable"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; outputs = { @@ -46,13 +42,11 @@ nvf, cidbot, nixvim, - apple-emoji, ... } @ inputs: let system = "x86_64-linux"; pkgs = import nixpkgs {inherit system;}; pkgsMaster = import nixpkgs-master {inherit system;}; - pkgsAppleEmoji = apple-emoji.packages.${system}; lib = nixpkgs.lib; spicetifyPkgs = spicetify-nix.legacyPackages.${system}; @@ -85,7 +79,6 @@ specialArgs = { inherit inputs; inherit pkgsMaster; - inherit pkgsAppleEmoji; inherit systemSettings; inherit userSettings; }; @@ -105,7 +98,6 @@ inherit self; inherit inputs; inherit pkgsMaster; - inherit pkgsAppleEmoji; inherit systemSettings; inherit userSettings; inherit spicetifyPkgs; diff --git a/system/themes.nix b/system/themes.nix index 252bbcd..b63bf20 100644 --- a/system/themes.nix +++ b/system/themes.nix @@ -1,5 +1,4 @@ { - pkgsAppleEmoji, config, pkgs, ... @@ -18,10 +17,6 @@ package = pkgs.maple-mono.NF; name = "Maple Mono NF"; }; - emoji = { - package = pkgsAppleEmoji.apple-emoji-linux; - name = "Apple Color Emoji"; - }; }; }; } diff --git a/user/hyprland.nix b/user/hyprland.nix index e5846a3..3626fd6 100644 --- a/user/hyprland.nix +++ b/user/hyprland.nix @@ -17,7 +17,7 @@ # waits for hyprpaper to initialize sleep 0.5s - wallpaper=$(shuf -e -n1 ${backgrounds}/{blockwavemoon.png,leafy.png,moon.jpg,rose_pine_contourline.png,rose_pine_maze.png,rose_pine_noiseline.png,rose_pine_shape.png,something-beautiful-in-nature.png}) + wallpaper=$(shuf -e -n1 ${backgrounds}/{blockwavemoon.png,leafy.png,moon.jpg,rose_pine_contourline.png,rose_pine_maze.png,rose_pine_noiseline.png,rose_pine_shape.png,something-beautiful-in-nature.jpg}) loaded_output=$(${pkgs.hyprland}/bin/hyprctl hyprpaper listloaded) echo $wallpaper > $HOME/wallpaper.txt if [[ $loaded_output != "no wallpapers loaded" ]]; then diff --git a/user/themes.nix b/user/themes.nix index 6fee6dc..d122a1e 100644 --- a/user/themes.nix +++ b/user/themes.nix @@ -1,4 +1,8 @@ -{config, pkgs, pkgsAppleEmoji, ...}: { +{ + config, + pkgs, + ... +}: { gtk = { enable = true; # font.name = "Ubuntu"; @@ -21,10 +25,6 @@ package = pkgs.maple-mono.NF; name = "Maple Mono NF"; }; - emoji = { - package = pkgsAppleEmoji.apple-emoji-linux; - name = "Apple Color Emoji"; - }; }; }; -- 2.51.2