diff --git a/config/home.nix b/config/home.nix index 5036552..c26791a 100644 --- a/config/home.nix +++ b/config/home.nix @@ -140,7 +140,7 @@ ansible-language-server lua-language-server tree-sitter - nodejs_21 + nodejs_22 nodePackages_latest.vls nodePackages_latest.volar vscode-langservers-extracted diff --git a/flake.lock b/flake.lock index d95ab2e..e4d69ed 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "fw-pkgs": { "locked": { - "lastModified": 1717099852, - "narHash": "sha256-hhjMoK2MlwSX3avfP0NuaneqynY8BrQMiiQlQm/wdvM=", + "lastModified": 1717322328, + "narHash": "sha256-Kb45yu6RgfTgtcwaj3eme5k/zjh3W3Gw5ACl7/OBYmw=", "owner": "fwastring", "repo": "fwpkgs", - "rev": "36c899da0873334f093e94a8bc1f57c7fa9943e9", + "rev": "f9d01269a520872f15f5e30f286616261821b158", "type": "github" }, "original": { @@ -23,43 +23,43 @@ ] }, "locked": { - "lastModified": 1716729592, - "narHash": "sha256-Y3bOjoh2cFBqZN0Jw1zUdyr7tjygyxl2bD/QY73GZP0=", + "lastModified": 1717527182, + "narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=", "owner": "nix-community", "repo": "home-manager", - "rev": "2c78a57c544dd19b07442350727ced097e1aa6e6", + "rev": "845a5c4c073f74105022533907703441e0464bc3", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.11", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1716633019, - "narHash": "sha256-xim1b5/HZYbWaZKyI7cn9TJCM6ewNVZnesRr00mXeS4=", + "lastModified": 1717952948, + "narHash": "sha256-mJi4/gjiwQlSaxjA6AusXBN/6rQRaPCycR7bd8fydnQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9d29cd266cebf80234c98dd0b87256b6be0af44e", + "rev": "2819fffa7fa42156680f0d282c60d81e8fb185b7", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1716061101, - "narHash": "sha256-H0eCta7ahEgloGIwE/ihkyGstOGu+kQwAiHvwVoXaA0=", + "lastModified": 1713638189, + "narHash": "sha256-q7APLfB6FmmSMI1Su5ihW9IwntBsk2hWNXh8XtSdSIk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e7cc61784ddf51c81487637b3031a6dd2d6673a2", + "rev": "74574c38577914733b4f7a775dd77d24245081dd", "type": "github" }, "original": { @@ -71,11 +71,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1716948383, - "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", + "lastModified": 1717974879, + "narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ad57eef4ef0659193044870c731987a6df5cf56b", + "rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3", "type": "github" }, "original": { @@ -87,11 +87,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1716062047, - "narHash": "sha256-OhysviwHQz4p2HZL4g7XGMLoUbWMjkMr/ogaR3VUYNA=", + "lastModified": 1713596654, + "narHash": "sha256-LJbHQQ5aX1LVth2ST+Kkse/DRzgxlVhTL1rxthvyhZc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "02923630b89aa1ab36ef8e422501a6f4fd4b2016", + "rev": "fd16bb6d3bcca96039b11aa52038fafeb6e4f4be", "type": "github" }, "original": { @@ -116,10 +116,10 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1716400300, - "narHash": "sha256-0lMkIk9h3AzOHs1dCL9RXvvN4PM8VBKb+cyGsqOKa4c=", - "path": "/nix/store/5cals4p1ryzfk8yb26dmk6j0rjqkyw3w-source", - "rev": "b549832718b8946e875c016a4785d204fcfc2e53", + "lastModified": 1713892811, + "narHash": "sha256-uIGmA2xq41vVFETCF1WW4fFWFT2tqBln+aXnWrvjGRE=", + "path": "/nix/store/d0lnnw00mxa025i7dz4g4qcdfixxmg1s-source", + "rev": "f1b0adc27265274e3b0c9b872a8f476a098679bd", "type": "path" }, "original": { diff --git a/flake.nix b/flake.nix index fc82ead..81fbca8 100644 --- a/flake.nix +++ b/flake.nix @@ -3,12 +3,12 @@ inputs = { # Nixpkgs - nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; fw-pkgs.url = "github:fwastring/fwpkgs/main"; # Home manager - home-manager.url = "github:nix-community/home-manager/release-23.11"; + home-manager.url = "github:nix-community/home-manager/release-24.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; # TODO: Add any other flake you might need diff --git a/moduler/common/dwm.nix b/moduler/common/dwm.nix index ebd15b1..e97d78b 100644 --- a/moduler/common/dwm.nix +++ b/moduler/common/dwm.nix @@ -5,7 +5,7 @@ let url = "https://github.com/FredzyW/dwm-conf.git"; # rev = "99a1e812295bcf65625a4b5a0dc1022658977920"; # rev = "99f005ad0e5e5c904262e980b541cd6f0d001949"; - rev = "795d43cdda641f8470e45546ae49d1484caa9604"; + rev = "1ba673a54d8241b87e706328cac362412f4bc584"; # rev = "577d43c76b193f45ed74f9f403946ea3cc4298cf"; # url = "https://git.wastring.com/fw/dwm.git"; # rev = "04039f157960b83f1ab8abebb0ea77c72a75a249"; diff --git a/moduler/common/rbw.nix b/moduler/common/rbw.nix index 670248a..6c9b991 100644 --- a/moduler/common/rbw.nix +++ b/moduler/common/rbw.nix @@ -5,7 +5,7 @@ settings = { email = "fredrik@wastring.com"; pinentry = pkgs.pinentry; - url = "https://pass.wastring.com"; + base_url = "https://pass.wastring.com"; }; }; } diff --git a/moduler/common/ssh.nix b/moduler/common/ssh.nix index d880a38..76071cf 100644 --- a/moduler/common/ssh.nix +++ b/moduler/common/ssh.nix @@ -38,6 +38,18 @@ user = "fw"; identityFile = "/home/fw/.ssh/fw-ssh-key"; }; + "fs1" = { + hostname = "192.168.0.120"; + port = 22; + user = "fw"; + identityFile = "/home/fw/.ssh/fw-ssh-key"; + }; + "backups" = { + hostname = "192.168.0.120"; + port = 22; + user = "github"; + identityFile = "/home/fw/.ssh/github-ssh-key"; + }; }; }; }