From 437e3d2abe9fed508bf367172cc73e66be2f6f07 Mon Sep 17 00:00:00 2001 From: k Date: Sat, 22 Feb 2025 22:27:13 -0500 Subject: [PATCH 1/5] updates --- flake.lock | 83 ++++++++++++++++++++++++++++-------------------------- flake.nix | 3 +- 2 files changed, 45 insertions(+), 41 deletions(-) diff --git a/flake.lock b/flake.lock index 03cfefd..c144b84 100644 --- a/flake.lock +++ b/flake.lock @@ -53,16 +53,17 @@ "base16-vim": { "flake": false, "locked": { - "lastModified": 1735953590, - "narHash": "sha256-YbQwaApLFJobn/0lbpMKcJ8N5axKlW2QIGkDS5+xoSU=", + "lastModified": 1732806396, + "narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=", "owner": "tinted-theming", "repo": "base16-vim", - "rev": "c2a1232aa2c0ed27dcbf005779bcfe0e0ab5e85d", + "rev": "577fe8125d74ff456cf942c733a85d769afe58b7", "type": "github" }, "original": { "owner": "tinted-theming", "repo": "base16-vim", + "rev": "577fe8125d74ff456cf942c733a85d769afe58b7", "type": "github" } }, @@ -202,19 +203,20 @@ }, "home-manager": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1736373539, - "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", + "lastModified": 1739381933, + "narHash": "sha256-4gvobxITgcrNGfwsVG5a46QzQCX89btIYw23p0ilbcc=", "owner": "nix-community", "repo": "home-manager", - "rev": "bd65bc3cde04c16755955630b344bc9e35272c56", + "rev": "15b59d4191b993ebdfcb1f61b834fced217882ba", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -227,11 +229,11 @@ ] }, "locked": { - "lastModified": 1736785676, - "narHash": "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=", + "lastModified": 1737630279, + "narHash": "sha256-wJQCxyMRc4P26zDrHmZiRD5bbfcJpqPG3e2djdGG3pk=", "owner": "nix-community", "repo": "home-manager", - "rev": "fc52a210b60f2f52c74eac41a8647c1573d2071d", + "rev": "0db5c8bfcce78583ebbde0b2abbc95ad93445f7c", "type": "github" }, "original": { @@ -242,11 +244,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1737751639, - "narHash": "sha256-ZEbOJ9iT72iwqXsiEMbEa8wWjyFvRA9Ugx8utmYbpz4=", + "lastModified": 1738816619, + "narHash": "sha256-5yRlg48XmpcX5b5HesdGMOte+YuCy9rzQkJz+imcu6I=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "dfad538f751a5aa5d4436d9781ab27a6128ec9d4", + "rev": "2eccff41bab80839b1d25b303b53d339fbb07087", "type": "github" }, "original": { @@ -258,37 +260,21 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731755305, - "narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=", - "owner": "NixOS", + "lastModified": 1739206421, + "narHash": "sha256-PwQASeL2cGVmrtQYlrBur0U20Xy07uSWVnFup2PHnDs=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4", + "rev": "44534bc021b85c8d78e465021e21f33b856e2540", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { - "locked": { - "lastModified": 1737672001, - "narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1736798957, "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=", @@ -308,7 +294,7 @@ "inputs": { "home-manager": "home-manager", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "stylix": "stylix" } }, @@ -324,19 +310,20 @@ "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "systems": "systems", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", + "tinted-schemes": "tinted-schemes", "tinted-tmux": "tinted-tmux", "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1737861120, - "narHash": "sha256-V/GWU1BQwbxyZif9RBvwn10S1KX+86uPkkI41KQEcQQ=", + "lastModified": 1739375014, + "narHash": "sha256-0fNbvZ1Dod4rDIfwGnC7CzJ3wRFSF1v5AvNCmNkVgXo=", "owner": "danth", "repo": "stylix", - "rev": "d6951d0b2ffe74e4779a180e9b6a0e17627756e1", + "rev": "e86de61bb8f5f2b6459d0be3e3291ad16db4b777", "type": "github" }, "original": { @@ -394,6 +381,22 @@ "type": "github" } }, + "tinted-schemes": { + "flake": false, + "locked": { + "lastModified": 1737565458, + "narHash": "sha256-y+9cvOA6BLKT0WfebDsyUpUa/YxKow9hTjBp6HpQv68=", + "owner": "tinted-theming", + "repo": "schemes", + "rev": "ae31625ba47aeaa4bf6a98cf11a8d4886f9463d9", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "schemes", + "type": "github" + } + }, "tinted-tmux": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 42694a5..dce55ff 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,8 @@ nixos-hardware.url = "github:NixOS/nixos-hardware/master"; stylix.url = "github:danth/stylix"; nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; - home-manager.url = "github:nix-community/home-manager/release-24.11"; + home-manager.url = "github:nix-community/home-manager"; + home-manager.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = { From 9db98508fb847b2bd0e72a520ec8145acb54c559 Mon Sep 17 00:00:00 2001 From: k Date: Sat, 1 Mar 2025 16:00:40 -0500 Subject: [PATCH 2/5] added bolt and removed activitywatch --- hosts/laptop/configuration.nix | 1 + hosts/laptop/home.nix | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix index f8a3135..9c5849d 100644 --- a/hosts/laptop/configuration.nix +++ b/hosts/laptop/configuration.nix @@ -54,6 +54,7 @@ }; services = { + hardware.bolt = {enable = true;}; pipewire = { enable = true; alsa.enable = true; diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix index b4d59e7..d6d28f9 100644 --- a/hosts/laptop/home.nix +++ b/hosts/laptop/home.nix @@ -40,7 +40,6 @@ services = { syncthing.enable = true; - activitywatch.enable = true; mpd = { enable = true; From 6a600e45aced0c03c327070291fc0bd087ef447f Mon Sep 17 00:00:00 2001 From: k Date: Sat, 1 Mar 2025 16:41:35 -0500 Subject: [PATCH 3/5] testing gitea actions --- .gitea/workflows/nix-fmt.yaml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .gitea/workflows/nix-fmt.yaml diff --git a/.gitea/workflows/nix-fmt.yaml b/.gitea/workflows/nix-fmt.yaml new file mode 100644 index 0000000..38ccfdd --- /dev/null +++ b/.gitea/workflows/nix-fmt.yaml @@ -0,0 +1,22 @@ +name: Format Nix Flake + +on: + push: + branches: [main] + pull_request: + branches: [main] + +jobs: + format: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + + - name: Install Nix + uses: cachix/install-nix-action@v2 + with: + nix_version: '2.18.1' # or desired Nix version + + - name: Format Nix Flake + run: nix fmt From 35313911ab1e775886f1086687cf7abef4f1f628 Mon Sep 17 00:00:00 2001 From: k Date: Sat, 1 Mar 2025 16:44:01 -0500 Subject: [PATCH 4/5] changed name --- .gitea/workflows/nix-fmt.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/nix-fmt.yaml b/.gitea/workflows/nix-fmt.yaml index 38ccfdd..5cac62f 100644 --- a/.gitea/workflows/nix-fmt.yaml +++ b/.gitea/workflows/nix-fmt.yaml @@ -2,9 +2,9 @@ name: Format Nix Flake on: push: - branches: [main] + branches: [master] pull_request: - branches: [main] + branches: [master] jobs: format: From 75e661a2c72969333c73c746731ab8dd441bd79c Mon Sep 17 00:00:00 2001 From: k Date: Sat, 1 Mar 2025 16:56:35 -0500 Subject: [PATCH 5/5] changed action --- .gitea/workflows/{nix-fmt.yaml => nix-check.yaml} | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) rename .gitea/workflows/{nix-fmt.yaml => nix-check.yaml} (62%) diff --git a/.gitea/workflows/nix-fmt.yaml b/.gitea/workflows/nix-check.yaml similarity index 62% rename from .gitea/workflows/nix-fmt.yaml rename to .gitea/workflows/nix-check.yaml index 5cac62f..ae87060 100644 --- a/.gitea/workflows/nix-fmt.yaml +++ b/.gitea/workflows/nix-check.yaml @@ -1,4 +1,4 @@ -name: Format Nix Flake +name: Verify Nix Flake Build on: push: @@ -7,16 +7,13 @@ on: branches: [master] jobs: - format: + verify_build: runs-on: ubuntu-latest - steps: - uses: actions/checkout@v4 - - name: Install Nix uses: cachix/install-nix-action@v2 with: - nix_version: '2.18.1' # or desired Nix version - - - name: Format Nix Flake - run: nix fmt + nix_version: '2.18.1' + - name: Verify Nix Flake + run: nix flake check