From cc23aeedc655ab8c3d765d0d9c30d04b7766b14a Mon Sep 17 00:00:00 2001 From: Jared Kling Date: Fri, 10 Jan 2025 23:30:44 -0600 Subject: [PATCH] add changes from tito to refactor --- flake.lock | 95 +++++++++++++++++++++++++++++++----- flake.nix | 2 +- hosts/tito/configuration.nix | 6 +-- modules/common.nix | 1 + 4 files changed, 86 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 56ed1f4..c806954 100644 --- a/flake.lock +++ b/flake.lock @@ -66,6 +66,22 @@ "type": "github" } }, + "firefox-gnome-theme": { + "flake": false, + "locked": { + "lastModified": 1734969791, + "narHash": "sha256-A9PxLienMYJ/WUvqFie9qXrNC2MeRRYw7TG/q7DRjZg=", + "owner": "rafaelmardojai", + "repo": "firefox-gnome-theme", + "rev": "92f4890bd150fc9d97b61b3583680c0524a8cafe", + "type": "github" + }, + "original": { + "owner": "rafaelmardojai", + "repo": "firefox-gnome-theme", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -161,11 +177,11 @@ "zig": "zig" }, "locked": { - "lastModified": 1736031329, - "narHash": "sha256-jKWHpdlWyN8fa/1MvSRX2qVf+ZBJLu8NsH7T9xK4WRo=", + "lastModified": 1736210320, + "narHash": "sha256-QnDkQ/s1OWmPj1f+7MFNxQiAPJdHbI1Aft7yM5I+8gQ=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "0306c592a7dbaa394da481ab2219b3bcd2b8b48f", + "rev": "a3837a1e4ee06a183f32d4a622c2cdcd51f73fb8", "type": "github" }, "original": { @@ -174,6 +190,59 @@ "type": "github" } }, + "git-hooks": { + "inputs": { + "flake-compat": [ + "stylix", + "flake-compat" + ], + "gitignore": "gitignore", + "nixpkgs": [ + "stylix", + "nixpkgs" + ], + "nixpkgs-stable": [ + "stylix", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1731363552, + "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "stylix", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "gnome-shell": { "flake": false, "locked": { @@ -236,11 +305,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1735669367, - "narHash": "sha256-tfYRbFhMOnYaM4ippqqid3BaLOXoFNdImrfBfCp4zn0=", + "lastModified": 1736061677, + "narHash": "sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60=", "owner": "nixos", "repo": "nixpkgs", - "rev": "edf04b75c13c2ac0e54df5ec5c543e300f76f1c9", + "rev": "cbd8ec4de4469333c82ff40d057350c30e9f7d36", "type": "github" }, "original": { @@ -328,11 +397,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1735844895, - "narHash": "sha256-CIRlqX9tBK2awJkmVu2cKuap/0QziDXStQZ/u/+e8Z4=", + "lastModified": 1736203741, + "narHash": "sha256-eSjkBwBdQk+TZWFlLbclF2rAh4JxbGg8az4w/Lfe7f4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "24d89184adf76d7ccc99e659dc5f3838efb5ee32", + "rev": "c9c88f08e3ee495e888b8d7c8624a0b2519cb773", "type": "github" }, "original": { @@ -347,8 +416,10 @@ "base16-fish": "base16-fish", "base16-helix": "base16-helix", "base16-vim": "base16-vim", + "firefox-gnome-theme": "firefox-gnome-theme", "flake-compat": "flake-compat_2", "flake-utils": "flake-utils_2", + "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", "nixpkgs": "nixpkgs_3", @@ -358,11 +429,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1734110444, - "narHash": "sha256-fp1iV2JldCSvz+7ODzXYUkQ+H7zyiWw5E0MQ4ILC4vw=", + "lastModified": 1736203541, + "narHash": "sha256-ucHJzVv3lGxq7v+snqs/rDNwojVyvBHxwQ5yE2qNfNc=", "owner": "danth", "repo": "stylix", - "rev": "9015d5d0d5d100f849129c43d257b827d300b089", + "rev": "45af2a43aaaf05dfb8839dc827c2e2b0d98375da", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b153fc2..da1490c 100644 --- a/flake.nix +++ b/flake.nix @@ -20,7 +20,7 @@ # ============ NixOS Configuration ============ # tito = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = {inherit inputs username stylix;}; + specialArgs = {inherit inputs username stylix ghostty ;}; modules = [ stylix.nixosModules.stylix sops-nix.nixosModules.sops diff --git a/hosts/tito/configuration.nix b/hosts/tito/configuration.nix index 0b87153..7f10407 100644 --- a/hosts/tito/configuration.nix +++ b/hosts/tito/configuration.nix @@ -5,6 +5,7 @@ inputs, username, stylix, + ghostty, ... }: { imports = [ @@ -56,9 +57,4 @@ stylix.cursor.name = "Vimix-Cursors"; system.stateVersion = "23.11"; - # ============= Maybe common ============= # - hardware.opengl = { - enable = true; - }; - } diff --git a/modules/common.nix b/modules/common.nix index 44521ef..49242c2 100644 --- a/modules/common.nix +++ b/modules/common.nix @@ -38,6 +38,7 @@ hardware.bluetooth.enable = true; hardware.pulseaudio.enable = false; + hardware.graphics.enable = true; environment.variables = { EDITOR = "nvim";