diff --git a/flake.lock b/flake.lock index 43a8ed9..bc6d1c4 100644 --- a/flake.lock +++ b/flake.lock @@ -101,16 +101,17 @@ }, "catppuccin": { "locked": { - "lastModified": 1728407414, - "narHash": "sha256-B8LaxUP93eh+it8RW1pGq4SsU2kj7f0ipzFuhBvpON8=", + "lastModified": 1729657913, + "narHash": "sha256-azNQ0gZ/tC6RI/DoEYkJQSofBicqbe7scC+Wb9hJ/UI=", "owner": "catppuccin", "repo": "nix", - "rev": "96cf8b4a05fb23a53c027621b1147b5cf9e5439f", + "rev": "207a8449ab95c0aff9ac893859f7d4b822be6f61", "type": "github" }, "original": { "owner": "catppuccin", "repo": "nix", + "rev": "207a8449ab95c0aff9ac893859f7d4b822be6f61", "type": "github" } }, @@ -578,47 +579,33 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1729413321, - "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=", + "lastModified": 1729658218, + "narHash": "sha256-9Rg+AqLqvqqJniP/OQB3GtgXoAd8IlazsHp97va042Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26", + "rev": "dfffb2e7a52d29a0ef8e21ec8a0f30487b227f1a", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_3": { "locked": { - "lastModified": 1698318101, - "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=", - "path": "/nix/store/35dcag44a0ymww0vy0s4jjgxwpv9g62d-source", - "rev": "63678e9f3d3afecfeafa0acead6239cdb447574c", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1725194671, - "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", + "lastModified": 1728888510, + "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c", + "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" } }, "nur": { @@ -728,15 +715,16 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1728373999, - "narHash": "sha256-7cRWJMnl7wnfB7AjDAEBxLHODJU1hTthKaEOUaAVUOw=", + "lastModified": 1729682381, + "narHash": "sha256-0hRxFhGgHqulhWQ5ZfuW3piNiwL7ptVWRMTCjioeizk=", "owner": "manuelbb-upb", "repo": "scientific-fhs", - "rev": "9184d547002364a059c67cbf7dcc43d7367ea876", + "rev": "37bddb7e1d9614e31be3d7f6a7a9266a12aeb2b3", "type": "github" }, "original": { "owner": "manuelbb-upb", + "ref": "flake_module", "repo": "scientific-fhs", "type": "github" } @@ -751,7 +739,9 @@ "flake-utils": "flake-utils_3", "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_4", + "nixpkgs": [ + "nixpkgs" + ], "systems": "systems_3", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", diff --git a/flake.nix b/flake.nix index 9ba6b80..b8a5532 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "NixOS configuration"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; home-manager = { url = "github:nix-community/home-manager"; @@ -43,16 +43,21 @@ nur.url = github:nix-community/NUR; - catppuccin.url = "github:catppuccin/nix"; + catppuccin.url = "github:catppuccin/nix/207a8449ab95c0aff9ac893859f7d4b822be6f61"; #split-monitor-workspaces = { # url = "github:Duckonaut/split-monitor-workspaces"; # inputs.hyprland.follows = "hyprland"; # <- make sure this line is present for the plugin to work as intended #}; - stylix.url = "github:danth/stylix"; + stylix = { + url = "github:danth/stylix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; - scientific-fhs.url = "github:manuelbb-upb/scientific-fhs"; + scientific-fhs = { + url = "github:manuelbb-upb/scientific-fhs/flake_module"; + }; }; outputs = inputs@{ diff --git a/home_configs/manuel/home.nix b/home_configs/manuel/home.nix index 8a65ea9..66f673e 100644 --- a/home_configs/manuel/home.nix +++ b/home_configs/manuel/home.nix @@ -148,7 +148,7 @@ enable = true; juliaVersions = [ { - version="1.10.4"; + version="1.11.1"; default=true; } ];