diff --git a/flake.lock b/flake.lock index 4a4cef9..8bfb293 100644 --- a/flake.lock +++ b/flake.lock @@ -133,11 +133,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1701539137, - "narHash": "sha256-nVO/5QYpf1GwjvtpXhyxx5M3U/WN0MwBro4Lsk+9mL0=", + "lastModified": 1701952659, + "narHash": "sha256-TJv2srXt6fYPUjxgLAL0cy4nuf1OZD4KuA1TrCiQqg0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "933d7dc155096e7575d207be6fb7792bc9f34f6d", + "rev": "b4372c4924d9182034066c823df76d6eaf1f4ec4", "type": "github" }, "original": { @@ -159,11 +159,11 @@ "thunderbird-gnome-theme": { "flake": false, "locked": { - "lastModified": 1699285862, - "narHash": "sha256-3TQYBJAeQ2fPFxQnD5iKRKKWFlN3GJhz1EkdwE+4m0k=", + "lastModified": 1701889124, + "narHash": "sha256-K+6oh7+J6RDBFkxphY/pzf0B+q5+IY54ZMKZrFSKXlc=", "owner": "rafaelmardojai", "repo": "thunderbird-gnome-theme", - "rev": "a899ca12204d19f4834fbd092aa5bb05dc4bd127", + "rev": "966e9dd54bd2ce9d36d51cd6af8c3bac7a764a68", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c31d3b2..ccd024c 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { - description = "NixOS/Darwin system configuration"; + description = "NixOS system configuration"; inputs = { nixpkgs.url = "nixpkgs/nixos-23.11"; diff --git a/hosts/atlas/hardware-configuration.nix b/hosts/atlas/hardware-configuration.nix index d5cc8ee..c2c666f 100644 --- a/hosts/atlas/hardware-configuration.nix +++ b/hosts/atlas/hardware-configuration.nix @@ -1,6 +1,3 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. { config, lib, pkgs, modulesPath, ... }: { diff --git a/hosts/eos/hardware-configuration.nix b/hosts/eos/hardware-configuration.nix index 4351673..eb82fa6 100644 --- a/hosts/eos/hardware-configuration.nix +++ b/hosts/eos/hardware-configuration.nix @@ -1,6 +1,3 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. { config, lib, pkgs, modulesPath, ... }: { diff --git a/hosts/helios/hardware-configuration.nix b/hosts/helios/hardware-configuration.nix index f8bad89..0ec880a 100644 --- a/hosts/helios/hardware-configuration.nix +++ b/hosts/helios/hardware-configuration.nix @@ -1,6 +1,3 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. { config, lib, pkgs, modulesPath, ... }: { diff --git a/hosts/odyssey/default.nix b/hosts/odyssey/default.nix index 7874e4e..88eec37 100644 --- a/hosts/odyssey/default.nix +++ b/hosts/odyssey/default.nix @@ -125,6 +125,7 @@ with lib.my; }; editors = { neovim.enable = true; + vscode.enable = true; }; security = { gpg.enable = true; diff --git a/hosts/odyssey/hardware-configuration.nix b/hosts/odyssey/hardware-configuration.nix index 7847dcd..bf70cfe 100644 --- a/hosts/odyssey/hardware-configuration.nix +++ b/hosts/odyssey/hardware-configuration.nix @@ -1,6 +1,3 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. { config, lib, pkgs, modulesPath, ... }: let diff --git a/modules/desktop/gnome.nix b/modules/desktop/gnome.nix index 211acd4..caf3e6f 100644 --- a/modules/desktop/gnome.nix +++ b/modules/desktop/gnome.nix @@ -180,6 +180,7 @@ in { gnomeExtensions.pano gnomeExtensions.paperwm # gnomeExtensions.pip-on-top + gnomeExtensions.rounded-window-corners gnomeExtensions.search-light gnomeExtensions.smart-auto-move gnomeExtensions.space-bar diff --git a/modules/editors/vscode.nix b/modules/editors/vscode.nix index 69c4b98..01b32e4 100644 --- a/modules/editors/vscode.nix +++ b/modules/editors/vscode.nix @@ -9,8 +9,40 @@ in { }; config = mkIf cfg.enable { + environment.sessionVariables.NIXOS_OZONE_WL = "1"; + home.programs.vscode = { enable = true; + extensions = with pkgs.vscode-extensions; [ + asvetliakov.vscode-neovim + brettm12345.nixfmt-vscode + coolbear.systemd-unit-file + editorconfig.editorconfig + golang.go + graphql.vscode-graphql-syntax + mattn.lisp + # mkhl.direnv + ms-python.vscode-pylance + ms-vscode.cpptools + ms-vscode.hexeditor + piousdeer.adwaita-theme + # redhat.java + # sumneko.lua + ]; + userSettings = { + "editor.renderLineHighlight" = "none"; + "extensions.experimental.affinity" = { + "asvetliakov.vscode-neovim" = 1; + }; + "files.autoSave" = "off"; + "window.autoDetectColorScheme" = true; + "window.commandCenter" = true; + "window.titleBarStyle" = "custom"; + "workbench.iconTheme" = null; + "workbench.preferredDarkColorTheme" = "Adwaita Dark"; + "workbench.preferredLightColorTheme" = "Adwaita Light"; + "workbench.tree.indent" = 12; + }; }; }; -} \ No newline at end of file +} diff --git a/overlays/gnome.nix b/overlays/gnome.nix index b0d9c09..1d9cc57 100644 --- a/overlays/gnome.nix +++ b/overlays/gnome.nix @@ -4,7 +4,7 @@ self: super: mutter = gsuper.mutter.overrideAttrs (oldAttrs: { src = super.fetchurl { url = "https://gitlab.gnome.org/Community/Ubuntu/mutter/-/archive/triple-buffering-v4-45/mutter-triple-buffering-v4-45.tar.gz"; - sha256 = "E+AdsQdotqlH/kYskl+Fwv0i+UTK7mfdkJ+zlfLdU9o="; + sha256 = "tN+zQ5brk+hc+louIipqPV/Bqft42ghKOzjZZMj5Q8A="; }; }); });