From 55cf784f565ec416b8f36be04ea7d98440e72f6a Mon Sep 17 00:00:00 2001 From: Jordan Holt Date: Fri, 8 Dec 2023 13:20:31 +0000 Subject: [PATCH 1/7] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/5de0b32be6e85dc1a9404c75131316e4ffbc634c' (2023-12-01) → 'github:NixOS/nixpkgs/b4372c4924d9182034066c823df76d6eaf1f4ec4' (2023-12-07) • Updated input 'thunderbird-gnome-theme': 'github:rafaelmardojai/thunderbird-gnome-theme/a899ca12204d19f4834fbd092aa5bb05dc4bd127' (2023-11-06) → 'github:rafaelmardojai/thunderbird-gnome-theme/966e9dd54bd2ce9d36d51cd6af8c3bac7a764a68' (2023-12-06) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 900d1df..511a1b6 100644 --- a/flake.lock +++ b/flake.lock @@ -118,11 +118,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1701389149, - "narHash": "sha256-rU1suTIEd5DGCaAXKW6yHoCfR1mnYjOXQFOaH7M23js=", + "lastModified": 1701952659, + "narHash": "sha256-TJv2srXt6fYPUjxgLAL0cy4nuf1OZD4KuA1TrCiQqg0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5de0b32be6e85dc1a9404c75131316e4ffbc634c", + "rev": "b4372c4924d9182034066c823df76d6eaf1f4ec4", "type": "github" }, "original": { @@ -143,11 +143,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": { From f98d1d546fbebeaebe9d7d736534eba37d4ec839 Mon Sep 17 00:00:00 2001 From: Jordan Holt Date: Fri, 8 Dec 2023 13:28:21 +0000 Subject: [PATCH 2/7] Update mutter triple buffering overlay --- overlays/gnome.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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="; }; }); }); From 1c2ca078c86dff075f7b0374cf2f85ca25da637b Mon Sep 17 00:00:00 2001 From: Jordan Holt Date: Fri, 8 Dec 2023 20:50:27 +0000 Subject: [PATCH 3/7] Add vscode extensions --- modules/editors/vscode.nix | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/modules/editors/vscode.nix b/modules/editors/vscode.nix index 69c4b98..7e58e8e 100644 --- a/modules/editors/vscode.nix +++ b/modules/editors/vscode.nix @@ -11,6 +11,25 @@ in { config = mkIf cfg.enable { 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 = { + "files.autoSave" = "off"; + }; }; }; -} \ No newline at end of file +} From 91103dc0e7a0a7423b552f19b0819e62d0fce5e4 Mon Sep 17 00:00:00 2001 From: Jordan Holt Date: Fri, 8 Dec 2023 20:50:48 +0000 Subject: [PATCH 4/7] Enable vscode on odyssey --- hosts/odyssey/default.nix | 1 + 1 file changed, 1 insertion(+) 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; From 8ddc5c9269b6ebb280412a1ccd614294b352d414 Mon Sep 17 00:00:00 2001 From: Jordan Holt Date: Fri, 8 Dec 2023 21:06:23 +0000 Subject: [PATCH 5/7] Enable Wayland for vscode, add config --- modules/editors/vscode.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/modules/editors/vscode.nix b/modules/editors/vscode.nix index 7e58e8e..01b32e4 100644 --- a/modules/editors/vscode.nix +++ b/modules/editors/vscode.nix @@ -9,6 +9,8 @@ in { }; config = mkIf cfg.enable { + environment.sessionVariables.NIXOS_OZONE_WL = "1"; + home.programs.vscode = { enable = true; extensions = with pkgs.vscode-extensions; [ @@ -19,7 +21,7 @@ in { golang.go graphql.vscode-graphql-syntax mattn.lisp - mkhl.direnv + # mkhl.direnv ms-python.vscode-pylance ms-vscode.cpptools ms-vscode.hexeditor @@ -28,7 +30,18 @@ in { # 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; }; }; }; From 7e591ee7d53c60fb085d0bc4c457c3f3acffe3f9 Mon Sep 17 00:00:00 2001 From: Jordan Holt Date: Fri, 8 Dec 2023 21:06:58 +0000 Subject: [PATCH 6/7] Add GNOME rounded window corner extension --- modules/desktop/gnome.nix | 1 + 1 file changed, 1 insertion(+) 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 From f6b9fb1429949519332e9e7fc333b6dfbc11f9d6 Mon Sep 17 00:00:00 2001 From: Jordan Holt Date: Fri, 8 Dec 2023 22:38:26 +0000 Subject: [PATCH 7/7] Fix formatting --- flake.nix | 2 +- hosts/atlas/hardware-configuration.nix | 3 --- hosts/eos/hardware-configuration.nix | 3 --- hosts/helios/hardware-configuration.nix | 3 --- hosts/odyssey/hardware-configuration.nix | 3 --- 5 files changed, 1 insertion(+), 13 deletions(-) diff --git a/flake.nix b/flake.nix index 90e56ad..bc2f081 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/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