diff --git a/flake.lock b/flake.lock index ffe294f..86f32ba 100644 --- a/flake.lock +++ b/flake.lock @@ -346,6 +346,22 @@ "type": "github" } }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1719082008, + "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "9693852a2070b398ee123a329e68f0dab5526681", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1718318537, @@ -425,6 +441,7 @@ "home-manager": "home-manager", "hyprland": "hyprland", "nixpkgs": "nixpkgs_3", + "nixpkgs-unstable": "nixpkgs-unstable", "pre-commit-hooks": "pre-commit-hooks", "slippi": "slippi", "sops-nix": "sops-nix" diff --git a/flake.nix b/flake.nix index c5043dd..33bd03e 100644 --- a/flake.nix +++ b/flake.nix @@ -1,8 +1,7 @@ { inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; - - # nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; + nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; disko.url = "github:nix-community/disko/master"; disko.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/modules/home-manager/common.nix b/modules/home-manager/common.nix index a68d1c4..fa7e177 100644 --- a/modules/home-manager/common.nix +++ b/modules/home-manager/common.nix @@ -41,6 +41,10 @@ nil alejandra gnupg + (pkgs.buildEnv { + name = "my-common-scripts"; + paths = [./scripts/common]; + }) ]; }; diff --git a/modules/home-manager/linux.nix b/modules/home-manager/linux.nix index a6cb37a..5f9e36f 100644 --- a/modules/home-manager/linux.nix +++ b/modules/home-manager/linux.nix @@ -7,7 +7,6 @@ programs.fish = { shellAliases = { - # TODO: these aren't working? disks = "df -h && lsblk"; sctl = "sudo systemctl"; bt = "bluetoothctl"; diff --git a/modules/home-manager/scripts/common/bin/td b/modules/home-manager/scripts/common/bin/td new file mode 100755 index 0000000..9d1a36b --- /dev/null +++ b/modules/home-manager/scripts/common/bin/td @@ -0,0 +1,2 @@ +#!/usr/bin/env bash +N todo