global: update dependencies

brckd · Jun 23, 2024 · 447496b · 447496b
1 parent 3e6cd46
commit 447496b
Show file tree

Hide file tree

Showing 10 changed files with 174 additions and 182 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -116,10 +116,30 @@
       inputs.flake-parts.follows = "flake-parts";
     };
 
+		# Development
+
     flake-compat.url = "github:edolstra/flake-compat";
 
     flake-utils.url = "github:numtide/flake-utils";
 
+		gitignore = {
+			url = "github:hercules-ci/gitignore";
+			inputs.nixpkgs.follows = "nixpkgs";
+		};
+
+		git-hooks = {
+			url = "github:cachix/git-hooks.nix";
+			inputs.flake-compat.follows = "flake-compat";
+			inputs.gitignore.follows = "gitignore";
+			inputs.nixpkgs.follows = "nixpkgs";
+		};
+
+		devshell = {
+			url = "github:numtide/devshell";
+			inputs.nixpkgs.follows = "nixpkgs";
+			inputs.flake-utils.follows = "flake-utils";
+		};
+
     # Formatter
     treefmt-nix = {
       url = "github:numtide/treefmt-nix";
@@ -129,9 +149,8 @@
     pre-commit-hooks = {
       url = "github:cachix/pre-commit-hooks.nix";
       inputs.nixpkgs.follows = "nixpkgs";
-      inputs.nixpkgs-stable.follows = "nixpkgs";
       inputs.flake-compat.follows = "flake-compat";
-      inputs.flake-utils.follows = "flake-utils";
+			inputs.gitignore.follows = "gitignore";
     };
 
     # Scheming
@@ -148,9 +167,11 @@
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.flake-compat.follows = "flake-compat";
       inputs.flake-parts.follows = "flake-parts";
-      inputs.pre-commit-hooks.follows = "pre-commit-hooks";
       inputs.home-manager.follows = "home-manager";
       inputs.nix-darwin.follows = "nix-darwin";
+			inputs.treefmt-nix.follows = "treefmt-nix";
+			inputs.devshell.follows = "devshell";
+			inputs.git-hooks.follows = "git-hooks";
     };
 
     ags = {
@@ -175,7 +196,7 @@
       flake = false;
     };
     nixos-symbolic = {
-      url = "file+https://raw.githubusercontent.com/NixOS/nixos-artwork/master/logo/white.svg";
+      url = "file+https://raw.githubusercontent.com/NixOS/nixos-artwork/master/logo/nixos-white.svg";
       flake = false;
     };
   };

diff --git a/modules/home/default.nix b/modules/home/default.nix
@@ -3,7 +3,7 @@
   ags,
   ...
 }: {
-  home.stateVersion = "23.11";
+  home.stateVersion = "24.05";
   programs.home-manager.enable = true;
 
   imports = [
@@ -18,8 +18,6 @@
     ./kitty
     ./nixvim
     ./librewolf
-    ./fastfetch
-    ./spotify-player
     ./cava
     ./vesktop
   ];

diff --git a/modules/home/fastfetch/default.nix b/modules/home/fastfetch/default.nix
diff --git a/modules/home/nixvim/default.nix b/modules/home/nixvim/default.nix
@@ -55,7 +55,7 @@ in {
         lsp = {
           enable = true;
           servers = {
-            nil_ls.enable = true;
+            nil-ls.enable = true;
             tsserver.enable = true;
             eslint.enable = true;
             rust-analyzer = {

diff --git a/modules/home/spotify-player/default.nix b/modules/home/spotify-player/default.nix
diff --git a/modules/home/stylix/default.nix b/modules/home/stylix/default.nix
@@ -5,9 +5,8 @@
 }: {
   config = {
     stylix = {
-      # placeholder
+			enable = true;
       image = wallpaper;
-
       base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
       fonts = rec {
         sansSerif = {

diff --git a/modules/nixos/hyprland/default.nix b/modules/nixos/hyprland/default.nix
@@ -1,18 +1,13 @@
 {
   config,
-  pkgs,
   lib,
   ...
 }:
 with lib; let
   cfg = config.programs.hyprland;
 in {
   config = mkIf cfg.enable {
-    hardware.opengl = {
-      enable = true;
-      driSupport = true;
-    };
-
+    hardware.graphics.enable = true;
     environment.sessionVariables.NIXOS_OZONE_WL = "1";
   };
 }
diff --git a/modules/nixos/sddm/default.nix b/modules/nixos/sddm/default.nix
@@ -5,10 +5,10 @@
   ...
 }:
 with lib; let
-  cfg = config.services.xserver.displayManager.sddm;
+  cfg = config.services.displayManager.sddm;
 in {
   config = mkIf cfg.enable {
-    services.xserver.displayManager.sddm = {
+    services.displayManager.sddm = {
       theme = "catppuccin-sddm-corners";
       wayland.enable = true;
     };

diff --git a/modules/nixos/stylix/default.nix b/modules/nixos/stylix/default.nix
@@ -5,6 +5,7 @@
 }: {
   config = {
     stylix = {
+			enable = true;
       image = wallpaper;
       base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
       fonts = rec {