this is conna have conflicts its so over

This commit is contained in:
2025-10-31 10:12:34 +00:00
parent c48cce4a4a
commit d33d191613
5 changed files with 121 additions and 292 deletions

View File

@@ -118,7 +118,7 @@ in
};
hyprscrolling = {
column_width = 0.9;
follow_focus = true;
follow_focus = false;
fullscreen_on_one_column = true;
};
};

379
flake.lock generated
View File

@@ -10,11 +10,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1760996210,
"narHash": "sha256-SfdiJqxGVOlFw29START445DlujG+HTIwqs297vTRLA=",
"lastModified": 1761238850,
"narHash": "sha256-WGoqR+ULsh1w7yDNAtJiE27HX6zSlGPR4I2pgjAU/SA=",
"owner": "Kirottu",
"repo": "anyrun",
"rev": "c21e7f64af9c04858223a77c71e3936fc936afaa",
"rev": "ae3c499316e9aa568acb3832566a1978ca665748",
"type": "github"
},
"original": {
@@ -79,8 +79,14 @@
},
"aquamarine_2": {
"inputs": {
"hyprutils": "hyprutils_2",
"hyprwayland-scanner": "hyprwayland-scanner_2",
"hyprutils": [
"hyprlauncher",
"hyprutils"
],
"hyprwayland-scanner": [
"hyprlauncher",
"hyprwayland-scanner"
],
"nixpkgs": [
"hyprlauncher",
"nixpkgs"
@@ -104,43 +110,6 @@
"type": "github"
}
},
"aquamarine_3": {
"inputs": {
"hyprutils": [
"hyprlauncher",
"hyprtoolkit",
"hyprutils"
],
"hyprwayland-scanner": [
"hyprlauncher",
"hyprtoolkit",
"hyprwayland-scanner"
],
"nixpkgs": [
"hyprlauncher",
"hyprtoolkit",
"nixpkgs"
],
"systems": [
"hyprlauncher",
"hyprtoolkit",
"systems"
]
},
"locked": {
"lastModified": 1759499898,
"narHash": "sha256-UNzYHLWfkSzLHDep5Ckb5tXc0fdxwPIrT+MY4kpQttM=",
"owner": "hyprwm",
"repo": "aquamarine",
"rev": "655e067f96fd44b3f5685e17f566b0e4d535d798",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "aquamarine",
"type": "github"
}
},
"base16": {
"inputs": {
"fromYaml": "fromYaml"
@@ -232,11 +201,11 @@
"quickshell": "quickshell"
},
"locked": {
"lastModified": 1761036034,
"narHash": "sha256-IVF2YZqatz5QoD63gKBKTVESHc1a87KgntVv53CTXv4=",
"lastModified": 1761208545,
"narHash": "sha256-rlhP4YHqbqSULj/Q3PkaN5mla8btYBBvs/qCiLCGLVM=",
"owner": "caelestia-dots",
"repo": "shell",
"rev": "58ac60c47c9ea44665ea0e7814562a6933721aaf",
"rev": "223207235e41e3476aefae4e9f4a8724dcd02e8b",
"type": "github"
},
"original": {
@@ -275,11 +244,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1760926060,
"narHash": "sha256-pEkdpaEPWkyhWFweRfxkTtofL6QTzKBK4zSn+AZ6dnI=",
"lastModified": 1761392494,
"narHash": "sha256-Xabw0gwVYKY158DyhNlKopAhjAw54wu7Ws0SmVVrjVA=",
"owner": "caelestia-dots",
"repo": "cli",
"rev": "d0f8a06e5959326f04ccf535b1b5c8bd15f6aa89",
"rev": "cc458bf8598c0beab27b5dc4331b0cf2ee654165",
"type": "github"
},
"original": {
@@ -300,11 +269,11 @@
"quickshell": "quickshell_2"
},
"locked": {
"lastModified": 1760837100,
"narHash": "sha256-B4iL67pRKARIPnZGnlV19axKjjW+UfNP1wnlPbxUM6M=",
"lastModified": 1761208545,
"narHash": "sha256-rlhP4YHqbqSULj/Q3PkaN5mla8btYBBvs/qCiLCGLVM=",
"owner": "caelestia-dots",
"repo": "shell",
"rev": "84343dde62f99590cd9e21694065cf70d96d9869",
"rev": "223207235e41e3476aefae4e9f4a8724dcd02e8b",
"type": "github"
},
"original": {
@@ -496,11 +465,11 @@
]
},
"locked": {
"lastModified": 1761005073,
"narHash": "sha256-r6qbieh8iC1q1eCaWv15f4UIp8SeGffwswhNSA1Qk3s=",
"lastModified": 1761395627,
"narHash": "sha256-9wQpgBRW2PzYw1wx+MgCt1IbPAYz93csApLMgSZOJCk=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "84e1adb0cdd13f5f29886091c7234365e12b1e7f",
"rev": "7296022150cd775917e4c831c393026eae7c2427",
"type": "github"
},
"original": {
@@ -569,7 +538,10 @@
},
"hyprgraphics_2": {
"inputs": {
"hyprutils": "hyprutils_3",
"hyprutils": [
"hyprlauncher",
"hyprutils"
],
"nixpkgs": [
"hyprlauncher",
"nixpkgs"
@@ -593,38 +565,6 @@
"type": "github"
}
},
"hyprgraphics_3": {
"inputs": {
"hyprutils": [
"hyprlauncher",
"hyprtoolkit",
"hyprutils"
],
"nixpkgs": [
"hyprlauncher",
"hyprtoolkit",
"nixpkgs"
],
"systems": [
"hyprlauncher",
"hyprtoolkit",
"systems"
]
},
"locked": {
"lastModified": 1759490292,
"narHash": "sha256-T6iWzDOXp8Wv0KQOCTHpBcmAOdHJ6zc/l9xaztW6Ivc=",
"owner": "hyprwm",
"repo": "hyprgraphics",
"rev": "9431db625cd9bb66ac55525479dce694101d6d7a",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprgraphics",
"type": "github"
}
},
"hyprland": {
"inputs": {
"aquamarine": "aquamarine",
@@ -643,11 +583,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1760959370,
"narHash": "sha256-tqZWNOZg9P1gpWiHNGtZTTb/UK+2E5LFmFpfEIArTqE=",
"lastModified": 1761401987,
"narHash": "sha256-fel0Mx/VqZbPRcKg/C3VGgtjCe5uOwcxeF8tY/5MHuw=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "46dab01bcc47b2e29f36cd4d35d04091e4134a67",
"rev": "b6f946991da0bf372df3f9f8f7160ac8514db8b9",
"type": "github"
},
"original": {
@@ -694,11 +634,11 @@
]
},
"locked": {
"lastModified": 1760659005,
"narHash": "sha256-wyS6tXYJuzbwckOeaCoRtT4qIG2UZ0YvSZx7EBNjTV0=",
"lastModified": 1761249285,
"narHash": "sha256-70dEwL5p3CB/00ODs2RHWUKTyafB+PF4Ld7IEMuO+no=",
"owner": "hyprwm",
"repo": "hyprland-plugins",
"rev": "a5a6f93d72d5fb37e78b98c756cfd8b340e71a19",
"rev": "81f6d1426537981fcbb921f8b5e470b1280ef8f3",
"type": "github"
},
"original": {
@@ -896,39 +836,55 @@
"hyprgraphics": "hyprgraphics_2",
"hyprlang": "hyprlang_2",
"hyprtoolkit": "hyprtoolkit",
"hyprutils": "hyprutils_5",
"hyprutils": "hyprutils_2",
"hyprwayland-scanner": "hyprwayland-scanner_2",
"hyprwire": "hyprwire",
"nixpkgs": [
"nixpkgs"
],
"systems": "systems_4"
"systems": "systems_3"
},
"locked": {
"lastModified": 1760889111,
"narHash": "sha256-5xKshH5fVHzqNXjxQMJWJn3maT76fotwCM14Bvp2pRE=",
"owner": "mrfluffy-dev",
"lastModified": 1761304556,
"narHash": "sha256-PR+E11KJekNmAPsW6NA+IyppbVTqjEbF0cRc9S1vgKk=",
"owner": "hyprwm",
"repo": "hyprlauncher",
"rev": "8191f44cf747fe62d4b5860869edbf225402cb42",
"rev": "5dfa71f6193224d1e33d466039f33d611377954a",
"type": "github"
},
"original": {
"owner": "mrfluffy-dev",
"owner": "hyprwm",
"repo": "hyprlauncher",
"type": "github"
}
},
"hyprtoolkit": {
"inputs": {
"aquamarine": "aquamarine_3",
"hyprgraphics": "hyprgraphics_3",
"aquamarine": [
"hyprlauncher",
"aquamarine"
],
"hyprgraphics": [
"hyprlauncher",
"hyprgraphics"
],
"hyprlang": "hyprlang_3",
"hyprutils": "hyprutils_4",
"hyprwayland-scanner": "hyprwayland-scanner_3",
"hyprutils": [
"hyprlauncher",
"hyprutils"
],
"hyprwayland-scanner": [
"hyprlauncher",
"hyprwayland-scanner"
],
"nixpkgs": [
"hyprlauncher",
"nixpkgs"
],
"systems": "systems_3"
"systems": [
"hyprlauncher",
"systems"
]
},
"locked": {
"lastModified": 1760875067,
@@ -970,87 +926,6 @@
}
},
"hyprutils_2": {
"inputs": {
"nixpkgs": [
"hyprlauncher",
"aquamarine",
"nixpkgs"
],
"systems": [
"hyprlauncher",
"aquamarine",
"systems"
]
},
"locked": {
"lastModified": 1755795954,
"narHash": "sha256-9QoDVkjLwjiZDR+y4cMWc/FVudRu5jCIG4rn15Afa9w=",
"owner": "hyprwm",
"repo": "hyprutils",
"rev": "b364dcb7391709acb4492e100fe750ca722992e1",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprutils",
"type": "github"
}
},
"hyprutils_3": {
"inputs": {
"nixpkgs": [
"hyprlauncher",
"hyprgraphics",
"nixpkgs"
],
"systems": [
"hyprlauncher",
"hyprgraphics",
"systems"
]
},
"locked": {
"lastModified": 1756117388,
"narHash": "sha256-oRDel6pNl/T2tI+nc/USU9ZP9w08dxtl7hiZxa0C/Wc=",
"owner": "hyprwm",
"repo": "hyprutils",
"rev": "b2ae3204845f5f2f79b4703b441252d8ad2ecfd0",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprutils",
"type": "github"
}
},
"hyprutils_4": {
"inputs": {
"nixpkgs": [
"hyprlauncher",
"hyprtoolkit",
"nixpkgs"
],
"systems": [
"hyprlauncher",
"hyprtoolkit",
"systems"
]
},
"locked": {
"lastModified": 1759609323,
"narHash": "sha256-5c9sJ4CFdmYJ/EcIUSyzo3CZu3fR+k5r7lnOrtZ8sWA=",
"owner": "hyprwm",
"repo": "hyprutils",
"rev": "9ab64319e95374934aac5406df4e69fee77345ff",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprutils",
"type": "github"
}
},
"hyprutils_5": {
"inputs": {
"nixpkgs": [
"hyprlauncher",
@@ -1075,33 +950,6 @@
"type": "github"
}
},
"hyprutils_6": {
"inputs": {
"nixpkgs": [
"hyprlauncher",
"hyprwire",
"nixpkgs"
],
"systems": [
"hyprlauncher",
"hyprwire",
"systems"
]
},
"locked": {
"lastModified": 1759609323,
"narHash": "sha256-5c9sJ4CFdmYJ/EcIUSyzo3CZu3fR+k5r7lnOrtZ8sWA=",
"owner": "hyprwm",
"repo": "hyprutils",
"rev": "9ab64319e95374934aac5406df4e69fee77345ff",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprutils",
"type": "github"
}
},
"hyprwayland-scanner": {
"inputs": {
"nixpkgs": [
@@ -1131,39 +979,10 @@
"inputs": {
"nixpkgs": [
"hyprlauncher",
"aquamarine",
"nixpkgs"
],
"systems": [
"hyprlauncher",
"aquamarine",
"systems"
]
},
"locked": {
"lastModified": 1751897909,
"narHash": "sha256-FnhBENxihITZldThvbO7883PdXC/2dzW4eiNvtoV5Ao=",
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
"rev": "fcca0c61f988a9d092cbb33e906775014c61579d",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
"type": "github"
}
},
"hyprwayland-scanner_3": {
"inputs": {
"nixpkgs": [
"hyprlauncher",
"hyprtoolkit",
"nixpkgs"
],
"systems": [
"hyprlauncher",
"hyprtoolkit",
"systems"
]
},
@@ -1183,7 +1002,10 @@
},
"hyprwire": {
"inputs": {
"hyprutils": "hyprutils_6",
"hyprutils": [
"hyprlauncher",
"hyprutils"
],
"nixpkgs": [
"hyprlauncher",
"nixpkgs"
@@ -1217,11 +1039,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
},
"locked": {
"lastModified": 1760950171,
"narHash": "sha256-E2ySTu/oK7cYBdAI3tlGP9zVjF4mZgWJ1OZInBCMb00=",
"lastModified": 1761348525,
"narHash": "sha256-V738NRqRVHCug0rPbYmXFAZsQnqmQAurDzu54WY/YIk=",
"owner": "sodiboo",
"repo": "niri-flake",
"rev": "f851a923137c0a54719412146fd63d24b3214e60",
"rev": "34e1de2311cda824f7685f2e2cd9453263ef75d5",
"type": "github"
},
"original": {
@@ -1250,11 +1072,11 @@
"niri-unstable": {
"flake": false,
"locked": {
"lastModified": 1760940149,
"narHash": "sha256-KbM47vD6E0cx+v4jYQZ8mD5N186AKm2CQlyh34TW58U=",
"lastModified": 1761337523,
"narHash": "sha256-j6hQ1B7TJt9irtvt2Kxbrb8pq16C8yv4w+M/Dbghabw=",
"owner": "YaLTeR",
"repo": "niri",
"rev": "b3245b81a6ed8edfaf5388a74d2e0a23c24941e5",
"rev": "4310c20c320d040f3df7a93de4064e452a1876ae",
"type": "github"
},
"original": {
@@ -1367,11 +1189,11 @@
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1760689525,
"narHash": "sha256-Dl0jvgL5NjgCGkQ8PCLmGIisWcbFhGWPqKRyIGJ9uus=",
"lastModified": 1761207985,
"narHash": "sha256-50TyAkVIllvbUtMQSweQ/xrZwnvnTHde3VlCCmKFD7k=",
"owner": "kaylorben",
"repo": "nixcord",
"rev": "81d2f10a849c4312fefa0cf323dce0a1460dcbbe",
"rev": "440351a2fc5e9b726e4f1ea66041512b4340b132",
"type": "github"
},
"original": {
@@ -1428,11 +1250,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1760862643,
"narHash": "sha256-PXwG0TM7Ek87DNx4LbGWuD93PbFeKAJs4FfALtp7Wo0=",
"lastModified": 1761173472,
"narHash": "sha256-m9W0dYXflzeGgKNravKJvTMR4Qqa2MVD11AwlGMufeE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "33c6dca0c0cb31d6addcd34e90a63ad61826b28c",
"rev": "c8aa8cc00a5cb57fada0851a038d35c08a36a2bb",
"type": "github"
},
"original": {
@@ -1444,11 +1266,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1760878510,
"narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=",
"lastModified": 1761114652,
"narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67",
"rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c",
"type": "github"
},
"original": {
@@ -1460,11 +1282,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1760878510,
"narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=",
"lastModified": 1761114652,
"narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67",
"rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c",
"type": "github"
},
"original": {
@@ -1492,11 +1314,11 @@
},
"nixpkgs_5": {
"locked": {
"lastModified": 1760878510,
"narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=",
"lastModified": 1761114652,
"narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67",
"rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c",
"type": "github"
},
"original": {
@@ -1686,7 +1508,7 @@
"gnome-shell": "gnome-shell",
"nixpkgs": "nixpkgs_6",
"nur": "nur",
"systems": "systems_5",
"systems": "systems_4",
"tinted-foot": "tinted-foot",
"tinted-kitty": "tinted-kitty",
"tinted-schemes": "tinted-schemes",
@@ -1753,21 +1575,6 @@
}
},
"systems_4": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default-linux",
"type": "github"
}
},
"systems_5": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -1924,11 +1731,11 @@
"xwayland-satellite-unstable": {
"flake": false,
"locked": {
"lastModified": 1759707084,
"narHash": "sha256-0pkftKs6/LReNvxw7DVTN2AJEheZVgyeK0Aarbagi70=",
"lastModified": 1761345612,
"narHash": "sha256-ph61jGpaonY04jdfQxkBYRgw7ptlNHo7K0W+5kCV/+0=",
"owner": "Supreeeme",
"repo": "xwayland-satellite",
"rev": "a9188e70bd748118b4d56a529871b9de5adb9988",
"rev": "04816e2a3634087db3de39043fcc9db2afcb0c44",
"type": "github"
},
"original": {
@@ -1947,11 +1754,11 @@
]
},
"locked": {
"lastModified": 1761020606,
"narHash": "sha256-XdDpTJHjFqZJ3ss6xzTWYyi3PEObX2fs+kW0Wg/rNDk=",
"lastModified": 1761387499,
"narHash": "sha256-YLKFDesY2QA32Vakj1G2jyNuF5oAqQC783TZkMwC2y4=",
"owner": "0xc000022070",
"repo": "zen-browser-flake",
"rev": "637cb6167da4dbf8ef7f5a50e69933c4f9796095",
"rev": "4894effc217ff851b5f5caad300b016dff59029e",
"type": "github"
},
"original": {

View File

@@ -52,7 +52,7 @@
inputs.hyprland.follows = "hyprland";
};
hyprlauncher = {
url = "github:mrfluffy-dev/hyprlauncher";
url = "github:hyprwm/hyprlauncher";
inputs.nixpkgs.follows = "nixpkgs";
};

View File

@@ -49,9 +49,28 @@ in
vscode = {
enable = true;
profiles.default.extensions = [
pkgs.vscode-extensions.platformio.platformio-vscode-ide
];
# Key fix: dont let the CLI touch ~/.vscode/extensions
mutableExtensionsDir = false;
# (Optional but nice) Use a build with a stable headless CLI:
# package = pkgs.vscodium; # or keep pkgs.vscode
profiles.default = {
extensions = with pkgs.vscode-extensions; [
platformio.platformio-vscode-ide
];
# Optional: keep Code from trying to self-update
# userSettings = {
# "update.mode" = "none";
# "extensions.autoUpdate" = false;
# };
};
# Optional (older HM versions expose these at top-level):
# enableUpdateCheck = false;
# enableExtensionUpdateCheck = false;
};
anyrun = {
@@ -276,6 +295,9 @@ in
# kdePackages.dolphin-plugins
# kdePackages.kde-cli-tools
# resvg # new
adwaita-icon-theme
hicolor-icon-theme
qt6.qtsvg
############################
# Experimental (inputs)

View File

@@ -25,7 +25,7 @@ in
enable = true;
flatpakSupport.enable = true;
};
# kde.enable = true;
kde.enable = true;
qt.enable = true;
vscode.enable = true;