Add huecli

Add python lsp to nvim
Add devshell and envrc
2024-06-04 23:44:05 +02:00 · 2024-06-04 16:09:50 +02:00 · 2024-06-04 12:44:11 +02:00 · 2024-06-04 12:37:37 +02:00
8 changed files with 229 additions and 36 deletions
--- a/.envrc
+++ b/.envrc
@@ -0,0 +1 @@
+use flake
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 result
+.direnv/
--- a/flake.lock
+++ b/flake.lock
@@ -1,8 +1,46 @@
 {
  "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "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_2": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "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"
+      }
+    },
    "ghettoptt": {
      "inputs": {
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
      },
      "locked": {
        "lastModified": 1717379603,
@@ -26,11 +64,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1717316182,
-        "narHash": "sha256-Xi0EpZcu39N0eW7apLjFfUOR9y80toyjYizez7J1wMI=",
+        "lastModified": 1717483170,
+        "narHash": "sha256-Xr/oYk3vmyv2a/nY8o/Wd0MdLsI5vaC38Kris7CWunM=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "9b53a10f4c91892f5af87cf55d08fba59ca086af",
+        "rev": "2cacdd6a27477f1fa46b7026dd806de30f164d3b",
        "type": "github"
      },
      "original": {
@@ -39,17 +77,62 @@
        "type": "github"
      }
    },
-    "nixpkgs": {
+    "huecli": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "poetry2nix": "poetry2nix"
+      },
      "locked": {
-        "lastModified": 1716948383,
-        "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "ad57eef4ef0659193044870c731987a6df5cf56b",
+        "lastModified": 1717513284,
+        "narHash": "sha256-93h1KbVh++U/FncreiMCMBSp/AkOG80Lu3RC27XBfVY=",
+        "ref": "master",
+        "rev": "1affe0fde236e68de6556bb3abc9a03f9c3cb512",
+        "revCount": 6,
+        "type": "git",
+        "url": "https://git.t-juice.club/torjus/huecli"
+      },
+      "original": {
+        "ref": "master",
+        "type": "git",
+        "url": "https://git.t-juice.club/torjus/huecli"
+      }
+    },
+    "nix-github-actions": {
+      "inputs": {
+        "nixpkgs": [
+          "huecli",
+          "poetry2nix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1703863825,
+        "narHash": "sha256-rXwqjtwiGKJheXB43ybM8NwWB8rO2dSRrEqes0S7F5Y=",
+        "owner": "nix-community",
+        "repo": "nix-github-actions",
+        "rev": "5163432afc817cf8bd1f031418d1869e4c9d5547",
        "type": "github"
      },
      "original": {
-        "owner": "NixOS",
+        "owner": "nix-community",
+        "repo": "nix-github-actions",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1717196966,
+        "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
        "ref": "nixos-unstable",
        "repo": "nixpkgs",
        "type": "github"
@@ -88,22 +171,6 @@
      }
    },
    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1716948383,
-        "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "ad57eef4ef0659193044870c731987a6df5cf56b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
      "locked": {
        "lastModified": 1713248628,
        "narHash": "sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U+ISA=",
@@ -119,7 +186,7 @@
        "type": "github"
      }
    },
-    "nixpkgs_4": {
+    "nixpkgs_3": {
      "locked": {
        "lastModified": 1717112898,
        "narHash": "sha256-7R2ZvOnvd9h8fDd65p0JnB7wXfUvreox3xFdYWd1BnY=",
@@ -137,7 +204,7 @@
    },
    "notlistener": {
      "inputs": {
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_2"
      },
      "locked": {
        "lastModified": 1713427933,
@@ -154,11 +221,37 @@
        "url": "https://git.t-juice.club/torjus/notlistener"
      }
    },
+    "poetry2nix": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "nix-github-actions": "nix-github-actions",
+        "nixpkgs": [
+          "huecli",
+          "nixpkgs"
+        ],
+        "systems": "systems_3",
+        "treefmt-nix": "treefmt-nix"
+      },
+      "locked": {
+        "lastModified": 1717171636,
+        "narHash": "sha256-SwqzDI7ddN8SkfJ0moYMRu9iastqI25YAHPpmI2PlYM=",
+        "owner": "nix-community",
+        "repo": "poetry2nix",
+        "rev": "3bad7d0f33e6fd09205a19aab01e10af532198f9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "poetry2nix",
+        "type": "github"
+      }
+    },
    "root": {
      "inputs": {
        "ghettoptt": "ghettoptt",
        "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs_2",
+        "huecli": "huecli",
+        "nixpkgs": "nixpkgs",
        "nixpkgs-stable": "nixpkgs-stable",
        "notlistener": "notlistener",
        "sops-nix": "sops-nix"
@@ -166,15 +259,15 @@
    },
    "sops-nix": {
      "inputs": {
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_3",
        "nixpkgs-stable": "nixpkgs-stable_2"
      },
      "locked": {
-        "lastModified": 1717297459,
-        "narHash": "sha256-cZC2f68w5UrJ1f+2NWGV9Gx0dEYmxwomWN2B0lx0QRA=",
+        "lastModified": 1717455931,
+        "narHash": "sha256-8Q6mKSsto8gaGczXd4G0lvawdAYLa5Dlh3/g4hl5CaM=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "ab2a43b0d21d1d37d4d5726a892f714eaeb4b075",
+        "rev": "d4555e80d80d2fa77f0a44201ca299f9602492a0",
        "type": "github"
      },
      "original": {
@@ -182,6 +275,72 @@
        "repo": "sops-nix",
        "type": "github"
      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "id": "systems",
+        "type": "indirect"
+      }
+    },
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "huecli",
+          "poetry2nix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1715940852,
+        "narHash": "sha256-wJqHMg/K6X3JGAE9YLM0LsuKrKb4XiBeVaoeMNlReZg=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "2fba33a182602b9d49f0b2440513e5ee091d838b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
    }
  },
  "root": "root",
--- a/flake.nix
+++ b/flake.nix
@@ -11,7 +11,14 @@
    };
    sops-nix.url = "github:Mic92/sops-nix";
    notlistener.url = "git+https://git.t-juice.club/torjus/notlistener?ref=master";
-    ghettoptt.url = "git+https://git.t-juice.club/torjus/ghettoptt?ref=master";
+    ghettoptt = {
+      url = "git+https://git.t-juice.club/torjus/ghettoptt?ref=master";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    huecli = {
+      url = "git+https://git.t-juice.club/torjus/huecli?ref=master";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
  };

  outputs =
@@ -21,6 +28,7 @@
    , sops-nix
    , notlistener
    , ghettoptt
+    , huecli
    , ...
    }@inputs:
    let
@@ -32,6 +40,15 @@
          config.allowUnfree = true;
        };
      };
+      allSystems = [
+        "x86_64-linux"
+        "aarch64-linux"
+        "x86_64-darwin"
+        "aarch64-darwin"
+      ];
+      forAllSystems = f: nixpkgs.lib.genAttrs allSystems (system: f {
+        pkgs = import nixpkgs { inherit system; };
+      });
    in
    {
      nixosConfigurations = {
@@ -63,6 +80,7 @@
                overlay-stable
                notlistener.overlays.default
                ghettoptt.overlays.default
+                huecli.overlays.default
              ];
            })
            ./hosts/gunter
@@ -70,5 +88,12 @@
          ];
        };
      };
+      devShells = forAllSystems ({ pkgs }: {
+        default = pkgs.mkShell {
+          packages = with pkgs; [
+            pre-commit
+          ];
+        };
+      });
    };
 }
--- a/home/editor/neovim/plugins.lua
+++ b/home/editor/neovim/plugins.lua
@@ -126,6 +126,10 @@ lspconfig.tsserver.setup({
 lspconfig.rust_analyzer.setup {
 }

+-- LSP: python
+lspconfig.pyright.setup {
+}
+
 -- LSP: C/C++
 lspconfig.clangd.setup({})

--- a/home/hyprland/cursor.nix
+++ b/home/hyprland/cursor.nix
@@ -3,7 +3,8 @@
    gtk.enable = true;
    # x11.enable = true;
    package = pkgs.catppuccin-cursors.macchiatoLavender;
-    name = "Catppuccin-Macchiato-Lavender-Cursors";
+    # name = "Catppuccin-Macchiato-Lavender-Cursors";
+    name = "catppuccin-macchiato-lavender-cursors";
    size = 32;
  };

--- a/home/packages/default.nix
+++ b/home/packages/default.nix
@@ -112,5 +112,6 @@ in

    # Homemade shit
    ghettoptt
+    huecli
  ];
 }
--- a/hosts/gunter/configuration.nix
+++ b/hosts/gunter/configuration.nix
@@ -16,6 +16,7 @@
  boot = {
    # Kernel stuff
    kernelPackages = pkgs.linuxPackages_xanmod_latest;
+    # kernelPackages = pkgs.linuxPackages_latest;
    kernelParams = [
      "quiet"
      "splash"
Author	SHA1	Message	Date
Torjus Håkestad	d7ee66ec7e	Add huecli Some checks failed pre-commit / pre-commit (push) Failing after 25s Details	2024-06-04 23:44:05 +02:00
Torjus Håkestad	39036609c5	Add python lsp to nvim	2024-06-04 16:09:50 +02:00
Torjus Håkestad	303f719d9d	Add devshell and envrc	2024-06-04 12:44:11 +02:00
Torjus Håkestad	88082aa0c1	Change cursor name	2024-06-04 12:37:37 +02:00