dotfiles
My PC Dotfiles & Websitegit clone https://github.com/maydayv7/dotfiles
commit 386b2e763647ef5ca1802a7745c035f9d0c411d2 parent 9d900dc7e4967793596b671f86efd66d893891ae Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 1 Feb 2024 22:05:55 +0530 chore(flake): Update `inputs` Also add Flatpak Overrides Flake lock file updates: • Updated input 'chaotic': 'github:chaotic-cx/nyx/35518e2947b9b640ee8a272404917d87dc8e087c' (2024-01-16) → 'github:chaotic-cx/nyx/c609893339987d806a36ffac3f70d05daa080879' (2024-01-31) • Updated input 'flatpak': 'github:gmodena/nix-flatpak/09d2dd72de3b9a7ef71f3013a15d34c649b83277' (2024-01-20) → 'github:gmodena/nix-flatpak/30f6cb66a1be2a350b08b13e820122b0f3d4bd81' (2024-01-31) • Updated input 'formatter': 'github:numtide/treefmt-nix/04f25d7bec9fb29d2c3bacaa48a3304840000d36' (2024-01-07) → 'github:numtide/treefmt-nix/c6153c2a3ff4c38d231e3ae99af29b87f1df5901' (2024-01-28) • Updated input 'framework': 'github:hercules-ci/flake-parts/07f6395285469419cf9d078f59b5b49993198c00' (2024-01-11) → 'github:hercules-ci/flake-parts/60c614008eed1d0383d21daac177a3e036192ed8' (2024-01-29) • Updated input 'gaming': 'github:fufexan/nix-gaming/e2abe296c5fb4673207e0c2b45b12507629970e5' (2024-01-16) → 'github:fufexan/nix-gaming/015aeaa26b7eeafb14ed7e01dce74d1f2338157f' (2024-01-31) • Updated input 'gaming/nixpkgs': 'github:NixOS/nixpkgs/eabe8d3eface69f5bb16c18f8662a702f50c20d5' (2024-01-09) → 'github:NixOS/nixpkgs/160b762eda6d139ac10ae081f8f78d640dd523eb' (2024-01-27) • Updated input 'generators': 'github:nix-community/nixos-generators/521fb4cdd8a2e1a00d1adf0fea7135d1faf04234' (2024-01-16) → 'github:nix-community/nixos-generators/896f6589db5b25023b812bbb6c1f5d3a499b1132' (2024-01-24) • Updated input 'hardware': 'github:nixos/nixos-hardware/bee2202bec57e521e3bd8acd526884b9767d7fa0' (2024-01-15) → 'github:nixos/nixos-hardware/f84eaffc35d1a655e84749228cde19922fcf55f1' (2024-01-25) • Updated input 'home-manager': 'github:nix-community/home-manager/85c3b600f660abd86e94cbcd1c46733943197a07' (2024-01-17) → 'github:nix-community/home-manager/10cd9c53115061aa6a0a90aad0b0dde6a999cdb9' (2024-01-19) • Updated input 'impermanence': 'github:nix-community/impermanence/033643a45a4a920660ef91caa391fbffb14da466' (2023-12-27) → 'github:nix-community/impermanence/cd13c2917eaa68e4c49fea0ff9cada45440d7045' (2024-01-30) • Updated input 'index': 'github:Mic92/nix-index-database/49aaeecf41ae0a0944e2c627cb515bcde428a1d1' (2024-01-15) → 'github:Mic92/nix-index-database/c782f2a4f6fc94311ab5ef31df2f1149a1856181' (2024-01-28) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/123b528b1115dc4b132498e16a327e433c32ac60' (2024-01-17) → 'github:NixOS/nixpkgs/6eeeacfaf67dd0f915b438bb3a93cfc89db06b09' (2024-02-01) • Updated input 'nur': 'github:nix-community/NUR/d8cb8b7bc09cf704831caa4cec54d2ab6e5756cd' (2024-01-17) → 'github:nix-community/NUR/006d88080f6b231ea268bb3298f23040eaa8cd1e' (2024-01-31) • Updated input 'sops': 'github:Mic92/sops-nix/87755331580fdf23df7e39b46d63ac88236bf42c' (2024-01-15) → 'github:Mic92/sops-nix/73bf36912e31a6b21af6e0f39218e067283c67ef' (2024-01-28) • Updated input 'stylix': 'github:danth/stylix/9bc1900b6888efdda39c2e02c7c8666911b72608' (2024-01-03) → 'github:danth/stylix/7a7c90015de7454060e103e94bb4e6010b5aa062' (2024-01-28) • Updated input 'stylix/base16-alacritty': 'github:aarowill/base16-alacritty/63d8ae5dfefe5db825dd4c699d0cdc2fc2c3eaf7' (2023-01-21) → 'github:aarowill/base16-alacritty/c95c200b3af739708455a03b5d185d3d2d263c6e' (2023-12-31) • Added input 'stylix/base16-alacritty-yaml': 'github:aarowill/base16-alacritty/63d8ae5dfefe5db825dd4c699d0cdc2fc2c3eaf7' (2023-01-21) • Updated input 'unstable': 'github:NixOS/nixpkgs/612f97239e2cc474c13c9dafa0df378058c5ad8d' (2024-01-21) → 'github:NixOS/nixpkgs/97b17f32362e475016f942bbdfda4a4a72a8a652' (2024-01-29) • Updated input 'vscode': 'github:nix-community/nix-vscode-extensions/d038c5bacf881d1d24bc37017c25c60751f440e9' (2024-01-17) → 'github:nix-community/nix-vscode-extensions/129d9ddaf92f8a0942037aebf99dfa09d31e0dde' (2024-01-31) • Updated input 'vscode-catppuccin/nixpkgs': 'github:NixOS/nixpkgs/ae5c332cbb5827f6b1f02572496b141021de335f' (2024-01-25) → 'github:NixOS/nixpkgs/b0d36bd0a420ecee3bc916c91886caca87c894e9' (2023-12-30) • Updated input 'windows': 'github:emmanuelrosa/erosanix/554942a8cd1b5b338d03ac3eb9ba4bd465e522df' (2024-01-16) → 'github:emmanuelrosa/erosanix/5e7095349da4e29d8727e4245385ca66d99ea810' (2024-01-31) --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: maydayv7 <maydayv7@gmail.com>
Diffstat:
| M | flake.lock | | | 140 | +++++++++++++++++++++++++++++++++++++++++-------------------------------------- |
| M | flake.nix | | | 6 | +++++- |
| M | modules/apps/flatpak.nix | | | 20 | +++++++++++++------- |
3 files changed, 90 insertions(+), 76 deletions(-)
diff --git a/flake.lock b/flake.lock @@ -21,6 +21,22 @@ "base16-alacritty": { "flake": false, "locked": { + "lastModified": 1703982197, + "narHash": "sha256-TNxKbwdiUXGi4Z4chT72l3mt3GSvOcz6NZsUH8bQU/k=", + "owner": "aarowill", + "repo": "base16-alacritty", + "rev": "c95c200b3af739708455a03b5d185d3d2d263c6e", + "type": "github" + }, + "original": { + "owner": "aarowill", + "repo": "base16-alacritty", + "type": "github" + } + }, + "base16-alacritty-yaml": { + "flake": false, + "locked": { "lastModified": 1674275109, "narHash": "sha256-Adwx9yP70I6mJrjjODOgZJjt4OPPe8gJu7UuBboXO4M=", "owner": "aarowill", @@ -31,6 +47,7 @@ "original": { "owner": "aarowill", "repo": "base16-alacritty", + "rev": "63d8ae5dfefe5db825dd4c699d0cdc2fc2c3eaf7", "type": "github" } }, @@ -178,11 +195,11 @@ "yafas": "yafas" }, "locked": { - "lastModified": 1705435319, - "narHash": "sha256-ZEamVBjuNeX3ikaukEe1vjopMGuWDjfP0Cwj+NfM7mY=", + "lastModified": 1706725791, + "narHash": "sha256-3xpRyvxdLK99lPyAXzm5GsjRdtSJJ7uwxXQUPPNNlmY=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "35518e2947b9b640ee8a272404917d87dc8e087c", + "rev": "c609893339987d806a36ffac3f70d05daa080879", "type": "github" }, "original": { @@ -352,11 +369,11 @@ }, "flatpak": { "locked": { - "lastModified": 1705758212, - "narHash": "sha256-96kbUcT7hvFPhs5vHqSLAQOCwsRojlmWa0+VpR6lrrE=", + "lastModified": 1706716715, + "narHash": "sha256-aoUh0585v3mMkqGV+aggvs9uZQdZWSqMEGGVUT1jX38=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "09d2dd72de3b9a7ef71f3013a15d34c649b83277", + "rev": "30f6cb66a1be2a350b08b13e820122b0f3d4bd81", "type": "github" }, "original": { @@ -372,11 +389,11 @@ ] }, "locked": { - "lastModified": 1704649711, - "narHash": "sha256-+qxqJrZwvZGilGiLQj3QbYssPdYCwl7ejwMImgH7VBQ=", + "lastModified": 1706462057, + "narHash": "sha256-7dG1D4iqqt0bEbBqUWk6lZiSqqwwAO0Hd1L5opVyhNM=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "04f25d7bec9fb29d2c3bacaa48a3304840000d36", + "rev": "c6153c2a3ff4c38d231e3ae99af29b87f1df5901", "type": "github" }, "original": { @@ -392,11 +409,11 @@ ] }, "locked": { - "lastModified": 1704982712, - "narHash": "sha256-2Ptt+9h8dczgle2Oo6z5ni5rt/uLMG47UFTR1ry/wgg=", + "lastModified": 1706569497, + "narHash": "sha256-oixb0IDb5eZYw6BaVr/R/1pSoMh4rfJHkVnlgeRIeZs=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "07f6395285469419cf9d078f59b5b49993198c00", + "rev": "60c614008eed1d0383d21daac177a3e036192ed8", "type": "github" }, "original": { @@ -429,11 +446,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1705434512, - "narHash": "sha256-bQJjtlHWU5aOnEtbZfMRuqXvHd5ufQEVATDY0gN4ZCA=", + "lastModified": 1706714349, + "narHash": "sha256-XCWHBWqfCGgP1EY+KWl2xAy1muJN/MTXChiBDbeAb/8=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "e2abe296c5fb4673207e0c2b45b12507629970e5", + "rev": "015aeaa26b7eeafb14ed7e01dce74d1f2338157f", "type": "github" }, "original": { @@ -452,11 +469,11 @@ ] }, "locked": { - "lastModified": 1705400161, - "narHash": "sha256-0MFaNIwwpVWB1N9m7cfHAM2pSVtYESQ7tlHxnDTOhM4=", + "lastModified": 1706085261, + "narHash": "sha256-7PgpHRHyShINcqgevPP1fJ6N8kM5ZSOJnk3QZBrOCQ0=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "521fb4cdd8a2e1a00d1adf0fea7135d1faf04234", + "rev": "896f6589db5b25023b812bbb6c1f5d3a499b1132", "type": "github" }, "original": { @@ -489,11 +506,11 @@ }, "hardware": { "locked": { - "lastModified": 1705312285, - "narHash": "sha256-rd+dY+v61Y8w3u9bukO/hB55Xl4wXv4/yC8rCGVnK5U=", + "lastModified": 1706182238, + "narHash": "sha256-Ti7CerGydU7xyrP/ow85lHsOpf+XMx98kQnPoQCSi1g=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "bee2202bec57e521e3bd8acd526884b9767d7fa0", + "rev": "f84eaffc35d1a655e84749228cde19922fcf55f1", "type": "github" }, "original": { @@ -509,11 +526,11 @@ ] }, "locked": { - "lastModified": 1705476964, - "narHash": "sha256-W5OK1fnj4qdn1HWOlxV2S3YiUvfaVjQM5ldWVpGV1fs=", + "lastModified": 1705659542, + "narHash": "sha256-WA3xVfAk1AYmFdwghT7mt/erYpsU6JPu9mdTEP/e9HQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "85c3b600f660abd86e94cbcd1c46733943197a07", + "rev": "10cd9c53115061aa6a0a90aad0b0dde6a999cdb9", "type": "github" }, "original": { @@ -525,11 +542,11 @@ }, "impermanence": { "locked": { - "lastModified": 1703656108, - "narHash": "sha256-hCSUqdFJKHHbER8Cenf5JRzjMlBjIdwdftGQsO0xoJs=", + "lastModified": 1706639736, + "narHash": "sha256-CaG4j9+UwBDfinxxvJMo6yOonSmSo0ZgnbD7aj2Put0=", "owner": "nix-community", "repo": "impermanence", - "rev": "033643a45a4a920660ef91caa391fbffb14da466", + "rev": "cd13c2917eaa68e4c49fea0ff9cada45440d7045", "type": "github" }, "original": { @@ -545,11 +562,11 @@ ] }, "locked": { - "lastModified": 1705282324, - "narHash": "sha256-LnURMA7yCM5t7et9O2+2YfGQh0FKAfE5GyahNDDzJVM=", + "lastModified": 1706411424, + "narHash": "sha256-BzziJYucEZvdCE985vjPoo3ztWcmUiSQ1wJ2CoT6jCc=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "49aaeecf41ae0a0944e2c627cb515bcde428a1d1", + "rev": "c782f2a4f6fc94311ab5ef31df2f1149a1856181", "type": "github" }, "original": { @@ -560,11 +577,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1704842529, - "narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=", + "lastModified": 1706367331, + "narHash": "sha256-AqgkGHRrI6h/8FWuVbnkfFmXr4Bqsr4fV23aISqj/xg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eabe8d3eface69f5bb16c18f8662a702f50c20d5", + "rev": "160b762eda6d139ac10ae081f8f78d640dd523eb", "type": "github" }, "original": { @@ -592,11 +609,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1705488716, - "narHash": "sha256-WW6pe/UFAPfnQ7dNTDY8mp7VYjZiBGAelHGNSy3kG4s=", + "lastModified": 1706747148, + "narHash": "sha256-fOwHK+cjfYL5vo8epmbSefChzlsQx6QLjch2xezx1Rc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "123b528b1115dc4b132498e16a327e433c32ac60", + "rev": "6eeeacfaf67dd0f915b438bb3a93cfc89db06b09", "type": "github" }, "original": { @@ -606,29 +623,13 @@ "type": "github" } }, - "nixpkgs_3": { - "locked": { - "lastModified": 1706191920, - "narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ae5c332cbb5827f6b1f02572496b141021de335f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nur": { "locked": { - "lastModified": 1705486356, - "narHash": "sha256-L3jttQvRGNx85oxzt/Uyyfzf0KQnOQfCB0dHUErtcLs=", + "lastModified": 1706741181, + "narHash": "sha256-3HtpuacqZ8dEFYGWBFWt8LEGMwl9t9uyOUp3OuThGPM=", "owner": "nix-community", "repo": "NUR", - "rev": "d8cb8b7bc09cf704831caa4cec54d2ab6e5756cd", + "rev": "006d88080f6b231ea268bb3298f23040eaa8cd1e", "type": "github" }, "original": { @@ -752,11 +753,11 @@ ] }, "locked": { - "lastModified": 1705356877, - "narHash": "sha256-274jL1cH64DcXUXebVMZBRUsTs3FvFlPIPkCN/yhSnI=", + "lastModified": 1706410821, + "narHash": "sha256-iCfXspqUOPLwRobqQNAQeKzprEyVowLMn17QaRPQc+M=", "owner": "Mic92", "repo": "sops-nix", - "rev": "87755331580fdf23df7e39b46d63ac88236bf42c", + "rev": "73bf36912e31a6b21af6e0f39218e067283c67ef", "type": "github" }, "original": { @@ -769,6 +770,7 @@ "inputs": { "base16": "base16", "base16-alacritty": "base16-alacritty", + "base16-alacritty-yaml": "base16-alacritty-yaml", "base16-fish": "base16-fish", "base16-foot": "base16-foot", "base16-helix": "base16-helix", @@ -784,11 +786,11 @@ ] }, "locked": { - "lastModified": 1704308480, - "narHash": "sha256-88ICCdJyYYtsolRnPhI9IF+bhUIVUyhJ7nrKcKPgf6M=", + "lastModified": 1706466685, + "narHash": "sha256-R6D+3wBQvn7sCZLbM3WrHbKtVNSflkruGQ/5bHfslhg=", "owner": "danth", "repo": "stylix", - "rev": "9bc1900b6888efdda39c2e02c7c8666911b72608", + "rev": "7a7c90015de7454060e103e94bb4e6010b5aa062", "type": "github" }, "original": { @@ -904,11 +906,11 @@ ] }, "locked": { - "lastModified": 1705454446, - "narHash": "sha256-Cx1ejwt9I8CGnRXU9jliJpwcfF1voADXQw7CNTIM280=", + "lastModified": 1706663720, + "narHash": "sha256-nPstfigc9FdWIwbtZcwfAjEP5fsI171CDMQ7rJdg0ok=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "d038c5bacf881d1d24bc37017c25c60751f440e9", + "rev": "129d9ddaf92f8a0942037aebf99dfa09d31e0dde", "type": "github" }, "original": { @@ -919,7 +921,9 @@ }, "vscode-catppuccin": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1704923501, @@ -963,11 +967,11 @@ ] }, "locked": { - "lastModified": 1705417837, - "narHash": "sha256-SADtjpWIBWNbgInjnSblx2lhOGHDLAX2j90uDC8WVQs=", + "lastModified": 1706705327, + "narHash": "sha256-QZ1F4CrHHen4thH9XLCjdlHGF4qWWf8GsjQkDMY1z5U=", "owner": "emmanuelrosa", "repo": "erosanix", - "rev": "554942a8cd1b5b338d03ac3eb9ba4bd465e522df", + "rev": "5e7095349da4e29d8727e4245385ca66d99ea810", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix @@ -157,7 +157,6 @@ flatpak.url = "github:gmodena/nix-flatpak"; # VS Code Extensions - vscode-catppuccin.url = "github:catppuccin/vscode"; vscode = { url = "github:nix-community/nix-vscode-extensions"; inputs = { @@ -166,6 +165,11 @@ }; }; + vscode-catppuccin = { + url = "github:catppuccin/vscode"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + # Windows VM Creator wfvm = { url = "git+https://git.m-labs.hk/M-Labs/wfvm"; diff --git a/modules/apps/flatpak.nix b/modules/apps/flatpak.nix @@ -21,13 +21,6 @@ in { environment.persist.directories = ["/var/lib/flatpak"]; user.persist.directories = [".cache/flatpak" ".local/share/flatpak" ".var/app"]; - #!# TODO #!# - # Use system Dconf Settings - /* - [Environment] - DCONF_USER_CONFIG_DIR=.config/dconf - */ - services.flatpak = { enable = true; @@ -55,6 +48,19 @@ in { */ ]; + # Platform Integration + overrides.global = { + Context = { + sockets = ["wayland" "!x11" "fallback-x11"]; + filesystems = ["~/.config/dconf:ro"]; + }; + + Environment = { + DCONF_USER_CONFIG_DIR = ".config/dconf"; + XCURSOR_PATH = "/run/host/user-share/icons:/run/host/share/icons"; + }; + }; + # Package Updates update = { onActivation = false;