From d554c8fbf2478a4844f641e816a77ded71bfb1ef Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Thu, 16 May 2024 15:52:35 -0400 Subject: [PATCH 01/16] fix(hyprland): use correct cursor theme in all apps --- user/modules/hyprland.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/user/modules/hyprland.nix b/user/modules/hyprland.nix index 6e525a9..2903777 100644 --- a/user/modules/hyprland.nix +++ b/user/modules/hyprland.nix @@ -1,7 +1,7 @@ {pkgs, ...}: { imports = [ ./waybar - ./wofi + ./wofi.nix ]; home.packages = with pkgs; [ @@ -95,10 +95,12 @@ name = "Papirus"; package = pkgs.papirus-icon-theme; }; - cursorTheme = { - name = "Adwaita"; - package = pkgs.gnome.adwaita-icon-theme; - size = 24; - }; + }; + + home.pointerCursor = { + gtk.enable = true; + name = "Adwaita"; + package = pkgs.gnome.adwaita-icon-theme; + size = 24; }; } From 809f3267e14b3f1b8893a0c34f36fe8a0909b03b Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Thu, 16 May 2024 15:52:56 -0400 Subject: [PATCH 02/16] fix(hyprland): match mesa version to hyprland version --- modules/hyprland.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/hyprland.nix b/modules/hyprland.nix index 0a3243c..c40980d 100644 --- a/modules/hyprland.nix +++ b/modules/hyprland.nix @@ -4,6 +4,11 @@ package = pkgs.unstable.hyprland; }; + hardware.opengl = { + package = pkgs.unstable.mesa.drivers; + package32 = pkgs.unstable.pkgsi686Linux.mesa.drivers; + }; + services.gnome.gnome-keyring.enable = true; environment.systemPackages = with pkgs; [ From daeb06b7a2ff0329201e5e17ac0a57e7fa2307f7 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Thu, 16 May 2024 15:53:34 -0400 Subject: [PATCH 03/16] feat(hyprland): move to tuigreet --- modules/hyprland.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/modules/hyprland.nix b/modules/hyprland.nix index c40980d..4b7d116 100644 --- a/modules/hyprland.nix +++ b/modules/hyprland.nix @@ -10,15 +10,12 @@ }; services.gnome.gnome-keyring.enable = true; + security.pam.services.greetd.enableGnomeKeyring = true; environment.systemPackages = with pkgs; [ # Theme adw-gtk3 - # Greeter - cage - greetd.gtkgreet - # Applications gnome.nautilus gnome.sushi @@ -42,7 +39,8 @@ enable = true; settings = { default_session = { - command = "cage -s -- gtkgreet --command=Hyprland"; + command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd Hyprland"; + user = "greeter"; }; }; }; From 62b7e887099a50c14bb3e546f712a51851f9ae38 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Thu, 16 May 2024 15:53:43 -0400 Subject: [PATCH 04/16] feat(hyprland): add keyd config --- modules/hyprland.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/modules/hyprland.nix b/modules/hyprland.nix index 4b7d116..a8ed061 100644 --- a/modules/hyprland.nix +++ b/modules/hyprland.nix @@ -35,6 +35,17 @@ # Required for Nautilus to work outside GNOME services.gvfs.enable = true; + # Use CAPSLOCK as Hyper key + services.keyd = { + enable = true; + keyboards.default = { + ids = ["*"]; + settings.main = { + capslock = "overload(meta, esc)"; + }; + }; + }; + services.greetd = { enable = true; settings = { From 7b20ca3586fe6ea81e8397b4be604aec88df9a0d Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Thu, 16 May 2024 15:53:52 -0400 Subject: [PATCH 05/16] feat(nixos): add zellij module --- user/environments/nixos/home.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/user/environments/nixos/home.nix b/user/environments/nixos/home.nix index f31706a..49c5c92 100644 --- a/user/environments/nixos/home.nix +++ b/user/environments/nixos/home.nix @@ -9,6 +9,7 @@ ../../modules/hyprland.nix ../../modules/nvim.nix ../../modules/vscode.nix + ../../modules/zellij ../../modules/zsh.nix ]; From 678563cffec276dd1a89f62a273306287199d2c1 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Thu, 16 May 2024 15:54:07 -0400 Subject: [PATCH 06/16] chore(firefox): update firefox-gnome-theme --- user/modules/firefox.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user/modules/firefox.nix b/user/modules/firefox.nix index e06cb6d..b98aa26 100644 --- a/user/modules/firefox.nix +++ b/user/modules/firefox.nix @@ -5,8 +5,8 @@ source = pkgs.fetchFromGitHub { owner = "rafaelmardojai"; repo = "firefox-gnome-theme"; - rev = "v121"; - hash = "sha256-M+Cw6vh7xCDmIhyVuEPNmaNVUwpmdFQq8zlsXZTKees="; + rev = "v125"; + hash = "sha256-N1BmvredC7xfZhobNOog0+0KrbGXPbQmmmWHT1eOoBw="; }; }; From 0bb07cba5a5a7651bc2184f52ec1508df7e2b072 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Mon, 3 Jun 2024 11:43:54 -0400 Subject: [PATCH 07/16] feat(ironbar): add module --- user/modules/ironbar/default.nix | 80 ++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 user/modules/ironbar/default.nix diff --git a/user/modules/ironbar/default.nix b/user/modules/ironbar/default.nix new file mode 100644 index 0000000..4304611 --- /dev/null +++ b/user/modules/ironbar/default.nix @@ -0,0 +1,80 @@ +{ + inputs, + lib, + ... +}: { + imports = [ + inputs.ironbar.homeManagerModules.default + ]; + + programs.ironbar = { + enable = true; + config = { + "anchor_to_edges" = true; + position = "top"; + start = [ + { + "type" = "workspaces"; + "all_monitors" = false; + # "name_map" = { + # "1" = "󰙯"; + # "2" = "icon:firefox"; + # "3" = ""; + # "Games" = "icon:steam"; + # "Code" = ""; + # }; + favorites = map (x: toString x) (lib.lists.range 1 8); + } + ]; + center = [ + { + type = "clock"; + } + ]; + end = [ + { + type = "volume"; + format = "{icon}"; + max_volume = 100; + icons = { + volume_high = "󰕾"; + volume_medium = "󰖀"; + volume_low = "󰕿"; + muted = "󰝟"; + }; + } + { + type = "notifications"; + show_count = true; + icons = { + closed_none = "󰍥"; + closed_some = "󱥂"; + closed_dnd = "󱅯"; + open_none = "󰍡"; + open_some = "󱥁"; + open_dnd = "󱅮"; + }; + } + ]; + }; + style = ""; + # package = inputs.ironbar; + systemd = false; + }; + + systemd.user.services.ironbar = { + Unit = { + Description = "Systemd service for Ironbar"; + Requires = ["graphical-session.target"]; + }; + + Service = { + Type = "simple"; + ExecStart = "${inputs.ironbar}/bin/ironbar"; + }; + + Install.WantedBy = [ + "hyprland-session.target" + ]; + }; +} From 780ef66712ecf551307a1037484091dede01d8ee Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Mon, 3 Jun 2024 11:44:08 -0400 Subject: [PATCH 08/16] fix(nvim): add prettier as css formatter --- user/modules/nvim/lua/plugins/lsp.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/user/modules/nvim/lua/plugins/lsp.lua b/user/modules/nvim/lua/plugins/lsp.lua index dde9307..abc83d6 100644 --- a/user/modules/nvim/lua/plugins/lsp.lua +++ b/user/modules/nvim/lua/plugins/lsp.lua @@ -58,6 +58,7 @@ return { typescript = { { "prettierd", "prettier" } }, typescriptreact = { { "prettierd", "prettier" } }, yaml = { { "prettierd", "prettier" } }, + css = { { "prettierd", "prettier" } }, }, }, }, From f4c8294ded05bbea027c6266102a8571b11680e0 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Mon, 3 Jun 2024 11:46:47 -0400 Subject: [PATCH 09/16] refactor: use shared module for home environments --- flake.lock | 427 ++++++++++++++++++++++++++++++++++++++++++++++------- flake.nix | 38 +++-- 2 files changed, 393 insertions(+), 72 deletions(-) diff --git a/flake.lock b/flake.lock index 6bf3bb0..2ab7563 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1715101957, - "narHash": "sha256-fs5uVQFTfgb4L9pnhldeyTHNcYwn1U4nKYoCBJ6W3W4=", + "lastModified": 1715290355, + "narHash": "sha256-2T7CHTqBXJJ3ZC6R/4TXTcKoXWHcvubKNj9SfomURnw=", "owner": "ryantm", "repo": "agenix", - "rev": "07479c2e7396acaaaac5925483498154034ea80a", + "rev": "8d37c5bdeade12b6479c85acd133063ab53187a0", "type": "github" }, "original": { @@ -23,6 +23,27 @@ "type": "github" } }, + "crane": { + "inputs": { + "nixpkgs": [ + "ironbar", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1713979152, + "narHash": "sha256-apdecPuh8SOQnkEET/kW/UcfjCRb8JbV5BKjoH+DcP4=", + "owner": "ipetkov", + "repo": "crane", + "rev": "a5eca68a2cf11adb32787fc141cddd29ac8eb79c", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -52,11 +73,11 @@ ] }, "locked": { - "lastModified": 1713946171, - "narHash": "sha256-lc75rgRQLdp4Dzogv5cfqOg6qYc5Rp83oedF2t0kDp8=", + "lastModified": 1715901937, + "narHash": "sha256-eMyvWP56ZOdraC2IOvZo0/RTDcrrsqJ0oJWDC76JTak=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "230a197063de9287128e2c68a7a4b0cd7d0b50a7", + "rev": "ffc01182f90118119930bdfc528c1ee9a39ecef8", "type": "github" }, "original": { @@ -100,14 +121,14 @@ }, "flake-utils": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -118,7 +139,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1710146030, @@ -136,7 +157,25 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { + "inputs": { + "systems": "systems_6" }, "locked": { "lastModified": 1705309234, @@ -152,9 +191,9 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_5": { "inputs": { - "systems": "systems_6" + "systems": "systems_8" }, "locked": { "lastModified": 1681202837, @@ -198,11 +237,11 @@ ] }, "locked": { - "lastModified": 1714043624, - "narHash": "sha256-Xn2r0Jv95TswvPlvamCC46wwNo8ALjRCMBJbGykdhcM=", + "lastModified": 1715381426, + "narHash": "sha256-wPuqrAQGdv3ISs74nJfGb+Yprm23U/rFpcHFFNWgM94=", "owner": "rycee", "repo": "home-manager", - "rev": "86853e31dc1b62c6eeed11c667e8cdd0285d4411", + "rev": "ab5542e9dbd13d0100f8baae2bc2d68af901f4b4", "type": "github" }, "original": { @@ -212,18 +251,190 @@ "type": "github" } }, + "hyprcursor": { + "inputs": { + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1715791817, + "narHash": "sha256-J069Uhv/gCMFLX1dSh2f+9ZTM09r1Nv3oUfocCnWKow=", + "owner": "hyprwm", + "repo": "hyprcursor", + "rev": "7c3aa03dffb53921e583ade3d4ae3f487e390e7e", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprcursor", + "type": "github" + } + }, + "hyprland": { + "inputs": { + "hyprcursor": "hyprcursor", + "hyprlang": "hyprlang", + "hyprwayland-scanner": "hyprwayland-scanner", + "nixpkgs": "nixpkgs", + "systems": "systems_2", + "xdph": "xdph" + }, + "locked": { + "lastModified": 1715898843, + "narHash": "sha256-6m0pykL42d5DXLe6dy31dbE0VlgtTCT3WUqf6pIs3RE=", + "ref": "refs/heads/main", + "rev": "a66cfe0fbed7fb4dc69383e107c2bf3b1e7cd80a", + "revCount": 4709, + "submodules": true, + "type": "git", + "url": "https://github.com/hyprwm/Hyprland" + }, + "original": { + "submodules": true, + "type": "git", + "url": "https://github.com/hyprwm/Hyprland" + } + }, + "hyprland-protocols": { + "inputs": { + "nixpkgs": [ + "hyprland", + "xdph", + "nixpkgs" + ], + "systems": [ + "hyprland", + "xdph", + "systems" + ] + }, + "locked": { + "lastModified": 1691753796, + "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", + "owner": "hyprwm", + "repo": "hyprland-protocols", + "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-protocols", + "type": "github" + } + }, + "hyprlang": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1715791527, + "narHash": "sha256-HhQ4zvGHrRjR63ltySSeg+x+0jb0lepiutWdnFhLRoo=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "969cb076e5b76f2e823aeca1937a3e1f159812ee", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprwayland-scanner": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1715879663, + "narHash": "sha256-/DwglRvj4XF4ECdNtrCIbthleszAZBwOiXG5A6r0K/c=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "f5181a068c1b06f2db51f6222e50a0c665a2b0c3", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, + "ironbar": { + "inputs": { + "crane": "crane", + "naersk": "naersk", + "nixpkgs": [ + "nixpkgs" + ], + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1715799856, + "narHash": "sha256-PPEVVM95PbEkrD+9KEZGWZrlhPqKanPn717l/sdjQsE=", + "owner": "JakeStanger", + "repo": "ironbar", + "rev": "c641b368a5aac7c7fcf97f660b5ee820c724bcdc", + "type": "github" + }, + "original": { + "owner": "JakeStanger", + "repo": "ironbar", + "type": "github" + } + }, + "naersk": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1713520724, + "narHash": "sha256-CO8MmVDmqZX2FovL75pu5BvwhW+Vugc7Q6ze7Hj8heI=", + "owner": "nix-community", + "repo": "naersk", + "rev": "c5037590290c6c7dae2e42e7da1e247e54ed2d49", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "naersk", + "type": "github" + } + }, "nix-vscode-extensions": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1715130616, - "narHash": "sha256-pWwzSphfGbeg/2lmfFo15b2Ykv/JtTXAWydy8dfHv9I=", + "lastModified": 1715822547, + "narHash": "sha256-2t+GMP23RRDfEel4YgaCb/qo6d432eJEFFM+4Rn+8b4=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "f0219364cbf407c76993996a9242b8eda0406b9a", + "rev": "6490ae7fc23e44b455766eb46a90257468596edd", "type": "github" }, "original": { @@ -235,17 +446,17 @@ "nixos-wsl": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1715114695, - "narHash": "sha256-Pw81Wkm8RhCZr17ltsDabFpat1lRltRAszkppBmmdaI=", + "lastModified": 1715888388, + "narHash": "sha256-aoO2kmvBeZ1ADKD5QZDu652IesI4aQ8eOgDFQm7DfA8=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "19c7ae9034389f5a7bbc6b17a7b72289c1c52272", + "rev": "d926f9ff6aa0cafe70b126b20d98086646c166ef", "type": "github" }, "original": { @@ -255,6 +466,36 @@ } }, "nixpkgs": { + "locked": { + "lastModified": 1715787315, + "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1714314149, + "narHash": "sha256-yNAevSKF4krRWacmLUsLK7D7PlfuY3zF0lYnGYNi9vQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "cf8cc1201be8bc71b7cbbbdaf349b22f4f99c7ae", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1713805509, "narHash": "sha256-YgSEan4CcrjivCNO5ZNzhg7/8ViLkZ4CB/GrGBVSudo=", @@ -270,13 +511,13 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs_4": { "locked": { - "lastModified": 1714971268, - "narHash": "sha256-IKwMSwHj9+ec660l+I4tki/1NRoeGpyA2GdtdYpAgEw=", + "lastModified": 1715668745, + "narHash": "sha256-xp62OkRkbUDNUc6VSqH02jB0FbOS+MsfMb7wL1RJOfA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "27c13997bf450a01219899f5a83bd6ffbfc70d3c", + "rev": "9ddcaffecdf098822d944d4147dd8da30b4e6843", "type": "github" }, "original": { @@ -285,7 +526,7 @@ "type": "indirect" } }, - "nixpkgs_3": { + "nixpkgs_5": { "locked": { "lastModified": 1706487304, "narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=", @@ -303,11 +544,11 @@ }, "nur": { "locked": { - "lastModified": 1715211950, - "narHash": "sha256-//YbMDEYB9O8ugYN1nsUQUhbBDFizhdnfHzkRIoc2MM=", + "lastModified": 1715899068, + "narHash": "sha256-dQn+Hv13ln+2d8rbIvGgYMLVGtcZLkghByu0yyRSoVc=", "owner": "nix-community", "repo": "NUR", - "rev": "6580e34800c76147aa5d61cf598123f0de72971c", + "rev": "f1c319a9df9a7d5b0282c3dbc2a0d3fce30270c8", "type": "github" }, "original": { @@ -321,11 +562,13 @@ "agenix": "agenix", "darwin": "darwin_2", "home-manager": "home-manager_2", + "hyprland": "hyprland", + "ironbar": "ironbar", "nix-vscode-extensions": "nix-vscode-extensions", "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_4", "nur": "nur", - "rust-overlay": "rust-overlay", + "rust-overlay": "rust-overlay_2", "unstable": "unstable", "utils": "utils", "vscode-server": "vscode-server" @@ -333,15 +576,37 @@ }, "rust-overlay": { "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_3" + "flake-utils": "flake-utils", + "nixpkgs": [ + "ironbar", + "nixpkgs" + ] }, "locked": { - "lastModified": 1715134005, - "narHash": "sha256-oujsCgNiQnZoQntNkkNkA7BhCmUvf9FLWj+2oGT2Jvc=", + "lastModified": 1714443211, + "narHash": "sha256-lKTA3XqRo4aVgkyTSCtpcALpGXdmkilHTtN00eRg0QU=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a8bfc2569a1965c0da8711d289d973f0011b441a", + "rev": "ce35c36f58f82cee6ec959e0d44c587d64281b6f", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_2": { + "inputs": { + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "lastModified": 1715825775, + "narHash": "sha256-7np2/EEr5Xm8IuKWQ43q8AA1Lb6Us2BW6rYMxGrInIg=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "55f468b3d49c5d3321e85f2f9b1158476a2a90fb", "type": "github" }, "original": { @@ -367,16 +632,16 @@ }, "systems_2": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -440,13 +705,43 @@ "type": "github" } }, + "systems_7": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_8": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "unstable": { "locked": { - "lastModified": 1715087517, - "narHash": "sha256-CLU5Tsg24Ke4+7sH8azHWXKd0CFd4mhLWfhYgUiDBpQ=", + "lastModified": 1715787315, + "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b211b392b8486ee79df6cdfb1157ad2133427a29", + "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5", "type": "github" }, "original": { @@ -457,7 +752,7 @@ }, "utils": { "inputs": { - "systems": "systems_5" + "systems": "systems_7" }, "locked": { "lastModified": 1710146030, @@ -475,7 +770,7 @@ }, "vscode-server": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "nixpkgs": [ "nixpkgs" ] @@ -493,6 +788,36 @@ "repo": "nixos-vscode-server", "type": "github" } + }, + "xdph": { + "inputs": { + "hyprland-protocols": "hyprland-protocols", + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1715788457, + "narHash": "sha256-32HOkjSIyANphV0p5gIwP4ONU/CcinhwOyVFB+tL/d0=", + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "rev": "af7c87a32f5d67eb2ada908a6a700f4e74831943", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 04db89d..3074b99 100644 --- a/flake.nix +++ b/flake.nix @@ -9,6 +9,11 @@ utils.url = "github:numtide/flake-utils"; rust-overlay.url = "github:oxalica/rust-overlay"; nix-vscode-extensions.url = "github:nix-community/nix-vscode-extensions"; + hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; + ironbar = { + url = "github:JakeStanger/ironbar"; + inputs.nixpkgs.follows = "nixpkgs"; + }; agenix = { url = "github:ryantm/agenix"; @@ -72,7 +77,14 @@ nixpkgs.overlays = builtins.attrValues self.overlays; }; - nixosConfigurations = { + nixosConfigurations = let + homeModule = { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.extraSpecialArgs = {inherit inputs;}; + home-manager.users.michael = import ./user/environments/nixos/home.nix; + }; + in { kitchen = nixpkgs.lib.nixosSystem { system = utils.lib.system.x86_64-linux; modules = @@ -80,11 +92,7 @@ ++ [ ./modules/common.nix ./modules/containers.nix - { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users.michael = import ./user/environments/nixos/home.nix; - } + homeModule ./machines/kitchen/configuration.nix ]; @@ -99,11 +107,7 @@ ./modules/common.nix ./modules/hyprland.nix ./modules/containers.nix - { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users.michael = import ./user/environments/nixos/home.nix; - } + homeModule ./machines/thinkcentre/configuration.nix agenix.nixosModules.default @@ -125,11 +129,7 @@ ./modules/hyprland.nix ./modules/containers.nix ./modules/applications/steam - { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users.michael = import ./user/environments/nixos/home.nix; - } + homeModule ./machines/terra/configuration.nix agenix.nixosModules.default @@ -148,11 +148,7 @@ defaultModules ++ [ ./modules/nix.nix - { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users.michael = import ./user/environments/nixos-server/home.nix; - } + homeModule agenix.nixosModules.default { environment.systemPackages = [ From b4b50ab8ae1541e71e3fd79aed6310ba053dbcaa Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Mon, 3 Jun 2024 11:47:20 -0400 Subject: [PATCH 10/16] chore(terra): format --- machines/terra/configuration.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/machines/terra/configuration.nix b/machines/terra/configuration.nix index c4f853c..6443617 100644 --- a/machines/terra/configuration.nix +++ b/machines/terra/configuration.nix @@ -1,8 +1,4 @@ -{ - config, - pkgs, - ... -}: { +{pkgs, ...}: { imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix @@ -13,7 +9,7 @@ networking.firewall = { enable = true; }; - networking.networkmanager.enable=true; + networking.networkmanager.enable = true; # Set your time zone. time.timeZone = "America/New_York"; From 1bf2f497076e982444c902b13956f159d686365e Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Mon, 3 Jun 2024 11:47:35 -0400 Subject: [PATCH 11/16] fix(terra): set nvim as default editor --- machines/terra/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/machines/terra/configuration.nix b/machines/terra/configuration.nix index 6443617..235dc01 100644 --- a/machines/terra/configuration.nix +++ b/machines/terra/configuration.nix @@ -45,6 +45,7 @@ }; programs.zsh.enable = true; + environment.variables.EDITOR = "nvim"; # Define a user account. Don't forget to set a password with ‘passwd’. users.users.michael = { From 66b68354e0b78b83930e1f2de9a220efd4b91bee Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Mon, 3 Jun 2024 11:48:05 -0400 Subject: [PATCH 12/16] feat(terra): add applications for hypermath development --- machines/terra/configuration.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/machines/terra/configuration.nix b/machines/terra/configuration.nix index 235dc01..b8cb976 100644 --- a/machines/terra/configuration.nix +++ b/machines/terra/configuration.nix @@ -51,7 +51,7 @@ users.users.michael = { isNormalUser = true; description = "Michael Thomas"; - extraGroups = ["wheel" "docker" "podman" "adbusers" "dialout"]; + extraGroups = ["wheel" "docker" "podman" "adbusers" "dialout" "libvirtd"]; shell = pkgs.zsh; openssh.authorizedKeys.keys = [ # Neptune @@ -61,6 +61,18 @@ ]; }; + # Enablle libvirtd + virtualisation.libvirtd.enable = true; + boot.kernelModules = ["kvm-amd" "kvm-intel"]; + + environment.systemPackages = with pkgs; [ + obs-studio + virt-manager + # GTK Discord Client + unstable.dissent + kdenlive + ]; + # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It‘s perfectly fine and recommended to leave From c6cc3d79b80416cf4a19e9cee75d69b9442b3b6e Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Mon, 3 Jun 2024 11:48:35 -0400 Subject: [PATCH 13/16] fix(hyprland): support steam --- modules/applications/steam/default.nix | 3 ++- modules/hyprland.nix | 15 +++++++++++---- user/modules/hyprland.nix | 9 +++++++-- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/modules/applications/steam/default.nix b/modules/applications/steam/default.nix index cb00c75..01a2b5f 100644 --- a/modules/applications/steam/default.nix +++ b/modules/applications/steam/default.nix @@ -1,6 +1,7 @@ -{ +{pkgs, ...}: { programs.steam = { enable = true; + package = pkgs.unstable.steam; gamescopeSession.enable = true; }; } diff --git a/modules/hyprland.nix b/modules/hyprland.nix index a8ed061..b4d32fe 100644 --- a/modules/hyprland.nix +++ b/modules/hyprland.nix @@ -1,12 +1,19 @@ -{pkgs, ...}: { +{ + pkgs, + inputs, + ... +}: let + pkgs-hyprland = inputs.hyprland.inputs.nixpkgs.legacyPackages.${pkgs.stdenv.hostPlatform.system}; +in { programs.hyprland = { enable = true; - package = pkgs.unstable.hyprland; + package = inputs.hyprland.packages.${pkgs.system}.hyprland; }; hardware.opengl = { - package = pkgs.unstable.mesa.drivers; - package32 = pkgs.unstable.pkgsi686Linux.mesa.drivers; + package = pkgs-hyprland.mesa.drivers; + driSupport32Bit = true; + package32 = pkgs-hyprland.pkgsi686Linux.mesa.drivers; }; services.gnome.gnome-keyring.enable = true; diff --git a/user/modules/hyprland.nix b/user/modules/hyprland.nix index 2903777..f9cfd24 100644 --- a/user/modules/hyprland.nix +++ b/user/modules/hyprland.nix @@ -1,6 +1,11 @@ -{pkgs, ...}: { +{ + pkgs, + inputs, + ... +}: { imports = [ ./waybar + inputs.hyprland.homeManagerModules.default ./wofi.nix ]; @@ -11,7 +16,7 @@ wayland.windowManager.hyprland = { enable = true; - package = pkgs.unstable.hyprland; + package = inputs.hyprland.packages.${pkgs.system}.hyprland; settings = { "$mod" = "SUPER"; general = { From ece337586c7a3e3340099d9e3b8697390a830479 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Mon, 3 Jun 2024 11:49:05 -0400 Subject: [PATCH 14/16] feat(hyprland): move to ironbar might ultimately move to ags, this is just a stopgap --- user/modules/hyprland.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/user/modules/hyprland.nix b/user/modules/hyprland.nix index f9cfd24..ec71db8 100644 --- a/user/modules/hyprland.nix +++ b/user/modules/hyprland.nix @@ -4,8 +4,9 @@ ... }: { imports = [ - ./waybar inputs.hyprland.homeManagerModules.default + # ./waybar + ./ironbar ./wofi.nix ]; From a9dc2f0f4b0b97c5ddaa86975dd82a75b8f041cb Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Mon, 3 Jun 2024 11:49:42 -0400 Subject: [PATCH 15/16] chore(nvim): update lockfile --- user/modules/nvim/lazy-lock.json | 88 ++++++++++++++------------------ 1 file changed, 37 insertions(+), 51 deletions(-) diff --git a/user/modules/nvim/lazy-lock.json b/user/modules/nvim/lazy-lock.json index 2242f05..dc996a2 100644 --- a/user/modules/nvim/lazy-lock.json +++ b/user/modules/nvim/lazy-lock.json @@ -1,58 +1,44 @@ { - "LazyVim": { "branch": "main", "commit": "9b4675ddde38fdae09978bd7dbdba83ec91f4d80" }, - "LuaSnip": { "branch": "master", "commit": "b152822e1a4bafb6bdf11a16cc26525cbd95ee00" }, - "bufferline.nvim": { "branch": "main", "commit": "73540cb95f8d95aa1af3ed57713c6720c78af915" }, - "catppuccin": { "branch": "main", "commit": "a1439ad7c584efb3d0ce14ccb835967f030450fe" }, + "LazyVim": { "branch": "main", "commit": "b289fea1636eda08d82344dc32a114bca550e375" }, + "bufferline.nvim": { "branch": "main", "commit": "99337f63f0a3c3ab9519f3d1da7618ca4f91cffe" }, + "catppuccin": { "branch": "main", "commit": "5215ea59df6d0a7e27da9a5cd1165e06d1b04cbe" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "conform.nvim": { "branch": "master", "commit": "12b3995537f52ba2810a9857e8ca256881febbda" }, - "crates.nvim": { "branch": "main", "commit": "f00e11e8282b94f2a2e938d32712c99f0e0bdeb4" }, - "dashboard-nvim": { "branch": "master", "commit": "1c8b82c5b02bb890862538be2061e37ef801a99b" }, - "dressing.nvim": { "branch": "master", "commit": "5162edb1442a729a885c45455a07e9a89058be2f" }, - "flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" }, - "friendly-snippets": { "branch": "main", "commit": "d5f74ce4dfdd82848f3f4eac65fe6e29ac5df4c2" }, - "gitsigns.nvim": { "branch": "main", "commit": "9cafac31a091267838e1e90fd6e083d37611f516" }, - "gruvbox.nvim": { "branch": "main", "commit": "6e4027ae957cddf7b193adfaec4a8f9e03b4555f" }, - "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, - "lazy.nvim": { "branch": "main", "commit": "bef521ac89c8d423f9d092e37b58e8af0c099309" }, + "conform.nvim": { "branch": "master", "commit": "7159a23d19fb982269dae2e8147ebbe34965095b" }, + "dashboard-nvim": { "branch": "master", "commit": "7596101deb41192a4f7939d2c4f1a531a984b801" }, + "dressing.nvim": { "branch": "master", "commit": "e3714c8049b2243e792492c4149e4cc395c68eb9" }, + "flash.nvim": { "branch": "main", "commit": "0b85b5ea6eaaebab5e012fab3496102094550686" }, + "friendly-snippets": { "branch": "main", "commit": "e11b09bf10706bb74e16e4c3d11b2274d62e687f" }, + "gitsigns.nvim": { "branch": "main", "commit": "75dc649106827183547d3bedd4602442340d2f7f" }, + "gruvbox.nvim": { "branch": "main", "commit": "f99a08abc5ab0b9b5b0e7a33211a439155c60a61" }, + "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" }, + "lazy.nvim": { "branch": "main", "commit": "b0ba3f9399bf48c86abaa4db1a40bd0b681d5018" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "273fdde8ac5e51f3a223ba70980e52bbc09d9f6f" }, - "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" }, - "mini.ai": { "branch": "main", "commit": "55e9b7217f29e62f734e239bfeed5731a065d801" }, - "mini.bufremove": { "branch": "main", "commit": "931a3bb514147d9e812767275c4beba6b779b1d3" }, - "mini.comment": { "branch": "main", "commit": "f9f1a646fd3d9df7397aa1b9550a875fe8189eb0" }, - "mini.indentscope": { "branch": "main", "commit": "a8274b6ea2d868198d27bd91a31ed5ea3a6a5744" }, - "mini.pairs": { "branch": "main", "commit": "5c975d8f68dc1e11bf4b20ced71e7987ed782513" }, - "mini.surround": { "branch": "main", "commit": "a00d69be09e3fe27dfa9e5b0298410d0e148e3e2" }, - "neo-tree.nvim": { "branch": "v3.x", "commit": "7aad1bf3f6b849cbf108e02c55ad4d701cb4d33a" }, - "neoconf.nvim": { "branch": "main", "commit": "9aeec25740fd009594e63b34b1c0b67f8eb3adce" }, - "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" }, - "no-neck-pain.nvim": { "branch": "main", "commit": "34625be12649666b7ccb08761087cc97bb788552" }, - "noice.nvim": { "branch": "main", "commit": "0cbe3f88d038320bdbda3c4c5c95f43a13c3aa12" }, - "nui.nvim": { "branch": "main", "commit": "cbd2668414331c10039278f558630ed19b93e69b" }, - "nvim-cmp": { "branch": "main", "commit": "8f3c541407e691af6163e2447f3af1bd6e17f9a3" }, - "nvim-lint": { "branch": "master", "commit": "861a04313501563bb1b11f125ae9b7237a517b9b" }, - "nvim-lspconfig": { "branch": "master", "commit": "aa5f4f4ee10b2688fb37fa46215672441d5cd5d9" }, - "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, - "nvim-spectre": { "branch": "master", "commit": "4651801ba37a9407b7257287aec45b6653ffc5e9" }, - "nvim-treesitter": { "branch": "master", "commit": "bbc67f736e22c37c23f2c11a05bfa23b715af30c" }, - "nvim-treesitter-context": { "branch": "master", "commit": "4fe0a54e86859744968e1a5c7867b49c86855774" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "23b820146956b3b681c19e10d3a8bc0cbd9a1d4c" }, - "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "a6382f744f584bbf71d0a563af789af7190aabda" }, - "nvim-web-devicons": { "branch": "master", "commit": "794bba734ec95eaff9bb82fbd112473be2087283" }, - "persistence.nvim": { "branch": "main", "commit": "4982499c1636eac254b72923ab826ee7827b3084" }, - "plenary.nvim": { "branch": "master", "commit": "08e301982b9a057110ede7a735dd1b5285eb341f" }, - "rustaceanvim": { "branch": "master", "commit": "cd35b0f7fb0c9fe6879b084096230a74fefa4da8" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" }, + "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" }, + "mini.ai": { "branch": "main", "commit": "7859b6344f5cee567a94f173859d25e20ba1a77e" }, + "mini.pairs": { "branch": "main", "commit": "40261dfcec7623cd57be3c3beb50fa73f2650cdf" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" }, + "no-neck-pain.nvim": { "branch": "main", "commit": "741ad26c4acc45f2164a3933f7825b0e555b724d" }, + "noice.nvim": { "branch": "main", "commit": "2bf04290b32dc5b1a002a4888c95147bb91ec6f2" }, + "nui.nvim": { "branch": "main", "commit": "b1b3dcd6ed8f355c78bad3d395ff645be5f8b6ae" }, + "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, + "nvim-lint": { "branch": "master", "commit": "1a3a8d047bc01f1760ae4a0f5e80f111ea222e67" }, + "nvim-lspconfig": { "branch": "master", "commit": "74e14808cdb15e625449027019406e1ff6dda020" }, + "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, + "nvim-spectre": { "branch": "master", "commit": "4d22fe03554056de4325762add3e546c77e3a275" }, + "nvim-treesitter": { "branch": "master", "commit": "a80fe081b4c5890980561e0de2458f64aaffbfc7" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "fd41b7ccc5490a3a99c734d1ee418b68d06c48a9" }, + "nvim-ts-autotag": { "branch": "main", "commit": "6eb4120a1aadef07ac312f1c4bc6456712220007" }, + "nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" }, + "persistence.nvim": { "branch": "main", "commit": "5fe077056c821aab41f87650bd6e1c48cd7dd047" }, + "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, - "telescope.nvim": { "branch": "master", "commit": "2d0d057791854decb2c9b6a0b52d43f3900dff40" }, - "todo-comments.nvim": { "branch": "main", "commit": "a7e39ae9e74f2c8c6dc4eea6d40c3971ae84752d" }, - "tokyonight.nvim": { "branch": "main", "commit": "67afeaf7fd6ebba000633e89f63c31694057edde" }, + "telescope.nvim": { "branch": "master", "commit": "dfa230be84a044e7f546a6c2b0a403c739732b86" }, + "todo-comments.nvim": { "branch": "main", "commit": "70a93ce66083699571adc361166504b03cc39c2b" }, + "tokyonight.nvim": { "branch": "main", "commit": "7e5ef71a103e7de5fe6c05f5d6ab97d1640f08cf" }, "tree-sitter-asm": { "branch": "main", "commit": "b0306e9bb2ebe01c6562f1aef265cc42ccc53070" }, - "trouble.nvim": { "branch": "main", "commit": "b9cf677f20bb2faa2dacfa870b084e568dca9572" }, - "vim-illuminate": { "branch": "master", "commit": "e522e0dd742a83506db0a72e1ced68c9c130f185" }, - "vim-startuptime": { "branch": "master", "commit": "ac2cccb5be617672add1f4f3c0a55ce99ba34e01" }, - "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } + "trouble.nvim": { "branch": "main", "commit": "29d1bb81adc847e89ddbbf5b11ff0079daf7cc0a" }, + "which-key.nvim": { "branch": "main", "commit": "4b7167f8fb2dba3d01980735e3509e172c024c29" } } \ No newline at end of file From 9c9960d630777f8e240e4eab29170cc5da66257e Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Mon, 3 Jun 2024 11:49:57 -0400 Subject: [PATCH 16/16] fix(git): add venus server as oauth provider --- user/modules/git_nixos.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/user/modules/git_nixos.nix b/user/modules/git_nixos.nix index 6c76c5f..bdfabd3 100644 --- a/user/modules/git_nixos.nix +++ b/user/modules/git_nixos.nix @@ -5,6 +5,7 @@ credential.helper = "manager"; credential.credentialStore = "secretservice"; credential."git.thomasfmly.org".provider = "generic"; + credential."https://git.s.michaelt.xyz".provider = "generic"; }; };