From af67c443ad93cf31fe89746f96ebd30f8e5b6761 Mon Sep 17 00:00:00 2001 From: installer Date: Mon, 10 Mar 2025 10:30:40 +0100 Subject: [PATCH] sdjsabnjkankcnzxckja --- .vscode/bookmarks.code-snippets | 8 ++ .vscode/settings.json | 4 +- flake.lock | 117 ++++++++++++++---- hosts/garand-laptop/config.nix | 2 +- hosts/garand-laptop/config/nixpkgs.nix | 4 +- .../codium.nix} | 14 +-- hosts/garand-laptop/home/programs.nix | 2 +- 7 files changed, 115 insertions(+), 36 deletions(-) rename hosts/garand-laptop/config/{nixpkgs.codium.nix => nixpkgs/codium.nix} (97%) diff --git a/.vscode/bookmarks.code-snippets b/.vscode/bookmarks.code-snippets index e0d82a9..5409f1f 100644 --- a/.vscode/bookmarks.code-snippets +++ b/.vscode/bookmarks.code-snippets @@ -61,5 +61,13 @@ " ];", "};" ] + }, + "nix-config": { + "scope": "nix", + "prefix": "nix-config", + "description": "Config do pluku .nix", + "body": [ + "{pkgs, ...}: {}" + ] } } \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 3fe1e41..bc25598 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -18,7 +18,9 @@ }, "editor.formatOnPaste": true, "editor.formatOnSave": true, - "editor.defaultFormatter": "jnoortheen.nix-ide", + "[nix]": { + "editor.defaultFormatter": "jnoortheen.nix-ide", + }, "[json]": { "editor.defaultFormatter": "vscode.json-language-features" } diff --git a/flake.lock b/flake.lock index 8e59abf..a0ef2af 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1739098586, - "narHash": "sha256-08FW+tVGWQKdiPZqXk6FO1JNB/Zybi7IYSWSGpp8V0Y=", + "lastModified": 1740813555, + "narHash": "sha256-GvkG6zoBsWgI7pbt92NZjGcOZMYC1C6pW8Lc4W1xMBU=", "owner": "AdnanHodzic", "repo": "auto-cpufreq", - "rev": "e6bbd2c8335a33f25a3fcb3bd2376e790f460ba2", + "rev": "6be154724337fa74236ee811150872304db21d8b", "type": "github" }, "original": { @@ -96,11 +96,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1739909849, - "narHash": "sha256-BdW/c3AaLtjkF9tisUY4a7YWvKhj4qszwOnvUGXSN4Y=", + "lastModified": 1741379467, + "narHash": "sha256-f314Ke28BGoVh4TK8FCzlPZgOl+oV7PvLyPF++ln9M4=", "owner": "rycee", "repo": "nur-expressions", - "rev": "5d1218489601a269098a180203f4f6d4db3746b9", + "rev": "0b95936d94ea2a3ce66538f299351cf0b491aa15", "type": "gitlab" }, "original": { @@ -127,7 +127,6 @@ } }, "flake-compat": { - "flake": false, "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -142,6 +141,28 @@ "type": "github" } }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "stylix", + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1629284811, @@ -207,11 +228,11 @@ ] }, "locked": { - "lastModified": 1735882644, - "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", + "lastModified": 1737465171, + "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", + "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", "type": "github" }, "original": { @@ -266,11 +287,11 @@ ] }, "locked": { - "lastModified": 1739913864, - "narHash": "sha256-WhzgQjadrwnwPJQLLxZUUEIxojxa7UWDkf7raAkB1Lw=", + "lastModified": 1741378606, + "narHash": "sha256-ytDmwV93lZ1f6jswJkxEQz5cBlwje/2rH/yUZDADZNs=", "owner": "nix-community", "repo": "home-manager", - "rev": "97ac0801d187b2911e8caa45316399de12f6f199", + "rev": "95711f926676018d279ba09fe7530d03b5d5b3e2", "type": "github" }, "original": { @@ -282,11 +303,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739736696, - "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=", + "lastModified": 1741246872, + "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f", + "rev": "10069ef4cf863633f57238f179a0297de84bd8d3", "type": "github" }, "original": { @@ -296,6 +317,29 @@ "type": "github" } }, + "nur": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": [ + "stylix", + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1740408283, + "narHash": "sha256-2xECnhgF3MU9YjmvOkrRp8wRFo2OjjewgCtlfckhL5s=", + "owner": "nix-community", + "repo": "NUR", + "rev": "496a4a11162bdffb9a7b258942de138873f019f7", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NUR", + "type": "github" + } + }, "root": { "inputs": { "auto-cpufreq": "auto-cpufreq", @@ -322,6 +366,7 @@ "nixpkgs": [ "nixpkgs" ], + "nur": "nur", "systems": "systems", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", @@ -330,11 +375,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1739909171, - "narHash": "sha256-GmuW8XkOF6lSEQBeXzUCyr6tetbbxX8wpNJlwFqT/9E=", + "lastModified": 1741381249, + "narHash": "sha256-lr62m73oNjkSX0ar7tPalTSTzaqCsuZCEYyK8mPbXPU=", "owner": "danth", "repo": "stylix", - "rev": "aeb550add3bfa1ce3ce249c3b3dad71ebb018318", + "rev": "4891f1471b682af073574dc51fa4810f1470ef8f", "type": "github" }, "original": { @@ -395,11 +440,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1737565458, - "narHash": "sha256-y+9cvOA6BLKT0WfebDsyUpUa/YxKow9hTjBp6HpQv68=", + "lastModified": 1740351358, + "narHash": "sha256-Hdk850xgAd3DL8KX0AbyU7tC834d3Lej1jOo3duWiOA=", "owner": "tinted-theming", "repo": "schemes", - "rev": "ae31625ba47aeaa4bf6a98cf11a8d4886f9463d9", + "rev": "a1bc2bd89e693e7e3f5764cfe8114e2ae150e184", "type": "github" }, "original": { @@ -411,11 +456,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1735737224, - "narHash": "sha256-FO2hRBkZsjlIRqzNHCPc/52yxg11kHGA8MEtSun9RwE=", + "lastModified": 1740272597, + "narHash": "sha256-/etfUV3HzAaLW3RSJVwUaW8ULbMn3v6wbTlXSKbcoWQ=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "aead506a9930c717ebf81cc83a2126e9ca08fa64", + "rev": "b6c7f46c8718cc484f2db8b485b06e2a98304cd0", "type": "github" }, "original": { @@ -439,6 +484,28 @@ "repo": "base16-zed", "type": "github" } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "stylix", + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } } }, "root": "root", diff --git a/hosts/garand-laptop/config.nix b/hosts/garand-laptop/config.nix index b371e9b..8c85ff4 100644 --- a/hosts/garand-laptop/config.nix +++ b/hosts/garand-laptop/config.nix @@ -9,7 +9,7 @@ ./config/localization.nix ./config/networking.nix ./config/nixpkgs.nix - ./config/nixpkgs.codium.nix + ./config/nixpkgs/codium.nix ./config/programs.nix ./config/security.nix ./config/services.nix diff --git a/hosts/garand-laptop/config/nixpkgs.nix b/hosts/garand-laptop/config/nixpkgs.nix index 909fb5c..8469474 100644 --- a/hosts/garand-laptop/config/nixpkgs.nix +++ b/hosts/garand-laptop/config/nixpkgs.nix @@ -111,7 +111,7 @@ alejandra tutanota-desktop ookla-speedtest - rustdesk + # rustdesk bun docker docker-compose @@ -139,6 +139,8 @@ lutris gambit-chess firefoxpwa + tty-solitaire + nextcloud-client ]; }; } diff --git a/hosts/garand-laptop/config/nixpkgs.codium.nix b/hosts/garand-laptop/config/nixpkgs/codium.nix similarity index 97% rename from hosts/garand-laptop/config/nixpkgs.codium.nix rename to hosts/garand-laptop/config/nixpkgs/codium.nix index 536e9e3..f6efc11 100644 --- a/hosts/garand-laptop/config/nixpkgs.codium.nix +++ b/hosts/garand-laptop/config/nixpkgs/codium.nix @@ -25,7 +25,7 @@ ms-azuretools.vscode-docker ms-python.debugpy ms-python.flake8 - ms-python.python + # ms-python.python ms-python.vscode-pylance njpwerner.autodocstring octref.vetur @@ -42,6 +42,12 @@ yoavbls.pretty-ts-errors ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ + { + name = "python"; + publisher = "ms-python"; + version = "2025.3.2025030601"; + hash = "sha256-xK9esQjcdDz8pNgGjB3HUKpwySSykNTXo3ubDW0nBR8="; + } { name = "goto-alias"; publisher = "antfu"; @@ -78,12 +84,6 @@ version = "1.2.7"; hash = "sha256-w3csu6rJm/Z6invC/TR7tx6Aq5DD77VM62nem8/QMlg="; } - { - name = "python-extension-pack"; - publisher = "donjayamanne"; - version = "1.7.0"; - hash = "sha256-ewOw6nMVzNSYddLcCBGKVNvllztFwhEtncE2RFeFcOc="; - } { name = "one-dark-pro-monokai-darker"; publisher = "eserozvataf"; diff --git a/hosts/garand-laptop/home/programs.nix b/hosts/garand-laptop/home/programs.nix index 0518f0e..d7440bd 100644 --- a/hosts/garand-laptop/home/programs.nix +++ b/hosts/garand-laptop/home/programs.nix @@ -104,7 +104,7 @@ in { hide_cursor = true; no_fade_in = false; }; - background = lib.mkDefault [ + background = lib.mkForce [ { path = "/home/${username}/Pictures/Wallpapers/attack-on-titan-mikasa-ackerman.jpg"; blur_passes = 3;