diff --git a/flake.lock b/flake.lock index 0d8b6a7..dbaf3ab 100644 --- a/flake.lock +++ b/flake.lock @@ -88,11 +88,11 @@ ] }, "locked": { - "lastModified": 1764350888, - "narHash": "sha256-6Rp18zavTlnlZzcoLoBTJMBahL2FycVkw2rAEs3cQvo=", + "lastModified": 1765326679, + "narHash": "sha256-fTLX9kDwLr9Y0rH/nG+h1XG5UU+jBcy0PFYn5eneRX8=", "owner": "nix-community", "repo": "disko", - "rev": "2055a08fd0e2fd41318279a5355eb8a161accf26", + "rev": "d64e5cdca35b5fad7c504f615357a7afe6d9c49e", "type": "github" }, "original": { @@ -168,11 +168,11 @@ ] }, "locked": { - "lastModified": 1764361670, - "narHash": "sha256-jgWzgpIaHbL3USIq0gihZeuy1lLf2YSfwvWEwnfAJUw=", + "lastModified": 1765337252, + "narHash": "sha256-HuWQp8fM25fyWflbuunQkQI62Hg0ecJxWD52FAgmxqY=", "owner": "nix-community", "repo": "home-manager", - "rev": "780be8ef503a28939cf9dc7996b48ffb1a3e04c6", + "rev": "13cc1efd78b943b98c08d74c9060a5b59bf86921", "type": "github" }, "original": { @@ -249,17 +249,14 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1760467504, - "narHash": "sha256-KzUZPZxIF6FmQW/Zpt8NtbPQ4lnkj/jdBYqBw5xE1L0=", - "ref": "refs/heads/master", - "rev": "a5f30c83b37d3171d5a8c1d2daf2c46829e04803", - "revCount": 9, - "type": "git", - "url": "https://code.m3ta.dev/m3tam3re/nixpkgs" + "lastModified": 1765432513, + "narHash": "sha256-pUOV+WXo6eIMhsQi2RzEPUnSwp34guVhWjvhypeszlI=", + "path": "/home/m3tam3re/p/nix/nixpkgs", + "type": "path" }, "original": { - "type": "git", - "url": "https://code.m3ta.dev/m3tam3re/nixpkgs" + "path": "/home/m3tam3re/p/nix/nixpkgs", + "type": "path" } }, "nix-ai-tools": { @@ -269,11 +266,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1764384059, - "narHash": "sha256-doxFSt1lphXDdi5Ev/QTWBAugZGDOpJHAyZBZgX9tzI=", + "lastModified": 1765423017, + "narHash": "sha256-ZXiMZWSet5gpnTGpc02JQHygDaaBwBEWzgUPx0YEm0c=", "owner": "numtide", "repo": "nix-ai-tools", - "rev": "9dec4068f94d22b5a4661793b6438f02cf60d089", + "rev": "6a717d02c0ded2f96568da6a35ab74962cbbf807", "type": "github" }, "original": { @@ -416,11 +413,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1764414772, - "narHash": "sha256-QZqBuzZ/1KLfwrBkdJmLGZoGnZmL0LhNmo1nD4bIaQE=", + "lastModified": 1765429017, + "narHash": "sha256-w0XQHkVx0qcWJRktzuerRSZZI/dQbuJiAFrQWEH4+lw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a7b62f2fdb7d06fcf01be5dc6e39510e4853b876", + "rev": "e2b4ce9a00fcb6458016c1fd626f336970017ea0", "type": "github" }, "original": { @@ -432,11 +429,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1764316264, - "narHash": "sha256-82L+EJU+40+FIdeG4gmUlOF1jeSwlf2AwMarrpdHF6o=", + "lastModified": 1764939437, + "narHash": "sha256-4TLFHUwXraw9Df5mXC/vCrJgb50CRr3CzUzF0Mn3CII=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9a7b80b6f82a71ea04270d7ba11b48855681c4b0", + "rev": "00d2457e2f608b4be6fe8b470b0a36816324b0ae", "type": "github" }, "original": { @@ -480,11 +477,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1764290847, - "narHash": "sha256-VwPgoDgnd628GdE3KyLqTyPF1WWh0VwT5UoKygoi8sg=", + "lastModified": 1765270179, + "narHash": "sha256-g2a4MhRKu4ymR4xwo+I+auTknXt/+j37Lnf0Mvfl1rE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cd5fedfc384cb98d9fd3827b55f4522f49efda42", + "rev": "677fbe97984e7af3175b6c121f3c39ee5c8d62c9", "type": "github" }, "original": { @@ -512,11 +509,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1764242076, - "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", + "lastModified": 1765186076, + "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", + "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8", "type": "github" }, "original": { @@ -550,11 +547,11 @@ ] }, "locked": { - "lastModified": 1764411961, - "narHash": "sha256-frGU6lCDzWPiTSQ9CUMVEfWgUx+LhIMUgHSjIL7umVM=", + "lastModified": 1765427325, + "narHash": "sha256-vJ/2MeUNpVjb2XoSZratGgSNi/6oHhoASUYRTA+8hI0=", "owner": "nix-community", "repo": "NUR", - "rev": "19c77bc00c6dab1ec487baf60a73a0ba40653c7b", + "rev": "aa58652d7a8e7463aa2cc5ecf5096204b557efab", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 3566f41..b6d3b91 100644 --- a/flake.nix +++ b/flake.nix @@ -22,8 +22,8 @@ nixpkgs-9e58ed7.url = "github:nixos/nixpkgs/9e58ed7ba759d81c98f033b7f5eba21ca68f53b0"; nixpkgs-master.url = "github:nixos/nixpkgs/master"; - m3ta-nixpkgs.url = "git+https://code.m3ta.dev/m3tam3re/nixpkgs"; - # m3ta-nixpkgs.url = "path:/home/m3tam3re/p/nix/nixpkgs"; + #m3ta-nixpkgs.url = "git+https://code.m3ta.dev/m3tam3re/nixpkgs"; + m3ta-nixpkgs.url = "path:/home/m3tam3re/p/nix/nixpkgs"; # nur = { url = "github:nix-community/NUR"; diff --git a/home/features/desktop/default.nix b/home/features/desktop/default.nix index 8d0e0b4..e0547d8 100644 --- a/home/features/desktop/default.nix +++ b/home/features/desktop/default.nix @@ -132,6 +132,7 @@ # brightnessctl # clipman distrobox + launch-webapp # eww # firefox-devedition file-roller diff --git a/home/m3tam3re/home.nix b/home/m3tam3re/home.nix index 1a072f1..0bc1c30 100644 --- a/home/m3tam3re/home.nix +++ b/home/m3tam3re/home.nix @@ -87,10 +87,6 @@ programs.git = { enable = true; - aliases = { - st = "status"; - logd = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"; - }; settings = { user = { name = "m3tm3re"; @@ -98,6 +94,10 @@ }; core.excludesfile = "~/.gitignore_global"; init.defaultBranch = "master"; + alias = { + st = "status"; + logd = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"; + }; }; };